vxe-table 3.9.0 → 3.9.2

package/lib/table/src/methods.js

@@ -749,23 +749,21 @@ const Methods = {
    * 更新数据行的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheRowMap(source) {
+  cacheRowMap(isSource) {
     const {
       treeConfig,
       treeOpts,
       tableFullData,
-      fullDataRowMap,
+      fullAllDataRowIdData,
       fullAllDataRowMap,
       tableFullTreeData
     } = this;
-    let {
-      fullDataRowIdData,
-      fullAllDataRowIdData
-    } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowkey = (0, _util.getRowkey)(this);
     const isLazy = treeConfig && treeOpts.lazy;
+    const fullAllDataRowIdMaps = {};
+    const fullDataRowIdMaps = {};
     const handleCache = (row, index, items, path, parent, nodes) => {
       let rowid = (0, _util.getRowid)(this, row);
       const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
@@ -777,29 +775,30 @@ const Methods = {
       if (isLazy && row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
         row[childrenField] = null;
       }
-      const rest = {
-        row,
-        rowid,
-        seq,
-        index: treeConfig && parent ? -1 : index,
-        _index: -1,
-        $index: -1,
-        items,
-        parent,
-        level
-      };
-      if (source) {
-        fullDataRowIdData[rowid] = rest;
-        fullDataRowMap.set(row, rest);
+      let cacheItem = fullAllDataRowIdData[rowid];
+      if (!cacheItem) {
+        cacheItem = {
+          row,
+          rowid,
+          seq,
+          index: -1,
+          _index: -1,
+          $index: -1,
+          items,
+          parent,
+          level
+        };
       }
-      fullAllDataRowIdData[rowid] = rest;
-      fullAllDataRowMap.set(row, rest);
+      if (isSource) {
+        cacheItem.index = treeConfig && parent ? -1 : index;
+        fullDataRowIdMaps[rowid] = cacheItem;
+      }
+      fullAllDataRowIdMaps[rowid] = cacheItem;
     };
-    if (source) {
-      fullDataRowIdData = this.fullDataRowIdData = {};
-      fullDataRowMap.clear();
+    if (isSource) {
+      this.fullDataRowIdData = fullDataRowIdMaps;
     }
-    fullAllDataRowIdData = this.fullAllDataRowIdData = {};
+    this.fullAllDataRowIdData = fullAllDataRowIdMaps;
     fullAllDataRowMap.clear();
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, handleCache, {
@@ -1093,11 +1092,11 @@ const Methods = {
    */
   getRowSeq(row) {
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = this;
     if (row) {
       const rowid = (0, _util.getRowid)(this, row);
-      const rest = fullDataRowIdData[rowid];
+      const rest = fullAllDataRowIdData[rowid];
       if (rest) {
         return rest.seq;
       }
@@ -1109,14 +1108,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 = (0, _util.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 = (0, _util.getRowid)(this, row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
+        return rest._index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   _getRowIndex(row) {
@@ -1130,7 +1149,17 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getVMRowIndex(row) {
-    return this.tableData.indexOf(row);
+    const {
+      fullAllDataRowIdData
+    } = this;
+    if (row) {
+      const rowid = (0, _util.getRowid)(this, row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
+        return rest.$index;
+      }
+    }
+    return -1;
   },
   // 在 v3 中废弃
   $getRowIndex(row) {
@@ -1144,14 +1173,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) {
@@ -1165,7 +1212,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) {
@@ -2620,7 +2676,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);