No commit message

steedos · Nov 17, 2023 · d56ce70 · d56ce70
2 parents 41115ab + 8ed70f9
commit d56ce70
Show file tree

Hide file tree

Showing 113 changed files with 511 additions and 503 deletions.
diff --git a/creator/packages/steedos-workflow/client/coreform/inputTypes/steedos-field/steedos-field.js b/creator/packages/steedos-workflow/client/coreform/inputTypes/steedos-field/steedos-field.js
@@ -2,7 +2,7 @@
  * @Author: [email protected]
  * @Date: 2023-10-28 15:25:17
  * @LastEditors: [email protected]
- * @LastEditTime: 2023-11-14 13:53:59
+ * @LastEditTime: 2023-11-16 11:15:19
  * @Description: 
  */
 if (Meteor.isClient) {
@@ -17,6 +17,7 @@ if (Meteor.isClient) {
         // 输出值
         valueOut: function () {
             const val = this.data("value");
+            const multiple = this.data('multiple') == 'true' || this.data('multiple') == true
             if(_.isString(val)){
                 if(val.indexOf('/') > -1){
                     return _.last(lodash.split(val, '/'))
@@ -25,14 +26,18 @@ if (Meteor.isClient) {
             }
 
             if(_.isArray(val)){
-                return _.map(val, (v)=>{
+                const rval = _.map(val, (v)=>{
                     if(_.isObject(v) && v.value){
                         return v.value
                     }else if(v.indexOf('/') > -1){
                         return _.last(lodash.split(v, '/'))
                     }
                     return v
-                })
+                });
+                if(multiple != true && rval.length > 0){
+                    return rval[0]
+                }
+                return rval;
             }else if(_.isObject(val)){
                 if(val.value){
                     return val.value
@@ -76,7 +81,7 @@ if (Meteor.isClient) {
                 // 遍历值，获取图片链接
                 _.each(ids, (id)=>{
                     values.push(window.getImageFieldUrl(Meteor.absoluteUrl(`/api/files/images/${id}`)))
-                })
+                });
             }else if(atts.fieldType === 'file'){
                 if(_.isString(ids)){
                     ids = [ids]
@@ -102,6 +107,7 @@ if (Meteor.isClient) {
             disabled = true;
           }
         $("#"+atts.id).data('value', values);
+        $("#"+atts.id).data('multiple', atts.multiple);
         const config = JSON.parse(atts.config || "{}");
         const schema = {
             render_engine: 'amis',
@@ -153,6 +159,7 @@ if (Meteor.isClient) {
                 ]
             }
         };
+        // console.log(`afSteedosField`, ids, schema)
         // 渲染amis
         Steedos.Page.render($("#"+atts.id)[0], schema, Object.assign({}, {}));
     };

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.20-beta.7",
+  "version": "2.5.20-beta.8",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.5.20-beta.7",
-    "@steedos/objectql": "2.5.20-beta.7",
-    "@steedos/service-package-loader": "2.5.20-beta.7",
+    "@steedos/accounts": "2.5.20-beta.8",
+    "@steedos/objectql": "2.5.20-beta.8",
+    "@steedos/service-package-loader": "2.5.20-beta.8",
     "@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": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.5.20-beta.7"
+  "version": "2.5.20-beta.8"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -55,20 +55,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.5.20-beta.7",
-    "@steedos/meteor-bundle-runner": "2.5.20-beta.7",
-    "@steedos/objectql": "2.5.20-beta.7",
+    "@steedos/auth": "2.5.20-beta.8",
+    "@steedos/meteor-bundle-runner": "2.5.20-beta.8",
+    "@steedos/objectql": "2.5.20-beta.8",
     "@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.20-beta.7",
+    "steedos-server": "2.5.20-beta.8",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,8 +13,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.5.20-beta.7",
-    "@steedos/objectql": "2.5.20-beta.7",
+    "@steedos/cachers": "2.5.20-beta.8",
+    "@steedos/objectql": "2.5.20-beta.8",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
     "ismobilejs": "^1.1.1",
@@ -25,5 +25,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
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].8/dist/assets.json";
+	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].9/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.20-beta.7",
+  "version": "2.5.20-beta.8",
   "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.20-beta.7",
-    "@steedos/metadata-registrar": "2.5.20-beta.7",
+    "@steedos/metadata-core": "2.5.20-beta.8",
+    "@steedos/metadata-registrar": "2.5.20-beta.8",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.5.20-beta.7",
+    "@steedos/filters": "2.5.20-beta.8",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.20-beta.7",
-    "@steedos/filters": "2.5.20-beta.7",
-    "@steedos/i18n": "2.5.20-beta.7",
-    "@steedos/metadata-core": "2.5.20-beta.7",
-    "@steedos/migrate": "2.5.20-beta.7",
-    "@steedos/objectql": "2.5.20-beta.7",
-    "@steedos/odata-v4-mongodb": "2.5.20-beta.7",
-    "@steedos/process": "2.5.20-beta.7",
-    "@steedos/standard-objects": "2.5.20-beta.7",
+    "@steedos/auth": "2.5.20-beta.8",
+    "@steedos/filters": "2.5.20-beta.8",
+    "@steedos/i18n": "2.5.20-beta.8",
+    "@steedos/metadata-core": "2.5.20-beta.8",
+    "@steedos/migrate": "2.5.20-beta.8",
+    "@steedos/objectql": "2.5.20-beta.8",
+    "@steedos/odata-v4-mongodb": "2.5.20-beta.8",
+    "@steedos/process": "2.5.20-beta.8",
+    "@steedos/standard-objects": "2.5.20-beta.8",
     "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.20-beta.7",
+    "@steedos/meteor-bundle-runner": "2.5.20-beta.8",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
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.20-beta.7",
+  "version": "2.5.20-beta.8",
   "keywords": [
     "react",
     "steedos"
@@ -49,5 +49,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
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.20-beta.7",
+  "version": "2.5.20-beta.8",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
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.20-beta.7",
+  "version": "2.5.20-beta.8",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.5.20-beta.7",
-    "@steedos/metadata-api": "2.5.20-beta.7",
-    "@steedos/metadata-core": "2.5.20-beta.7",
-    "@steedos/objectql": "2.5.20-beta.7",
+    "@steedos/core": "2.5.20-beta.8",
+    "@steedos/metadata-api": "2.5.20-beta.8",
+    "@steedos/metadata-core": "2.5.20-beta.8",
+    "@steedos/objectql": "2.5.20-beta.8",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/formula/package.json b/packages/formula/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/formula",
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "Salesforce Formula Parser",
   "main": "lib/formulon.js",
   "files": [
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/i18n",
   "private": false,
-  "version": "2.5.20-beta.7",
+  "version": "2.5.20-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/cachers": "2.5.20-beta.7",
+    "@steedos/cachers": "2.5.20-beta.8",
     "i18next": "^19.3.4",
     "i18next-sprintf-postprocessor": "^0.2.2",
     "underscore": "1.13.4"
@@ -22,5 +22,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e672cf2b968c914e4c49c8bfd53cbf3437fa74e5"
+  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
 }