vxe-table 3.9.0 → 3.9.2

package/packages/table/src/methods.ts

@@ -7,6 +7,8 @@ import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible,
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 
+import type { VxeTableDefines } from '../../../types'
+
 const { getConfig, getI18n, renderer, formats, interceptor } = VxeUI
 
 const isWebkit = browse['-webkit'] && !browse.edge
@@ -650,13 +652,14 @@ const Methods = {
    * 更新数据行的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheRowMap (source: any) {
-    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData } = this
-    let { fullDataRowIdData, fullAllDataRowIdData } = this
+  cacheRowMap (isSource?: boolean) {
+    const { treeConfig, treeOpts, tableFullData, fullAllDataRowIdData, fullAllDataRowMap, tableFullTreeData } = this
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowkey = getRowkey(this)
     const isLazy = treeConfig && treeOpts.lazy
+    const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+    const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
     const handleCache = (row: any, index: any, items: any, path: any, parent: any, nodes: any) => {
       let rowid = getRowid(this, row)
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
@@ -668,19 +671,20 @@ const Methods = {
       if (isLazy && row[hasChildField] && XEUtils.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 }
+      }
+      if (isSource) {
+        cacheItem.index = treeConfig && parent ? -1 : index
+        fullDataRowIdMaps[rowid] = cacheItem
       }
-      fullAllDataRowIdData[rowid] = rest
-      fullAllDataRowMap.set(row, rest)
+      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.eachTree(tableFullTreeData, handleCache, { children: childrenField })
@@ -910,10 +914,10 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getRowSeq (row: any) {
-    const { fullDataRowIdData } = this
+    const { fullAllDataRowIdData } = this
     if (row) {
       const rowid = getRowid(this, row)
-      const rest = fullDataRowIdData[rowid]
+      const rest = fullAllDataRowIdData[rowid]
       if (rest) {
         return rest.seq
       }
@@ -925,14 +929,30 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getRowIndex (row: any) {
-    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: any) {
-    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: any) {
@@ -946,7 +966,15 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getVMRowIndex (row: any) {
-    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: any) {
@@ -960,14 +988,28 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   getColumnIndex (column: any) {
-    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: any) {
-    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: any) {
@@ -981,7 +1023,14 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   getVMColumnIndex (column: any) {
-    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: any) {
@@ -2147,7 +2196,9 @@ const Methods = {
               })
             } else {
               const labelEl = cellEl.firstChild as HTMLElement
-              titleWidth = labelEl.offsetWidth
+              if (labelEl) {
+                titleWidth = labelEl.offsetWidth
+              }
             }
             if (titleWidth) {
               colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4)

package/packages/table/src/table.ts

@@ -373,19 +373,19 @@ export default {
       return this.computeValidOpts
     },
     computeValidOpts () {
-      return Object.assign({ message: 'default' }, XEUtils.clone(getConfig().table.validConfig, true), this.validConfig)
+      return Object.assign({ message: 'default' }, getConfig().table.validConfig, this.validConfig)
     },
     sXOpts () {
       return this.computeSXOpts
     },
     computeSXOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.scrollX, true), this.scrollX)
+      return Object.assign({}, getConfig().table.scrollX, this.scrollX)
     },
     sYOpts () {
       return this.computeSYOpts
     },
     computeSYOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.scrollY, true), this.scrollY)
+      return Object.assign({}, getConfig().table.scrollY, this.scrollY)
     },
     rowHeightMaps () {
       return {
@@ -399,49 +399,49 @@ export default {
       return this.computeColumnOpts
     },
     computeColumnOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.columnConfig, true), this.columnConfig)
+      return Object.assign({}, getConfig().table.columnConfig, this.columnConfig)
     },
     rowOpts () {
       return this.computeRowOpts
     },
     computeRowOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.rowConfig, true), this.rowConfig)
+      return Object.assign({}, getConfig().table.rowConfig, this.rowConfig)
     },
     resizeOpts () {
       return this.computeResizeOpts
     },
     computeResizeOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.resizeConfig, true), this.resizeConfig)
+      return Object.assign({}, getConfig().table.resizeConfig, this.resizeConfig)
     },
     resizableOpts () {
       return this.computeResizableOpts
     },
     computeResizableOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.resizableConfig, true), this.resizableConfig)
+      return Object.assign({}, getConfig().table.resizableConfig, this.resizableConfig)
     },
     seqOpts () {
       return this.computeSeqOpts
     },
     computeSeqOpts () {
-      return Object.assign({ startIndex: 0 }, XEUtils.clone(getConfig().table.seqConfig, true), this.seqConfig)
+      return Object.assign({ startIndex: 0 }, getConfig().table.seqConfig, this.seqConfig)
     },
     radioOpts () {
       return this.computeRadioOpts
     },
     computeRadioOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.radioConfig, true), this.radioConfig)
+      return Object.assign({}, getConfig().table.radioConfig, this.radioConfig)
     },
     checkboxOpts () {
       return this.computeCheckboxOpts
     },
     computeCheckboxOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.checkboxConfig, true), this.checkboxConfig)
+      return Object.assign({}, getConfig().table.checkboxConfig, this.checkboxConfig)
     },
     tooltipOpts () {
       return this.computeTooltipOpts
     },
     computeTooltipOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().tooltip, true), XEUtils.clone(getConfig().table.tooltipConfig, true), this.tooltipConfig)
+      return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, this.tooltipConfig)
     },
     tipConfig () {
       return { ...this.tooltipOpts }
@@ -453,49 +453,49 @@ export default {
       return this.computeEditOpts
     },
     computeEditOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.editConfig, true), this.editConfig)
+      return Object.assign({}, getConfig().table.editConfig, this.editConfig)
     },
     sortOpts () {
       return this.computeSortOpts
     },
     computeSortOpts () {
-      return Object.assign({ orders: ['asc', 'desc', null] }, XEUtils.clone(getConfig().table.sortConfig, true), this.sortConfig)
+      return Object.assign({ orders: ['asc', 'desc', null] }, getConfig().table.sortConfig, this.sortConfig)
     },
     filterOpts () {
       return this.computeFilterOpts
     },
     computeFilterOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.filterConfig, true), this.filterConfig)
+      return Object.assign({}, getConfig().table.filterConfig, this.filterConfig)
     },
     mouseOpts () {
       return this.computeMouseOpts
     },
     computeMouseOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.mouseConfig, true), this.mouseConfig)
+      return Object.assign({}, getConfig().table.mouseConfig, this.mouseConfig)
     },
     areaOpts () {
       return this.computeAreaOpts
     },
     computeAreaOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.areaConfig, true), this.areaConfig)
+      return Object.assign({}, getConfig().table.areaConfig, this.areaConfig)
     },
     keyboardOpts () {
       return this.computeKeyboardOpts
     },
     computeKeyboardOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.keyboardConfig, true), this.keyboardConfig)
+      return Object.assign({}, getConfig().table.keyboardConfig, this.keyboardConfig)
     },
     clipOpts () {
       return this.computeClipOpts
     },
     computeClipOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.clipConfig, true), this.clipConfig)
+      return Object.assign({}, getConfig().table.clipConfig, this.clipConfig)
     },
     fnrOpts () {
       return this.computeFNROpts
     },
     computeFNROpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.fnrConfig, true), this.fnrConfig)
+      return Object.assign({}, getConfig().table.fnrConfig, this.fnrConfig)
     },
     headerCtxMenu () {
       const headerOpts = this.ctxMenuOpts.header
@@ -525,49 +525,49 @@ export default {
       return this.computeMenuOpts
     },
     computeMenuOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.menuConfig, true), this.contextMenu, this.menuConfig)
+      return Object.assign({}, getConfig().table.menuConfig, this.contextMenu, this.menuConfig)
     },
     exportOpts () {
       return this.computeExportOpts
     },
     computeExportOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.exportConfig, true), this.exportConfig)
+      return Object.assign({}, getConfig().table.exportConfig, this.exportConfig)
     },
     importOpts () {
       return this.computeImportOpts
     },
     computeImportOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.importConfig, true), this.importConfig)
+      return Object.assign({}, getConfig().table.importConfig, this.importConfig)
     },
     printOpts () {
       return this.computePrintOpts
     },
     computePrintOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.printConfig, true), this.printConfig)
+      return Object.assign({}, getConfig().table.printConfig, this.printConfig)
     },
     expandOpts () {
       return this.computeExpandOpts
     },
     computeExpandOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.expandConfig, true), this.expandConfig)
+      return Object.assign({}, getConfig().table.expandConfig, this.expandConfig)
     },
     treeOpts () {
       return this.computeTreeOpts
     },
     computeTreeOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.treeConfig, true), this.treeConfig)
+      return Object.assign({}, getConfig().table.treeConfig, this.treeConfig)
     },
     emptyOpts () {
       return this.computeEmptyOpts
     },
     computeEmptyOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.emptyRender, true), this.emptyRender)
+      return Object.assign({}, getConfig().table.emptyRender, this.emptyRender)
     },
     loadingOpts () {
       return this.computeLoadingOpts
     },
     computeLoadingOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.loadingConfig, true), this.loadingConfig)
+      return Object.assign({}, getConfig().table.loadingConfig, this.loadingConfig)
     },
     cellOffsetWidth () {
       return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1
@@ -576,7 +576,7 @@ export default {
       return this.computeCustomOpts
     },
     computeCustomOpts () {
-      return Object.assign({}, XEUtils.clone(getConfig().table.customConfig, true), this.customConfig)
+      return Object.assign({}, getConfig().table.customConfig, this.customConfig)
     },
     autoWidthColumnList () {
       const { tableColumn, visibleColumn } = this