@byteluck-fe/model-driven-engine 2.3.13-beta.1 → 2.3.13-beta.3

package/dist/esm/common/Engine.js

@@ -1165,11 +1165,20 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 Object.keys(dataSet).map(function(dataCode) {
                     var entity = dataSet[dataCode];
                     if (Array.isArray(entity)) {
+                        var mapping = _this.getDataBindMapping(dataCode);
+                        if (!mapping) {
+                            return;
+                        }
+                        if (!newState[mapping.dataViewId]) {
+                            newState[mapping.dataViewId] = {};
+                        }
+                        if (!entity.length) {
+                            var _newState_mapping_dataViewId_mapping_controlId;
+                            newState[mapping.dataViewId][mapping.controlId] = (_newState_mapping_dataViewId_mapping_controlId = newState[mapping.dataViewId][mapping.controlId]) !== null && _newState_mapping_dataViewId_mapping_controlId !== void 0 ? _newState_mapping_dataViewId_mapping_controlId : [];
+                        } else {
+                            newState[mapping.dataViewId][mapping.controlId] = [];
+                        }
                         entity.map(function(row) {
-                            var mapping = _this.getDataBindMapping(dataCode);
-                            if (!mapping) {
-                                return;
-                            }
                             var newRow = JSONCopy(_this.store.emptyState[mapping.dataViewId][mapping.controlId]);
                             var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                             ;

package/dist/esm/common/proxyState.js

@@ -142,14 +142,14 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
             var _reProxyState;
-            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
+            newValue = (_reProxyState = reProxyState(newValue)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
             // TODO 直接操作下标改动明细表时，没有对行数据进行checker
             if (Array.isArray(target)) {
                 // 操作数组的时候，不需要使用拼接的thisKey，先判断执行的是否是违规操作，违规操作的话会报错，不允许继续执行，正常操作的话，返回一个回调函数，用于在值修改完之后触发
-                var nextHandler = ArrayHandler(target, propertyKey, value, thisKey, callback);
+                var nextHandler = ArrayHandler(target, propertyKey, newValue, thisKey, callback);
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
                 if (nextHandler) {
                     nextHandler();
@@ -171,7 +171,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     return true;
                 }
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
-                callback.call(null, target, concatKey, value, oldValue);
+                callback.call(null, target, concatKey, newValue, oldValue);
             }
             return setResult;
         }