vxe-table 3.12.10-beta.2 → 3.12.10-beta.21

package/packages/table/src/header.ts

@@ -2,12 +2,11 @@ import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
-import { getOffsetPos, hasClass, addClass, removeClass } from '../../ui/src/dom'
-import { convertHeaderColumnToRows, getColReMinWidth } from './util'
+import { convertHeaderColumnToRows } from './util'
 
 import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, TableReactData, TableInternalData, VxeComponentStyleType } from '../../../types'
 
-const { getI18n, renderer, renderEmptyElement } = VxeUI
+const { renderer, renderEmptyElement } = VxeUI
 
 const cellType = 'header'
 
@@ -25,6 +24,10 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
   const { scrollXStore } = tableInternalData
   const columnOpts = $xeTable.computeColumnOpts
   const columnDragOpts = $xeTable.computeColumnDragOpts
+  const cellOpts = $xeTable.computeCellOpts
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight
+  const headerCellOpts = $xeTable.computeHeaderCellOpts
+  const currCellHeight = headerCellOpts.height || cellOpts.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
@@ -34,6 +37,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     const compConf = renderOpts ? renderer.get(renderOpts.name) : null
     const isColGroup = column.children && column.children.length
     const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX
+    const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding
     const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
     const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign
     let showEllipsis = headOverflow === 'ellipsis'
@@ -48,15 +52,15 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     }
     const columnIndex = $xeTable.getColumnIndex(column)
     const _columnIndex = $xeTable.getVTColumnIndex(column)
-    const params = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: cellType, isHidden: fixedHiddenColumn, hasFilter }
+    const cellParams = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: cellType, isHidden: fixedHiddenColumn, hasFilter }
     const thAttrs: Record<string, string | number | null> = {
       colid,
       colspan: column.colSpan > 1 ? column.colSpan : null,
       rowspan: column.rowSpan > 1 ? column.rowSpan : null
     }
     const thOns: any = {
-      click: (evnt: MouseEvent) => $xeTable.triggerHeaderCellClickEvent(evnt, params),
-      dblclick: (evnt: MouseEvent) => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+      click: (evnt: MouseEvent) => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
+      dblclick: (evnt: MouseEvent) => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
     }
     // 虚拟滚动不支持动态高度
     if (scrollXLoad && !hasEllipsis) {
@@ -65,11 +69,11 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell'
     let isDisabledDrag = false
     if (isColDragCell) {
-      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params))
+      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams))
     }
     // 按下事件处理
     if (mouseConfig || isColDragCell) {
-      thOns.mousedown = (evnt: any) => $xeTable.triggerHeaderCellMousedownEvent(evnt, params)
+      thOns.mousedown = (evnt: any) => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams)
     }
     // 拖拽列事件
     if (columnOpts.drag) {
@@ -80,32 +84,42 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
         thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent
       }
     }
+    const isLastColumn = $columnIndex === cols.length - 1
+    const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
 
-    let isPreLoadStatus = false
-    if (scrollXLoad && !isGroup && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
-      isPreLoadStatus = true
+    let isVNPreEmptyStatus = false
+    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      isVNPreEmptyStatus = true
+    }
+
+    const tcStyle: Record<string, string> = {}
+    if (hasEllipsis) {
+      tcStyle.height = `${currCellHeight}px`
+    } else {
+      tcStyle.minHeight = `${currCellHeight}px`
     }
 
     return h('th', {
       class: ['vxe-header--column', colid, {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
-        'col--last': $columnIndex === cols.length - 1,
+        'col--last': isLastColumn,
         'col--fixed': column.fixed,
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
+        'is--padding': isPadding,
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
         'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
         'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
-      }, getClass(headerClassName, params), getClass(headerCellClassName, params)],
+      }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
       attrs: thAttrs,
-      style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) as VxeComponentStyleType : undefined,
+      style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle) as VxeComponentStyleType : undefined,
       on: thOns,
       key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
     }, [
@@ -114,22 +128,32 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
           'c--title': showTitle,
           'c--tooltip': showTooltip,
           'c--ellipsis': showEllipsis
-        }]
-      }, isPreLoadStatus || (isOptimizeMode && fixedHiddenColumn) ? [] : column.renderHeader(h, params)),
+        }],
+        style: tcStyle
+      }, isVNPreEmptyStatus || (isOptimizeMode && fixedHiddenColumn)
+        ? []
+        : [
+            h('div', {
+              attrs: {
+                colid
+              },
+              class: 'vxe-cell--wrapper'
+            }, column.renderHeader(h, cellParams))
+          ]),
       /**
      * 列宽拖动
      */
-      !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
+      !fixedHiddenColumn && showResizable
         ? h('div', {
-          class: ['vxe-resizable', {
+          class: ['vxe-cell--col-resizable', {
             'is--line': !border || border === 'none'
           }],
           on: {
-            mousedown: (evnt: MouseEvent) => _vm.resizeMousedownEvent(evnt, params),
-            dblclick: (evnt: MouseEvent) => $xeTable.handleResizeDblclickEvent(evnt, params)
+            mousedown: (evnt: MouseEvent) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+            dblclick: (evnt: MouseEvent) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
           }
         })
-        : null
+        : renderEmptyElement($xeTable)
     ])
   })
 }
@@ -368,126 +392,6 @@ export default {
     uploadColumn () {
       const { $parent: $xetable } = this
       this.headerColumn = $xetable.isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : []
-    },
-    resizeMousedownEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderHeaderParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
-      const $xeTable = this.$parent
-      const tableInternalData = $xeTable
-
-      const { column } = params
-      const { $parent: $xetable, fixedType } = this
-      const { visibleColumn } = tableInternalData
-      const { refTableBody, refLeftContainer, refRightContainer } = $xetable.$refs
-      const tableEl = $xeTable.$el as HTMLDivElement
-      const resizeBarElem = $xetable.$refs.refCellResizeBar as HTMLDivElement
-      const resizeTipElem = $xetable.$refs.refCellResizeTip as HTMLDivElement
-      const wrapperElem = this.$el as HTMLDivElement
-      const { clientX: dragClientX } = evnt
-      const dragBtnElem = evnt.target as HTMLDivElement
-      const cell = dragBtnElem.parentNode as HTMLTableCellElement
-      const cellParams = Object.assign(params, { cell })
-      const resizableOpts = $xeTable.computeResizableOpts
-      let dragLeft = 0
-      const tableBodyElem = refTableBody.$el
-      const pos = getOffsetPos(dragBtnElem, tableEl)
-      const dragBtnWidth = dragBtnElem.clientWidth
-      const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2)
-      const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth // 列之间的最小间距
-      let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval
-      let dragPosLeft = pos.left + dragBtnOffsetWidth
-      const domMousemove = document.onmousemove
-      const domMouseup = document.onmouseup
-      const isLeftFixed = fixedType === 'left'
-      const isRightFixed = fixedType === 'right'
-
-      // 计算左右侧固定列偏移量
-      let fixedOffsetWidth = 0
-      if (isLeftFixed || isRightFixed) {
-        const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling'
-        let tempCellElem = cell[siblingProp] as HTMLTableCellElement
-        while (tempCellElem) {
-          if (hasClass(tempCellElem, 'fixed--hidden')) {
-            break
-          } else if (!hasClass(tempCellElem, 'col--group')) {
-            fixedOffsetWidth += tempCellElem.offsetWidth
-          }
-          tempCellElem = tempCellElem[siblingProp] as HTMLTableCellElement
-        }
-        if (isRightFixed && refRightContainer) {
-          dragPosLeft = refRightContainer.offsetLeft + fixedOffsetWidth
-        }
-      }
-
-      // 处理拖动事件
-      const updateEvent = function (evnt: any) {
-        evnt.stopPropagation()
-        evnt.preventDefault()
-        const offsetX = evnt.clientX - dragClientX
-        let left = dragPosLeft + offsetX
-        const scrollLeft = fixedType ? 0 : tableBodyElem.scrollLeft
-        if (isLeftFixed) {
-          // 左固定列（不允许超过右侧固定列、不允许超过右边距）
-          left = Math.min(left, (refRightContainer ? refRightContainer.offsetLeft : tableBodyElem.clientWidth) - fixedOffsetWidth - minInterval)
-        } else if (isRightFixed) {
-          // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
-          dragMinLeft = (refLeftContainer ? refLeftContainer.clientWidth : 0) + fixedOffsetWidth + minInterval
-          left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval)
-        } else {
-          dragMinLeft = Math.max(tableBodyElem.scrollLeft, dragMinLeft)
-          // left = Math.min(left, tableBodyElem.clientWidth + tableBodyElem.scrollLeft - 40)
-        }
-        dragLeft = Math.max(left, dragMinLeft)
-        const resizeBarLeft = dragLeft - scrollLeft
-        resizeBarElem.style.left = `${resizeBarLeft}px`
-        if (resizableOpts.showDragTip && resizeTipElem) {
-          const tableWidth = tableEl.clientWidth
-          const wrapperRect = wrapperElem.getBoundingClientRect()
-          const resizeBarWidth = resizeBarElem.clientWidth
-          const resizeTipWidth = resizeTipElem.clientWidth
-          const resizeTipHeight = resizeTipElem.clientHeight
-          let resizeTipLeft = -resizeTipWidth
-          if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
-            resizeTipLeft = resizeTipWidth + resizeBarWidth - resizeBarLeft
-          } else if (resizeBarLeft > tableWidth) {
-            resizeTipLeft += tableWidth - resizeBarLeft
-          }
-          resizeTipElem.style.left = `${resizeTipLeft}px`
-          resizeTipElem.style.top = `${Math.min(tableEl.clientHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`
-          resizeTipElem.textContent = getI18n('vxe.table.resizeColTip', [column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)])
-        }
-      }
-
-      $xetable._isResize = true
-      addClass($xetable.$el, 'drag--resize')
-      resizeBarElem.style.display = 'block'
-      document.onmousemove = updateEvent
-      document.onmouseup = function (evnt) {
-        document.onmousemove = domMousemove
-        document.onmouseup = domMouseup
-        const resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)
-        column.resizeWidth = resizeWidth
-        if (resizableOpts.dragMode === 'fixed') {
-          visibleColumn.forEach((item: any) => {
-            if (item.id !== column.id) {
-              if (!item.resizeWidth) {
-                item.resizeWidth = item.renderWidth
-              }
-            }
-          })
-        }
-        resizeBarElem.style.display = 'none'
-        $xetable._isResize = false
-        $xetable._lastResizeTime = Date.now()
-        $xetable.analyColumnWidth()
-        $xetable.recalculate(true).then(() => {
-          $xetable.saveCustomStore('update:visible')
-          $xetable.updateCellAreas()
-          $xetable.emitEvent('resizable-change', { ...params, resizeWidth }, evnt)
-          setTimeout(() => $xetable.recalculate(true), 300)
-        })
-        removeClass($xetable.$el, 'drag--resize')
-      }
-      updateEvent(evnt)
-      $xetable.closeMenu()
     }
   } as any
 } as any