vxe-table 3.9.1 → 3.9.2

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.1";
+const version = "3.9.2";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.1";
+core_.VxeUI.tableVersion = "3.9.2";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.1"}`;
+const log_version = `table v${"3.9.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5732,11 +5732,11 @@ const Methods = {
    */
   getRowSeq(row) {
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = this;
     if (row) {
       const rowid = getRowid(this, row);
-      const rest = fullDataRowIdData[rowid];
+      const rest = fullAllDataRowIdData[rowid];
       if (rest) {
         return rest.seq;
       }
@@ -5748,14 +5748,34 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getRowIndex(row) {
-    return this.fullDataRowMap.has(row) ? this.fullDataRowMap.get(row).index : -1;
+    const {
+      fullAllDataRowIdData
+    } = this;
+    if (row) {
+      const rowid = getRowid(this, row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
+        return rest.index;
+      }
+    }
+    return -1;
   },
   /**
    * 根据 row 获取相对于当前数据中的索引
    * @param {Row} row 行对象
    */
   getVTRowIndex(row) {
-    return this.afterFullData.indexOf(row);
+    const {
+      fullAllDataRowIdData
+    } = this;
+    if (row) {
+      const rowid = getRowid(this, row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
+        return rest._index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   _getRowIndex(row) {
@@ -5769,7 +5789,17 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getVMRowIndex(row) {
-    return this.tableData.indexOf(row);
+    const {
+      fullAllDataRowIdData
+    } = this;
+    if (row) {
+      const rowid = getRowid(this, row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
+        return rest.$index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   $getRowIndex(row) {
@@ -5783,14 +5813,32 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   getColumnIndex(column) {
-    return this.fullColumnMap.has(column) ? this.fullColumnMap.get(column).index : -1;
+    const {
+      fullColumnIdData
+    } = this;
+    if (column) {
+      const rest = fullColumnIdData[column.id];
+      if (rest) {
+        return rest.index;
+      }
+    }
+    return -1;
   },
   /**
    * 根据 column 获取相对于当前表格列中的索引
    * @param {ColumnInfo} column 列配置
    */
   getVTColumnIndex(column) {
-    return this.visibleColumn.indexOf(column);
+    const {
+      fullColumnIdData
+    } = this;
+    if (column) {
+      const rest = fullColumnIdData[column.id];
+      if (rest) {
+        return rest._index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   _getColumnIndex(column) {
@@ -5804,7 +5852,16 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   getVMColumnIndex(column) {
-    return this.tableColumn.indexOf(column);
+    const {
+      fullColumnIdData
+    } = this;
+    if (column) {
+      const rest = fullColumnIdData[column.id];
+      if (rest) {
+        return rest.$index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   $getColumnIndex(column) {
@@ -7261,7 +7318,9 @@ const Methods = {
               });
             } else {
               const labelEl = cellEl.firstChild;
-              titleWidth = labelEl.offsetWidth;
+              if (labelEl) {
+                titleWidth = labelEl.offsetWidth;
+              }
             }
             if (titleWidth) {
               colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);