@byteluck-fe/model-driven-engine 2.6.0-alpha.17c → 2.6.0-alpha.17e

package/dist/esm/common/Engine.js

@@ -680,6 +680,12 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                 return this.setInstance(instance, props, value, rowIndex);
             }
         },
+        {
+            key: "getRule",
+            value: function getRule(controlType, props) {
+                return Runtime.staticGetRules(controlType, props);
+            }
+        },
         {
             key: "getAllRules",
             value: function getAllRules(controlId) {

package/dist/esm/common/Runtime.js

@@ -84,7 +84,7 @@ function _createSuper(Derived) {
     };
 }
 import { RegisterControls } from '@byteluck-fe/model-driven-core';
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema } from '@byteluck-fe/model-driven-shared';
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema, isArray } from '@byteluck-fe/model-driven-shared';
 import { hasChildrenControl, loopDataViewControl, loopFormControl } from '../utils/runtimeUtils';
 export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     "use strict";
@@ -162,14 +162,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
                 var antdRules = {};
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = {};
-                    var Rules = Runtime.staticControlsRuntimeRules.get(dataView.type);
-                    if (Rules) {
-                        var rules = new Rules(dataView.props);
-                        result = Array.from(rules)[0];
-                    }
-                    ruleItems[dataView.id] = JSONCopy(result);
-                    antdRules[dataView.id] = JSONCopy(result);
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    ruleItems[dataView.id] = JSONCopy(result[0]);
+                    antdRules[dataView.id] = JSONCopy(result[0]);
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -192,14 +187,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = {};
-                    var Rules = Runtime.staticControlsRuntimeRules.get(dataView.type);
-                    if (Rules) {
-                        var rules = new Rules(dataView.props);
-                        result = Array.from(rules)[0];
-                    }
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
                     // ruleItems[dataView.id] = dataView.rules[0]
-                    ruleItems[dataView.id] = result;
+                    ruleItems[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -218,14 +208,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var antdRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    var result = {};
-                    var Rules = Runtime.staticControlsRuntimeRules.get(dataView.type);
-                    if (Rules) {
-                        var rules = new Rules(dataView.props);
-                        result = Array.from(rules)[0];
-                    }
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
                     // antdRules[dataView.id] = dataView.rules[0]
-                    antdRules[dataView.id] = result;
+                    antdRules[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -243,21 +228,29 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     return Runtime;
 }(RegisterControls);
 function loop(control, parentId, callback) {
-    if (Array.isArray(control)) {
-        control.map(function(item) {
-            callback(item, parentId);
-            if (hasChildrenControl(item)) {
-                var ctl = item;
-                if (!ctl.children) {
-                    ctl.children = [];
-                }
-                // @ts-ignore
-                loop(ctl.children, ctl.id, callback);
+    var _instances = Array.isArray(control) ? control : [
+        control
+    ];
+    _instances.map(function(item) {
+        callback(item, parentId);
+        if (hasChildrenControl(item)) {
+            var ctl = item;
+            if (!ctl.children) {
+                ctl.children = [];
             }
-        });
-    } else {
-        callback(control, parentId);
-    }
+            // @ts-ignore
+            loop(ctl.children, ctl.id, callback);
+        }
+        if (hasHeaderOrFooterControl(item, 'headers')) {
+            loop(item.props.headers, item.id, callback);
+        }
+        if (hasHeaderOrFooterControl(item, 'footers')) {
+            loop(item.props.footers, item.id, callback);
+        }
+    });
+}
+function hasHeaderOrFooterControl(control, checkType) {
+    return checkType in control.props && isArray(control.props[checkType]);
 }
 /**
  * 控件是否在视图中隐藏，遍历查找所有parent
@@ -275,12 +268,7 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = [];
-    var Rules = Runtime.staticControlsRuntimeRules.get(item.type);
-    if (Rules) {
-        var rules = new Rules(item.props);
-        result = Array.from(rules);
-    }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         // data[item.id] = item.rules
@@ -306,12 +294,7 @@ item) {
                     // itemRules.fields[index].fields[formControl.id] = (
                     //   formControl as RuntimeFormControl
                     // ).rules
-                    var childResult = [];
-                    var childRules = Runtime.staticControlsRuntimeRules.get(formControl.type);
-                    if (childRules) {
-                        var childrules = new childRules(formControl.props);
-                        childResult = Array.from(childrules);
-                    }
+                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                     // @ts-ignore
                     itemRules.fields[index].fields[formControl.id] = childResult;
                 }
@@ -325,12 +308,7 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    var result = [];
-    var Rules = Runtime.staticControlsRuntimeRules.get(item.type);
-    if (Rules) {
-        var rules = new Rules(item.props);
-        result = Array.from(rules);
-    }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         // antdRules[item.id] = item.rules
@@ -341,12 +319,7 @@ item) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
                 // rules[formControl.id] = (formControl as RuntimeFormControl).rules
-                var childResult = [];
-                var childRules = Runtime.staticControlsRuntimeRules.get(formControl.type);
-                if (childRules) {
-                    var childrules = new childRules(formControl.props);
-                    childResult = Array.from(childrules);
-                }
+                var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                 rules[formControl.id] = childResult;
             });
             antdRules[item.id].push(rules);