@byteluck-fe/model-driven-engine 4.37.0-lx1 → 5.3.0-1-beta2

package/dist/esm/common/Engine.js

@@ -325,7 +325,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { isDataBind } from '@byteluck-fe/model-driven-core';
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, updateValueFromKeys, warn, Watcher, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
 import { Runtime } from './Runtime';
 import { Store } from './Store';
 import { findItem, proxyState } from './proxyState';
@@ -351,18 +351,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         _this = _call_super(this, Engine), _define_property(_this, "store", void 0), _define_property(_this, "rawStore", {}), _define_property(_this, "parent", void 0), // 提供注册运行态控件以及实例化控件的能力
         _define_property(_this, "runtime", void 0), // 提供子线程处理脚本以及修改数据的能力
         // public worker: OkWorker
-        _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), _define_property(_this, "externalParams", void 0), // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
+        _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), _define_property(_this, "externalParams", void 0), _define_property(_this, "children", void 0), // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
         _define_property(_this, "__plugins", void 0), _define_property(_this, "__pluginsApplied", false), _define_property(_this, "$options", void 0), _define_property(_this, "actionManager", new ActionManager()), _define_property(_this, "dataManager", void 0), _define_property(_this, "_jobTasks", []), _define_property(_this, "createControlInstance", _this.createInstance);
         _this.$options = Object.freeze(props);
         var _this_$options = _this.$options, _this_$options_autoMount = _this_$options.autoMount, autoMount = _this_$options_autoMount === void 0 ? true : _this_$options_autoMount, schema = _this_$options.schema, beforeCreateInstance = _this_$options.beforeCreateInstance, externalParams = _this_$options.externalParams, _this_$options_language = _this_$options.// fieldModel,
-        language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language, _this_$options_debug = _this_$options.debug, debug = _this_$options_debug === void 0 ? false : _this_$options_debug;
-        RulesMessage.setLocale(language);
+        language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language, _this_$options_debug = _this_$options.debug, debug = _this_$options_debug === void 0 ? false : _this_$options_debug, messagesI18n = _this_$options.messagesI18n, children = _this_$options.children;
         _this.debug = debug;
         _this.runtime = new Runtime({
             schema: schema,
             beforeCreateInstance: beforeCreateInstance
         });
         _this.externalParams = externalParams;
+        _this.children = children;
         _this.store = new Store({
             instance: _this.runtime.instance
         });
@@ -405,6 +405,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "mount",
             value: function mount() {
+                // @i18n-translate-ignore
                 this.debugLog("engine的mount方法开始调用");
                 var _this_$options = this.$options, _this_$options_plugins = _this_$options.plugins, plugins = _this_$options_plugins === void 0 ? [] : _this_$options_plugins;
                 this._handlerProxyState();
@@ -412,6 +413,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 this.applyPlugins();
                 // 触发所有控件的默认值的change事件
                 this.setStates(this.getState());
+                // @i18n-translate-ignore
                 this.debugLog("engine的mount方法调用结束");
                 if (this.debug && typeof window !== 'undefined') {
                     // @ts-ignore
@@ -437,7 +439,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_proxyStateBeforeSetCallback",
             value: function _proxyStateBeforeSetCallback(state, key, newValue, oldValue) {
-                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
+                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
                 // 找不到控件说明不是改动控件上的字段，直接通过
                 if (!instance) {
                     return newValue;
@@ -487,8 +489,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             key: "_handlerArrayUpdate",
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
-                var instanceItem = findItem(key, this);
-                var subtable = instanceItem.instance;
+                var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
                 // if (!(subtable instanceof RuntimeListControl)) return
                 if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
@@ -519,7 +520,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) {
@@ -537,7 +537,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)
@@ -553,14 +552,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') {
@@ -575,12 +572,19 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                     var subtableData = this.getState(subtable.id);
                     this._handlerSubtableUpdateUid(subtableData);
+                    this.runtime.getFlatInstances();
+                    var rowIndexs = createdNewRows.map(function(item) {
+                        var _item_children_, _item_children;
+                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
+                        return _this.getInstanceRowIndex(subControl);
+                    });
                     this.emit('list-change', {
                         instance: subtable,
                         value: subtableData,
                         options: Object.assign({}, options, {
                             changed: createdNewRows,
                             data: createdNewRowsData,
+                            rowIndexs: rowIndexs,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
                             jsonValue: JSON.stringify(subtableData),
                             isDeleteLastOne: isDeleteLastOne,
@@ -609,11 +613,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_handlerObjectUpdate",
             value: function _handlerObjectUpdate(state, key, value, oldValue) {
-                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
+                var _this = this;
+                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
                 if (!instance) {
                     return;
                 }
-                var index = rowIndex;
+                var index = this.getInstanceRowIndex(instance);
                 var options = eventOptionsTemp || {};
                 // if (instance instanceof RuntimeListControl) {
                 if (instance.controlType === CONTROL_BASE_TYPE.LIST && instance.type === CONTROL_TYPE.SUBTABLE) {
@@ -629,7 +634,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)
@@ -637,8 +641,14 @@ 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);
+                    var rowIndexs = newRows.map(function(item) {
+                        var _item_children_, _item_children;
+                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
+                        return _this.getInstanceRowIndex(subControl);
+                    });
                     this.emit('list-change', {
                         instance: instance,
                         value: value,
@@ -646,6 +656,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
+                            rowIndexs: rowIndexs,
                             deleted: deleted,
                             // deleted: oldValue ?? [],
                             type: 'push',
@@ -949,9 +960,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 设置payload的options，提供在不是使用标准api修改state的时候可以传递options，会在本次任务执行完成之后清空
-   * @param options 需要携带的options
+            /**
+   * 设置payload的options，提供在不是使用标准api修改state的时候可以传递options，会在本次任务执行完成之后清空
+   * @param options 需要携带的options
    * */ key: "setPayloadOptions",
             value: function setPayloadOptions(options) {
                 eventOptionsTemp = options;
@@ -961,16 +972,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             key: "setState",
             value: function setState(controlId, value, rowIndex, options) {
                 eventOptionsTemp = options;
+                // @i18n-translate-ignore
                 this.debugLog('[%o]: 触发setState, 修改的值为%o, rowIndex=%o, options=%o', controlId, value, rowIndex, options);
                 this.store.setState(controlId, value, rowIndex);
+                // @i18n-translate-ignore
                 this.debugLog('[%o]: setState完成, 修改的值为%o, rowIndex=%o', controlId, value, rowIndex);
                 eventOptionsTemp = null;
             }
         },
         {
-            /**
-   * 向Store设置一组值，明细表必须全量赋值，并触发事件（触发事件是根据组件在页面中的顺序逐个触发）
-   * @param states
+            /**
+   * 向Store设置一组值，明细表必须全量赋值，并触发事件（触发事件是根据组件在页面中的顺序逐个触发）
+   * @param states
    */ key: "setStates",
             value: function setStates(states, rowIndex, options) {
                 var _this = this;
@@ -997,55 +1010,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            //理想-获取表单头部信息
-            key: "getTitleField",
-            value: function getTitleField(key) {
-                var titleData = Object.values(this.store.state).filter(function(a) {
-                    return a.submit_user;
-                })[0];
-                if (key) {
-                    return titleData[key];
-                } else {
-                    return titleData;
-                }
-            }
-        },
-        {
-            //理想-获取系统字段
-            key: "getSystemField",
-            value: function getSystemField(key) {
-                var _this_externalParams;
-                var systemCodesMap = [
-                    'creator',
-                    'process_location',
-                    'create_time',
-                    'uid',
-                    'update_time',
-                    'process_status',
-                    'process_instance_id',
-                    'process_key'
-                ];
-                var arr = ((_this_externalParams = this.externalParams) === null || _this_externalParams === void 0 ? void 0 : _this_externalParams.data.data_set.values.filter(function(a) {
-                    return systemCodesMap.some(function(k) {
-                        return k == a.code;
-                    });
-                })) || [];
-                if (key) {
-                    var _arr_filter_;
-                    return (_arr_filter_ = arr.filter(function(a) {
-                        return a.code == key;
-                    })[0]) === null || _arr_filter_ === void 0 ? void 0 : _arr_filter_.value;
-                } else {
-                    return arr;
-                }
-            }
-        },
-        {
-            /**
-   * 通过dataCode和fieldCode来获取控件的值
-   * @param dataCode 模型编码 - 如果是主表的话就是主表的模型编码，明细子表的话就是子表的模型编码
-   * @param fieldCode 字段编码 - 控件绑定的数据项的编码
-   * @param rowIndex 行下标 - 如果是明细子表中的控件需要提供
+            /**
+   * 通过dataCode和fieldCode来获取控件的值
+   * @param dataCode 模型编码 - 如果是主表的话就是主表的模型编码，明细子表的话就是子表的模型编码
+   * @param fieldCode 字段编码 - 控件绑定的数据项的编码
+   * @param rowIndex 行下标 - 如果是明细子表中的控件需要提供
    * */ key: "getField",
             value: function getField(dataCode, fieldCode, rowIndex) {
                 if (!fieldCode) {
@@ -1117,27 +1086,31 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                 var _controlIdMapping_key2;
                                 obj[(_controlIdMapping_key2 = controlIdMapping[key]) === null || _controlIdMapping_key2 === void 0 ? void 0 : _controlIdMapping_key2.dataBind.fieldCode] = getFieldData[key];
                             } else if ((_controlIdMapping_key1 = controlIdMapping[key]) === null || _controlIdMapping_key1 === void 0 ? void 0 : (_controlIdMapping_key_dataBind1 = _controlIdMapping_key1.dataBind) === null || _controlIdMapping_key_dataBind1 === void 0 ? void 0 : _controlIdMapping_key_dataBind1.dataCode) {
-                                var _controlIdMapping_key3;
-                                // 明细字表只循环一层明细子表未递归
-                                obj[(_controlIdMapping_key3 = controlIdMapping[key]) === null || _controlIdMapping_key3 === void 0 ? void 0 : _controlIdMapping_key3.dataBind.dataCode] = getFieldData[key].map(function(item) {
-                                    var objChi = {};
-                                    for(var keyChi in item){
-                                        var _controlIdMapping_key_children_keyChi;
-                                        var fieldCode = (_controlIdMapping_key_children_keyChi = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi === void 0 ? void 0 : _controlIdMapping_key_children_keyChi.dataBind.fieldCode;
-                                        //未绑定字段的控件，直接抛弃
-                                        if (fieldCode !== '') {
-                                            if (fieldCode) {
-                                                objChi[fieldCode] = item[keyChi];
-                                            } else {
-                                                for(var keyChi1 in item[keyChi]){
-                                                    var _controlIdMapping_key_children_keyChi1;
-                                                    objChi[(_controlIdMapping_key_children_keyChi1 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi1 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi1.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
+                                if (!Array.isArray(getFieldData[key])) {
+                                // obj[controlIdMapping[key]?.dataBind.dataCode] = ''
+                                } else {
+                                    var _controlIdMapping_key3, _getFieldData_key;
+                                    // 明细字表只循环一层明细子表未递归
+                                    obj[(_controlIdMapping_key3 = controlIdMapping[key]) === null || _controlIdMapping_key3 === void 0 ? void 0 : _controlIdMapping_key3.dataBind.dataCode] = (_getFieldData_key = getFieldData[key]) === null || _getFieldData_key === void 0 ? void 0 : _getFieldData_key.map(function(item) {
+                                        var objChi = {};
+                                        for(var keyChi in item){
+                                            var _controlIdMapping_key_children_keyChi;
+                                            var fieldCode = (_controlIdMapping_key_children_keyChi = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi === void 0 ? void 0 : _controlIdMapping_key_children_keyChi.dataBind.fieldCode;
+                                            //未绑定字段的控件，直接抛弃
+                                            if (fieldCode !== '') {
+                                                if (fieldCode) {
+                                                    objChi[fieldCode] = item[keyChi];
+                                                } else {
+                                                    for(var keyChi1 in item[keyChi]){
+                                                        var _controlIdMapping_key_children_keyChi1;
+                                                        objChi[(_controlIdMapping_key_children_keyChi1 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi1 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi1.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
-                                    return objChi;
-                                });
+                                        return objChi;
+                                    });
+                                }
                             } else if (controlIdMapping[key]) {
                                 // 兼容一个控件需要绑定多个字段的情况
                                 for(var keyChi in getFieldData[key]){
@@ -1156,13 +1129,13 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 通过dataCode和fieldCode来设置控件的值
-   * @param dataCode 模型编码 - 如果是主表的话就是主表的模型编码，明细子表的话就是子表的模型编码
-   * @param fieldCode 字段编码 - 控件绑定的数据项的编码
-   * @param value 修改的值
-   * @param rowIndex 行下标 - 如果是明细子表中的控件需要提供
-   * @param options 触发事件携带的参数
+            /**
+   * 通过dataCode和fieldCode来设置控件的值
+   * @param dataCode 模型编码 - 如果是主表的话就是主表的模型编码，明细子表的话就是子表的模型编码
+   * @param fieldCode 字段编码 - 控件绑定的数据项的编码
+   * @param value 修改的值
+   * @param rowIndex 行下标 - 如果是明细子表中的控件需要提供
+   * @param options 触发事件携带的参数
    * */ key: "setField",
             value: function setField(dataCode, fieldCode, value, rowIndex, options) {
                 var dataBindMapping = this.getDataBindMapping(dataCode, fieldCode);
@@ -1190,12 +1163,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 通过dataCode和 state来给一组控件赋值，并触发事件携带options
-   * @param dataCode 需要赋值的目标模型
-   * @param state 赋值对象，以fieldCode为key组成的对象
-   * @param rowIndex 行下标，给明细子表赋值时指定赋值某行
-   * @param options 触发事件携带的参数
+            /**
+   * 通过dataCode和 state来给一组控件赋值，并触发事件携带options
+   * @param dataCode 需要赋值的目标模型
+   * @param state 赋值对象，以fieldCode为key组成的对象
+   * @param rowIndex 行下标，给明细子表赋值时指定赋值某行
+   * @param options 触发事件携带的参数
    * */ key: "setFields",
             value: function setFields(dataCode, state, rowIndex, options) {
                 var _this = this;
@@ -1236,10 +1209,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 通过dataCode来将state转化为标准的state结构
-   * @param dataCode 需要转换的目标模型code
-   * @param state 值对象，以fieldCode为key组成的对象
+            /**
+   * 通过dataCode来将state转化为标准的state结构
+   * @param dataCode 需要转换的目标模型code
+   * @param state 值对象，以fieldCode为key组成的对象
    * */ key: "buildFields",
             value: function buildFields(dataCode, state) {
                 var _this = this;
@@ -1280,13 +1253,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 向Store设置一组值，并触发事件携带options
-   * @param dataSet
-   * @options 传递给关联事件中 EventPayload中的options，一般在plugin中监听使用
+            /**
+   * 向Store设置一组值，并触发事件携带options
+   * @param dataSet
+   * @options 传递给关联事件中 EventPayload中的options，一般在plugin中监听使用
    */ key: "setData",
             value: function setData(dataSet, options) {
                 var _this = this;
+                // @i18n-translate-ignore
                 this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
                 var onlySetData = options === null || options === void 0 ? void 0 : options.onlySetData;
                 var newState = this.store.defaultState;
@@ -1408,31 +1382,35 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     }
                                 }
                             });
+                            // @i18n-translate-ignore
                             _this.debugLog("engine setData方法默认值及表单数据组合完成，参数为%o。", newState);
                         }
                     }
                 });
+                // @i18n-translate-ignore
                 this.debugLog("engine setData方法数据组合完成，参数为%o。", newState);
                 this.setStates(newState, undefined, _object_spread({
                     setData: true
                 }, options));
+                this.runtime.getFlatInstances();
+                // @i18n-translate-ignore
                 this.debugLog("engine setData方法执行完成。");
             }
         },
         {
-            /**
-   * 获取控件的dataBind
-   * @param controlId
+            /**
+   * 获取控件的dataBind
+   * @param controlId
    * */ key: "getDataBind",
             value: function getDataBind(controlId) {
                 return this.store.getDataBind(controlId);
             }
         },
         {
-            /**
-   * 获取组件实例，传入rowIndex代表获取明细表内的控件实例，rowIndex传入-1代表获取表头内的实例
-   * @param controlId
-   * @param rowIndex
+            /**
+   * 获取组件实例，传入rowIndex代表获取明细表内的控件实例，rowIndex传入-1代表获取表头内的实例
+   * @param controlId
+   * @param rowIndex
    */ key: "getInstance",
             value: function getInstance(controlId, rowIndex) {
                 var instances = this.getInstances(controlId, rowIndex === -1);
@@ -1451,10 +1429,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
         },
         {
-            /**
-   * 获取组件实例，明细表中的组件将会得到数组, 第二个参数为(false/不传入)则获取到的是明细表内不包含表头内实例的所有控件实例，传入true则获取到包含表头内实例的所有控件实例,表头内实例永远在下标0的位置
-   * @param controlId
-   * @param header 明细表内是否获取表头的控件
+            /**
+   * 获取组件实例，明细表中的组件将会得到数组, 第二个参数为(false/不传入)则获取到的是明细表内不包含表头内实例的所有控件实例，传入true则获取到包含表头内实例的所有控件实例,表头内实例永远在下标0的位置
+   * @param controlId
+   * @param header 明细表内是否获取表头的控件
    */ // getInstances(
             //   controlId?: string,
             //   header: boolean = false
@@ -1520,12 +1498,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
@@ -1542,6 +1524,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         var instances = this.getInstances(instance, rowIndex === -1);
                         instances.map(function(_instance) {
                             if (_instance) {
+                                // @i18n-translate-ignore
                                 _this.debugLog("[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
                                 updateValueFromKeys(_instance.props, props, value);
                                 _this.schemaEvent('schema-change', {
@@ -1562,6 +1545,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         if (!_instance) {
                             return;
                         }
+                        // @i18n-translate-ignore
                         this.debugLog("[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
                         updateValueFromKeys(_instance.props, props, value);
                         this.schemaEvent('schema-change', {
@@ -1576,54 +1560,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         },
-        {
-            /**
-   * 前端二开新增方法，支持给多选控件动态赋值选项和默认值
-   * ctx.setInstance('zQX4ViR3c0', 'options', [{ label:'初级：N<2年', value: '初级' },{ label:'高级：N>2年', value: '高级' }]);
-   * ctx.setState('zQX4ViR3c0',['初级'])
-   * 将以上两个方法封装成一个新的方法setInstanceAndState
-   * ctx.setInstanceAndState('uexLafJeGH', 'options', [{ label:'初级：N<2年', value: '初级' ,checked: true}，{ label:'初级：N>2年', value: '高级' }]);
-   * 可同时设置选项和默认值
-   * @param instance 
-   * @param props 
-   * @param value 
-   * @param rowIndex 
-   */ key: "setInstanceAndState",
-            value: function setInstanceAndState(instance, props, value, rowIndex) {
-                this.setInstance(instance, props, value, rowIndex);
-                if (value && Array.isArray(value)) {
-                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                    try {
-                        for(var _iterator = value[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                            var item = _step.value;
-                            if (item.checked) {
-                                var instanceId = '';
-                                if (typeof instance !== 'string') {
-                                    instanceId = instance.id;
-                                } else {
-                                    instanceId = instance;
-                                }
-                                this.setState(instanceId, item.value, rowIndex);
-                                break;
-                            }
-                        }
-                    } catch (err) {
-                        _didIteratorError = true;
-                        _iteratorError = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                _iterator.return();
-                            }
-                        } finally{
-                            if (_didIteratorError) {
-                                throw _iteratorError;
-                            }
-                        }
-                    }
-                }
-            }
-        },
         {
             key: "getControlIdMapping",
             value: function getControlIdMapping() {
@@ -1638,7 +1574,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 var mapping = this.store.dataBindMapping[dataCode];
                 if (!mapping) {
-                    warn("No corresponding dataCode=".concat(dataCode, " was found"));
+                    // warn(`No corresponding dataCode=${dataCode} was found`)
                     return;
                 }
                 if (!fieldCode) {
@@ -1648,7 +1584,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     return item.fieldCode === fieldCode;
                 });
                 if (!dataBindMapping) {
-                    warn("No corresponding fieldCode=".concat(fieldCode, " was found"));
+                    // warn(`No corresponding fieldCode=${fieldCode} was found`)
                     return;
                 }
                 return dataBindMapping;
@@ -1674,27 +1610,27 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         },
         {
             key: "assertInstance",
-            value: /**
-   * 判断控件的类型，返回当前控件的正确类型
+            value: /**
+   * 判断控件的类型，返回当前控件的正确类型
    * */ function assertInstance(instance, types) {
                 return isString(types) ? instance.type === types : types.includes(instance.type);
             }
         },
         {
             key: "assertInstanceIsCustomControl",
-            value: /**
-   * 判断控件或控件类型是一个自定义控件
+            value: /**
+   * 判断控件或控件类型是一个自定义控件
    * */ function assertInstanceIsCustomControl(instance) {
                 return !isBuiltInControls(isString(instance) ? instance : instance.type);
             }
         },
         {
             key: "getInstanceRowIndex",
-            value: /**
-   * 获取控件在明细子表中的行下标，
-   * 如果控件在表头内，则返回-1
-   * 如果控件在表内，则返回行下标
-   * 如果控件不在明细表内，则返回undefined
+            value: /**
+   * 获取控件在明细子表中的行下标，
+   * 如果控件在表头内，则返回-1
+   * 如果控件在表内，则返回行下标
+   * 如果控件不在明细表内，则返回undefined
    * */ // public getInstanceRowIndex(
             //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
             // ) {

package/dist/esm/common/Runtime.js

@@ -110,6 +110,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') {
@@ -129,6 +130,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;
@@ -277,16 +281,16 @@ 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) {
     return checkType in control.props && isArray(control.props[checkType]);
 }
-/**
- * 控件是否在视图中隐藏，遍历查找所有parent
+/**
+ * 控件是否在视图中隐藏，遍历查找所有parent
  * */ function getControlIsHide(control) {
     if (control.props.isHide) {
         return true;