npm - @byteluck-fe/model-driven-engine - Versions diffs - 2.3.4 → 2.3.6 - Mend

@byteluck-fe/model-driven-engine 2.3.4 → 2.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/esm/common/Engine.js +29 -23
package/dist/index.umd.js +7 -7
package/package.json +2 -2

package/dist/esm/common/Engine.js CHANGED Viewed

@@ -1213,34 +1213,40 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             newState[mapping.dataViewId][mapping.controlId].push(newRow);
                         });
                     } else if (entity) {
+                        var _Object_keys;
                         var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                         ;
                         var emptyState = JSONCopy(_this.store.emptyState);
-                        Object.keys(entity).map(function(fieldCode) {
-                            if (skipKey.includes(fieldCode)) {
-                                return;
-                            }
-                            var mapping = _this.getDataBindMapping(dataCode, fieldCode);
-                            if (mapping) {
-                                if (!newState[mapping.dataViewId[0]]) {
-                                    newState[mapping.dataViewId[0]] = {};
+                        if (!((_Object_keys = Object.keys(entity)) === null || _Object_keys === void 0 ? void 0 : _Object_keys.length)) {
+                            //判断entity 为空对象就给表单赋值默认值
+                            newState = JSONCopy(emptyState);
+                        } else {
+                            Object.keys(entity).map(function(fieldCode) {
+                                if (skipKey.includes(fieldCode)) {
+                                    return;
                                 }
-                                if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
-                                    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 = (_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) {
-                                            objValue[key] = entity[dataBind.fieldCode];
-                                        }
-                                        skipKey.push(dataBind.fieldCode);
-                                    });
-                                    newState[mapping.dataViewId[0]][mapping.controlId] = objValue;
+                                var mapping = _this.getDataBindMapping(dataCode, fieldCode);
+                                if (mapping) {
+                                    if (!newState[mapping.dataViewId[0]]) {
+                                        newState[mapping.dataViewId[0]] = {};
+                                    }
+                                    if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
+                                        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 = (_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) {
+                                                objValue[key] = entity[dataBind.fieldCode];
+                                            }
+                                            skipKey.push(dataBind.fieldCode);
+                                        });
+                                        newState[mapping.dataViewId[0]][mapping.controlId] = objValue;
+                                    }
                                 }
-                            }
-                        });
+                            });
+                        }
                         var newMapping = _this.getDataBindMapping(dataCode);
                         if (newMapping) {
                             var _newMapping_fields;