@byteluck-fe/model-driven-engine 2.3.0 → 2.3.1-beta.11

package/dist/esm/common/Engine.js

@@ -1088,6 +1088,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             } else if (entity) {
                 var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                 ;
+                var emptyState = JSONCopy(_this.store.emptyState);
                 Object.keys(entity).map(function(fieldCode) {
                     if (skipKey.includes(fieldCode)) {
                         return;
@@ -1098,7 +1099,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             newState[mapping.dataViewId[0]] = {};
                         }
                         if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
-                            newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode];
+                            newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode] !== undefined ? entity[fieldCode] : emptyState[mapping.dataViewId[0]][mapping.controlId];
                         } else if (_instanceof(mapping.dataBind, ObjectDataBind)) {
                             var _this_getEmptyState;
                             var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(mapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
@@ -1198,24 +1199,42 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         return instances;
     };
     _proto.setInstance = function setInstance(instance, props, value, rowIndex) {
+        var _this = this;
         try {
-            var _instance;
-            if (typeof instance === "string") {
-                _instance = this.getInstance(instance, rowIndex);
+            if (typeof instance === "string" && rowIndex === -1) {
+                //修改明细表整列属性的逻辑
+                var instances = this.getInstances(instance, rowIndex === -1);
+                instances.map(function(_instance) {
+                    if (_instance) {
+                        _this.debugLog("[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
+                        updateValueFromKeys(_instance.props, props, value);
+                        _this.schemaEvent("schema-change", {
+                            instance: _instance,
+                            props: props,
+                            value: value,
+                            rowIndex: rowIndex
+                        });
+                    }
+                });
             } else {
-                _instance = instance;
-            }
-            if (!_instance) {
-                return;
+                var _instance;
+                if (typeof instance === "string") {
+                    _instance = this.getInstance(instance, rowIndex);
+                } else {
+                    _instance = instance;
+                }
+                if (!_instance) {
+                    return;
+                }
+                this.debugLog("[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
+                updateValueFromKeys(_instance.props, props, value);
+                this.schemaEvent("schema-change", {
+                    instance: _instance,
+                    props: props,
+                    value: value,
+                    rowIndex: rowIndex
+                });
             }
-            this.debugLog("[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
-            updateValueFromKeys(_instance.props, props, value);
-            this.schemaEvent("schema-change", {
-                instance: _instance,
-                props: props,
-                value: value,
-                rowIndex: rowIndex
-            });
         } catch (e) {
             throw e;
         }

package/dist/esm/common/Store.js

@@ -204,7 +204,8 @@ function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
     //if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        dataViewState[item.id] = JSONCopy(item.props.defaultValue);
+        // 2023-3-23 jiaqi 首次进入页面去除填充默认值
+        // dataViewState[item.id] = JSONCopy(item.props.defaultValue)
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
         var emptyTemplate = {};