vxe-table 4.1.0 → 4.1.3

package/packages/edit/src/hook.ts

@@ -130,7 +130,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         editStore.insertList.unshift(...newRecords)
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
         $xetable.updateFooter()
-        $xetable.updateCache()
+        $xetable.cacheRowMap()
         $xetable.handleTableData()
         $xetable.updateAfterDataIndex()
         $xetable.checkSelectionStatus()
@@ -223,7 +223,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         })
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
         $xetable.updateFooter()
-        $xetable.updateCache()
+        $xetable.cacheRowMap()
         $xetable.handleTableData()
         $xetable.updateAfterDataIndex()
         $xetable.checkSelectionStatus()

package/packages/export/src/hook.ts

@@ -728,6 +728,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
       }
       saveLocalFile({ filename, type, content }).then(() => {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.expSuccess'), status: 'success' })
         }
       })
@@ -799,6 +805,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
               loadRest = $xetable.reloadData(data)
             }
             if (opts.message !== false) {
+              // 检测弹窗模块
+              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (!VXETable.modal) {
+                  errLog('vxe.error.reqModule', ['Modal'])
+                }
+              }
               VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.impSuccess', [rows.length]), status: 'success' })
             }
             return loadRest.then(() => {
@@ -808,6 +820,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
             })
           })
       } else if (opts.message !== false) {
+        // 检测弹窗模块
+        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (!VXETable.modal) {
+            errLog('vxe.error.reqModule', ['Modal'])
+          }
+        }
         VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.impFields'), status: 'error' })
         if (_importReject) {
           _importReject({ status: false })
@@ -822,6 +840,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!importMethod && !XEUtils.includes(VXETable.config.importTypes, type)) {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [type]), status: 'error' })
         }
         const params = { status: false }

package/packages/export/src/util.ts

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { browse } from '../../tools/dom'
-import { getLog, parseFile } from '../../tools/utils'
+import { getLog, parseFile, errLog } from '../../tools/utils'
 
 import { VxeTablePropTypes, SaveFileFunction, ReadFileFunction, VxeTableConstructor } from '../../../types/all'
 
@@ -82,6 +82,12 @@ export const readLocalFile: ReadFileFunction = (options) => {
         resolve({ status: true, files, file })
       } else {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [errType]), status: 'error' })
         }
         const params = { status: false, files, file }
@@ -152,16 +158,22 @@ export const saveLocalFile: SaveFileFunction = (options) => {
   const name = `${filename}.${type}`
   if (window.Blob) {
     const blob = content instanceof Blob ? content : getExportBlobByContent(XEUtils.toValueString(content), options)
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, name)
+    if ((navigator as any).msSaveBlob) {
+      (navigator as any).msSaveBlob(blob, name)
     } else {
+      const url = URL.createObjectURL(blob)
       const linkElem = document.createElement('a')
       linkElem.target = '_blank'
       linkElem.download = name
-      linkElem.href = URL.createObjectURL(blob)
+      linkElem.href = url
       document.body.appendChild(linkElem)
       linkElem.click()
-      document.body.removeChild(linkElem)
+      requestAnimationFrame(() => {
+        if (linkElem.parentNode) {
+          linkElem.parentNode.removeChild(linkElem)
+        }
+        URL.revokeObjectURL(url)
+      })
     }
     return Promise.resolve()
   }

package/packages/footer/src/footer.ts

@@ -91,11 +91,11 @@ export default defineComponent({
       let { fixedType, fixedColumn, tableColumn, footerTableData } = props
       const { footerRowClassName, footerCellClassName, footerRowStyle, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps
       const { visibleColumn } = tableInternalData
-      const { scrollXLoad, overflowX, scrollbarWidth, currentColumn, mergeFooterList } = tableReactData
+      const { scrollYLoad, overflowX, scrollbarWidth, currentColumn, mergeFooterList } = tableReactData
       const tooltipOpts = computeTooltipOpts.value
       // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || allColumnFooterOverflow) {
+        if (scrollYLoad || allColumnFooterOverflow) {
           if (!mergeFooterList.length || !footerSpanMethod) {
             tableColumn = fixedColumn
           } else {
@@ -165,8 +165,8 @@ export default defineComponent({
               const _columnIndex = $xetable.getVTColumnIndex(column)
               const itemIndex = _columnIndex
               const params: VxeTableDefines.CellRenderFooterParams = { $table: $xetable, _rowIndex, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, itemIndex, items: list, fixed: fixedType, type: renderType, data: footerTableData }
-              // 虚拟滚动不支持动态高度
-              if (scrollXLoad && !hasEllipsis) {
+              // 纵向虚拟滚动不支持动态行高
+              if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true
               }
               if (showTitle || showTooltip || showAllTip) {

package/packages/form/src/form.ts

@@ -25,8 +25,12 @@ class Rule {
     })
   }
 
+  get content () {
+    return getFuncText(this.$options.content || this.$options.message)
+  }
+
   get message () {
-    return getFuncText(this.$options.message)
+    return this.content
   }
 
   [key: string]: any
@@ -69,10 +73,10 @@ export default defineComponent({
     loading: Boolean as PropType<VxeFormPropTypes.Loading>,
     data: Object as PropType<VxeFormPropTypes.Data>,
     size: { type: String as PropType<VxeFormPropTypes.Size>, default: () => GlobalConfig.form.size || GlobalConfig.size },
-    span: [String, Number] as PropType<VxeFormPropTypes.Span>,
+    span: { type: [String, Number] as PropType<VxeFormPropTypes.Span>, default: () => GlobalConfig.form.span },
     align: { type: String as PropType<VxeFormPropTypes.Align>, default: () => GlobalConfig.form.align },
     titleAlign: { type: String as PropType<VxeFormPropTypes.TitleAlign>, default: () => GlobalConfig.form.titleAlign },
-    titleWidth: [String, Number] as PropType<VxeFormPropTypes.TitleWidth>,
+    titleWidth: { type: [String, Number] as PropType<VxeFormPropTypes.TitleWidth>, default: () => GlobalConfig.form.titleWidth },
     titleColon: { type: Boolean as PropType<VxeFormPropTypes.TitleColon>, default: () => GlobalConfig.form.titleColon },
     titleAsterisk: { type: Boolean as PropType<VxeFormPropTypes.TitleAsterisk>, default: () => GlobalConfig.form.titleAsterisk },
     titleOverflow: { type: [Boolean, String] as PropType<VxeFormPropTypes.TitleOverflow>, default: null },
@@ -327,12 +331,12 @@ export default defineComponent({
                 })
                 if (customValid) {
                   if (XEUtils.isError(customValid)) {
-                    errorRules.push(new Rule({ type: 'custom', trigger, message: customValid.message, rule: new Rule(rule) }))
+                    errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))
                   } else if (customValid.catch) {
                     // 如果为异步校验（注：异步校验是并发无序的）
                     syncVailds.push(
                       customValid.catch((e: any) => {
-                        errorRules.push(new Rule({ type: 'custom', trigger, message: e ? e.message : rule.message, rule: new Rule(rule) }))
+                        errorRules.push(new Rule({ type: 'custom', trigger, content: e ? e.message : (rule.content || rule.message), rule: new Rule(rule) }))
                       })
                     )
                   }
@@ -585,7 +589,7 @@ export default defineComponent({
               style: errRule.maxWidth ? {
                 width: `${errRule.maxWidth}px`
               } : null
-            }, errRule.message)
+            }, errRule.content)
           )
         }
         const ons = showTooltip ? {

package/packages/form/src/render.ts

@@ -35,9 +35,9 @@ export function renderTitle ($xeform: VxeFormConstructor & VxeFormPrivateMethods
   const titVNs = []
   if (titlePrefix) {
     titVNs.push(
-      titlePrefix.message
+      (titlePrefix.content || titlePrefix.message)
         ? h(resolveComponent('vxe-tooltip') as ComponentOptions, {
-          content: getFuncText(titlePrefix.message),
+          content: getFuncText(titlePrefix.content || titlePrefix.message),
           enterable: titlePrefix.enterable,
           theme: titlePrefix.theme
         }, {
@@ -59,9 +59,9 @@ export function renderTitle ($xeform: VxeFormConstructor & VxeFormPrivateMethods
   const fixVNs = []
   if (titleSuffix) {
     fixVNs.push(
-      titleSuffix.message
+      (titleSuffix.content || titleSuffix.message)
         ? h(resolveComponent('vxe-tooltip') as ComponentOptions, {
-          content: getFuncText(titleSuffix.message),
+          content: getFuncText(titleSuffix.content || titleSuffix.message),
           enterable: titleSuffix.enterable,
           theme: titleSuffix.theme
         }, {

package/packages/grid/src/grid.ts

@@ -13,7 +13,7 @@ import { TableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, VxeGridP
 
 const tableComponentPropKeys = Object.keys(tableComponentProps as any)
 
-const tableComponentMethodKeys: (keyof TableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadExpandContent', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'focus', 'blur', 'connect']
+const tableComponentMethodKeys: (keyof TableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'focus', 'blur', 'connect']
 
 const gridComponentEmits: VxeGridEmits = [
   ...tableComponentEmits,
@@ -259,6 +259,12 @@ export default defineComponent({
         gridExtendTableMethods.clearCheckboxRow()
       } else {
         if (isMsg) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }
       }
@@ -285,6 +291,12 @@ export default defineComponent({
             }
           })
         } else {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ id: `msg_${code}`, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }
       } else {
@@ -800,6 +812,12 @@ export default defineComponent({
                       reactData.tableLoading = false
                       reactData.pendingRecords = reactData.pendingRecords.filter((row) => $xetable.findRowIndexOf(removeRecords, row) === -1)
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal'])
+                          }
+                        }
                         VXETable.modal.message({ content: getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
                       }
                       if (afterDelete) {
@@ -811,12 +829,23 @@ export default defineComponent({
                     .catch(rest => {
                       reactData.tableLoading = false
                       if (isMsg) {
+                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                          if (!VXETable.modal.message) {
+                            errLog('vxe.error.reqModule', ['Modal'])
+                          }
+                        }
                         VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
                     })
                 })
               } else {
                 if (isMsg) {
+                  // 检测弹窗模块
+                  if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (!VXETable.modal) {
+                      errLog('vxe.error.reqModule', ['Modal'])
+                    }
+                  }
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
                 }
               }
@@ -850,6 +879,12 @@ export default defineComponent({
                       reactData.tableLoading = false
                       reactData.pendingRecords = []
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal'])
+                          }
+                        }
                         VXETable.modal.message({ content: getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
                       }
                       if (afterSave) {
@@ -861,11 +896,23 @@ export default defineComponent({
                     .catch(rest => {
                       reactData.tableLoading = false
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal'])
+                          }
+                        }
                         VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
                     })
                 } else {
                   if (isMsg) {
+                    // 检测弹窗模块
+                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (!VXETable.modal) {
+                        errLog('vxe.error.reqModule', ['Modal'])
+                      }
+                    }
                     VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
                   }
                 }

package/packages/header/src/header.ts

@@ -22,6 +22,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xetable
     const { refElem: tableRefElem, refTableBody, refLeftContainer, refRightContainer, refCellResizeBar } = $xetable.getRefMaps()
+    const { computeColumnOpts } = $xetable.getComputeMaps()
 
     const headerColumn = ref([] as VxeTableDefines.ColumnInfo[][])
 
@@ -146,12 +147,13 @@ export default defineComponent({
     const renderVN = () => {
       let { fixedType, fixedColumn, tableColumn } = props
       const { resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
-      const { isGroup, currentColumn, scrollXLoad, overflowX, scrollbarWidth } = tableReactData
+      const { isGroup, currentColumn, scrollYLoad, overflowX, scrollbarWidth } = tableReactData
+      const columnOpts = computeColumnOpts.value
       let headerGroups: VxeTableDefines.ColumnInfo[][] = headerColumn.value
       // 如果是使用优化模式
       if (!isGroup) {
         if (fixedType) {
-          if (scrollXLoad || allColumnHeaderOverflow) {
+          if (scrollYLoad || allColumnHeaderOverflow) {
             tableColumn = fixedColumn
           }
         }
@@ -216,8 +218,8 @@ export default defineComponent({
                 onClick: (evnt: MouseEvent) => $xetable.triggerHeaderCellClickEvent(evnt, params),
                 onDblclick: (evnt: MouseEvent) => $xetable.triggerHeaderCellDblclickEvent(evnt, params)
               }
-              // 虚拟滚动不支持动态高度
-              if (scrollXLoad && !hasEllipsis) {
+              // 纵向虚拟滚动不支持动态行高
+              if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true
               }
               // 按下事件处理
@@ -258,7 +260,7 @@ export default defineComponent({
                 /**
                  * 列宽拖动
                  */
-                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : resizable) ? h('div', {
+                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable)) ? h('div', {
                   class: ['vxe-resizable', {
                     'is--line': !border || border === 'none'
                   }],

package/packages/select/src/select.ts

@@ -198,7 +198,7 @@ export default defineComponent({
       return nextTick()
     }
 
-    const updateCache = () => {
+    const cacheItemMap = () => {
       const { fullOptionList, fullGroupList } = reactData
       const groupOptionsField = computeGroupOptionsField.value
       const key = getOptkey()
@@ -706,19 +706,19 @@ export default defineComponent({
         reactData.fullGroupList = []
         reactData.fullOptionList = value || []
       }
-      updateCache()
+      cacheItemMap()
     })
 
     watch(() => props.options, (value) => {
       reactData.fullGroupList = []
       reactData.fullOptionList = value || []
-      updateCache()
+      cacheItemMap()
     })
 
     watch(() => props.optionGroups, (value) => {
       reactData.fullOptionList = []
       reactData.fullGroupList = value || []
-      updateCache()
+      cacheItemMap()
     })
 
     onMounted(() => {
@@ -729,7 +729,7 @@ export default defineComponent({
         } else if (options) {
           reactData.fullOptionList = options
         }
-        updateCache()
+        cacheItemMap()
       })
       GlobalEvent.on($xeselect, 'mousewheel', handleGlobalMousewheelEvent)
       GlobalEvent.on($xeselect, 'mousedown', handleGlobalMousedownEvent)

package/packages/table/src/body.ts

@@ -31,7 +31,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xetable
     const { refTableHeader, refTableBody, refTableFooter, refTableLeftBody, refTableRightBody, refValidTooltip } = $xetable.getRefMaps()
-    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts } = $xetable.getComputeMaps()
+    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts, computeRowOpts } = $xetable.getComputeMaps()
 
     const refElem = ref() as Ref<XEBodyScrollElement>
     const refBodyTable = ref() as Ref<HTMLTableElement>
@@ -110,16 +110,18 @@ export default defineComponent({
      */
     const renderColumn = ($seq: string, seq: number, rowid: string, fixedType: any, rowLevel: number, row: any, rowIndex: number, $rowIndex: number, _rowIndex: number, column: any, $columnIndex: number, columns: any, items: any[]) => {
       const { columnKey, height, showOverflow: allColumnOverflow, cellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig } = tableProps
-      const { tableData, overflowX, scrollXLoad, scrollYLoad, currentColumn, mergeList, editStore, validStore, isAllOverflow } = tableReactData
+      const { tableData, overflowX, scrollYLoad, currentColumn, mergeList, editStore, validStore, isAllOverflow } = tableReactData
       const { afterFullData } = tableInternalData
       const validOpts = computeValidOpts.value
       const checkboxOpts = computeCheckboxOpts.value
       const editOpts = computeEditOpts.value
       const tooltipOpts = computeTooltipOpts.value
+      const rowOpts = computeRowOpts.value
       const sYOpts = computeSYOpts.value
       const { type, cellRender, editRender, align, showOverflow, className, treeNode } = column
       const { actived } = editStore
-      const { rHeight } = sYOpts
+      const { rHeight: scrollYRHeight } = sYOpts
+      const { height: rowHeight } = rowOpts
       const showAllTip = tooltipOpts.showAll
       const columnIndex = $xetable.getColumnIndex(column)
       const _columnIndex = $xetable.getVTColumnIndex(column)
@@ -138,7 +140,7 @@ export default defineComponent({
       const attrs: any = { colid: column.id }
       const params: VxeTableDefines.CellRenderBodyParams = { $table: $xetable, $seq, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
       // 虚拟滚动不支持动态高度
-      if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
+      if (scrollYLoad && !hasEllipsis) {
         showEllipsis = hasEllipsis = true
       }
       // hover 进入事件
@@ -230,7 +232,7 @@ export default defineComponent({
               'c--ellipsis': showEllipsis
             }],
             style: {
-              maxHeight: hasEllipsis && rHeight ? `${rHeight}px` : ''
+              maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
             }
           })
         )
@@ -245,7 +247,7 @@ export default defineComponent({
               'c--ellipsis': showEllipsis
             }],
             style: {
-              maxHeight: hasEllipsis && rHeight ? `${rHeight}px` : ''
+              maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
             },
             title: showTitle ? $xetable.getCellLabel(row, column) : null
           }, column.renderCell(params))
@@ -283,16 +285,16 @@ export default defineComponent({
         key: columnKey ? column.id : $columnIndex,
         ...attrs,
         style: Object.assign({
-          height: hasEllipsis && rHeight ? `${rHeight}px` : ''
+          height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
         }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null),
         ...tdOns
       }, tdVNs)
     }
 
-    const renderRows = ($seq: string, rowLevel: any, fixedType: any, tableData: any, tableColumn: any) => {
+    const renderRows = ($seq: string, fixedType: any, tableData: any, tableColumn: any) => {
       const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, showOverflow: allColumnOverflow, editConfig, treeConfig } = tableProps
       const { hasFixedColumn, treeExpandeds, scrollYLoad, editStore, rowExpandeds, expandColumn, selectRow } = tableReactData
-      const { scrollYStore } = tableInternalData
+      const { fullAllDataRowIdData, scrollYStore } = tableInternalData
       const checkboxOpts = computeCheckboxOpts.value
       const radioOpts = computeRadioOpts.value
       const treeOpts = computeTreeOpts.value
@@ -324,6 +326,8 @@ export default defineComponent({
           }
         }
         const rowid = getRowid($xetable, row)
+        const rest = fullAllDataRowIdData[rowid]
+        const rowLevel = rest ? rest.level : 0
         const params = { $table: $xetable, $seq, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex }
         let isNewRow = false
         if (editConfig) {
@@ -382,10 +386,10 @@ export default defineComponent({
           )
         }
         // 如果是树形表格
-        if (treeConfig && treeExpandeds.length) {
+        if (treeConfig && !scrollYLoad && treeExpandeds.length) {
           const rowChildren = row[treeOpts.children]
           if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-            rows.push(...renderRows($seq ? `${$seq}.${seq}` : `${seq}`, rowLevel + 1, fixedType, rowChildren, tableColumn))
+            rows.push(...renderRows($seq ? `${$seq}.${seq}` : `${seq}`, fixedType, rowChildren, tableColumn))
           }
         }
       })
@@ -603,7 +607,7 @@ export default defineComponent({
     const renderVN = () => {
       let { fixedColumn, fixedType, tableColumn } = props
       const { keyboardConfig, showOverflow: allColumnOverflow, spanMethod, mouseConfig } = tableProps
-      const { tableData, mergeList, scrollXLoad, scrollYLoad, isAllOverflow } = tableReactData
+      const { tableData, mergeList, scrollYLoad, isAllOverflow } = tableReactData
       const { visibleColumn } = tableInternalData
       const { slots } = tableContext
       const sYOpts = computeSYOpts.value
@@ -614,7 +618,7 @@ export default defineComponent({
       // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
       // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+        if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
           if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
             tableColumn = fixedColumn
           } else {
@@ -682,7 +686,7 @@ export default defineComponent({
            */
           h('tbody', {
             ref: refBodyTBody
-          }, renderRows('', 0, fixedType, tableData, tableColumn))
+          }, renderRows('', fixedType, tableData, tableColumn))
         ]),
         h('div', {
           class: 'vxe-table--checkbox-range'