@byteluck-fe/model-driven-engine 2.3.1-beta.13 → 2.3.1-beta.16

package/dist/esm/common/Store.js

@@ -23,45 +23,6 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 import { DataBind, ObjectDataBind } 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";
@@ -96,7 +57,7 @@ var Store = /*#__PURE__*/ function() {
         // }
         } else {
             if (rowIndex !== undefined) {
-                //TODO 目前只找了一层明细表，没有递归
+                //TODO 目前只找了一层明细表，没有递归 如果是添加uid
                 Object.keys(this.controlIdMapping).map(function(subtableId) {
                     var dataView = _this.controlIdMapping[subtableId].dataView;
                     var children = _this.controlIdMapping[subtableId].children;
@@ -170,9 +131,16 @@ var Store = /*#__PURE__*/ function() {
         } else {
             var controlInfo = this.controlIdMapping[controlId];
             if (controlInfo !== undefined) {
-                return this.emptyState[controlInfo.dataView][controlId];
+                var state = this.emptyState[controlInfo.dataView][controlId];
+                //判断找到的是否是明细表的控件
+                if ("children" in this.emptyState[controlInfo.dataView]) {
+                    Object.assign(state, {
+                        uid: "new:" + buildUUID("uid")
+                    });
+                }
+                return state;
             } else {
-                var state;
+                var state1;
                 //TODO 目前只找了一层明细表，没有递归
                 Object.keys(this.controlIdMapping).map(function(subtableId) {
                     var dataViewId = _this.controlIdMapping[subtableId].dataView;
@@ -180,14 +148,12 @@ var Store = /*#__PURE__*/ function() {
                     if (children !== undefined) {
                         Object.keys(children).map(function(childControlId) {
                             if (childControlId === controlId) {
-                                state = _objectSpreadProps(_objectSpread({}, _this.emptyState[dataViewId][subtableId][controlId]), {
-                                    uid: "new:" + buildUUID("uid")
-                                });
+                                state1 = _this.emptyState[dataViewId][subtableId][controlId];
                             }
                         });
                     }
                 });
-                return state;
+                return state1;
             }
         }
     };