手机端工作流重定位报错，电脑端正常 steedos/steedos-project-shportenergy#116

steedos · Mar 11, 2024 · 523f824 · 523f824
1 parent fd54c2f
commit 523f824
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 56 deletions.
diff --git a/creator/packages/steedos-base/client/bootstrap.coffee b/creator/packages/steedos-base/client/bootstrap.coffee
@@ -171,6 +171,10 @@ Setup.setGlobalAjaxHeader = () ->
 	$.ajaxSetup
 		beforeSend: (request) ->
 			request.setRequestHeader('X-User-Id', Meteor.userId())
+			spaceId = Session.get("spaceId")
+			token = Accounts._storedLoginToken()
+			if spaceId && token
+				request.setRequestHeader('Authorization', 'Bearer ' +  spaceId + ',' + token)
 
 Meteor.startup ->
 	Setup.setGlobalAjaxHeader()

diff --git a/server/bundle/programs/server/packages/modules.js b/server/bundle/programs/server/packages/modules.js
@@ -466,7 +466,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/objectql",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "lib/index.js"
 };
 
@@ -493,7 +493,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "lib/index.js"
 };
 
@@ -520,7 +520,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "index.js"
 };
 
@@ -547,7 +547,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "index.js"
 };
 
@@ -574,7 +574,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "index.js"
 };
 
@@ -601,7 +601,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "package.service.js"
 };
 
@@ -628,7 +628,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "package.service.js"
 };
 
@@ -655,7 +655,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "lib/index.js"
 };
 
@@ -682,7 +682,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "lib/index.js"
 };
 
@@ -709,7 +709,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-workflow",
-  "version": "2.2.80",
+  "version": "2.2.81",
   "main": "package.service.js"
 };
 

diff --git a/...00702d4e6b9d7512d90853dded2b02b2e78fda.js → ...4f33a89aba298458f0314bd72a0c5fbcda60c2.js b/...00702d4e6b9d7512d90853dded2b02b2e78fda.js → ...4f33a89aba298458f0314bd72a0c5fbcda60c2.js
diff --git a/...6b9d7512d90853dded2b02b2e78fda.stats.json → ...ba298458f0314bd72a0c5fbcda60c2.stats.json b/...6b9d7512d90853dded2b02b2e78fda.stats.json → ...ba298458f0314bd72a0c5fbcda60c2.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 6255883,
-  "totalMinifiedGzipBytes": 1548540,
+  "totalMinifiedBytes": 6256009,
+  "totalMinifiedGzipBytes": 1548574,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -3054,7 +3054,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      106755,
+      106881,
       {
         "node_modules": {
           "meteor": {
@@ -3081,7 +3081,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 7748,
+                "bootstrap.coffee": 7874,
                 "lib": {
                   "printThis": {
                     "printThis.js": 3740

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": "c900702d4e6b9d7512d90853dded2b02b2e78fda.js",
+      "path": "1f4f33a89aba298458f0314bd72a0c5fbcda60c2.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/c900702d4e6b9d7512d90853dded2b02b2e78fda.js?meteor_js_resource=true",
-      "size": 6255883,
-      "hash": "c900702d4e6b9d7512d90853dded2b02b2e78fda",
-      "sri": "fi8y2lVzQKTR0UdgbnMVH3KdXpfyu6W0I2SmrTtki9KynwitMZQh9hTYAidNnsEnE0HTEIIbhBKjXAUBFoYfiw=="
+      "url": "/1f4f33a89aba298458f0314bd72a0c5fbcda60c2.js?meteor_js_resource=true",
+      "size": 6256009,
+      "hash": "1f4f33a89aba298458f0314bd72a0c5fbcda60c2",
+      "sri": "BZBPI04s0Cm5SSFcqXmWurTk5iYDvD87LzJ8277CYENNYLRjP7xXsapt5hIWeJ+Cdx0ExV0k3AKOy2YhWU+RRA=="
     },
     {
-      "path": "c900702d4e6b9d7512d90853dded2b02b2e78fda.stats.json",
+      "path": "1f4f33a89aba298458f0314bd72a0c5fbcda60c2.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/c900702d4e6b9d7512d90853dded2b02b2e78fda.stats.json?meteor_js_resource=true",
+      "url": "/1f4f33a89aba298458f0314bd72a0c5fbcda60c2.stats.json?meteor_js_resource=true",
       "size": 134358,
-      "hash": "f5663efdc3a62aeb4277fe5659f13ffac388709d",
-      "sri": "T57ajunX6b2eamU5eSjFouqs1HhhgAugX/eaLDDqvNxkTFPpg5I9lqfeL6JvCJ7r7QNpudhItp3R+5f64Hm+zQ=="
+      "hash": "0020930be09c14b7b92ff66411a65ded88c521b5",
+      "sri": "1Gg0AiJ95iJT7Mdt2O056I8jlBVvW9mLHHSKBl5GglLYZ7aFPiEmySxJeumzTxc48hgiDXTR7IWKt5FrpQCWaw=="
     },
     {
       "path": "dynamic/node_modules/devextreme/ui/drop_down_box.js",

diff --git a/...86f76e3b13a5d890c2e2cf5225db0435a211bd.js → ...1358775a5befaa3a92a9efd0a549fc60334176.js b/...86f76e3b13a5d890c2e2cf5225db0435a211bd.js → ...1358775a5befaa3a92a9efd0a549fc60334176.js
diff --git a/...13a5d890c2e2cf5225db0435a211bd.stats.json → ...5befaa3a92a9efd0a549fc60334176.stats.json b/...13a5d890c2e2cf5225db0435a211bd.stats.json → ...5befaa3a92a9efd0a549fc60334176.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 6103030,
-  "totalMinifiedGzipBytes": 1511808,
+  "totalMinifiedBytes": 6103156,
+  "totalMinifiedGzipBytes": 1511841,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
@@ -2937,7 +2937,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      106300,
+      106426,
       {
         "node_modules": {
           "meteor": {
@@ -2964,7 +2964,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 7748,
+                "bootstrap.coffee": 7874,
                 "lib": {
                   "printThis": {
                     "printThis.js": 3740

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": "8d86f76e3b13a5d890c2e2cf5225db0435a211bd.js",
+      "path": "9f1358775a5befaa3a92a9efd0a549fc60334176.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/8d86f76e3b13a5d890c2e2cf5225db0435a211bd.js?meteor_js_resource=true",
-      "size": 6103030,
-      "hash": "8d86f76e3b13a5d890c2e2cf5225db0435a211bd",
-      "sri": "wid1dETqQ/G8UPjvvFaBHsCALAbEqTP/S8TTMQ1Qw8g7QcMeDzB80Itu12SnKVo+eThIODx3xrKg8pmkI5iwQQ=="
+      "url": "/9f1358775a5befaa3a92a9efd0a549fc60334176.js?meteor_js_resource=true",
+      "size": 6103156,
+      "hash": "9f1358775a5befaa3a92a9efd0a549fc60334176",
+      "sri": "VXAjc8dd5YsyWt25uF+OfBteKl1HdNIvD+KGfYeHoWfwsB3na7sRr85qAgK6zWNuXUD/kdtlSgb9Kh/vAxzpJg=="
     },
     {
-      "path": "8d86f76e3b13a5d890c2e2cf5225db0435a211bd.stats.json",
+      "path": "9f1358775a5befaa3a92a9efd0a549fc60334176.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/8d86f76e3b13a5d890c2e2cf5225db0435a211bd.stats.json?meteor_js_resource=true",
+      "url": "/9f1358775a5befaa3a92a9efd0a549fc60334176.stats.json?meteor_js_resource=true",
       "size": 127637,
-      "hash": "b7db5f85b5b7d7d05c1375e26099e83b85af6f9d",
-      "sri": "i70wYeW2rFAMmDca+q7pvX27jLqlfL+k1ipWXJHyUFwxJiJmg4sHqDaPRDHhx77ERNOJLdxl3dyqv3LgXZbQ2w=="
+      "hash": "5e0d4a5e493fd619bb177861558b301ccd6dea1c",
+      "sri": "/Twsk9IBy582jYZMqDx9VqfM0cx9wTETvMVj9speZ+poPbHZLPi93fLicBLtXqugzbWP5BFMuEQzUtim5Cm+uQ=="
     },
     {
       "path": "dynamic/node_modules/devextreme/ui/drop_down_box.js",

diff --git a/...0630741050269d9fec334e1ba27e01c1b479d5.js → ...099e67c4d80a04486078c921b23d18524661c9.js b/...0630741050269d9fec334e1ba27e01c1b479d5.js → ...099e67c4d80a04486078c921b23d18524661c9.js
diff --git a/...50269d9fec334e1ba27e01c1b479d5.stats.json → ...d80a04486078c921b23d18524661c9.stats.json b/...50269d9fec334e1ba27e01c1b479d5.stats.json → ...d80a04486078c921b23d18524661c9.stats.json
@@ -3,8 +3,8 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 8282881,
-  "totalMinifiedGzipBytes": 2054624,
+  "totalMinifiedBytes": 8283007,
+  "totalMinifiedGzipBytes": 2054650,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
@@ -3054,7 +3054,7 @@
       }
     ],
     "packages/steedos_base.js": [
-      107121,
+      107247,
       {
         "node_modules": {
           "meteor": {
@@ -3081,7 +3081,7 @@
                 "server_session.js": 14
               },
               "client": {
-                "bootstrap.coffee": 7748,
+                "bootstrap.coffee": 7874,
                 "lib": {
                   "printThis": {
                     "printThis.js": 3740

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": "ad0630741050269d9fec334e1ba27e01c1b479d5.js",
+      "path": "58099e67c4d80a04486078c921b23d18524661c9.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/ad0630741050269d9fec334e1ba27e01c1b479d5.js?meteor_js_resource=true",
-      "size": 8282881,
-      "hash": "ad0630741050269d9fec334e1ba27e01c1b479d5",
-      "sri": "EsnnlhksbAyRh2a5OP6M2BMazbzYXM91fycGoNdz+aOBcd4xl6PdALPUMHfaEAIPAttSKCSCPnqPqgiq5rxRLA=="
+      "url": "/__cordova/58099e67c4d80a04486078c921b23d18524661c9.js?meteor_js_resource=true",
+      "size": 8283007,
+      "hash": "58099e67c4d80a04486078c921b23d18524661c9",
+      "sri": "boQESq7EOTf3T23IDdT9BPGZ5n07zSVCg4tp3HrzwpJhh5U4hEKuIBVxdOzudHN75mzBA/3XOO4QBGXO7/HY2w=="
     },
     {
-      "path": "ad0630741050269d9fec334e1ba27e01c1b479d5.stats.json",
+      "path": "58099e67c4d80a04486078c921b23d18524661c9.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/ad0630741050269d9fec334e1ba27e01c1b479d5.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/58099e67c4d80a04486078c921b23d18524661c9.stats.json?meteor_js_resource=true",
       "size": 134871,
-      "hash": "f787c51314c516fdcd79ec3fc6b1f45af35fe625",
-      "sri": "aQNjxoFlijVvBK+s5sBrY08OcFTCYtIQE3Ujaa+YDi62EjXfdmqLDsanb1Pu9finMYMblbAFHBgdua0kXZiveQ=="
+      "hash": "3315ed8c7ed34e32857492e52d3eaa9e288033a8",
+      "sri": "oCYF5cbXvCja3FOSU2YGQmu1dus+0CB2uu8BAeUQ6W1U2YJo6ZclsdNvwdyd0p5QTiiRzDtkkxjVU1YtFlJOVQ=="
     },
     {
       "path": "09faad89f76a0cb1782b6c31b25ad266ec554175.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": "c0c8092b43bc82ce5cc5bc6f15827f6b15fcc50a"
+  "gitCommitHash": "fd54c2f995bc7247445dcd3fda68df0c492c7789"
 }