vxe-table 4.15.8 → 4.16.0-beta.1

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

@@ -1,4 +1,4 @@
-import { inject, nextTick } from 'vue'
+import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util'
@@ -7,7 +7,7 @@ import { hasClass } from '../../../ui/src/dom'
 import { createHtmlPage, getExportBlobByContent } from './util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
-import type { VxeGridConstructor, VxeTablePropTypes, VxeColumnPropTypes, TableExportMethods, VxeGridPropTypes, VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
+import type { VxeTablePropTypes, VxeColumnPropTypes, TableExportMethods, VxeGridPropTypes, VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
 
 const { getI18n, hooks, renderer } = VxeUI
 
@@ -93,8 +93,11 @@ function getBooleanValue (cellValue: any) {
 }
 
 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, index) => footerFilterMethod({ $table: $xeTable, items, $rowIndex: index })) : footerTableData
+  return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, items, $rowIndex: index })) : footerTableData
 }
 
 function getCsvCellTypeLabel (column: any, cellValue: any) {
@@ -301,9 +304,6 @@ hooks.add('tableExportModule', {
     const { props, reactData, internalData } = $xeTable
     const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts } = $xeTable.getComputeMaps()
 
-    const $xeGrid = inject<VxeGridConstructor | null>('$xeGrid', null)
-    const $xeGantt = inject('$xeGantt', null)
-
     const hasTreeChildren = (row: any) => {
       const treeOpts = computeTreeOpts.value
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -491,10 +491,13 @@ hooks.add('tableExportModule', {
     }
 
     const getExportData = (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(opts, columns, datas)
     }
@@ -810,10 +813,13 @@ hooks.add('tableExportModule', {
     }
 
     const handleExport = (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(opts)
@@ -827,7 +833,7 @@ hooks.add('tableExportModule', {
         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)
@@ -835,7 +841,7 @@ hooks.add('tableExportModule', {
         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 }
@@ -1027,6 +1033,10 @@ hooks.add('tableExportModule', {
     }
 
     const handleExportAndPrint = (options: VxeTablePropTypes.ExportOpts | VxeTablePropTypes.ExportConfig, isPrint?: boolean) => {
+      const $xeGrid = $xeTable.xeGrid
+      const $xeGantt = $xeTable.xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
+
       const { treeConfig, showHeader, showFooter } = props
       const { initStore, isGroup, footerTableData, exportStore, exportParams } = reactData
       const { collectColumn, mergeBodyList, mergeFooterList } = internalData
@@ -1034,7 +1044,7 @@ hooks.add('tableExportModule', {
       const hasTree = treeConfig
       const customOpts = computeCustomOpts.value
       const selectRecords = $xeTable.getCheckboxRecords()
-      const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
+      const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
       const hasFooter = !!footerTableData.length
       const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
       const defOpts = Object.assign({
@@ -1109,7 +1119,8 @@ hooks.add('tableExportModule', {
           exportParams.filename = filename({
             options: defOpts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           })
         } else {
           exportParams.filename = `${filename}`
@@ -1120,7 +1131,8 @@ hooks.add('tableExportModule', {
           exportParams.sheetName = sheetName({
             options: defOpts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           })
         } else {
           exportParams.sheetName = `${sheetName}`
@@ -1151,12 +1163,16 @@ hooks.add('tableExportModule', {
        * @param {Object} options 参数
        */
       exportData (options) {
+        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 = computeExportOpts.value
         const treeOpts = computeTreeOpts.value
-        const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
+        const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
         const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
         const opts = Object.assign({
           message: true,
@@ -1257,7 +1273,7 @@ hooks.add('tableExportModule', {
               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',
@@ -1265,7 +1281,7 @@ hooks.add('tableExportModule', {
             }
           )
         } 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[] = []
@@ -1283,7 +1299,8 @@ hooks.add('tableExportModule', {
             handleOptions.filename = filename({
               options: opts,
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             })
           } else {
             handleOptions.filename = `${filename}`
@@ -1298,7 +1315,8 @@ hooks.add('tableExportModule', {
             handleOptions.sheetName = sheetName({
               options: opts,
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             })
           } else {
             handleOptions.sheetName = `${sheetName}`
@@ -1320,7 +1338,7 @@ hooks.add('tableExportModule', {
 
         if (!handleOptions.print) {
           if (beforeExportMethod) {
-            beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid })
+            beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
           }
         }
         if (!handleOptions.data) {
@@ -1332,13 +1350,13 @@ hooks.add('tableExportModule', {
               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.reactData
-              const { computeProxyOpts } = $xeGrid.getComputeMaps()
+            if ($xeGGWrapper && !handleOptions.remote) {
+              const gridReactData = $xeGGWrapper.reactData
+              const { computeProxyOpts } = $xeGGWrapper.getComputeMaps()
               const proxyOpts = computeProxyOpts.value
               const { sortData } = gridReactData
               const { beforeQueryAll, afterQueryAll, ajax = {} } = proxyOpts
@@ -1425,6 +1443,9 @@ hooks.add('tableExportModule', {
         return VxeUI.readFile(options)
       },
       print (options) {
+        const $xeGrid = $xeTable.xeGrid
+        const $xeGantt = $xeTable.xeGantt
+
         const printOpts = computePrintOpts.value
         const opts = Object.assign({
           original: false
@@ -1442,7 +1463,8 @@ hooks.add('tableExportModule', {
             printTitle = sheetName({
               options: opts,
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             })
           } else {
             printTitle = `${sheetName}`
@@ -1468,7 +1490,9 @@ hooks.add('tableExportModule', {
                           html,
                           content: html,
                           options: opts,
-                          $table: $xeTable
+                          $table: $xeTable,
+                          $grid: $xeGrid,
+                          $gantt: $xeGantt
                         })
                       }
                     : undefined
@@ -1487,7 +1511,9 @@ hooks.add('tableExportModule', {
                             html,
                             content: html,
                             options: opts,
-                            $table: $xeTable
+                            $table: $xeTable,
+                            $grid: $xeGrid,
+                            $gantt: $xeGantt
                           })
                         }
                       : undefined

package/packages/table/module/export/import-panel.ts

@@ -94,6 +94,7 @@ export default defineVxeComponent({
 
     const renderVN = () => {
       const $xeGrid = $xeTable.xeGrid
+      const $xeGantt = $xeTable.xeGantt
 
       const { defaultOptions, storeData } = props
       const selectName = computeSelectName.value
@@ -130,6 +131,7 @@ export default defineVxeComponent({
             const params = {
               $table: $xeTable,
               $grid: $xeGrid,
+              $gantt: $xeGantt,
               options: defaultOptions,
               params: defaultOptions.params as any
             }
@@ -207,6 +209,7 @@ export default defineVxeComponent({
             const params = {
               $table: $xeTable,
               $grid: $xeGrid,
+              $gantt: $xeGantt,
               options: defaultOptions,
               params: defaultOptions.params as any
             }

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

@@ -280,11 +280,12 @@ hooks.add('tableMenuModule', {
        */
       ctxMenuLinkEvent (evnt, menu) {
         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({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $event: evnt })
+          const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt })
           const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null
           if (tmMethod) {
             tmMethod(params, evnt)

package/packages/table/module/validator/hook.ts

@@ -463,6 +463,7 @@ hooks.add('tableValidatorModule', {
        */
       validCellRules (validType, row, column, val) {
         const $xeGrid = $xeTable.xeGrid
+        const $xeGantt = $xeTable.xeGantt
 
         const { editRules } = props
         const { field } = column
@@ -486,7 +487,8 @@ hooks.add('tableValidatorModule', {
                     columnIndex: $xeTable.getColumnIndex(column),
                     field: column.field,
                     $table: $xeTable,
-                    $grid: $xeGrid
+                    $grid: $xeGrid,
+                    $gantt: $xeGantt
                   }
                   let customValid: any
                   if (XEUtils.isString(validator)) {

package/packages/table/src/body.ts

@@ -102,6 +102,7 @@ export default defineVxeComponent({
       items: any[]
     ) => {
       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
@@ -162,6 +163,7 @@ export default defineVxeComponent({
       } = {
         $table: $xeTable,
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         isEdit: false,
         seq,
         rowid,
@@ -469,6 +471,7 @@ export default defineVxeComponent({
 
     const renderRows = (fixedType: 'left' | 'right' | '', isOptimizeMode: boolean, tableData: any[], tableColumn: VxeTableDefines.ColumnInfo[]) => {
       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
@@ -608,8 +611,9 @@ export default defineVxeComponent({
               _columnIndex = colRest._index
             }
             const expandParams: VxeTableDefines.CellRenderDataParams = {
-              $grid: $xeGrid,
               $table: $xeTable,
+              $grid: $xeGrid,
+              $gantt: $xeGantt,
               seq,
               column: expandColumn as VxeTableDefines.ColumnInfo,
               columnIndex,
@@ -697,6 +701,7 @@ export default defineVxeComponent({
     const renderVN = () => {
       const { slots } = tableContext
       const $xeGrid = $xeTable.xeGrid
+      const $xeGantt = $xeTable.xeGantt
 
       const { fixedColumn, fixedType, tableColumn } = props
       const { spanMethod, footerSpanMethod, mouseConfig } = tableProps
@@ -778,7 +783,7 @@ export default defineVxeComponent({
 
       let emptyContent: string | VxeComponentSlotType | VxeComponentSlotType[]
       const emptySlot = slots ? slots.empty : null
-      const emptyParams = { $table: $xeTable, $grid: $xeGrid }
+      const emptyParams = { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }
       if (emptySlot) {
         emptyContent = $xeTable.callSlot(emptySlot, emptyParams)
       } else {

package/packages/table/src/column.ts

@@ -171,6 +171,7 @@ export default defineVxeComponent({
 
     provide('$xeColumn', $xeColumn)
     provide('$xeGrid', null)
+    provide('$xeGantt', null)
 
     return renderVN
   }

package/packages/table/src/columnInfo.ts

@@ -12,6 +12,8 @@ export class ColumnInfo {
   constructor ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, _vm: any, { renderHeader, renderCell, renderFooter, renderData }: any = {}) {
     const tableProps = $xeTable.props
     const $xeGrid = $xeTable.xeGrid
+    const $xeGantt = $xeTable.xeGantt
+    const $xeGGWrapper = $xeGrid || $xeGantt
 
     const { field, editRender } = _vm
 
@@ -166,11 +168,11 @@ export class ColumnInfo {
       // 单元格插槽，只对 grid 有效
       slots: _vm.slots
     })
-    if ($xeGrid) {
-      const { computeProxyOpts } = $xeGrid.getComputeMaps()
+    if ($xeGGWrapper) {
+      const { computeProxyOpts } = $xeGGWrapper.getComputeMaps()
       const proxyOpts = computeProxyOpts.value
       if (proxyOpts.beforeColumn) {
-        proxyOpts.beforeColumn({ $grid: $xeGrid, column: this })
+        proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this })
       }
     }
   }

package/packages/table/src/footer.ts

@@ -46,6 +46,7 @@ export default defineVxeComponent({
 
     const renderRows = (isOptimizeMode: boolean, tableColumn: VxeTableDefines.ColumnInfo[], footerTableData: any[], row: any, $rowIndex: number, _rowIndex: number) => {
       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
@@ -87,6 +88,7 @@ export default defineVxeComponent({
         } = {
           $table: $xeTable,
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           row,
           rowIndex: _rowIndex,
           _rowIndex,

package/packages/table/src/group.ts

@@ -51,6 +51,7 @@ export default defineVxeComponent({
 
     provide('$xeColgroup', $xeColgroup)
     provide('$xeGrid', null)
+    provide('$xeGantt', null)
 
     return renderVN
   }

package/packages/table/src/header.ts

@@ -45,6 +45,7 @@ export default defineVxeComponent({
 
     const renderRows = (isGroup: boolean, isOptimizeMode: boolean, cols: VxeTableDefines.ColumnInfo[], $rowIndex: number) => {
       const $xeGrid = $xeTable.xeGrid
+      const $xeGantt = $xeTable.xeGantt
 
       const { fixedType } = props
       const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
@@ -87,6 +88,7 @@ export default defineVxeComponent({
         } = {
           $table: $xeTable,
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           $rowIndex,
           column,
           columnIndex,