Skip to content

Commit

Permalink
fix [Bug]: 审批单复选框组字段报错:value.split is not a function #6319
Browse files Browse the repository at this point in the history 
fix #6320
  • Loading branch information
@baozhoutao
baozhoutao committed Jan 22, 2024
1 parent 76ced57 commit 7e3bdea
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 45 deletions.
6 changes: 5 additions & 1 deletion creator/packages/steedos-workflow/client/lib/instance_manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,11 @@ InstanceManager.getMyApprove = function () {
}];
}

currentApprove.values = InstanceManager.getInstanceFormValue();
if(InstanceManager.isAmisForm()){
currentApprove.values = InstanceManager.getInstanceFormValue();
}else{
currentApprove.values = InstanceManager.getInstanceValuesByAutoForm();
}

return currentApprove;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/workflow/engine/manager/uuflow_manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ uuflowManager.getInstanceName = function (instance, vals) {
}
break;
case 'multiSelect':
var splitedValues = value.split(",");
var splitedValues = typeof value === 'string' ? value.split(",") : value;
var selectedOptions = fieldOptions.filter(function (item) { return splitedValues.indexOf(item.value) > -1; });
if (selectedOptions.length) {
values[field.code] = selectedOptions.map(function (item) { return item.label; }).join(",");
Expand Down
2 changes: 1 addition & 1 deletion ...f6068bcf47c63204ee24f9ba461f8d472875a5.js → ...31113a97d5473d9ea0934ba8659271bb1ff8fb.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...47c63204ee24f9ba461f8d472875a5.stats.json → ...d5473d9ea0934ba8659271bb1ff8fb.stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "standard-minifier-js",
"version": "2.6.0"
},
"totalMinifiedBytes": 4302504,
"totalMinifiedGzipBytes": 1084008,
"totalMinifiedBytes": 4302588,
"totalMinifiedGzipBytes": 1084016,
"minifiedBytesByPackage": {
"packages/meteor.js": 9504,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -2663,7 +2663,7 @@
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
714982,
715066,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2702,7 +2702,7 @@
"1_form_formula.js": 7787,
"2_steedos_data_format.js": 6022,
"approve_manager.js": 14090,
"instance_manager.js": 30767,
"instance_manager.js": 30851,
"uuflow_api.js": 13949,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
Expand Down
18 changes: 9 additions & 9 deletions server/bundle/programs/web.browser.legacy/program.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"format": "web-program-pre1",
"manifest": [
{
"path": "d9f6068bcf47c63204ee24f9ba461f8d472875a5.js",
"path": "6831113a97d5473d9ea0934ba8659271bb1ff8fb.js",
"where": "client",
"type": "js",
"cacheable": true,
"url": "/d9f6068bcf47c63204ee24f9ba461f8d472875a5.js?meteor_js_resource=true",
"size": 4302504,
"hash": "d9f6068bcf47c63204ee24f9ba461f8d472875a5",
"sri": "MLD+LYyM/OjxCVatl2kO3y9MU/tBXym0q4dMQnUgqESiTAy+pH5ppwQlkyygEL33Sp2ukoQRwJsZHyGamobXOw=="
"url": "/6831113a97d5473d9ea0934ba8659271bb1ff8fb.js?meteor_js_resource=true",
"size": 4302588,
"hash": "6831113a97d5473d9ea0934ba8659271bb1ff8fb",
"sri": "W6ArIUc3dYvydv9jHMCzb8IxjJn5zB9hX5NurHSD1xkn95n9sYnafoheTmef4Ys2elfnAdEif0ZHqgOe28GmgA=="
},
{
"path": "d9f6068bcf47c63204ee24f9ba461f8d472875a5.stats.json",
"path": "6831113a97d5473d9ea0934ba8659271bb1ff8fb.stats.json",
"where": "client",
"type": "json",
"cacheable": true,
"url": "/d9f6068bcf47c63204ee24f9ba461f8d472875a5.stats.json?meteor_js_resource=true",
"url": "/6831113a97d5473d9ea0934ba8659271bb1ff8fb.stats.json?meteor_js_resource=true",
"size": 92670,
"hash": "cbeb1fbc2d5f5d7b3f57978f37516eeba5d2c556",
"sri": "psh3Oowsy0yk6PmG7XcUpAWyrrrlGQI4lp2U1Um6XCTWNo2YV/edexYhDQOI+AfvT7LGUOkCq7pmVGg9vbbm5Q=="
"hash": "8772047501a30af3b36a31d495b928d414594f61",
"sri": "nqE9wbNq/suybYaHQibulT0VcM/4Z0Q75dIIpohRUcqiin04tyZGHQoWADZL3SGJu3K4tnqFE/DNIyfN1B+isg=="
},
{
"path": "dynamic/node_modules/formBuilder/dist/form-builder.min.js",
Expand Down
2 changes: 1 addition & 1 deletion ...f6068bcf47c63204ee24f9ba461f8d472875a5.js → ...31113a97d5473d9ea0934ba8659271bb1ff8fb.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...47c63204ee24f9ba461f8d472875a5.stats.json → ...d5473d9ea0934ba8659271bb1ff8fb.stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "standard-minifier-js",
"version": "2.6.0"
},
"totalMinifiedBytes": 4302504,
"totalMinifiedGzipBytes": 1084008,
"totalMinifiedBytes": 4302588,
"totalMinifiedGzipBytes": 1084016,
"minifiedBytesByPackage": {
"packages/meteor.js": 9504,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -2663,7 +2663,7 @@
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
714982,
715066,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2702,7 +2702,7 @@
"1_form_formula.js": 7787,
"2_steedos_data_format.js": 6022,
"approve_manager.js": 14090,
"instance_manager.js": 30767,
"instance_manager.js": 30851,
"uuflow_api.js": 13949,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
Expand Down
18 changes: 9 additions & 9 deletions server/bundle/programs/web.browser/program.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"format": "web-program-pre1",
"manifest": [
{
"path": "d9f6068bcf47c63204ee24f9ba461f8d472875a5.js",
"path": "6831113a97d5473d9ea0934ba8659271bb1ff8fb.js",
"where": "client",
"type": "js",
"cacheable": true,
"url": "/d9f6068bcf47c63204ee24f9ba461f8d472875a5.js?meteor_js_resource=true",
"size": 4302504,
"hash": "d9f6068bcf47c63204ee24f9ba461f8d472875a5",
"sri": "MLD+LYyM/OjxCVatl2kO3y9MU/tBXym0q4dMQnUgqESiTAy+pH5ppwQlkyygEL33Sp2ukoQRwJsZHyGamobXOw=="
"url": "/6831113a97d5473d9ea0934ba8659271bb1ff8fb.js?meteor_js_resource=true",
"size": 4302588,
"hash": "6831113a97d5473d9ea0934ba8659271bb1ff8fb",
"sri": "W6ArIUc3dYvydv9jHMCzb8IxjJn5zB9hX5NurHSD1xkn95n9sYnafoheTmef4Ys2elfnAdEif0ZHqgOe28GmgA=="
},
{
"path": "d9f6068bcf47c63204ee24f9ba461f8d472875a5.stats.json",
"path": "6831113a97d5473d9ea0934ba8659271bb1ff8fb.stats.json",
"where": "client",
"type": "json",
"cacheable": true,
"url": "/d9f6068bcf47c63204ee24f9ba461f8d472875a5.stats.json?meteor_js_resource=true",
"url": "/6831113a97d5473d9ea0934ba8659271bb1ff8fb.stats.json?meteor_js_resource=true",
"size": 92670,
"hash": "cbeb1fbc2d5f5d7b3f57978f37516eeba5d2c556",
"sri": "psh3Oowsy0yk6PmG7XcUpAWyrrrlGQI4lp2U1Um6XCTWNo2YV/edexYhDQOI+AfvT7LGUOkCq7pmVGg9vbbm5Q=="
"hash": "8772047501a30af3b36a31d495b928d414594f61",
"sri": "nqE9wbNq/suybYaHQibulT0VcM/4Z0Q75dIIpohRUcqiin04tyZGHQoWADZL3SGJu3K4tnqFE/DNIyfN1B+isg=="
},
{
"path": "dynamic/node_modules/formBuilder/dist/form-builder.min.js",
Expand Down
2 changes: 1 addition & 1 deletion ...08aa8cfebbc5225fa15f919e9456b81dcad276.js → ...76e1a992a33390a68f1ec10b44132a70e13724.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...bbc5225fa15f919e9456b81dcad276.stats.json → ...a33390a68f1ec10b44132a70e13724.stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "standard-minifier-js",
"version": "2.6.0"
},
"totalMinifiedBytes": 4480720,
"totalMinifiedGzipBytes": 1141659,
"totalMinifiedBytes": 4480804,
"totalMinifiedGzipBytes": 1141668,
"minifiedBytesByPackage": {
"packages/meteor.js": 9639,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -2389,7 +2389,7 @@
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
716403,
716487,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2428,7 +2428,7 @@
"1_form_formula.js": 7827,
"2_steedos_data_format.js": 6020,
"approve_manager.js": 14646,
"instance_manager.js": 30806,
"instance_manager.js": 30890,
"uuflow_api.js": 13949,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
Expand Down
18 changes: 9 additions & 9 deletions server/bundle/programs/web.cordova/program.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"format": "web-program-pre1",
"manifest": [
{
"path": "5c08aa8cfebbc5225fa15f919e9456b81dcad276.js",
"path": "5e76e1a992a33390a68f1ec10b44132a70e13724.js",
"where": "client",
"type": "js",
"cacheable": true,
"url": "/__cordova/5c08aa8cfebbc5225fa15f919e9456b81dcad276.js?meteor_js_resource=true",
"size": 4480720,
"hash": "5c08aa8cfebbc5225fa15f919e9456b81dcad276",
"sri": "3z34kMVPhunq4+ZjOtGKe65XcEd1fHDu3HB7QAUOe1dPa3+RzmoHKJf/FYL82Cw1hVx0NrW4cVgEUtH8Hr6/iw=="
"url": "/__cordova/5e76e1a992a33390a68f1ec10b44132a70e13724.js?meteor_js_resource=true",
"size": 4480804,
"hash": "5e76e1a992a33390a68f1ec10b44132a70e13724",
"sri": "8zSh/iTieFKadPQysbyDdFIWnnI8hLVd/AzQlZBecs1M8XvbUv4f9qbal1FKUH94QEzCi7gYWg5leDTZZIIflQ=="
},
{
"path": "5c08aa8cfebbc5225fa15f919e9456b81dcad276.stats.json",
"path": "5e76e1a992a33390a68f1ec10b44132a70e13724.stats.json",
"where": "client",
"type": "json",
"cacheable": true,
"url": "/__cordova/5c08aa8cfebbc5225fa15f919e9456b81dcad276.stats.json?meteor_js_resource=true",
"url": "/__cordova/5e76e1a992a33390a68f1ec10b44132a70e13724.stats.json?meteor_js_resource=true",
"size": 82382,
"hash": "112c0ed4e268cedfb2f4489e1f17fd235d1ad2d8",
"sri": "oiByakqeN3uqeNPEZfnbuYnFT30TeACfpxVpqSgsQ5hYDY06Vbbwnsqh3CNgR2PZmlGFnmk9vqDa4KJUphSrgg=="
"hash": "5c68597536cd2943c7ddb03a8d84b5d61bfaed73",
"sri": "MPgRPgA9QTpTH8k6r4Hp9n3CWam61TwWujMgMrmExaN+y4TvczimqA7qDjg2h6CRw6H+Wfqs0XPBEU/roYFVEg=="
},
{
"path": "8cdd5ab4f65446df4b26a1db8bc957ca122670cf.css",
Expand Down
2 changes: 1 addition & 1 deletion server/bundle/star.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@
"meteorRelease": "[email protected]",
"nodeVersion": "12.16.1",
"npmVersion": "6.13.4",
"gitCommitHash": "a534c88bd3e12856a7000c1417c858a5ae626636"
"gitCommitHash": "76ced5709c435b1195cb81769f6ff26e8b497af1"
}

0 comments on commit 7e3bdea

Please sign in to comment.