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

package/dist/esm/common/Engine.js

@@ -1115,6 +1115,34 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                 });
             }
+            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;
+                    }
+                    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);
         this.setStates(newState, undefined, options);

package/dist/esm/common/Store.js

@@ -133,7 +133,7 @@ var Store = /*#__PURE__*/ function() {
             if (controlInfo !== undefined) {
                 var state = this.emptyState[controlInfo.dataView][controlId];
                 //判断找到的是否是明细表的控件
-                if ("children" in this.emptyState[controlInfo.dataView]) {
+                if ("children" in controlInfo) {
                     Object.assign(state, {
                         uid: "new:" + buildUUID("uid")
                     });
@@ -211,8 +211,8 @@ function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
     //if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        // 2023-3-23 jiaqi 首次进入页面去除填充默认值
-        dataViewState[item.id] = JSONCopy(item.props.defaultValue);
+        // 2023-4-2 jiaqi 首次进入页面去除填充默认值
+        // dataViewState[item.id] = JSONCopy(item.props.defaultValue)
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
         var emptyTemplate = {};