No commit message

steedos · Oct 31, 2023 · 6df0862 · 6df0862
2 parents 5c359d4 + 41fd313
commit 6df0862
Show file tree

Hide file tree

Showing 110 changed files with 512 additions and 464 deletions.
diff --git a/creator/packages/steedos-workflow/client/lib/instance_manager.js b/creator/packages/steedos-workflow/client/lib/instance_manager.js
@@ -630,6 +630,10 @@ InstanceManager.getInstanceFormValue = function(){
 			return ;
 		}
 		autoFormValue = _.extend(instanceformValues.insertDoc, instanceformValues.updateDoc.$unset);
+		// 指定分析特定流程字段值异常问题
+		if ("" == autoFormValue["文件标题"] && "4c0acf34-aaa2-4834-a189-dd742e987382" == WorkflowManager.getInstance()?.flow) {
+			localStorage.setItem("__autoFormValue", JSON.stringify(autoFormValue));
+		}
 	}
 	return autoFormValue;
 }
@@ -874,7 +878,10 @@ InstanceManager.saveIns = function (noWarn) {
 		$('body').addClass("loading");
 	}
 	var instance = WorkflowManager.getInstance();
+	var insFormValues;
 	if (instance) {
+		insFormValues = InstanceManager.getInstanceValuesByAutoForm();
+
 		if (instance.state != 'draft') {
 			InstanceManager.updateApproveSign('', $("#suggestion").val(), "update", InstanceSignText.helpers.getLastSignApprove())
 		}
@@ -956,7 +963,7 @@ InstanceManager.saveIns = function (noWarn) {
 			});
 		} else if (state == "pending") {
 			var myApprove = InstanceManager.getMyApprove();
-			myApprove.values = InstanceManager.getInstanceValuesByAutoForm();
+			myApprove.values = insFormValues
 
 			if (!_.isEmpty(myApprove) && !_.isEmpty(myApprove._id)) {
 				Meteor.call("inbox_save_instance", myApprove, function (error, result) {

diff --git a/creator/packages/steedos-workflow/client/views/instance/instance_suggestion.coffee b/creator/packages/steedos-workflow/client/views/instance/instance_suggestion.coffee
@@ -393,7 +393,7 @@ Template.instance_suggestion.events
 		lastSignApprove = InstanceSignText.helpers.getLastSignApprove()
 
 		setTimeout ()->
-			if (insId == Session.get('instanceId'))
+			if insId == Session.get('instanceId') && FlowRouter.current().params.record_id == Session.get('instanceTaskId')
 				InstanceManager.saveIns(true);
 				InstanceManager.updateApproveSign(sign_field_code, suggestion_val, "update", lastSignApprove)
 

diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.5.18-beta.1",
-    "@steedos/objectql": "2.5.18-beta.1",
-    "@steedos/service-package-loader": "2.5.18-beta.1",
+    "@steedos/accounts": "2.5.18-beta.2",
+    "@steedos/objectql": "2.5.18-beta.2",
+    "@steedos/service-package-loader": "2.5.18-beta.2",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.5.18-beta.1"
+  "version": "2.5.18-beta.2"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -55,20 +55,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.5.18-beta.1",
-    "@steedos/meteor-bundle-runner": "2.5.18-beta.1",
-    "@steedos/objectql": "2.5.18-beta.1",
+    "@steedos/auth": "2.5.18-beta.2",
+    "@steedos/meteor-bundle-runner": "2.5.18-beta.2",
+    "@steedos/objectql": "2.5.18-beta.2",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.5.18-beta.1",
+    "steedos-server": "2.5.18-beta.2",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,8 +13,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.5.18-beta.1",
-    "@steedos/objectql": "2.5.18-beta.1",
+    "@steedos/cachers": "2.5.18-beta.2",
+    "@steedos/objectql": "2.5.18-beta.2",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
     "ismobilejs": "^1.1.1",
@@ -25,5 +25,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/cli/default.steedos.config.js b/packages/cli/default.steedos.config.js
@@ -29,7 +29,7 @@ if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
 process.env.STEEDOS_AMIS_URL =  process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
 
 if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
-	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].17/dist/assets.json";
+	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].18/dist/assets.json";
 }
 
 if(_.isEmpty(process.env.SERIALIZER)){

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.5.18-beta.1",
-    "@steedos/metadata-registrar": "2.5.18-beta.1",
+    "@steedos/metadata-core": "2.5.18-beta.2",
+    "@steedos/metadata-registrar": "2.5.18-beta.2",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.5.18-beta.1",
+    "@steedos/filters": "2.5.18-beta.2",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.18-beta.1",
-    "@steedos/filters": "2.5.18-beta.1",
-    "@steedos/i18n": "2.5.18-beta.1",
-    "@steedos/metadata-core": "2.5.18-beta.1",
-    "@steedos/migrate": "2.5.18-beta.1",
-    "@steedos/objectql": "2.5.18-beta.1",
-    "@steedos/odata-v4-mongodb": "2.5.18-beta.1",
-    "@steedos/process": "2.5.18-beta.1",
-    "@steedos/standard-objects": "2.5.18-beta.1",
+    "@steedos/auth": "2.5.18-beta.2",
+    "@steedos/filters": "2.5.18-beta.2",
+    "@steedos/i18n": "2.5.18-beta.2",
+    "@steedos/metadata-core": "2.5.18-beta.2",
+    "@steedos/migrate": "2.5.18-beta.2",
+    "@steedos/objectql": "2.5.18-beta.2",
+    "@steedos/odata-v4-mongodb": "2.5.18-beta.2",
+    "@steedos/process": "2.5.18-beta.2",
+    "@steedos/standard-objects": "2.5.18-beta.2",
     "body-parser": "^1.18.1",
     "bunyan-sfdx-no-dtrace": "^1.8.2",
     "clone": "^2.1.2",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@salesforce/kit": "1.0.4",
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/meteor-bundle-runner": "2.5.18-beta.1",
+    "@steedos/meteor-bundle-runner": "2.5.18-beta.2",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "keywords": [
     "react",
     "steedos"
@@ -49,5 +49,5 @@
   "engines": {
     "node": ">=12.22.0"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/create-steedos-package/package.json b/packages/create-steedos-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-package",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/data-import/package.json b/packages/data-import/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@steedos/data-import",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.5.18-beta.1",
-    "@steedos/metadata-api": "2.5.18-beta.1",
-    "@steedos/metadata-core": "2.5.18-beta.1",
-    "@steedos/objectql": "2.5.18-beta.1",
+    "@steedos/core": "2.5.18-beta.2",
+    "@steedos/metadata-api": "2.5.18-beta.2",
+    "@steedos/metadata-core": "2.5.18-beta.2",
+    "@steedos/objectql": "2.5.18-beta.2",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/formula/package.json b/packages/formula/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/formula",
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "Salesforce Formula Parser",
   "main": "lib/formulon.js",
   "files": [
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/i18n",
   "private": false,
-  "version": "2.5.18-beta.1",
+  "version": "2.5.18-beta.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/cachers": "2.5.18-beta.1",
+    "@steedos/cachers": "2.5.18-beta.2",
     "i18next": "^19.3.4",
     "i18next-sprintf-postprocessor": "^0.2.2",
     "underscore": "1.13.4"
@@ -22,5 +22,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
+  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
 }