@byteluck-fe/model-driven-engine 2.5.0-alpha.9 → 2.5.0-beta.1

package/dist/esm/plugins/CalcPlugin.js

@@ -11,33 +11,6 @@ function _classCallCheck(instance, Constructor) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -70,413 +43,360 @@ export var CalcPlugin = /*#__PURE__*/ function() {
     "use strict";
     function CalcPlugin(options) {
         _classCallCheck(this, CalcPlugin);
-        _defineProperty(this, "engine", void 0);
-        _defineProperty(this, "options", void 0);
         /**
    * 所有的计算公式控件
    * */ // @ts-ignore
-        _defineProperty(this, "calcControls", []);
+        this.calcControls = [];
         /**
    * key=控件id  value=控件修改后需要触发重新计算的计算公式控件组成的数组
    * 存储为一个Map，用于在控件change的时候，重新计算依赖的calc
-   * */ _defineProperty(this, "dependenciesTriggerMap", new Map());
+   * */ this.dependenciesTriggerMap = new Map();
         /**
    * 隐藏以后需要被计算的控件
-   * */ _defineProperty(this, "hideNotRememberControlIds", []);
-        _defineProperty(this, "dontHasPermissionControlIds", []);
-        _defineProperty(this, "cacheComputedResult", {});
+   * */ this.hideNotRememberControlIds = [];
+        this.dontHasPermissionControlIds = [];
+        this.cacheComputedResult = {};
         this.options = options;
         this.getDontHasPermissionControlIds();
         this.getNeedHideRememberControlIds();
     }
-    _createClass(CalcPlugin, [
-        {
-            key: "getNeedHideRememberControlIds",
-            value: /**
+    var _proto = CalcPlugin.prototype;
+    /**
    * @description 获取显隐控制的需要被记住值的控件id
-   * */ function getNeedHideRememberControlIds() {
-                var _this_options;
-                if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.displayBoList)) {
-                    return;
-                }
-                this.hideNotRememberControlIds = this.options.displayBoList.reduce(function(result, current) {
-                    if (!current.is_remember) {
-                        var _result;
-                        (_result = result).push.apply(_result, _toConsumableArray(current.hide_controls));
-                    }
-                    return result;
-                }, []);
+   * */ _proto.getNeedHideRememberControlIds = function getNeedHideRememberControlIds() {
+        var _this_options;
+        if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.displayBoList)) {
+            return;
+        }
+        this.hideNotRememberControlIds = this.options.displayBoList.reduce(function(result, current) {
+            if (!current.is_remember) {
+                var _result;
+                (_result = result).push.apply(_result, _toConsumableArray(current.hide_controls));
             }
-        },
-        {
-            key: "getDontHasPermissionControlIds",
-            value: /**
+            return result;
+        }, []);
+    };
+    /**
    * @description 获取权限控制的隐藏的字段，不需要参与计算
-   * */ function getDontHasPermissionControlIds() {
-                var _this_options;
-                if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.behavior)) {
-                    return;
-                }
-                this.dontHasPermissionControlIds = this.options.behavior.reduce(function(result, current) {
-                    if (current.ctrlBehavior === 1) {
-                        result.push(current.ctrlId);
-                    }
-                    return result;
-                }, []);
+   * */ _proto.getDontHasPermissionControlIds = function getDontHasPermissionControlIds() {
+        var _this_options;
+        if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.behavior)) {
+            return;
+        }
+        this.dontHasPermissionControlIds = this.options.behavior.reduce(function(result, current) {
+            if (current.ctrlBehavior === 1) {
+                result.push(current.ctrlId);
             }
-        },
-        {
-            key: "controlNeedComputedValue",
-            value: /**
+            return result;
+        }, []);
+    };
+    /**
    * @description 判断控件是否需要被计算
    * @param control 控件
-   * */ function controlNeedComputedValue(control) {
-                if (!control) {
-                    return false;
-                }
-                var isHide = this.getControlIsHide(control);
-                // 权限控制的控件隐藏，并且控件已经隐藏了(不需要知道是否记住值，统一不计算，这个逻辑前置是因为可能存在显隐控制的，需要记住值，但是被权限控制隐藏的字段，这种情况下权限控制权重最高)
-                if (this.dontHasPermissionControlIds.includes(control.id) && isHide) {
-                    return false;
-                }
-                // 被显隐控制的且不需要记住值，并且控件已经隐藏了(控件已经隐藏以后，因为不需要记住值，所以一律不计算)
-                if (this.hideNotRememberControlIds.includes(control.id) && isHide) {
-                    return false;
-                }
-                // 其余都计算
-                return true;
-            }
-        },
-        {
-            key: "getControlIsHide",
-            value: /**
+   * */ _proto.controlNeedComputedValue = function controlNeedComputedValue(control) {
+        if (!control) {
+            return false;
+        }
+        var isHide = this.getControlIsHide(control);
+        // 权限控制的控件隐藏，并且控件已经隐藏了(不需要知道是否记住值，统一不计算，这个逻辑前置是因为可能存在显隐控制的，需要记住值，但是被权限控制隐藏的字段，这种情况下权限控制权重最高)
+        if (this.dontHasPermissionControlIds.includes(control.id) && isHide) {
+            return false;
+        }
+        // 被显隐控制的且不需要记住值，并且控件已经隐藏了(控件已经隐藏以后，因为不需要记住值，所以一律不计算)
+        if (this.hideNotRememberControlIds.includes(control.id) && isHide) {
+            return false;
+        }
+        // 其余都计算
+        return true;
+    };
+    /**
    * @description 获取控件是否被隐藏
    * @param control 控件
-   * */ function getControlIsHide(control) {
-                if (control.props.isHide) {
-                    return true;
-                }
-                if (control.parent === null) {
-                    return false;
-                }
-                return this.getControlIsHide(control.parent);
-            }
-        },
-        {
-            key: "apply",
-            value: function apply(engine) {
-                var _this = this;
-                this.engine = engine;
-                this.resetDependencies();
-                this.watchControlChange();
-                this.watchSubtableChange();
-                this.watchSchemaHideChange();
-                this.engine.on("engine-mounted", function() {
-                    _this.allCalcControlComputed();
-                });
-            }
-        },
-        {
-            key: "resetDependencies",
-            value: /**
+   * */ _proto.getControlIsHide = function getControlIsHide(control) {
+        if (control.props.isHide) {
+            return true;
+        }
+        if (control.parent === null) {
+            return false;
+        }
+        return this.getControlIsHide(control.parent);
+    };
+    _proto.apply = function apply(engine) {
+        var _this = this;
+        this.engine = engine;
+        this.resetDependencies();
+        this.watchControlChange();
+        this.watchSubtableChange();
+        this.watchSchemaHideChange();
+        this.engine.on("engine-mounted", function() {
+            _this.allCalcControlComputed();
+        });
+    };
+    /**
    * @description 重置依赖，获取所有的计算公式控件，并根据计算公式获取控件依赖关系
-   * */ function resetDependencies() {
-                this.calcControls = [];
-                this.dependenciesTriggerMap.clear();
-                this.getAllCalcControl();
-                this.getCalcDependencies();
-            }
-        },
-        {
-            key: "allCalcControlComputed",
-            value: /**
+   * */ _proto.resetDependencies = function resetDependencies() {
+        this.calcControls = [];
+        this.dependenciesTriggerMap.clear();
+        this.getAllCalcControl();
+        this.getCalcDependencies();
+    };
+    /**
    * @description 执行所有计算公式控件的计算
-   * */ function allCalcControlComputed() {
-                var _this = this;
-                this.calcControls.forEach(function(item) {
-                    return _this.computedCalcValue(item);
-                });
-            }
-        },
-        {
-            key: "getAllCalcControl",
-            value: /**
+   * */ _proto.allCalcControlComputed = function allCalcControlComputed() {
+        var _this = this;
+        this.calcControls.forEach(function(item) {
+            return _this.computedCalcValue(item);
+        });
+    };
+    /**
    * @description 获取所有的计算公式控件
-   * */ function getAllCalcControl() {
-                this.calcControls = this.engine.runtime.flatInstances.filter(// @ts-ignore
-                function(item) {
-                    return item.type === CONTROL_TYPE.CALC;
-                });
-            }
-        },
-        {
-            key: "getCalcDependencies",
-            value: /**
+   * */ _proto.getAllCalcControl = function getAllCalcControl() {
+        this.calcControls = this.engine.runtime.flatInstances.filter(// @ts-ignore
+        function(item) {
+            return item.type === CONTROL_TYPE.CALC;
+        });
+    };
+    /**
    * @description 获取计算公式控件依赖，组成 依赖=>[计算公式] 的Map结构
-   * */ function getCalcDependencies() {
-                var _this = this;
-                this.calcControls.forEach(function(item) {
-                    var scriptEcho = item.props.scriptEcho;
-                    scriptEcho.forEach(function(scriptItem) {
-                        if (scriptItem.type === CALC_TOKEN_TYPE.VariableInMainTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInCurrentSubTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable) {
-                            // 当前是一个变量，存储依赖于当前变量的计算公式
-                            _this.setDependenciesTriggerMapItem(scriptItem.id, item);
-                        }
-                        // 依赖明细子表的计算公式控件，不收集自己表内的，而是主表或者其他明细子表的控件
-                        if (scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable && scriptItem.subTableId) {
-                            _this.setDependenciesTriggerMapItem(scriptItem.subTableId, item);
-                        }
-                    });
-                });
-            }
-        },
-        {
-            key: "setDependenciesTriggerMapItem",
-            value: function setDependenciesTriggerMapItem(id, // @ts-ignore
-            item) {
-                if (!this.dependenciesTriggerMap.has(id)) {
-                    this.dependenciesTriggerMap.set(id, []);
+   * */ _proto.getCalcDependencies = function getCalcDependencies() {
+        var _this = this;
+        this.calcControls.forEach(function(item) {
+            var scriptEcho = item.props.scriptEcho;
+            scriptEcho.forEach(function(scriptItem) {
+                if (scriptItem.type === CALC_TOKEN_TYPE.VariableInMainTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInCurrentSubTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable) {
+                    // 当前是一个变量，存储依赖于当前变量的计算公式
+                    _this.setDependenciesTriggerMapItem(scriptItem.id, item);
                 }
-                var arr = this.dependenciesTriggerMap.get(id);
-                if (!arr.includes(item)) {
-                    arr.push(item);
+                // 依赖明细子表的计算公式控件，不收集自己表内的，而是主表或者其他明细子表的控件
+                if (scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable && scriptItem.subTableId) {
+                    _this.setDependenciesTriggerMapItem(scriptItem.subTableId, item);
                 }
-            }
-        },
-        {
-            key: "getCalcControlsFromSubtableRows",
-            value: function getCalcControlsFromSubtableRows(// @ts-ignore
-            subtableRows) {
-                var _this = this;
-                return subtableRows.reduce(function(result, current) {
-                    // @ts-ignore
-                    current.children.forEach(function(item) {
-                        var control = item.children[0];
-                        // @ts-ignore
-                        if (control && _this.engine.assertInstance(control, CONTROL_TYPE.CALC)) {
-                            result.push(control);
-                        }
-                    });
-                    return result;
+            });
+        });
+    };
+    _proto.setDependenciesTriggerMapItem = function setDependenciesTriggerMapItem(id, // @ts-ignore
+    item) {
+        if (!this.dependenciesTriggerMap.has(id)) {
+            this.dependenciesTriggerMap.set(id, []);
+        }
+        var arr = this.dependenciesTriggerMap.get(id);
+        if (!arr.includes(item)) {
+            arr.push(item);
+        }
+    };
+    _proto.getCalcControlsFromSubtableRows = function getCalcControlsFromSubtableRows(// @ts-ignore
+    subtableRows) {
+        var _this = this;
+        return subtableRows.reduce(function(result, current) {
+            // @ts-ignore
+            current.children.forEach(function(item) {
+                var control = item.children[0];
                 // @ts-ignore
-                }, []);
-            }
-        },
-        {
-            key: "watchSchemaHideChange",
-            value: /**
+                if (control && _this.engine.assertInstance(control, CONTROL_TYPE.CALC)) {
+                    result.push(control);
+                }
+            });
+            return result;
+        // @ts-ignore
+        }, []);
+    };
+    /**
    * @description 监听控件的显隐事件，把显隐会影响的控件触发一遍计算
-   * */ function watchSchemaHideChange() {
-                var _this = this;
-                this.engine.on("schema-change", function(payload) {
-                    if (payload.props === "isHide") {
-                        var _this_dependenciesTriggerMap_get;
-                        var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
-                        calcControls.forEach(function(calc) {
-                            _this.computedCalcValue(calc);
-                        });
-                    }
+   * */ _proto.watchSchemaHideChange = function watchSchemaHideChange() {
+        var _this = this;
+        this.engine.on("schema-change", function(payload) {
+            if (payload.props === "isHide") {
+                var _this_dependenciesTriggerMap_get;
+                var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
+                calcControls.forEach(function(calc) {
+                    _this.computedCalcValue(calc);
                 });
             }
-        },
-        {
-            key: "watchSubtableChange",
-            value: /**
+        });
+    };
+    /**
    * @description 监听明细子表的change事件，把明细表会影响的控件触发一遍计算
-   * */ function watchSubtableChange() {
-                var _this = this;
-                this.engine.on("list-change", function(payload) {
-                    var _payload_options;
-                    _this.resetDependencies();
-                    var _payload_options_changed;
-                    var changedRows = (_payload_options_changed = (_payload_options = payload.options) === null || _payload_options === void 0 ? void 0 : _payload_options.changed) !== null && _payload_options_changed !== void 0 ? _payload_options_changed : [];
-                    // 对发生改变的行进行重新计算
-                    var changedCalc = _this.getCalcControlsFromSubtableRows(changedRows);
-                    // @ts-ignore
-                    changedCalc.forEach(function(calcControl) {
-                        _this.computedCalcValue(calcControl);
-                    });
-                    var _this_dependenciesTriggerMap_get;
-                    var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
-                    // @ts-ignore
-                    calcControls.forEach(function(calcControl) {
-                        _this.computedCalcValue(calcControl);
-                    });
-                });
-            }
-        },
-        {
-            key: "watchControlChange",
-            value: /**
+   * */ _proto.watchSubtableChange = function watchSubtableChange() {
+        var _this = this;
+        this.engine.on("list-change", function(payload) {
+            var _payload_options;
+            _this.resetDependencies();
+            var _payload_options_changed;
+            var changedRows = (_payload_options_changed = (_payload_options = payload.options) === null || _payload_options === void 0 ? void 0 : _payload_options.changed) !== null && _payload_options_changed !== void 0 ? _payload_options_changed : [];
+            // 对发生改变的行进行重新计算
+            var changedCalc = _this.getCalcControlsFromSubtableRows(changedRows);
+            // @ts-ignore
+            changedCalc.forEach(function(calcControl) {
+                _this.computedCalcValue(calcControl);
+            });
+            var _this_dependenciesTriggerMap_get;
+            var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
+            // @ts-ignore
+            calcControls.forEach(function(calcControl) {
+                _this.computedCalcValue(calcControl);
+            });
+        });
+    };
+    /**
    * @description 监听控件的change事件，当控件change的时候，取到控件会影响的计算公式，然后执行对应的计算
-   * */ function watchControlChange() {
-                var _this = this;
-                this.engine.on("change", function(payload) {
-                    var instance = payload.instance;
-                    if (!_this.dependenciesTriggerMap.has(instance.id)) {
-                        return;
-                    }
-                    var _this_dependenciesTriggerMap_get;
-                    var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
-                    // 在明细子表中的控件，如果计算公式也在明细子表，那只触发同一行的计算公式的计算
-                    if (payload.rowIndex !== undefined && payload.rowIndex > -1) {
-                        // @ts-ignore
-                        calcControls.forEach(function(calcControl) {
-                            if (_this.controlInSubtable(calcControl)) {
-                                var calcIndex = _this.engine.getInstanceRowIndex(calcControl);
-                                if (calcIndex !== payload.rowIndex) {
-                                    return;
-                                }
-                            }
-                            _this.computedCalcValue(calcControl);
-                        });
-                    } else {
-                        // @ts-ignore
-                        calcControls.forEach(function(calcControl) {
-                            _this.computedCalcValue(calcControl);
-                        });
+   * */ _proto.watchControlChange = function watchControlChange() {
+        var _this = this;
+        this.engine.on("change", function(payload) {
+            var instance = payload.instance;
+            if (!_this.dependenciesTriggerMap.has(instance.id)) {
+                return;
+            }
+            var _this_dependenciesTriggerMap_get;
+            var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
+            // 在明细子表中的控件，如果计算公式也在明细子表，那只触发同一行的计算公式的计算
+            if (payload.rowIndex !== undefined && payload.rowIndex > -1) {
+                // @ts-ignore
+                calcControls.forEach(function(calcControl) {
+                    if (_this.controlInSubtable(calcControl)) {
+                        var calcIndex = _this.engine.getInstanceRowIndex(calcControl);
+                        if (calcIndex !== payload.rowIndex) {
+                            return;
+                        }
                     }
+                    _this.computedCalcValue(calcControl);
+                });
+            } else {
+                // @ts-ignore
+                calcControls.forEach(function(calcControl) {
+                    _this.computedCalcValue(calcControl);
                 });
             }
-        },
-        {
-            key: "controlInSubtable",
-            value: /**
+        });
+    };
+    /**
    * @description 控件在明细子表内
-   * */ function controlInSubtable(control) {
-                var _control_parent;
-                return ((_control_parent = control.parent) === null || _control_parent === void 0 ? void 0 : _control_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN;
-            }
-        },
-        {
-            key: "computedCalcValue",
-            value: /**
+   * */ _proto.controlInSubtable = function controlInSubtable(control) {
+        var _control_parent;
+        return ((_control_parent = control.parent) === null || _control_parent === void 0 ? void 0 : _control_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN;
+    };
+    /**
    * @description 执行计算公式的计算
    * */ // @ts-ignore
-            function computedCalcValue(control) {
-                var _this = this;
-                var scriptEcho = control.props.scriptEcho;
-                if (!scriptEcho || scriptEcho.length === 0) {
-                    return;
-                }
-                // @ts-ignore
-                var scriptText = scriptEcho.reduce(function(result, current) {
-                    if (current.type === CALC_TOKEN_TYPE.Operator || current.type === CALC_TOKEN_TYPE.Number) {
-                        return result + current.name;
-                    }
-                    var num = 0;
-                    var instance;
-                    switch(current.type){
-                        case CALC_TOKEN_TYPE.VariableInMainTable:
-                            {
-                                var value = _this.getNumberValue(_this.engine.getState(current.id));
-                                instance = _this.engine.getInstance(current.id);
-                                num = Number(value);
-                                break;
-                            }
-                        case CALC_TOKEN_TYPE.VariableInCurrentSubTable:
-                            {
-                                var rowIndex = _this.engine.getInstanceRowIndex(control);
-                                instance = _this.engine.getInstance(current.id, rowIndex);
-                                var state = _this.engine.getState(current.id, rowIndex);
-                                var value1 = _this.getNumberValue(state);
-                                num = Number(value1);
-                                break;
-                            }
-                        case CALC_TOKEN_TYPE.VariableInOtherSubTable:
-                            {
-                                var states = _this.engine.getState(current.id);
-                                var values = Array.isArray(states) ? states.map(function(item) {
-                                    return _this.getNumberValue(item);
-                                }) : [];
-                                var value2 = _this.getAggregateTypeValue(values, current.aggregateType);
-                                instance = _this.engine.getInstance(current.subTableId);
-                                num = Number(value2);
-                                break;
-                            }
+    _proto.computedCalcValue = function computedCalcValue(control) {
+        var _this = this;
+        var scriptEcho = control.props.scriptEcho;
+        if (!scriptEcho || scriptEcho.length === 0) {
+            return;
+        }
+        var rowIndex = undefined;
+        if (this.controlInSubtable(control)) {
+            rowIndex = this.engine.getInstanceRowIndex(control);
+        }
+        // @ts-ignore
+        var scriptText = scriptEcho.reduce(function(result, current) {
+            if (current.type === CALC_TOKEN_TYPE.Operator || current.type === CALC_TOKEN_TYPE.Number) {
+                return result + current.name;
+            }
+            var num = 0;
+            var instance;
+            switch(current.type){
+                case CALC_TOKEN_TYPE.VariableInMainTable:
+                    {
+                        var value = _this.getNumberValue(_this.engine.getState(current.id));
+                        instance = _this.engine.getInstance(current.id);
+                        num = Number(value);
+                        break;
                     }
-                    if (!Number.isNaN(num) && _this.controlNeedComputedValue(instance)) {
-                        // 在每一个数字外边包一个括号，将 --1 转为 -(-1) 确保 --1 这种情况不会出问题
-                        result += "(".concat(num, ")");
-                    } else {
-                        result += 0;
+                case CALC_TOKEN_TYPE.VariableInCurrentSubTable:
+                    {
+                        //const rowIndex = this.engine.getInstanceRowIndex(control)
+                        instance = _this.engine.getInstance(current.id, rowIndex);
+                        var state = _this.engine.getState(current.id, rowIndex);
+                        var value1 = _this.getNumberValue(state);
+                        num = Number(value1);
+                        break;
                     }
-                    return result;
-                }, "");
-                var value;
-                // 有缓存的话取缓存，没有缓存再执行eval
-                if (this.cacheComputedResult[scriptText] !== undefined) {
-                    value = this.cacheComputedResult[scriptText];
-                } else {
-                    // 解决js精准度问题
-                    value = Number(format(new Function("return ".concat(scriptText))(), {
-                        precision: 16
-                    }));
-                    this.cacheComputedResult[scriptText] = value;
-                }
-                var rowIndex = undefined;
-                if (this.controlInSubtable(control)) {
-                    rowIndex = this.engine.getInstanceRowIndex(control);
-                    // 控件在明细表内，但是没有行下标，说明控件被已经删除了，所以直接return
-                    if (rowIndex === undefined) {
-                        return;
+                case CALC_TOKEN_TYPE.VariableInOtherSubTable:
+                    {
+                        var states = _this.engine.getState(current.id);
+                        var values = Array.isArray(states) ? states.map(function(item) {
+                            return _this.getNumberValue(item);
+                        }) : [];
+                        var value2 = _this.getAggregateTypeValue(values, current.aggregateType);
+                        instance = _this.engine.getInstance(current.subTableId);
+                        num = Number(value2);
+                        break;
                     }
-                }
-                var oldValue = this.engine.getState(control.id, rowIndex);
-                var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
-                // 如果值没变的话，不触发修改
-                if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
-                    return;
-                }
-                var _oldValue_unit;
-                this.engine.setState(control.id, {
-                    result: result,
-                    unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
-                }, rowIndex);
             }
-        },
-        {
-            key: "getNumberValue",
-            value: /**
+            if (!Number.isNaN(num) && _this.controlNeedComputedValue(instance)) {
+                // 在每一个数字外边包一个括号，将 --1 转为 -(-1) 确保 --1 这种情况不会出问题
+                result += "(".concat(num, ")");
+            } else {
+                result += 0;
+            }
+            return result;
+        }, "");
+        var value;
+        // 有缓存的话取缓存，没有缓存再执行eval
+        if (this.cacheComputedResult[scriptText] !== undefined) {
+            value = this.cacheComputedResult[scriptText];
+        } else {
+            // 解决js精准度问题
+            value = Number(format(new Function("return ".concat(scriptText))(), {
+                precision: 16
+            }));
+            this.cacheComputedResult[scriptText] = value;
+        }
+        // let rowIndex = undefined
+        if (this.controlInSubtable(control)) {
+            // rowIndex = this.engine.getInstanceRowIndex(control)
+            // 控件在明细表内，但是没有行下标，说明控件被已经删除了，所以直接return
+            if (rowIndex === undefined) {
+                return;
+            }
+        }
+        var oldValue = this.engine.getState(control.id, rowIndex);
+        var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
+        // 如果值没变的话，不触发修改
+        if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
+            return;
+        }
+        var _oldValue_unit;
+        this.engine.setState(control.id, {
+            result: result,
+            unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
+        }, rowIndex);
+    };
+    /**
    * @description 获取数字值，因为计算公式可以依赖计算公式和金额，所以需要从value中取到对应的值
-   * */ function getNumberValue(value) {
-                if (typeof value === "object" && value) {
-                    if ("result" in value) {
-                        return value.result;
-                    } else if ("amount" in value) {
-                        return value.amount;
-                    }
-                }
-                if (typeof value === "number") {
-                    return value;
-                }
-                return 0;
+   * */ _proto.getNumberValue = function getNumberValue(value) {
+        if (typeof value === "object" && value) {
+            if ("result" in value) {
+                return value.result;
+            } else if ("amount" in value) {
+                return value.amount;
             }
-        },
-        {
-            key: "getAggregateTypeValue",
-            value: /**
+        }
+        if (typeof value === "number") {
+            return value;
+        }
+        return 0;
+    };
+    /**
    * 计算明细子表最大值最小值平均值总和
-   * */ function getAggregateTypeValue(values, type) {
-                if (!type || !values || !values.length) return 0;
-                switch(type){
-                    case CALC_AGGREGATE_TYPE.MAX:
-                        var _Math;
-                        return (_Math = Math).max.apply(_Math, _toConsumableArray(values));
-                    case CALC_AGGREGATE_TYPE.MIN:
-                        var _Math1;
-                        return (_Math1 = Math).min.apply(_Math1, _toConsumableArray(values));
-                    case CALC_AGGREGATE_TYPE.SUM:
-                        return values.reduce(function(a, b) {
-                            return a + b;
-                        });
-                    case CALC_AGGREGATE_TYPE.AVG:
-                        return values.reduce(function(a, b) {
-                            return a + b;
-                        }) / values.length;
-                }
-            }
+   * */ _proto.getAggregateTypeValue = function getAggregateTypeValue(values, type) {
+        if (!type || !values || !values.length) return 0;
+        switch(type){
+            case CALC_AGGREGATE_TYPE.MAX:
+                var _Math;
+                return (_Math = Math).max.apply(_Math, _toConsumableArray(values));
+            case CALC_AGGREGATE_TYPE.MIN:
+                var _Math1;
+                return (_Math1 = Math).min.apply(_Math1, _toConsumableArray(values));
+            case CALC_AGGREGATE_TYPE.SUM:
+                return values.reduce(function(a, b) {
+                    return a + b;
+                });
+            case CALC_AGGREGATE_TYPE.AVG:
+                return values.reduce(function(a, b) {
+                    return a + b;
+                }) / values.length;
         }
-    ]);
+    };
     return CalcPlugin;
 }();