@byteluck-fe/model-driven-engine 2.5.1-alpha.1 → 2.5.1

package/dist/esm/common/Engine.js

@@ -1178,7 +1178,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         if (!newState[mapping.dataViewId]) {
                             newState[mapping.dataViewId] = {};
                         }
-                        newState[mapping.dataViewId][mapping.controlId] = [];
+                        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 newRow = JSONCopy(_this.store.emptyState[mapping.dataViewId][mapping.controlId]);
                             var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量

package/dist/esm/common/Store.js

@@ -82,9 +82,10 @@ var Store = /*#__PURE__*/ function() {
             value: function setState(controlId, value, rowIndex) {
                 var _this = this;
                 var controlInfo = this.controlIdMapping[controlId];
+                var noProxyValue = JSONCopy(value);
                 if (controlInfo !== undefined) {
                     //qiyu 按照对象赋值，Object.assign会触发多次key的change事件
-                    this.state[controlInfo.dataView][controlId] = value;
+                    this.state[controlInfo.dataView][controlId] = noProxyValue;
                 // if (
                 //   controlInfo.dataBind instanceof ObjectDataBind &&
                 //   isPlainObject(value)
@@ -102,14 +103,16 @@ var Store = /*#__PURE__*/ function() {
                             if (children !== undefined) {
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
-                                        _this.state[dataView][subtableId][rowIndex][controlId] = value;
+                                        if (_this.state[dataView][subtableId][rowIndex]) {
+                                            _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
+                                        }
                                     }
                                 });
                             }
                         });
                     } else {
                         //不存在的 controlId，直接被挂载到外部key
-                        this.state[controlId] = value;
+                        this.state[controlId] = noProxyValue;
                     }
                 }
             }
@@ -271,12 +274,12 @@ item) {
         loopFormSchema(item.props.headers, function(headerItem) {
             emptyTemplate[headerItem.id] = JSONCopy(headerItem.props.defaultValue);
         });
-        var _item_props_defaultRows;
-        dataViewState[item.id] = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
+        var _item_props_defaultRows, _fill_map;
+        dataViewState[item.id] = (_fill_map = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
             return _objectSpread({
                 uid: "new:" + buildUUID("uid")
             }, JSONCopy(emptyTemplate));
-        });
+        })) !== null && _fill_map !== void 0 ? _fill_map : [];
         emptyDataViewState[item.id] = emptyTemplate;
     }
 }

package/dist/esm/common/proxyState.js

@@ -24,7 +24,7 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 var cc = console;
-import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -137,19 +137,19 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     }
                 }
             };
-            var newValue = value;
+            var newValue = JSONCopy(value);
             // @ts-ignore
             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,9 +171,11 @@ 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;
+            // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
+            //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'
+            return setResult ? setResult : true;
         }
     };
 }

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -213,7 +213,7 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
                             switch(_state.label){
                                 case 0:
                                     // 初始化state的时候不触发change事件,必须在engine mounted以后才触发
-                                    if (eventKey === "change" && !_this.engine.isMounted) {
+                                    if ((eventKey === "change" || eventKey === "list-change") && !_this.engine.isMounted) {
                                         return [
                                             2
                                         ];