@byteluck-fe/model-driven-engine 2.7.0-beta → 2.8.0-alpha.1

package/dist/esm/common/Engine.js

@@ -111,13 +111,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -347,8 +340,8 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { DataBind, ObjectDataBind, RuntimeListControl } from "@byteluck-fe/model-driven-core";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
+import { isDataBind } from "@byteluck-fe/model-driven-core";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher, isBuiltInControls } from "@byteluck-fe/model-driven-shared";
 import { Runtime } from "./Runtime";
 import { Store } from "./Store";
 import { findItem, proxyState } from "./proxyState";
@@ -481,7 +474,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 // @ts-ignore
                 if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE)) {
-                    var _newValue;
                     if (newValue === null) {
                         return [];
                     }
@@ -496,7 +488,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }, {});
                     // @ts-ignore
                     var emptyState = this.getEmptyState(instance.id);
-                    return (_newValue = newValue) === null || _newValue === void 0 ? void 0 : _newValue.map(function(row) {
+                    return newValue === null || newValue === void 0 ? void 0 : newValue.map(function(row) {
                         return(// @ts-ignore
                         checkerSubtableValue(fieldTypeMap, row, emptyState));
                     });
@@ -526,7 +518,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
                 var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
-                if (!_instanceof(subtable, RuntimeListControl)) return;
+                // if (!(subtable instanceof RuntimeListControl)) return
+                if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
                 var createRows = function(len) {
                     // @ts-ignore
@@ -544,6 +537,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var createdNewRows = [];
                 var createdNewRowsData = [];
                 var deleted = [];
+                var isDeleteLastOne = false;
                 if (type && args) {
                     // const subtableOldLength = subtable.children.length
                     switch(type){
@@ -580,6 +574,13 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             } else {
                                 var // @ts-ignore
                                 _subtable_children2;
+                                // 从哪儿开始
+                                var start1 = args[0];
+                                // 替换几个
+                                var replace1 = args[1];
+                                if (start1 + replace1 === subtable.children.length - 1) {
+                                    isDeleteLastOne = true;
+                                }
                                 (_subtable_children2 = subtable.children)[type].apply(_subtable_children2, _to_consumable_array(args));
                                 this.runtime.getFlatInstances();
                             }
@@ -608,7 +609,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             changed: createdNewRows,
                             data: createdNewRowsData,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
-                            jsonValue: JSON.stringify(this.getState(subtable.id))
+                            jsonValue: JSON.stringify(this.getState(subtable.id)),
+                            isDeleteLastOne: isDeleteLastOne,
+                            type: type,
+                            args: args
                         })
                     });
                     // 主动清空本次任务中的options
@@ -651,7 +655,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
-                            deleted: oldValue !== null && oldValue !== void 0 ? oldValue : []
+                            deleted: oldValue !== null && oldValue !== void 0 ? oldValue : [],
+                            type: "push"
                         })
                     });
                 } else {
@@ -946,7 +951,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 var dataBind = dataBindMapping1.dataBind, controlId1 = dataBindMapping1.controlId;
                 var state = this.getState(controlId1, rowIndex);
-                if (_instanceof(dataBind, ObjectDataBind)) {
+                //if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind)) {
                     return Object.entries(dataBind).reduce(function(result, param) {
                         var _param = _sliced_to_array(param, 2), key = _param[0], dataBind = _param[1];
                         // objectDataBind的元素，跳过下一次赋值
@@ -1053,7 +1059,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     return;
                 }
                 var dataBind = dataBindMapping.dataBind, controlId = dataBindMapping.controlId;
-                if (_instanceof(dataBind, ObjectDataBind)) {
+                // if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind)) {
                     var _JSONCopy;
                     var oldState = (_JSONCopy = JSONCopy(this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : this.getEmptyState(controlId);
                     // fieldCode不代表是key，所以需要找到对应的key
@@ -1095,7 +1102,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind)) {
                         var _JSONCopy;
                         var oldState = (_JSONCopy = JSONCopy(_this.getState(controlId, rowIndex))) !== null && _JSONCopy !== void 0 ? _JSONCopy : _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
@@ -1139,7 +1147,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind)) {
                         var oldState = _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
                         result[item.controlId] = Object.entries(dataBind).reduce(function(result, param) {
@@ -1198,9 +1207,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     return i.fieldCode === fieldCode;
                                 });
                                 if (fieldMapping) {
-                                    if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
+                                    if (// fieldMapping.dataBind instanceof DataBind &&
+                                    isDataBind(fieldMapping.dataBind) && row[fieldCode] !== undefined) {
                                         newRow[fieldMapping.controlId] = row[fieldCode];
-                                    } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
+                                    // } else if (fieldMapping.dataBind instanceof ObjectDataBind) {
+                                    } else if (!isDataBind(fieldMapping.dataBind)) {
                                         var _this_getEmptyState;
                                         var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
                                         Object.keys(fieldMapping.dataBind).map(function(key) {
@@ -1233,9 +1244,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     if (!newState[mapping.dataViewId[0]]) {
                                         newState[mapping.dataViewId[0]] = {};
                                     }
-                                    if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
+                                    if (// mapping.dataBind instanceof DataBind &&
+                                    isDataBind(mapping.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)) {
+                                    // } else if (mapping.dataBind instanceof ObjectDataBind) {
+                                    } else if (!isDataBind(mapping.dataBind)) {
                                         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) {
@@ -1252,20 +1265,17 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         }
                         var newMapping = _this.getDataBindMapping(dataCode);
                         if (newMapping) {
-                            var _newMapping_fields, _newMapping, _newMapping1, _newMapping2, _newState, _mappingKeys;
-                            var mappingKeys = (_newMapping = newMapping) === null || _newMapping === void 0 ? void 0 : (_newMapping_fields = _newMapping.fields) === null || _newMapping_fields === void 0 ? void 0 : _newMapping_fields.map(function(item) {
-                                var _item;
-                                return (_item = item) === null || _item === void 0 ? void 0 : _item.controlId;
+                            var _newMapping_fields;
+                            var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (_newMapping_fields = newMapping.fields) === null || _newMapping_fields === void 0 ? void 0 : _newMapping_fields.map(function(item) {
+                                return item === null || item === void 0 ? void 0 : item.controlId;
                             });
-                            var mappingValue = _this.getEmptyState((_newMapping1 = newMapping) === null || _newMapping1 === void 0 ? void 0 : _newMapping1.controlId);
+                            var mappingValue = _this.getEmptyState(newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId);
                             var _newState_newMapping_controlId;
-                            var mainStateKeys = Object.keys((_newState_newMapping_controlId = (_newState = newState) === null || _newState === void 0 ? void 0 : _newState[(_newMapping2 = newMapping) === null || _newMapping2 === void 0 ? void 0 : _newMapping2.controlId]) !== null && _newState_newMapping_controlId !== void 0 ? _newState_newMapping_controlId : {});
-                            (_mappingKeys = mappingKeys) === null || _mappingKeys === void 0 ? void 0 : _mappingKeys.forEach(function(key) {
-                                var _newMapping;
-                                if (!mainStateKeys.includes(key) && key !== "uid" && newState[(_newMapping = newMapping) === null || _newMapping === void 0 ? void 0 : _newMapping.controlId]) {
+                            var mainStateKeys = Object.keys((_newState_newMapping_controlId = newState === null || newState === void 0 ? void 0 : newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) !== null && _newState_newMapping_controlId !== void 0 ? _newState_newMapping_controlId : {});
+                            mappingKeys === null || mappingKeys === void 0 ? void 0 : mappingKeys.forEach(function(key) {
+                                if (!mainStateKeys.includes(key) && key !== "uid" && newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) {
                                     if (Object.keys(newState).length) {
-                                        var _newMapping1;
-                                        Object.assign(newState[(_newMapping1 = newMapping) === null || _newMapping1 === void 0 ? void 0 : _newMapping1.controlId], _define_property({}, key, mappingValue[key]));
+                                        Object.assign(newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId], _define_property({}, key, mappingValue[key]));
                                     } else {
                                         Object.assign(newState, _define_property({}, newMapping.controlId, _define_property({}, key, mappingValue[key])));
                                     }
@@ -1331,6 +1341,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
                     if (instances.length) {
                         var instance = instances[0];
+                        // if (this.inList(instance.id) === true) {
                         if (this.inList(instance.id) !== undefined) {
                             var headerInstance = this.getInstanceInSubtableHeader(instance);
                             if (headerInstance) {
@@ -1468,6 +1479,14 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 return isString(types) ? instance.type === types : types.includes(instance.type);
             }
         },
+        {
+            key: "assertInstanceIsCustomControl",
+            value: /**
+   * 判断控件或控件类型是一个自定义控件
+   * */ function assertInstanceIsCustomControl(instance) {
+                return !isBuiltInControls(isString(instance) ? instance : instance.type);
+            }
+        },
         {
             key: "getInstanceRowIndex",
             value: /**
@@ -1503,7 +1522,27 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         },
         {
             key: "getInstanceParentControl",
-            value: function getInstanceParentControl(instance, controlType) {
+            value: // public getInstanceRowIndex(
+            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
+            // ) {
+            //   let rowIndex: number | undefined
+            //   // @ts-ignore
+            //   if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+            //     rowIndex = -1
+            //   }else{
+            //     const instanceList = this.runtime.instanceMap[instance.id]
+            //     if(Object.prototype.toString.call(instanceList) === '[object Array]'){
+            //       const index = instanceList.findIndex(
+            //         (item: any) => item === instance
+            //       )
+            //       if (index > -1) {
+            //         rowIndex = index
+            //       }
+            //     }
+            //   }
+            //   return rowIndex
+            // }
+            function getInstanceParentControl(instance, controlType) {
                 if (!instance.parent) {
                     return;
                 }

package/dist/esm/common/OkWorker.js

@@ -77,7 +77,9 @@ var OkWorker = /*#__PURE__*/ function() {
             key: "createWorkerFunction",
             value: function createWorkerFunction() {
                 return function() {
-                    var createHandler = function createHandler(parentKey) {
+                    log("‍\uD83D\uDE80 worker running");
+                    var _self = self;
+                    function createHandler(parentKey) {
                         return {
                             get: function get(target, key, value) {
                                 return Reflect.get(target, key, value);
@@ -92,9 +94,7 @@ var OkWorker = /*#__PURE__*/ function() {
                                 return Reflect.set(target, key, value);
                             }
                         };
-                    };
-                    log("‍\uD83D\uDE80 worker running");
-                    var _self = self;
+                    }
                     // function createProxy(
                     // 	obj: Record<string, unknown> | Array<Record<string, unknown>>,
                     // 	parentKey?: string

package/dist/esm/common/Runtime.js

@@ -234,8 +234,12 @@ function loop(control, callback) {
         control.map(function(item) {
             callback(item);
             if (hasChildrenControl(item)) {
+                var ctl = item;
+                if (!ctl.children) {
+                    ctl.children = [];
+                }
                 // @ts-ignore
-                loop(item.children, callback);
+                loop(ctl.children, callback);
             }
         });
     } else {

package/dist/esm/common/Store.js

@@ -30,13 +30,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -52,7 +45,7 @@ function _object_spread(target) {
     }
     return target;
 }
-import { DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
+import { DataBind, isDataBind } from "@byteluck-fe/model-driven-core";
 import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from "@byteluck-fe/model-driven-shared";
 import { loopDataViewControl, loopFormControl, buildUUID } from "../utils/runtimeUtils";
 var Store = /*#__PURE__*/ function() {
@@ -82,10 +75,9 @@ 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] = noProxyValue;
+                    this.state[controlInfo.dataView][controlId] = value;
                 // if (
                 //   controlInfo.dataBind instanceof ObjectDataBind &&
                 //   isPlainObject(value)
@@ -104,7 +96,7 @@ var Store = /*#__PURE__*/ function() {
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
                                         if (_this.state[dataView][subtableId][rowIndex]) {
-                                            _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
+                                            _this.state[dataView][subtableId][rowIndex][controlId] = value;
                                         }
                                     }
                                 });
@@ -112,7 +104,7 @@ var Store = /*#__PURE__*/ function() {
                         });
                     } else {
                         //不存在的 controlId，直接被挂载到外部key
-                        this.state[controlId] = noProxyValue;
+                        this.state[controlId] = value;
                     }
                 }
             }
@@ -208,7 +200,6 @@ var Store = /*#__PURE__*/ function() {
         {
             key: "getDataBind",
             value: function getDataBind(controlId) {
-                var _result;
                 var result = this.controlIdMapping[controlId];
                 if (result) {
                     return result.dataBind;
@@ -224,7 +215,7 @@ var Store = /*#__PURE__*/ function() {
                         }
                     }
                 }
-                return (_result = result) === null || _result === void 0 ? void 0 : _result.dataBind;
+                return result === null || result === void 0 ? void 0 : result.dataBind;
             }
         }
     ]);
@@ -289,7 +280,8 @@ item) {
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         var _item_props_dataBind, _item_props;
-        if (_instanceof(item.props.dataBind, ObjectDataBind)) {
+        // if (item.props.dataBind instanceof ObjectDataBind) {
+        if (!isDataBind(item.props.dataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
             Object.keys(item.props.dataBind).map(function(key) {
                 var dataBind = item.props.dataBind;
@@ -344,7 +336,8 @@ item) {
         };
         var subtableId = item.id;
         loopFormSchema(item.props.headers, function(item) {
-            if (_instanceof(item.props.dataBind, ObjectDataBind)) {
+            // if (item.props.dataBind instanceof ObjectDataBind) {
+            if (!isDataBind(item.props.dataBind)) {
                 Object.keys(item.props.dataBind).map(function(key) {
                     var dataBind = item.props.dataBind;
                     var dataCode = dataBind[key].dataCode;

package/dist/esm/common/checkerValue.js

@@ -63,13 +63,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -254,13 +247,13 @@ var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "transform",
             value: function transform(value) {
-                var getStringValueArray = function getStringValueArray(value) {
+                if (value === undefined || value === null) {
+                    return [];
+                }
+                function getStringValueArray(value) {
                     return value.map(function(item) {
                         return !item ? "" : String(item);
                     });
-                };
-                if (value === undefined || value === null) {
-                    return [];
                 }
                 if (isArray(value)) {
                     return getStringValueArray(value);
@@ -299,15 +292,15 @@ var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "transform",
             value: function transform(value) {
-                var getNumberValueArray = function getNumberValueArray(value) {
+                if (value === undefined || value === null) {
+                    return [];
+                }
+                function getNumberValueArray(value) {
                     return value.map(function(item) {
                         return !item && item !== 0 ? "" : Number(item);
                     }).filter(function(item) {
                         return item === "" || !Number.isNaN(item);
                     });
-                };
-                if (value === undefined || value === null) {
-                    return [];
                 }
                 if (isArray(value)) {
                     return getNumberValueArray(value);
@@ -344,16 +337,16 @@ var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, AmountValue) || isPlainObject(value) && "amount" in value && isNumber(value.amount) && "currency" in value && isString(value.currency);
+                return(// value instanceof AmountValue ||
+                isPlainObject(value) && "amount" in value && isNumber(value.amount) && "currency" in value && isString(value.currency));
             }
         },
         {
             key: "transform",
             value: function transform(value, oldValue) {
                 if (value === undefined || value === null || value === "") {
-                    var _oldValue;
                     return new AmountValue({
-                        currency: (_oldValue = oldValue) === null || _oldValue === void 0 ? void 0 : _oldValue.currency
+                        currency: oldValue === null || oldValue === void 0 ? void 0 : oldValue.currency
                     });
                 }
                 var result;
@@ -395,7 +388,8 @@ var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, RangeDateValue) || isPlainObject(value) && "min" in value && isString(value.min) && "max" in value && isString(value.max);
+                return(// value instanceof RangeDateValue ||
+                isPlainObject(value) && "min" in value && isString(value.min) && "max" in value && isString(value.max));
             }
         },
         {
@@ -442,16 +436,16 @@ var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, CalcValue) || isPlainObject(value) && "result" in value && isNumber(value.result) && "unit" in value && isString(value.unit);
+                return(// value instanceof CalcValue ||
+                isPlainObject(value) && "result" in value && isNumber(value.result) && "unit" in value && isString(value.unit));
             }
         },
         {
             key: "transform",
             value: function transform(value, oldValue) {
                 if (value === undefined || value === null || value === "") {
-                    var _oldValue;
                     return new CalcValue({
-                        unit: (_oldValue = oldValue) === null || _oldValue === void 0 ? void 0 : _oldValue.unit
+                        unit: oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit
                     });
                 }
                 var result;
@@ -493,7 +487,18 @@ var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, AddressValue);
+                // return value instanceof AddressValue
+                if (isPlainObject(value)) {
+                    // city?: string;
+                    // cityDisplay?: string;
+                    // district?: string;
+                    // districtDisplay?: string;
+                    // province?: string;
+                    // provinceDisplay?: string
+                    return true;
+                } else {
+                    return false;
+                }
             }
         },
         {

package/dist/esm/common/proxyState.js

@@ -24,7 +24,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var cc = console;
-import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -125,7 +125,11 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             return Reflect.get(target, propertyKey, receiver);
         },
         set: function set(target, propertyKey, value, receiver) {
-            var reProxyState = function reProxyState(value) {
+            var newValue = value;
+            // @ts-ignore
+            var oldValue = target[propertyKey];
+            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            function reProxyState(value) {
                 if (typeof value === "object" && value !== null) {
                     // @ts-ignore
                     if (value[engineProxyFlag] !== true) {
@@ -136,20 +140,16 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                         value[engineTargetKey], callback, beforeSetCallback, concatKey);
                     }
                 }
-            };
-            var newValue = JSONCopy(value);
-            // @ts-ignore
-            var oldValue = target[propertyKey];
-            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            }
             var _reProxyState;
-            newValue = (_reProxyState = reProxyState(newValue)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
+            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
             // TODO 直接操作下标改动明细表时，没有对行数据进行checker
             if (Array.isArray(target)) {
                 // 操作数组的时候，不需要使用拼接的thisKey，先判断执行的是否是违规操作，违规操作的话会报错，不允许继续执行，正常操作的话，返回一个回调函数，用于在值修改完之后触发
-                var nextHandler = ArrayHandler(target, propertyKey, newValue, thisKey, callback);
+                var nextHandler = ArrayHandler(target, propertyKey, value, 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, newValue, oldValue);
+                callback.call(null, target, concatKey, value, oldValue);
             }
             // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
             //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'
@@ -205,7 +205,7 @@ function flatInstanceForChildren(controls) {
     var result = [];
     controls.forEach(function(item) {
         result.push(item);
-        if (item.controlType === "layout") {
+        if (item.controlType === "layout" || item.controlType === "wrap") {
             var _result;
             (_result = result).push.apply(_result, _to_consumable_array(flatInstanceForChildren(item.children)));
         }
@@ -237,18 +237,17 @@ function flatInstanceForChildren(controls) {
         var index = Number(key);
         var isNotIndex = Number.isNaN(index);
         if (isNotIndex && prevItem) {
-            var _prevItem, _flatChildren;
-            var flatChildren = ((_prevItem = prevItem) === null || _prevItem === void 0 ? void 0 : _prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
-            var findEndItem = (_flatChildren = flatChildren) === null || _flatChildren === void 0 ? void 0 : _flatChildren.find(function(item) {
+            var flatChildren = (prevItem === null || prevItem === void 0 ? void 0 : prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
+            var findEndItem = flatChildren === null || flatChildren === void 0 ? void 0 : flatChildren.find(function(item) {
                 return item.id === key;
             });
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
             return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
         } else {
-            var _prevItem_children, _prevItem1;
+            var _prevItem_children;
             var _prevItem_children_index;
             // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (_prevItem_children_index = (_prevItem1 = prevItem) === null || _prevItem1 === void 0 ? void 0 : (_prevItem_children = _prevItem1.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
+            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
         }
     }, initInstance);
 }