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

package/dist/esm/common/Engine.js

@@ -1343,55 +1343,59 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
    * 如果控件在表头内，则返回-1
    * 如果控件在表内，则返回行下标
    * 如果控件不在明细表内，则返回undefined
-   * */ // public getInstanceRowIndex(
-            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
-            // ) {
-            //   if (!instance.parent) {
-            //     return
-            //   }
-            //   let rowIndex: number | undefined
-            //   // @ts-ignore
-            //   if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
-            //     // 表头内的控件
-            //     // @ts-ignore
-            //     if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-            //       rowIndex = -1
-            //     } else {
-            //       // @ts-ignore
-            //       const index = instance.parent.children.findIndex(
-            //         (item: any) => item === instance
-            //       )
-            //       if (index > -1) {
-            //         rowIndex = index
-            //       }
-            //     }
-            //   } else {
-            //     rowIndex = this.getInstanceRowIndex(instance.parent)
-            //   }
-            //   return rowIndex
-            // }
-            function getInstanceRowIndex(instance) {
+   * */ function getInstanceRowIndex(instance) {
+                if (!instance.parent) {
+                    return;
+                }
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-                    rowIndex = -1;
-                } else {
-                    var instanceList = this.runtime.instanceMap[instance.id];
-                    if (Object.prototype.toString.call(instanceList) === '[object Array]') {
-                        var index = instanceList.findIndex(function(item) {
+                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
+                        // 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) {
                             rowIndex = index;
                         }
                     }
+                } else {
+                    rowIndex = this.getInstanceRowIndex(instance.parent);
                 }
                 return rowIndex;
             }
         },
         {
             key: "getInstanceParentControl",
-            value: function getInstanceParentControl(instance, controlType) {
+            value: // public getInstanceRowIndex(
+            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
+            // ) {
+            //   let rowIndex: number | undefined
+            //   // @ts-ignore
+            //   if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+            //     rowIndex = -1
+            //   }else{
+            //     const instanceList = this.runtime.instanceMap[instance.id]
+            //     if(Object.prototype.toString.call(instanceList) === '[object Array]'){
+            //       const index = instanceList.findIndex(
+            //         (item: any) => item === instance
+            //       )
+            //       if (index > -1) {
+            //         rowIndex = index
+            //       }
+            //     }
+            //   }
+            //   return rowIndex
+            // }
+            function getInstanceParentControl(instance, controlType) {
                 if (!instance.parent) {
                     return;
                 }
@@ -1485,5 +1489,5 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
     ]);
     return Engine;
 }(Watcher);
+// @ts-ignore
 export { Engine };
-console.log('a');