vxe-table 4.14.12 → 4.14.14

package/packages/table/src/table.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
-import { getRowUniqueId, clearTableAllStatus, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight } from './util'
+import { createInternalData, getRowUniqueId, clearTableAllStatus, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime'
 import { warnLog, errLog } from '../../ui/src/log'
@@ -21,7 +21,7 @@ import TableExportPanelComponent from '../module/export/export-panel'
 import TableMenuPanelComponent from '../module/menu/panel'
 
 import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType } from 'vxe-pc-ui'
-import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
+import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
@@ -298,123 +298,7 @@ export default defineVxeComponent({
       isColLoading: false
     })
 
-    const internalData: TableInternalData = {
-      tZindex: 0,
-      currKeyField: '',
-      isCurrDeepKey: false,
-      elemStore: {},
-      // 存放横向 X 虚拟滚动相关的信息
-      scrollXStore: {
-        preloadSize: 0,
-        offsetSize: 0,
-        visibleSize: 0,
-        visibleStartIndex: 0,
-        visibleEndIndex: 0,
-        startIndex: 0,
-        endIndex: 0
-      },
-      // 存放纵向 Y 虚拟滚动相关信息
-      scrollYStore: {
-        preloadSize: 0,
-        offsetSize: 0,
-        visibleSize: 0,
-        visibleStartIndex: 0,
-        visibleEndIndex: 0,
-        startIndex: 0,
-        endIndex: 0
-      },
-      // 表格宽度
-      tableWidth: 0,
-      // 表格高度
-      tableHeight: 0,
-      // 表头高度
-      headerHeight: 0,
-      // 表尾高度
-      footerHeight: 0,
-      customHeight: 0,
-      customMinHeight: 0,
-      customMaxHeight: 0,
-      // 当前 hover 行
-      hoverRow: null,
-      // 最后滚动位置
-      lastScrollLeft: 0,
-      lastScrollTop: 0,
-      // 单选框属性，已选中保留的行
-      radioReserveRow: null,
-      // 复选框属性，已选中保留的行集合
-      checkboxReserveRowMap: {},
-      // 行数据，已展开保留的行集合
-      rowExpandedReserveRowMap: {},
-      // 树结构数据，已展开保留的行集合
-      treeExpandedReserveRowMap: {},
-      // 树结构数据，不确定状态的集合
-      treeIndeterminateRowMaps: {},
-      // 列表完整数据、条件处理后
-      tableFullData: [],
-      afterFullData: [],
-      afterTreeFullData: [],
-      afterGroupFullData: [],
-      // 列表条件处理后数据集合
-      afterFullRowMaps: {},
-      // 树结构完整数据、条件处理后
-      tableFullTreeData: [],
-      // 行分组全量数据、条件处理后
-      tableFullGroupData: [],
-      tableSynchData: [],
-      tableSourceData: [],
-      // 收集的列配置（带分组）
-      collectColumn: [],
-      // 完整所有列（不带分组）
-      tableFullColumn: [],
-      // 渲染所有列
-      visibleColumn: [],
-      // 全量数据集（包括当前和已删除）
-      fullAllDataRowIdData: {},
-      // 数据集（仅当前）
-      fullDataRowIdData: {},
-      // 数据集（仅可视）
-      visibleDataRowIdData: {},
-      // 渲染中缓存数据
-      sourceDataRowIdData: {},
-      fullColumnIdData: {},
-      fullColumnFieldData: {},
-
-      // 合并单元格的数据
-      mergeBodyList: [],
-      mergeBodyMaps: {},
-      // 合并表尾的数据
-      mergeFooterList: [],
-      mergeFooterMaps: {},
-      // 已合并单元格数据集合
-      mergeBodyCellMaps: {},
-      // 已合并表尾数据集合
-      mergeFooterCellMaps: {},
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开的分组行
-      rowGroupExpandedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
-      // 已标记的对象集
-      pendingRowMaps: {},
-      // 已新增的临时行
-      insertRowMaps: {},
-      // 已删除行
-      removeRowMaps: {},
-
-      cvCacheMaps: {},
-
-      inited: false,
-      tooltipTimeout: null,
-      initStatus: false,
-      isActivated: false
-    }
+    const internalData = createInternalData()
 
     let tableMethods = {} as TableMethods
     let tablePrivateMethods = {} as TablePrivateMethods
@@ -3510,6 +3394,7 @@ export default defineVxeComponent({
       }).then(() => {
         computeScrollLoad()
       }).then(() => {
+        const virtualYOpts = computeVirtualYOpts.value
         // 是否启用了虚拟滚动
         if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize
@@ -3519,6 +3404,9 @@ export default defineVxeComponent({
           if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
             errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"'])
           }
+          if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+            warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside'])
+          }
           // if (showOverflow) {
           //   if (!rowOpts.height) {
           //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -5087,6 +4975,28 @@ export default defineVxeComponent({
         }
         return []
       },
+      /**
+       * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+       */
+      getTreeRowLevel (rowOrRowid) {
+        const { treeConfig } = props
+        const { fullAllDataRowIdData } = internalData
+        if (rowOrRowid && treeConfig) {
+          let rowid
+          if (XEUtils.isString(rowOrRowid)) {
+            rowid = rowOrRowid
+          } else {
+            rowid = getRowid($xeTable, rowOrRowid)
+          }
+          if (rowid) {
+            const rest = fullAllDataRowIdData[rowid]
+            if (rest) {
+              return rest.level
+            }
+          }
+        }
+        return -1
+      },
       /**
        * 只对 tree-config 有效，获取行的父级
        */
@@ -5804,9 +5714,23 @@ export default defineVxeComponent({
       /**
        * 用于当前行，获取当前行的数据
        */
-      getCurrentRecord () {
+      getCurrentRecord (isFull) {
+        const { currentRow } = reactData
+        const { fullDataRowIdData, afterFullRowMaps } = internalData
         const rowOpts = computeRowOpts.value
-        return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null
+        if (rowOpts.isCurrent || props.highlightCurrentRow) {
+          const rowid = getRowid($xeTable, currentRow)
+          if (isFull) {
+            if (fullDataRowIdData[rowid]) {
+              return currentRow
+            }
+          } else {
+            if (afterFullRowMaps[rowid]) {
+              return currentRow
+            }
+          }
+        }
+        return null
       },
       /**
        * 用于单选行，获取当已选中的数据
@@ -11689,7 +11613,7 @@ export default defineVxeComponent({
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
-      loadTableData(value, false).then(() => {
+      loadTableData(value, true).then(() => {
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         const expandOpts = computeExpandOpts.value
         internalData.inited = true
@@ -11950,6 +11874,12 @@ export default defineVxeComponent({
         if (props.resizable) {
           warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable'])
         }
+        if (props.virtualXConfig && props.scrollX) {
+          warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
+        }
+        if (props.virtualYConfig && props.scrollY) {
+          warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
+        }
         // if (props.scrollY) {
         //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
         // }
@@ -12040,6 +11970,15 @@ export default defineVxeComponent({
           warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
         }
 
+        if (treeConfig) {
+          XEUtils.arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
+            const val = treeOpts[key as 'rowField']
+            if (val && val.indexOf('.') > -1) {
+              errLog('vxe.error.errProp', [`${key}=${val}`, `${key}=${val.split('.')[0]}`])
+            }
+          })
+        }
+
         if (rowOpts.currentMethod) {
           warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-row-config.beforeSelectMethod'])
         }
@@ -12154,10 +12093,6 @@ export default defineVxeComponent({
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu()
       }
-      tablePrivateMethods.preventEvent(null, 'beforeUnmount', { $table: $xeTable })
-    })
-
-    onUnmounted(() => {
       globalEvents.off($xeTable, 'paste')
       globalEvents.off($xeTable, 'copy')
       globalEvents.off($xeTable, 'cut')
@@ -12167,7 +12102,12 @@ export default defineVxeComponent({
       globalEvents.off($xeTable, 'keydown')
       globalEvents.off($xeTable, 'resize')
       globalEvents.off($xeTable, 'contextmenu')
+      tablePrivateMethods.preventEvent(null, 'beforeUnmount', { $table: $xeTable })
+    })
+
+    onUnmounted(() => {
       tablePrivateMethods.preventEvent(null, 'unmounted', { $table: $xeTable })
+      XEUtils.assign(internalData, createInternalData())
     })
 
     nextTick(() => {

package/packages/table/src/util.ts

@@ -4,7 +4,127 @@ import { ColumnInfo } from './columnInfo'
 import { isPx, isScale, queryElement } from '../../ui/src/dom'
 import { eqEmptyValue } from '../../ui/src/utils'
 
-import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeTablePropTypes } from '../../../types'
+import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeTablePropTypes, TableInternalData } from '../../../types'
+
+export function createInternalData (): TableInternalData {
+  return {
+    tZindex: 0,
+    currKeyField: '',
+    isCurrDeepKey: false,
+    elemStore: {},
+    // 存放横向 X 虚拟滚动相关的信息
+    scrollXStore: {
+      preloadSize: 0,
+      offsetSize: 0,
+      visibleSize: 0,
+      visibleStartIndex: 0,
+      visibleEndIndex: 0,
+      startIndex: 0,
+      endIndex: 0
+    },
+    // 存放纵向 Y 虚拟滚动相关信息
+    scrollYStore: {
+      preloadSize: 0,
+      offsetSize: 0,
+      visibleSize: 0,
+      visibleStartIndex: 0,
+      visibleEndIndex: 0,
+      startIndex: 0,
+      endIndex: 0
+    },
+    // 表格宽度
+    tableWidth: 0,
+    // 表格高度
+    tableHeight: 0,
+    // 表头高度
+    headerHeight: 0,
+    // 表尾高度
+    footerHeight: 0,
+    customHeight: 0,
+    customMinHeight: 0,
+    customMaxHeight: 0,
+    // 当前 hover 行
+    hoverRow: null,
+    // 最后滚动位置
+    lastScrollLeft: 0,
+    lastScrollTop: 0,
+    // 单选框属性，已选中保留的行
+    radioReserveRow: null,
+    // 复选框属性，已选中保留的行集合
+    checkboxReserveRowMap: {},
+    // 行数据，已展开保留的行集合
+    rowExpandedReserveRowMap: {},
+    // 树结构数据，已展开保留的行集合
+    treeExpandedReserveRowMap: {},
+    // 树结构数据，不确定状态的集合
+    treeIndeterminateRowMaps: {},
+    // 列表完整数据、条件处理后
+    tableFullData: [],
+    afterFullData: [],
+    afterTreeFullData: [],
+    afterGroupFullData: [],
+    // 列表条件处理后数据集合
+    afterFullRowMaps: {},
+    // 树结构完整数据、条件处理后
+    tableFullTreeData: [],
+    // 行分组全量数据、条件处理后
+    tableFullGroupData: [],
+    tableSynchData: [],
+    tableSourceData: [],
+    // 收集的列配置（带分组）
+    collectColumn: [],
+    // 完整所有列（不带分组）
+    tableFullColumn: [],
+    // 渲染所有列
+    visibleColumn: [],
+    // 全量数据集（包括当前和已删除）
+    fullAllDataRowIdData: {},
+    // 数据集（仅当前）
+    fullDataRowIdData: {},
+    // 数据集（仅可视）
+    visibleDataRowIdData: {},
+    // 渲染中缓存数据
+    sourceDataRowIdData: {},
+    fullColumnIdData: {},
+    fullColumnFieldData: {},
+
+    // 合并单元格的数据
+    mergeBodyList: [],
+    mergeBodyMaps: {},
+    // 合并表尾的数据
+    mergeFooterList: [],
+    mergeFooterMaps: {},
+    // 已合并单元格数据集合
+    mergeBodyCellMaps: {},
+    // 已合并表尾数据集合
+    mergeFooterCellMaps: {},
+    // 已展开的行集合
+    rowExpandedMaps: {},
+    // 懒加载中的展开行的集合
+    rowExpandLazyLoadedMaps: {},
+    // 已展开的分组行
+    rowGroupExpandedMaps: {},
+    // 已展开树节点集合
+    treeExpandedMaps: {},
+    // 懒加载中的树节点的集合
+    treeExpandLazyLoadedMaps: {},
+    // 复选框属性，已选中的行集合
+    selectCheckboxMaps: {},
+    // 已标记的对象集
+    pendingRowMaps: {},
+    // 已新增的临时行
+    insertRowMaps: {},
+    // 已删除行
+    removeRowMaps: {},
+
+    cvCacheMaps: {},
+
+    inited: false,
+    tooltipTimeout: null,
+    initStatus: false,
+    isActivated: false
+  }
+}
 
 const getAllConvertColumns = (columns: any, parentColumn?: any) => {
   const result: any[] = []