@byteluck-fe/model-driven-engine 1.5.0-beta.7 → 1.7.2

package/dist/esm/common/proxyState.js

@@ -38,7 +38,7 @@ var proxyArrayApi = [
     "shift",
     "pop",
     "unshift",
-    "reverse", 
+    "reverse"
 ];
 export var engineProxyFlag = Symbol("__engineProxy__");
 export var engineTargetKey = Symbol("__engineTarget__");
@@ -85,7 +85,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
         return function() {
             return callback.call(null, target, thisKey, "splice", [
                 newLength,
-                oldLength - newLength, 
+                oldLength - newLength
             ]);
         };
     // 直接操作下标
@@ -148,8 +148,8 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             // @ts-ignore
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
-            var ref;
-            newValue = (ref = reProxyState(value)) !== null && ref !== void 0 ? ref : newValue;
+            var _reProxyState;
+            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
@@ -243,10 +243,10 @@ function flatInstanceForChildren(controls) {
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
             return findEndItem ? findEndItem : _instanceof(prevItem, RuntimeFormControl) ? prevItem : undefined;
         } else {
-            var ref;
-            var ref1;
+            var _prevItem_children;
+            var _prevItem_children_index;
             // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (ref1 = prevItem === null || prevItem === void 0 ? void 0 : (ref = prevItem.children) === null || ref === void 0 ? void 0 : ref[index]) !== null && ref1 !== void 0 ? ref1 : 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;
         }
     }, initInstance);
 }
@@ -286,9 +286,9 @@ function getArrayNewArgs(type, args, value) {
                 var result;
                 var addValue = getArrayNewValue(key, args);
                 if (addValue.length) {
-                    var _obj, ref;
+                    var _this, _this_engineArrayBeforeSetCallbackFlag;
                     // @ts-ignore
-                    var newValue = (ref = (_obj = this)[engineArrayBeforeSetCallbackFlag]) === null || ref === void 0 ? void 0 : ref.call(_obj, // @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
                     this[engineProxyThisKey], addValue);
                     var newArgs = getArrayNewArgs(key, args, newValue);

package/dist/esm/plugins/CalcPlugin.js

@@ -29,6 +29,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe/model-driven-shared";
+import { format } from "mathjs";
 var DisplayType;
 (function(DisplayType) {
     DisplayType[/**
@@ -63,8 +64,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
     /**
    * @description 获取显隐控制的需要被记住值的控件id
    * */ _proto.getNeedHideRememberControlIds = function getNeedHideRememberControlIds() {
-        var ref;
-        if (!((ref = this.options) === null || ref === void 0 ? void 0 : ref.displayBoList)) {
+        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) {
@@ -78,8 +79,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
     /**
    * @description 获取权限控制的隐藏的字段，不需要参与计算
    * */ _proto.getDontHasPermissionControlIds = function getDontHasPermissionControlIds() {
-        var ref;
-        if (!((ref = this.options) === null || ref === void 0 ? void 0 : ref.behavior)) {
+        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) {
@@ -205,8 +206,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
         var _this = this;
         this.engine.on("schema-change", function(payload) {
             if (payload.props === "isHide") {
-                var ref;
-                var calcControls = (ref = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && ref !== void 0 ? ref : [];
+                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);
                 });
@@ -218,18 +219,18 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ _proto.watchSubtableChange = function watchSubtableChange() {
         var _this = this;
         this.engine.on("list-change", function(payload) {
-            var ref;
+            var _payload_options;
             _this.resetDependencies();
-            var ref1;
-            var changedRows = (ref1 = (ref = payload.options) === null || ref === void 0 ? void 0 : ref.changed) !== null && ref1 !== void 0 ? ref1 : [];
+            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 ref2;
-            var calcControls = (ref2 = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && ref2 !== void 0 ? ref2 : [];
+            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);
@@ -245,8 +246,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
             if (!_this.dependenciesTriggerMap.has(instance.id)) {
                 return;
             }
-            var ref;
-            var calcControls = (ref = _this.dependenciesTriggerMap.get(instance.id)) !== null && ref !== void 0 ? ref : [];
+            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
@@ -270,8 +271,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
     /**
    * @description 控件在明细子表内
    * */ _proto.controlInSubtable = function controlInSubtable(control) {
-        var ref;
-        return ((ref = control.parent) === null || ref === void 0 ? void 0 : ref.type) === CONTROL_TYPE.SUBTABLE_COLUMN;
+        var _control_parent;
+        return ((_control_parent = control.parent) === null || _control_parent === void 0 ? void 0 : _control_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN;
     };
     /**
    * @description 执行计算公式的计算
@@ -331,7 +332,10 @@ export var CalcPlugin = /*#__PURE__*/ function() {
         if (this.cacheComputedResult[scriptText] !== undefined) {
             value = this.cacheComputedResult[scriptText];
         } else {
-            value = new Function("return ".concat(scriptText))();
+            // 解决js精准度问题
+            value = Number(format(new Function("return ".concat(scriptText))(), {
+                precision: 16
+            }));
             this.cacheComputedResult[scriptText] = value;
         }
         var rowIndex = undefined;
@@ -348,10 +352,10 @@ export var CalcPlugin = /*#__PURE__*/ function() {
         if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
             return;
         }
-        var ref;
+        var _oldValue_unit;
         this.engine.setState(control.id, {
             result: result,
-            unit: (ref = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && ref !== void 0 ? ref : ""
+            unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
         }, rowIndex);
     };
     /**

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -32,7 +32,101 @@ function _classCallCheck(instance, Constructor) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-import regeneratorRuntime from "regenerator-runtime";
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
 import { EventLogic } from "@byteluck-fe/model-driven-shared";
 // type EventKeyMap = {
 //   [eventKey in EventKeys]?: string
@@ -80,30 +174,36 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
     _proto.engineAddEventListener = function engineAddEventListener(eventKey, controlEventKey) {
         var _this = this;
         this.engine.on(eventKey, function() {
-            var _ref = _asyncToGenerator(/*#__PURE__*/ regeneratorRuntime.mark(function _callee(payload) {
-                return regeneratorRuntime.wrap(function _callee$(_ctx) {
-                    while(1)switch(_ctx.prev = _ctx.next){
+            var _ref = _asyncToGenerator(function(payload) {
+                return __generator(this, function(_state) {
+                    switch(_state.label){
                         case 0:
-                            if (!(eventKey === "change" && !_this.engine.isMounted)) {
-                                _ctx.next = 2;
-                                break;
+                            // 初始化state的时候不触发change事件,必须在engine mounted以后才触发
+                            if (eventKey === "change" && !_this.engine.isMounted) {
+                                return [
+                                    2
+                                ];
                             }
-                            return _ctx.abrupt("return");
+                            if (!(payload.instance !== undefined)) return [
+                                3,
+                                2
+                            ];
+                            return [
+                                4,
+                                _this.callControlEvent(controlEventKey, payload)
+                            ];
+                        case 1:
+                            return [
+                                2,
+                                _state.sent()
+                            ];
                         case 2:
-                            if (!(payload.instance !== undefined)) {
-                                _ctx.next = 6;
-                                break;
-                            }
-                            _ctx.next = 5;
-                            return _this.callControlEvent(controlEventKey, payload);
-                        case 5:
-                            return _ctx.abrupt("return", _ctx.sent);
-                        case 6:
-                        case "end":
-                            return _ctx.stop();
+                            return [
+                                2
+                            ];
                     }
-                }, _callee);
-            }));
+                });
+            });
             return function(payload) {
                 return _ref.apply(this, arguments);
             };
@@ -111,58 +211,66 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
     };
     _proto.callControlEvent = function callControlEvent(name, payload) {
         var _this = this;
-        return _asyncToGenerator(/*#__PURE__*/ regeneratorRuntime.mark(function _callee() {
+        return _asyncToGenerator(function() {
             var events, result;
-            return regeneratorRuntime.wrap(function _callee$(_ctx) {
-                while(1)switch(_ctx.prev = _ctx.next){
+            return __generator(this, function(_state) {
+                switch(_state.label){
                     case 0:
                         events = _this.config[payload.instance.id];
-                        if (!(!events || !Array.isArray(events[name]))) {
-                            _ctx.next = 3;
-                            break;
+                        if (!events || !Array.isArray(events[name])) {
+                            return [
+                                2,
+                                []
+                            ];
                         }
-                        return _ctx.abrupt("return", []);
-                    case 3:
-                        _ctx.next = 5;
-                        return Promise.all(events[name].map(function() {
-                            var _ref = _asyncToGenerator(/*#__PURE__*/ regeneratorRuntime.mark(function _callee(eventName) {
-                                var execResult;
-                                return regeneratorRuntime.wrap(function _callee$(_ctx) {
-                                    while(1)switch(_ctx.prev = _ctx.next){
-                                        case 0:
-                                            _ctx.next = 2;
-                                            return _this.engine.getAction().execAction(eventName, //qiyu 注释掉的两个参数变为全局参数
-                                            // this.engine,
-                                            // this.engine.getAction().actionUtils, //以前是params，空的
-                                            payload);
-                                        case 2:
-                                            execResult = _ctx.sent;
-                                            return _ctx.abrupt("return", execResult);
-                                        case 4:
-                                        case "end":
-                                            return _ctx.stop();
-                                    }
-                                }, _callee);
-                            }));
-                            return function(eventName) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }()));
-                    case 5:
-                        result = _ctx.sent;
-                        if (!result.includes(false)) {
-                            _ctx.next = 10;
-                            break;
+                        return [
+                            4,
+                            Promise.all(events[name].map(function() {
+                                var _ref = _asyncToGenerator(function(eventName) {
+                                    var execResult;
+                                    return __generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                return [
+                                                    4,
+                                                    _this.engine.getAction().execAction(eventName, //qiyu 注释掉的两个参数变为全局参数
+                                                    // this.engine,
+                                                    // this.engine.getAction().actionUtils, //以前是params，空的
+                                                    payload)
+                                                ];
+                                            case 1:
+                                                execResult = _state.sent();
+                                                return [
+                                                    2,
+                                                    execResult
+                                                ];
+                                        }
+                                    });
+                                });
+                                return function(eventName) {
+                                    return _ref.apply(this, arguments);
+                                };
+                            }()))
+                        ];
+                    case 1:
+                        result = _state.sent();
+                        if (result.includes(false)) {
+                            return [
+                                2,
+                                false
+                            ];
+                        } else {
+                            return [
+                                2,
+                                result
+                            ];
                         }
-                        return _ctx.abrupt("return", false);
-                    case 10:
-                        return _ctx.abrupt("return", result);
-                    case 11:
-                    case "end":
-                        return _ctx.stop();
+                        return [
+                            2
+                        ];
                 }
-            }, _callee);
-        }))();
+            });
+        })();
     };
     return ControlsEventPlugin;
 }();

package/dist/esm/plugins/ES6ModulePlugin.js

@@ -71,7 +71,7 @@ export var ES6ModulePlugin = /*#__PURE__*/ function() {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
             for(var _iterator = Object.entries(res.funcMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
                 actionManager.addAction(key, value);
             }
         } catch (err) {
@@ -117,7 +117,7 @@ export function parseModule(action, engine) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = Object.entries(module.exports)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
             if (typeof value === "function") {
                 funcMap[key] = value;
             } else {