vxe-table 3.17.10 → 3.18.0-beta.1

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.10";
+const version = "3.18.0-beta.1";
 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.17.10"}`;
+const log_version = `table v${"3.18.0-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2701,6 +2701,8 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       field,
       editRender
@@ -2854,11 +2856,15 @@ 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
+        });
+      }
     }
   }
   getTitle() {
@@ -5215,7 +5221,8 @@ Object.keys(columnProps).forEach(name => {
   provide() {
     return {
       $xeColumn: this,
-      $xeGrid: null
+      $xeGrid: null,
+      $xeGantt: null
     };
   },
   inject: {
@@ -5272,7 +5279,8 @@ const Column = VxeColumn;
   provide() {
     return {
       $xeColumn: this,
-      $xeGrid: null
+      $xeGrid: null,
+      $xeGantt: null
     };
   },
   inject: {
@@ -6053,8 +6061,11 @@ function cacheColumnMap($xeTable) {
       }
       fullColFieldData[field] = rest;
     } else {
-      if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
+      if (storage && !type) {
+        errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`]);
+      }
+      if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+        errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -10121,9 +10132,11 @@ const Methods = {
     const $xeTable = this;
     // const slots = $xeTable.$scopedSlots
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     if (slotFunc) {
-      if ($xeGrid) {
-        return $xeGrid.callSlot(slotFunc, params, h, vNodes);
+      if ($xeGGWrapper) {
+        return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
       }
       // if (XEUtils.isString(slotFunc)) {
       //   slotFunc = slots[slotFunc] || null
@@ -10144,10 +10157,12 @@ const Methods = {
   getParentElem() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       $el
     } = this;
-    return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode;
+    return $xeGGWrapper ? $xeGGWrapper.$el.parentNode : $el.parentNode;
   },
   /**
    * 获取父容器的高度
@@ -10155,6 +10170,8 @@ const Methods = {
   getParentHeight() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const props = $xeTable;
     const {
       height
@@ -10165,8 +10182,8 @@ const Methods = {
       const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
       let parentWrapperHeight = 0;
       if (parentElem) {
-        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-          parentWrapperHeight = $xeGrid.getParentHeight();
+        if ($xeGGWrapper && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGGWrapper.getParentHeight();
         } else {
           parentWrapperHeight = parentElem.clientHeight;
         }
@@ -10183,7 +10200,9 @@ const Methods = {
   getExcludeHeight() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
-    return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
+    return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0;
   },
   /**
    * 重置表格的一切数据状态
@@ -12695,6 +12714,7 @@ const Methods = {
   preventEvent(evnt, type, args, next, end) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     let evntList = methods_interceptor.get(type);
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
@@ -12709,8 +12729,9 @@ const Methods = {
     for (let i = 0; i < evntList.length; i++) {
       const func = evntList[i];
       const fnRest = func(Object.assign({
-        $grid: $xeGrid,
         $table: $xeTable,
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
         $event: evnt
       }, args));
       if (fnRest === false) {
@@ -12738,6 +12759,8 @@ const Methods = {
   handleGlobalMousedownEvent(evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       $el,
       $refs,
@@ -12838,7 +12861,7 @@ const Methods = {
         }
       }
     } else if (mouseConfig) {
-      if (!getEventTargetNode(evnt, $el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
+      if (!getEventTargetNode(evnt, $el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
         if (this.clearSelected) {
           this.clearSelected();
         }
@@ -12862,7 +12885,7 @@ const Methods = {
     if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
       this.closeMenu();
     }
-    const isActivated = getEventTargetNode(evnt, ($xeGrid || this).$el).flag;
+    const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
     // 如果存在校验，点击了表格之外则清除
     if (!isActivated && editRules && validOpts.autoClear) {
       this.validErrorMaps = {};
@@ -12940,6 +12963,7 @@ const Methods = {
     const internalData = $xeTable;
     const reactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     // 该行为只对当前激活的表格有效
     if (internalData.isActivated) {
       $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
@@ -13166,7 +13190,8 @@ const Methods = {
               column: selected.column,
               columnIndex: $xeTable.getColumnIndex(selected.column),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -13194,7 +13219,8 @@ const Methods = {
                 column: selected.column,
                 columnIndex: $xeTable.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -13225,7 +13251,8 @@ const Methods = {
               rowIndex: $xeTable.getRowIndex(parentRow),
               $rowIndex: $xeTable.getVMRowIndex(parentRow),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             $xeTable.setTreeExpand(parentRow, false).then(() => $xeTable.scrollToRow(parentRow)).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
           }
@@ -13246,7 +13273,8 @@ const Methods = {
               column: selected.column,
               columnIndex: $xeTable.getColumnIndex(selected.column),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
@@ -14521,18 +14549,22 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow(row) {
-    const {
-      $el,
-      rowOpts
-    } = this;
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    const rowOpts = $xeTable.computeRowOpts;
     this.clearCurrentRow();
     // this.clearCurrentColumn()
     this.currentRow = row;
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
-      if ($el) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`[rowid="${getRowid(this, row)}"]`), elem => addClass(elem, 'row--current'));
+      if (el) {
+        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) {
+      $xeGanttView.handleUpdateCurrentRow(row);
+    }
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
@@ -14585,15 +14617,20 @@ const Methods = {
    * 用于当前行，手动清空当前高亮的状态
    */
   clearCurrentRow() {
-    const {
-      $el
-    } = this;
-    this.currentRow = null;
-    this.hoverRow = null;
-    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'));
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    reactData.currentRow = null;
+    internalData.hoverRow = null;
+    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'));
     }
-    return this.$nextTick();
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateCurrentRow();
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于单选行，手动清空用户的选择
@@ -14664,24 +14701,31 @@ const Methods = {
     this.setHoverRow(row);
   },
   setHoverRow(row) {
-    const {
-      $el
-    } = this;
-    const rowid = getRowid(this, row);
-    this.clearHoverRow();
-    if ($el) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    $xeTable.clearHoverRow();
+    if (el) {
+      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) {
+      $xeGanttView.handleUpdateHoverRow(row);
     }
-    this.hoverRow = row;
   },
   clearHoverRow() {
-    const {
-      $el
-    } = this;
-    if ($el) {
-      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'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      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) {
+      $xeGanttView.handleUpdateHoverRow();
     }
-    this.hoverRow = null;
   },
   triggerHeaderCellClickEvent(evnt, params) {
     const $xeTable = this;
@@ -18206,6 +18250,7 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       showFooter,
       footerData,
@@ -18223,7 +18268,8 @@ const Methods = {
         columns: visibleColumn,
         data: afterFullData,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       }) : [];
     }
     reactData.footerTableData = footData;
@@ -18391,20 +18437,24 @@ const Methods = {
   dispatchEvent(type, params, evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     $xeTable.$emit(type, createEvent(evnt, {
       $table: $xeTable,
-      $grid: $xeGrid
+      $grid: $xeGrid,
+      $gantt: $xeGantt
     }, params));
   },
   // 已废弃，使用 dispatchEvent
   emitEvent(type, params, evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
-    this.$emit(type, Object.assign({
+    const $xeGantt = $xeTable.$xeGantt;
+    $xeTable.$emit(type, createEvent(evnt, {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       $event: evnt
-    }, params));
+    }));
   },
   focus() {
     this.isActivated = true;
@@ -18579,6 +18629,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     columnKey,
     resizable: allResizable,
@@ -18703,6 +18754,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const cellParams = {
     $table: $xeTable,
     $grid: $xeGrid,
+    $gantt: $xeGantt,
     isEdit: false,
     seq,
     rowid,
@@ -18989,6 +19041,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     stripe,
     rowKey,
@@ -19176,6 +19229,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         const expandParams = {
           $grid: $xeGrid,
           $table: $xeTable,
+          $gantt: $xeGantt,
           seq,
           column: expandColumn,
           columnIndex,
@@ -19282,6 +19336,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const slots = $xeTable.$scopedSlots;
     const {
       xID
@@ -19385,7 +19440,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const emptySlot = slots ? slots.empty : null;
     const emptyParams = {
       $table: $xeTable,
-      $grid: $xeGrid
+      $grid: $xeGrid,
+      $gantt: $xeGantt
     };
     if (emptySlot) {
       emptyContent = emptySlot.call($xeTable, emptyParams);
@@ -19502,6 +19558,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   const props = _vm;
   const $xeTable = _vm.$parent;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const tableProps = $xeTable;
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
@@ -19578,6 +19635,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const cellParams = {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       $rowIndex,
       column,
       columnIndex,
@@ -19949,6 +20007,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     fixedType
   } = props;
@@ -20021,6 +20080,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const cellParams = {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       row,
       rowIndex: _rowIndex,
       _rowIndex,
@@ -20470,6 +20530,7 @@ const renderSimplePanel = (h, _vm) => {
   const tableProps = $xeTable;
   const tableReactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     customStore
   } = props;
@@ -20521,6 +20582,7 @@ const renderSimplePanel = (h, _vm) => {
   const params = {
     $table: $xeTable,
     $grid: $xeGrid,
+    $gantt: $xeGantt,
     columns: customColumnList,
     isAllChecked,
     isAllIndeterminate,
@@ -20744,6 +20806,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
   const tableProps = $xeTable;
   const tableReactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     customStore
   } = props;
@@ -20800,6 +20863,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
   const params = {
     $table: $xeTable,
     $grid: $xeGrid,
+    $gantt: $xeGantt,
     columns: customColumnList,
     isAllChecked,
     isAllIndeterminate,
@@ -22028,6 +22092,7 @@ const {
   render(h) {
     const $xeTable = this.$parent;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       hasFile,
       loading,
@@ -22070,6 +22135,7 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             options: defaultOptions,
             params: defaultOptions.params
           };
@@ -22123,6 +22189,7 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             options: defaultOptions,
             params: defaultOptions.params
           };
@@ -22283,6 +22350,7 @@ const {
   render(h) {
     const $xeTable = this.$xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       _e,
       checkedAll,
@@ -22377,6 +22445,7 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             options: defaultOptions,
             columns,
             params: defaultOptions.params
@@ -22574,6 +22643,7 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             options: defaultOptions,
             columns,
             params: defaultOptions.params
@@ -23294,6 +23364,7 @@ const {
     handleGlobalContextmenuEvent(evnt) {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
       const internalData = $xeTable;
       const {
         $refs,
@@ -23320,8 +23391,9 @@ const {
           const type = 'body';
           const params = {
             type,
+            $table: $xeTable,
             $grid: $xeGrid,
-            $table: this,
+            $gantt: $xeGantt,
             keyboard: true,
             columns: this.visibleColumn.slice(0),
             $event: evnt
@@ -23354,8 +23426,9 @@ const {
           });
           const params = {
             type: layout,
+            $table: $xeTable,
             $grid: $xeGrid,
-            $table: this,
+            $gantt: $xeGantt,
             columns: this.visibleColumn.slice(0),
             $event: evnt
           };
@@ -23546,13 +23619,15 @@ const {
     ctxMenuLinkEvent(evnt, menu) {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
       // 如果一级菜单有配置 code 则允许点击，否则不能点击
       if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = mixin_menus.get(menu.code);
         const params = Object.assign({
           menu,
+          $table: $xeTable,
           $grid: $xeGrid,
-          $table: this,
+          $gantt: $xeGantt,
           $event: evnt
         }, this.ctxMenuStore.args);
         if (gMenuOpts && gMenuOpts.menuMethod) {
@@ -25123,6 +25198,8 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
   });
 }
 function getExportData($xeTable, opts) {
+  const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     columns,
     dataFilterMethod
@@ -25131,6 +25208,8 @@ function getExportData($xeTable, opts) {
   if (dataFilterMethod) {
     datas = datas.filter((row, index) => dataFilterMethod({
       $table: $xeTable,
+      $grid: $xeGrid,
+      $gantt: $xeGantt,
       row,
       $rowIndex: index
     }));
@@ -25181,11 +25260,15 @@ function getFooterCellValue($xeTable, opts, row, column) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
 }
 function getFooterData($xeTable, opts, footerTableData) {
+  const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     footerFilterMethod
   } = opts;
   return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({
     $table: $xeTable,
+    $grid: $xeGrid,
+    $gantt: $xeGantt,
     items,
     $rowIndex: index
   })) : footerTableData;
@@ -25534,6 +25617,7 @@ function clearColumnConvert(columns) {
 }
 function handleExport($xeTable, opts) {
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     remote,
     columns,
@@ -25546,7 +25630,8 @@ function handleExport($xeTable, opts) {
       const params = {
         options: opts,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       };
       resolve(exportMethod ? exportMethod(params) : params);
     } else {
@@ -25568,7 +25653,8 @@ function handleExport($xeTable, opts) {
           status: true,
           options: opts,
           $table: $xeTable,
-          $grid: $xeGrid
+          $grid: $xeGrid,
+          $gantt: $xeGantt
         });
       }
     }
@@ -25583,7 +25669,8 @@ function handleExport($xeTable, opts) {
           status: false,
           options: opts,
           $table: $xeTable,
-          $grid: $xeGrid
+          $grid: $xeGrid,
+          $gantt: $xeGantt
         });
       }
     }
@@ -25990,6 +26077,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
+  const $xeGGWrapper = $xeGrid || $xeGantt;
   const {
     treeConfig,
     showHeader,
@@ -26011,7 +26100,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   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({
@@ -26098,7 +26187,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
       exportParams.filename = filename({
         options: defOpts,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       });
     } else {
       exportParams.filename = `${filename}`;
@@ -26109,7 +26199,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
       exportParams.sheetName = sheetName({
         options: defOpts,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       });
     } else {
       exportParams.sheetName = `${sheetName}`;
@@ -26190,6 +26281,7 @@ const convertToRows = originColumns => {
       const internalData = $xeTable;
       const $xeGrid = $xeTable.$xeGrid;
       const $xeGantt = $xeTable.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         treeConfig,
         showHeader,
@@ -26208,7 +26300,7 @@ const convertToRows = originColumns => {
       } = 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,
@@ -26329,6 +26421,8 @@ const convertToRows = originColumns => {
           mapChildren: '_children'
         }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({
           $table: $xeTable,
+          $grid: $xeGrid,
+          $gantt: $xeGantt,
           column: column,
           $columnIndex: index
         })), {
@@ -26339,6 +26433,8 @@ const convertToRows = originColumns => {
       } else {
         groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({
           $table: $xeTable,
+          $grid: $xeGrid,
+          $gantt: $xeGantt,
           column,
           $columnIndex: index
         })), {
@@ -26365,7 +26461,8 @@ const convertToRows = originColumns => {
           handleOptions.filename = filename({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           });
         } else {
           handleOptions.filename = `${filename}`;
@@ -26379,7 +26476,8 @@ const convertToRows = originColumns => {
           handleOptions.sheetName = sheetName({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           });
         } else {
           handleOptions.sheetName = `${sheetName}`;
@@ -26404,7 +26502,8 @@ const convertToRows = originColumns => {
           beforeExportMethod({
             options: handleOptions,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           });
         }
       }
@@ -26419,12 +26518,12 @@ const convertToRows = originColumns => {
             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;
-            const proxyOpts = $xeGrid.computeProxyOpts;
+          if ($xeGGWrapper && !handleOptions.remote) {
+            const gridReactData = $xeGGWrapper;
+            const proxyOpts = $xeGGWrapper.computeProxyOpts;
             const {
               sortData
             } = gridReactData;
@@ -26546,10 +26645,12 @@ const convertToRows = originColumns => {
     _print(options) {
       const $xeTable = this;
       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,
@@ -26564,7 +26665,8 @@ const convertToRows = originColumns => {
           printTitle = sheetName({
             options: opts,
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           });
         } else {
           printTitle = `${sheetName}`;
@@ -26589,7 +26691,9 @@ const convertToRows = originColumns => {
                   html,
                   content: html,
                   options: opts,
-                  $table: $xeTable
+                  $table: $xeTable,
+                  $grid: $xeGrid,
+                  $gantt: $xeGantt
                 });
               } : undefined
             }));
@@ -26608,7 +26712,9 @@ const convertToRows = originColumns => {
                     html,
                     content: html,
                     options: opts,
-                    $table: $xeTable
+                    $table: $xeTable,
+                    $grid: $xeGrid,
+                    $gantt: $xeGantt
                   });
                 } : undefined
               });
@@ -28032,7 +28138,8 @@ function calcMaxHeight($xeTable) {
 }
 function emitCustomEvent($xeTable, type, evnt) {
   const $xeGrid = $xeTable.$xeGrid;
-  const comp = $xeGrid || $xeTable;
+  const $xeGantt = $xeTable.$xeGantt;
+  const comp = $xeGrid || $xeGantt || $xeTable;
   comp.dispatchEvent('custom', {
     type
   }, evnt);
@@ -28357,7 +28464,8 @@ function emitCustomEvent($xeTable, type, evnt) {
     emitCustomEvent(type, evnt) {
       const $xeTable = this;
       const $xeGrid = $xeTable.$xeGrid;
-      const comp = $xeGrid || $xeTable;
+      const $xeGantt = $xeTable.$xeGantt;
+      const comp = $xeGrid || $xeGantt || $xeTable;
       comp.dispatchEvent('custom', {
         type
       }, evnt);
@@ -28543,12 +28651,14 @@ function renderFixed(h, $xeTable, fixedType) {
 function renderEmptyBody(h, $xeTable) {
   const slots = $xeTable.$scopedSlots;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const emptyOpts = $xeTable.computeEmptyOpts;
   const emptySlot = slots.empty;
   let emptyContent = '';
   const emptyParams = {
     $table: $xeTable,
-    $grid: $xeGrid
+    $grid: $xeGrid,
+    $gantt: $xeGantt
   };
   if (emptySlot) {
     emptyContent = emptySlot.call($xeTable, emptyParams);
@@ -28645,6 +28755,7 @@ function renderRowExpandedVNs(h, $xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
   const {
     treeConfig
   } = props;
@@ -28721,8 +28832,9 @@ function renderRowExpandedVNs(h, $xeTable) {
         _columnIndex = colRest._index;
       }
       const expandParams = {
-        $grid: $xeGrid,
         $table: $xeTable,
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
         seq,
         column: expandColumn,
         columnIndex,
@@ -29145,6 +29257,7 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       const props = $xeTable;
       const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
       const {
         id
       } = props;
@@ -29152,7 +29265,8 @@ function renderBody(h, $xeTable) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(id)) {
           return `${id({
             $table: $xeTable,
-            $grid: $xeGrid
+            $grid: $xeGrid,
+            $gantt: $xeGantt
           }) || ''}`;
         }
         return `${id}`;
@@ -30296,6 +30410,7 @@ function renderBody(h, $xeTable) {
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const props = $xeTable;
     const slots = $xeTable.$scopedSlots;
     const reactData = $xeTable;
@@ -30467,6 +30582,7 @@ function renderBody(h, $xeTable) {
         default: () => $xeTable.callSlot(loadingSlot, {
           $table: $xeTable,
           $grid: $xeGrid,
+          $gantt: $xeGantt,
           loading: currLoading
         }, h)
       } : {}
@@ -30477,6 +30593,7 @@ function renderBody(h, $xeTable) {
     }, $xeTable.callSlot(loadingSlot, {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       loading: currLoading
     }, h)) : table_renderEmptyElement($xeTable),
     /**
@@ -30600,7 +30717,7 @@ function toolbar_createInternalData() {
     connectTable: null
   };
 }
-/* harmony default export */ var src_toolbar = (/* define-vxe-component start */defineVxeComponent({
+/* harmony default export */ var toolbar = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeToolbar',
   mixins: [toolbar_globalMixins.sizeMixin],
   props: {
@@ -31557,8 +31674,10 @@ function grid_createInternalData() {
   },
   provide() {
     const $xeGrid = this;
+    const $xeGantt = null;
     return {
-      $xeGrid
+      $xeGrid,
+      $xeGantt
     };
   },
   data() {
@@ -33123,9 +33242,8 @@ function grid_createInternalData() {
         toolbarConfig
       } = props;
       const toolbarSlot = slots.toolbar;
-      const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
       const toolbarOpts = $xeGrid.computeToolbarOpts;
-      if (hasToolbar) {
+      if (toolbarConfig && isEnableConf(toolbarOpts) || toolbarSlot) {
         return h('div', {
           key: 'toolbar',
           ref: 'refToolbarWrapper',
@@ -33133,7 +33251,7 @@ function grid_createInternalData() {
         }, toolbarSlot ? toolbarSlot.call($xeGrid, {
           $grid: $xeGrid,
           $gantt: null
-        }) : [h(src_toolbar, {
+        }) : [h(toolbar, {
           props: Object.assign({}, toolbarOpts, {
             slots: undefined
           }),
@@ -34810,15 +34928,15 @@ const Table = VxeTable;
 ;// CONCATENATED MODULE: ./packages/toolbar/index.ts
 
 
-const VxeToolbar = Object.assign({}, src_toolbar, {
+const VxeToolbar = Object.assign({}, toolbar, {
   install(app) {
-    app.component(src_toolbar.name, src_toolbar);
+    app.component(toolbar.name, toolbar);
   }
 });
 if (core_.VxeUI.dynamicApp) {
-  core_.VxeUI.dynamicApp.component(src_toolbar.name, src_toolbar);
+  core_.VxeUI.dynamicApp.component(toolbar.name, toolbar);
 }
-core_.VxeUI.component(src_toolbar);
+core_.VxeUI.component(toolbar);
 const Toolbar = VxeToolbar;
 /* harmony default export */ var packages_toolbar = ((/* unused pure expression or super */ null && (VxeToolbar)));
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
@@ -34843,6 +34961,7 @@ const Toolbar = VxeToolbar;
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
       modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
+      reqSupportProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
@@ -34880,7 +34999,8 @@ const Toolbar = VxeToolbar;
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
-      useNew: '不建议使用 {0}，请使用 {1}'
+      useNew: '不建议使用 {0}，请使用 {1}',
+      errorVersion: '版本不匹配，当前版本 {0}，最低支持版本为 {1}'
     },
     table: {
       emptyText: '暂无数据',