@byteluck-fe/model-driven-engine 1.7.5 → 1.7.6

package/dist/esm/common/ActionManager.js

@@ -173,7 +173,7 @@ export var ActionManager = /*#__PURE__*/ function() {
         }
         var _this = this;
         return _asyncToGenerator(function() {
-            var action, _func, result, e;
+            var action, _action_func, result, e;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -193,7 +193,7 @@ export var ActionManager = /*#__PURE__*/ function() {
                         ]);
                         return [
                             4,
-                            (_func = action.func).call.apply(_func, [
+                            (_action_func = action.func).call.apply(_action_func, [
                                 null,
                                 context
                             ].concat(_toConsumableArray(args)))

package/dist/esm/common/Engine.js

@@ -367,8 +367,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         _this._jobTasks = [];
         _this.createControlInstance = _this.createInstance;
         _this.$options = Object.freeze(props);
-        var _$options = _this.$options, _autoMount = _$options.autoMount, autoMount = _autoMount === void 0 ? true : _autoMount, schema = _$options.schema, beforeCreateInstance = _$options.beforeCreateInstance, externalParams = _$options.externalParams, _language = _$options.// fieldModel,
-        language, language = _language === void 0 ? DEFAULT_LOCALE : _language, _debug = _$options.debug, debug = _debug === void 0 ? false : _debug;
+        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);
         _this.debug = debug;
         _this.runtime = new Runtime({
@@ -402,13 +402,13 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){
             arg[_key] = arguments[_key];
         }
-        var _runtime;
-        (_runtime = this.runtime).register.apply(_runtime, _toConsumableArray(arg));
+        var _this_runtime;
+        (_this_runtime = this.runtime).register.apply(_this_runtime, _toConsumableArray(arg));
         return this;
     };
     _proto.mount = function mount() {
         this.debugLog("engine的mount方法开始调用");
-        var _$options = this.$options, _plugins = _$options.plugins, plugins = _plugins === void 0 ? [] : _plugins;
+        var _this_$options = this.$options, _this_$options_plugins = _this_$options.plugins, plugins = _this_$options_plugins === void 0 ? [] : _this_$options_plugins;
         this._handlerProxyState();
         this.__plugins = plugins;
         this.applyPlugins();
@@ -496,17 +496,17 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             switch(type){
                 case "push":
                 case "unshift":
-                    var _children;
+                    var _subtable_children;
                     var newRowLengths = args.length;
                     createdNewRows = createRows(newRowLengths);
                     createdNewRowsData = args;
-                    (_children = subtable.children)[type].apply(_children, _toConsumableArray(createdNewRows));
+                    (_subtable_children = subtable.children)[type].apply(_subtable_children, _toConsumableArray(createdNewRows));
                     this.runtime.getFlatInstances();
                     break;
                 case "splice":
                     if (args.length > 2) {
                         var // @ts-ignore
-                        _children1;
+                        _subtable_children1;
                         var newRowLengths1 = args.length - 2;
                         var newValues = args.slice(2);
                         createdNewRows = createRows(newRowLengths1);
@@ -515,7 +515,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         var start = args[0];
                         // 替换几个
                         var replace = args[1];
-                        (_children1 = subtable.children)[type].apply(_children1, [
+                        (_subtable_children1 = subtable.children)[type].apply(_subtable_children1, [
                             start,
                             replace
                         ].concat(_toConsumableArray(createdNewRows)));
@@ -526,15 +526,15 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // })
                     } else {
                         var // @ts-ignore
-                        _children2;
-                        (_children2 = subtable.children)[type].apply(_children2, _toConsumableArray(args));
+                        _subtable_children2;
+                        (_subtable_children2 = subtable.children)[type].apply(_subtable_children2, _toConsumableArray(args));
                         this.runtime.getFlatInstances();
                     }
                     break;
                 default:
                     var // @ts-ignore
-                    _children3;
-                    (_children3 = subtable.children)[type].apply(_children3, _toConsumableArray(args));
+                    _subtable_children3;
+                    (_subtable_children3 = subtable.children)[type].apply(_subtable_children3, _toConsumableArray(args));
                     this.runtime.getFlatInstances();
                     break;
             }
@@ -570,7 +570,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var options = eventOptionsTemp || {};
         if (_instanceof(instance, RuntimeListControl)) {
             var // @ts-ignore
-            _children;
+            _instance_children;
             instance.children.length = 0;
             var newValue = value;
             // @ts-ignore
@@ -580,7 +580,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var row = this.listControlCreateRow(instance, "subtable-row");
                 row && newRows.push(row);
             }
-            (_children = instance.children).push.apply(_children, _toConsumableArray(newRows));
+            (_instance_children = instance.children).push.apply(_instance_children, _toConsumableArray(newRows));
             this.runtime.getFlatInstances();
             // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
             // for (let i = 0; i < newValue.length; i++) {
@@ -612,8 +612,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         if (this.__pluginsApplied) return;
         this.__plugins.forEach(function(plugin) {
             try {
-                var _pluginName;
-                applyingPluginName = (_pluginName = plugin.pluginName) !== null && _pluginName !== void 0 ? _pluginName : plugin.constructor.name;
+                var _plugin_pluginName;
+                applyingPluginName = (_plugin_pluginName = plugin.pluginName) !== null && _plugin_pluginName !== void 0 ? _plugin_pluginName : plugin.constructor.name;
                 plugin.apply(_this);
             } catch (e) {
                 error("".concat(applyingPluginName, " Plugin apply Error \n ").concat(e));
@@ -627,11 +627,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var row = this.runtime.createControlInstance(rowType);
         if (!row) return;
         if (_instanceof(row, RuntimeLayoutControl)) {
-            var _children;
+            var _row_children;
             var template = JSONCopy(instance.props.headers);
             // @ts-ignore
             var columns = this.createControl(template);
-            (_children = row.children).push.apply(_children, _toConsumableArray(columns));
+            (_row_children = row.children).push.apply(_row_children, _toConsumableArray(columns));
         }
         return row;
     };
@@ -718,8 +718,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
             args[_key] = arguments[_key];
         }
-        var _runtime;
-        return (_runtime = this.runtime).createControl.apply(_runtime, _toConsumableArray(args));
+        var _this_runtime;
+        return (_this_runtime = this.runtime).createControl.apply(_this_runtime, _toConsumableArray(args));
     };
     _proto.createInstance = function createInstance(type, initSchema) {
         return this.runtime.createControlInstance(type, initSchema);
@@ -734,16 +734,16 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         if (controlId === undefined) {
             return this.runtime.rules;
         } else {
-            var ref;
-            return (ref = this.runtime.rules[controlId]) === null || ref === void 0 ? void 0 : ref.fields;
+            var _this_runtime_rules_controlId;
+            return (_this_runtime_rules_controlId = this.runtime.rules[controlId]) === null || _this_runtime_rules_controlId === void 0 ? void 0 : _this_runtime_rules_controlId.fields;
         }
     };
     _proto.getAntdRules = function getAntdRules(controlId) {
         if (controlId === undefined) {
             return this.runtime.antdRules;
         } else {
-            var ref;
-            return (ref = this.runtime.antdRules[controlId]) === null || ref === void 0 ? void 0 : ref.fields;
+            var _this_runtime_antdRules_controlId;
+            return (_this_runtime_antdRules_controlId = this.runtime.antdRules[controlId]) === null || _this_runtime_antdRules_controlId === void 0 ? void 0 : _this_runtime_antdRules_controlId.fields;
         }
     };
     _proto.getState = function getState(controlId, rowIndex) {
@@ -753,13 +753,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             return this.store.getState(controlId, rowIndex);
         }
     };
-    _proto.getFieldCodeState = function getFieldCodeState(controlId) {
-        if (controlId === undefined) {
-            return this.store.fieldCodeState;
-        } else {
-            return this.store.getFieldCodeState(controlId);
-        }
-    };
     _proto.getEmptyState = function getEmptyState(controlId) {
         if (controlId === undefined) {
             return JSONCopy(this.store.emptyState);
@@ -840,11 +833,70 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto.getData = function getData(dataCode) {
-        if (dataCode) {
-            var dataBindMapping = this.getDataBindMapping(dataCode);
-            if (dataBindMapping) {
-                var controlId = dataBindMapping.controlId;
-                return this.getFieldCodeState(controlId);
+        if (!dataCode) return;
+        var dataBindMapping = this.getDataBindMapping(dataCode);
+        var controlIdMapping = this.getControlIdMapping();
+        if (dataBindMapping) {
+            var controlId = dataBindMapping.controlId;
+            var getFieldData = this.getField(dataCode);
+            // 明细子表值
+            if (Array.isArray(getFieldData)) {
+                var data = getFieldData.map(function(item) {
+                    var obj = {};
+                    for(var key in item){
+                        var _controlIdMapping_controlId_children_key, _controlIdMapping_controlId, _controlIdMapping_controlId_children_key_dataBind, _controlIdMapping_controlId1;
+                        if ((_controlIdMapping_controlId_children_key = (_controlIdMapping_controlId = controlIdMapping[controlId]) === null || _controlIdMapping_controlId === void 0 ? void 0 : _controlIdMapping_controlId.children[key]) === null || _controlIdMapping_controlId_children_key === void 0 ? void 0 : (_controlIdMapping_controlId_children_key_dataBind = _controlIdMapping_controlId_children_key.dataBind) === null || _controlIdMapping_controlId_children_key_dataBind === void 0 ? void 0 : _controlIdMapping_controlId_children_key_dataBind.fieldCode) {
+                            var _controlIdMapping_controlId_children_key1;
+                            obj[(_controlIdMapping_controlId_children_key1 = controlIdMapping[controlId].children[key]) === null || _controlIdMapping_controlId_children_key1 === void 0 ? void 0 : _controlIdMapping_controlId_children_key1.dataBind.fieldCode] = item[key];
+                        } else if ((_controlIdMapping_controlId1 = controlIdMapping[controlId]) === null || _controlIdMapping_controlId1 === void 0 ? void 0 : _controlIdMapping_controlId1.children[key]) {
+                            // 兼容一个控件需要绑定多个字段的情况
+                            for(var keyChi in item[key]){
+                                var _controlIdMapping_controlId_children_key2, _controlIdMapping_controlId2;
+                                obj[(_controlIdMapping_controlId_children_key2 = (_controlIdMapping_controlId2 = controlIdMapping[controlId]) === null || _controlIdMapping_controlId2 === void 0 ? void 0 : _controlIdMapping_controlId2.children[key]) === null || _controlIdMapping_controlId_children_key2 === void 0 ? void 0 : _controlIdMapping_controlId_children_key2.dataBind[keyChi].fieldCode] = item[key][keyChi];
+                            }
+                        }
+                    }
+                    return obj;
+                });
+                return data;
+            } else {
+                var _loop = function(key) {
+                    var _controlIdMapping_key, _controlIdMapping_key_dataBind, _controlIdMapping_key1, _controlIdMapping_key_dataBind1;
+                    if ((_controlIdMapping_key = controlIdMapping[key]) === null || _controlIdMapping_key === void 0 ? void 0 : (_controlIdMapping_key_dataBind = _controlIdMapping_key.dataBind) === null || _controlIdMapping_key_dataBind === void 0 ? void 0 : _controlIdMapping_key_dataBind.fieldCode) {
+                        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;
+                                if ((_controlIdMapping_key_children_keyChi = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi === void 0 ? void 0 : _controlIdMapping_key_children_keyChi.dataBind.fieldCode) {
+                                    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.fieldCode] = item[keyChi];
+                                } else {
+                                    for(var keyChi1 in item[keyChi]){
+                                        var _controlIdMapping_key_children_keyChi2;
+                                        objChi[(_controlIdMapping_key_children_keyChi2 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi2 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi2.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
+                                    // 
+                                    }
+                                }
+                            }
+                            return objChi;
+                        });
+                    } else if (controlIdMapping[key]) {
+                        // 兼容一个控件需要绑定多个字段的情况
+                        for(var keyChi in getFieldData[key]){
+                            var _controlIdMapping_key_dataBind_keyChi, _controlIdMapping_key4;
+                            obj[(_controlIdMapping_key_dataBind_keyChi = (_controlIdMapping_key4 = controlIdMapping[key]) === null || _controlIdMapping_key4 === void 0 ? void 0 : _controlIdMapping_key4.dataBind[keyChi]) === null || _controlIdMapping_key_dataBind_keyChi === void 0 ? void 0 : _controlIdMapping_key_dataBind_keyChi.fieldCode] = getFieldData[key][keyChi];
+                        }
+                    }
+                };
+                // 主表
+                var obj = {};
+                for(var key in getFieldData)_loop(key);
+                return obj;
             }
         }
         return;
@@ -863,8 +915,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
         var dataBind = dataBindMapping.dataBind, controlId = dataBindMapping.controlId;
         if (_instanceof(dataBind, ObjectDataBind)) {
-            var ref;
-            var oldState = (ref = JSONCopy(this.getState(controlId, rowIndex))) !== null && ref !== void 0 ? ref : this.getEmptyState(controlId);
+            var _JSONCopy;
+            var oldState = (_JSONCopy = JSONCopy(this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : this.getEmptyState(controlId);
             // fieldCode不代表是key，所以需要找到对应的key
             var newState = Object.entries(dataBind).reduce(function(result, param) {
                 var _param = _slicedToArray(param, 2), key = _param[0], dataBind = _param[1];
@@ -902,8 +954,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             }
             // 对象类型的值
             if (_instanceof(dataBind, ObjectDataBind)) {
-                var ref;
-                var oldState = (ref = JSONCopy(_this.getState(controlId, rowIndex))) !== null && ref !== void 0 ? ref : _this.getEmptyState(controlId);
+                var _JSONCopy;
+                var oldState = (_JSONCopy = JSONCopy(_this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : _this.getEmptyState(controlId);
                 // fieldCode不代表是key，所以需要找到对应的key
                 var newState = Object.entries(dataBind).reduce(function(result, param) {
                     var _param = _slicedToArray(param, 2), key = _param[0], dataBind = _param[1];
@@ -981,19 +1033,19 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                     ;
                     Object.keys(row).map(function(fieldCode) {
-                        var ref, ref1;
+                        var _this_store_dataBindMapping_dataCode, _this_store_dataBindMapping_dataCode_fields;
                         if (skipKey.includes(fieldCode)) {
                             return;
                         }
-                        var fieldMapping = (ref = _this.store.dataBindMapping[dataCode]) === null || ref === void 0 ? void 0 : (ref1 = ref.fields) === null || ref1 === void 0 ? void 0 : ref1.find(function(i) {
+                        var fieldMapping = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
                             return i.fieldCode === fieldCode;
                         });
                         if (fieldMapping) {
                             if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
                                 newRow[fieldMapping.controlId] = row[fieldCode];
                             } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
-                                var ref2;
-                                var objValue = JSONCopy((ref2 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref2 !== void 0 ? ref2 : {});
+                                var _this_getEmptyState;
+                                var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
                                 Object.keys(fieldMapping.dataBind).map(function(key) {
                                     var dataBind = fieldMapping.dataBind[key];
                                     if (row[dataBind.fieldCode] !== undefined) {
@@ -1028,8 +1080,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
                             newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode];
                         } else if (_instanceof(mapping.dataBind, ObjectDataBind)) {
-                            var ref;
-                            var objValue = JSONCopy((ref = _this.getEmptyState(mapping.controlId)) !== null && ref !== void 0 ? ref : {});
+                            var _this_getEmptyState;
+                            var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(mapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
                             Object.keys(mapping.dataBind).map(function(key) {
                                 var dataBind = mapping.dataBind[key];
                                 if (entity[dataBind.fieldCode] !== undefined) {
@@ -1097,11 +1149,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             } else {
                 var controlIdMapping = this.getControlIdMapping();
-                var ref;
-                var ref1 = _slicedToArray((ref = Object.entries(controlIdMapping).find(function(param) {
+                var _Object_entries_find;
+                var _ref = _slicedToArray((_Object_entries_find = Object.entries(controlIdMapping).find(function(param) {
                     var _param = _slicedToArray(param, 2), _ = _param[0], mapping = _param[1];
                     return mapping.children && controlId in mapping.children;
-                })) !== null && ref !== void 0 ? ref : [], 1), subtableId = ref1[0];
+                })) !== null && _Object_entries_find !== void 0 ? _Object_entries_find : [], 1), subtableId = _ref[0];
                 if (subtableId) {
                     var subtable = this.getInstance(subtableId);
                     // @ts-ignore
@@ -1255,8 +1307,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
             args[_key] = arguments[_key];
         }
-        var _runtime;
-        return (_runtime = this.runtime).registerControlConfig.apply(_runtime, _toConsumableArray(args));
+        var _this_runtime;
+        return (_this_runtime = this.runtime).registerControlConfig.apply(_this_runtime, _toConsumableArray(args));
     };
     _proto.getControlConfig = function getControlConfig(control) {
         return this.runtime.getControlConfig(control);

package/dist/esm/common/OkWorker.js

@@ -18,12 +18,12 @@ var OkWorker = /*#__PURE__*/ function() {
         });
     };
     _proto.destroy = function destroy() {
-        var ref;
-        (ref = this.worker) === null || ref === void 0 ? void 0 : ref.terminate();
+        var _this_worker;
+        (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.terminate();
     };
     _proto.postMessage = function postMessage(message) {
-        var ref;
-        (ref = this.worker) === null || ref === void 0 ? void 0 : ref.postMessage(message);
+        var _this_worker;
+        (_this_worker = this.worker) === null || _this_worker === void 0 ? void 0 : _this_worker.postMessage(message);
     };
     OkWorker.createWorker = function createWorker() {
         var blob = new Blob([
@@ -64,7 +64,7 @@ var OkWorker = /*#__PURE__*/ function() {
             // 	return new Proxy(obj, createHandler(parentKey))
             // }
             _self.addEventListener("message", function(event) {
-                var _data = event.data, action = _data.action, payload = _data.payload, fn = _data.fn;
+                var _event_data = event.data, action = _event_data.action, payload = _event_data.payload, fn = _event_data.fn;
                 log(action, payload);
                 // 通过proxy进行代理，每次修改的时候，自动向外抛出postMessage
                 // data.key1 = 1

package/dist/esm/common/Store.js

@@ -30,10 +30,9 @@ var Store = /*#__PURE__*/ function() {
     "use strict";
     function Store(props) {
         _classCallCheck(this, Store);
-        var ref = init(props.instance), state = ref.state, emptyState = ref.emptyState, databindMapping = ref.databindMapping, controlidMapping = ref.controlidMapping, fieldCodeState = ref.fieldCodeState;
+        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping;
         this.emptyState = emptyState;
         this.state = state;
-        this.fieldCodeState = fieldCodeState;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
     }
@@ -97,8 +96,8 @@ var Store = /*#__PURE__*/ function() {
                         if (children !== undefined) {
                             Object.keys(children).map(function(childControlId) {
                                 if (childControlId === controlId) {
-                                    var ref;
-                                    state = (ref = _this.state[dataViewId][subtableId][rowIndex]) === null || ref === void 0 ? void 0 : ref[controlId];
+                                    var _this_state_dataViewId_subtableId_rowIndex;
+                                    state = (_this_state_dataViewId_subtableId_rowIndex = _this.state[dataViewId][subtableId][rowIndex]) === null || _this_state_dataViewId_subtableId_rowIndex === void 0 ? void 0 : _this_state_dataViewId_subtableId_rowIndex[controlId];
                                 }
                             });
                         }
@@ -124,25 +123,6 @@ var Store = /*#__PURE__*/ function() {
             }
         }
     };
-    _proto.getFieldCodeState = function getFieldCodeState(controlId) {
-        //qiyu 由于header的数据是后补充的，所以从state获取第一层值。
-        // const controlInfo = this.controlIdMapping[controlId]
-        var detection = this.fieldCodeState[controlId];
-        if (detection !== undefined) {
-            return this.fieldCodeState[controlId];
-        } else {
-            var controlInfo = this.controlIdMapping[controlId];
-            var dataCode = controlInfo.dataBind.dataCode;
-            if (controlInfo !== undefined) {
-                if (controlInfo.dataView === controlId) {
-                    return this.fieldCodeState[controlId];
-                } else {
-                    var dataCode1 = controlInfo.dataBind.dataCode;
-                    return this.fieldCodeState[controlInfo.dataView][dataCode1] || this.fieldCodeState[controlInfo.dataView];
-                }
-            }
-        }
-    };
     _proto.getEmptyState = function getEmptyState(controlId) {
         var _this = this;
         var detection = this.emptyState[controlId];
@@ -193,8 +173,6 @@ var Store = /*#__PURE__*/ function() {
 function init(instance) {
     var state = {};
     var emptyState = {};
-    var fieldCodeState = {};
-    var fieldCodeEmptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
     // loopFormControl(instance, (item, children) => {
@@ -204,76 +182,39 @@ function init(instance) {
         var dvId = dataView.id;
         var dataViewState = {};
         var emptyDataViewState = {};
-        var dataViewFieldCodeState = {};
-        var emptyDataViewFieldCodeState = {};
         // @ts-ignore
         loopFormControl([
             dataView
         ], function(item, children) {
-            buildState(dataViewState, emptyDataViewState, dataViewFieldCodeState, emptyDataViewFieldCodeState, item);
+            buildState(dataViewState, emptyDataViewState, item);
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
         });
         state[dvId] = dataViewState;
         emptyState[dvId] = emptyDataViewState;
-        fieldCodeState[dvId] = dataViewFieldCodeState;
-        fieldCodeEmptyState[dvId] = emptyDataViewFieldCodeState;
     });
     return {
         state: state,
         emptyState: emptyState,
         databindMapping: databindMapping,
-        controlidMapping: controlidMapping,
-        fieldCodeState: fieldCodeState,
-        fieldCodeEmptyState: fieldCodeEmptyState
+        controlidMapping: controlidMapping
     };
 }
-function buildState(dataViewState, emptyDataViewState, dataViewFieldCodeState, emptyDataViewFieldCodeState, // @ts-ignore
+function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
     if (_instanceof(item, RuntimeFormControl)) {
         dataViewState[item.id] = JSONCopy(item.props.defaultValue);
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
-        if (_instanceof(item.props.dataBind, ObjectDataBind)) {
-            // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
-            Object.keys(item.props.dataBind).forEach(function(key) {
-                var dataBind = item.props.dataBind;
-                var defaultValue = item.props.defaultValue;
-                var dataBindFieldCode = dataBind[key].fieldCode;
-                dataViewFieldCodeState[dataBindFieldCode] = JSONCopy(defaultValue[key]);
-                emptyDataViewFieldCodeState[dataBindFieldCode] = JSONCopy(defaultValue[key]);
-            });
-        } else {
-            var dataBindFieldCode = item.props.dataBind.fieldCode;
-            dataViewFieldCodeState[dataBindFieldCode] = JSONCopy(item.props.defaultValue);
-            emptyDataViewFieldCodeState[dataBindFieldCode] = JSONCopy(item.props.defaultValue);
-        }
     } else {
         var emptyTemplate = {};
-        var emptyFieldCodeTemplate = {};
         loopFormSchema(item.props.headers, function(headerItem) {
             emptyTemplate[headerItem.id] = JSONCopy(headerItem.props.defaultValue);
-            // 处理成fieldCode
-            var headerItemFieldCode = headerItem.props.dataBind.fieldCode;
-            if (_instanceof(headerItem.props.dataBind, ObjectDataBind)) {
-                // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
-                Object.keys(headerItem.props.dataBind).forEach(function(key) {
-                    emptyFieldCodeTemplate[headerItem.props.dataBind[key].fieldCode] = JSONCopy(headerItem.props.defaultValue[key]);
-                });
-            } else {
-                emptyFieldCodeTemplate[headerItemFieldCode] = JSONCopy(headerItem.props.defaultValue);
-            }
         });
-        var _defaultRows;
-        dataViewState[item.id] = new Array((_defaultRows = item.props.defaultRows) !== null && _defaultRows !== void 0 ? _defaultRows : 1).fill(0).map(function() {
+        var _item_props_defaultRows;
+        dataViewState[item.id] = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
             return JSONCopy(emptyTemplate);
         });
         emptyDataViewState[item.id] = emptyTemplate;
-        var dataBindFieldCode1 = item.props.datasourceBind.dataCode;
-        var _defaultRows1;
-        dataViewFieldCodeState[dataBindFieldCode1] = new Array((_defaultRows1 = item.props.defaultRows) !== null && _defaultRows1 !== void 0 ? _defaultRows1 : 1).fill(0).map(function() {
-            return JSONCopy(emptyFieldCodeTemplate);
-        });
-        emptyDataViewFieldCodeState[dataBindFieldCode1] = emptyFieldCodeTemplate;
     }
 }
 function buildDataBindMapping(data, dataViewId, // @ts-ignore
@@ -379,9 +320,9 @@ item) {
             options: []
         };
         loopFormSchema(item.props.headers, function(formControl) {
-            var ref;
-            var ref1;
-            Object.assign((ref1 = (ref = data[item.id]) === null || ref === void 0 ? void 0 : ref.children) !== null && ref1 !== void 0 ? ref1 : {}, _defineProperty({}, formControl.id, {
+            var _data_item_id;
+            var _data_item_id_children;
+            Object.assign((_data_item_id_children = (_data_item_id = data[item.id]) === null || _data_item_id === void 0 ? void 0 : _data_item_id.children) !== null && _data_item_id_children !== void 0 ? _data_item_id_children : {}, _defineProperty({}, formControl.id, {
                 dataBind: formControl.props.dataBind
             }));
         });

package/dist/esm/common/checkerValue.js

@@ -520,8 +520,8 @@ function getFieldTypeFromKey(key) {
     }
 }
 export function checkerValue(fieldType, key, value, oldValue) {
-    var ref;
-    var getCheckerFieldType = (ref = getFieldTypeFromKey(key)) !== null && ref !== void 0 ? ref : fieldType;
+    var _getFieldTypeFromKey;
+    var getCheckerFieldType = (_getFieldTypeFromKey = getFieldTypeFromKey(key)) !== null && _getFieldTypeFromKey !== void 0 ? _getFieldTypeFromKey : fieldType;
     var checker = ValueCheckerFactory.getValueChecker(getCheckerFieldType);
     if (!checker || checker.validate(value)) {
         return value;

package/dist/esm/common/proxyState.js

@@ -148,8 +148,8 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             // @ts-ignore
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
-            var ref;
-            newValue = (ref = reProxyState(value)) !== null && ref !== void 0 ? ref : newValue;
+            var _reProxyState;
+            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
@@ -243,10 +243,10 @@ function flatInstanceForChildren(controls) {
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
             return findEndItem ? findEndItem : _instanceof(prevItem, RuntimeFormControl) ? prevItem : undefined;
         } else {
-            var ref;
-            var ref1;
+            var _prevItem_children;
+            var _prevItem_children_index;
             // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (ref1 = prevItem === null || prevItem === void 0 ? void 0 : (ref = prevItem.children) === null || ref === void 0 ? void 0 : ref[index]) !== null && ref1 !== void 0 ? ref1 : prevItem;
+            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
         }
     }, initInstance);
 }
@@ -286,9 +286,9 @@ function getArrayNewArgs(type, args, value) {
                 var result;
                 var addValue = getArrayNewValue(key, args);
                 if (addValue.length) {
-                    var _obj, ref;
+                    var _this, _this_engineArrayBeforeSetCallbackFlag;
                     // @ts-ignore
-                    var newValue = (ref = (_obj = this)[engineArrayBeforeSetCallbackFlag]) === null || ref === void 0 ? void 0 : ref.call(_obj, // @ts-ignore
+                    var newValue = (_this_engineArrayBeforeSetCallbackFlag = (_this = this)[engineArrayBeforeSetCallbackFlag]) === null || _this_engineArrayBeforeSetCallbackFlag === void 0 ? void 0 : _this_engineArrayBeforeSetCallbackFlag.call(_this, // @ts-ignore
                     this[engineTargetKey], // @ts-ignore
                     this[engineProxyThisKey], addValue);
                     var newArgs = getArrayNewArgs(key, args, newValue);