@byteluck-fe/model-driven-engine 2.6.0-alpha.18 → 2.6.0-alpha.18a

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) {
@@ -1343,14 +1349,18 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                 }
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
+                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE) || this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE_COLUMN)) {
                     // 表头内的控件
                     // @ts-ignore
                     if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
                         rowIndex = -1;
                     } else {
                         // @ts-ignore
-                        var index = instance.parent.children.findIndex(function(item) {
+                        // const index = instance.parent.children.findIndex(
+                        //   (item: any) => item === instance
+                        // )
+                        var instances = this.runtime.instanceMap[instance.id] || [];
+                        var index = instances.findIndex(function(item) {
                             return item === instance;
                         });
                         if (index > -1) {
@@ -1466,12 +1476,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
         {
             key: "register",
             value: // 注册外部控件
-            function register() {
-                for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){
-                    arg[_key] = arguments[_key];
-                }
-                var _Runtime;
-                return (_Runtime = Runtime).register.apply(_Runtime, _toConsumableArray(arg));
+            function register(control) {
+                return Runtime.register(control, 'Runtime');
             }
         },
         {
@@ -1483,5 +1489,5 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
     ]);
     return Engine;
 }(Watcher);
+// @ts-ignore
 export { Engine };
-console.log('a');

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, 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";
@@ -96,6 +96,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
         _this = _super.call(this, 'Runtime');
         _this._flatInstances = [];
         _this._instanceMap = {};
+        _this._controlParentIdMap = {};
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);
@@ -108,19 +109,26 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             value: function getFlatInstances() {
                 var instances = [];
                 var instanceMap = {};
-                loop(this._instance, function(item) {
+                var controlParentIdMap = {};
+                loop(this._instance, '', function(item, parentId) {
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-                    if (item.type === 'subtable-row' || item.type === 'subtable-column') {
-                        return;
-                    }
+                    //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
+                    // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
+                    //   return
+                    // }
                     instances.push(item);
                     if (!instanceMap[item.id]) {
                         instanceMap[item.id] = [];
                     }
                     instanceMap[item.id].push(item);
+                    if (parentId) {
+                        // @ts-ignore
+                        controlParentIdMap[item.id] = parentId;
+                    }
                 });
                 this._flatInstances = instances;
                 this._instanceMap = instanceMap;
+                this._controlParentIdMap = controlParentIdMap;
                 return this._flatInstances;
             }
         },
@@ -154,8 +162,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
                 var antdRules = {};
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    ruleItems[dataView.id] = dataView.rules[0];
-                    antdRules[dataView.id] = dataView.rules[0];
+                    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 ||
@@ -178,7 +187,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    ruleItems[dataView.id] = dataView.rules[0];
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    // ruleItems[dataView.id] = dataView.rules[0]
+                    ruleItems[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -197,7 +208,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
             get: function get() {
                 var antdRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    antdRules[dataView.id] = dataView.rules[0];
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    // antdRules[dataView.id] = dataView.rules[0]
+                    antdRules[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -214,22 +227,30 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     ]);
     return Runtime;
 }(RegisterControls);
-function loop(control, callback) {
-    if (Array.isArray(control)) {
-        control.map(function(item) {
-            callback(item);
-            if (hasChildrenControl(item)) {
-                var ctl = item;
-                if (!ctl.children) {
-                    ctl.children = [];
-                }
-                // @ts-ignore
-                loop(ctl.children, callback);
+function loop(control, parentId, 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);
-    }
+            // @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
@@ -237,7 +258,7 @@ function loop(control, callback) {
     if (control.props.isHide) {
         return true;
     }
-    if (control.parent === null) {
+    if (control.parent === null || control.parent === undefined) {
         return false;
     }
     return getControlIsHide(control.parent);
@@ -247,11 +268,14 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        data[item.id] = item.rules;
+        // data[item.id] = item.rules
+        data[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
-        data[item.id] = item.rules;
+        // data[item.id] = item.rules
+        data[item.id] = result;
         var itemRules = {
             type: 'array',
             fields: {}
@@ -266,8 +290,13 @@ item) {
                             fields: {}
                         };
                     }
+                    // // @ts-ignore
+                    // itemRules.fields[index].fields[formControl.id] = (
+                    //   formControl as RuntimeFormControl
+                    // ).rules
+                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                     // @ts-ignore
-                    itemRules.fields[index].fields[formControl.id] = formControl.rules;
+                    itemRules.fields[index].fields[formControl.id] = childResult;
                 }
             });
         });
@@ -279,15 +308,19 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        antdRules[item.id] = item.rules;
+        // antdRules[item.id] = item.rules
+        antdRules[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
         item.children.forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
-                rules[formControl.id] = formControl.rules;
+                // rules[formControl.id] = (formControl as RuntimeFormControl).rules
+                var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
+                rules[formControl.id] = childResult;
             });
             antdRules[item.id].push(rules);
         });