@byteluck-fe/model-driven-engine 2.22.0-beta.7 → 2.22.1-beta.1

package/dist/esm/common/Engine.js

@@ -549,7 +549,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             createdNewRows = createRows(newRowLengths);
                             createdNewRowsData = args;
                             (_subtable_children = subtable.children)[type].apply(_subtable_children, _to_consumable_array(createdNewRows));
-                            this.runtime.getFlatInstances();
                             break;
                         case 'splice':
                             if (args.length > 2) {
@@ -567,7 +566,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     start,
                                     replace
                                 ].concat(_to_consumable_array(createdNewRows)));
-                                this.runtime.getFlatInstances();
                             // newValues.forEach((item: any, index) => {
                             //   let newIndex = start + index
                             //   this.setStates(item, newIndex, options)
@@ -583,14 +581,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     isDeleteLastOne = true;
                                 }
                                 (_subtable_children2 = subtable.children)[type].apply(_subtable_children2, _to_consumable_array(args));
-                                this.runtime.getFlatInstances();
                             }
                             break;
                         default:
                             var // @ts-ignore
                             _subtable_children3;
                             (_subtable_children3 = subtable.children)[type].apply(_subtable_children3, _to_consumable_array(args));
-                            this.runtime.getFlatInstances();
                             break;
                     }
                     if (type === 'splice') {
@@ -605,6 +601,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                     var subtableData = this.getState(subtable.id);
                     this._handlerSubtableUpdateUid(subtableData);
+                    this.runtime.getFlatInstances();
                     this.emit('list-change', {
                         instance: subtable,
                         value: subtableData,
@@ -658,7 +655,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         row && newRows.push(row);
                     }
                     (_instance_children = instance.children).push.apply(_instance_children, _to_consumable_array(newRows));
-                    this.runtime.getFlatInstances();
                     // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
                     // for (let i = 0; i < newValue.length; i++) {
                     //   this.setStates(newValue[i], i, options)
@@ -666,6 +662,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var deleted = oldValue !== null && oldValue !== void 0 ? oldValue : [];
                     if ((options === null || options === void 0 ? void 0 : options.setData) === true) {
                         deleted = [];
+                    } else {
+                        this.runtime.getFlatInstances();
                     }
                     this._handlerSubtableUpdateUid(newValue);
                     this.emit('list-change', {
@@ -1401,6 +1399,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 this.setStates(newState, undefined, _object_spread({
                     setData: true
                 }, options));
+                this.runtime.getFlatInstances();
                 this.debugLog("engine setData方法执行完成。");
             }
         },
@@ -1505,12 +1504,16 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var instances = Array.from(this.runtime.instanceMap[controlId] || []);
                 if (header) {
                     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
-                    if (instances.length) {
-                        var instance = instances[0];
-                        var headerInstance = this.findSubtableHeadersControl(instance.id);
-                        if (headerInstance !== undefined) {
-                            instances.unshift(headerInstance);
-                        }
+                    // if (instances.length) {
+                    //   const instance: RuntimeControl = instances[0]
+                    //   const headerInstance = this.findSubtableHeadersControl(instance.id)
+                    //   if (headerInstance !== undefined) {
+                    //     instances.unshift(headerInstance)
+                    //   }
+                    // }
+                    var headerInstance = this.findSubtableHeadersControl(controlId);
+                    if (headerInstance !== undefined) {
+                        instances.unshift(headerInstance);
                     }
                 }
                 // @ts-ignore

package/dist/esm/common/Runtime.js

@@ -126,6 +126,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 var instanceMap = {};
                 var controlParentIdMap = {};
                 loop(this._instance, '', function(item, parentId) {
+                    var _item_parent;
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
                     //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
                     // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
@@ -145,6 +146,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                         }
                     }
                     instances.push(item);
+                    if (((_item_parent = item.parent) === null || _item_parent === void 0 ? void 0 : _item_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN && item.parent.parent === undefined) {
+                        return;
+                    }
                     instanceMap[item.id].push(item);
                 });
                 this._flatInstances = instances;
@@ -293,9 +297,9 @@ function loop(control, parentId, callback) {
         if (hasHeaderOrFooterControl(item, 'headers')) {
             loop(item.props.headers, item.id, callback);
         }
-        if (hasHeaderOrFooterControl(item, 'footers')) {
-            loop(item.props.footers, item.id, callback);
-        }
+    // if (hasHeaderOrFooterControl(item, 'footers')) {
+    //   loop((item.props as any).footers, item.id, callback)
+    // }
     });
 }
 function hasHeaderOrFooterControl(control, checkType) {

package/dist/esm/utils/runtimeUtils.js

@@ -6,7 +6,8 @@ export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {
             //TODO 此处需要再抽象一层 datagrid/datalist
-            if (item.type === CONTROL_TYPE.SUBTABLE) {
+            // if (item.type === CONTROL_TYPE.SUBTABLE) {
+            if (item.controlType === CONTROL_BASE_TYPE.LIST) {
                 // @ts-ignore
                 var children = []//item.getChildrenFormControl() as RuntimeFormControl[]
                 ;