@byteluck-fe/model-driven-engine 2.7.0-alpha.30a → 2.7.0-alpha.33

package/dist/esm/common/Engine.js

@@ -702,8 +702,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var columns = this.createControl(template);
                     (_inst_children = inst.children).push.apply(_inst_children, _to_consumable_array(columns));
                 }
-                //@ts-ignore
-                row.parent = instance;
                 return row;
             }
         },
@@ -823,12 +821,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 return this.setInstance(instance, props, value, rowIndex);
             }
         },
-        {
-            key: "getRule",
-            value: function getRule(controlType, props) {
-                return Runtime.staticGetRules(controlType, props);
-            }
-        },
         {
             key: "getAllRules",
             value: function getAllRules(controlId) {
@@ -1138,7 +1130,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function buildFields(dataCode, state) {
                 var _this = this;
                 var mapping = this.getDataBindMapping(dataCode);
-                if (!mapping || !mapping.fields) {
+                if (!mapping) {
                     return;
                 }
                 var skipKeys = [];
@@ -1331,59 +1323,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 获取组件实例，明细表中的组件将会得到数组, 第二个参数为(false/不传入)则获取到的是明细表内不包含表头内实例的所有控件实例，传入true则获取到包含表头内实例的所有控件实例,表头内实例永远在下标0的位置
    * @param controlId
    * @param header 明细表内是否获取表头的控件
-   */ // getInstances(
-            //   controlId?: string,
-            //   header: boolean = false
-            // ): ControlRuntimeInstance<ControlsKeys>[] {
-            //   // const cc = console
-            //   // const label = '🐑 genInstances ' + controlId + ' ' + Date.now()
-            //   // cc.time(label)
-            //
-            //   if (controlId === undefined) {
-            //     // cc.timeEnd(label)
-            //     return this.runtime.flatInstances
-            //   }
-            //   const instances = Array.from(this.runtime.instanceMap[controlId] || [])
-            //   if (header) {
-            //     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
-            //     if (instances.length) {
-            //       const instance: RuntimeControl = instances[0]
-            //       // if (this.inList(instance.id) === true) {
-            //       if (this.inList(instance.id) !== undefined) {
-            //         const headerInstance = this.getInstanceInSubtableHeader(instance)
-            //         if (headerInstance) {
-            //           instances.unshift(headerInstance)
-            //         }
-            //       }
-            //     } else {
-            //       const controlIdMapping = this.getControlIdMapping()
-            //       const [subtableId] =
-            //         Object.entries(controlIdMapping).find(
-            //           ([_, mapping]) => mapping.children && controlId in mapping.children
-            //         ) ?? []
-            //       if (subtableId) {
-            //         const subtable = this.getInstance(subtableId)
-            //         // @ts-ignore
-            //         const headerColumn = subtable.props.headers.find((column: any) =>
-            //           column.children.find((item: any) => item.id === controlId)
-            //         )
-            //         if (headerColumn) {
-            //           const headerInstance = headerColumn.children.find(
-            //             (item: any) => item.id === controlId
-            //           )
-            //           if (headerInstance) {
-            //             instances.unshift(
-            //               headerInstance as ControlRuntimeInstance<ControlsKeys>
-            //             )
-            //           }
-            //         }
-            //       }
-            //     }
-            //   }
-            //   // @ts-ignore
-            //   return instances
-            // }
-            key: "getInstances",
+   */ key: "getInstances",
             value: function getInstances(controlId) {
                 var header = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
                 // const cc = console
@@ -1393,15 +1333,42 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // cc.timeEnd(label)
                     return this.runtime.flatInstances;
                 }
-                var instances = this.runtime.instanceMap[controlId] || [];
+                var instances = Array.from(this.runtime.instanceMap[controlId] || []);
                 if (header) {
-                    var instance = instances[0];
-                    if (instance) {
-                        var _instance_parent;
-                        // @ts-ignore
-                        var parentId = (_instance_parent = instance.parent) === null || _instance_parent === void 0 ? void 0 : _instance_parent.id;
-                        if (parentId) {
-                            instances = this.runtime.instanceMap[parentId] || [];
+                    // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
+                    if (instances.length) {
+                        var instance = instances[0];
+                        // if (this.inList(instance.id) === true) {
+                        if (this.inList(instance.id) !== undefined) {
+                            var headerInstance = this.getInstanceInSubtableHeader(instance);
+                            if (headerInstance) {
+                                instances.unshift(headerInstance);
+                            }
+                        }
+                    } else {
+                        var _this_getControlIdMapping;
+                        var controlIdMapping = (_this_getControlIdMapping = this.getControlIdMapping()) !== null && _this_getControlIdMapping !== void 0 ? _this_getControlIdMapping : {};
+                        var _Object_entries_find;
+                        var _ref = _sliced_to_array((_Object_entries_find = Object.entries(controlIdMapping).find(function(param) {
+                            var _param = _sliced_to_array(param, 2), _ = _param[0], mapping = _param[1];
+                            return mapping.children && controlId in mapping.children;
+                        })) !== null && _Object_entries_find !== void 0 ? _Object_entries_find : [], 1), subtableId = _ref[0];
+                        if (subtableId) {
+                            var subtable = this.getInstance(subtableId);
+                            // @ts-ignore
+                            var headerColumn = subtable.props.headers.find(function(column) {
+                                return column.children.find(function(item) {
+                                    return item.id === controlId;
+                                });
+                            });
+                            if (headerColumn) {
+                                var headerInstance1 = headerColumn.children.find(function(item) {
+                                    return item.id === controlId;
+                                });
+                                if (headerInstance1) {
+                                    instances.unshift(headerInstance1);
+                                }
+                            }
                         }
                     }
                 }
@@ -1516,64 +1483,55 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 如果控件在表头内，则返回-1
    * 如果控件在表内，则返回行下标
    * 如果控件不在明细表内，则返回undefined
-   * */ // public getInstanceRowIndex(
-            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
-            // ) {
-            //   if (!instance.parent) {
-            //     return
-            //   }
-            //   let rowIndex: number | undefined
-            //   // @ts-ignore
-            //   if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
-            //     // 表头内的控件
-            //     // @ts-ignore
-            //     if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-            //       rowIndex = -1
-            //     } else {
-            //       // @ts-ignore
-            //       // const index = instance.parent.children.findIndex(
-            //       //   (item: any) => item === instance
-            //       // )
-            //       let instances = this.runtime.instanceMap[instance.id] || []
-            //       const index = instances.findIndex((item: any) => item === instance)
-            //       if (index > -1) {
-            //         rowIndex = index
-            //       }
-            //     }
-            //   } else {
-            //     rowIndex = this.getInstanceRowIndex(instance.parent)
-            //   }
-            //   return rowIndex
-            // }
-            function getInstanceRowIndex(instance) {
+   * */ function getInstanceRowIndex(instance) {
                 if (!instance.parent) {
                     return;
                 }
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-                    rowIndex = -1;
-                } else {
-                    var isColumnChild = this.getInstanceParentControl(instance, // @ts-ignore
-                    CONTROL_TYPE.SUBTABLE_COLUMN);
-                    if (isColumnChild) {
-                        var instanceList = this.runtime.instanceMap[instance.id];
-                        if (Object.prototype.toString.call(instanceList) === "[object Array]") {
-                            var index = instanceList.findIndex(function(item) {
-                                return item === instance;
-                            });
-                            if (index > -1) {
-                                rowIndex = index;
-                            }
+                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
+                    // 表头内的控件
+                    // @ts-ignore
+                    if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+                        rowIndex = -1;
+                    } else {
+                        // @ts-ignore
+                        var index = instance.parent.children.findIndex(function(item) {
+                            return item === instance;
+                        });
+                        if (index > -1) {
+                            rowIndex = index;
                         }
                     }
+                } else {
+                    rowIndex = this.getInstanceRowIndex(instance.parent);
                 }
                 return rowIndex;
             }
         },
         {
             key: "getInstanceParentControl",
-            value: function getInstanceParentControl(instance, controlType) {
+            value: // public getInstanceRowIndex(
+            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
+            // ) {
+            //   let rowIndex: number | undefined
+            //   // @ts-ignore
+            //   if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+            //     rowIndex = -1
+            //   }else{
+            //     const instanceList = this.runtime.instanceMap[instance.id]
+            //     if(Object.prototype.toString.call(instanceList) === '[object Array]'){
+            //       const index = instanceList.findIndex(
+            //         (item: any) => item === instance
+            //       )
+            //       if (index > -1) {
+            //         rowIndex = index
+            //       }
+            //     }
+            //   }
+            //   return rowIndex
+            // }
+            function getInstanceParentControl(instance, controlType) {
                 if (!instance.parent) {
                     return;
                 }
@@ -1652,8 +1610,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "register",
             value: // 注册外部控件
-            function register(control) {
-                return Runtime.register(control, "Runtime");
+            function register() {
+                for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){
+                    arg[_key] = arguments[_key];
+                }
+                var _Runtime;
+                return (_Runtime = Runtime).register.apply(_Runtime, _to_consumable_array(arg));
             }
         },
         {
@@ -1665,5 +1627,4 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     ]);
     return Engine;
 }(Watcher);
-// @ts-ignore
 export { Engine };

package/dist/esm/common/Runtime.js

@@ -97,7 +97,7 @@ function _create_super(Derived) {
     };
 }
 import { RegisterControls } from "@byteluck-fe/model-driven-core";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema, isArray } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
 import { hasChildrenControl, loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
 export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     "use strict";
@@ -111,7 +111,6 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         _define_property(_assert_this_initialized(_this), "_instance", void 0);
         _define_property(_assert_this_initialized(_this), "_flatInstances", []);
         _define_property(_assert_this_initialized(_this), "_instanceMap", {});
-        _define_property(_assert_this_initialized(_this), "_controlParentIdMap", {});
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);
@@ -124,32 +123,19 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             value: function getFlatInstances() {
                 var instances = [];
                 var instanceMap = {};
-                var controlParentIdMap = {};
-                loop(this._instance, "", function(item, parentId) {
+                loop(this._instance, function(item) {
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-                    //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
-                    // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
-                    //   return
-                    // }
-                    if (parentId) {
-                        // @ts-ignore
-                        controlParentIdMap[item.id] = parentId;
+                    if (item.type === "subtable-row" || item.type === "subtable-column") {
+                        return;
                     }
+                    instances.push(item);
                     if (!instanceMap[item.id]) {
                         instanceMap[item.id] = [];
                     }
-                    //不知为何subtable-column会多存一次
-                    if (item.type === "subtable-column") {
-                        if (instanceMap[item.id].length > 0) {
-                            return;
-                        }
-                    }
-                    instances.push(item);
                     instanceMap[item.id].push(item);
                 });
                 this._flatInstances = instances;
                 this._instanceMap = instanceMap;
-                this._controlParentIdMap = controlParentIdMap;
                 return this._flatInstances;
             }
         },
@@ -183,9 +169,8 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 var antdRules = {};
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    ruleItems[dataView.id] = JSONCopy(result[0]);
-                    antdRules[dataView.id] = JSONCopy(result[0]);
+                    ruleItems[dataView.id] = dataView.rules[0];
+                    antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -208,9 +193,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             get: function get() {
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    // ruleItems[dataView.id] = dataView.rules[0]
-                    ruleItems[dataView.id] = result[0];
+                    ruleItems[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -229,9 +212,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             get: function get() {
                 var antdRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    // antdRules[dataView.id] = dataView.rules[0]
-                    antdRules[dataView.id] = result[0];
+                    antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -248,30 +229,22 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     ]);
     return Runtime;
 }(RegisterControls);
-function loop(control, parentId, callback) {
-    var _instances = Array.isArray(control) ? control : [
-        control
-    ];
-    _instances.map(function(item) {
-        callback(item, parentId);
-        if (hasChildrenControl(item)) {
-            var ctl = item;
-            if (!ctl.children) {
-                ctl.children = [];
+function loop(control, callback) {
+    if (Array.isArray(control)) {
+        control.map(function(item) {
+            callback(item);
+            if (hasChildrenControl(item)) {
+                var ctl = item;
+                if (!ctl.children) {
+                    ctl.children = [];
+                }
+                // @ts-ignore
+                loop(ctl.children, callback);
             }
-            // @ts-ignore
-            loop(ctl.children, ctl.id, callback);
-        }
-        if (hasHeaderOrFooterControl(item, "headers")) {
-            loop(item.props.headers, item.id, callback);
-        }
-        if (hasHeaderOrFooterControl(item, "footers")) {
-            loop(item.props.footers, item.id, callback);
-        }
-    });
-}
-function hasHeaderOrFooterControl(control, checkType) {
-    return checkType in control.props && isArray(control.props[checkType]);
+        });
+    } else {
+        callback(control);
+    }
 }
 /**
  * 控件是否在视图中隐藏，遍历查找所有parent
@@ -279,7 +252,7 @@ function hasHeaderOrFooterControl(control, checkType) {
     if (control.props.isHide) {
         return true;
     }
-    if (control.parent === null || control.parent === undefined) {
+    if (control.parent === null) {
         return false;
     }
     return getControlIsHide(control.parent);
@@ -289,14 +262,11 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        // data[item.id] = item.rules
-        data[item.id] = result;
+        data[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
-        // data[item.id] = item.rules
-        data[item.id] = result;
+        data[item.id] = item.rules;
         var itemRules = {
             type: "array",
             fields: {}
@@ -311,13 +281,8 @@ item) {
                             fields: {}
                         };
                     }
-                    // // @ts-ignore
-                    // itemRules.fields[index].fields[formControl.id] = (
-                    //   formControl as RuntimeFormControl
-                    // ).rules
-                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                     // @ts-ignore
-                    itemRules.fields[index].fields[formControl.id] = childResult;
+                    itemRules.fields[index].fields[formControl.id] = formControl.rules;
                 }
             });
         });
@@ -329,19 +294,15 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        // antdRules[item.id] = item.rules
-        antdRules[item.id] = result;
+        antdRules[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
         item.children.forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
-                // rules[formControl.id] = (formControl as RuntimeFormControl).rules
-                var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
-                rules[formControl.id] = childResult;
+                rules[formControl.id] = formControl.rules;
             });
             antdRules[item.id].push(rules);
         });

package/dist/esm/plugins/CalcPlugin.js

@@ -156,7 +156,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 if (control.props.isHide) {
                     return true;
                 }
-                if (control.parent === null || control.parent === undefined) {
+                if (control.parent === null) {
                     return false;
                 }
                 return this.getControlIsHide(control.parent);

package/dist/esm/plugins/ES6ModulePlugin.js

@@ -79,15 +79,13 @@ function _unsupported_iterable_to_array(o, minLen) {
 import { error } from "@byteluck-fe/model-driven-shared";
 export var ES6ModulePlugin = /*#__PURE__*/ function() {
     "use strict";
-    function ES6ModulePlugin(config, env, eventJs) {
+    function ES6ModulePlugin(config, env) {
         _class_call_check(this, ES6ModulePlugin);
         _define_property(this, "config", void 0);
         _define_property(this, "engine", void 0);
         _define_property(this, "env", void 0);
-        _define_property(this, "eventJs", void 0);
         this.config = config;
         this.env = env;
-        this.eventJs = eventJs;
     }
     _create_class(ES6ModulePlugin, [
         {
@@ -98,55 +96,28 @@ export var ES6ModulePlugin = /*#__PURE__*/ function() {
                 if (!action) {
                     return;
                 }
+                var res = parseModule(action, engine, this.env);
+                if (!res) {
+                    return;
+                }
                 var actionManager = engine.getAction();
-                if (this.eventJs) {
-                    this.eventJs.exportsFun({
-                        ctx: engine,
-                        utils: actionManager.actionUtils
-                    });
-                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                    try {
-                        for(var _iterator = Object.entries(this.eventJs)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                            var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
-                            actionManager.addAction(key, value);
-                        }
-                    } catch (err) {
-                        _didIteratorError = true;
-                        _iteratorError = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                _iterator.return();
-                            }
-                        } finally{
-                            if (_didIteratorError) {
-                                throw _iteratorError;
-                            }
-                        }
-                    }
-                } else {
-                    var res = parseModule(action, engine, this.env);
-                    if (!res) {
-                        return;
+                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 _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
+                        actionManager.addAction(key, value);
                     }
-                    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
                     try {
-                        for(var _iterator1 = Object.entries(res.funcMap)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                            var _step_value1 = _sliced_to_array(_step1.value, 2), key1 = _step_value1[0], value1 = _step_value1[1];
-                            actionManager.addAction(key1, value1);
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
                         }
-                    } catch (err) {
-                        _didIteratorError1 = true;
-                        _iteratorError1 = err;
                     } finally{
-                        try {
-                            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                                _iterator1.return();
-                            }
-                        } finally{
-                            if (_didIteratorError1) {
-                                throw _iteratorError1;
-                            }
+                        if (_didIteratorError) {
+                            throw _iteratorError;
                         }
                     }
                 }