vxe-table 3.24.4 → 3.25.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.24.4",
+  "version": "3.25.0-beta.0",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -65,7 +65,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.19.4"
+    "vxe-pc-ui": "3.20.0"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/grid/src/grid.ts

@@ -2,7 +2,7 @@ import { CreateElement, VNode, PropType } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
-import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit } from '../../ui/src/dom'
+import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit, hasClass } from '../../ui/src/dom'
 import { VxeUI } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
@@ -483,13 +483,27 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return 0
     },
+    getParentElem () {
+      const $xeGrid = this
+
+      const el = $xeGrid.$refs.refElem as HTMLDivElement
+      if (!el) {
+        return null
+      }
+      let parentEl = el.parentElement
+      // 如果是虚拟滚动条
+      if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
+        parentEl = parentEl.parentElement
+      }
+      return parentEl
+    },
     getParentHeight () {
       const $xeGrid = this
       const reactData = $xeGrid.reactData
 
       const el = $xeGrid.$refs.refElem as HTMLDivElement
       if (el) {
-        const parentEl = el.parentElement as HTMLElement
+        const parentEl = $xeGrid.getParentElem()
         return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - $xeGrid.getExcludeHeight()
       }
       return 0

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

@@ -1,7 +1,7 @@
 import { CreateElement, VNode, PropType } from 'vue'
 import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
-import { formatText } from '../../../ui/src/utils'
+import { formatText, hasEnableConf } from '../../../ui/src/utils'
 import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
 import { createComponentLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
@@ -443,6 +443,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { customColumnList } = tableReactData
       const { collectColumn } = tableInternalData
       const customOpts = $xeTable.computeCustomOpts
+      const mouseOpts = $xeTable.computeMouseOpts
       const { immediate } = customOpts
       const trEl = evnt.currentTarget as HTMLElement
       const columnDragOpts = $xeTable.computeColumnDragOpts
@@ -595,7 +596,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn)
             }
 
-            if (mouseConfig) {
+            if (hasEnableConf(mouseConfig, mouseOpts)) {
               if ($xeTable.clearSelected) {
                 $xeTable.clearSelected()
               }

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

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
-import { isEnableConf } from '../../../ui/src/utils'
+import { hasEnableConf, isEnableConf } from '../../../ui/src/utils'
 import { getCellValue, setCellValue, getRowid } from '../../src/util'
 import { removeClass, addClass } from '../../../ui/src/dom'
 import { createComponentLog } from '../../../ui/src/log'
@@ -411,6 +411,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   const { editConfig, mouseConfig } = props
   const { editStore, tableColumn } = reactData
   const editOpts = $xeTable.computeEditOpts
+  const mouseOpts = $xeTable.computeMouseOpts
   const { mode } = editOpts
   const { actived, focused } = editStore
   const { row, column } = params
@@ -426,7 +427,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
         // 判断是否禁用编辑
         let type: 'edit-disabled' | 'edit-activated' = 'edit-disabled'
         if (!beforeEditMethod || beforeEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })) {
-          if (mouseConfig) {
+          if (hasEnableConf(mouseConfig, mouseOpts)) {
             $xeTable.clearSelected()
             if ($xeTable.clearCellAreas) {
               $xeTable.clearCellAreas()
@@ -483,7 +484,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
         }
       } else {
         const { column: oldColumn } = actived
-        if (mouseConfig) {
+        if (hasEnableConf(mouseConfig, mouseOpts)) {
           $xeTable.clearSelected()
           if ($xeTable.clearCellAreas) {
             $xeTable.clearCellAreas()
@@ -1145,7 +1146,7 @@ export default {
       const editOpts = $xeTable.computeEditOpts
       const { actived, selected } = editStore
       const { row, column } = params
-      const isMouseSelected = mouseConfig && mouseOpts.selected
+      const isMouseSelected = hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected
       const selectMethod = () => {
         if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
           if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {

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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util'
-import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
+import { parseFile, formatText, eqEmptyValue, hasEnableConf } from '../../../ui/src/utils'
 import { hasClass, toCssUnit } from '../../../ui/src/dom'
 import { createHtmlPage, getExportBlobByContent } from './util'
 import { createComponentLog } from '../../../ui/src/log'
@@ -2029,7 +2029,7 @@ export default {
         }
         return
       }
-      if (!importConfig) {
+      if (!hasEnableConf(importConfig, importOpts)) {
         errLog('vxe.error.reqProp', ['import-config'])
       }
       // 处理类型
@@ -2070,12 +2070,13 @@ export default {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
 
+      const { exportConfig } = props
       const exportOpts = $xeTable.computeExportOpts
       const defOpts = Object.assign({
         message: true,
         types: XEUtils.keys(exportOpts._typeMaps)
       }, exportOpts, options)
-      if (!props.exportConfig) {
+      if (!hasEnableConf(exportConfig, exportOpts)) {
         errLog('vxe.error.reqProp', ['export-config'])
       }
       return handleExportAndPrint($xeTable, defOpts)
@@ -2085,11 +2086,12 @@ export default {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
 
+      const { printConfig } = props
       const printOpts = $xeTable.computePrintOpts
       const defOpts = Object.assign({
         message: true
       }, printOpts, options)
-      if (!props.printConfig) {
+      if (!hasEnableConf(printConfig, printOpts)) {
         errLog('vxe.error.reqProp', ['print-config'])
       }
       return handleExportAndPrint($xeTable, defOpts, true)

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

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { toFilters, handleFieldOrColumn, getRefElem } from '../../src/util'
 import { toCssUnit, triggerEvent, updatePanelPlacement } from '../../../ui/src/dom'
-import { isEnableConf } from '../../../ui/src/utils'
+import { hasEnableConf, isEnableConf } from '../../../ui/src/utils'
 
 import type { VxeTableConstructor, VxeTableDefines, TableReactData, TableInternalData, VxeColumnPropTypes, VxeTablePrivateMethods } from '../../../../types'
 
@@ -428,7 +428,7 @@ export default {
         $xeTable.handleTableData(true)
         $xeTable.checkSelectionStatus()
       }
-      if (mouseConfig && mouseOpts.area && $xeTable.handleFilterEvent) {
+      if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleFilterEvent) {
         $xeTable.handleFilterEvent(evnt as Event, params)
       }
       if (evnt) {

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

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils'
 import { getRefElem } from '../../src/util'
 import { getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
+import { hasEnableConf } from '../../../ui/src/utils'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, TableReactData, TableInternalData } from '../../../../types'
 
@@ -492,13 +493,13 @@ export default {
       const checkboxOpts = $xeTable.computeCheckboxOpts
       const mouseOpts = $xeTable.computeMouseOpts
       const editOpts = $xeTable.computeEditOpts
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaMnEvent) {
-        return $xeTable.triggerClAreaMnEvent(evnt, params)
+      if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.triggerClAaMnEvent) {
+        return $xeTable.triggerClAaMnEvent(evnt, params)
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           handleCheckboxRangeEvent($xeTable, evnt, params)
         }
-        if (mouseConfig && mouseOpts.selected) {
+        if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
           if (!editConfig || editOpts.mode === 'cell') {
             $xeTable.handleSelected(params, evnt)
           }

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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { getDomNode, getAbsolutePos, getEventTargetNode, toCssUnit } from '../../../ui/src/dom'
-import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
+import { isEnableConf, hasChildrenList, hasEnableConf } from '../../../ui/src/utils'
 import { createComponentLog } from '../../../ui/src/log'
 
 import type { VxeComponentStyleType } from 'vxe-pc-ui'
@@ -93,7 +93,7 @@ export default {
           const type = 'body'
           const params: any = { source: 'table', type, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, keyboard: true, columns: visibleColumn.slice(0), $event: evnt }
           // 如果开启单元格区域
-          if (mouseConfig && mouseOpts.area) {
+          if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area) {
             const activeArea = $xeTable.getActiveCellArea()
             if (activeArea && activeArea.row && activeArea.column) {
               params.row = activeArea.row
@@ -101,7 +101,7 @@ export default {
               $xeTable.handleOpenMenuEvent(evnt, type, params)
               return
             }
-          } else if (mouseConfig && mouseOpts.selected) {
+          } else if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
             // 如果启用键盘导航且已选中单元格
             if (selected.row && selected.column) {
               params.row = selected.row

package/packages/table/render/index.ts

@@ -2,7 +2,7 @@ import { CreateElement, VNode } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getCellValue, setCellValue } from '../src/util'
-import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
+import { getFuncText, formatText, isEmptyValue, hasEnableConf } from '../../ui/src/utils'
 import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 
@@ -919,9 +919,10 @@ function getNativeInputRenderCellVNs (h: CreateElement, cellValue: any, labelVNs
   const { name } = renderOpts
   const tableProps = $table
   const { editConfig, mouseConfig } = tableProps
+  const mouseOpts = $table.computeMouseOpts
   let isColSelected = false
   let isActiveCellArea = false
-  if (editConfig && mouseConfig) {
+  if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
     const tableReactData = $table as unknown as TableReactData
     const { editStore } = tableReactData
     const { selected } = editStore
@@ -954,9 +955,10 @@ function getInputRenderCellVNs (h: CreateElement, cellValue: any, labelVNs: VNod
   const { $table, row, column } = renderParams
   const tableProps = $table
   const { editConfig, mouseConfig } = tableProps
+  const mouseOpts = $table.computeMouseOpts
   let isColSelected = false
   let isActiveCellArea = false
-  if (editConfig && mouseConfig) {
+  if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
     const tableReactData = $table as unknown as TableReactData
     const { editStore } = tableReactData
     const editOpts = $table.computeEditOpts

package/packages/table/src/body.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { defineVxeComponent } from '../../ui/src/comp'
-import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils'
+import { isEnableConf, getClass, getDefaultConfig, hasEnableConf } from '../../ui/src/utils'
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util'
 import { updateCellTitle } from '../../ui/src/dom'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -227,7 +227,7 @@ function renderTdColumn (
     }
   }
   // 按下事件处理
-  if (isRowDragCell || checkboxOpts.range || mouseConfig) {
+  if (isRowDragCell || checkboxOpts.range || hasEnableConf(mouseConfig, mouseOpts)) {
     tdOns.mousedown = (evnt: MouseEvent) => {
       $xeTable.triggerCellMousedownEvent(evnt, cellParams)
     }
@@ -422,7 +422,7 @@ function renderTdColumn (
   }
 
   let showAreaRowStatus = false
-  if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+  if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && !_columnIndex && selectCellToRow) {
     showAreaRowStatus = true
   }
 
@@ -936,7 +936,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         h('div', {
           class: 'vxe-table--checkbox-range'
         }),
-        mouseConfig && mouseOpts.area
+        hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
           ? h('div', {
             class: 'vxe-table--cell-area',
             attrs: {

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 { defineVxeComponent } from '../../ui/src/comp'
-import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils'
+import { isEnableConf, getClass, getDefaultConfig, hasEnableConf } from '../../ui/src/utils'
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 
@@ -34,6 +34,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
   const rendererOpts = $xeTable.computeRendererOpts
+  const mouseOpts = $xeTable.computeMouseOpts
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
   const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
   const isLastRow = _rowIndex === headerGroups.length - 1
@@ -125,7 +126,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
       isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams))
     }
     // 按下事件处理
-    if (mouseConfig || isColDragCell) {
+    if (hasEnableConf(mouseConfig, mouseOpts) || isColDragCell) {
       thOns.mousedown = (evnt: any) => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams)
     }
     // 拖拽列事件
@@ -567,7 +568,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             ref: 'refHeaderTHead'
           }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
         ]),
-        mouseConfig && mouseOpts.area
+        hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
           ? h('div', {
             class: 'vxe-table--cell-area',
             attrs: {