@byteluck-fe/model-driven-engine 1.7.6-bete.20 → 1.7.6-bete.21

package/dist/esm/common/Engine.js

@@ -341,6 +341,7 @@ 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 = {};
@@ -434,7 +435,6 @@ 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 cc = console;
         var now = Date.now();
         cc.log("㊗️_proxyStateBeforeSetCallback findItem " + key, newValue, oldValue);
@@ -447,6 +447,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
         // @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];
@@ -455,12 +458,10 @@ 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)));
+                return checkerSubtableValue(fieldTypeMap, row, emptyState);
             });
         }
         var keys = key.split(".");
@@ -592,30 +593,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var index = this.getInstanceRowIndex(instance);
         var options = eventOptionsTemp || {};
         if (_instanceof(instance, RuntimeListControl)) {
-            // const hasValue = Object.keys(instance.rowProps).length > 0
-            // debugger
-            // if (!hasValue) {
-            //     instance.children = instance.props.headers.map((header) => {
-            //       // instance.rowProps[header.id] = (this.createInstance as any)(
-            //       //   header.controlType
-            //       // )
-            //       return (this.createInstance as any)(
-            //         header.controlType
-            //       )
-            //     })
-            // }
             // instance.children.length = 0
+            this.initSubTableRowPropsFromInstanceHeaders(instance);
             var newValue = value;
             // @ts-ignore
             var newRows = [];
-            // JUTODO 这里template就是headers对应的  subtable-columns
-            // JUTODO 需要新增一种 subtableRow 的数据结构
-            // 同时，可以以其中一行进行缓存，作为 subtable-headers-columns 的公共列的instance
-            // 究竟要去 subtableRow 中取 props 还是 去 公共header instance 取？
-            // 答：始终应该取 subtableRow 的props，因为它是从 subtable-headers-columns 里copy下来的，并且可能会被同行的其他列修改
-            // const rowID =
-            // const subtableRow = genSubTableRowInstanceFromHeaders(instance.props.headers)
-            //   instance.setRowProps()
+            this.initSubTableRowPropsFromProxySetNewValue(instance, value);
             // for (let i = 0; i < newValue.length; i++) {
             //   // @ts-ignore
             //   const row = this.listControlCreateRow(instance, 'subtable-row')
@@ -624,10 +607,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             // @ts-ignore
             // instance.children.push(...newRows)
             this.runtime.getFlatInstances();
-            // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
-            // for (let i = 0; i < newValue.length; i++) {
-            //   this.setStates(newValue[i], i, options)
-            // }
             this.emit("list-change", {
                 instance: instance,
                 value: value,
@@ -1064,7 +1043,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var _this = this;
         this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
         var newState = {};
-        debugger;
+        // debugger
         Object.keys(dataSet).map(function(dataCode) {
             var entity = dataSet[dataCode];
             if (Array.isArray(entity)) {
@@ -1362,6 +1341,27 @@ 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++){

package/dist/esm/common/SubTableSpeedUp.js

@@ -6,9 +6,12 @@ headers) {
     var subtableRow = headers.reduce(function(pre, cur) {
         var children = cur.children;
         children.forEach(function(control) {
-            pre[control.id] = cloneDeep(control.props);
+            pre[control.id] = copyPropsFromControlInstance(control);
         });
         return pre;
     }, {});
     return subtableRow;
 }
+function copyPropsFromControlInstance(control) {
+    return cloneDeep(control.props);
+}