@steedos/service-metadata-objects 2.2.55-beta.9 → 2.3.0-beta.11

package/lib/summary/type.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SteedosSummaryTypeBlankValue = exports.SupportedSummaryFieldTypes = exports.SteedosSummaryDataTypeValue = exports.SteedosSummaryTypeValue = void 0;
-/**
- * 累计汇总字段支持的计算类型
- */
 var SteedosSummaryTypeValue;
 (function (SteedosSummaryTypeValue) {
     SteedosSummaryTypeValue["COUNT"] = "count";
@@ -11,10 +8,6 @@ var SteedosSummaryTypeValue;
     SteedosSummaryTypeValue["MIN"] = "min";
     SteedosSummaryTypeValue["MAX"] = "max";
 })(SteedosSummaryTypeValue = exports.SteedosSummaryTypeValue || (exports.SteedosSummaryTypeValue = {}));
-/**
- * 累计汇总字段支持的字段类型（特指数据库中最终保存的结果类型）
- * 注意这时也是支持公式类型字段的，不过最终使用的是公式字段本身的数据类型
- */
 var SteedosSummaryDataTypeValue;
 (function (SteedosSummaryDataTypeValue) {
     SteedosSummaryDataTypeValue["Number"] = "number";
@@ -23,18 +16,12 @@ var SteedosSummaryDataTypeValue;
     SteedosSummaryDataTypeValue["Date"] = "date";
     SteedosSummaryDataTypeValue["Datetime"] = "datetime";
 })(SteedosSummaryDataTypeValue = exports.SteedosSummaryDataTypeValue || (exports.SteedosSummaryDataTypeValue = {}));
-/**
- * 各个累计汇总计算类型支持的字段类型，用于判断SteedosFieldSummaryTypeConfig中配置的summary_field所指向的字段类型是否符合规范
- */
 exports.SupportedSummaryFieldTypes = {
     "sum": [SteedosSummaryDataTypeValue.Number, SteedosSummaryDataTypeValue.Currency, SteedosSummaryDataTypeValue.Percent],
     "avg": [SteedosSummaryDataTypeValue.Number, SteedosSummaryDataTypeValue.Currency, SteedosSummaryDataTypeValue.Percent],
     "min": [SteedosSummaryDataTypeValue.Number, SteedosSummaryDataTypeValue.Currency, SteedosSummaryDataTypeValue.Percent, SteedosSummaryDataTypeValue.Date, SteedosSummaryDataTypeValue.Datetime],
     "max": [SteedosSummaryDataTypeValue.Number, SteedosSummaryDataTypeValue.Currency, SteedosSummaryDataTypeValue.Percent, SteedosSummaryDataTypeValue.Date, SteedosSummaryDataTypeValue.Datetime]
 };
-/**
- * 各个累计汇总计算类型的空值处理方式
- */
 exports.SteedosSummaryTypeBlankValue = {
     "count": 0,
     "sum": 0,

package/lib/summary/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/summary/type.ts"],"names":[],"mappings":";;;AA0BA;;GAEG;AACH,IAAY,uBAKX;AALD,WAAY,uBAAuB;IAC/B,0CAAe,CAAA;IACf,sCAAW,CAAA;IACX,sCAAW,CAAA;IACX,sCAAW,CAAA;AACf,CAAC,EALW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAKlC;AAED;;;GAGG;AACH,IAAY,2BAMX;AAND,WAAY,2BAA2B;IACnC,gDAAiB,CAAA;IACjB,oDAAqB,CAAA;IACrB,kDAAmB,CAAA;IACnB,4CAAa,CAAA;IACb,oDAAqB,CAAA;AACzB,CAAC,EANW,2BAA2B,GAA3B,mCAA2B,KAA3B,mCAA2B,QAMtC;AAED;;GAEG;AACU,QAAA,0BAA0B,GAAG;IACtC,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,CAAC;IACtH,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,CAAC;IACtH,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,EAAE,2BAA2B,CAAC,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC;IAC9L,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,EAAE,2BAA2B,CAAC,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC;CACjM,CAAC;AAEF;;GAEG;AACU,QAAA,4BAA4B,GAAG;IACxC,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;CACd,CAAC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/summary/type.ts"],"names":[],"mappings":";;;AA6BA,IAAY,uBAKX;AALD,WAAY,uBAAuB;IAC/B,0CAAe,CAAA;IACf,sCAAW,CAAA;IACX,sCAAW,CAAA;IACX,sCAAW,CAAA;AACf,CAAC,EALW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAKlC;AAMD,IAAY,2BAMX;AAND,WAAY,2BAA2B;IACnC,gDAAiB,CAAA;IACjB,oDAAqB,CAAA;IACrB,kDAAmB,CAAA;IACnB,4CAAa,CAAA;IACb,oDAAqB,CAAA;AACzB,CAAC,EANW,2BAA2B,GAA3B,mCAA2B,KAA3B,mCAA2B,QAMtC;AAKY,QAAA,0BAA0B,GAAG;IACtC,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,CAAC;IACtH,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,CAAC;IACtH,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,EAAE,2BAA2B,CAAC,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC;IAC9L,KAAK,EAAE,CAAC,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,CAAC,QAAQ,EAAE,2BAA2B,CAAC,OAAO,EAAE,2BAA2B,CAAC,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC;CACjM,CAAC;AAKW,QAAA,4BAA4B,GAAG;IACxC,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;CACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-metadata-objects",
-  "version": "2.2.55-beta.9",
+  "version": "2.3.0-beta.11",
   "description": "",
   "main": "lib/objects.service.js",
   "scripts": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "dependencies": {
     "@salesforce/ts-types": "^1.1.1",
-    "@steedos/formula": "2.2.55-beta.9",
-    "@steedos/i18n": "2.2.55-beta.9",
-    "@steedos/metadata-registrar": "2.2.55-beta.9",
+    "@steedos/formula": "2.3.0-beta.11",
+    "@steedos/i18n": "2.3.0-beta.11",
+    "@steedos/metadata-registrar": "2.3.0-beta.11",
     "dotenv-flow": "^3.1.0",
     "ioredis": "^4.22.0",
     "lodash": "^4.17.21",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0253cd417ecd852b5b5ba473ae357141cb71f590"
+  "gitHead": "bca3b97bce7221bce55cd941bd074cf512fec7cd"
 }

package/src/formula/formulaActionHandler.ts

@@ -1,4 +1,4 @@
-import { SteedosFieldFormulaTypeConfig, SteedosFieldFormulaQuoteTypeConfig, SteedosFormulaVarTypeConfig, SteedosFormulaVarPathTypeConfig, FormulaUserKey, SteedosFormulaBlankValue } from './type';
+import { SteedosFieldFormulaTypeConfig, SteedosFieldFormulaQuoteTypeConfig, SteedosFormulaVarTypeConfig, SteedosFormulaVarPathTypeConfig, FormulaUserKey, FormulaUserSessionKey, SteedosFormulaBlankValue } from './type';
 import { pickFormulaVars } from './core';
 // import { isCodeObject } from '../util'; TODO
 import { Register } from '@steedos/metadata-registrar';
@@ -67,29 +67,36 @@ export class FormulaActionHandler{
      */
     async computeFormulaVarAndQuotes(formulaVar: string, objectConfig: any,  quotes: Array<SteedosFieldFormulaQuoteTypeConfig>, vars: Array<SteedosFormulaVarTypeConfig>){
         let isSimpleVar = objectConfig === null;//明确传入null时表示要计算的是普通变量。
-        // 公式变量以FormulaUserSessionKey（即$user）值开头，说明是userSession变量
+        // 公式变量以FormulaUserSessionKey（即$user）值开头，说明是user变量
         let isUserVar = new RegExp(`^${FormulaUserKey.replace("$","\\$")}\\b`).test(formulaVar);
+        let isUserSessionVar = new RegExp(`^${FormulaUserSessionKey.replace("$","\\$")}\\b`).test(formulaVar);
         let varItems = formulaVar.split(".");
         let paths: Array<SteedosFormulaVarPathTypeConfig> = [];
         let formulaVarItem: SteedosFormulaVarTypeConfig = {
             key: formulaVar,
             paths: paths
         };
-        if (isUserVar) {
+        if (isUserVar || isUserSessionVar) {
             // user var不可以按普通变量处理，因为其变量值依赖paths属性
             isSimpleVar = false;
             objectConfig = "space_users";
         }
         if(isSimpleVar){
             // 只要不是user var则标记为普通变量，后续取参数值时直接通过key取值，而不用走变量上的paths属性。
-            // 普通变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
-            // 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以下面所有逻辑
+            // 普通变量直接跳过后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
+            // 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以走的是后面的逻辑
             formulaVarItem.is_simple_var = true;
             vars.push(formulaVarItem);
             return;
         }
+        if(isUserSessionVar){
+            // $userSession变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
+            formulaVarItem.is_user_session_var = true;
+            vars.push(formulaVarItem);
+            return;
+        }
         if (isUserVar) {
-            // 如果是userSession变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
+            // 如果是user变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
             formulaVarItem.is_user_var = true;
             // vars.push(formulaVarItem);
             // return;
@@ -253,9 +260,9 @@ export class FormulaActionHandler{
             // console.log('key', key);
             // const field = config.fields[key]
             if (field.type === "formula") {
-                if(datasource !== "meteor" && datasource !== "default"){
-                    throw new Error(`The type of the field '${field.name}' on the object '${config.name}' can't be 'formula', because it is not in the default datasource.`);
-                }
+                // if(datasource !== "meteor" && datasource !== "default"){
+                //     throw new Error(`The type of the field '${field.name}' on the object '${config.name}' can't be 'formula', because it is not in the default datasource.`);
+                // }
                 try {
                     // 这里一定要加try catch，否则某个字段报错后，后续其他字段及其他对象就再也没有正常加载了
                     const fieldFormulaConfig = await this.getObjectFieldFormulaConfig(clone(field), config)

package/src/formula/type.ts

@@ -1,5 +1,6 @@
-// 公式内容中表示userSession变量的占位符
+// 公式内容中表示user变量的占位符
 export const FormulaUserKey = "$user";
+export const FormulaUserSessionKey = "$userSession";
 
 /**
  * 记录公式字段中引用的本对象或其他对象上的字段
@@ -65,6 +66,7 @@ export type SteedosFormulaVarTypeConfig = {
     key: string,
     paths: Array<SteedosFormulaVarPathTypeConfig>,
     is_user_var?: boolean,
+    is_user_session_var?: boolean,
     is_simple_var?: boolean //当不传入objectApiName时变量上设置该属性表示一个普通的变量
 }
 

package/src/master-detail/masterDetailActionHandler.ts

@@ -130,16 +130,18 @@ export class MasterDetailActionHandler{
     }
 
     async checkMasterDetails(objectApiName: string) {
-        const mastersCount = (await this.getMasters(objectApiName)).length;
-        const detailsCount = (await this.getDetails(objectApiName)).length;
-        if (mastersCount > 2) {
-            throw new Error(`There are ${mastersCount} fields of type master_detail on the object '${objectApiName}', but only 2 fields are allowed at most.`);
-        }
-        else if (mastersCount > 1) {
-            if (detailsCount > 0) {
-                throw new Error(`There are ${mastersCount} fields of type master_detail on the object "${objectApiName}", but only 1 field are allowed at most, because this object is the master object of another object on a master-detail relationship.`);
-            }
-        }
+        // 取消主表子表字段数量限制 #3697
+
+        // const mastersCount = (await this.getMasters(objectApiName)).length;
+        // const detailsCount = (await this.getDetails(objectApiName)).length;
+        // if (mastersCount > 2) {
+        //     throw new Error(`There are ${mastersCount} fields of type master_detail on the object '${objectApiName}', but only 2 fields are allowed at most.`);
+        // }
+        // else if (mastersCount > 1) {
+        //     if (detailsCount > 0) {
+        //         throw new Error(`There are ${mastersCount} fields of type master_detail on the object "${objectApiName}", but only 1 field are allowed at most, because this object is the master object of another object on a master-detail relationship.`);
+        //     }
+        // }
 
         const detailPaths = await this.getDetailPaths(objectApiName);
 

package/src/objects/fields/index.ts

@@ -24,8 +24,8 @@ export function getDBType(objectName, field) {
         case "html":
             return SteedosFieldDBType.text;
         case "select":
-            if (this.multiple) {
-                return SteedosFieldDBType.array;
+            if (field.multiple) {
+                return SteedosFieldDBType.varchar;
             } else {
                 return SteedosFieldDBType.varchar;
             }
@@ -35,16 +35,17 @@ export function getDBType(objectName, field) {
             return SteedosFieldDBType.boolean;
         case "date":
             return SteedosFieldDBType.date;
+        //时间字段按日期时间类型处理
+        case "time":
         case "datetime":
             return SteedosFieldDBType.dateTime;
-        case "time":
-            //时间字段按日期时间类型处理
-            return this.getDBType("datetime");
+        //百分比字段按数值类型处理
+        case "percent":
         case "number":
             return SteedosFieldDBType.number;
         case "currency":
-            if (!this.scale && this.scale != 0) {
-                this.scale = 2;
+            if (!field.scale && field.scale != 0) {
+                field.scale = 2;
             }
             return SteedosFieldDBType.number;
         case "password":
@@ -132,13 +133,10 @@ export function getDBType(objectName, field) {
         case "markdown":
             return SteedosFieldDBType.varchar;
         case "formula":
-            return this.getDBType(this.data_type);
+            return getDBType(objectName, { ...field, type: field.data_type });
         case "summary":
             //汇总不需要check类型
             return SteedosFieldDBType.varchar;
-        case "percent":
-            //百分比字段按数值类型处理
-            return this.getDBType("number");
         default:
             console.log(`field`, field);
             throw new Error(

package/tsconfig.json

@@ -26,6 +26,7 @@
           "es2017",
           "esnext"
         ],
+        "removeComments": true
     },
     "include": [
       "./src/**/*"