lu-lowcode-package-form 0.11.95 → 0.11.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.11.95",
+  "version": "0.11.96",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@dnd-kit/core": "^6.1.0",

package/src/components/form-container/index.jsx

@@ -552,7 +552,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         if (dependencyMap.current.has(childIdentifier)) {
             const childData = dependencyMap.current.get(childIdentifier);
             if (formula && formula.length > 0) {
-                const formulaResult = (evalFormula(formula) == "true");
+                const __current = fieldValues[childIdentifier]
+                const formulaResult = (evalFormula(formula, __current) == "true");
                 // console.log(`${childIdentifier} 计算公式:`, formula)
                 // console.log(`${childIdentifier} 计算结果:`, formulaResult)
                 // console.log(`${childIdentifier} childData.show:`, childData.show)
@@ -689,7 +690,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             }
 
             if (formula && formula.length > 0) {
-                const formulaResult = evalFormula(formula);
+                const __current = fieldValues[childIdentifier]
+                const formulaResult = evalFormula(formula, __current);
                 console.log(`${childIdentifier} 计算公式:`, formula)
                 console.log(`${childIdentifier} 计算结果:`, formulaResult)
 

package/src/utils/formula.js

@@ -3,21 +3,22 @@ import Decimal from 'decimal.js';
 
 // 不安全的Function函数，有时间的话需要重新编写公式编译器
 // 可以使用库 expr-eval 来替换（undo)
-const evalFormula = memoizee((formula) => {
+const evalFormula = memoizee((formula, current) => {
     let result = "";
     let funcCode = "";
     try {
         // 注入 Decimal 库并包装计算逻辑
         funcCode = `
-               const D = Decimal;
+               const D = opts.Decimal;
+               const __current = opts.__current;
                const decimal = (num) => new D(num);
                return (function() {
                    const __result = ${formula.join("")};
                    return __result;
                })()
            `;
-        const func = new Function('Decimal', funcCode);
-        result = func(Decimal);
+        const func = new Function('opts', funcCode);
+        result = func({Decimal,__current:current});
         // result = eval(formula.join(""));
         if (!(typeof result === "object" && result !== null))
             result = result.toString();