@byteluck-fe/model-driven-engine 2.3.1-beta.19 → 2.3.1-beta.20

package/dist/esm/common/Engine.js

@@ -1113,35 +1113,27 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             newState[mapping.dataViewId[0]][mapping.controlId] = objValue;
                         }
                     }
-                });
-            }
-            var mapping = _this.getDataBindMapping(dataCode);
-            if (mapping) {
-                var mappingValue = Object.keys(JSONCopy(_this.getEmptyState(mapping.controlId)));
-                if (mapping.dataViewId === mapping.controlId) {
-                    var _newState_mapping_dataViewId;
-                    var _newState_mapping_dataViewId_mapping_controlId;
-                    var subtableStateKeys = Object.keys((_newState_mapping_dataViewId_mapping_controlId = newState === null || newState === void 0 ? void 0 : (_newState_mapping_dataViewId = newState[mapping.dataViewId]) === null || _newState_mapping_dataViewId === void 0 ? void 0 : _newState_mapping_dataViewId[mapping.controlId]) !== null && _newState_mapping_dataViewId_mapping_controlId !== void 0 ? _newState_mapping_dataViewId_mapping_controlId : {});
-                    if (!subtableStateKeys.length) {
-                        return;
-                    }
-                    Object.keys(mappingValue).forEach(function(key) {
-                        if (!subtableStateKeys.includes(key) && key !== "uid") {
-                            Object.assign(newState[mapping.dataViewId][mapping.controlId], mappingValue[key]);
-                        }
-                    });
-                } else {
-                    var _newState_mapping_controlId;
-                    var mainStateKeys = Object.keys((_newState_mapping_controlId = newState === null || newState === void 0 ? void 0 : newState[mapping.controlId]) !== null && _newState_mapping_controlId !== void 0 ? _newState_mapping_controlId : {});
-                    if (!mainStateKeys.length) {
-                        return;
+                    var newMapping = _this.getDataBindMapping(dataCode);
+                    if (newMapping) {
+                        var _newMapping_fields;
+                        var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (_newMapping_fields = newMapping.fields) === null || _newMapping_fields === void 0 ? void 0 : _newMapping_fields.map(function(item) {
+                            return item === null || item === void 0 ? void 0 : item.controlId;
+                        });
+                        var mappingValue = _this.getEmptyState(newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId);
+                        var mainStateKeys = Object.keys(newState);
+                        mappingKeys.forEach(function(key) {
+                            if (!mainStateKeys.includes(key) && key !== "uid") {
+                                if (Object.keys(newState).length) {
+                                    Object.assign(newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId], _defineProperty({}, key, [
+                                        mappingValue[key]
+                                    ]));
+                                } else {
+                                    Object.assign(newState, _defineProperty({}, newMapping.controlId, _defineProperty({}, key, mappingValue[key])));
+                                }
+                            }
+                        });
                     }
-                    Object.keys(mappingValue).forEach(function(key) {
-                        if (!mainStateKeys.includes(key) && key !== "uid") {
-                            Object.assign(newState[mapping.controlId], mappingValue[key]);
-                        }
-                    });
-                }
+                });
             }
         });
         this.debugLog("engine setData方法数据组合完成，参数为%o。", newState);