@byteluck-fe/model-driven-engine 2.8.0-alpha.1f → 2.8.0-alpha.1h

package/dist/esm/common/Engine.js

@@ -649,9 +649,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     //   this.setStates(newValue[i], i, options)
                     // }
                     var deleted = oldValue !== null && oldValue !== void 0 ? oldValue : [];
-                    if ((eventOptionsTemp === null || eventOptionsTemp === void 0 ? void 0 : eventOptionsTemp.listChange) === "noDelete") {
-                        deleted = [];
-                    }
                     this.emit("list-change", {
                         instance: instance,
                         value: value,
@@ -1360,9 +1357,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                 });
                 this.debugLog("engine setData方法数据组合完成，参数为%o。", newState);
-                this.setStates(newState, undefined, _object_spread({
-                    listChange: "noDelete"
-                }, options));
+                this.setStates(newState, undefined, options);
                 this.debugLog("engine setData方法执行完成。");
             }
         },
@@ -1464,15 +1459,42 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // cc.timeEnd(label)
                     return this.runtime.flatInstances;
                 }
-                var instances = this.runtime.instanceMap[controlId] || [];
+                var instances = Array.from(this.runtime.instanceMap[controlId] || []);
                 if (header) {
-                    var instance = instances[0];
-                    if (instance) {
-                        var _instance_parent;
-                        // @ts-ignore
-                        var parentId = (_instance_parent = instance.parent) === null || _instance_parent === void 0 ? void 0 : _instance_parent.id;
-                        if (parentId) {
-                            instances = this.runtime.instanceMap[parentId] || [];
+                    // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
+                    if (instances.length) {
+                        var instance = instances[0];
+                        // if (this.inList(instance.id) === true) {
+                        if (this.inList(instance.id) !== undefined) {
+                            var headerInstance = this.getInstanceInSubtableHeader(instance);
+                            if (headerInstance) {
+                                instances.unshift(headerInstance);
+                            }
+                        }
+                    } else {
+                        var _this_getControlIdMapping;
+                        var controlIdMapping = (_this_getControlIdMapping = this.getControlIdMapping()) !== null && _this_getControlIdMapping !== void 0 ? _this_getControlIdMapping : {};
+                        var _Object_entries_find;
+                        var _ref = _sliced_to_array((_Object_entries_find = Object.entries(controlIdMapping).find(function(param) {
+                            var _param = _sliced_to_array(param, 2), _ = _param[0], mapping = _param[1];
+                            return mapping.children && controlId in mapping.children;
+                        })) !== null && _Object_entries_find !== void 0 ? _Object_entries_find : [], 1), subtableId = _ref[0];
+                        if (subtableId) {
+                            var subtable = this.getInstance(subtableId);
+                            // @ts-ignore
+                            var headerColumn = subtable.props.headers.find(function(column) {
+                                return column.children.find(function(item) {
+                                    return item.id === controlId;
+                                });
+                            });
+                            if (headerColumn) {
+                                var headerInstance1 = headerColumn.children.find(function(item) {
+                                    return item.id === controlId;
+                                });
+                                if (headerInstance1) {
+                                    instances.unshift(headerInstance1);
+                                }
+                            }
                         }
                     }
                 }
@@ -1630,7 +1652,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE_COLUMN) && this.assertInstance(instance.parent.parent, CONTROL_TYPE.SUBTABLE)) {
                     rowIndex = -1;
                 } else {
                     var isColumnChild = this.getInstanceParentControl(instance, // @ts-ignore