[Bug]: 流程第一步发起后，页面显示信息有误 #6967

steedos · Jul 29, 2024 · df675fa · df675fa
1 parent 0606dd1
commit df675fa
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 71 deletions.
diff --git a/creator/packages/steedos-workflow/client/lib/uuflow_api.js b/creator/packages/steedos-workflow/client/lib/uuflow_api.js
@@ -146,15 +146,15 @@ UUflow_api.post_submit = function (instance) {
 					}
 				});
 
-				if(instance.distribute_from_instance || instance.distribute_from_instances.length > 0) {
+				if (instance.distribute_from_instance || (instance.distribute_from_instances && instance.distribute_from_instances.length > 0)) {
 					window.goBack();
 				}else{
 					FlowRouter.go("/workflow/space/" + Session.get('spaceId') + "/draft/");
 				}
 				return;
 			}
 
-			if(instance.distribute_from_instance  || instance.distribute_from_instances.length > 0) {
+			if (instance.distribute_from_instance || (instance.distribute_from_instances && instance.distribute_from_instances.length > 0)) {
 				window.goBack();
 			}else{
 				FlowRouter.go("/workflow/space/" + Session.get("spaceId") + "/" + Session.get("box"));

diff --git a/server/bundle/programs/server/packages/aldeed_autoform.js b/server/bundle/programs/server/packages/aldeed_autoform.js
@@ -9,24 +9,21 @@ var MongoObject = Package['aldeed:simple-schema'].MongoObject;
 var check = Package.check.check;
 var Match = Package.check.Match;
 
-/* Package-scope variables */
-var AutoForm, globalDefaultTemplate, setDefaults, ArrayTracker, FormData, form_version, Hooks, getFlatDocOfFieldValues, getInputValue, getInputData, updateTrackedFieldValue, updateAllTrackedFieldValues, getAllFieldsInForm, validateField, arrayTracker, defaultTypeTemplates, deps, FormPreserve, res, Utility, year, month, date;
-
 (function(){
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//                                                                                                                     //
-// packages/aldeed_autoform/autoform-common.js                                                                         //
-//                                                                                                                     //
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                                                                                                                       //
+///////////////////////////////////////////////////////////////////////
+//                                                                   //
+// packages/aldeed_autoform/autoform-common.js                       //
+//                                                                   //
+///////////////////////////////////////////////////////////////////////
+                                                                     //
 // This is the only file that is run on the server, too
 
 // Extend the schema options allowed by SimpleSchema
 SimpleSchema.extendOptions({
   autoform: Match.Optional(Object)
 });
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////
 
 }).call(this);
 

diff --git a/server/bundle/programs/server/packages/modules.js b/server/bundle/programs/server/packages/modules.js
@@ -463,7 +463,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/objectql",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "lib/index.js"
 };
 
@@ -490,7 +490,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "lib/index.js"
 };
 
@@ -517,7 +517,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "lib/index.js"
 };
 
@@ -544,7 +544,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "index.js"
 };
 
@@ -571,7 +571,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "index.js"
 };
 
@@ -598,7 +598,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "index.js"
 };
 
@@ -625,7 +625,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "package.service.js"
 };
 
@@ -652,7 +652,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-objectql",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "package.service.js"
 };
 
@@ -679,7 +679,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-ui",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "package.service.js"
 };
 
@@ -706,7 +706,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "package.service.js"
 };
 
@@ -733,7 +733,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/router",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "lib/index.js"
 };
 
@@ -760,7 +760,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "lib/index.js"
 };
 
@@ -787,7 +787,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/workflow",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "main": "index.js"
 };
 

diff --git a/...300208b0127664c9de2d1db122fd5837d4470d.js → ...ae5db893355e490a20e64da601141b5a4a8f58.js b/...300208b0127664c9de2d1db122fd5837d4470d.js → ...ae5db893355e490a20e64da601141b5a4a8f58.js
diff --git a/...127664c9de2d1db122fd5837d4470d.stats.json → ...355e490a20e64da601141b5a4a8f58.stats.json b/...127664c9de2d1db122fd5837d4470d.stats.json → ...355e490a20e64da601141b5a4a8f58.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303982,
-  "totalMinifiedGzipBytes": 1084411,
+  "totalMinifiedBytes": 4304040,
+  "totalMinifiedGzipBytes": 1084419,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715813,
+      715871,
       {
         "node_modules": {
           "meteor": {
@@ -2703,7 +2703,7 @@
                   "2_steedos_data_format.js": 6022,
                   "approve_manager.js": 14090,
                   "instance_manager.js": 31013,
-                  "uuflow_api.js": 14112,
+                  "uuflow_api.js": 14170,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
                   "instance_readonly_template.coffee": 36588,

diff --git a/server/bundle/programs/web.browser.legacy/program.json b/server/bundle/programs/web.browser.legacy/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "e2300208b0127664c9de2d1db122fd5837d4470d.js",
+      "path": "bcae5db893355e490a20e64da601141b5a4a8f58.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/e2300208b0127664c9de2d1db122fd5837d4470d.js?meteor_js_resource=true",
-      "size": 4303982,
-      "hash": "e2300208b0127664c9de2d1db122fd5837d4470d",
-      "sri": "kXY9fwzA3dRjt6+/CGOrrf6rm5RyjNBSNH+bdj8jTVWEUX7rpy+89Gduyy90TW17cYsiQT4yByCRYBWW4zImow=="
+      "url": "/bcae5db893355e490a20e64da601141b5a4a8f58.js?meteor_js_resource=true",
+      "size": 4304040,
+      "hash": "bcae5db893355e490a20e64da601141b5a4a8f58",
+      "sri": "+z7LMJNJO7ZkwZ4WUGvCfhGnMcIUYXPZS/yy+oD4gzUuxfO4tOwvFypxLRgfMgEE2N3TvEO0o3a+7ARK9NW0jw=="
     },
     {
-      "path": "e2300208b0127664c9de2d1db122fd5837d4470d.stats.json",
+      "path": "bcae5db893355e490a20e64da601141b5a4a8f58.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/e2300208b0127664c9de2d1db122fd5837d4470d.stats.json?meteor_js_resource=true",
+      "url": "/bcae5db893355e490a20e64da601141b5a4a8f58.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "22388efb6e55677db13f1be9c14615ab3f6d33e6",
-      "sri": "GynQNXL/DFb+fjiAw4mWPPNbJypZracmpWGc80pEnBEJbGMYdt0x6JxuLspANTedXZ6EO96W7M1FmWzgZw+3fA=="
+      "hash": "3de24379a4041d46a2b0b42221c3f50354e64bfc",
+      "sri": "VVNByf6O3k/tVBhfbP720/13/dyjzxmyG7h9iGSWZ0qsF7lc3zyMTqrkLQOMpbevaYOTyBppDTbtFFwhDrnNVA=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...300208b0127664c9de2d1db122fd5837d4470d.js → ...ae5db893355e490a20e64da601141b5a4a8f58.js b/...300208b0127664c9de2d1db122fd5837d4470d.js → ...ae5db893355e490a20e64da601141b5a4a8f58.js
diff --git a/...127664c9de2d1db122fd5837d4470d.stats.json → ...355e490a20e64da601141b5a4a8f58.stats.json b/...127664c9de2d1db122fd5837d4470d.stats.json → ...355e490a20e64da601141b5a4a8f58.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303982,
-  "totalMinifiedGzipBytes": 1084411,
+  "totalMinifiedBytes": 4304040,
+  "totalMinifiedGzipBytes": 1084419,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715813,
+      715871,
       {
         "node_modules": {
           "meteor": {
@@ -2703,7 +2703,7 @@
                   "2_steedos_data_format.js": 6022,
                   "approve_manager.js": 14090,
                   "instance_manager.js": 31013,
-                  "uuflow_api.js": 14112,
+                  "uuflow_api.js": 14170,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
                   "instance_readonly_template.coffee": 36588,

diff --git a/server/bundle/programs/web.browser/program.json b/server/bundle/programs/web.browser/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "e2300208b0127664c9de2d1db122fd5837d4470d.js",
+      "path": "bcae5db893355e490a20e64da601141b5a4a8f58.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/e2300208b0127664c9de2d1db122fd5837d4470d.js?meteor_js_resource=true",
-      "size": 4303982,
-      "hash": "e2300208b0127664c9de2d1db122fd5837d4470d",
-      "sri": "kXY9fwzA3dRjt6+/CGOrrf6rm5RyjNBSNH+bdj8jTVWEUX7rpy+89Gduyy90TW17cYsiQT4yByCRYBWW4zImow=="
+      "url": "/bcae5db893355e490a20e64da601141b5a4a8f58.js?meteor_js_resource=true",
+      "size": 4304040,
+      "hash": "bcae5db893355e490a20e64da601141b5a4a8f58",
+      "sri": "+z7LMJNJO7ZkwZ4WUGvCfhGnMcIUYXPZS/yy+oD4gzUuxfO4tOwvFypxLRgfMgEE2N3TvEO0o3a+7ARK9NW0jw=="
     },
     {
-      "path": "e2300208b0127664c9de2d1db122fd5837d4470d.stats.json",
+      "path": "bcae5db893355e490a20e64da601141b5a4a8f58.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/e2300208b0127664c9de2d1db122fd5837d4470d.stats.json?meteor_js_resource=true",
+      "url": "/bcae5db893355e490a20e64da601141b5a4a8f58.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "22388efb6e55677db13f1be9c14615ab3f6d33e6",
-      "sri": "GynQNXL/DFb+fjiAw4mWPPNbJypZracmpWGc80pEnBEJbGMYdt0x6JxuLspANTedXZ6EO96W7M1FmWzgZw+3fA=="
+      "hash": "3de24379a4041d46a2b0b42221c3f50354e64bfc",
+      "sri": "VVNByf6O3k/tVBhfbP720/13/dyjzxmyG7h9iGSWZ0qsF7lc3zyMTqrkLQOMpbevaYOTyBppDTbtFFwhDrnNVA=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...7d1027319a2407868eca068b6919418c808ebc.js → ...c20b08c55d24731e6ca3d442e1ee99ec6a796e.js b/...7d1027319a2407868eca068b6919418c808ebc.js → ...c20b08c55d24731e6ca3d442e1ee99ec6a796e.js
diff --git a/...9a2407868eca068b6919418c808ebc.stats.json → ...5d24731e6ca3d442e1ee99ec6a796e.stats.json b/...9a2407868eca068b6919418c808ebc.stats.json → ...5d24731e6ca3d442e1ee99ec6a796e.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4480205,
-  "totalMinifiedGzipBytes": 1143707,
+  "totalMinifiedBytes": 4480263,
+  "totalMinifiedGzipBytes": 1143713,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
@@ -2396,7 +2396,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      717624,
+      717682,
       {
         "node_modules": {
           "meteor": {
@@ -2436,7 +2436,7 @@
                   "2_steedos_data_format.js": 6020,
                   "approve_manager.js": 14646,
                   "instance_manager.js": 31442,
-                  "uuflow_api.js": 14112,
+                  "uuflow_api.js": 14170,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
                   "instance_readonly_template.coffee": 36588,

diff --git a/server/bundle/programs/web.cordova/program.json b/server/bundle/programs/web.cordova/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "b77d1027319a2407868eca068b6919418c808ebc.js",
+      "path": "58c20b08c55d24731e6ca3d442e1ee99ec6a796e.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/b77d1027319a2407868eca068b6919418c808ebc.js?meteor_js_resource=true",
-      "size": 4480205,
-      "hash": "b77d1027319a2407868eca068b6919418c808ebc",
-      "sri": "aje/6hzgOcD6WJGsPUVJSA5xmzJGgmh51dV7+nfyVVP24e0FpekagIhSM8MzIEU3qQ/pgOVv7M2VepLcKpKIYw=="
+      "url": "/__cordova/58c20b08c55d24731e6ca3d442e1ee99ec6a796e.js?meteor_js_resource=true",
+      "size": 4480263,
+      "hash": "58c20b08c55d24731e6ca3d442e1ee99ec6a796e",
+      "sri": "SLIgoXi63AXP/nMD7zszUMnPeVJCCI2wQgx4vO7la8Ffy2eca1eo3SYU9EFtnuf0cPsqd/J0rJybl9KpC9ok8Q=="
     },
     {
-      "path": "b77d1027319a2407868eca068b6919418c808ebc.stats.json",
+      "path": "58c20b08c55d24731e6ca3d442e1ee99ec6a796e.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/b77d1027319a2407868eca068b6919418c808ebc.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/58c20b08c55d24731e6ca3d442e1ee99ec6a796e.stats.json?meteor_js_resource=true",
       "size": 82585,
-      "hash": "e63378ddebaccadf2c7321c56fb97798dd668760",
-      "sri": "K+K0G7bkODv9q16gYMMOgnfDfKFgEWZgxC7jyWs4nXm7uz2aCKAqxoXj06HZh0SOtSuOwxtwefenFilfGVEjlQ=="
+      "hash": "5c4c89f0bb71a03c3cb45b44711f7dcdc3e1b186",
+      "sri": "VkH3RZYzufsQ9AXAZ+tGId3WcAduzUy4A1LXVtT8F0G+ZjERX/1iECJb6MKhkdE7pftLzkN09In02JQAtR9TfA=="
     },
     {
       "path": "74e57541b632f784ecc6c6da7ec37a37209ab816.css",

diff --git a/server/bundle/star.json b/server/bundle/star.json
@@ -36,5 +36,5 @@
   "meteorRelease": "[email protected]",
   "nodeVersion": "12.16.1",
   "npmVersion": "6.13.4",
-  "gitCommitHash": "912ae6d68ac33f4b528e91c7f7e0419c7238cfb0"
+  "gitCommitHash": "0606dd11e2780ea5b159792d304960b026b1294c"
 }