vxe-table 3.15.5 → 3.15.6

package/packages/locale/lang/hy-AM.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/locale/lang/id-ID.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/locale/lang/it-IT.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Il numero massimo di colonne bloccate non può superare {0}',
       dragTip: 'Sposta: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Seleziona almeno un record!',

package/packages/locale/lang/ja-JP.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大固定列数が {0} です。',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '1つ以上のレコードを選択してください',

package/packages/locale/lang/ko-KR.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '최대 고정 열 수는 {0}을(를) 초과할 수 없습니다.',
       dragTip: '이동: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '최소한 하나의 레코드를 선택해주세요!',

package/packages/locale/lang/nb-NO.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Maksimalt antall frosne kolonner kan ikke overstige {0}',
       dragTip: 'Flytt: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/locale/lang/pt-BR.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Por favor, selecione pelo menos um registro!',

package/packages/locale/lang/ru-RU.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Максимальное количество замороженных столбцов не может превышать {0}.',
       dragTip: 'Переместить: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Пожалуйста, выберите хотя бы одну запись!',

package/packages/locale/lang/th-TH.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'จำนวนคอลัมน์ที่ตรึงไว้สูงสุดต้องไม่เกิน {0}',
       dragTip: 'ย้าย: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'โปรดเลือกอย่างน้อยหนึ่งรายการ!',

package/packages/locale/lang/ug-CN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'توڭلىتىشقا بولىدىغان ئەڭ چوڭ قۇر سانى  {0} دانە',
       dragTip: 'يۆتكەش：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'كەم بولغاندا بىر تال ئۇچۇر تاللاڭ',

package/packages/locale/lang/uk-UA.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Максимальна кількість зафіксованих стовпців не повинна перевищувати {0}',
       dragTip: 'Переміщення: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Будь ласка, виберіть хоча б один запис!',

package/packages/locale/lang/vi-VN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/locale/lang/zh-CHT.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大凍結列的數量不能超過 {0} 個',
       dragTip: '移動：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '請至少選擇一筆記錄！',

package/packages/locale/lang/zh-CN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/table/module/custom/mixin.ts

@@ -1,34 +1,58 @@
 import XEUtils from 'xe-utils'
 
-import type { VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeGridConstructor, GridPrivateMethods } from '../../../../types'
+import type { VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeGridConstructor, VxeTableDefines, GridPrivateMethods, TableReactData, TableInternalData } from '../../../../types'
+
+function calcMaxHeight ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const reactData = $xeTable as unknown as TableReactData
+
+  const { customStore } = reactData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  // 判断面板不能大于表格高度
+  let tableHeight = 0
+  if (el) {
+    tableHeight = el.clientHeight - 28
+  }
+  customStore.maxHeight = Math.max(88, tableHeight)
+}
+
+function emitCustomEvent ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, type: VxeTableDefines.CustomType, evnt: Event) {
+  const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+  const comp = $xeGrid || $xeTable
+  comp.dispatchEvent('custom', { type }, evnt)
+}
 
 export default {
   methods: {
     _openCustom () {
-      const $xeTable = this
-      const reactData = $xeTable
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const { initStore, customStore } = reactData
       customStore.visible = true
       initStore.custom = true
       $xeTable.handleUpdateCustomColumn()
       $xeTable.checkCustomStatus()
-      $xeTable.calcMaxHeight()
-      return this.$nextTick().then(() => this.calcMaxHeight())
+      calcMaxHeight($xeTable)
+      return $xeTable.$nextTick().then(() => calcMaxHeight($xeTable))
     },
     _closeCustom () {
-      const { customStore, customOpts } = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { customStore } = reactData
+      const customOpts = $xeTable.computeCustomOpts
       if (customStore.visible) {
         customStore.visible = false
         if (!customOpts.immediate) {
-          this.handleCustom()
+          $xeTable.handleCustom()
         }
       }
-      return this.$nextTick()
+      return $xeTable.$nextTick()
     },
     _saveCustom () {
-      const $xeTable = this
-      const reactData = $xeTable
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const { customOpts, customColumnList } = this
       const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
@@ -65,10 +89,12 @@ export default {
       return $xeTable.saveCustomStore('confirm')
     },
     _cancelCustom () {
-      const $xeTable = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
-      const { customStore, customOpts, customColumnList } = $xeTable
+      const { customColumnList, customStore } = reactData
       const { oldSortMaps, oldFixedMaps, oldVisibleMaps } = customStore
+      const customOpts = $xeTable.computeCustomOpts
       const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
       XEUtils.eachTree(customColumnList, column => {
         const colid = column.getKey()
@@ -92,11 +118,12 @@ export default {
       return $xeTable.$nextTick()
     },
     _resetCustom (options: any) {
-      const $xeTable = this
-      const reactData = $xeTable
-      const internalData = $xeTable
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
 
-      const { collectColumn, customOpts } = internalData
+      const { collectColumn } = internalData
+      const customOpts = $xeTable.computeCustomOpts
       const { checkMethod } = customOpts
       const opts = Object.assign({
         visible: true,
@@ -114,7 +141,7 @@ export default {
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber
         }
-        if (!checkMethod || checkMethod({ column })) {
+        if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
           column.visible = column.defaultVisible
         }
         column.renderResizeWidth = column.renderWidth
@@ -129,19 +156,20 @@ export default {
       return this.setCustomAllCheckbox(isAll)
     },
     _setCustomAllCheckbox (checked: boolean) {
-      const $xeTable = this
-      const reactData = $xeTable
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
-      const { customStore } = this
-      const { customColumnList, customOpts } = this
+      const { customStore } = reactData
+      const { customColumnList } = reactData
+      const customOpts = $xeTable.computeCustomOpts
       const { checkMethod, visibleMethod } = customOpts
       const isAll = !!checked
       if (customOpts.immediate) {
         XEUtils.eachTree(customColumnList, (column) => {
-          if (visibleMethod && !visibleMethod({ column })) {
+          if (visibleMethod && !visibleMethod({ $table: $xeTable, column })) {
             return
           }
-          if (checkMethod && !checkMethod({ column })) {
+          if (checkMethod && !checkMethod({ $table: $xeTable, column })) {
             return
           }
           column.visible = isAll
@@ -154,10 +182,10 @@ export default {
         $xeTable.saveCustomStore('update:visible')
       } else {
         XEUtils.eachTree(customColumnList, (column) => {
-          if (visibleMethod && !visibleMethod({ column })) {
+          if (visibleMethod && !visibleMethod({ $table: $xeTable, column })) {
             return
           }
-          if (checkMethod && !checkMethod({ column })) {
+          if (checkMethod && !checkMethod({ $table: $xeTable, column })) {
             return
           }
           column.renderVisible = isAll
@@ -167,60 +195,66 @@ export default {
       }
       $xeTable.checkCustomStatus()
     },
-    calcMaxHeight  () {
-      const { $el, customStore } = this
-      // 判断面板不能大于表格高度
-      let tableHeight = 0
-      if ($el) {
-        tableHeight = $el.clientHeight - 28
-      }
-      customStore.maxHeight = Math.max(88, tableHeight)
-    },
     checkCustomStatus () {
-      const { customStore, collectColumn, customOpts } = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
+
+      const { customStore } = reactData
+      const { collectColumn } = internalData
+      const customOpts = $xeTable.computeCustomOpts
       const { checkMethod } = customOpts
-      customStore.isAll = collectColumn.every((column: any) => (checkMethod ? !checkMethod({ column }) : false) || column.renderVisible)
-      customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column: any) => (!checkMethod || checkMethod({ column })) && (column.renderVisible || column.halfVisible))
+      customStore.isAll = collectColumn.every((column) => (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false) || column.renderVisible)
+      customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column) => (!checkMethod || checkMethod({ $table: $xeTable, column })) && (column.renderVisible || column.halfVisible))
     },
     emitCustomEvent (type: any, evnt: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
 
       const comp = $xeGrid || $xeTable
-      comp.$emit('custom', { type, $table: $xeTable, $grid: $xeGrid, $event: evnt })
+      comp.dispatchEvent('custom', { type }, evnt)
     },
     triggerCustomEvent (evnt: any) {
-      const { customStore } = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { customStore } = reactData
       if (customStore.visible) {
         this.closeCustom()
-        this.emitCustomEvent('close', evnt)
+        emitCustomEvent($xeTable, 'close', evnt)
       } else {
         customStore.btnEl = evnt.target
         this.openCustom()
-        this.emitCustomEvent('open', evnt)
+        emitCustomEvent($xeTable, 'open', evnt)
       }
     },
     customOpenEvent (evnt: any) {
-      const { customStore } = this
-      if (!customStore.visible) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { customStore } = reactData
+      if (customStore.visible) {
         customStore.activeBtn = true
         customStore.btnEl = evnt.target
-        this.openCustom()
-        this.emitCustomEvent('open', evnt)
+        $xeTable.openCustom()
+        emitCustomEvent($xeTable, 'open', evnt)
       }
     },
     customCloseEvent (evnt: any) {
-      const { customStore } = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { customStore } = reactData
       if (customStore.visible) {
         customStore.activeBtn = false
-        this.closeCustom()
-        this.emitCustomEvent('close', evnt)
+        $xeTable.closeCustom()
+        emitCustomEvent($xeTable, 'close', evnt)
       }
     },
     handleUpdateCustomColumn () {
-      const $xeTable = this
-      const reactData = $xeTable
-      const internalData = $xeTable
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
 
       const { customStore } = reactData
       const { collectColumn } = internalData

package/packages/table/module/custom/panel.ts

@@ -1,7 +1,7 @@
 import { CreateElement, VNode } from 'vue'
 import { VxeUI } from '../../../ui'
 import { formatText } from '../../../ui/src/utils'
-import { getTpImg, addClass, removeClass } from '../../../ui/src/dom'
+import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
 import { errLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
 
@@ -136,13 +136,13 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
     isCustomStatus
   }
   XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
-    const isVisible = visibleMethod ? visibleMethod({ column }) : true
+    const isVisible = visibleMethod ? visibleMethod({ $table: $xeTable, column }) : true
     if (isVisible) {
       const isChecked = column.renderVisible
       const isIndeterminate = column.halfVisible
       const isColGroup = column.children && column.children.length
       const colTitle = formatText(column.getTitle(), 1)
-      const isDisabled = checkMethod ? !checkMethod({ column }) : false
+      const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false
       const isHidden = !isChecked
       colVNs.push(
         h('li', {
@@ -445,7 +445,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
     isCustomStatus
   }
   XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
-    const isVisible = visibleMethod ? visibleMethod({ column }) : true
+    const isVisible = visibleMethod ? visibleMethod({ $table: $xeTable, column }) : true
     if (isVisible) {
       // 默认继承调整宽度
       let customMinWidth = 0
@@ -470,7 +470,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
       const isIndeterminate = column.halfVisible
       const colTitle = formatText(column.getTitle(), 1)
       const isColGroup = column.children && column.children.length
-      const isDisabled = checkMethod ? !checkMethod({ column }) : false
+      const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false
       const isHidden = !isChecked
       trVNs.push(
         h('tr', {
@@ -1273,7 +1273,7 @@ export default {
       removeClass(trEl, 'active--drag-target')
       removeClass(trEl, 'active--drag-origin')
     },
-    sortDragoverEvent  (evnt: any) {
+    sortDragoverEvent  (evnt: DragEvent) {
       const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
       const { dragCol } = this
@@ -1283,7 +1283,7 @@ export default {
       const columnDragOpts = $xeTable.computeColumnDragOpts
       const { isCrossDrag, isToChildDrag } = columnDragOpts
       const optEl = evnt.currentTarget as HTMLElement
-      const hasCtrlKey = evnt.ctrlKey
+      const isControlKey = hasControlKey(evnt)
       const colid = optEl.getAttribute('colid')
       const column = $xeTable.getColumnById(colid)
       // 是否移入有效列
@@ -1300,7 +1300,7 @@ export default {
           showDropTip(this, evnt, optEl, false, dragPos)
           return
         }
-        this.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey && immediate)
+        this.prevDragToChild = !!((isCrossDrag && isToChildDrag) && isControlKey && immediate)
         this.prevDragCol = column
         this.prevDragPos = dragPos
         showDropTip(this, evnt, optEl, true, dragPos)

package/packages/table/module/export/mixin.ts

@@ -25,11 +25,12 @@ function hasTreeChildren ($xeTable: VxeTableConstructor, row: any) {
   return row[childrenField] && row[childrenField].length
 }
 
-function getSeq ($xeTable: VxeTableConstructor, cellValue: any, row: any, $rowIndex: any, column: any, $columnIndex: any) {
+function getSeq ($xeTable: VxeTableConstructor, cellValue: any, row: any, $rowIndex: number, column: VxeTableDefines.ColumnInfo, $columnIndex: number) {
   const seqOpts = $xeTable.computeSeqOpts
-  const seqMethod = seqOpts.seqMethod || column.seqMethod
+  const seqMethod = seqOpts.seqMethod || (column as any).seqMethod
   if (seqMethod) {
     return seqMethod({
+      $table: $xeTable,
       row,
       rowIndex: $xeTable.getRowIndex(row),
       $rowIndex,
@@ -116,12 +117,12 @@ function getBodyLabelData ($xeTable: VxeTableConstructor, opts: VxeTablePropType
               case 'checkbox':
                 cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row))
                 item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
-                item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row })
+                item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row })
                 break
               case 'radio':
                 cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row))
                 item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : ''
-                item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row })
+                item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row })
                 break
               default:
                 if (opts.original) {
@@ -174,12 +175,12 @@ function getBodyLabelData ($xeTable: VxeTableConstructor, opts: VxeTablePropType
           case 'checkbox':
             cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row))
             item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
-            item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row })
+            item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row })
             break
           case 'radio':
             cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row))
             item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : ''
-            item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row })
+            item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row })
             break
           default:
             if (opts.original) {
@@ -204,11 +205,11 @@ function getBodyLabelData ($xeTable: VxeTableConstructor, opts: VxeTablePropType
   })
 }
 
-function getExportData ($xeTable: any, opts: VxeTablePropTypes.ExportHandleOptions) {
+function getExportData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions) {
   const { columns, dataFilterMethod } = opts
   let datas = opts.data
   if (dataFilterMethod) {
-    datas = datas.filter((row: any, index: any) => dataFilterMethod({ row, $rowIndex: index }))
+    datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, row, $rowIndex: index }))
   }
   return getBodyLabelData($xeTable, opts, columns, datas)
 }
@@ -217,16 +218,16 @@ function getBooleanValue (cellValue: any) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true
 }
 
-function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: any, column: any) {
+function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, column: VxeTableDefines.ColumnInfo) {
   const columnOpts = $xeTable.computeColumnOpts
   const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
   return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? column.getTitle() : column.field) || '')
 }
 
-function getFooterCellValue ($xeTable: any, opts: any, row: any, column: any) {
+function getFooterCellValue ($xeTable: any, opts: VxeTablePropTypes.ExportHandleOptions, row: any, column: VxeTableDefines.ColumnInfo) {
   const columnOpts = $xeTable.computeColumnOpts
   const renderOpts = column.editRender || column.cellRender
-  let footLabelMethod = column.footerExportMethod
+  let footLabelMethod: VxeColumnPropTypes.FooterExportMethod | undefined = column.footerExportMethod
   if (!footLabelMethod && renderOpts && renderOpts.name) {
     const compConf = renderer.get(renderOpts.name)
     if (compConf) {
@@ -247,9 +248,9 @@ function getFooterCellValue ($xeTable: any, opts: any, row: any, column: any) {
   return XEUtils.get(row, column.field)
 }
 
-function getFooterData (opts: VxeTablePropTypes.ExportHandleOptions, footerTableData: any[]) {
+function getFooterData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, footerTableData: any[]) {
   const { footerFilterMethod } = opts
-  return footerFilterMethod ? footerTableData.filter((items: any, index: any) => footerFilterMethod({ items, $rowIndex: index })) : footerTableData
+  return footerFilterMethod ? footerTableData.filter((items: any, index: any) => footerFilterMethod({ $table: $xeTable, items, $rowIndex: index })) : footerTableData
 }
 
 function getCsvCellTypeLabel (column: any, cellValue: any) {
@@ -294,7 +295,7 @@ function toCsv ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: Vx
   })
   if (opts.isFooter) {
     const { footerTableData } = reactData
-    const footers = getFooterData(opts, footerTableData)
+    const footers = getFooterData($xeTable, opts, footerTableData)
     footers.forEach((row) => {
       content += columns.map(column => toTxtCellLabel(getFooterCellValue($xeTable, opts, row, column))).join(',') + enterSymbol
     })
@@ -314,7 +315,7 @@ function toTxt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: Vx
   })
   if (opts.isFooter) {
     const { footerTableData } = reactData
-    const footers = getFooterData(opts, footerTableData)
+    const footers = getFooterData($xeTable, opts, footerTableData)
     footers.forEach((row) => {
       content += columns.map(column => toTxtCellLabel(getFooterCellValue($xeTable, opts, row, column))).join('\t') + enterSymbol
     })
@@ -484,7 +485,7 @@ function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: V
   }
   if (isFooter) {
     const { footerTableData } = reactData
-    const footers = getFooterData(opts, footerTableData)
+    const footers = getFooterData($xeTable, opts, footerTableData)
     if (footers.length) {
       tables.push('<tfoot>')
       footers.forEach((row: any) => {
@@ -539,7 +540,7 @@ function toXML ($xeTable: any, opts: any, columns: any[], datas: any[]) {
   })
   if (opts.isFooter) {
     const { footerTableData } = reactData
-    const footers = getFooterData(opts, footerTableData)
+    const footers = getFooterData($xeTable, opts, footerTableData)
     footers.forEach((row: any) => {
       xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xeTable, opts, row, column)}</Data></Cell>`).join('')}</Row>`
     })
@@ -1131,7 +1132,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
     }
     column.checked = isChecked
     column.halfChecked = false
-    column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false)
+    column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false)
   })
   // 更新条件
   Object.assign(exportStore, {

package/packages/table/module/keyboard/mixin.ts

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import { getRefElem } from '../../src/util'
-import { hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom'
+import { hasClass, getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, TableReactData, TableInternalData } from '../../../../types'
 
@@ -437,8 +437,9 @@ export default {
           const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight)
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+            const isControlKey = hasControlKey(evnt)
             lastRangeRows = rangeRows
-            if (evnt.ctrlKey) {
+            if (isControlKey) {
               rangeRows.forEach((row: any) => {
                 $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1)
               })