vxe-table 4.13.27 → 4.13.29

package/packages/table/src/table.ts

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
 import tableProps from './props'
 import tableEmits from './emits'
-import { getRowUniqueId, clearTableAllStatus, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCellHeight } from './util'
+import { getRowUniqueId, clearTableAllStatus, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCellHeight } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 import TableCustomPanelComponent from '../module/custom/panel'
@@ -987,7 +987,7 @@ export default defineComponent({
 
     const getNextSortOrder = (column: VxeTableDefines.ColumnInfo) => {
       const sortOpts = computeSortOpts.value
-      const { orders } = sortOpts
+      const { orders = [] } = sortOpts
       const currOrder = column.order || null
       const oIndex = orders.indexOf(currOrder) + 1
       return orders[oIndex < orders.length ? oIndex : 0]
@@ -1399,6 +1399,54 @@ export default defineComponent({
       return rest
     }
 
+    const handleSortEvent = (evnt: Event | null, sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) => {
+      const sortOpts = computeSortOpts.value
+      const { multiple, remote, orders } = sortOpts
+      if (!XEUtils.isArray(sortConfs)) {
+        sortConfs = [sortConfs]
+      }
+      if (sortConfs && sortConfs.length) {
+        if (!multiple) {
+          sortConfs = [sortConfs[0]]
+          clearAllSort()
+        }
+        let firstColumn: any = null
+        sortConfs.forEach((confs: any, index: number) => {
+          let { field, order } = confs
+          let column = field
+          if (XEUtils.isString(field)) {
+            column = $xeTable.getColumnByField(field)
+          }
+          if (!firstColumn) {
+            firstColumn = column
+          }
+          if (column && column.sortable) {
+            if (orders && orders.indexOf(order) === -1) {
+              order = getNextSortOrder(column)
+            }
+            if (column.order !== order) {
+              column.order = order
+            }
+            column.sortTime = Date.now() + index
+          }
+        })
+        if (isUpdate) {
+          if (!remote) {
+            $xeTable.handleTableData(true)
+          }
+        }
+        if (evnt) {
+          $xeTable.handleColumnSortEvent(evnt, firstColumn)
+        }
+        return nextTick().then(() => {
+          updateRowOffsetTop()
+          $xeTable.updateCellAreas()
+          return updateStyle()
+        })
+      }
+      return nextTick()
+    }
+
     const clearAllSort = () => {
       const { tableFullColumn } = internalData
       tableFullColumn.forEach((column) => {
@@ -3868,7 +3916,7 @@ export default defineComponent({
     }
 
     const checkLastSyncScroll = (isRollX: boolean, isRollY: boolean) => {
-      const { scrollXLoad, scrollYLoad } = reactData
+      const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData
       const { lcsTimeout } = internalData
       if (lcsTimeout) {
         clearTimeout(lcsTimeout)
@@ -3884,13 +3932,19 @@ export default defineComponent({
         internalData.inFooterScroll = false
         internalData.scrollRenderType = ''
 
-        calcCellHeight()
+        if (!isAllOverflow) {
+          calcCellHeight()
+          updateRowOffsetTop()
+        }
         if (isRollX && scrollXLoad) {
           $xeTable.updateScrollXData()
         }
         if (isRollY && scrollYLoad) {
           $xeTable.updateScrollYData().then(() => {
-            calcCellHeight()
+            if (!isAllOverflow) {
+              calcCellHeight()
+              updateRowOffsetTop()
+            }
             $xeTable.updateScrollYSpace()
           })
         }
@@ -4921,6 +4975,7 @@ export default defineComponent({
             }
             XEUtils.eachTree([targetColumn], (column) => {
               column.fixed = fixed
+              column.renderFixed = fixed
             })
             tablePrivateMethods.saveCustomStore('update:fixed')
             if (!status) {
@@ -4945,6 +5000,7 @@ export default defineComponent({
           if (targetColumn && targetColumn.fixed) {
             XEUtils.eachTree([targetColumn], (column) => {
               column.fixed = null
+              column.renderFixed = null
             })
             tablePrivateMethods.saveCustomStore('update:fixed')
             if (!status) {
@@ -5723,49 +5779,11 @@ export default defineComponent({
         return nextTick()
       },
       setSort (sortConfs, isUpdate) {
-        const sortOpts = computeSortOpts.value
-        const { multiple, remote, orders } = sortOpts
-        if (!XEUtils.isArray(sortConfs)) {
-          sortConfs = [sortConfs]
-        }
-        if (sortConfs && sortConfs.length) {
-          if (!multiple) {
-            sortConfs = [sortConfs[0]]
-            clearAllSort()
-          }
-          let firstColumn: any = null
-          sortConfs.forEach((confs: any, index: number) => {
-            let { field, order } = confs
-            let column = field
-            if (XEUtils.isString(field)) {
-              column = tableMethods.getColumnByField(field)
-            }
-            if (!firstColumn) {
-              firstColumn = column
-            }
-            if (column && column.sortable) {
-              if (orders && orders.indexOf(order) === -1) {
-                order = getNextSortOrder(column)
-              }
-              if (column.order !== order) {
-                column.order = order
-              }
-              column.sortTime = Date.now() + index
-            }
-          })
-          if (isUpdate) {
-            if (!remote) {
-              $xeTable.handleTableData(true)
-            }
-            $xeTable.handleColumnSortEvent(new Event('click'), firstColumn)
-          }
-          return nextTick().then(() => {
-            updateRowOffsetTop()
-            tableMethods.updateCellAreas()
-            return updateStyle()
-          })
-        }
-        return nextTick()
+        // 已废弃，即将去掉事件触发 new Event('click') -> null
+        return handleSortEvent(new Event('click'), sortConfs, isUpdate)
+      },
+      setSortByEvent (evnt, sortConfs, isUpdate) {
+        return handleSortEvent(evnt, sortConfs, isUpdate)
       },
       /**
        * 清空指定列的排序条件
@@ -5847,6 +5865,16 @@ export default defineComponent({
         }
         return sortList
       },
+      setFilterByEvent (evnt, fieldOrColumn, options, isUpdate) {
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn)
+        if (column && column.filters) {
+          column.filters = toFilters(options || [])
+          if (isUpdate) {
+            return $xeTable.handleColumnConfirmFilter(column, evnt)
+          }
+        }
+        return nextTick()
+      },
       /**
        * 关闭筛选
        * @param {Event} evnt 事件
@@ -8558,10 +8586,14 @@ export default defineComponent({
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
           const ctEl = tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper')
           let ovEl = null
+          let tipEl = tdEl.querySelector<HTMLElement>(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label')
           if (column.treeNode) {
             ovEl = tdEl.querySelector<HTMLElement>('.vxe-tree-cell')
           }
-          handleTooltip(evnt, tdEl, ovEl || ctEl, tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper'), params)
+          if (!tipEl) {
+            tipEl = ctEl
+          }
+          handleTooltip(evnt, tdEl, ovEl || ctEl, tipEl, params)
         }
       },
       /**
@@ -8573,7 +8605,16 @@ export default defineComponent({
         const tdEl = evnt.currentTarget as HTMLTableCellElement
         handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row)
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, tdEl, tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper'), tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper') as HTMLElement, params)
+          const ctEl = tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper')
+          let ovEl = null
+          let tipEl = tdEl.querySelector<HTMLElement>(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label')
+          if (column.type === 'html') {
+            ovEl = tdEl.querySelector<HTMLElement>('.vxe-cell--html')
+          }
+          if (!tipEl) {
+            tipEl = ctEl
+          }
+          handleTooltip(evnt, tdEl, ovEl || ctEl, tipEl, params)
         }
       },
       handleTargetLeaveEvent () {

package/styles/components/table.scss

@@ -1050,6 +1050,20 @@ $btnThemeList: (
       }
     }
   }
+  .vxe-header--column {
+    &.col--ellipsis {
+      &.col--center {
+        .vxe-cell--wrapper {
+          justify-content: center;
+        }
+      }
+      &.col--right {
+        .vxe-cell--wrapper {
+          justify-content: right;
+        }
+      }
+    }
+  }
   .vxe-header--column,
   .vxe-footer--column {
     &.col--ellipsis {