vxe-table 3.18.0-beta.7 → 3.18.0

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

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Tham số "{1}" của "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       uniField: 'Tên trường "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       repeatKey: 'Lặp lại khóa chính {0} = "{1}", có thể gây ra lỗi',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Phương thức "{0}" không được dùng nữa, vui lòng sử dụng "{1}"',
       delProp: 'Tham số "{0}" không được dùng, vui lòng sử dụng "{1}"',
       delEvent: 'Sự kiện "{0}" được không dùng nữa, vui lòng sử dụng "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Thứ hai'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的參數 "{1}" 重複定義，這可能會出現錯誤',
       uniField: '字段名 "{0}" 重複定義，這可能會出現錯誤',
       repeatKey: '主鍵重複 {0}="{1}"，這可能會出現錯誤',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已廢棄，請使用 "{1}"',
       delProp: '參數 "{0}" 已廢棄，請使用 "{1}"',
       delEvent: '事件 "{0}" 已廢棄，請使用 "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: '秒'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -536,6 +537,37 @@ export default {
         ss: '秒'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{E}日',
+        date: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        date: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -130,6 +130,167 @@ function handleMoveSelected ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
   return params
 }
 
+function handleCheckboxRangeEvent ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, evnt: any, params: any) {
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { elemStore } = internalData
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+  const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
+  const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
+  const { column, cell } = params
+  if (column.type === 'checkbox') {
+    let bodyWrapperElem = bodyScrollElem as HTMLElement
+    if (leftScrollElem && column.fixed === 'left') {
+      bodyWrapperElem = leftScrollElem
+    } else if (rightScrollElem && column.fixed === 'right') {
+      bodyWrapperElem = rightScrollElem
+    }
+    if (!bodyWrapperElem) {
+      return
+    }
+    const el = $xeTable.$refs.refElem as HTMLDivElement
+    const disX = evnt.clientX
+    const disY = evnt.clientY
+    const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range') as HTMLElement
+    const trElem = cell.parentNode
+    const selectRecords = $xeTable.getCheckboxRecords()
+    let lastRangeRows = []
+    const marginSize = 1
+    const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem)
+    const startTop = offsetRest.offsetTop + evnt.offsetY
+    const startLeft = offsetRest.offsetLeft + evnt.offsetX
+    const startScrollTop = bodyWrapperElem.scrollTop
+    const rowHeight = trElem.offsetHeight
+    const trRect = trElem.getBoundingClientRect()
+    const offsetClientTop = disY - trRect.y
+    let mouseScrollTimeout: any = null
+    let isMouseScrollDown: any = false
+    let mouseScrollSpaceSize = 1
+    const triggerEvent = (type: any, evnt: any) => {
+      $xeTable.dispatchEvent(`checkbox-range-${type}` as 'checkbox-range-change' | 'checkbox-range-start' | 'checkbox-range-end', {
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords()
+      }, evnt)
+    }
+    const handleChecked = (evnt: any) => {
+      const { clientX, clientY } = evnt
+      const offsetLeft = clientX - disX
+      const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop)
+      let rangeHeight = Math.abs(offsetTop)
+      let rangeWidth = Math.abs(offsetLeft)
+      let rangeTop = startTop
+      let rangeLeft = startLeft
+      if (offsetTop < marginSize) {
+        // 向上
+        rangeTop += offsetTop
+        if (rangeTop < marginSize) {
+          rangeTop = marginSize
+          rangeHeight = startTop
+        }
+      } else {
+        // 向下
+        rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize)
+      }
+      if (offsetLeft < marginSize) {
+        // 向左
+        rangeLeft += offsetLeft
+        if (rangeWidth > startLeft) {
+          rangeLeft = marginSize
+          rangeWidth = startLeft
+        }
+      } else {
+        // 向右
+        rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize)
+      }
+      checkboxRangeElem.style.height = `${rangeHeight}px`
+      checkboxRangeElem.style.width = `${rangeWidth}px`
+      checkboxRangeElem.style.left = `${rangeLeft}px`
+      checkboxRangeElem.style.top = `${rangeTop}px`
+      checkboxRangeElem.style.display = 'block'
+      const rangeRows = getCheckboxRangeRows($xeTable, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight)
+      // 至少滑动 10px 才能有效匹配
+      if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+        const isControlKey = hasControlKey(evnt)
+        lastRangeRows = rangeRows
+        if (isControlKey) {
+          rangeRows.forEach((row: any) => {
+            $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1)
+          })
+        } else {
+          $xeTable.setAllCheckboxRow(false)
+          $xeTable.handleCheckedCheckboxRow(rangeRows, true, false)
+        }
+        triggerEvent('change', evnt)
+      }
+    }
+    // 停止鼠标滚动
+    const stopMouseScroll = () => {
+      clearTimeout(mouseScrollTimeout)
+      mouseScrollTimeout = null
+    }
+    // 开始鼠标滚动
+    const startMouseScroll = (evnt: any) => {
+      stopMouseScroll()
+      mouseScrollTimeout = setTimeout(() => {
+        if (mouseScrollTimeout) {
+          const { scrollLeft, scrollTop, clientHeight, scrollHeight } = bodyWrapperElem
+          const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight)
+          if (isMouseScrollDown) {
+            if (scrollTop + clientHeight < scrollHeight) {
+              $xeTable.scrollTo(scrollLeft, scrollTop + topSize)
+              startMouseScroll(evnt)
+              handleChecked(evnt)
+            } else {
+              stopMouseScroll()
+            }
+          } else {
+            if (scrollTop) {
+              $xeTable.scrollTo(scrollLeft, scrollTop - topSize)
+              startMouseScroll(evnt)
+              handleChecked(evnt)
+            } else {
+              stopMouseScroll()
+            }
+          }
+        }
+      }, 50)
+    }
+    addClass(el, 'drag--range')
+    document.onmousemove = evnt => {
+      evnt.preventDefault()
+      evnt.stopPropagation()
+      const { clientY } = evnt
+      const { boundingTop } = getAbsolutePos(bodyWrapperElem)
+      // 如果超过可视区，触发滚动
+      if (clientY < boundingTop) {
+        isMouseScrollDown = false
+        mouseScrollSpaceSize = boundingTop - clientY
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt)
+        }
+      } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
+        isMouseScrollDown = true
+        mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt)
+        }
+      } else if (mouseScrollTimeout) {
+        stopMouseScroll()
+      }
+      handleChecked(evnt)
+    }
+    document.onmouseup = (evnt) => {
+      stopMouseScroll()
+      removeClass(el, 'drag--range')
+      checkboxRangeElem.removeAttribute('style')
+      document.onmousemove = null
+      document.onmouseup = null
+      triggerEvent('end', evnt)
+    }
+    triggerEvent('start', evnt)
+  }
+}
+
 export default {
   methods: {
     // 处理 Tab 键移动
@@ -344,181 +505,24 @@ export default {
     },
     handleCellMousedownEvent (evnt: any, params: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
 
-      const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this
+      const { editConfig, checkboxConfig, mouseConfig } = props
+      const checkboxOpts = $xeTable.computeCheckboxOpts
+      const mouseOpts = $xeTable.computeMouseOpts
+      const editOpts = $xeTable.computeEditOpts
       if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
         return $xeTable.triggerCellAreaModnEvent(evnt, params)
       } else {
         if (checkboxConfig && checkboxOpts.range) {
-          this.handleCheckboxRangeEvent(evnt, params)
+          handleCheckboxRangeEvent($xeTable, evnt, params)
         }
         if (mouseConfig && mouseOpts.selected) {
           if (!editConfig || editOpts.mode === 'cell') {
-            handleSelected(params, evnt)
-          }
-        }
-      }
-    },
-    handleCheckboxRangeEvent (evnt: any, params: any) {
-      const $xeTable = this
-      const internalData = $xeTable
-
-      const { elemStore } = internalData
-      const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
-      const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
-      const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
-      const { column, cell } = params
-      if (column.type === 'checkbox') {
-        let bodyWrapperElem = bodyScrollElem as HTMLElement
-        if (leftScrollElem && column.fixed === 'left') {
-          bodyWrapperElem = leftScrollElem
-        } else if (rightScrollElem && column.fixed === 'right') {
-          bodyWrapperElem = rightScrollElem
-        }
-        if (!bodyWrapperElem) {
-          return
-        }
-        const el = $xeTable.$refs.refElem as HTMLDivElement
-        const disX = evnt.clientX
-        const disY = evnt.clientY
-        const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range') as HTMLElement
-        const trElem = cell.parentNode
-        const selectRecords = this.getCheckboxRecords()
-        let lastRangeRows = []
-        const marginSize = 1
-        const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem)
-        const startTop = offsetRest.offsetTop + evnt.offsetY
-        const startLeft = offsetRest.offsetLeft + evnt.offsetX
-        const startScrollTop = bodyWrapperElem.scrollTop
-        const rowHeight = trElem.offsetHeight
-        const trRect = trElem.getBoundingClientRect()
-        const offsetClientTop = disY - trRect.y
-        let mouseScrollTimeout: any = null
-        let isMouseScrollDown: any = false
-        let mouseScrollSpaceSize = 1
-        const triggerEvent = (type: any, evnt: any) => {
-          this.emitEvent(`checkbox-range-${type}`, {
-            records: () => this.getCheckboxRecords(),
-            reserves: () => this.getCheckboxReserveRecords()
-          }, evnt)
-        }
-        const handleChecked = (evnt: any) => {
-          const { clientX, clientY } = evnt
-          const offsetLeft = clientX - disX
-          const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop)
-          let rangeHeight = Math.abs(offsetTop)
-          let rangeWidth = Math.abs(offsetLeft)
-          let rangeTop = startTop
-          let rangeLeft = startLeft
-          if (offsetTop < marginSize) {
-            // 向上
-            rangeTop += offsetTop
-            if (rangeTop < marginSize) {
-              rangeTop = marginSize
-              rangeHeight = startTop
-            }
-          } else {
-            // 向下
-            rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize)
-          }
-          if (offsetLeft < marginSize) {
-            // 向左
-            rangeLeft += offsetLeft
-            if (rangeWidth > startLeft) {
-              rangeLeft = marginSize
-              rangeWidth = startLeft
-            }
-          } else {
-            // 向右
-            rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize)
-          }
-          checkboxRangeElem.style.height = `${rangeHeight}px`
-          checkboxRangeElem.style.width = `${rangeWidth}px`
-          checkboxRangeElem.style.left = `${rangeLeft}px`
-          checkboxRangeElem.style.top = `${rangeTop}px`
-          checkboxRangeElem.style.display = 'block'
-          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 (isControlKey) {
-              rangeRows.forEach((row: any) => {
-                $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1)
-              })
-            } else {
-              this.setAllCheckboxRow(false)
-              this.handleCheckedCheckboxRow(rangeRows, true, false)
-            }
-            triggerEvent('change', evnt)
-          }
-        }
-        // 停止鼠标滚动
-        const stopMouseScroll = () => {
-          clearTimeout(mouseScrollTimeout)
-          mouseScrollTimeout = null
-        }
-        // 开始鼠标滚动
-        const startMouseScroll = (evnt: any) => {
-          stopMouseScroll()
-          mouseScrollTimeout = setTimeout(() => {
-            if (mouseScrollTimeout) {
-              const { scrollLeft, scrollTop, clientHeight, scrollHeight } = bodyWrapperElem
-              const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight)
-              if (isMouseScrollDown) {
-                if (scrollTop + clientHeight < scrollHeight) {
-                  this.scrollTo(scrollLeft, scrollTop + topSize)
-                  startMouseScroll(evnt)
-                  handleChecked(evnt)
-                } else {
-                  stopMouseScroll()
-                }
-              } else {
-                if (scrollTop) {
-                  this.scrollTo(scrollLeft, scrollTop - topSize)
-                  startMouseScroll(evnt)
-                  handleChecked(evnt)
-                } else {
-                  stopMouseScroll()
-                }
-              }
-            }
-          }, 50)
-        }
-        addClass(el, 'drag--range')
-        document.onmousemove = evnt => {
-          evnt.preventDefault()
-          evnt.stopPropagation()
-          const { clientY } = evnt
-          const { boundingTop } = getAbsolutePos(bodyWrapperElem)
-          // 如果超过可视区，触发滚动
-          if (clientY < boundingTop) {
-            isMouseScrollDown = false
-            mouseScrollSpaceSize = boundingTop - clientY
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt)
-            }
-          } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
-            isMouseScrollDown = true
-            mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt)
-            }
-          } else if (mouseScrollTimeout) {
-            stopMouseScroll()
+            $xeTable.handleSelected(params, evnt)
           }
-          handleChecked(evnt)
         }
-        document.onmouseup = (evnt) => {
-          stopMouseScroll()
-          removeClass(el, 'drag--range')
-          checkboxRangeElem.removeAttribute('style')
-          document.onmousemove = null
-          document.onmouseup = null
-          triggerEvent('end', evnt)
-        }
-        triggerEvent('start', evnt)
       }
     }
-  } as any
+  }
 }

package/packages/table/src/footer.ts

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
 import { updateCellTitle } from '../../ui/src/dom'
-import { getCellHeight } from './util'
+import { getCalcHeight } from './util'
 
 import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, TableReactData, TableInternalData, VxeComponentStyleType } from '../../../types'
 
@@ -32,7 +32,7 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const cellOpts = $xeTable.computeCellOpts
   const footerCellOpts = $xeTable.computeFooterCellOpts
-  const currCellHeight = getCellHeight(footerCellOpts.height) || defaultRowHeight
+  const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight
 
   return tableColumn.map((column: any, $columnIndex: any) => {
     const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column

package/packages/table/src/header.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
-import { getCellHeight, convertHeaderColumnToRows } from './util'
+import { getCalcHeight, convertHeaderColumnToRows } from './util'
 
 import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, TableReactData, TableInternalData, VxeComponentStyleType } from '../../../types'
 
@@ -29,7 +29,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
-  const currCellHeight = getCellHeight(headerCellOpts.height) || defaultRowHeight
+  const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
   const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
   return cols.map((column: any, $columnIndex: any) => {
     const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column

package/packages/table/src/table.ts

@@ -2,7 +2,7 @@ import { CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { getFuncText, isEnableConf } from '../../ui/src/utils'
 import { initTpImg } from '../../ui/src/dom'
-import { createInternalData, createHandleGetRowId, getCellHeight, hasDeepKey } from './util'
+import { createInternalData, createHandleGetRowId, getCalcHeight, hasDeepKey } from './util'
 import { VxeUI } from '../../ui'
 import methods from './methods'
 import TableBodyComponent from './body'
@@ -926,11 +926,21 @@ export default {
     },
     computeHeaderCellOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const $xeGantt = $xeTable.$xeGantt
       const props = $xeTable
 
       const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig)
+      const defaultRowHeight = $xeTable.computeDefaultRowHeight
       const cellOpts = $xeTable.computeCellOpts
-      headerCellOpts.height = XEUtils.toNumber(getCellHeight(headerCellOpts.height || cellOpts.height))
+      let headCellHeight = XEUtils.toNumber(getCalcHeight(headerCellOpts.height || cellOpts.height))
+      if ($xeGantt) {
+        const taskScaleConfs = $xeGantt.computeTaskScaleConfs
+        if (taskScaleConfs && taskScaleConfs.length > 2) {
+          const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskScaleConfs.length
+          headCellHeight = Math.max(ganttMinHeadCellHeight, headCellHeight)
+        }
+      }
+      headerCellOpts.height = headCellHeight
       return headerCellOpts
     },
     computeFooterCellOpts () {
@@ -939,7 +949,7 @@ export default {
 
       const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig)
       const cellOpts = $xeTable.computeCellOpts
-      footerCellOpts.height = XEUtils.toNumber(getCellHeight(footerCellOpts.height || cellOpts.height))
+      footerCellOpts.height = XEUtils.toNumber(getCalcHeight(footerCellOpts.height || cellOpts.height))
       return footerCellOpts
     },
     rowOpts () {
@@ -1896,6 +1906,16 @@ export default {
     this.preventEvent(null, 'activated')
   },
   deactivated () {
+    const $xeTable = this
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { filterStore } = reactData
+    if (filterStore.visible) {
+      $xeTable.clearFilter()
+    }
+    $xeTable.closeTooltip()
+    internalData.isActivated = false
     this.preventEvent(null, 'deactivated')
   },
   beforeDestroy () {

package/packages/table/src/util.ts

@@ -315,7 +315,7 @@ function getElementMarginAndWidth (elem: HTMLElement | null) {
   return 0
 }
 
-export function getCellHeight (height: number | 'unset' | undefined | null) {
+export function getCalcHeight (height: number | 'unset' | undefined | null) {
   if (height === 'unset') {
     return 0
   }