@byteluck-fe/model-driven-engine 2.8.0-alpha.2 → 2.8.0-alpha.21

package/dist/esm/common/Engine.js

@@ -630,7 +630,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var index = this.getInstanceRowIndex(instance);
                 var options = eventOptionsTemp || {};
                 // if (instance instanceof RuntimeListControl) {
-                if (instance.controlType === CONTROL_BASE_TYPE.LIST) {
+                if (instance.controlType === CONTROL_BASE_TYPE.LIST && instance.type === CONTROL_TYPE.SUBTABLE) {
                     var // @ts-ignore
                     _instance_children;
                     instance.children.length = 0;
@@ -1285,7 +1285,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                             var _this_getEmptyState;
                                             cacheEmptyState[fieldMapping.controlId] = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
                                         }
-                                        var objValue = cacheEmptyState[fieldMapping.controlId];
+                                        var objValue = JSONCopy(cacheEmptyState[fieldMapping.controlId]);
                                         Object.keys(fieldMapping.dataBind).map(function(key) {
                                             var dataBind = fieldMapping.dataBind[key];
                                             if (row[dataBind.fieldCode] !== undefined) {
@@ -1295,8 +1295,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                         });
                                         newRow[fieldMapping.controlId] = objValue;
                                     }
-                                } else if (fieldCode === "uid" && row["uid"] !== undefined) {
-                                    newRow["uid"] = row["uid"];
+                                } else if (fieldCode === "uid" && row.uid !== undefined) {
+                                    newRow.uid = row.uid;
+                                } else if (fieldCode === "virtualStore" && row.virtualStore !== undefined) {
+                                    newRow.virtualStore = Object.freeze(row.virtualStore);
                                 }
                             });
                             newState[mapping.dataViewId][mapping.controlId].push(newRow);
@@ -1469,37 +1471,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // 如果能从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);
-                                }
-                            }
+                        var headerInstance = this.findSubtableHeadersControl(instance.id);
+                        if (headerInstance !== undefined) {
+                            instances.unshift(headerInstance);
                         }
                     }
                 }
@@ -1656,8 +1630,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     return;
                 }
                 var rowIndex;
-                // @ts-ignore
-                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE_COLUMN) && this.assertInstance(instance.parent.parent, CONTROL_TYPE.SUBTABLE)) {
+                var isHeaders = // @ts-ignore
+                this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE_COLUMN) && // @ts-ignore
+                this.assertInstance(instance.parent.parent, CONTROL_TYPE.SUBTABLE);
+                if (isHeaders) {
                     rowIndex = -1;
                 } else {
                     var isColumnChild = this.getInstanceParentControl(instance, // @ts-ignore
@@ -1740,18 +1716,29 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "inList",
             value: function inList(controlId) {
-                var _this_store_controlIdMapping;
-                var mapping = (_this_store_controlIdMapping = this.store.controlIdMapping) !== null && _this_store_controlIdMapping !== void 0 ? _this_store_controlIdMapping : {};
-                var listKey = undefined;
-                Object.keys(mapping).some(function(key) {
-                    var _mapping_key_children, _mapping_key;
-                    var matched = (_mapping_key = mapping[key]) === null || _mapping_key === void 0 ? void 0 : (_mapping_key_children = _mapping_key.children) === null || _mapping_key_children === void 0 ? void 0 : _mapping_key_children.hasOwnProperty(controlId);
-                    if (matched) {
-                        listKey = key;
+                var mapping = this.store.subtableHeadersControlIdMapping;
+                var subtableId = undefined;
+                for(var key in mapping){
+                    if (controlId in mapping[key]) {
+                        subtableId = key;
+                        break;
                     }
-                    return matched;
-                });
-                return listKey;
+                }
+                return subtableId;
+            }
+        },
+        {
+            key: "findSubtableHeadersControl",
+            value: function findSubtableHeadersControl(controlId) {
+                var mapping = this.store.subtableHeadersControlIdMapping;
+                var instance = undefined;
+                for(var key in mapping){
+                    if (controlId in mapping[key]) {
+                        instance = mapping[key][controlId];
+                        break;
+                    }
+                }
+                return instance;
             }
         }
     ], [

package/dist/esm/common/Store.js

@@ -57,13 +57,15 @@ var Store = /*#__PURE__*/ function() {
         _define_property(this, "dataBindMapping", void 0 // 主要提供给二开使用
         );
         _define_property(this, "controlIdMapping", void 0);
+        _define_property(this, "subtableHeadersControlIdMapping", void 0);
         _define_property(this, "defaultState", void 0);
-        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState;
+        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState, subtableHeadersControlIdMapping = _init.subtableHeadersControlIdMapping;
         this.emptyState = emptyState;
         this.state = state;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
         this.defaultState = defaultState;
+        this.subtableHeadersControlIdMapping = subtableHeadersControlIdMapping;
     }
     _create_class(Store, [
         {
@@ -121,7 +123,14 @@ var Store = /*#__PURE__*/ function() {
                 } else {
                     var controlInfo = this.controlIdMapping[controlId];
                     if (controlInfo !== undefined) {
-                        return this.state[controlInfo.dataView][controlId];
+                        var data = this.state[controlInfo.dataView][controlId];
+                        var _controlInfo_children;
+                        // 只有明细表key，再通过rowIndex获取行数据
+                        if (rowIndex !== undefined && Object.keys((_controlInfo_children = controlInfo === null || controlInfo === void 0 ? void 0 : controlInfo.children) !== null && _controlInfo_children !== void 0 ? _controlInfo_children : {}).length > 0) {
+                            return data[rowIndex];
+                        } else {
+                            return data;
+                        }
                     } else {
                         if (rowIndex !== undefined) {
                             var state;
@@ -226,6 +235,7 @@ function init(instance) {
     var emptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
+    var subtableHeadersControlIdMapping = {};
     var defaultState = {};
     // loopFormControl(instance, (item, children) => {
     // })
@@ -241,6 +251,7 @@ function init(instance) {
             buildState(dataViewState, emptyDataViewState, item);
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
+            buildSubtableHeadersControlIdMapping(subtableHeadersControlIdMapping, item);
         });
         state[dvId] = {};
         defaultState[dvId] = dataViewState;
@@ -249,6 +260,7 @@ function init(instance) {
     return {
         state: state,
         defaultState: defaultState,
+        subtableHeadersControlIdMapping: subtableHeadersControlIdMapping,
         emptyState: emptyState,
         databindMapping: databindMapping,
         controlidMapping: controlidMapping
@@ -393,4 +405,17 @@ item) {
         });
     }
 }
+function buildSubtableHeadersControlIdMapping(data, // @ts-ignore
+item) {
+    if (item.type === CONTROL_TYPE.SUBTABLE) {
+        var headersInstances = {};
+        item.props.headers.map(// @ts-ignore
+        function(item) {
+            item.children.map(function(item) {
+                Object.assign(headersInstances, _define_property({}, item.id, item));
+            });
+        });
+        Object.assign(data, _define_property({}, item.id, headersInstances));
+    }
+}
 export { Store };

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -69,13 +69,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([

package/dist/esm/plugins/LifecycleEventPlugin.js

@@ -115,13 +115,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([