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

package/dist/esm/common/Engine.js

@@ -1466,12 +1466,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');
             }
         },
         {

package/dist/esm/common/Runtime.js

@@ -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;
             }
         },
@@ -234,21 +242,21 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls1) {
     ]);
     return Runtime;
 }(RegisterControls);
-function loop(control, callback) {
+function loop(control, parentId, callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {
-            callback(item);
+            callback(item, parentId);
             if (hasChildrenControl(item)) {
                 var ctl = item;
                 if (!ctl.children) {
                     ctl.children = [];
                 }
                 // @ts-ignore
-                loop(ctl.children, callback);
+                loop(ctl.children, ctl.id, callback);
             }
         });
     } else {
-        callback(control);
+        callback(control, parentId);
     }
 }
 /**