vxe-table 3.18.0-beta.3 → 3.18.0-beta.5

package/es/table/module/custom/mixin.js

@@ -1,13 +1,20 @@
 import XEUtils from 'xe-utils';
 import { getColumnList } from '../../src/util';
 function calcMaxHeight($xeTable) {
+    const $xeGantt = $xeTable.$xeGantt;
     const reactData = $xeTable;
     const { customStore } = reactData;
-    const el = $xeTable.$refs.refElem;
+    let wrapperEl = $xeTable.$refs.refElem;
     // 判断面板不能大于表格高度
     let tableHeight = 0;
-    if (el) {
-        tableHeight = el.clientHeight - 28;
+    if ($xeGantt) {
+        const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+        if (ganttContainerElem) {
+            wrapperEl = ganttContainerElem;
+        }
+    }
+    if (wrapperEl) {
+        tableHeight = wrapperEl.clientHeight - 28;
     }
     customStore.maxHeight = Math.max(88, tableHeight);
 }

package/es/table/module/custom/panel.js

@@ -273,6 +273,7 @@ const renderSimplePanel = (h, _vm) => {
         }
     });
     return h('div', {
+        ref: 'refElem',
         key: 'simple',
         class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
                 'is--active': customStore.visible
@@ -425,7 +426,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
     const VxeUIDrawerComponent = VxeUI.getComponent('VxeDrawer');
     const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-    const VxeUINumberInputComponent = VxeUI.getComponent('VxeInput');
+    const VxeUINumberInputComponent = VxeUI.getComponent('VxeNumberInput');
     const _vm = $xeTableCustomPanel;
     const props = $xeTableCustomPanel;
     const $xeTable = $xeTableCustomPanel.$xeTable;
@@ -893,6 +894,8 @@ export default {
         const VxeUIRadioGroupComponent = VxeUI.getComponent('VxeRadioGroup');
         $xeTableCustomPanel.$nextTick(() => {
             const $xeTable = $xeTableCustomPanel.$xeTable;
+            const $xeGantt = $xeTable.$xeGantt;
+            const tableInternalData = $xeTable;
             const { customOpts } = $xeTable;
             const { mode } = customOpts;
             if (!VxeUIModalComponent && (mode === 'modal')) {
@@ -905,13 +908,31 @@ export default {
                 errLog('vxe.error.reqComp', ['vxe-button']);
             }
             if (!VxeUINumberInputComponent) {
-                errLog('vxe.error.reqComp', ['vxe-input']);
+                errLog('vxe.error.reqComp', ['vxe-number-input']);
             }
             if (!VxeUIRadioGroupComponent) {
                 errLog('vxe.error.reqComp', ['vxe-radio-group']);
             }
+            if ($xeGantt) {
+                const { teleportToWrapperElem } = tableInternalData;
+                const el = $xeTableCustomPanel.$refs.refElem;
+                if (el && teleportToWrapperElem) {
+                    teleportToWrapperElem.appendChild(el);
+                }
+            }
         });
     },
+    beforeDestroy() {
+        const $xeTableCustomPanel = this;
+        const $xeTable = $xeTableCustomPanel.$xeTable;
+        const $xeGantt = $xeTable.$xeGantt;
+        if ($xeGantt) {
+            const el = $xeTableCustomPanel.$refs.refElem;
+            if (el && el.parentElement) {
+                el.parentElement.removeChild(el);
+            }
+        }
+    },
     render(h) {
         const $xeTableCustomPanel = this;
         const $xeTable = $xeTableCustomPanel.$xeTable;

package/es/table/module/keyboard/mixin.js

@@ -352,8 +352,8 @@ export default {
         handleCellMousedownEvent(evnt, params) {
             const $xeTable = this;
             const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModownEvent) {
-                return $xeTable.triggerCellAreaModownEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
+                return $xeTable.triggerCellAreaModnEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/src/cell.js

@@ -369,6 +369,8 @@ export const Cell = {
         const { isRowGroupStatus } = tableReactData;
         const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const renderOpts = editRender || cellRender;
+        const defaultSlot = slots ? slots.default : null;
+        const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         let cellValue = '';
         if (isRowGroupStatus && field && row.isAggregate) {
             const aggRow = row;
@@ -396,6 +398,9 @@ export const Cell = {
                  */
                 totalValue: childCount
             };
+            if (gcSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childCount }, params), h));
+            }
             if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
                 if (contentMethod) {
@@ -416,8 +421,8 @@ export const Cell = {
             }
         }
         else {
-            if (slots && slots.default) {
-                return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
+            if (defaultSlot) {
+                return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
             if (renderOpts) {
                 const compConf = renderer.get(renderOpts.name);

package/es/table/src/methods.js

@@ -392,7 +392,7 @@ function updateScrollYStatus($xeTable, fullData) {
     // 如果gt为0，则总是启用
     const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
     reactData.scrollYLoad = scrollYLoad;
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
         $xeGanttView.handleUpdateSYStatus(scrollYLoad);
     }
     return scrollYLoad;
@@ -1221,7 +1221,7 @@ function updateStyle($xeTable) {
     if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
         $xeTable.addCellSelectedClass();
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateStyle) {
         $xeGanttView.handleUpdateStyle();
     }
     return $xeTable.$nextTick();
@@ -2770,7 +2770,7 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
         else {
             resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
         }
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleLazyRecalculate) {
             $xeGanttView.handleLazyRecalculate();
         }
         internalData.rceTimeout = setTimeout(() => {
@@ -3032,6 +3032,7 @@ function loadTableData($xeTable, datas, isReset) {
     }).then(() => {
         computeScrollLoad($xeTable);
     }).then(() => {
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         // 是否启用了虚拟滚动
         if (sYLoad) {
             scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3040,6 +3041,9 @@ function loadTableData($xeTable, datas, isReset) {
             if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
                 errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
             }
+            if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+                warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+            }
             // if (showOverflow) {
             //   if (!rowOpts.height) {
             //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -3756,7 +3760,7 @@ const Methods = {
         const $xeGGWrapper = $xeGrid || $xeGantt;
         if (slotFunc) {
             if ($xeGGWrapper) {
-                return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
+                return $xeGGWrapper.callSlot(slotFunc, params, h);
             }
             // if (XEUtils.isString(slotFunc)) {
             //   slotFunc = slots[slotFunc] || null
@@ -3900,7 +3904,7 @@ const Methods = {
         });
         reactData.tableData = tableData;
         internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.updateViewData) {
             $xeGanttView.updateViewData();
         }
         return $xeTable.$nextTick();
@@ -4862,6 +4866,32 @@ const Methods = {
         }
         return [];
     },
+    /**
+     * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+     */
+    getTreeRowLevel(rowOrRowid) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData } = internalData;
+        if (rowOrRowid && treeConfig) {
+            let rowid;
+            if (XEUtils.isString(rowOrRowid)) {
+                rowid = rowOrRowid;
+            }
+            else {
+                rowid = getRowid($xeTable, rowOrRowid);
+            }
+            if (rowid) {
+                const rest = fullAllDataRowIdData[rowid];
+                if (rest) {
+                    return rest.level;
+                }
+            }
+        }
+        return -1;
+    },
     /**
      * 只对 tree-config 有效，获取行的父级
      */
@@ -4881,7 +4911,9 @@ const Methods = {
             }
             if (rowid) {
                 const rest = fullAllDataRowIdData[rowid];
-                return rest ? rest.parent : null;
+                if (rest) {
+                    return rest.parent;
+                }
             }
         }
         return null;
@@ -7570,7 +7602,7 @@ const Methods = {
                 XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
             }
         }
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
             $xeGanttView.handleUpdateCurrentRow(row);
         }
         return this.$nextTick();
@@ -7629,7 +7661,7 @@ const Methods = {
         if (el) {
             XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
         }
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
             $xeGanttView.handleUpdateCurrentRow();
         }
         return $xeTable.$nextTick();
@@ -7703,7 +7735,7 @@ const Methods = {
             XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--hover'));
         }
         internalData.hoverRow = row;
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
             $xeGanttView.handleUpdateHoverRow(row);
         }
     },
@@ -7716,7 +7748,7 @@ const Methods = {
             XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
         }
         internalData.hoverRow = null;
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
             $xeGanttView.handleUpdateHoverRow();
         }
     },
@@ -10456,7 +10488,7 @@ const Methods = {
             if (isScrollXBig && mouseOpts.area) {
                 errLog('vxe.error.notProp', ['mouse-config.area']);
             }
-            if ($xeGanttView) {
+            if ($xeGanttView && $xeGanttView.handleUpdateSXSpace) {
                 $xeGanttView.handleUpdateSXSpace();
             }
             return $xeTable.$nextTick(() => {
@@ -10577,7 +10609,7 @@ const Methods = {
         if (isScrollYBig && mouseOpts.area) {
             errLog('vxe.error.notProp', ['mouse-config.area']);
         }
-        if ($xeGanttView) {
+        if ($xeGanttView && $xeGanttView.handleUpdateSYSpace) {
             $xeGanttView.handleUpdateSYSpace();
         }
         return $xeTable.$nextTick().then(() => {

package/es/table/src/table.js

@@ -1495,7 +1495,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerCellAreaModownEvent) {
+        if (!$xeTable.triggerCellAreaModnEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }
@@ -1663,10 +1663,18 @@ export default {
     mounted() {
         const $xeTable = this;
         const props = $xeTable;
+        const internalData = $xeTable;
+        const $xeGantt = $xeTable.$xeGantt;
         const columnOpts = $xeTable.computeColumnOpts;
         const rowOpts = $xeTable.computeRowOpts;
         const customOpts = $xeTable.computeCustomOpts;
         const virtualYOpts = $xeTable.computeVirtualYOpts;
+        if ($xeGantt) {
+            const classifyWrapperEl = $xeGantt.$refs.refClassifyWrapperElem;
+            if (classifyWrapperEl) {
+                internalData.teleportToWrapperElem = classifyWrapperEl;
+            }
+        }
         if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
             initTpImg();
         }

package/es/table/src/util.js

@@ -115,6 +115,7 @@ export function createInternalData() {
         tBodyHeight: 0,
         // 表尾高度
         tFooterHeight: 0,
+        teleportToWrapperElem: null,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,

package/es/toolbar/src/toolbar.js

@@ -49,6 +49,9 @@ export default {
     inject: {
         $xeGrid: {
             default: null
+        },
+        $xeGantt: {
+            default: null
         }
     },
     data() {
@@ -183,6 +186,8 @@ export default {
             const $xeToolbar = this;
             const reactData = $xeToolbar.reactData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { isRefresh } = reactData;
             const refreshOpts = $xeToolbar.computeRefreshOpts;
             if (!isRefresh) {
@@ -198,9 +203,9 @@ export default {
                         reactData.isRefresh = false;
                     }
                 }
-                else if ($xeGrid) {
+                else if ($xeGGWrapper) {
                     reactData.isRefresh = true;
-                    $xeGrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch((e) => e).then(() => {
+                    $xeGGWrapper.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch(() => { }).then(() => {
                         reactData.isRefresh = false;
                     });
                 }
@@ -209,8 +214,10 @@ export default {
         zoomEvent({ $event }) {
             const $xeToolbar = this;
             const $xeGrid = $xeToolbar.$xeGrid;
-            if ($xeGrid) {
-                $xeGrid.triggerZoomEvent($event);
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
+            if ($xeGGWrapper) {
+                $xeGGWrapper.triggerZoomEvent($event);
             }
             else {
                 warnLog('vxe.error.notProp', ['zoom']);
@@ -321,18 +328,20 @@ export default {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { $event } = eventParams;
             const { connectTable } = internalData;
             const $table = connectTable;
             const { code } = item;
             if (code) {
                 $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-                    if ($xeGrid) {
-                        $xeGrid.triggerToolbarBtnEvent(item, $event);
+                    if ($xeGGWrapper) {
+                        $xeGGWrapper.triggerToolbarBtnEvent(item, $event);
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
+                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $gantt: $xeGantt, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {
@@ -351,18 +360,20 @@ export default {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { $event } = eventParams;
             const { connectTable } = internalData;
             const $table = connectTable;
             const { code } = item;
             if (code) {
                 $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-                    if ($xeGrid) {
-                        $xeGrid.triggerToolbarTolEvent(item, $event);
+                    if ($xeGGWrapper) {
+                        $xeGGWrapper.triggerToolbarTolEvent(item, $event);
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
+                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $gantt: $xeGantt, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {
@@ -430,6 +441,7 @@ export default {
             const slots = $xeToolbar.$scopedSlots;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
             const { buttons } = props;
             const { connectTable } = internalData;
             const $table = connectTable;
@@ -437,7 +449,7 @@ export default {
             const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
             const btnVNs = [];
             if (buttonPrefixSlot) {
-                btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             if (buttons) {
                 buttons.forEach((item) => {
@@ -446,7 +458,7 @@ export default {
                         const compConf = buttonRender ? renderer.get(buttonRender.name) : null;
                         if (buttonRender && compConf && compConf.renderToolbarButton) {
                             const toolbarButtonClassName = compConf.toolbarButtonClassName;
-                            const params = { $grid: $xeGrid, $table: $table, button: item };
+                            const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table, button: item };
                             btnVNs.push(h('span', {
                                 class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
                             }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params))));
@@ -488,7 +500,7 @@ export default {
                 });
             }
             if (buttonSuffixSlot) {
-                btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             return btnVNs;
         },
@@ -503,6 +515,7 @@ export default {
             const slots = $xeToolbar.$scopedSlots;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
             const { tools } = props;
             const { connectTable } = internalData;
             const $table = connectTable;
@@ -510,7 +523,7 @@ export default {
             const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
             const btnVNs = [];
             if (toolPrefixSlot) {
-                btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             if (tools) {
                 tools.forEach((item, tIndex) => {
@@ -520,7 +533,7 @@ export default {
                         const compConf = toolRender ? renderer.get(rdName) : null;
                         if (toolRender && compConf && compConf.renderToolbarTool) {
                             const toolbarToolClassName = compConf.toolbarToolClassName;
-                            const params = { $grid: $xeGrid, $table: $table, tool: item };
+                            const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table, tool: item };
                             btnVNs.push(h('span', {
                                 key: rdName,
                                 class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
@@ -564,7 +577,7 @@ export default {
                 });
             }
             if (toolSuffixSlot) {
-                btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             return btnVNs;
         },
@@ -650,14 +663,16 @@ export default {
             const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
             const $xeToolbar = this;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const zoomOpts = $xeToolbar.computeZoomOpts;
-            return $xeGrid && VxeUIButtonComponent
+            return $xeGGWrapper && VxeUIButtonComponent
                 ? h(VxeUIButtonComponent, {
                     key: 'zoom',
                     props: {
                         circle: true,
-                        icon: $xeGrid.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
-                        title: getI18n(`vxe.toolbar.zoom${$xeGrid.isMaximized() ? 'Out' : 'In'}`)
+                        icon: $xeGGWrapper.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
+                        title: getI18n(`vxe.toolbar.zoom${$xeGGWrapper.isMaximized() ? 'Out' : 'In'}`)
                     },
                     on: {
                         click: $xeToolbar.zoomEvent
@@ -703,6 +718,8 @@ export default {
             const slots = $xeToolbar.$scopedSlots;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
+            const $xeGantt = $xeToolbar.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { perfect, loading, refresh, zoom, custom, className } = props;
             const { connectTable } = internalData;
             const $table = connectTable;
@@ -719,10 +736,10 @@ export default {
             }, [
                 h('div', {
                     class: 'vxe-buttons--wrapper'
-                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
+                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
                 h('div', {
                     class: 'vxe-tools--wrapper'
-                }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderRightTools(h)),
+                }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderRightTools(h)),
                 h('div', {
                     class: 'vxe-tools--operate'
                 }, [
@@ -730,7 +747,7 @@ export default {
                     props.export ? $xeToolbar.renderToolExport(h) : renderEmptyElement($xeToolbar),
                     props.print ? $xeToolbar.renderToolPrint(h) : renderEmptyElement($xeToolbar),
                     refresh ? $xeToolbar.renderToolRefresh(h) : renderEmptyElement($xeToolbar),
-                    zoom && $xeGrid ? $xeToolbar.renderToolZoom(h) : renderEmptyElement($xeToolbar),
+                    zoom && $xeGGWrapper ? $xeToolbar.renderToolZoom(h) : renderEmptyElement($xeToolbar),
                     custom ? $xeToolbar.renderToolCustom(h) : renderEmptyElement($xeToolbar)
                 ])
             ]);
@@ -740,11 +757,13 @@ export default {
         const $xeToolbar = this;
         const props = $xeToolbar;
         const $xeGrid = $xeToolbar.$xeGrid;
+        const $xeGantt = $xeToolbar.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         $xeToolbar.$nextTick(() => {
             const refreshOpts = $xeToolbar.computeRefreshOpts;
             const $xeTable = $xeToolbar.fintTable();
             const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
-            if (props.refresh && !$xeGrid && !queryMethod) {
+            if (props.refresh && !$xeGGWrapper && !queryMethod) {
                 warnLog('vxe.error.notFunc', ['queryMethod']);
             }
             if (XEUtils.isPlainObject(props.custom)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.0-beta.3";
+export const version = "3.18.0-beta.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.18.0-beta.3"}`;
+const version = `table v${"3.18.0-beta.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -400,7 +400,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         }
       }
     },
-    callSlot(slotFunc, params, h, vNodes) {
+    callSlot(slotFunc, params, h) {
       const $xeGrid = this;
       const slots = $xeGrid.$scopedSlots;
       if (slotFunc) {
@@ -408,7 +408,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           slotFunc = slots[slotFunc] || null;
         }
         if (_xeUtils.default.isFunction(slotFunc)) {
-          return (0, _vn.getSlotVNs)(slotFunc.call(this, params, h, vNodes));
+          return (0, _vn.getSlotVNs)(slotFunc.call(this, params, h));
         }
       }
       return [];