当申请单状态非草稿，但是在草稿箱时不暂存

steedos/steedos-project-hbport#688
steedos · May 6, 2024 · 32d40f1 · 32d40f1
1 parent 12cb158
commit 32d40f1
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 69 deletions.
diff --git a/creator/packages/steedos-creator/client/router.coffee b/creator/packages/steedos-creator/client/router.coffee
@@ -281,7 +281,9 @@ objectRoutes.route '/view/:record_id',
 	triggersExit: [
 		(context, redirect) ->
 			if Session.get("instance_change") && ((context.params?.object_name == 'instances' && context.queryParams?.side_listview_id == 'draft') || (context.params?.object_name == 'instance_tasks' && context.queryParams?.side_listview_id == 'inbox'))
-				InstanceManager.saveIns(false);
+				ins = WorkflowManager.getInstance()
+				if !("draft" != ins.state && "draft" == Session.get("box"))
+					InstanceManager.saveIns(false);
 	]
 objectRoutes.route '/grid/:list_view_id',
 	action: (params, queryParams)->

diff --git a/creator/packages/steedos-workflow/client/views/instance/instance_view.coffee b/creator/packages/steedos-workflow/client/views/instance/instance_view.coffee
@@ -159,6 +159,7 @@ Template.instance_view.onRendered ->
 
 			# 当申请单在草稿箱，但是申请单的状态不是草稿时，页面切换到草稿箱列表
 			if "draft" != ins.state && "draft" == Session.get("box")
+				Session.set("instance_change", false)
 				window.history.back()
 
 			Tracker.nonreactive ()->

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

diff --git a/...bd58631c711b1dac3b67de074e4e2b89018ca6.js → ...8e091408993e566bde6016e2c1649202635d18.js b/...bd58631c711b1dac3b67de074e4e2b89018ca6.js → ...8e091408993e566bde6016e2c1649202635d18.js
diff --git a/...711b1dac3b67de074e4e2b89018ca6.stats.json → ...993e566bde6016e2c1649202635d18.stats.json b/...711b1dac3b67de074e4e2b89018ca6.stats.json → ...993e566bde6016e2c1649202635d18.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303459,
-  "totalMinifiedGzipBytes": 1084235,
+  "totalMinifiedBytes": 4303580,
+  "totalMinifiedGzipBytes": 1084269,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2533,7 +2533,7 @@
       }
     ],
     "packages/steedos_creator.js": [
-      102685,
+      102770,
       {
         "node_modules": {
           "meteor": {
@@ -2586,7 +2586,7 @@
                 "core.coffee": 18669,
                 "colors.coffee": 1485,
                 "temp_navs.coffee": 3922,
-                "router.coffee": 6149,
+                "router.coffee": 6234,
                 "tenant.coffee": 220,
                 "animate.js": 405,
                 "colResizable-1.6.js": 5920,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715614,
+      715650,
       {
         "node_modules": {
           "meteor": {
@@ -2751,7 +2751,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8168,
+                    "instance_view.coffee": 8204,
                     "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": "1dbd58631c711b1dac3b67de074e4e2b89018ca6.js",
+      "path": "0e8e091408993e566bde6016e2c1649202635d18.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/1dbd58631c711b1dac3b67de074e4e2b89018ca6.js?meteor_js_resource=true",
-      "size": 4303459,
-      "hash": "1dbd58631c711b1dac3b67de074e4e2b89018ca6",
-      "sri": "5MLRca7KQC+NjoBY2rEBCQA2EJfsKu/ryL/IAr9TwAWdRJMedEUL4L0wI2nno6Ly1+Z+qXyf/7dDNy9VlyRaUg=="
+      "url": "/0e8e091408993e566bde6016e2c1649202635d18.js?meteor_js_resource=true",
+      "size": 4303580,
+      "hash": "0e8e091408993e566bde6016e2c1649202635d18",
+      "sri": "OhdUtIAEsG93aRo8iLO7Mnu+wUBBwXhI5ZVLJzM2ljxaP13AHdvoclBFj0Th3bBhZ/D2rDubEGyCLIaLgl098w=="
     },
     {
-      "path": "1dbd58631c711b1dac3b67de074e4e2b89018ca6.stats.json",
+      "path": "0e8e091408993e566bde6016e2c1649202635d18.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/1dbd58631c711b1dac3b67de074e4e2b89018ca6.stats.json?meteor_js_resource=true",
+      "url": "/0e8e091408993e566bde6016e2c1649202635d18.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "ef2af3e1e8f1487d924691ecbdeca521443880a4",
-      "sri": "RI+iUej1RE7kvIB7DTYNi81uo82gopC7dzGDzZjvu0DSoUgZpg0AX7tDqhLaekY8HRtejunmNdC57fyVh3pYkQ=="
+      "hash": "2c2177a2ae31d8307d864b5b8bccdf64b84f5d8d",
+      "sri": "HeiN/r/U3DZ81rMIw+hfArKVm8WBnN42ePE1jWwgu1LYTmYo6TperjdmsJYf+AgD+81mUxUvKPGg7P2C3/vieQ=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...bd58631c711b1dac3b67de074e4e2b89018ca6.js → ...8e091408993e566bde6016e2c1649202635d18.js b/...bd58631c711b1dac3b67de074e4e2b89018ca6.js → ...8e091408993e566bde6016e2c1649202635d18.js
diff --git a/...711b1dac3b67de074e4e2b89018ca6.stats.json → ...993e566bde6016e2c1649202635d18.stats.json b/...711b1dac3b67de074e4e2b89018ca6.stats.json → ...993e566bde6016e2c1649202635d18.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303459,
-  "totalMinifiedGzipBytes": 1084235,
+  "totalMinifiedBytes": 4303580,
+  "totalMinifiedGzipBytes": 1084269,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2533,7 +2533,7 @@
       }
     ],
     "packages/steedos_creator.js": [
-      102685,
+      102770,
       {
         "node_modules": {
           "meteor": {
@@ -2586,7 +2586,7 @@
                 "core.coffee": 18669,
                 "colors.coffee": 1485,
                 "temp_navs.coffee": 3922,
-                "router.coffee": 6149,
+                "router.coffee": 6234,
                 "tenant.coffee": 220,
                 "animate.js": 405,
                 "colResizable-1.6.js": 5920,
@@ -2663,7 +2663,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      715614,
+      715650,
       {
         "node_modules": {
           "meteor": {
@@ -2751,7 +2751,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8168,
+                    "instance_view.coffee": 8204,
                     "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": "1dbd58631c711b1dac3b67de074e4e2b89018ca6.js",
+      "path": "0e8e091408993e566bde6016e2c1649202635d18.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/1dbd58631c711b1dac3b67de074e4e2b89018ca6.js?meteor_js_resource=true",
-      "size": 4303459,
-      "hash": "1dbd58631c711b1dac3b67de074e4e2b89018ca6",
-      "sri": "5MLRca7KQC+NjoBY2rEBCQA2EJfsKu/ryL/IAr9TwAWdRJMedEUL4L0wI2nno6Ly1+Z+qXyf/7dDNy9VlyRaUg=="
+      "url": "/0e8e091408993e566bde6016e2c1649202635d18.js?meteor_js_resource=true",
+      "size": 4303580,
+      "hash": "0e8e091408993e566bde6016e2c1649202635d18",
+      "sri": "OhdUtIAEsG93aRo8iLO7Mnu+wUBBwXhI5ZVLJzM2ljxaP13AHdvoclBFj0Th3bBhZ/D2rDubEGyCLIaLgl098w=="
     },
     {
-      "path": "1dbd58631c711b1dac3b67de074e4e2b89018ca6.stats.json",
+      "path": "0e8e091408993e566bde6016e2c1649202635d18.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/1dbd58631c711b1dac3b67de074e4e2b89018ca6.stats.json?meteor_js_resource=true",
+      "url": "/0e8e091408993e566bde6016e2c1649202635d18.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "ef2af3e1e8f1487d924691ecbdeca521443880a4",
-      "sri": "RI+iUej1RE7kvIB7DTYNi81uo82gopC7dzGDzZjvu0DSoUgZpg0AX7tDqhLaekY8HRtejunmNdC57fyVh3pYkQ=="
+      "hash": "2c2177a2ae31d8307d864b5b8bccdf64b84f5d8d",
+      "sri": "HeiN/r/U3DZ81rMIw+hfArKVm8WBnN42ePE1jWwgu1LYTmYo6TperjdmsJYf+AgD+81mUxUvKPGg7P2C3/vieQ=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...12634efbf04b96ad53a047d4b5cc3b824c11b7.js → ...30c101caa5703f6bfb61789c7e2d80336dd6dc.js b/...12634efbf04b96ad53a047d4b5cc3b824c11b7.js → ...30c101caa5703f6bfb61789c7e2d80336dd6dc.js
diff --git a/...f04b96ad53a047d4b5cc3b824c11b7.stats.json → ...a5703f6bfb61789c7e2d80336dd6dc.stats.json b/...f04b96ad53a047d4b5cc3b824c11b7.stats.json → ...a5703f6bfb61789c7e2d80336dd6dc.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4479682,
-  "totalMinifiedGzipBytes": 1143549,
+  "totalMinifiedBytes": 4479803,
+  "totalMinifiedGzipBytes": 1143588,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
@@ -2266,7 +2266,7 @@
       }
     ],
     "packages/steedos_creator.js": [
-      102910,
+      102995,
       {
         "node_modules": {
           "meteor": {
@@ -2319,7 +2319,7 @@
                 "core.coffee": 18669,
                 "colors.coffee": 1485,
                 "temp_navs.coffee": 3922,
-                "router.coffee": 6149,
+                "router.coffee": 6234,
                 "tenant.coffee": 220,
                 "animate.js": 445,
                 "colResizable-1.6.js": 5960,
@@ -2396,7 +2396,7 @@
     "packages/steedos_autoform-modals.js": 20485,
     "packages/steedos_slipjs.js": 15081,
     "packages/steedos_workflow.js": [
-      717425,
+      717461,
       {
         "node_modules": {
           "meteor": {
@@ -2484,7 +2484,7 @@
                     "template.instance_suggestion.js": 13122,
                     "instance_suggestion.coffee": 11911,
                     "template.instance_view.js": 4887,
-                    "instance_view.coffee": 8168,
+                    "instance_view.coffee": 8204,
                     "template.instance_amis_view.js": 264,
                     "instance_amis_view.coffee": 401,
                     "template.reassign_modal.js": 2500,

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": "5112634efbf04b96ad53a047d4b5cc3b824c11b7.js",
+      "path": "9f30c101caa5703f6bfb61789c7e2d80336dd6dc.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/5112634efbf04b96ad53a047d4b5cc3b824c11b7.js?meteor_js_resource=true",
-      "size": 4479682,
-      "hash": "5112634efbf04b96ad53a047d4b5cc3b824c11b7",
-      "sri": "rkwYzy1QpLkjKefXpN/DyRq3btMD0/n3uPO/KChdwmXXBaZMjPkEmG6vlSYoVCoQxPXnSU5zEkvzZTMobh96RA=="
+      "url": "/__cordova/9f30c101caa5703f6bfb61789c7e2d80336dd6dc.js?meteor_js_resource=true",
+      "size": 4479803,
+      "hash": "9f30c101caa5703f6bfb61789c7e2d80336dd6dc",
+      "sri": "5b9eSFovYGLJ9YXe0Skk7ha2cpmkHxs60Qz6geWNrpC3q9JpFn1wN1kIRh0D7twJYXNV614Ms/aUVt+j1hreWQ=="
     },
     {
-      "path": "5112634efbf04b96ad53a047d4b5cc3b824c11b7.stats.json",
+      "path": "9f30c101caa5703f6bfb61789c7e2d80336dd6dc.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/5112634efbf04b96ad53a047d4b5cc3b824c11b7.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/9f30c101caa5703f6bfb61789c7e2d80336dd6dc.stats.json?meteor_js_resource=true",
       "size": 82585,
-      "hash": "0aac716e7dd8488efdcc028f63ade9aff2019abe",
-      "sri": "TM1P9WeOnePcO/Np0bIDc1XjUBvD/CvwMks5eORg6ESl7+pTWvT84B6E1jL1DbsvfRSYDSEM8CeS+eQIrH3Y4g=="
+      "hash": "6ac86a2aabff437a4c5bb451ca3d934120593e24",
+      "sri": "OK92iBYGNuzPVsRO4O5tfp1Aj9CmcJxLP2j+CL9B+RRnlrtEMgHBRYB4fzBF6mOJj/e1GhIrMGvbOyKQszVziA=="
     },
     {
       "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": "87e539b176a750044766f468e0b1bc44ec3338bf"
+  "gitCommitHash": "12cb158b55009e5ca64165a8900d3cff448f7369"
 }