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

package/dist/esm/common/Store.js

@@ -30,9 +30,10 @@ var Store = /*#__PURE__*/ function() {
     "use strict";
     function Store(props) {
         _classCallCheck(this, Store);
-        var ref = init(props.instance), state = ref.state, emptyState = ref.emptyState, databindMapping = ref.databindMapping, controlidMapping = ref.controlidMapping;
+        var ref = init(props.instance), state = ref.state, emptyState = ref.emptyState, databindMapping = ref.databindMapping, controlidMapping = ref.controlidMapping, fieldCodeState = ref.fieldCodeState;
         this.emptyState = emptyState;
         this.state = state;
+        this.fieldCodeState = fieldCodeState;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
     }
@@ -123,6 +124,25 @@ var Store = /*#__PURE__*/ function() {
             }
         }
     };
+    _proto.getFieldCodeState = function getFieldCodeState(controlId) {
+        //qiyu 由于header的数据是后补充的，所以从state获取第一层值。
+        // const controlInfo = this.controlIdMapping[controlId]
+        var detection = this.fieldCodeState[controlId];
+        if (detection !== undefined) {
+            return this.fieldCodeState[controlId];
+        } else {
+            var controlInfo = this.controlIdMapping[controlId];
+            var dataCode = controlInfo.dataBind.dataCode;
+            if (controlInfo !== undefined) {
+                if (controlInfo.dataView === controlId) {
+                    return this.fieldCodeState[controlId];
+                } else {
+                    var dataCode1 = controlInfo.dataBind.dataCode;
+                    return this.fieldCodeState[controlInfo.dataView][dataCode1] || this.fieldCodeState[controlInfo.dataView];
+                }
+            }
+        }
+    };
     _proto.getEmptyState = function getEmptyState(controlId) {
         var _this = this;
         var detection = this.emptyState[controlId];
@@ -173,6 +193,8 @@ var Store = /*#__PURE__*/ function() {
 function init(instance) {
     var state = {};
     var emptyState = {};
+    var fieldCodeState = {};
+    var fieldCodeEmptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
     // loopFormControl(instance, (item, children) => {
@@ -182,39 +204,76 @@ function init(instance) {
         var dvId = dataView.id;
         var dataViewState = {};
         var emptyDataViewState = {};
+        var dataViewFieldCodeState = {};
+        var emptyDataViewFieldCodeState = {};
         // @ts-ignore
         loopFormControl([
             dataView
         ], function(item, children) {
-            buildState(dataViewState, emptyDataViewState, item);
+            buildState(dataViewState, emptyDataViewState, dataViewFieldCodeState, emptyDataViewFieldCodeState, item);
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
         });
         state[dvId] = dataViewState;
         emptyState[dvId] = emptyDataViewState;
+        fieldCodeState[dvId] = dataViewFieldCodeState;
+        fieldCodeEmptyState[dvId] = emptyDataViewFieldCodeState;
     });
     return {
         state: state,
         emptyState: emptyState,
         databindMapping: databindMapping,
-        controlidMapping: controlidMapping
+        controlidMapping: controlidMapping,
+        fieldCodeState: fieldCodeState,
+        fieldCodeEmptyState: fieldCodeEmptyState
     };
 }
-function buildState(dataViewState, emptyDataViewState, // @ts-ignore
+function buildState(dataViewState, emptyDataViewState, dataViewFieldCodeState, emptyDataViewFieldCodeState, // @ts-ignore
 item) {
     if (_instanceof(item, RuntimeFormControl)) {
         dataViewState[item.id] = JSONCopy(item.props.defaultValue);
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
+        if (_instanceof(item.props.dataBind, ObjectDataBind)) {
+            // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
+            Object.keys(item.props.dataBind).forEach(function(key) {
+                var dataBind = item.props.dataBind;
+                var defaultValue = item.props.defaultValue;
+                var dataBindFieldCode = dataBind[key].fieldCode;
+                dataViewFieldCodeState[dataBindFieldCode] = JSONCopy(defaultValue[key]);
+                emptyDataViewFieldCodeState[dataBindFieldCode] = JSONCopy(defaultValue[key]);
+            });
+        } else {
+            var dataBindFieldCode = item.props.dataBind.fieldCode;
+            dataViewFieldCodeState[dataBindFieldCode] = JSONCopy(item.props.defaultValue);
+            emptyDataViewFieldCodeState[dataBindFieldCode] = JSONCopy(item.props.defaultValue);
+        }
     } else {
         var emptyTemplate = {};
+        var emptyFieldCodeTemplate = {};
         loopFormSchema(item.props.headers, function(headerItem) {
             emptyTemplate[headerItem.id] = JSONCopy(headerItem.props.defaultValue);
+            // 处理成fieldCode
+            var headerItemFieldCode = headerItem.props.dataBind.fieldCode;
+            if (_instanceof(headerItem.props.dataBind, ObjectDataBind)) {
+                // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
+                Object.keys(headerItem.props.dataBind).forEach(function(key) {
+                    emptyFieldCodeTemplate[headerItem.props.dataBind[key].fieldCode] = JSONCopy(headerItem.props.defaultValue[key]);
+                });
+            } else {
+                emptyFieldCodeTemplate[headerItemFieldCode] = JSONCopy(headerItem.props.defaultValue);
+            }
         });
         var _defaultRows;
         dataViewState[item.id] = new Array((_defaultRows = item.props.defaultRows) !== null && _defaultRows !== void 0 ? _defaultRows : 1).fill(0).map(function() {
             return JSONCopy(emptyTemplate);
         });
         emptyDataViewState[item.id] = emptyTemplate;
+        var dataBindFieldCode1 = item.props.datasourceBind.dataCode;
+        var _defaultRows1;
+        dataViewFieldCodeState[dataBindFieldCode1] = new Array((_defaultRows1 = item.props.defaultRows) !== null && _defaultRows1 !== void 0 ? _defaultRows1 : 1).fill(0).map(function() {
+            return JSONCopy(emptyFieldCodeTemplate);
+        });
+        emptyDataViewFieldCodeState[dataBindFieldCode1] = emptyFieldCodeTemplate;
     }
 }
 function buildDataBindMapping(data, dataViewId, // @ts-ignore

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
             ]);
         };
     // 直接操作下标

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[/**
@@ -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;

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;
 }();