@byteluck-fe/model-driven-engine 2.8.1-alpha.8 → 2.8.1-beta.9

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;
     }
@@ -365,9 +378,9 @@ item) {
                 // @ts-ignore
                 if (((_item_props_dataBind_dataBindKey = item.props.dataBind[dataBindKey]) === null || _item_props_dataBind_dataBindKey === void 0 ? void 0 : _item_props_dataBind_dataBindKey.fieldCode) != "") {
                     var // @ts-ignore
-                    _item_props_dataBind_dataBindKey1;
+                    _item_props_dataBind_dataBindKey1, _findFields;
                     // @ts-ignore
-                    data[(_item_props_dataBind_dataBindKey1 = item.props.dataBind[dataBindKey]) === null || _item_props_dataBind_dataBindKey1 === void 0 ? void 0 : _item_props_dataBind_dataBindKey1.fieldCode] = result[0].fields[dataBindKey];
+                    data[(_item_props_dataBind_dataBindKey1 = item.props.dataBind[dataBindKey]) === null || _item_props_dataBind_dataBindKey1 === void 0 ? void 0 : _item_props_dataBind_dataBindKey1.fieldCode] = ((_findFields = findFields(result)) === null || _findFields === void 0 ? void 0 : _findFields[dataBindKey]) || [];
                 }
             }
         }
@@ -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]) {
@@ -394,10 +411,10 @@ item) {
                             var _formControl_props_dataBind_dataBindKey;
                             // @ts-ignore
                             if (((_formControl_props_dataBind_dataBindKey = formControl.props.dataBind[dataBindKey]) === null || _formControl_props_dataBind_dataBindKey === void 0 ? void 0 : _formControl_props_dataBind_dataBindKey.fieldCode) != "") {
-                                var _childResult_;
+                                var _findFields;
                                 // @ts-ignore
                                 itemRules.fields[index].fields[// @ts-ignore
-                                formControl.props.dataBind[dataBindKey].fieldCode] = (_childResult_ = childResult[0]) === null || _childResult_ === void 0 ? void 0 : _childResult_.fields[dataBindKey];
+                                formControl.props.dataBind[dataBindKey].fieldCode] = ((_findFields = findFields(childResult)) === null || _findFields === void 0 ? void 0 : _findFields[dataBindKey]) || [];
                             }
                         }
                     } else {
@@ -414,8 +431,18 @@ item) {
         data[(_item_props_datasourceBind1 = item.props.datasourceBind) === null || _item_props_datasourceBind1 === void 0 ? void 0 : _item_props_datasourceBind1.dataCode].push(itemRules);
     }
 }
+function findFields(childResult) {
+    var ruleItem = {};
+    childResult.map(function(item) {
+        if (item.fields) {
+            ruleItem = item;
+        }
+    });
+    return ruleItem === null || ruleItem === void 0 ? void 0 : ruleItem.fields;
+}
 function buildControlAntdRules(antdRules, // @ts-ignore
 item) {
+    var isSubtableDefaultRules = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (getControlIsHide(item)) {
         return;
     }
@@ -426,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

@@ -77,9 +77,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)
@@ -98,7 +99,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] = value;
+                                            _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
                                         }
                                     }
                                 });
@@ -106,7 +107,7 @@ var Store = /*#__PURE__*/ function() {
                         });
                     } else {
                         //不存在的 controlId，直接被挂载到外部key
-                        this.state[controlId] = value;
+                        this.state[controlId] = noProxyValue;
                     }
                 }
             }

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 } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -125,7 +125,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             return Reflect.get(target, propertyKey, receiver);
         },
         set: function set(target, propertyKey, value, receiver) {
-            var newValue = value;
+            var newValue = JSONCopy(value);
             // @ts-ignore
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
@@ -142,14 +142,14 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                 }
             }
             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,7 +171,7 @@ 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);
             }
             // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
             //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'

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
                                         ];

package/dist/esm/plugins/StylePlugin.js

@@ -1,4 +1,10 @@
-function _class_call_check(instance, Constructor) {
+/*
+ * @Author: zhaoxiaoyang zhaoxiaoyang@byteluck.com
+ * @Date: 2022-04-15 14:06:03
+ * @LastEditors: zhaoxiaoyang zhaoxiaoyang@byteluck.com
+ * @LastEditTime: 2023-11-30 16:38:47
+ * @FilePath: /model-driven/packages/engine/src/plugins/StylePlugin.ts
+ */ function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }