@byteluck-fe/model-driven-engine 2.2.0 → 2.2.1-test.1

package/dist/esm/common/Engine.js

@@ -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,14 +431,16 @@ 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];
@@ -446,12 +449,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 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 +474,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) {
@@ -562,7 +564,7 @@ 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;
         }
@@ -879,7 +881,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 +1135,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 +1172,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         }
+        // @ts-ignore
         return instances;
     };
     _proto.setInstance = function setInstance(instance, props, value, rowIndex) {
@@ -1191,7 +1191,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 +1314,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

@@ -114,6 +114,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") {
+                return;
+            }
             instances.push(item);
             if (!instanceMap[item.id]) {
                 instanceMap[item.id] = [];

package/dist/esm/common/proxyState.js

@@ -32,6 +32,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
 import { error, logerror } from "@byteluck-fe/model-driven-shared";
+var cc = console;
 var proxyArrayApi = [
     "splice",
     "push",
@@ -221,15 +222,21 @@ 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) {

package/dist/esm/utils/runtimeUtils.js

@@ -14,15 +14,12 @@ 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)) {
                 callback(item);
             }
@@ -33,9 +30,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