当申请单在草稿箱，但是申请单的状态不是草稿时，页面切换到草稿箱列表

steedos/steedos-project-hbport#688
steedos · Apr 22, 2024 · 406b183 · 406b183
1 parent de622d8
commit 406b183
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 85 deletions.
diff --git a/creator/packages/steedos-workflow/client/views/instance/instance_view.coffee b/creator/packages/steedos-workflow/client/views/instance/instance_view.coffee
@@ -156,6 +156,11 @@ Template.instance_view.onRendered ->
 		if ins
 			form_version = db.form_versions.findOne({_id: ins.form_version})
 			flow_version = db.flow_versions.findOne({_id: ins.flow_version})
+
+			# 当申请单在草稿箱，但是申请单的状态不是草稿时，页面切换到草稿箱列表
+			if "draft" != ins.state && "draft" == Session.get("box")
+				window.history.back()
+
 			Tracker.nonreactive ()->
 				if ins && Session.get("instanceId") == ins._id && form_version && flow_version
 					try

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.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "lib/index.js"
 };
 
@@ -490,7 +490,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "lib/index.js"
 };
 
@@ -517,7 +517,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "lib/index.js"
 };
 
@@ -544,7 +544,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "index.js"
 };
 
@@ -571,7 +571,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "index.js"
 };
 
@@ -598,7 +598,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "index.js"
 };
 
@@ -625,7 +625,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "package.service.js"
 };
 
@@ -652,7 +652,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-objectql",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "package.service.js"
 };
 
@@ -679,7 +679,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-ui",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "package.service.js"
 };
 
@@ -706,7 +706,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "package.service.js"
 };
 
@@ -733,7 +733,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/router",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "lib/index.js"
 };
 
@@ -760,7 +760,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "lib/index.js"
 };
 
@@ -787,7 +787,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/workflow",
-  "version": "2.7.0-beta.27",
+  "version": "2.7.0-beta.33",
   "main": "index.js"
 };
 

diff --git a/server/bundle/programs/server/packages/steedos_creator-autoform-modals.js b/server/bundle/programs/server/packages/steedos_creator-autoform-modals.js
@@ -1,5 +1,8 @@
 (function () {
 
+/* Package-scope variables */
+var __coffeescriptShare, SteedosTable, CreatorTable, trs, label, thead, fieldValues, str, keyLength, addItemTr, defaultValue;
+
 
 
 /* Exports */

diff --git a/...30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js → ...461a56421310674286edcface0a3649e92aaac.js b/...30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js → ...461a56421310674286edcface0a3649e92aaac.js
diff --git a/...d411f69f37eb34e6e7e0bcbcdccbda.stats.json → ...1310674286edcface0a3649e92aaac.stats.json b/...d411f69f37eb34e6e7e0bcbcdccbda.stats.json → ...1310674286edcface0a3649e92aaac.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303809,
-  "totalMinifiedGzipBytes": 1084329,
+  "totalMinifiedBytes": 4303898,
+  "totalMinifiedGzipBytes": 1084341,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      928419,
+      928437,
       {
         "node_modules": {
           "meteor": {
@@ -273,11 +273,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715510,
+      715581,
       {
         "node_modules": {
           "meteor": {
@@ -2751,7 +2751,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8097,
+                    "instance_view.coffee": 8168,
                     "template.instance_amis_view.js": 264,
                     "instance_amis_view.coffee": 401,
                     "template.reassign_modal.js": 2500,

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": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js",
+      "path": "e3461a56421310674286edcface0a3649e92aaac.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js?meteor_js_resource=true",
-      "size": 4303809,
-      "hash": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda",
-      "sri": "CofW/Q8Aypqo9i78QlohLrOlRtmN9mSOvouiwcms6wpCvBU1f5FXwenRESTcnB2eQbk2RoIfhpjq9MUq/j2M8Q=="
+      "url": "/e3461a56421310674286edcface0a3649e92aaac.js?meteor_js_resource=true",
+      "size": 4303898,
+      "hash": "e3461a56421310674286edcface0a3649e92aaac",
+      "sri": "omJsMqti9VoGcwq6WQxvSQUs9OAbfDSb8REBb/dN1cEvAe/1R5/S/6dCegAEErARbTC/cMNiUOMf65bh09GaRg=="
     },
     {
-      "path": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.stats.json",
+      "path": "e3461a56421310674286edcface0a3649e92aaac.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.stats.json?meteor_js_resource=true",
+      "url": "/e3461a56421310674286edcface0a3649e92aaac.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "5c9c93984691c693b7aec21f5383ae07993b4e54",
-      "sri": "mIrnCtJkltBdJtehUybsyE0rpx8wSXOQNsVqvIuU2TCmDdMsA7BwXXY2wTSi8n7R0ea0ewK6FrPL4b7EVHl0Hg=="
+      "hash": "2870e95dccc98d1d5777e8409e0bc4692d7b00af",
+      "sri": "dGpnkfc5xqZmu8kPaZMTd9XE8poInI5yafps25EOHy6WR0nBZekhzCnP2vboWfJaWRH006OHLwuyrnF1oylPWg=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",
@@ -318,8 +318,8 @@
       "cacheable": false,
       "url": "/packages/steedos_formbuilder/formbuilder/languages/zh-CN.lang",
       "size": 2439,
-      "hash": "41c29095fb591655d64f6862170bca966f1a0938",
-      "sri": "8LZx6iCUP2UhboPQOSgsmQZulwyOsprmS+IO6+XcEgQDv/IKad4JGZEfaklHdL3mHs3ZqCSm2a2QbIMxkWx7vg=="
+      "hash": "734a9818c1a08d28b1e1dde1ed0c967ad5b1639b",
+      "sri": null
     },
     {
       "path": "assets/icons/License-for-icons.txt",

diff --git a/...30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js → ...461a56421310674286edcface0a3649e92aaac.js b/...30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js → ...461a56421310674286edcface0a3649e92aaac.js
diff --git a/...d411f69f37eb34e6e7e0bcbcdccbda.stats.json → ...1310674286edcface0a3649e92aaac.stats.json b/...d411f69f37eb34e6e7e0bcbcdccbda.stats.json → ...1310674286edcface0a3649e92aaac.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303809,
-  "totalMinifiedGzipBytes": 1084329,
+  "totalMinifiedBytes": 4303898,
+  "totalMinifiedGzipBytes": 1084341,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      928419,
+      928437,
       {
         "node_modules": {
           "meteor": {
@@ -273,11 +273,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715510,
+      715581,
       {
         "node_modules": {
           "meteor": {
@@ -2751,7 +2751,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8097,
+                    "instance_view.coffee": 8168,
                     "template.instance_amis_view.js": 264,
                     "instance_amis_view.coffee": 401,
                     "template.reassign_modal.js": 2500,

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": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js",
+      "path": "e3461a56421310674286edcface0a3649e92aaac.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.js?meteor_js_resource=true",
-      "size": 4303809,
-      "hash": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda",
-      "sri": "CofW/Q8Aypqo9i78QlohLrOlRtmN9mSOvouiwcms6wpCvBU1f5FXwenRESTcnB2eQbk2RoIfhpjq9MUq/j2M8Q=="
+      "url": "/e3461a56421310674286edcface0a3649e92aaac.js?meteor_js_resource=true",
+      "size": 4303898,
+      "hash": "e3461a56421310674286edcface0a3649e92aaac",
+      "sri": "omJsMqti9VoGcwq6WQxvSQUs9OAbfDSb8REBb/dN1cEvAe/1R5/S/6dCegAEErARbTC/cMNiUOMf65bh09GaRg=="
     },
     {
-      "path": "2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.stats.json",
+      "path": "e3461a56421310674286edcface0a3649e92aaac.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/2d30b2f091d411f69f37eb34e6e7e0bcbcdccbda.stats.json?meteor_js_resource=true",
+      "url": "/e3461a56421310674286edcface0a3649e92aaac.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "5c9c93984691c693b7aec21f5383ae07993b4e54",
-      "sri": "mIrnCtJkltBdJtehUybsyE0rpx8wSXOQNsVqvIuU2TCmDdMsA7BwXXY2wTSi8n7R0ea0ewK6FrPL4b7EVHl0Hg=="
+      "hash": "2870e95dccc98d1d5777e8409e0bc4692d7b00af",
+      "sri": "dGpnkfc5xqZmu8kPaZMTd9XE8poInI5yafps25EOHy6WR0nBZekhzCnP2vboWfJaWRH006OHLwuyrnF1oylPWg=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",
@@ -318,8 +318,8 @@
       "cacheable": false,
       "url": "/packages/steedos_formbuilder/formbuilder/languages/zh-CN.lang",
       "size": 2439,
-      "hash": "41c29095fb591655d64f6862170bca966f1a0938",
-      "sri": "8LZx6iCUP2UhboPQOSgsmQZulwyOsprmS+IO6+XcEgQDv/IKad4JGZEfaklHdL3mHs3ZqCSm2a2QbIMxkWx7vg=="
+      "hash": "734a9818c1a08d28b1e1dde1ed0c967ad5b1639b",
+      "sri": null
     },
     {
       "path": "assets/icons/License-for-icons.txt",

diff --git a/...f8a76e9918a6c4e2b5e9dccf2f8c8cb5fa58a9.js → ...f177d70eeb307d49d6949e2381badb47eac2e8.js b/...f8a76e9918a6c4e2b5e9dccf2f8c8cb5fa58a9.js → ...f177d70eeb307d49d6949e2381badb47eac2e8.js
diff --git a/...18a6c4e2b5e9dccf2f8c8cb5fa58a9.stats.json → ...eb307d49d6949e2381badb47eac2e8.stats.json b/...18a6c4e2b5e9dccf2f8c8cb5fa58a9.stats.json → ...eb307d49d6949e2381badb47eac2e8.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4480032,
-  "totalMinifiedGzipBytes": 1143637,
+  "totalMinifiedBytes": 4480121,
+  "totalMinifiedGzipBytes": 1143650,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      1027497,
+      1027515,
       {
         "node_modules": {
           "meteor": {
@@ -125,11 +125,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -2396,7 +2396,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      717321,
+      717392,
       {
         "node_modules": {
           "meteor": {
@@ -2484,7 +2484,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8097,
+                    "instance_view.coffee": 8168,
                     "template.instance_amis_view.js": 264,
                     "instance_amis_view.coffee": 401,
                     "template.reassign_modal.js": 2500,