@byteluck-fe/model-driven-engine 2.8.1-beta1 → 2.8.2-beta.1

package/dist/esm/common/Engine.js

@@ -348,6 +348,7 @@ import { findItem, proxyState } from "./proxyState";
 import { ActionManager } from "./ActionManager";
 import { DataManager } from "./DataManager";
 import { checkerSubtableValue, checkerValue } from "./checkerValue";
+import { buildUUID } from "../utils/runtimeUtils";
 if (typeof window !== "undefined") {
     // @ts-ignore
     window.engines = {};
@@ -602,14 +603,16 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             result
                         ];
                     }
+                    var subtableData = this.getState(subtable.id);
+                    this._handlerSubtableUpdateUid(subtableData);
                     this.emit("list-change", {
                         instance: subtable,
-                        value: this.getState(subtable.id),
+                        value: subtableData,
                         options: Object.assign({}, options, {
                             changed: createdNewRows,
                             data: createdNewRowsData,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
-                            jsonValue: JSON.stringify(this.getState(subtable.id)),
+                            jsonValue: JSON.stringify(subtableData),
                             isDeleteLastOne: isDeleteLastOne,
                             type: type,
                             args: args
@@ -620,6 +623,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         },
+        {
+            key: "_handlerSubtableUpdateUid",
+            value: function _handlerSubtableUpdateUid(subtableData) {
+                subtableData.forEach(function(item) {
+                    if (!item.uid) {
+                        Object.assign(item, {
+                            uid: "new:" + buildUUID("uid")
+                        });
+                    }
+                });
+            }
+        },
         {
             key: "_handlerObjectUpdate",
             value: function _handlerObjectUpdate(state, key, value, oldValue) {
@@ -652,6 +667,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     if ((options === null || options === void 0 ? void 0 : options.setData) === true) {
                         deleted = [];
                     }
+                    this._handlerSubtableUpdateUid(newValue);
                     this.emit("list-change", {
                         instance: instance,
                         value: value,
@@ -661,7 +677,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             data: newValue,
                             deleted: deleted,
                             // deleted: oldValue ?? [],
-                            type: "push"
+                            type: "push",
+                            jsonValue: JSON.stringify(newValue)
                         })
                     });
                 } else {

package/dist/esm/common/Runtime.js

@@ -180,26 +180,33 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         {
             key: "allRules",
             get: function get() {
-                var antdRules = {};
-                var ruleItems = {};
+                var defaultAntdRules = {};
+                var defaultRule = {};
+                var defaultFieldRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
                     var result = Runtime.staticGetRules(dataView.type, dataView.props);
-                    ruleItems[dataView.id] = JSONCopy(result[0]);
-                    antdRules[dataView.id] = JSONCopy(result[0]);
+                    defaultRule[dataView.id] = JSONCopy(result[0]);
+                    defaultAntdRules[dataView.id] = JSONCopy(result[0]);
+                    defaultFieldRules[dataView.id] = JSONCopy(result[0]);
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
                         //   item instanceof RuntimeListControl
                         // ) {
                         if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
-                            buildControlRules(ruleItems[dataView.id].fields, item);
-                            buildControlAntdRules(antdRules[dataView.id].fields, item);
+                            buildControlRules(defaultRule[dataView.id].fields, item, true);
+                            buildControlAntdRules(defaultAntdRules[dataView.id].fields, item, true);
+                            buildFieldCodeRules(defaultFieldRules[dataView.id].fields, item, true);
                         }
                     });
                 });
                 return {
-                    rules: ruleItems,
-                    antdRules: antdRules
+                    rules: this.rules,
+                    antdRules: this.antdRules,
+                    fieldCodeRules: this.fieldCodeRules,
+                    defaultAntdRules: defaultAntdRules,
+                    defaultRule: defaultRule,
+                    defaultFieldRules: defaultFieldRules
                 };
             }
         },
@@ -307,6 +314,7 @@ function hasHeaderOrFooterControl(control, checkType) {
 }
 function buildControlRules(data, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -322,7 +330,11 @@ item) {
             type: "array",
             fields: {}
         };
-        item.children.forEach(function(row, index) {
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row, index) {
             loopFormSchema(row.children, function(formControl) {
                 if (itemRules.fields) {
                     if (!itemRules.fields[index]) {
@@ -347,6 +359,7 @@ item) {
 }
 function buildFieldCodeRules(data, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -378,7 +391,11 @@ item) {
             type: "array",
             fields: {}
         };
-        item.children.forEach(function(row, index) {
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row, index) {
             loopFormSchema(row.children, function(formControl) {
                 if (itemRules.fields) {
                     if (!itemRules.fields[index]) {
@@ -425,6 +442,7 @@ function findFields(childResult) {
 }
 function buildControlAntdRules(antdRules, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -435,7 +453,11 @@ item) {
         antdRules[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
-        item.children.forEach(function(row) {
+        (isSubtableDefaultRules === true ? [
+            {
+                children: item.props.headers
+            }
+        ] : item.children).forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
                 // rules[formControl.id] = (formControl as RuntimeFormControl).rules

package/dist/esm/common/Store.js

@@ -79,6 +79,16 @@ var Store = /*#__PURE__*/ function() {
                 var controlInfo = this.controlIdMapping[controlId];
                 var noProxyValue = JSONCopy(value);
                 if (controlInfo !== undefined) {
+                    //明细表
+                    if (controlInfo.children) {
+                        value.forEach(function(item) {
+                            if (!item.uid) {
+                                Object.assign(item, {
+                                    uid: "new:" + buildUUID("uid")
+                                });
+                            }
+                        });
+                    }
                     //qiyu 按照对象赋值，Object.assign会触发多次key的change事件
                     this.state[controlInfo.dataView][controlId] = noProxyValue;
                 // if (
@@ -365,6 +375,13 @@ item) {
                     });
                 });
             } else {
+                if (data[item.props.dataBind.dataCode] === undefined) {
+                    data[item.props.dataBind.dataCode] = {
+                        controlId: dataViewId,
+                        fields: [],
+                        dataViewId: dataViewId
+                    };
+                }
                 data[item.props.dataBind.dataCode].fields.push({
                     fieldCode: item.props.dataBind.fieldCode,
                     controlId: item.id,