@byteluck-fe/model-driven-engine 2.1.0-beta.1 → 2.1.0-beta.2

package/dist/esm/common/Engine.js

@@ -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);
+        var instance = findItem(this.runtime.flatInstances, key, this.store, this.runtime);
         // 找不到控件说明不是改动控件上的字段，直接通过
         if (!instance) {
             return newValue;
@@ -473,7 +473,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerArrayUpdate = function _handlerArrayUpdate(state, key, type, args, result) {
-        var subtable = findItem(this.runtime.flatInstances, key);
+        var subtable = findItem(this.runtime.flatInstances, key, this.store, this.runtime);
         if (!_instanceof(subtable, RuntimeListControl)) return;
         // 新增多行方法
         // JUTODO 这里已经直接删除了创建instance 的逻辑，或许以后连这个函数都不需要调用了
@@ -556,7 +556,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.store, this.runtime);
         if (!instance) {
             return;
         }

package/dist/esm/common/SubTableSpeedUp.js

@@ -12,6 +12,6 @@ headers) {
     }, {});
     return subtableRow;
 }
-function copyPropsFromControlInstance(control) {
+export function copyPropsFromControlInstance(control) {
     return cloneDeep(control.props);
 }

package/dist/esm/common/proxyState.js

@@ -30,8 +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 } from "@byteluck-fe/model-driven-core";
-import { error, logerror } from "@byteluck-fe/model-driven-shared";
+import { RuntimeFormControl, RuntimeListControl } from "@byteluck-fe/model-driven-core";
+import { error, log, logerror, warn } from "@byteluck-fe/model-driven-shared";
+import { copyPropsFromControlInstance } from "./SubTableSpeedUp";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -217,14 +218,94 @@ 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;
+                }
+            }
+            warn("未找到 明细子表控件", keys);
+            return undefined;
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+};
 /**
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key) {
+ * */ export function findItem(flatInstance, key, store, runtime) {
     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;
+        // 当 rowProps 中没有对应的 rowProps时候，进行copy
+        if (!subTableInstance.rowProps[rowUid]) {
+            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;
+            }
+            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) {