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

package/dist/esm/common/Engine.js

@@ -111,13 +111,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -347,8 +340,8 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { DataBind, ObjectDataBind, RuntimeListControl } from "@byteluck-fe/model-driven-core";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
+import { isDataBind } from "@byteluck-fe/model-driven-core";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher, isBuiltInControls } from "@byteluck-fe/model-driven-shared";
 import { Runtime } from "./Runtime";
 import { Store } from "./Store";
 import { findItem, proxyState } from "./proxyState";
@@ -525,7 +518,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
                 var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
-                if (!_instanceof(subtable, RuntimeListControl)) return;
+                // if (!(subtable instanceof RuntimeListControl)) return
+                if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
                 var createRows = function(len) {
                     // @ts-ignore
@@ -543,6 +537,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var createdNewRows = [];
                 var createdNewRowsData = [];
                 var deleted = [];
+                var isDeleteLastOne = false;
                 if (type && args) {
                     // const subtableOldLength = subtable.children.length
                     switch(type){
@@ -579,6 +574,13 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             } else {
                                 var // @ts-ignore
                                 _subtable_children2;
+                                // 从哪儿开始
+                                var start1 = args[0];
+                                // 替换几个
+                                var replace1 = args[1];
+                                if (start1 + replace1 === subtable.children.length - 1) {
+                                    isDeleteLastOne = true;
+                                }
                                 (_subtable_children2 = subtable.children)[type].apply(_subtable_children2, _to_consumable_array(args));
                                 this.runtime.getFlatInstances();
                             }
@@ -607,7 +609,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             changed: createdNewRows,
                             data: createdNewRowsData,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
-                            jsonValue: JSON.stringify(this.getState(subtable.id))
+                            jsonValue: JSON.stringify(this.getState(subtable.id)),
+                            isDeleteLastOne: isDeleteLastOne,
+                            type: type,
+                            args: args
                         })
                     });
                     // 主动清空本次任务中的options
@@ -650,7 +655,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
-                            deleted: oldValue !== null && oldValue !== void 0 ? oldValue : []
+                            deleted: oldValue !== null && oldValue !== void 0 ? oldValue : [],
+                            type: "push"
                         })
                     });
                 } else {
@@ -687,7 +693,32 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "listControlCreateRow",
             value: function listControlCreateRow(instance, rowType) {
-                var row = this.runtime.createControlInstance(rowType);
+                var row;
+                if (rowType === "subtable-row") {
+                    row = {
+                        children: [],
+                        controlType: CONTROL_BASE_TYPE.LAYOUT,
+                        id: genNonDuplicateId(),
+                        type: "subtable-row",
+                        props: {
+                            caption: "",
+                            isHide: false,
+                            style: {
+                                height: "",
+                                heightConfig: "fill",
+                                width: "",
+                                widthConfig: "fill"
+                            }
+                        },
+                        fieldType: undefined,
+                        customEvents: [],
+                        pageStatus: 0,
+                        rules: [],
+                        parent: undefined
+                    };
+                } else {
+                    row = this.runtime.createControlInstance(rowType);
+                }
                 if (!row) return;
                 // if (row instanceof RuntimeLayoutControl) {
                 // @ts-ignore
@@ -697,8 +728,32 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var template = JSONCopy(instance.props.headers);
                     // @ts-ignore
                     var columns = this.createControl(template);
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = columns[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var column = _step.value;
+                            if (!column.parent) {
+                                this.runtime.resetInstanceParent(column, inst);
+                            }
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
                     (_inst_children = inst.children).push.apply(_inst_children, _to_consumable_array(columns));
                 }
+                //@ts-ignore
+                row.parent = instance;
                 return row;
             }
         },
@@ -818,6 +873,12 @@ 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) {
@@ -945,7 +1006,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 var dataBind = dataBindMapping1.dataBind, controlId1 = dataBindMapping1.controlId;
                 var state = this.getState(controlId1, rowIndex);
-                if (_instanceof(dataBind, ObjectDataBind)) {
+                //if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind)) {
                     return Object.entries(dataBind).reduce(function(result, param) {
                         var _param = _sliced_to_array(param, 2), key = _param[0], dataBind = _param[1];
                         // objectDataBind的元素，跳过下一次赋值
@@ -1052,7 +1114,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     return;
                 }
                 var dataBind = dataBindMapping.dataBind, controlId = dataBindMapping.controlId;
-                if (_instanceof(dataBind, ObjectDataBind)) {
+                // if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind)) {
                     var _JSONCopy;
                     var oldState = (_JSONCopy = JSONCopy(this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : this.getEmptyState(controlId);
                     // fieldCode不代表是key，所以需要找到对应的key
@@ -1094,7 +1157,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind)) {
                         var _JSONCopy;
                         var oldState = (_JSONCopy = JSONCopy(_this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
@@ -1124,7 +1188,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function buildFields(dataCode, state) {
                 var _this = this;
                 var mapping = this.getDataBindMapping(dataCode);
-                if (!mapping) {
+                if (!mapping || !mapping.fields) {
                     return;
                 }
                 var skipKeys = [];
@@ -1138,7 +1202,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind)) {
                         var oldState = _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
                         result[item.controlId] = Object.entries(dataBind).reduce(function(result, param) {
@@ -1184,24 +1249,34 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         } else {
                             newState[mapping.dataViewId][mapping.controlId] = [];
                         }
+                        var cacheEmptyState = {};
+                        var cacheFieldMapping = {};
                         entity.map(function(row) {
                             var newRow = JSONCopy(_this.store.emptyState[mapping.dataViewId][mapping.controlId]);
                             var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                             ;
                             Object.keys(row).map(function(fieldCode) {
-                                var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
                                 if (skipKey.includes(fieldCode)) {
                                     return;
                                 }
-                                var fieldMapping = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
-                                    return i.fieldCode === fieldCode;
-                                });
+                                if (cacheFieldMapping.hasOwnProperty(fieldCode) === false) {
+                                    var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
+                                    cacheFieldMapping[fieldCode] = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
+                                        return i.fieldCode === fieldCode;
+                                    });
+                                }
+                                var fieldMapping = cacheFieldMapping[fieldCode];
                                 if (fieldMapping) {
-                                    if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
+                                    if (// fieldMapping.dataBind instanceof DataBind &&
+                                    isDataBind(fieldMapping.dataBind) && row[fieldCode] !== undefined) {
                                         newRow[fieldMapping.controlId] = row[fieldCode];
-                                    } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
-                                        var _this_getEmptyState;
-                                        var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
+                                    // } else if (fieldMapping.dataBind instanceof ObjectDataBind) {
+                                    } else if (!isDataBind(fieldMapping.dataBind)) {
+                                        if (cacheEmptyState.hasOwnProperty(fieldMapping.controlId) === false) {
+                                            var _this_getEmptyState;
+                                            cacheEmptyState[fieldMapping.controlId] = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
+                                        }
+                                        var objValue = cacheEmptyState[fieldMapping.controlId];
                                         Object.keys(fieldMapping.dataBind).map(function(key) {
                                             var dataBind = fieldMapping.dataBind[key];
                                             if (row[dataBind.fieldCode] !== undefined) {
@@ -1232,9 +1307,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     if (!newState[mapping.dataViewId[0]]) {
                                         newState[mapping.dataViewId[0]] = {};
                                     }
-                                    if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
+                                    if (// mapping.dataBind instanceof DataBind &&
+                                    isDataBind(mapping.dataBind) && entity[fieldCode] !== undefined) {
                                         newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode] !== undefined ? entity[fieldCode] : emptyState[mapping.dataViewId[0]][mapping.controlId];
-                                    } else if (_instanceof(mapping.dataBind, ObjectDataBind)) {
+                                    // } else if (mapping.dataBind instanceof ObjectDataBind) {
+                                    } else if (!isDataBind(mapping.dataBind)) {
                                         var _this_getEmptyState;
                                         var objValue = (_this_getEmptyState = _this.getEmptyState(mapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {};
                                         Object.keys(mapping.dataBind).map(function(key) {
@@ -1312,7 +1389,59 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 获取组件实例，明细表中的组件将会得到数组, 第二个参数为(false/不传入)则获取到的是明细表内不包含表头内实例的所有控件实例，传入true则获取到包含表头内实例的所有控件实例,表头内实例永远在下标0的位置
    * @param controlId
    * @param header 明细表内是否获取表头的控件
-   */ key: "getInstances",
+   */ // 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",
             value: function getInstances(controlId) {
                 var header = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
                 // const cc = console
@@ -1322,41 +1451,15 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // cc.timeEnd(label)
                     return this.runtime.flatInstances;
                 }
-                var instances = Array.from(this.runtime.instanceMap[controlId] || []);
+                var instances = this.runtime.instanceMap[controlId] || [];
                 if (header) {
-                    // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
-                    if (instances.length) {
-                        var instance = instances[0];
-                        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);
-                                }
-                            }
+                    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] || [];
                         }
                     }
                 }
@@ -1464,6 +1567,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 return isString(types) ? instance.type === types : types.includes(instance.type);
             }
         },
+        {
+            key: "assertInstanceIsCustomControl",
+            value: /**
+   * 判断控件或控件类型是一个自定义控件
+   * */ function assertInstanceIsCustomControl(instance) {
+                return !isBuiltInControls(isString(instance) ? instance : instance.type);
+            }
+        },
         {
             key: "getInstanceRowIndex",
             value: /**
@@ -1471,28 +1582,57 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 如果控件在表头内，则返回-1
    * 如果控件在表内，则返回行下标
    * 如果控件不在明细表内，则返回undefined
-   * */ function getInstanceRowIndex(instance) {
+   * */ // 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) {
                 if (!instance.parent) {
                     return;
                 }
                 var rowIndex;
                 // @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
-                        var index = instance.parent.children.findIndex(function(item) {
-                            return item === instance;
-                        });
-                        if (index > -1) {
-                            rowIndex = index;
+                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;
+                            }
                         }
                     }
-                } else {
-                    rowIndex = this.getInstanceRowIndex(instance.parent);
                 }
                 return rowIndex;
             }
@@ -1578,12 +1718,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "register",
             value: // 注册外部控件
-            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));
+            function register(control) {
+                return Runtime.register(control, "Runtime");
             }
         },
         {
@@ -1595,4 +1731,5 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     ]);
     return Engine;
 }(Watcher);
+// @ts-ignore
 export { Engine };

package/dist/esm/common/OkWorker.js

@@ -77,7 +77,9 @@ var OkWorker = /*#__PURE__*/ function() {
             key: "createWorkerFunction",
             value: function createWorkerFunction() {
                 return function() {
-                    var createHandler = function createHandler(parentKey) {
+                    log("‍\uD83D\uDE80 worker running");
+                    var _self = self;
+                    function createHandler(parentKey) {
                         return {
                             get: function get(target, key, value) {
                                 return Reflect.get(target, key, value);
@@ -92,9 +94,7 @@ var OkWorker = /*#__PURE__*/ function() {
                                 return Reflect.set(target, key, value);
                             }
                         };
-                    };
-                    log("‍\uD83D\uDE80 worker running");
-                    var _self = self;
+                    }
                     // function createProxy(
                     // 	obj: Record<string, unknown> | Array<Record<string, unknown>>,
                     // 	parentKey?: string