vxe-table 3.17.10 → 3.18.0-beta.1

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

@@ -212,10 +212,13 @@ function getBodyLabelData ($xeTable: VxeTableConstructor, opts: VxeTablePropType
 }
 
 function getExportData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions) {
+  const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
+
   const { columns, dataFilterMethod } = opts
   let datas = opts.data
   if (dataFilterMethod) {
-    datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, row, $rowIndex: index }))
+    datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, row, $rowIndex: index }))
   }
   return getBodyLabelData($xeTable, opts, columns, datas)
 }
@@ -255,8 +258,11 @@ function getFooterCellValue ($xeTable: any, opts: VxeTablePropTypes.ExportHandle
 }
 
 function getFooterData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, footerTableData: any[]) {
+  const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
+
   const { footerFilterMethod } = opts
-  return footerFilterMethod ? footerTableData.filter((items: any, index: any) => footerFilterMethod({ $table: $xeTable, items, $rowIndex: index })) : footerTableData
+  return footerFilterMethod ? footerTableData.filter((items: any, index: any) => footerFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, items, $rowIndex: index })) : footerTableData
 }
 
 function getCsvCellTypeLabel (column: any, cellValue: any) {
@@ -599,11 +605,12 @@ function clearColumnConvert (columns: any) {
 
 function handleExport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions) {
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
 
   const { remote, columns, colgroups, exportMethod, afterExportMethod } = opts
   return new Promise(resolve => {
     if (remote) {
-      const params = { options: opts, $table: $xeTable, $grid: $xeGrid }
+      const params = { options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }
       resolve(exportMethod ? exportMethod(params) : params)
     } else {
       const datas = getExportData($xeTable, opts)
@@ -617,7 +624,7 @@ function handleExport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, o
     clearColumnConvert(columns)
     if (!opts.print) {
       if (afterExportMethod) {
-        afterExportMethod({ status: true, options: opts, $table: $xeTable, $grid: $xeGrid })
+        afterExportMethod({ status: true, options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
       }
     }
     return Object.assign({ status: true }, params)
@@ -625,7 +632,7 @@ function handleExport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, o
     clearColumnConvert(columns)
     if (!opts.print) {
       if (afterExportMethod) {
-        afterExportMethod({ status: false, options: opts, $table: $xeTable, $grid: $xeGrid })
+        afterExportMethod({ status: false, options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
       }
     }
     const params = { status: false }
@@ -995,6 +1002,8 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
+  const $xeGGWrapper = $xeGrid || $xeGantt
 
   const { treeConfig, showHeader, showFooter } = props
   const { initStore, isGroup, footerTableData, exportStore, exportParams } = reactData
@@ -1003,7 +1012,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const hasTree = treeConfig
   const customOpts = $xeTable.computeCustomOpts
   const selectRecords = $xeTable.getCheckboxRecords()
-  const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {}
+  const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {}
   const hasFooter = !!footerTableData.length
   const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
   const defOpts = Object.assign({
@@ -1078,7 +1087,8 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
       exportParams.filename = filename({
         options: defOpts,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       })
     } else {
       exportParams.filename = `${filename}`
@@ -1089,7 +1099,8 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
       exportParams.sheetName = sheetName({
         options: defOpts,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       })
     } else {
       exportParams.sheetName = `${sheetName}`
@@ -1178,13 +1189,14 @@ export default {
       const internalData = $xeTable as unknown as TableInternalData
       const $xeGrid = $xeTable.$xeGrid
       const $xeGantt = $xeTable.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { treeConfig, showHeader, showFooter } = props
       const { isGroup } = reactData
       const { tableFullColumn, afterFullData, afterTreeFullData, collectColumn, mergeBodyList, mergeFooterList } = internalData
       const exportOpts = $xeTable.computeExportOpts
       const treeOpts = $xeTable.computeTreeOpts
-      const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {}
+      const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {}
       const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
       const opts = Object.assign({
         message: true,
@@ -1285,7 +1297,7 @@ export default {
             children: 'childNodes',
             mapChildren: '_children'
           }),
-          (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column: column as any, $columnIndex: index })),
+          (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: column as any, $columnIndex: index })),
           {
             children: '_children',
             mapChildren: 'childNodes',
@@ -1293,7 +1305,7 @@ export default {
           }
         )
       } else {
-        groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true })
+        groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true })
       }
       // 获取所有列
       const cols: VxeTableDefines.ColumnInfo[] = []
@@ -1311,7 +1323,8 @@ export default {
           handleOptions.filename = filename({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           })
         } else {
           handleOptions.filename = `${filename}`
@@ -1326,7 +1339,8 @@ export default {
           handleOptions.sheetName = sheetName({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           })
         } else {
           handleOptions.sheetName = `${sheetName}`
@@ -1348,7 +1362,7 @@ export default {
 
       if (!handleOptions.print) {
         if (beforeExportMethod) {
-          beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid })
+          beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
         }
       }
 
@@ -1361,13 +1375,13 @@ export default {
             handleOptions.data = selectRecords
           }
         } else if (mode === 'all') {
-          if (!$xeGrid) {
+          if (!$xeGGWrapper) {
             errLog('vxe.error.errProp', ['all', 'mode=current,selected'])
           }
 
-          if ($xeGrid && !handleOptions.remote) {
-            const gridReactData = $xeGrid as unknown as GridReactData
-            const proxyOpts = $xeGrid.computeProxyOpts
+          if ($xeGGWrapper && !handleOptions.remote) {
+            const gridReactData = $xeGGWrapper as unknown as GridReactData
+            const proxyOpts = $xeGGWrapper.computeProxyOpts
             const { sortData } = gridReactData
             const { beforeQueryAll, afterQueryAll, ajax = {} } = proxyOpts
             const resConfigs = proxyOpts.response || proxyOpts.props || {}
@@ -1467,11 +1481,13 @@ export default {
     _print (options?: VxeTablePropTypes.PrintConfig) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const $xeGrid = $xeTable.$xeGrid
+      const $xeGantt = $xeTable.$xeGantt
 
+      const printOpts = $xeTable.computePrintOpts
       const opts = Object.assign({
         original: false
         // beforePrintMethod
-      }, this.printOpts, options, {
+      }, printOpts, options, {
         type: 'html',
         download: false,
         remote: false,
@@ -1485,7 +1501,8 @@ export default {
           printTitle = sheetName({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           })
         } else {
           printTitle = `${sheetName}`
@@ -1511,7 +1528,9 @@ export default {
                         html,
                         content: html,
                         options: opts,
-                        $table: $xeTable
+                        $table: $xeTable,
+                        $grid: $xeGrid,
+                        $gantt: $xeGantt
                       })
                     }
                   : undefined
@@ -1530,7 +1549,9 @@ export default {
                           html,
                           content: html,
                           options: opts,
-                          $table: $xeTable
+                          $table: $xeTable,
+                          $grid: $xeGrid,
+                          $gantt: $xeGantt
                         })
                       }
                     : undefined

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

@@ -4,7 +4,7 @@ import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
 import { warnLog } from '../../../ui/src/log'
 
-import type { VxeTableConstructor, VxeTablePrivateMethods, VxeGridConstructor, GridPrivateMethods, TableInternalData } from '../../../../types'
+import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData } from '../../../../types'
 
 const { menus, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
 
@@ -60,7 +60,8 @@ export default {
      */
     handleGlobalContextmenuEvent (evnt: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-      const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+      const $xeGrid = $xeTable.$xeGrid
+      const $xeGantt = $xeTable.$xeGantt
       const internalData = $xeTable as unknown as TableInternalData
 
       const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this
@@ -74,7 +75,7 @@ export default {
         }
         if (internalData._keyCtx) {
           const type = 'body'
-          const params: any = { type, $grid: $xeGrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt }
+          const params: any = { type, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt }
           // 如果开启单元格区域
           if (mouseConfig && mouseOpts.area) {
             const activeArea = this.getActiveCellArea()
@@ -101,7 +102,7 @@ export default {
             // target=td|th，直接向上找 table 去匹配即可
             return target.parentNode.parentNode.parentNode.getAttribute('xid') === tId
           })
-          const params: any = { type: layout, $grid: $xeGrid, $table: this, columns: this.visibleColumn.slice(0), $event: evnt }
+          const params: any = { type: layout, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, columns: this.visibleColumn.slice(0), $event: evnt }
           if (columnTargetNode.flag) {
             const cell = columnTargetNode.targetElem
             const column = this.getColumnNode(cell).item
@@ -257,12 +258,13 @@ export default {
      */
     ctxMenuLinkEvent (evnt: any, menu: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-      const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+      const $xeGrid = $xeTable.$xeGrid
+      const $xeGantt = $xeTable.$xeGantt
 
       // 如果一级菜单有配置 code 则允许点击，否则不能点击
       if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = menus.get(menu.code)
-        const params = Object.assign({ menu, $grid: $xeGrid, $table: this, $event: evnt }, this.ctxMenuStore.args)
+        const params = Object.assign({ menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt }, this.ctxMenuStore.args)
         if (gMenuOpts && gMenuOpts.menuMethod) {
           gMenuOpts.menuMethod(params, evnt)
         }

package/packages/table/src/body.ts

@@ -86,6 +86,7 @@ function renderTdColumn (
   const tableReactData = $xeTable as unknown as TableReactData
   const tableInternalData = $xeTable as unknown as TableInternalData
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
 
   const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
   const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData
@@ -145,6 +146,7 @@ function renderTdColumn (
   } = {
     $table: $xeTable,
     $grid: $xeGrid,
+    $gantt: $xeGantt,
     isEdit: false,
     seq,
     rowid,
@@ -462,6 +464,7 @@ function renderRows (h: CreateElement, _vm: any, fixedType: 'left' | 'right' | '
   const tableReactData = $xeTable as unknown as TableReactData
   const tableInternalData = $xeTable as unknown as TableInternalData
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
 
   const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps
   const { hasFixedColumn, treeExpandedFlag, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData
@@ -610,6 +613,7 @@ function renderRows (h: CreateElement, _vm: any, fixedType: 'left' | 'right' | '
         const expandParams: VxeTableDefines.CellRenderDataParams = {
           $grid: $xeGrid,
           $table: $xeTable,
+          $gantt: $xeGantt,
           seq,
           column: expandColumn as VxeTableDefines.ColumnInfo,
           columnIndex,
@@ -719,6 +723,7 @@ export default {
     const tableReactData = $xeTable as unknown as TableReactData
     const tableInternalData = $xeTable as unknown as TableInternalData
     const $xeGrid = $xeTable.$xeGrid
+    const $xeGantt = $xeTable.$xeGantt
     const slots = $xeTable.$scopedSlots
 
     const { xID } = $xeTable
@@ -803,7 +808,7 @@ export default {
 
     let emptyContent
     const emptySlot = slots ? slots.empty : null
-    const emptyParams = { $table: $xeTable, $grid: $xeGrid }
+    const emptyParams = { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }
     if (emptySlot) {
       emptyContent = emptySlot.call($xeTable, emptyParams)
     } else {

package/packages/table/src/column.ts

@@ -160,7 +160,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
   provide () {
     return {
       $xeColumn: this,
-      $xeGrid: null
+      $xeGrid: null,
+      $xeGantt: null
     }
   },
   inject: {

package/packages/table/src/columnInfo.ts

@@ -4,7 +4,7 @@ import { toFilters } from './util'
 import { getFuncText } from '../../ui/src/utils'
 import { warnLog, errLog } from '../../ui/src/log'
 
-import type { VxeTableConstructor, VxeTablePrivateMethods, VxeGridConstructor, GridPrivateMethods } from '../../../types'
+import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
 const { getI18n, formats } = VxeUI
 
@@ -12,7 +12,9 @@ export class ColumnInfo {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   constructor ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, _vm: any, { renderHeader, renderCell, renderFooter, renderData }: any = {}) {
     const tableProps = $xeTable
-    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+    const $xeGrid = $xeTable.$xeGrid
+    const $xeGantt = $xeTable.$xeGantt
+    const $xeGGWrapper = $xeGrid || $xeGantt
 
     const { field, editRender } = _vm
 
@@ -174,8 +176,10 @@ export class ColumnInfo {
       // 单元格插槽，只对 grid 有效
       slots: _vm.slots
     })
-    if (proxyOpts && proxyOpts.beforeColumn) {
-      proxyOpts.beforeColumn({ $grid: $xeGrid, column: this })
+    if ($xeGGWrapper) {
+      if (proxyOpts && proxyOpts.beforeColumn) {
+        proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this })
+      }
     }
   }
 

package/packages/table/src/footer.ts

@@ -18,6 +18,7 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
   const tableReactData = $xeTable as unknown as TableReactData
   const tableInternalData = $xeTable as unknown as TableInternalData
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
 
   const { fixedType } = props
   const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps
@@ -59,6 +60,7 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
     } = {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       row,
       rowIndex: _rowIndex,
       _rowIndex,

package/packages/table/src/group.ts

@@ -11,7 +11,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
   provide () {
     return {
       $xeColumn: this,
-      $xeGrid: null
+      $xeGrid: null,
+      $xeGantt: null
     }
   },
   inject: {

package/packages/table/src/header.ts

@@ -14,6 +14,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
   const props = _vm
   const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
   const tableProps = $xeTable
   const tableReactData = $xeTable as unknown as TableReactData
   const tableInternalData = $xeTable as unknown as TableInternalData
@@ -54,9 +55,12 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     }
     const columnIndex = colRest.index
     const _columnIndex = colRest._index
-    const cellParams = {
+    const cellParams: VxeTableDefines.CellRenderHeaderParams & {
+      $table: VxeTableConstructor & VxeTablePrivateMethods
+    } = {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       $rowIndex,
       column,
       columnIndex,