@byteluck-fe/model-driven-engine 2.2.0 → 2.2.1-beta.2

package/dist/esm/common/Engine.js

@@ -333,8 +333,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { DataBind, ObjectDataBind, RuntimeFormControl, RuntimeLayoutControl, RuntimeListControl } from "@byteluck-fe/model-driven-core";
-import { CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
+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 { Runtime } from "./Runtime";
 import { Store } from "./Store";
 import { findItem, proxyState } from "./proxyState";
@@ -358,6 +358,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         _classCallCheck(this, Engine);
         var _this;
         _this = _super.call(this);
+        _this.rawStore = {};
         // 提供子线程处理脚本以及修改数据的能力
         // public worker: OkWorker
         _this.isMounted = false;
@@ -430,28 +431,30 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         this.store.state = proxyState(this.store.state, this._proxyStateCallback.bind(this), this._proxyStateBeforeSetCallback.bind(this));
     };
     _proto._proxyStateBeforeSetCallback = function _proxyStateBeforeSetCallback(state, key, newValue, oldValue) {
-        var _this = this;
-        var instance = findItem(this.runtime.flatInstances, key);
+        var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
         // 找不到控件说明不是改动控件上的字段，直接通过
         if (!instance) {
             return newValue;
         }
         // @ts-ignore
         if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE)) {
+            if (newValue === null) {
+                return [];
+            }
             // @ts-ignore
             var fieldTypeMap = instance.props.headers.reduce(function(result, column) {
                 var formInstance = column.children[0];
-                if (formInstance && _instanceof(formInstance, RuntimeFormControl)) {
+                // if (formInstance && formInstance instanceof RuntimeFormControl) {
+                if (formInstance && formInstance.controlType === CONTROL_BASE_TYPE.FORM) {
                     result[formInstance.id] = formInstance.fieldType;
                 }
                 return result;
             }, {});
-            if (newValue === null) {
-                return [];
-            }
+            // @ts-ignore
+            var emptyState = this.getEmptyState(instance.id);
             return newValue.map(function(row) {
                 return(// @ts-ignore
-                checkerSubtableValue(fieldTypeMap, row, _this.getEmptyState(instance.id)));
+                checkerSubtableValue(fieldTypeMap, row, emptyState));
             });
         }
         var keys = key.split(".");
@@ -472,7 +475,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     };
     _proto._handlerArrayUpdate = function _handlerArrayUpdate(state, key, type, args, result) {
         var _this = this;
-        var subtable = findItem(this.runtime.flatInstances, key);
+        var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
         if (!_instanceof(subtable, RuntimeListControl)) return;
         // 新增多行方法
         var createRows = function(len) {
@@ -554,7 +557,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 options: Object.assign({}, options, {
                     changed: createdNewRows,
                     data: createdNewRowsData,
-                    deleted: deleted !== null && deleted !== void 0 ? deleted : []
+                    deleted: deleted !== null && deleted !== void 0 ? deleted : [],
+                    jsonValue: JSON.stringify(this.getState(subtable.id))
                 })
             });
             // 主动清空本次任务中的options
@@ -562,13 +566,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerObjectUpdate = function _handlerObjectUpdate(state, key, value, oldValue) {
-        var instance = findItem(this.runtime.flatInstances, key);
+        var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
         if (!instance) {
             return;
         }
         var index = this.getInstanceRowIndex(instance);
         var options = eventOptionsTemp || {};
-        if (_instanceof(instance, RuntimeListControl)) {
+        // if (instance instanceof RuntimeListControl) {
+        if (instance.controlType === CONTROL_BASE_TYPE.LIST) {
             var // @ts-ignore
             _instance_children;
             instance.children.length = 0;
@@ -626,12 +631,15 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.listControlCreateRow = function listControlCreateRow(instance, rowType) {
         var row = this.runtime.createControlInstance(rowType);
         if (!row) return;
-        if (_instanceof(row, RuntimeLayoutControl)) {
-            var _row_children;
+        // if (row instanceof RuntimeLayoutControl) {
+        // @ts-ignore
+        if (row.controlType === CONTROL_BASE_TYPE.LAYOUT) {
+            var _inst_children;
+            var inst = row;
             var template = JSONCopy(instance.props.headers);
             // @ts-ignore
             var columns = this.createControl(template);
-            (_row_children = row.children).push.apply(_row_children, _toConsumableArray(columns));
+            (_inst_children = inst.children).push.apply(_inst_children, _toConsumableArray(columns));
         }
         return row;
     };
@@ -879,7 +887,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     for(var keyChi1 in item[keyChi]){
                                         var _controlIdMapping_key_children_keyChi2;
                                         objChi[(_controlIdMapping_key_children_keyChi2 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi2 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi2.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
-                                    // 
+                                    //
                                     }
                                 }
                             }
@@ -1133,15 +1141,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         if (controlId === undefined) {
             return this.runtime.flatInstances;
         }
-        var instances = this.runtime.flatInstances.filter(// @ts-ignore
-        function(item) {
-            return item.id === controlId;
-        });
+        var instances = this.runtime.instanceMap[controlId] || [];
         if (header) {
             // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
             if (instances.length) {
                 var instance = instances[0];
-                if (this.getInstanceRowIndex(instance) !== undefined) {
+                if (this.inList(instance.id) === true) {
                     var headerInstance = this.getInstanceInSubtableHeader(instance);
                     if (headerInstance) {
                         instances.unshift(headerInstance);
@@ -1173,6 +1178,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         }
+        // @ts-ignore
         return instances;
     };
     _proto.setInstance = function setInstance(instance, props, value, rowIndex) {
@@ -1191,7 +1197,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             this.schemaEvent("schema-change", {
                 instance: _instance,
                 props: props,
-                value: value
+                value: value,
+                rowIndex: rowIndex
             });
         } catch (e) {
             throw e;
@@ -1313,6 +1320,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.getControlConfig = function getControlConfig(control) {
         return this.runtime.getControlConfig(control);
     };
+    _proto.inList = function inList(controlId) {
+        var mapping = this.store.controlIdMapping;
+        var result = Object.keys(mapping).some(function(key) {
+            var _mapping_key, _mapping_key_children;
+            return (_mapping_key = mapping[key]) === null || _mapping_key === void 0 ? void 0 : (_mapping_key_children = _mapping_key.children) === null || _mapping_key_children === void 0 ? void 0 : _mapping_key_children.hasOwnProperty(controlId);
+        });
+        return result;
+    };
     // 注册外部控件
     Engine.register = function register() {
         for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){

package/dist/esm/common/Runtime.js

@@ -42,13 +42,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _setPrototypeOf(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 _possibleConstructorReturn(self, call) {
     if (call && (_typeof(call) === "object" || typeof call === "function")) {
         return call;
@@ -90,8 +83,8 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { RuntimeFormControl, RuntimeListControl, RegisterControls } from "@byteluck-fe/model-driven-core";
-import { CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
+import { RegisterControls } from "@byteluck-fe/model-driven-core";
+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";
@@ -114,6 +107,10 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         var instances = [];
         var instanceMap = {};
         loop(this._instance, function(item) {
+            // 3.4.1 避免将subtable-row 放到 _flatInstances 中
+            if (item.type === "subtable-row" || item.type === "subtable-column") {
+                return;
+            }
             instances.push(item);
             if (!instanceMap[item.id]) {
                 instanceMap[item.id] = [];
@@ -156,7 +153,11 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 loopDataViewControl(this._instance, function(dataView) {
                     ruleItems[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
-                        if (_instanceof(item, RuntimeFormControl) || _instanceof(item, RuntimeListControl)) {
+                        // if (
+                        //   item instanceof RuntimeFormControl ||
+                        //   item instanceof RuntimeListControl
+                        // ) {
+                        if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
                             buildControlRules(ruleItems[dataView.id].fields, item);
                         }
                     });
@@ -171,7 +172,11 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 loopDataViewControl(this._instance, function(dataView) {
                     antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
-                        if (_instanceof(item, RuntimeFormControl) || _instanceof(item, RuntimeListControl)) {
+                        // if (
+                        //   item instanceof RuntimeFormControl ||
+                        //   item instanceof RuntimeListControl
+                        // ) {
+                        if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
                             buildControlAntdRules(antdRules[dataView.id].fields, item);
                         }
                     });
@@ -211,7 +216,8 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         data[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
         data[item.id] = item.rules;
@@ -242,7 +248,8 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         antdRules[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];

package/dist/esm/common/Store.js

@@ -23,8 +23,8 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-import { RuntimeFormControl, DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
-import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+import { DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
+import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from "@byteluck-fe/model-driven-shared";
 import { loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
 var Store = /*#__PURE__*/ function() {
     "use strict";
@@ -202,7 +202,8 @@ function init(instance) {
 }
 function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    //if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         dataViewState[item.id] = JSONCopy(item.props.defaultValue);
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
@@ -219,7 +220,8 @@ item) {
 }
 function buildDataBindMapping(data, dataViewId, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         if (_instanceof(item.props.dataBind, ObjectDataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
             Object.keys(item.props.dataBind).map(function(key) {
@@ -303,7 +305,8 @@ item) {
 }
 function buildControlIdMapping(data, dataViewId, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         data[item.id] = {
             dataBind: item.props.dataBind,
             options: [],

package/dist/esm/common/proxyState.js

@@ -6,13 +6,6 @@ function _arrayLikeToArray(arr, len) {
 function _arrayWithoutHoles(arr) {
     if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -30,8 +23,8 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
-import { error, logerror } from "@byteluck-fe/model-driven-shared";
+var cc = console;
+import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -221,27 +214,33 @@ function flatInstanceForChildren(controls) {
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key) {
+ * */ export function findItem(flatInstance, key, instanceMap) {
     if (key === "") return undefined;
     var keys = key.split(".");
     if (keys.length === 0) return undefined;
     var oneKey = keys[0];
     var otherKeys = keys.slice(1);
-    var initInstance = flatInstance.find(function(item) {
-        return item.id === oneKey;
-    });
+    // 3.4.1 优化速度，读取instanceMap
+    // cc.time('findItem flatInstance find')
+    // const initInstance = flatInstance.find((item) => item.id === oneKey)
+    // cc.log('🏠 findItem flatInstance find result', initInstance)
+    // cc.timeEnd('findItem flatInstance find')
+    // cc.time('findItem instanceMap match')
+    var initInstance = instanceMap[oneKey] ? instanceMap[oneKey][0] : undefined;
+    // cc.log('🏠 findItem instanceMap match result', initInstance)
+    // cc.timeEnd('findItem instanceMap match')
     if (otherKeys.length === 0) return initInstance;
     // @ts-ignore
     return otherKeys.reduce(function(prevItem, key) {
         var index = Number(key);
         var isNotIndex = Number.isNaN(index);
-        if (isNotIndex) {
+        if (isNotIndex && prevItem) {
             var flatChildren = (prevItem === null || prevItem === void 0 ? void 0 : prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
             var findEndItem = flatChildren === null || flatChildren === void 0 ? void 0 : flatChildren.find(function(item) {
                 return item.id === key;
             });
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
-            return findEndItem ? findEndItem : _instanceof(prevItem, RuntimeFormControl) ? prevItem : undefined;
+            return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
         } else {
             var _prevItem_children;
             var _prevItem_children_index;

package/dist/esm/utils/runtimeUtils.js

@@ -1,11 +1,3 @@
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
-import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
 import { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 export function hasChildrenControl(instance) {
     return instance.controlType === CONTROL_BASE_TYPE.LAYOUT || instance.controlType === CONTROL_BASE_TYPE.WRAP || instance.controlType === CONTROL_BASE_TYPE.LIST || instance.controlType === CONTROL_BASE_TYPE.SEARCH;
@@ -14,16 +6,13 @@ export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {
             //TODO 此处需要再抽象一层 datagrid/datalist
-            // @ts-ignore
             if (item.type === CONTROL_TYPE.SUBTABLE) {
                 // @ts-ignore
                 var children = item.getChildrenFormControl();
                 callback(item, children);
             } else if (hasChildrenControl(item)) {
-                // @ts-ignore
                 loopFormControl(item === null || item === void 0 ? void 0 : item.children, callback);
-            // @ts-ignore
-            } else if (_instanceof(item, RuntimeFormControl)) {
+            } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {
                 callback(item);
             }
         });
@@ -33,9 +22,7 @@ export function loopDataViewControl(control, // @ts-ignore
 callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {
-            if (// @ts-ignore
-            item.type === CONTROL_TYPE.DATA_VIEW || // @ts-ignore
-            item.type === CONTROL_TYPE.SIMPLE_SEARCH) {
+            if (item.type === CONTROL_TYPE.DATA_VIEW || item.type === CONTROL_TYPE.SIMPLE_SEARCH) {
                 callback(item);
             } else if (hasChildrenControl(item)) {
                 // @ts-ignore