@byteluck-fe/model-driven-engine 2.7.0-alpha.4 → 2.7.0-beta

package/dist/esm/common/checkerValue.js

@@ -1,18 +1,18 @@
-function _arrayLikeToArray(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _arrayWithHoles(arr) {
+function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _assertThisInitialized(self) {
+function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     }
     return self;
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -26,12 +26,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -44,11 +44,11 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+function _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
     };
-    return _getPrototypeOf(o);
+    return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
@@ -61,7 +61,7 @@ function _inherits(subClass, superClass) {
             configurable: true
         }
     });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+    if (superClass) _set_prototype_of(subClass, superClass);
 }
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -70,7 +70,7 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-function _iterableToArrayLimit(arr, i) {
+function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -94,10 +94,10 @@ function _iterableToArrayLimit(arr, i) {
     }
     return _arr;
 }
-function _nonIterableRest() {
+function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _objectSpread(target) {
+function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -107,40 +107,40 @@ function _objectSpread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
+            _define_property(target, key, source[key]);
         });
     }
     return target;
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
     }
-    return _assertThisInitialized(self);
+    return _assert_this_initialized(self);
 }
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
         o.__proto__ = p;
         return o;
     };
-    return _setPrototypeOf(o, p);
+    return _set_prototype_of(o, p);
 }
-function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-var _typeof = function(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _unsupportedIterableToArray(o, minLen) {
+}
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-function _isNativeReflectConstruct() {
+function _is_native_reflect_construct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
     if (Reflect.construct.sham) return false;
     if (typeof Proxy === "function") return true;
@@ -151,17 +151,17 @@ function _isNativeReflectConstruct() {
         return false;
     }
 }
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
+function _create_super(Derived) {
+    var hasNativeReflectConstruct = _is_native_reflect_construct();
     return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
+        var Super = _get_prototype_of(Derived), result;
         if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
+            var NewTarget = _get_prototype_of(this).constructor;
             result = Reflect.construct(Super, arguments, NewTarget);
         } else {
             result = Super.apply(this, arguments);
         }
-        return _possibleConstructorReturn(this, result);
+        return _possible_constructor_return(this, result);
     };
 }
 import { isArray, isFunction, isString, isJSONArray, isJSONObject, isNumber, isNumberAndEmptyStringArray, isPlainObject, isStringArray, FieldTypes, isObject } from "@byteluck-fe/model-driven-shared";
@@ -169,17 +169,17 @@ import { AddressValue, AmountValue, CalcValue, RangeDateValue } from "@byteluck-
 import { camelizeKeys } from "humps";
 var ValueChecker = function ValueChecker() {
     "use strict";
-    _classCallCheck(this, ValueChecker);
+    _class_call_check(this, ValueChecker);
 };
 var StringValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(StringValueChecker, ValueChecker);
-    var _super = _createSuper(StringValueChecker);
+    var _super = _create_super(StringValueChecker);
     function StringValueChecker() {
-        _classCallCheck(this, StringValueChecker);
+        _class_call_check(this, StringValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(StringValueChecker, [
+    _create_class(StringValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -207,12 +207,12 @@ var StringValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var NumberValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(NumberValueChecker, ValueChecker);
-    var _super = _createSuper(NumberValueChecker);
+    var _super = _create_super(NumberValueChecker);
     function NumberValueChecker() {
-        _classCallCheck(this, NumberValueChecker);
+        _class_call_check(this, NumberValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(NumberValueChecker, [
+    _create_class(NumberValueChecker, [
         {
             // 数字类型允许是空字符串，用于置空数据
             key: "validate",
@@ -239,12 +239,12 @@ var NumberValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(StringArrayValueChecker, ValueChecker);
-    var _super = _createSuper(StringArrayValueChecker);
+    var _super = _create_super(StringArrayValueChecker);
     function StringArrayValueChecker() {
-        _classCallCheck(this, StringArrayValueChecker);
+        _class_call_check(this, StringArrayValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(StringArrayValueChecker, [
+    _create_class(StringArrayValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -284,12 +284,12 @@ var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(NumberArrayValueChecker, ValueChecker);
-    var _super = _createSuper(NumberArrayValueChecker);
+    var _super = _create_super(NumberArrayValueChecker);
     function NumberArrayValueChecker() {
-        _classCallCheck(this, NumberArrayValueChecker);
+        _class_call_check(this, NumberArrayValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(NumberArrayValueChecker, [
+    _create_class(NumberArrayValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -335,12 +335,12 @@ var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(MoneyValueChecker, ValueChecker);
-    var _super = _createSuper(MoneyValueChecker);
+    var _super = _create_super(MoneyValueChecker);
     function MoneyValueChecker() {
-        _classCallCheck(this, MoneyValueChecker);
+        _class_call_check(this, MoneyValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(MoneyValueChecker, [
+    _create_class(MoneyValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -351,18 +351,19 @@ var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
             key: "transform",
             value: function transform(value, oldValue) {
                 if (value === undefined || value === null || value === "") {
+                    var _oldValue;
                     return new AmountValue({
-                        currency: oldValue === null || oldValue === void 0 ? void 0 : oldValue.currency
+                        currency: (_oldValue = oldValue) === null || _oldValue === void 0 ? void 0 : _oldValue.currency
                     });
                 }
                 var result;
                 if (isPlainObject(value)) {
-                    result = new AmountValue(_objectSpread({}, oldValue, value));
+                    result = new AmountValue(_object_spread({}, oldValue, value));
                 }
                 if (isString(value) && isJSONObject(value)) {
                     try {
                         var newValue = JSON.parse(value);
-                        result = new AmountValue(_objectSpread({}, oldValue, newValue));
+                        result = new AmountValue(_object_spread({}, oldValue, newValue));
                     } catch (e) {}
                 }
                 if (result) {
@@ -385,12 +386,12 @@ var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(TimeScopeValueChecker, ValueChecker);
-    var _super = _createSuper(TimeScopeValueChecker);
+    var _super = _create_super(TimeScopeValueChecker);
     function TimeScopeValueChecker() {
-        _classCallCheck(this, TimeScopeValueChecker);
+        _class_call_check(this, TimeScopeValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(TimeScopeValueChecker, [
+    _create_class(TimeScopeValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -405,12 +406,12 @@ var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
                 }
                 var result;
                 if (isPlainObject(value)) {
-                    result = new RangeDateValue(_objectSpread({}, oldValue, value));
+                    result = new RangeDateValue(_object_spread({}, oldValue, value));
                 }
                 if (isString(value) && isJSONObject(value)) {
                     try {
                         var newValue = JSON.parse(value);
-                        result = new RangeDateValue(_objectSpread({}, oldValue, newValue));
+                        result = new RangeDateValue(_object_spread({}, oldValue, newValue));
                     } catch (e) {}
                 }
                 if (result) {
@@ -432,12 +433,12 @@ var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(CalcValueChecker, ValueChecker);
-    var _super = _createSuper(CalcValueChecker);
+    var _super = _create_super(CalcValueChecker);
     function CalcValueChecker() {
-        _classCallCheck(this, CalcValueChecker);
+        _class_call_check(this, CalcValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(CalcValueChecker, [
+    _create_class(CalcValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -448,18 +449,19 @@ var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
             key: "transform",
             value: function transform(value, oldValue) {
                 if (value === undefined || value === null || value === "") {
+                    var _oldValue;
                     return new CalcValue({
-                        unit: oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit
+                        unit: (_oldValue = oldValue) === null || _oldValue === void 0 ? void 0 : _oldValue.unit
                     });
                 }
                 var result;
                 if (isPlainObject(value)) {
-                    result = new CalcValue(_objectSpread({}, oldValue, value));
+                    result = new CalcValue(_object_spread({}, oldValue, value));
                 }
                 if (isString(value) && isJSONObject(value)) {
                     try {
                         var newValue = JSON.parse(value);
-                        result = new CalcValue(_objectSpread({}, oldValue, newValue));
+                        result = new CalcValue(_object_spread({}, oldValue, newValue));
                     } catch (e) {}
                 }
                 if (result) {
@@ -482,12 +484,12 @@ var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(AddressValueChecker, ValueChecker);
-    var _super = _createSuper(AddressValueChecker);
+    var _super = _create_super(AddressValueChecker);
     function AddressValueChecker() {
-        _classCallCheck(this, AddressValueChecker);
+        _class_call_check(this, AddressValueChecker);
         return _super.apply(this, arguments);
     }
-    _createClass(AddressValueChecker, [
+    _create_class(AddressValueChecker, [
         {
             key: "validate",
             value: function validate(value) {
@@ -502,12 +504,12 @@ var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
                 }
                 var result;
                 if (isPlainObject(value)) {
-                    result = new AddressValue(_objectSpread({}, oldValue, camelizeKeys(value)));
+                    result = new AddressValue(_object_spread({}, oldValue, camelizeKeys(value)));
                 }
                 if (isString(value) && isJSONObject(value)) {
                     try {
                         var newValue = JSON.parse(value);
-                        result = new AddressValue(_objectSpread({}, oldValue, camelizeKeys(newValue)));
+                        result = new AddressValue(_object_spread({}, oldValue, camelizeKeys(newValue)));
                     } catch (e) {}
                 }
                 if (result) {
@@ -532,9 +534,9 @@ var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var ValueCheckerFactory = /*#__PURE__*/ function() {
     "use strict";
     function ValueCheckerFactory() {
-        _classCallCheck(this, ValueCheckerFactory);
+        _class_call_check(this, ValueCheckerFactory);
     }
-    _createClass(ValueCheckerFactory, null, [
+    _create_class(ValueCheckerFactory, null, [
         {
             key: "getValueChecker",
             value: function getValueChecker(fieldType) {
@@ -614,7 +616,7 @@ export function checkerValue(fieldType, key, value, oldValue) {
 }
 export function checkerSubtableValue(fieldTypeMap, value, emptyValue) {
     return Object.entries(fieldTypeMap).reduce(function(result, param) {
-        var _param = _slicedToArray(param, 2), key = _param[0], fieldType = _param[1];
+        var _param = _sliced_to_array(param, 2), key = _param[0], fieldType = _param[1];
         var nowValue = value[key];
         result[key] = checkerValue(fieldType, key, nowValue, emptyValue[key]);
         return result;

package/dist/esm/common/proxyState.js

@@ -1,30 +1,30 @@
-function _arrayLikeToArray(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
-function _iterableToArray(iter) {
+function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _nonIterableSpread() {
+function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _unsupportedIterableToArray(o, minLen) {
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var cc = console;
-import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -137,19 +137,19 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     }
                 }
             };
-            var newValue = value;
+            var newValue = JSONCopy(value);
             // @ts-ignore
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
             var _reProxyState;
-            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
+            newValue = (_reProxyState = reProxyState(newValue)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
             // TODO 直接操作下标改动明细表时，没有对行数据进行checker
             if (Array.isArray(target)) {
                 // 操作数组的时候，不需要使用拼接的thisKey，先判断执行的是否是违规操作，违规操作的话会报错，不允许继续执行，正常操作的话，返回一个回调函数，用于在值修改完之后触发
-                var nextHandler = ArrayHandler(target, propertyKey, value, thisKey, callback);
+                var nextHandler = ArrayHandler(target, propertyKey, newValue, thisKey, callback);
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
                 if (nextHandler) {
                     nextHandler();
@@ -171,9 +171,11 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     return true;
                 }
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
-                callback.call(null, target, concatKey, value, oldValue);
+                callback.call(null, target, concatKey, newValue, oldValue);
             }
-            return setResult;
+            // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
+            //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'
+            return setResult ? setResult : true;
         }
     };
 }
@@ -205,7 +207,7 @@ function flatInstanceForChildren(controls) {
         result.push(item);
         if (item.controlType === "layout") {
             var _result;
-            (_result = result).push.apply(_result, _toConsumableArray(flatInstanceForChildren(item.children)));
+            (_result = result).push.apply(_result, _to_consumable_array(flatInstanceForChildren(item.children)));
         }
     });
     return result;
@@ -235,17 +237,18 @@ function flatInstanceForChildren(controls) {
         var index = Number(key);
         var isNotIndex = Number.isNaN(index);
         if (isNotIndex && prevItem) {
-            var flatChildren = (prevItem === null || prevItem === void 0 ? void 0 : prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
-            var findEndItem = flatChildren === null || flatChildren === void 0 ? void 0 : flatChildren.find(function(item) {
+            var _prevItem, _flatChildren;
+            var flatChildren = ((_prevItem = prevItem) === null || _prevItem === void 0 ? void 0 : _prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
+            var findEndItem = (_flatChildren = flatChildren) === null || _flatChildren === void 0 ? void 0 : _flatChildren.find(function(item) {
                 return item.id === key;
             });
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
             return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
         } else {
-            var _prevItem_children;
+            var _prevItem_children, _prevItem1;
             var _prevItem_children_index;
             // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
+            return (_prevItem_children_index = (_prevItem1 = prevItem) === null || _prevItem1 === void 0 ? void 0 : (_prevItem_children = _prevItem1.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
         }
     }, initInstance);
 }
@@ -285,7 +288,7 @@ function getArrayNewArgs(type, args, value) {
                 var result;
                 var addValue = getArrayNewValue(key, args);
                 if (addValue.length) {
-                    var _this, _this_engineArrayBeforeSetCallbackFlag;
+                    var _this_engineArrayBeforeSetCallbackFlag, _this;
                     // @ts-ignore
                     var newValue = (_this_engineArrayBeforeSetCallbackFlag = (_this = this)[engineArrayBeforeSetCallbackFlag]) === null || _this_engineArrayBeforeSetCallbackFlag === void 0 ? void 0 : _this_engineArrayBeforeSetCallbackFlag.call(_this, // @ts-ignore
                     this[engineTargetKey], // @ts-ignore

package/dist/esm/plugins/CalcPlugin.js

@@ -1,12 +1,12 @@
-function _arrayLikeToArray(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -20,12 +20,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -38,22 +38,22 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _iterableToArray(iter) {
+function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _nonIterableSpread() {
+function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _unsupportedIterableToArray(o, minLen) {
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe/model-driven-shared";
 import { format } from "mathjs";
@@ -69,27 +69,27 @@ var DisplayType;
 export var CalcPlugin = /*#__PURE__*/ function() {
     "use strict";
     function CalcPlugin(options) {
-        _classCallCheck(this, CalcPlugin);
-        _defineProperty(this, "engine", void 0);
-        _defineProperty(this, "options", void 0);
+        _class_call_check(this, CalcPlugin);
+        _define_property(this, "engine", void 0);
+        _define_property(this, "options", void 0);
         /**
    * 所有的计算公式控件
    * */ // @ts-ignore
-        _defineProperty(this, "calcControls", []);
+        _define_property(this, "calcControls", []);
         /**
    * key=控件id  value=控件修改后需要触发重新计算的计算公式控件组成的数组
    * 存储为一个Map，用于在控件change的时候，重新计算依赖的calc
-   * */ _defineProperty(this, "dependenciesTriggerMap", new Map());
+   * */ _define_property(this, "dependenciesTriggerMap", new Map());
         /**
    * 隐藏以后需要被计算的控件
-   * */ _defineProperty(this, "hideNotRememberControlIds", []);
-        _defineProperty(this, "dontHasPermissionControlIds", []);
-        _defineProperty(this, "cacheComputedResult", {});
+   * */ _define_property(this, "hideNotRememberControlIds", []);
+        _define_property(this, "dontHasPermissionControlIds", []);
+        _define_property(this, "cacheComputedResult", {});
         this.options = options;
         this.getDontHasPermissionControlIds();
         this.getNeedHideRememberControlIds();
     }
-    _createClass(CalcPlugin, [
+    _create_class(CalcPlugin, [
         {
             key: "getNeedHideRememberControlIds",
             value: /**
@@ -102,7 +102,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 this.hideNotRememberControlIds = this.options.displayBoList.reduce(function(result, current) {
                     if (!current.is_remember) {
                         var _result;
-                        (_result = result).push.apply(_result, _toConsumableArray(current.hide_controls));
+                        (_result = result).push.apply(_result, _to_consumable_array(current.hide_controls));
                     }
                     return result;
                 }, []);
@@ -355,6 +355,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ // @ts-ignore
             function computedCalcValue(control) {
                 var _this = this;
+                var _oldValue, _oldValue1;
                 var scriptEcho = control.props.scriptEcho;
                 if (!scriptEcho || scriptEcho.length === 0) {
                     return;
@@ -429,13 +430,13 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 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)) {
+                if (result === ((_oldValue = 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 : ""
+                    unit: (_oldValue_unit = (_oldValue1 = oldValue) === null || _oldValue1 === void 0 ? void 0 : _oldValue1.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
                 }, rowIndex);
             }
         },
@@ -466,10 +467,10 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 switch(type){
                     case CALC_AGGREGATE_TYPE.MAX:
                         var _Math;
-                        return (_Math = Math).max.apply(_Math, _toConsumableArray(values));
+                        return (_Math = Math).max.apply(_Math, _to_consumable_array(values));
                     case CALC_AGGREGATE_TYPE.MIN:
                         var _Math1;
-                        return (_Math1 = Math).min.apply(_Math1, _toConsumableArray(values));
+                        return (_Math1 = Math).min.apply(_Math1, _to_consumable_array(values));
                     case CALC_AGGREGATE_TYPE.SUM:
                         return values.reduce(function(a, b) {
                             return a + b;