@steedos/service-metadata-objects 2.7.8-beta.2 → 2.7.8-beta.21

package/LICENSE.txt

@@ -1,22 +1,21 @@
-Steedos Licensing
+# Open Source License
 
-SOFTWARE LICENSING
+Steedos is licensed under a modified version of the Apache License 2.0, with the following additional conditions:
 
-To determine under which license you may use a file from the Steedos source code,
-please resort to the header of that file.
+1. Steedos may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer:
 
-If the file has no header, the following rules apply
-1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
+a. Multi-tenant service: Unless explicitly authorized by Steedos in writing, you may not use the Steedos source code to operate a multi-tenant environment.
+    - Tenant Definition: Within the context of Steedos, one tenant corresponds to one space. The space provides a separated area for each tenant's data and configurations.
 
-On request, licenses under different terms are available.
+b. LOGO and copyright information: In the process of using Steedos's frontend, you may not remove or modify the LOGO or copyright information in the Steedos console or applications. This restriction is inapplicable to uses of Steedos that do not involve its frontend.
 
-Source code of enterprise features are files that
-* are in folders named "ee" or start with "ee_", or in subfolders of such folders.
-* contain the strings "ee_" in its filename name.
-The files can be found by running the command `find . -iname ee -or -iname "*_ee*" -or -iname "*ee_*"`
+2. As a contributor, you should agree that:
 
-STEEDOS TRADEMARK GUIDELINES
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.
 
-Your use of the mark Steedos is subject to Steedos, Inc's prior written approval. For trademark approval or any questions
-you have about using these trademarks, please email zhuangjianguo@steedos.com
+Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
+
+The interactive design of this product is protected by appearance patent.
+
+© 2025 Steedos, Inc.

package/lib/formula/core.js

@@ -5,7 +5,32 @@ const tslib_1 = require("tslib");
 const formula_1 = require("@steedos/formula");
 const field_formula_1 = require("./field_formula");
 const util_1 = require("./util");
+const amis_formula_1 = require("amis-formula");
+const isAmisFormula = (formula) => {
+    return /\$\{.+\}/.test(formula);
+};
+function extractAmisFormulaVariableNames(node) {
+    let result = [];
+    function traverse(node) {
+        if (!node)
+            return;
+        if (node.type === 'variable') {
+            result.push(node.name);
+        }
+        for (const key in node) {
+            if (typeof node[key] === 'object' && node[key] !== null) {
+                traverse(node[key]);
+            }
+        }
+    }
+    traverse(node);
+    return result;
+}
 const pickFormulaVars = (formula) => {
+    if (isAmisFormula(formula)) {
+        const result = extractAmisFormulaVariableNames((0, amis_formula_1.parse)(formula));
+        return result;
+    }
     return (0, formula_1.extract)(formula);
 };
 exports.pickFormulaVars = pickFormulaVars;

package/lib/formula/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":";;;;AACA,8CAA2C;AAC3C,mDAA+D;AAC/D,iCAAoE;AAM7D,MAAM,eAAe,GAAG,CAAC,OAAe,EAAiB,EAAE;IAC9D,OAAO,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAUM,MAAM,oCAAoC,GAAG,CAAO,iBAAyB,EAAE,gBAAwB,EAAE,UAAkB,EAAE,UAA0B,EAAoB,EAAE;IAChL,MAAM,OAAO,GAAyC,MAAM,IAAA,4CAA4B,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IAC9H,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;QAC3B,OAAO,IAAA,iDAA0C,EAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACzF;SACI;QAED,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAA,CAAA;AATY,QAAA,oCAAoC,wCAShD"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":";;;;AAAA,8CAA2C;AAC3C,mDAA+D;AAC/D,iCAAoE;AAEpE,+CAAoC;AAEpC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;IAEtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC,CAAA;AAmBD,SAAS,+BAA+B,CAAC,IAAI;IACzC,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,SAAS,QAAQ,CAAC,IAAI;QAClB,IAAI,CAAC,IAAI;YAAE,OAAO;QAGlB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QAGD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACvB;SACJ;IACL,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC;IACf,OAAO,MAAM,CAAC;AAClB,CAAC;AAMM,MAAM,eAAe,GAAG,CAAC,OAAe,EAAiB,EAAE;IAC9D,IAAG,aAAa,CAAC,OAAO,CAAC,EAAC;QACtB,MAAM,MAAM,GAAG,+BAA+B,CAAC,IAAA,oBAAK,EAAC,OAAO,CAAC,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,eAAe,mBAM3B;AAUM,MAAM,oCAAoC,GAAG,CAAO,iBAAyB,EAAE,gBAAwB,EAAE,UAAkB,EAAE,UAA0B,EAAoB,EAAE;IAChL,MAAM,OAAO,GAAyC,MAAM,IAAA,4CAA4B,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IAC9H,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;QAC3B,OAAO,IAAA,iDAA0C,EAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACzF;SACI;QAED,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAA,CAAA;AATY,QAAA,oCAAoC,wCAShD"}

package/lib/formula/formulaActionHandler.js

@@ -143,9 +143,6 @@ class FormulaActionHandler {
                         if (tempFieldConfig.multiple) {
                             throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a multiple ${tempFieldConfig.type} type, it is not supported yet.`);
                         }
-                        if (i === varItems.length - 1) {
-                            throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a ${tempFieldConfig.type} type, so you must add more property after it.`);
-                        }
                         if (tempFieldConfig.reference_to_field && paths.length) {
                             paths[paths.length - 1].reference_to_field = tempFieldConfig.reference_to_field;
                         }

package/lib/formula/formulaActionHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-metadata-objects",
-  "version": "2.7.8-beta.2",
+  "version": "2.7.8-beta.21",
   "description": "",
   "main": "lib/objects.service.js",
   "scripts": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "dependencies": {
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/formula": "2.7.8-beta.2",
-    "@steedos/i18n": "2.7.8-beta.2",
-    "@steedos/metadata-registrar": "2.7.8-beta.2",
+    "@steedos/formula": "2.7.8-beta.21",
+    "@steedos/i18n": "2.7.8-beta.21",
+    "@steedos/metadata-registrar": "2.7.8-beta.21",
     "dotenv-flow": "^3.1.0",
     "ioredis": "^4.22.0",
     "lodash": "^4.17.21",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d915768c87aaa7bc026623a4953d6f39c5ddace1"
+  "gitHead": "bde64f8e1f880f54583600a8bb0a6018f36061b7"
 }

package/src/formula/core.ts

@@ -1,13 +1,63 @@
-
 import { extract } from '@steedos/formula';
 import { getObjectFieldFormulaConfigs } from './field_formula';
 import { isFieldFormulaConfigQuotingObjectAndFields } from './util';
 import { SteedosFieldFormulaTypeConfig } from './type';
+import { parse } from "amis-formula"
+
+const isAmisFormula = (formula: string) => {
+    // 有${}包裹的表达式就识别为amis公式
+    return /\$\{.+\}/.test(formula);
+}
+
+// const extractAmisFormulaVariableNames = (node, result = []) => {
+//     // 检查当前节点是否有 "type" 属性，并且这个类型是 "variable"
+//     if (node.type === 'variable') {
+//         result.push(node.name);
+//     }
+
+//     // 如果当前节点是对象，递归检查所有子节点
+//     for (const key in node) {
+//         if (typeof node[key] === 'object' && node[key] !== null) {
+//             extractAmisFormulaVariableNames(node[key], result);
+//         }
+//     }
+
+//     return result;
+// }
+
+
+function extractAmisFormulaVariableNames(node) {
+    let result = [];
+
+    function traverse(node) {
+        if (!node) return;
+
+        // 如果是变量节点，收集它的name
+        if (node.type === 'variable') {
+            result.push(node.name);
+        }
+
+        // 递归遍历所有子节点
+        for (const key in node) {
+            if (typeof node[key] === 'object' && node[key] !== null) {
+                traverse(node[key]);
+            }
+        }
+    }
+    
+    traverse(node);
+    return result;
+}
+
 /**
  * 根据公式内容，取出其中{}中的变量
  * @param formula 
  */
 export const pickFormulaVars = (formula: string): Array<string> => {
+    if(isAmisFormula(formula)){
+        const result = extractAmisFormulaVariableNames(parse(formula));
+        return result;
+    }
     return extract(formula);
 }
 

package/src/formula/formulaActionHandler.ts

@@ -175,10 +175,10 @@ export class FormulaActionHandler{
                     // TODO:暂时不支持数组的解析，见：公式字段中要实现lookup关联到数组字段的情况 #783
                     throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a multiple ${tempFieldConfig.type} type, it is not supported yet.`);
                 }
-                if (i === varItems.length - 1) {
-                    // 引用类型字段后面必须继续引用该字段的相关属性，否则直接报错
-                    throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a ${tempFieldConfig.type} type, so you must add more property after it.`);
-                }
+                // if (i === varItems.length - 1) {
+                //     // 引用类型字段后面必须继续引用该字段的相关属性，否则直接报错
+                //     throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a ${tempFieldConfig.type} type, so you must add more property after it.`);
+                // }
                 if(tempFieldConfig.reference_to_field && paths.length){
                     paths[paths.length - 1].reference_to_field = tempFieldConfig.reference_to_field;
                 }