@byteluck-fe/model-driven-engine 2.2.7 → 2.3.1-beta.11

package/dist/esm/common/Engine.js

@@ -738,6 +738,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.updateInstanceProps = function updateInstanceProps(instance, props, value, rowIndex) {
         return this.setInstance(instance, props, value, rowIndex);
     };
+    _proto.getAllRules = function getAllRules(controlId) {
+        var rules = this.runtime.allRules;
+        if (controlId === undefined) {
+            return rules;
+        } else {
+            var _rules_rules_controlId, _rules_antdRules_controlId;
+            return {
+                rules: (_rules_rules_controlId = rules.rules[controlId]) === null || _rules_rules_controlId === void 0 ? void 0 : _rules_rules_controlId.fields,
+                antdRules: (_rules_antdRules_controlId = rules.antdRules[controlId]) === null || _rules_antdRules_controlId === void 0 ? void 0 : _rules_antdRules_controlId.fields
+            };
+        }
+    };
     _proto.getRules = function getRules(controlId) {
         if (controlId === undefined) {
             return this.runtime.rules;
@@ -1076,6 +1088,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             } else if (entity) {
                 var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                 ;
+                var emptyState = JSONCopy(_this.store.emptyState);
                 Object.keys(entity).map(function(fieldCode) {
                     if (skipKey.includes(fieldCode)) {
                         return;
@@ -1086,7 +1099,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             newState[mapping.dataViewId[0]] = {};
                         }
                         if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
-                            newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode];
+                            newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode] !== undefined ? entity[fieldCode] : emptyState[mapping.dataViewId[0]][mapping.controlId];
                         } else if (_instanceof(mapping.dataBind, ObjectDataBind)) {
                             var _this_getEmptyState;
                             var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(mapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
@@ -1138,7 +1151,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * @param header 明细表内是否获取表头的控件
    */ _proto.getInstances = function getInstances(controlId) {
         var header = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+        // const cc = console
+        // const label = '🐑 genInstances ' + controlId + ' ' + Date.now()
+        // cc.time(label)
         if (controlId === undefined) {
+            // cc.timeEnd(label)
             return this.runtime.flatInstances;
         }
         var instances = this.runtime.instanceMap[controlId] || [];
@@ -1360,3 +1377,4 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     return Engine;
 }(Watcher);
 export { Engine };
+console.log("a");

package/dist/esm/common/Runtime.js

@@ -146,6 +146,31 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 return this._instanceMap;
             }
         },
+        {
+            key: "allRules",
+            get: function get() {
+                var antdRules = {};
+                var ruleItems = {};
+                loopDataViewControl(this._instance, function(dataView) {
+                    ruleItems[dataView.id] = dataView.rules[0];
+                    antdRules[dataView.id] = dataView.rules[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);
+                        }
+                    });
+                });
+                return {
+                    rules: ruleItems,
+                    antdRules: antdRules
+                };
+            }
+        },
         {
             key: "rules",
             get: function get() {

package/dist/esm/common/Store.js

@@ -204,7 +204,8 @@ function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
     //if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        dataViewState[item.id] = JSONCopy(item.props.defaultValue);
+        // 2023-3-23 jiaqi 首次进入页面去除填充默认值
+        // dataViewState[item.id] = JSONCopy(item.props.defaultValue)
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
         var emptyTemplate = {};

package/dist/esm/utils/runtimeUtils.js

@@ -12,6 +12,7 @@ export function loopFormControl(control, callback) {
                 callback(item, children);
             } else if (hasChildrenControl(item)) {
                 loopFormControl(item === null || item === void 0 ? void 0 : item.children, callback);
+            // @ts-ignore
             } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {
                 callback(item);
             }