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

steedos/steedos-project-hbport#688
steedos · Apr 22, 2024 · 4e7c955 · 4e7c955
1 parent e47f883
commit 4e7c955
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 66 deletions.
diff --git a/creator/packages/steedos-workflow/client/lib/instance_manager.js b/creator/packages/steedos-workflow/client/lib/instance_manager.js
@@ -647,7 +647,7 @@ InstanceManager.getInstanceFormValue = function(){
 		autoFormValue = _.extend(instanceformValues.insertDoc, instanceformValues.updateDoc.$unset);
 		// 指定分析特定流程字段值异常问题
 		const instance = WorkflowManager.getInstance();
-		if (instance && 'draft' != instance.state && !autoFormValue["文件标题"] && ("4c0acf34-aaa2-4834-a189-dd742e987382" == instance.flow || "fd456ae72001cb119a7a9076" == instance.flow)) {
+		if (instance && "draft" == Session.get("box") && 'draft' != instance.state && !autoFormValue["文件标题"] && ("4c0acf34-aaa2-4834-a189-dd742e987382" == instance.flow || "fd456ae72001cb119a7a9076" == instance.flow)) {
 			const currentApprove = InstanceManager.getCurrentApprove();
 			Sentry.captureMessage("申请单值丢失", {
 				contexts: {

diff --git a/creator/packages/steedos-workflow/client/router.coffee b/creator/packages/steedos-workflow/client/router.coffee
@@ -141,7 +141,9 @@ workflowSpaceRoutes.route '/:box/:instanceId',
 	triggersExit: [(context, redirect) ->
 #		ins发生变化 并且 是传阅  || ins发生变化 并且 表单不是只读
 		if (Session.get("box") == "draft" || Session.get("box") == "inbox") && Session.get("instance_change") && (InstanceManager.isCC(WorkflowManager.getInstance()) || !ApproveManager.isReadOnly())
-			InstanceManager.saveIns();
+			ins = WorkflowManager.getInstance()
+			if !("draft" != ins.state && "draft" == Session.get("box"))
+				InstanceManager.saveIns();
 		Session.set("instanceId", null);
 		Session.set('flow_selected_opinion', undefined);
 	]
diff --git a/...1ace64e0405719718e3fbade6b7f6e751a4542.js → ...c9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js b/...1ace64e0405719718e3fbade6b7f6e751a4542.js → ...c9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js
diff --git a/...405719718e3fbade6b7f6e751a4542.stats.json → ...ec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json b/...405719718e3fbade6b7f6e751a4542.stats.json → ...ec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303816,
-  "totalMinifiedGzipBytes": 1084342,
+  "totalMinifiedBytes": 4303950,
+  "totalMinifiedGzipBytes": 1084360,
   "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": [
-      715517,
+      715633,
       {
         "node_modules": {
           "meteor": {
@@ -2702,7 +2702,7 @@
                   "1_form_formula.js": 7787,
                   "2_steedos_data_format.js": 6022,
                   "approve_manager.js": 14090,
-                  "instance_manager.js": 31003,
+                  "instance_manager.js": 31032,
                   "uuflow_api.js": 13949,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
@@ -2888,7 +2888,7 @@
                   }
                 },
                 "admin_menu.coffee": 363,
-                "router.coffee": 3574,
+                "router.coffee": 3661,
                 "subscribe.coffee": 3489,
                 "methods": {
                   "call_statistics.coffee": 442

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": "651ace64e0405719718e3fbade6b7f6e751a4542.js",
+      "path": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/651ace64e0405719718e3fbade6b7f6e751a4542.js?meteor_js_resource=true",
-      "size": 4303816,
-      "hash": "651ace64e0405719718e3fbade6b7f6e751a4542",
-      "sri": "OdhIMyTo7Pn0crf+xOnsnGIerjqUwJA75P1TtuPLcUv7+N+QeCREGJvIIQRzVBenYzo5rKNzbwr0CIQbIz2+3Q=="
+      "url": "/5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js?meteor_js_resource=true",
+      "size": 4303950,
+      "hash": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a",
+      "sri": "EMjq2iquVGAEdbCzJOGpaDgy9quvu38a+Qcm5VbbUMgzDQlzGcpaQUh56xwAYjZ0BoCxeP7jTVVRYFFVG+1c7A=="
     },
     {
-      "path": "651ace64e0405719718e3fbade6b7f6e751a4542.stats.json",
+      "path": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/651ace64e0405719718e3fbade6b7f6e751a4542.stats.json?meteor_js_resource=true",
+      "url": "/5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "d4242b2f2ad91a36d878aa64c758076e44ea3132",
-      "sri": "MckBzR45VPiVJgDH1qWrOhSpDHcCl3I8A+n8abUjRigCDX22ImawUYcc/+q9gBjXBKemrW8QhZWO/Y7Rf9vDOg=="
+      "hash": "e3006cd35058e235001276a78a617e515f014570",
+      "sri": "20tH2hK87d17Rt//wBeQYPjzHvMiTUxCkIdVAcwUONQWC7ZX2M334Q4o//lG3YWLaH0/f4ytQ/4yaRCPDJTuHw=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...1ace64e0405719718e3fbade6b7f6e751a4542.js → ...c9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js b/...1ace64e0405719718e3fbade6b7f6e751a4542.js → ...c9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js
diff --git a/...405719718e3fbade6b7f6e751a4542.stats.json → ...ec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json b/...405719718e3fbade6b7f6e751a4542.stats.json → ...ec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303816,
-  "totalMinifiedGzipBytes": 1084342,
+  "totalMinifiedBytes": 4303950,
+  "totalMinifiedGzipBytes": 1084360,
   "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": [
-      715517,
+      715633,
       {
         "node_modules": {
           "meteor": {
@@ -2702,7 +2702,7 @@
                   "1_form_formula.js": 7787,
                   "2_steedos_data_format.js": 6022,
                   "approve_manager.js": 14090,
-                  "instance_manager.js": 31003,
+                  "instance_manager.js": 31032,
                   "uuflow_api.js": 13949,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
@@ -2888,7 +2888,7 @@
                   }
                 },
                 "admin_menu.coffee": 363,
-                "router.coffee": 3574,
+                "router.coffee": 3661,
                 "subscribe.coffee": 3489,
                 "methods": {
                   "call_statistics.coffee": 442

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": "651ace64e0405719718e3fbade6b7f6e751a4542.js",
+      "path": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/651ace64e0405719718e3fbade6b7f6e751a4542.js?meteor_js_resource=true",
-      "size": 4303816,
-      "hash": "651ace64e0405719718e3fbade6b7f6e751a4542",
-      "sri": "OdhIMyTo7Pn0crf+xOnsnGIerjqUwJA75P1TtuPLcUv7+N+QeCREGJvIIQRzVBenYzo5rKNzbwr0CIQbIz2+3Q=="
+      "url": "/5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.js?meteor_js_resource=true",
+      "size": 4303950,
+      "hash": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a",
+      "sri": "EMjq2iquVGAEdbCzJOGpaDgy9quvu38a+Qcm5VbbUMgzDQlzGcpaQUh56xwAYjZ0BoCxeP7jTVVRYFFVG+1c7A=="
     },
     {
-      "path": "651ace64e0405719718e3fbade6b7f6e751a4542.stats.json",
+      "path": "5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/651ace64e0405719718e3fbade6b7f6e751a4542.stats.json?meteor_js_resource=true",
+      "url": "/5ac9ebd73bec6a8db0e2f1e8fa755ed3f3f52a9a.stats.json?meteor_js_resource=true",
       "size": 92684,
-      "hash": "d4242b2f2ad91a36d878aa64c758076e44ea3132",
-      "sri": "MckBzR45VPiVJgDH1qWrOhSpDHcCl3I8A+n8abUjRigCDX22ImawUYcc/+q9gBjXBKemrW8QhZWO/Y7Rf9vDOg=="
+      "hash": "e3006cd35058e235001276a78a617e515f014570",
+      "sri": "20tH2hK87d17Rt//wBeQYPjzHvMiTUxCkIdVAcwUONQWC7ZX2M334Q4o//lG3YWLaH0/f4ytQ/4yaRCPDJTuHw=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...36f9daf253586d022f724ec4429836e2c2ba34.js → ...937694c8dd1126c86f1c3310eccae893e625f0.js b/...36f9daf253586d022f724ec4429836e2c2ba34.js → ...937694c8dd1126c86f1c3310eccae893e625f0.js
diff --git a/...53586d022f724ec4429836e2c2ba34.stats.json → ...dd1126c86f1c3310eccae893e625f0.stats.json b/...53586d022f724ec4429836e2c2ba34.stats.json → ...dd1126c86f1c3310eccae893e625f0.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4480039,
-  "totalMinifiedGzipBytes": 1143650,
+  "totalMinifiedBytes": 4480173,
+  "totalMinifiedGzipBytes": 1143670,
   "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": [
-      717328,
+      717444,
       {
         "node_modules": {
           "meteor": {
@@ -2435,7 +2435,7 @@
                   "1_form_formula.js": 7827,
                   "2_steedos_data_format.js": 6020,
                   "approve_manager.js": 14646,
-                  "instance_manager.js": 31432,
+                  "instance_manager.js": 31461,
                   "uuflow_api.js": 13949,
                   "workflow_manager.js": 13054,
                   "node_manager.js": 5745,
@@ -2621,7 +2621,7 @@
                   }
                 },
                 "admin_menu.coffee": 363,
-                "router.coffee": 3574,
+                "router.coffee": 3661,
                 "subscribe.coffee": 3489,
                 "methods": {
                   "call_statistics.coffee": 442

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": "4736f9daf253586d022f724ec4429836e2c2ba34.js",
+      "path": "47937694c8dd1126c86f1c3310eccae893e625f0.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/4736f9daf253586d022f724ec4429836e2c2ba34.js?meteor_js_resource=true",
-      "size": 4480039,
-      "hash": "4736f9daf253586d022f724ec4429836e2c2ba34",
-      "sri": "EtCq4Id2URAA7WPT9qdU0PFXjOETqpbzH8G45//vqo7JLi7HIR49uvlXfFJ93N2cJjlUcqpUr5T5WicPynDpTA=="
+      "url": "/__cordova/47937694c8dd1126c86f1c3310eccae893e625f0.js?meteor_js_resource=true",
+      "size": 4480173,
+      "hash": "47937694c8dd1126c86f1c3310eccae893e625f0",
+      "sri": "bZTOgQgoYeO0z/kj6xBDusImj42bQnWbyWHha+8haD81pe0krdou0/lacUzDVlJ0S4o//Fja6VobN9UccWGsjg=="
     },
     {
-      "path": "4736f9daf253586d022f724ec4429836e2c2ba34.stats.json",
+      "path": "47937694c8dd1126c86f1c3310eccae893e625f0.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/4736f9daf253586d022f724ec4429836e2c2ba34.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/47937694c8dd1126c86f1c3310eccae893e625f0.stats.json?meteor_js_resource=true",
       "size": 82586,
-      "hash": "f6b7ca52022e12b49a4d25206a4bc54451cf6dd1",
-      "sri": "+YkHFMBJsHpXYalv4i5wM+cWQIUXCOa23S0g0R5uV9AXTlO1WZMxlk0giIQqamgmQe3M7UPYeKeqlM97bU5VkQ=="
+      "hash": "3639816f738d77fed65a7ae531cd7e512db75f93",
+      "sri": "MI1I2DRLw4ERRfaw02b/nuwoF+Ys44y7gu6isbo5uRvB8Ewe3XOC6SH0yNNldsSu53f70C1OoaUNxgYkP64GRQ=="
     },
     {
       "path": "74e57541b632f784ecc6c6da7ec37a37209ab816.css",

diff --git a/server/bundle/star.json b/server/bundle/star.json
@@ -36,5 +36,5 @@
   "meteorRelease": "METEOR@1.9.3",
   "nodeVersion": "12.16.1",
   "npmVersion": "6.13.4",
-  "gitCommitHash": "8e0d863aa936cfaa21a2a556babf5f86ebd5ff9e"
+  "gitCommitHash": "e47f883addce501e779c7559081f58ea0a4592f4"
 }