@byteluck-fe/model-driven-engine 2.1.0-beta.4 → 2.1.0-sourcemap.10

package/dist/esm/common/Engine.js

@@ -333,7 +333,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { DataBind, ObjectDataBind, RuntimeFormControl, RuntimeListControl } from "@byteluck-fe/model-driven-core";
+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 { Runtime } from "./Runtime";
 import { Store } from "./Store";
@@ -341,7 +341,6 @@ import { findItem, proxyState } from "./proxyState";
 import { ActionManager } from "./ActionManager";
 import { DataManager } from "./DataManager";
 import { checkerSubtableValue, checkerValue } from "./checkerValue";
-import { genSubTableRowInstanceFromHeaders } from "./SubTableSpeedUp";
 if (typeof window !== "undefined") {
     // @ts-ignore
     window.engines = {};
@@ -359,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;
@@ -431,7 +431,7 @@ 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 instance = findItem(this.runtime.flatInstances, key, this.store, this.runtime);
+        var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
         // 找不到控件说明不是改动控件上的字段，直接通过
         if (!instance) {
             return newValue;
@@ -473,12 +473,20 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerArrayUpdate = function _handlerArrayUpdate(state, key, type, args, result) {
-        var subtable = findItem(this.runtime.flatInstances, key, this.store, this.runtime);
+        var _this = this;
+        var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
         if (!_instanceof(subtable, RuntimeListControl)) return;
         // 新增多行方法
-        // JUTODO 这里已经直接删除了创建instance 的逻辑，或许以后连这个函数都不需要调用了
         var createRows = function(len) {
-            return [];
+            // @ts-ignore
+            var newRows = [];
+            for(var i = 0; i < len; i++){
+                // @ts-ignore
+                var row = _this.listControlCreateRow(subtable, "subtable-row");
+                row && newRows.push(row);
+            }
+            // @ts-ignore
+            return newRows;
         };
         var options = eventOptionsTemp;
         // @ts-ignore
@@ -556,17 +564,26 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerObjectUpdate = function _handlerObjectUpdate(state, key, value, oldValue) {
-        var instance = findItem(this.runtime.flatInstances, key, this.store, this.runtime);
+        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)) {
+            var // @ts-ignore
+            _instance_children;
             instance.children.length = 0;
             var newValue = value;
             // @ts-ignore
             var newRows = [];
+            for(var i = 0; i < newValue.length; i++){
+                // @ts-ignore
+                var row = this.listControlCreateRow(instance, "subtable-row");
+                row && newRows.push(row);
+            }
+            (_instance_children = instance.children).push.apply(_instance_children, _toConsumableArray(newRows));
+            this.runtime.getFlatInstances();
             // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
             // for (let i = 0; i < newValue.length; i++) {
             //   this.setStates(newValue[i], i, options)
@@ -609,13 +626,23 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         this.__pluginsApplied = true;
     };
     _proto.listControlCreateRow = function listControlCreateRow(instance, rowType) {
-        throw new Error("该api已废弃");
+        var row = this.runtime.createControlInstance(rowType);
+        if (!row) return;
+        if (_instanceof(row, RuntimeLayoutControl)) {
+            var _row_children;
+            var template = JSONCopy(instance.props.headers);
+            // @ts-ignore
+            var columns = this.createControl(template);
+            (_row_children = row.children).push.apply(_row_children, _toConsumableArray(columns));
+        }
+        return row;
     };
     _proto.listControlAddRow = function listControlAddRow(instance) {
         var // @ts-ignore
         rowType = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "subtable-row";
-        // JUTODO 这似乎是个二开api
-        throw new Error("该api已废弃");
+        var row = this.listControlCreateRow(instance, rowType);
+        if (!row) return;
+        instance.children.push(row);
     };
     // payload应该是runtimeSchema和value，然后通过runTimeSchema去找需要修改的data里边的key
     _proto.emit = function emit(eventKey, payload) {
@@ -1105,13 +1132,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * @param header 明细表内是否获取表头的控件
    */ _proto.getInstances = function getInstances(controlId) {
         var header = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+        var cc = console;
+        var label = "\uD83D\uDC11 genInstances " + controlId + " " + Date.now();
+        cc.time(label);
         if (controlId === undefined) {
+            cc.timeEnd(label);
             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) {
@@ -1148,6 +1176,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         }
+        cc.timeEnd(label);
         return instances;
     };
     _proto.setInstance = function setInstance(instance, props, value, rowIndex) {
@@ -1288,27 +1317,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.getControlConfig = function getControlConfig(control) {
         return this.runtime.getControlConfig(control);
     };
-    _proto.initSubTableRowPropsFromInstanceHeaders = function initSubTableRowPropsFromInstanceHeaders(instance) {
-        var cc = console;
-        var now = Date.now();
-        var timeLabel = "\uD83D\uDC2E  initSubTableRowPropsFromInstanceHeaders " + now;
-        cc.time(timeLabel);
-        /**headers实际 是 SubTableColumnControl的数组 */ Object.assign(instance.rowProps, genSubTableRowInstanceFromHeaders(instance.props.headers));
-        cc.timeEnd(timeLabel);
-    };
-    _proto.initSubTableRowPropsFromProxySetNewValue = function initSubTableRowPropsFromProxySetNewValue(instance, value) {
-        var cc = console;
-        var now = Date.now();
-        var timeLabel = "\uD83D\uDC37  initSubTableRowPropsFromProxySetNewValue " + now;
-        cc.time(timeLabel);
-        value.forEach(function(item) {
-            Object.assign(instance.rowProps, {
-                // 这里只是做个性能测试，实际上需要merge rowProps，并且还需要一个恰当的key
-                now: genSubTableRowInstanceFromHeaders(instance.props.headers)
-            });
-        });
-        cc.timeEnd(timeLabel);
-    };
     // 注册外部控件
     Engine.register = function register() {
         for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){
@@ -1323,3 +1331,4 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     return Engine;
 }(Watcher);
 export { Engine };
+console.log("a");

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-column 放到 _flatInstances 中
+            if (item.type === "subtable-column") {
+                return;
+            }
             instances.push(item);
             if (!instanceMap[item.id]) {
                 instanceMap[item.id] = [];

package/dist/esm/common/proxyState.js

@@ -30,9 +30,9 @@ 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, RuntimeListControl } from "@byteluck-fe/model-driven-core";
-import { error, log, logerror, warn } from "@byteluck-fe/model-driven-shared";
-import { copyPropsFromControlInstance } from "./SubTableSpeedUp";
+import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
+import { error, logerror } from "@byteluck-fe/model-driven-shared";
+var cc = console;
 var proxyArrayApi = [
     "splice",
     "push",
@@ -218,99 +218,25 @@ function flatInstanceForChildren(controls) {
     });
     return result;
 }
-var findRowIndex = function(keys) {
-    return keys.find(isNumberString);
-};
-var isNumberString = function(item) {
-    return item === String(Number(item));
-};
-var isInSubtable = function(keys) {
-    return keys.some(isNumberString);
-};
-var findSubTableInstanceFromKeyPath = function(flatInstance, keys) {
-    if (keys.length < 2) {
-        warn("未找到 明细子表控件", keys);
-        return undefined;
-    }
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = flatInstance[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var instance = _step.value;
-            if (keys.includes(instance.id)) {
-                if (_instanceof(instance, RuntimeListControl)) {
-                    return instance;
-                }
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    warn("未找到 明细子表控件", keys);
-    return undefined;
-};
 /**
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key, store, runtime) {
+ * */ export function findItem(flatInstance, key, instanceMap) {
     if (key === "") return undefined;
     var keys = key.split(".");
     if (keys.length === 0) return undefined;
-    // 在明细子表里的，就直接给create 一个 instance，并从subtable instance上取得对应 目标的props 赋值上去
-    if (isInSubtable(keys)) {
-        console.log("findItem isInSubtable");
-        // 先找到 明细子表的instance
-        var subTableInstance = findSubTableInstanceFromKeyPath(flatInstance, keys);
-        if (!subTableInstance) {
-            return undefined;
-        }
-        // 再找到 明细子表的 state
-        var subTableState = store.getState(subTableInstance.id);
-        if (!subTableState) {
-            return undefined;
-        }
-        var rowIndex = Number(findRowIndex(keys));
-        if (!Number.isInteger(rowIndex)) {
-            return undefined;
-        }
-        // 最后找到 行 的state
-        var rowState = subTableState[rowIndex];
-        var rowUid = rowState.uid;
-        var headerInstances = subTableInstance.props.headers.map(function(v) {
-            return v.children[0];
-        });
-        var columnId = keys[keys.length - 1];
-        var targetInstance = headerInstances.find(function(i) {
-            return i.id === columnId;
-        });
-        if (!targetInstance) {
-            return undefined;
-        }
-        // 当 rowProps 中没有对应的 rowProps时候，进行copy
-        if (rowUid && !subTableInstance.rowProps[rowUid]) {
-            log("\uD83C\uDF1F copy rowProps", subTableInstance.id, rowUid, columnId);
-            subTableInstance.rowProps[rowUid] = copyPropsFromControlInstance(targetInstance);
-        }
-        // @ts-ignore
-        var tempInstance = runtime.createControlInstance(targetInstance.type);
-        return tempInstance;
-    }
     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) {