@byteluck-fe/model-driven-engine 6.2.0-beta.9 → 6.2.0-cyj.1

package/dist/esm/common/ActionManager.js

@@ -14,11 +14,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
         reject(error);
         return;
     }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
+    if (info.done) resolve(value);
+    else Promise.resolve(value).then(_next, _throw);
 }
 function _async_to_generator(fn) {
     return function() {
@@ -36,9 +33,7 @@ function _async_to_generator(fn) {
     };
 }
 function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -62,28 +57,20 @@ function _define_property(obj, key, value) {
             configurable: true,
             writable: true
         });
-    } else {
-        obj[key] = value;
-    }
+    } else obj[key] = value;
     return obj;
 }
 function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) {
+        return Array.from(iter);
+    }
 }
 function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -93,9 +80,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {
@@ -175,6 +170,14 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 import { error, logerror } from '@byteluck-fe/model-driven-shared';
 export var ActionManager = /*#__PURE__*/ function() {
     "use strict";

package/dist/esm/common/DataManager.js

@@ -6,11 +6,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
         reject(error);
         return;
     }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
+    if (info.done) resolve(value);
+    else Promise.resolve(value).then(_next, _throw);
 }
 function _async_to_generator(fn) {
     return function() {
@@ -28,9 +25,7 @@ function _async_to_generator(fn) {
     };
 }
 function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -54,9 +49,7 @@ function _define_property(obj, key, value) {
             configurable: true,
             writable: true
         });
-    } else {
-        obj[key] = value;
-    }
+    } else obj[key] = value;
     return obj;
 }
 function _ts_generator(thisArg, body) {
@@ -68,9 +61,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {

package/dist/esm/common/Engine.js

@@ -10,9 +10,7 @@ function _array_without_holes(arr) {
     if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
 function _assert_this_initialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
+    if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return self;
 }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -23,11 +21,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
         reject(error);
         return;
     }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
+    if (info.done) resolve(value);
+    else Promise.resolve(value).then(_next, _throw);
 }
 function _async_to_generator(fn) {
     return function() {
@@ -49,9 +44,7 @@ function _call_super(_this, derived, args) {
     return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
 }
 function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -75,22 +68,17 @@ function _define_property(obj, key, value) {
             configurable: true,
             writable: true
         });
-    } else {
-        obj[key] = value;
-    }
+    } else obj[key] = value;
     return obj;
 }
 function _get(target, property, receiver) {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-        _get = Reflect.get;
-    } else {
+    if (typeof Reflect !== "undefined" && Reflect.get) _get = Reflect.get;
+    else {
         _get = function get(target, property, receiver) {
             var base = _super_prop_base(target, property);
             if (!base) return;
             var desc = Object.getOwnPropertyDescriptor(base, property);
-            if (desc.get) {
-                return desc.get.call(receiver || target);
-            }
+            if (desc.get) return desc.get.call(receiver || target);
             return desc.value;
         };
     }
@@ -115,8 +103,18 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
+function _is_native_reflect_construct() {
+    try {
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
+}
 function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) {
+        return Array.from(iter);
+    }
 }
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
@@ -143,10 +141,10 @@ function _iterable_to_array_limit(arr, i) {
     return _arr;
 }
 function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
@@ -178,9 +176,8 @@ function ownKeys(object, enumerableOnly) {
 }
 function _object_spread_props(target, source) {
     source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
+    if (Object.getOwnPropertyDescriptors) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    else {
         ownKeys(Object(source)).forEach(function(key) {
             Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
         });
@@ -188,9 +185,7 @@ function _object_spread_props(target, source) {
     return target;
 }
 function _possible_constructor_return(self, call) {
-    if (call && (_type_of(call) === "object" || typeof call === "function")) {
-        return call;
-    }
+    if (call && (_type_of(call) === "object" || typeof call === "function")) return call;
     return _assert_this_initialized(self);
 }
 function _set_prototype_of(o, p) {
@@ -213,26 +208,6 @@ function _super_prop_base(object, property) {
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-function _is_native_reflect_construct() {
-    try {
-        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-    } catch (_) {}
-    return (_is_native_reflect_construct = function() {
-        return !!result;
-    })();
-}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -242,9 +217,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {
@@ -324,9 +307,20 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { getLocaleText } from '@byteluck-fe/locale-message';
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 import { isDataBind } from '@byteluck-fe/model-driven-core';
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, updateValueFromKeys, warn, Watcher, deepFreeze, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, updateValueFromKeys, warn, Watcher, isBuiltInControls } from '@byteluck-fe/model-driven-shared';
 import { Runtime } from './Runtime';
 import { Store } from './Store';
 import { findItem, proxyState } from './proxyState';
@@ -494,7 +488,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 // if (!(subtable instanceof RuntimeListControl)) return
                 if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
-                var createRows = function(len) {
+                var createRows = function createRows(len) {
                     // @ts-ignore
                     var newRows = [];
                     for(var i = 0; i < len; i++){
@@ -777,7 +771,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: // payload应该是runtimeSchema和value，然后通过runTimeSchema去找需要修改的data里边的key
             function emit(eventKey, payload) {
                 var _this = this;
-                var _this1 = this, _superprop_get_emit = function() {
+                var _this1 = this, _superprop_get_emit = function _superprop_get_emit() {
                     return _get(_get_prototype_of(Engine.prototype), "emit", _this);
                 };
                 return _async_to_generator(function() {
@@ -1260,124 +1254,146 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * @options 传递给关联事件中 EventPayload中的options，一般在plugin中监听使用
    */ key: "setData",
             value: function setData(dataSet, options) {
-                var _this = this;
-                // @i18n-translate-ignore
-                this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
-                var onlySetData = options === null || options === void 0 ? void 0 : options.onlySetData;
-                var newState = this.store.defaultState;
-                if (onlySetData === true) {
-                    newState = {};
-                }
-                Object.keys(dataSet).map(function(dataCode) {
+                var _this, _loop = function(i) {
+                    var dataCode = dataCodes[i];
                     var entity = dataSet[dataCode];
                     if (Array.isArray(entity)) {
-                        var mapping = _this.getDataBindMapping(dataCode);
+                        var _storeEmptyState_dataViewId;
+                        var mapping = dataBindMapping[dataCode];
                         if (!mapping) {
-                            return;
+                            return "continue";
                         }
-                        if (!newState[mapping.dataViewId]) {
-                            newState[mapping.dataViewId] = {};
+                        var dataViewId = mapping.dataViewId, controlId = mapping.controlId, fields = mapping.fields;
+                        if (!newState[dataViewId]) {
+                            newState[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 : [];
+                            var _newState_dataViewId_controlId;
+                            newState[dataViewId][controlId] = (_newState_dataViewId_controlId = newState[dataViewId][controlId]) !== null && _newState_dataViewId_controlId !== void 0 ? _newState_dataViewId_controlId : [];
                         } else {
-                            newState[mapping.dataViewId][mapping.controlId] = [];
+                            newState[dataViewId][controlId] = [];
+                        }
+                        var fieldMap = new Map();
+                        for(var j = 0; j < fields.length; j++){
+                            var field = fields[j];
+                            fieldMap.set(field.fieldCode, field);
                         }
+                        var unboundFields = new Set();
+                        for(var j1 = 0; j1 < fields.length; j1++){
+                            var field1 = fields[j1];
+                            if (field1.fieldCode) {
+                                unboundFields.add(field1.fieldCode);
+                            }
+                        }
+                        var emptyRowTemplate = (_storeEmptyState_dataViewId = storeEmptyState[dataViewId]) === null || _storeEmptyState_dataViewId === void 0 ? void 0 : _storeEmptyState_dataViewId[controlId];
                         var cacheEmptyState = {};
                         var cacheFieldMapping = {};
-                        entity.map(function(row) {
-                            var newRow = JSONCopy(_this.store.emptyState[mapping.dataViewId][mapping.controlId]);
-                            var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
-                            ;
-                            Object.keys(row).map(function(fieldCode) {
-                                if (skipKey.includes(fieldCode)) {
-                                    return;
+                        for(var j2 = 0; j2 < entity.length; j2++){
+                            var row = entity[j2];
+                            var newRow = JSONCopy(emptyRowTemplate);
+                            var skipKey = new Set();
+                            var rowKeys = Object.keys(row);
+                            for(var k = 0; k < rowKeys.length; k++){
+                                var fieldCode = rowKeys[k];
+                                var rowValue = row[fieldCode];
+                                if (!unboundFields.has(fieldCode) && fieldCode in newRow && rowValue !== undefined) {
+                                    newRow[fieldCode] = rowValue;
                                 }
-                                if (cacheFieldMapping.hasOwnProperty(fieldCode) === false) {
-                                    var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
-                                    cacheFieldMapping[fieldCode] = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
-                                        return i.fieldCode === fieldCode;
-                                    });
+                                if (skipKey.has(fieldCode)) {
+                                    continue;
+                                }
+                                if (!cacheFieldMapping[fieldCode]) {
+                                    var mappedField = fieldMap.get(fieldCode);
+                                    if (mappedField) {
+                                        cacheFieldMapping[fieldCode] = mappedField;
+                                    }
                                 }
                                 var fieldMapping = cacheFieldMapping[fieldCode];
                                 if (fieldMapping) {
-                                    if (// fieldMapping.dataBind instanceof DataBind &&
-                                    isDataBind(fieldMapping.dataBind) && row[fieldCode] !== undefined) {
-                                        newRow[fieldMapping.controlId] = row[fieldCode];
-                                    // } else if (fieldMapping.dataBind instanceof ObjectDataBind) {
+                                    if (isDataBind(fieldMapping.dataBind) && rowValue !== undefined) {
+                                        newRow[fieldMapping.controlId] = rowValue;
                                     } else if (!isDataBind(fieldMapping.dataBind)) {
-                                        if (cacheEmptyState.hasOwnProperty(fieldMapping.controlId) === false) {
-                                            var _this_getEmptyState;
-                                            cacheEmptyState[fieldMapping.controlId] = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
+                                        var fieldControlId = fieldMapping.controlId;
+                                        if (!cacheEmptyState[fieldControlId]) {
+                                            var _this_store_getEmptyState;
+                                            cacheEmptyState[fieldControlId] = JSONCopy((_this_store_getEmptyState = _this.store.getEmptyState(fieldControlId)) !== null && _this_store_getEmptyState !== void 0 ? _this_store_getEmptyState : {});
                                         }
-                                        var objValue = JSONCopy(cacheEmptyState[fieldMapping.controlId]);
-                                        Object.keys(fieldMapping.dataBind).map(function(key) {
-                                            var dataBind = fieldMapping.dataBind[key];
-                                            if (row[dataBind.fieldCode] !== undefined) {
-                                                objValue[key] = row[dataBind.fieldCode];
+                                        var objValue = JSONCopy(cacheEmptyState[fieldControlId]);
+                                        var dataBind = fieldMapping.dataBind;
+                                        var bindKeys = Object.keys(dataBind);
+                                        for(var m = 0; m < bindKeys.length; m++){
+                                            var key = bindKeys[m];
+                                            var bindInfo = dataBind[key];
+                                            var fieldCodeValue = row[bindInfo.fieldCode];
+                                            if (fieldCodeValue !== undefined) {
+                                                objValue[key] = fieldCodeValue;
                                             }
-                                            skipKey.push(dataBind.fieldCode);
-                                        });
-                                        newRow[fieldMapping.controlId] = objValue;
+                                            skipKey.add(bindInfo.fieldCode);
+                                        }
+                                        newRow[fieldControlId] = objValue;
                                     }
-                                } else if (fieldCode === 'uid' && row.uid !== undefined) {
-                                    newRow.uid = row.uid;
-                                } else if (fieldCode === 'virtualStore' && row.virtualStore !== undefined) {
-                                    newRow.virtualStore = Object.freeze(row.virtualStore);
+                                } else if (fieldCode === 'uid' && rowValue !== undefined) {
+                                    newRow.uid = rowValue;
+                                } else if (fieldCode === 'virtualStore' && rowValue !== undefined) {
+                                    newRow.virtualStore = Object.freeze(rowValue);
                                 }
-                            });
-                            newState[mapping.dataViewId][mapping.controlId].push(newRow);
-                        });
+                            }
+                            newState[dataViewId][controlId].push(newRow);
+                        }
                     } else if (entity) {
                         var _Object_keys;
-                        var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
-                        ;
+                        var skipKey1 = [];
                         var emptyState = JSONCopy(_this.store.emptyState);
                         if (!((_Object_keys = Object.keys(entity)) === null || _Object_keys === void 0 ? void 0 : _Object_keys.length)) {
-                        // newState = this.store.defaultState
+                        // 空对象，不做处理
                         } else {
                             Object.keys(entity).map(function(fieldCode) {
-                                if (skipKey.includes(fieldCode)) {
+                                if (skipKey1.includes(fieldCode)) {
                                     return;
                                 }
-                                var mapping = _this.getDataBindMapping(dataCode, fieldCode);
+                                var mapping = _this1.getDataBindMapping(dataCode, fieldCode);
                                 if (mapping) {
                                     if (!newState[mapping.dataViewId[0]]) {
                                         newState[mapping.dataViewId[0]] = {};
                                     }
-                                    if (// mapping.dataBind instanceof DataBind &&
-                                    isDataBind(mapping.dataBind) && entity[fieldCode] !== undefined) {
+                                    if (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 (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 : {};
+                                        var objValue = (_this_getEmptyState = _this1.getEmptyState(mapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {};
                                         Object.keys(mapping.dataBind).map(function(key) {
                                             var dataBind = mapping.dataBind[key];
-                                            //金额及计算公式控件在赋值时会经过两次 且当控件值不为同一个模型时，会赋值两次 会导致前后覆盖行为。
                                             if (dataSet[dataBind.dataCode]) {
                                                 var extendEntity = dataSet[dataBind.dataCode];
                                                 if (extendEntity[dataBind.fieldCode] !== undefined) {
                                                     objValue[key] = extendEntity[dataBind.fieldCode];
                                                 }
                                             }
-                                            skipKey.push(dataBind.fieldCode);
+                                            skipKey1.push(dataBind.fieldCode);
                                         });
                                         newState[mapping.dataViewId[0]][mapping.controlId] = objValue;
                                     }
+                                } else {
+                                    var mapping1 = _this1.getDataBindMapping(dataCode);
+                                    if ((mapping1 === null || mapping1 === void 0 ? void 0 : mapping1.dataViewId) && entity[fieldCode] !== undefined) {
+                                        var dataViweId = mapping1 === null || mapping1 === void 0 ? void 0 : mapping1.dataViewId;
+                                        var isInDataView = fieldCode in (emptyState[dataViweId] || {});
+                                        if (isInDataView) {
+                                            newState[dataViweId][fieldCode] = entity[fieldCode];
+                                        }
+                                    }
                                 }
                             });
                         }
                         var newMapping = _this.getDataBindMapping(dataCode);
                         if (newMapping) {
+                            var _ref;
                             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(newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId);
-                            var _newState_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 : {});
+                            var mainStateKeys = Object.keys((_ref = newState === null || newState === void 0 ? void 0 : newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) !== null && _ref !== void 0 ? _ref : {});
                             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) {
@@ -1391,7 +1407,19 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             _this.debugLog("engine setData方法默认值及表单数据组合完成，参数为%o。", newState);
                         }
                     }
-                });
+                };
+                var _this1 = this;
+                // @i18n-translate-ignore
+                this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
+                var onlySetData = options === null || options === void 0 ? void 0 : options.onlySetData;
+                var newState = this.store.defaultState;
+                if (onlySetData === true) {
+                    newState = {};
+                }
+                var dataBindMapping = this.store.dataBindMapping;
+                var storeEmptyState = this.store.emptyState;
+                var dataCodes = Object.keys(dataSet);
+                for(var i = 0; i < dataCodes.length; i++)_this = this, _loop(i);
                 // @i18n-translate-ignore
                 this.debugLog("engine setData方法数据组合完成，参数为%o。", newState);
                 this.setStates(newState, undefined, _object_spread({
@@ -1399,7 +1427,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }, options));
                 this.runtime.getFlatInstances();
                 // @i18n-translate-ignore
-                this.debugLog(getLocaleText('CMD.b44b1751969061759'));
+                this.debugLog("engine setData方法执行完成。");
             }
         },
         {
@@ -1593,7 +1621,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var _instance = this.getInstance(dataBindMapping.controlId, rowIndex);
                     this.debugLog("调用了setFieldInstance[%o]: 修改instance: %o的%o属性，修改的值为%o。", _instance.id, _instance, props, value);
                     this.setInstance(_instance.id, props, value, rowIndex);
-                    return deepFreeze(_instance);
+                    return _instance;
                 }
             }
         },

package/dist/esm/common/OkWorker.js

@@ -1,7 +1,5 @@
 function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -25,9 +23,7 @@ function _define_property(obj, key, value) {
             configurable: true,
             writable: true
         });
-    } else {
-        obj[key] = value;
-    }
+    } else obj[key] = value;
     return obj;
 }
 import { log } from '@byteluck-fe/model-driven-shared';

package/dist/esm/common/Plugin.js

@@ -1,7 +1,5 @@
 function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 var Plugin = function Plugin() {
     "use strict";