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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.0-beta.3";
+const version = "3.18.0-beta.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.0-beta.3"}`;
+const log_version = `table v${"3.18.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3006,6 +3006,7 @@ function createInternalData() {
     tBodyHeight: 0,
     // 表尾高度
     tFooterHeight: 0,
+    teleportToWrapperElem: null,
     inited: false,
     tooltipTimeout: null,
     initStatus: false,
@@ -4104,6 +4105,8 @@ const Cell = {
       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;
@@ -4140,6 +4143,13 @@ 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) {
@@ -4157,8 +4167,8 @@ 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 = cell_renderer.get(renderOpts.name);
@@ -6175,7 +6185,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;
@@ -7207,7 +7217,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();
@@ -9010,7 +9020,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(() => {
@@ -9309,6 +9319,7 @@ function loadTableData($xeTable, datas, isReset) {
   }).then(() => {
     computeScrollLoad($xeTable);
   }).then(() => {
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     // 是否启用了虚拟滚动
     if (sYLoad) {
       scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -9317,6 +9328,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)
@@ -10140,7 +10154,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
@@ -10295,7 +10309,7 @@ const Methods = {
     });
     reactData.tableData = tableData;
     internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.updateViewData) {
       $xeGanttView.updateViewData();
     }
     return $xeTable.$nextTick();
@@ -11426,6 +11440,35 @@ 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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrRowid)) {
+        rowid = rowOrRowid;
+      } else {
+        rowid = getRowid($xeTable, rowOrRowid);
+      }
+      if (rowid) {
+        const rest = fullAllDataRowIdData[rowid];
+        if (rest) {
+          return rest.level;
+        }
+      }
+    }
+    return -1;
+  },
   /**
    * 只对 tree-config 有效，获取行的父级
    */
@@ -11448,7 +11491,9 @@ const Methods = {
       }
       if (rowid) {
         const rest = fullAllDataRowIdData[rowid];
-        return rest ? rest.parent : null;
+        if (rest) {
+          return rest.parent;
+        }
       }
     }
     return null;
@@ -14566,7 +14611,7 @@ const Methods = {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
       }
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
       $xeGanttView.handleUpdateCurrentRow(row);
     }
     return this.$nextTick();
@@ -14631,7 +14676,7 @@ const Methods = {
     if (el) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
       $xeGanttView.handleUpdateCurrentRow();
     }
     return $xeTable.$nextTick();
@@ -14714,7 +14759,7 @@ const Methods = {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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);
     }
   },
@@ -14727,7 +14772,7 @@ const Methods = {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
     }
     internalData.hoverRow = null;
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
       $xeGanttView.handleUpdateHoverRow();
     }
   },
@@ -17931,7 +17976,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(() => {
@@ -18062,7 +18107,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(() => {
@@ -20704,6 +20749,7 @@ const renderSimplePanel = (h, _vm) => {
     }
   });
   return h('div', {
+    ref: 'refElem',
     key: 'simple',
     class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
       'is--active': customStore.visible
@@ -20803,7 +20849,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
   const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-  const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeInput');
+  const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
   const _vm = $xeTableCustomPanel;
   const props = $xeTableCustomPanel;
   const $xeTable = $xeTableCustomPanel.$xeTable;
@@ -21213,6 +21259,8 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
     $xeTableCustomPanel.$nextTick(() => {
       const $xeTable = $xeTableCustomPanel.$xeTable;
+      const $xeGantt = $xeTable.$xeGantt;
+      const tableInternalData = $xeTable;
       const {
         customOpts
       } = $xeTable;
@@ -21229,13 +21277,33 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         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;
@@ -27236,8 +27304,8 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         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) {
           this.handleCheckboxRangeEvent(evnt, params);
@@ -28128,15 +28196,22 @@ function checkRuleStatus(rule, val) {
 
 
 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);
 }
@@ -30138,7 +30213,7 @@ function renderBody(h, $xeTable) {
     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']);
       }
@@ -30306,10 +30381,18 @@ function renderBody(h, $xeTable) {
   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();
     }
@@ -30762,6 +30845,9 @@ function toolbar_createInternalData() {
   inject: {
     $xeGrid: {
       default: null
+    },
+    $xeGantt: {
+      default: null
     }
   },
   data() {
@@ -30925,6 +31011,8 @@ function toolbar_createInternalData() {
       const $xeToolbar = this;
       const reactData = $xeToolbar.reactData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         isRefresh
       } = reactData;
@@ -30940,11 +31028,11 @@ function toolbar_createInternalData() {
           } catch (e) {
             reactData.isRefresh = false;
           }
-        } else if ($xeGrid) {
+        } else if ($xeGGWrapper) {
           reactData.isRefresh = true;
-          $xeGrid.triggerToolbarCommitEvent({
+          $xeGGWrapper.triggerToolbarCommitEvent({
             code: refreshOpts.code || 'reload'
-          }, $event).catch(e => e).then(() => {
+          }, $event).catch(() => {}).then(() => {
             reactData.isRefresh = false;
           });
         }
@@ -30955,8 +31043,10 @@ function toolbar_createInternalData() {
     }) {
       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']);
       }
@@ -31078,6 +31168,8 @@ function toolbar_createInternalData() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         $event
       } = eventParams;
@@ -31090,8 +31182,8 @@ function toolbar_createInternalData() {
       } = item;
       if (code) {
         $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-          if ($xeGrid) {
-            $xeGrid.triggerToolbarBtnEvent(item, $event);
+          if ($xeGGWrapper) {
+            $xeGGWrapper.triggerToolbarBtnEvent(item, $event);
           } else {
             const gCommandOpts = toolbar_commands.get(code);
             const params = {
@@ -31099,7 +31191,7 @@ function toolbar_createInternalData() {
               button: item,
               $table: $table,
               $grid: $xeGrid,
-              $gantt: null,
+              $gantt: $xeGantt,
               $event
             };
             if (gCommandOpts) {
@@ -31119,6 +31211,8 @@ function toolbar_createInternalData() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         $event
       } = eventParams;
@@ -31131,8 +31225,8 @@ function toolbar_createInternalData() {
       } = item;
       if (code) {
         $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-          if ($xeGrid) {
-            $xeGrid.triggerToolbarTolEvent(item, $event);
+          if ($xeGGWrapper) {
+            $xeGGWrapper.triggerToolbarTolEvent(item, $event);
           } else {
             const gCommandOpts = toolbar_commands.get(code);
             const params = {
@@ -31141,7 +31235,7 @@ function toolbar_createInternalData() {
               tool: item,
               $table: $table,
               $grid: $xeGrid,
-              $gantt: null,
+              $gantt: $xeGantt,
               $event
             };
             if (gCommandOpts) {
@@ -31210,6 +31304,7 @@ function toolbar_createInternalData() {
       const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
       const {
         buttons
       } = props;
@@ -31224,6 +31319,7 @@ function toolbar_createInternalData() {
         btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, {
           buttons: buttons || [],
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           $table: $table
         })));
       }
@@ -31239,6 +31335,7 @@ function toolbar_createInternalData() {
               const toolbarButtonClassName = compConf.toolbarButtonClassName;
               const params = {
                 $grid: $xeGrid,
+                $gantt: $xeGantt,
                 $table: $table,
                 button: item
               };
@@ -31283,6 +31380,7 @@ function toolbar_createInternalData() {
         btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, {
           buttons: buttons || [],
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           $table: $table
         })));
       }
@@ -31299,6 +31397,7 @@ function toolbar_createInternalData() {
       const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
       const {
         tools
       } = props;
@@ -31313,6 +31412,7 @@ function toolbar_createInternalData() {
         btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, {
           tools: tools || [],
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           $table: $table
         })));
       }
@@ -31329,6 +31429,7 @@ function toolbar_createInternalData() {
               const toolbarToolClassName = compConf.toolbarToolClassName;
               const params = {
                 $grid: $xeGrid,
+                $gantt: $xeGantt,
                 $table: $table,
                 tool: item
               };
@@ -31375,6 +31476,7 @@ function toolbar_createInternalData() {
         btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, {
           tools: tools || [],
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           $table: $table
         })));
       }
@@ -31454,13 +31556,15 @@ function toolbar_createInternalData() {
       const VxeUIButtonComponent = core_.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 ? h(VxeUIButtonComponent, {
+      return $xeGGWrapper && VxeUIButtonComponent ? h(VxeUIButtonComponent, {
         key: 'zoom',
         props: {
           circle: true,
-          icon: $xeGrid.isMaximized() ? zoomOpts.iconOut || toolbar_getIcon().TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || toolbar_getIcon().TOOLBAR_TOOLS_FULLSCREEN,
-          title: toolbar_getI18n(`vxe.toolbar.zoom${$xeGrid.isMaximized() ? 'Out' : 'In'}`)
+          icon: $xeGGWrapper.isMaximized() ? zoomOpts.iconOut || toolbar_getIcon().TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || toolbar_getIcon().TOOLBAR_TOOLS_FULLSCREEN,
+          title: toolbar_getI18n(`vxe.toolbar.zoom${$xeGGWrapper.isMaximized() ? 'Out' : 'In'}`)
         },
         on: {
           click: $xeToolbar.zoomEvent
@@ -31501,6 +31605,8 @@ function toolbar_createInternalData() {
       const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
+      const $xeGantt = $xeToolbar.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         perfect,
         loading,
@@ -31529,26 +31635,30 @@ function toolbar_createInternalData() {
         class: 'vxe-buttons--wrapper'
       }, buttonsSlot ? buttonsSlot({
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         $table: $table
       }) : $xeToolbar.renderLeftBtns(h)), h('div', {
         class: 'vxe-tools--wrapper'
       }, toolsSlot ? toolsSlot({
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         $table: $table
       }) : $xeToolbar.renderRightTools(h)), h('div', {
         class: 'vxe-tools--operate'
-      }, [props.import ? $xeToolbar.renderToolImport(h) : toolbar_renderEmptyElement($xeToolbar), props.export ? $xeToolbar.renderToolExport(h) : toolbar_renderEmptyElement($xeToolbar), props.print ? $xeToolbar.renderToolPrint(h) : toolbar_renderEmptyElement($xeToolbar), refresh ? $xeToolbar.renderToolRefresh(h) : toolbar_renderEmptyElement($xeToolbar), zoom && $xeGrid ? $xeToolbar.renderToolZoom(h) : toolbar_renderEmptyElement($xeToolbar), custom ? $xeToolbar.renderToolCustom(h) : toolbar_renderEmptyElement($xeToolbar)])]);
+      }, [props.import ? $xeToolbar.renderToolImport(h) : toolbar_renderEmptyElement($xeToolbar), props.export ? $xeToolbar.renderToolExport(h) : toolbar_renderEmptyElement($xeToolbar), props.print ? $xeToolbar.renderToolPrint(h) : toolbar_renderEmptyElement($xeToolbar), refresh ? $xeToolbar.renderToolRefresh(h) : toolbar_renderEmptyElement($xeToolbar), zoom && $xeGGWrapper ? $xeToolbar.renderToolZoom(h) : toolbar_renderEmptyElement($xeToolbar), custom ? $xeToolbar.renderToolCustom(h) : toolbar_renderEmptyElement($xeToolbar)])]);
     }
   },
   created() {
     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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.custom)) {
@@ -32002,7 +32112,7 @@ function grid_createInternalData() {
         }
       }
     },
-    callSlot(slotFunc, params, h, vNodes) {
+    callSlot(slotFunc, params, h) {
       const $xeGrid = this;
       const slots = $xeGrid.$scopedSlots;
       if (slotFunc) {
@@ -32010,7 +32120,7 @@ function grid_createInternalData() {
           slotFunc = slots[slotFunc] || null;
         }
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
-          return getSlotVNs(slotFunc.call(this, params, h, vNodes));
+          return getSlotVNs(slotFunc.call(this, params, h));
         }
       }
       return [];