npm - @byteluck-fe/model-driven-engine - Versions diffs - 6.1.0-1-beta.1 → 6.1.0-1-beta.2 - Mend

@byteluck-fe/model-driven-engine 6.1.0-1-beta.1 → 6.1.0-1-beta.2

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 CHANGED Viewed

@@ -1355,8 +1355,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                         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];
+                                            //金额及计算公式控件在赋值时会经过两次 且当控件值不为同一个模型时，会赋值两次 会导致前后覆盖行为。
+                                            if (dataSet[dataBind.dataCode]) {
+                                                var extendEntity = dataSet[dataBind.dataCode];
+                                                if (extendEntity[dataBind.fieldCode] !== undefined) {
+                                                    objValue[key] = extendEntity[dataBind.fieldCode];
+                                                }
                                             }
                                             skipKey.push(dataBind.fieldCode);
                                         });