vxe-table 4.15.5 → 4.15.7

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

@@ -315,5 +315,8 @@ VxeUI.hooks.add('tableCustomModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableCustomMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableCustomMethodKeys);
     }
 });

package/es/table/module/edit/hook.js

@@ -973,5 +973,8 @@ hooks.add('tableEditModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableEditMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableEditMethodKeys);
     }
 });

package/es/table/module/export/hook.js

@@ -256,6 +256,7 @@ hooks.add('tableExportModule', {
         const { props, reactData, internalData } = $xeTable;
         const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts } = $xeTable.getComputeMaps();
         const $xeGrid = inject('$xeGrid', null);
+        const $xeGantt = inject('$xeGantt', null);
         const hasTreeChildren = (row) => {
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -1297,6 +1298,7 @@ hooks.add('tableExportModule', {
                                 const params = {
                                     $table: $xeTable,
                                     $grid: $xeGrid,
+                                    $gantt: $xeGantt,
                                     sort: sortData.length ? sortData[0] : {},
                                     sorts: sortData,
                                     filters: gridReactData.filterData,
@@ -1306,7 +1308,7 @@ hooks.add('tableExportModule', {
                                 return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
                                     .then(rest => {
                                     const listProp = resConfigs.list;
-                                    handleOptions.data = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, listProp)) : rest) || [];
+                                    handleOptions.data = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : XEUtils.get(rest, listProp)) : rest) || [];
                                     if (afterQueryAll) {
                                         afterQueryAll(params);
                                     }
@@ -1550,5 +1552,8 @@ hooks.add('tableExportModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableExportMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableExportMethodKeys);
     }
 });

package/es/table/module/filter/hook.js

@@ -344,5 +344,8 @@ hooks.add('tableFilterModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableFilterMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableFilterMethodKeys);
     }
 });

package/es/table/module/menu/hook.js

@@ -298,5 +298,8 @@ hooks.add('tableMenuModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableMenuMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableMenuMethodKeys);
     }
 });

package/es/table/module/validator/hook.js

@@ -595,5 +595,8 @@ hooks.add('tableValidatorModule', {
     },
     setupGrid($xeGrid) {
         return $xeGrid.extendTableMethods(tableValidatorMethodKeys);
+    },
+    setupGantt($xeGantt) {
+        return $xeGantt.extendTableMethods(tableValidatorMethodKeys);
     }
 });

package/es/table/src/emits.js

@@ -1,4 +1,4 @@
-export default [
+export const tableEmits = [
     'update:data',
     'keydown-start',
     'keydown',

package/es/table/src/props.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '../../ui';
 const { getConfig } = VxeUI;
-export default {
+export const tableProps = {
     /** 基本属性 */
     id: [String, Function],
     // 数据

package/es/table/src/table.js

@@ -12,13 +12,21 @@ import Cell from './cell';
 import TableBodyComponent from './body';
 import TableHeaderComponent from './header';
 import TableFooterComponent from './footer';
-import tableProps from './props';
-import tableEmits from './emits';
+import { tableProps } from './props';
+import { tableEmits } from './emits';
 import TableCustomPanelComponent from '../module/custom/panel';
 import TableFilterPanelComponent from '../module/filter/panel';
 import TableImportPanelComponent from '../module/export/import-panel';
 import TableExportPanelComponent from '../module/export/export-panel';
 import TableMenuPanelComponent from '../module/menu/panel';
+import '../module/filter/hook';
+import '../module/menu/hook';
+import '../module/edit/hook';
+import '../module/export/hook';
+import '../module/keyboard/hook';
+import '../module/validator/hook';
+import '../module/custom/hook';
+import '../render';
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI;
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -83,6 +91,8 @@ export default defineVxeComponent({
             rowGroupColumn: null,
             // 展开列信息
             expandColumn: null,
+            checkboxColumn: null,
+            radioColumn: null,
             // 树节点列信息
             treeNodeColumn: null,
             hasFixedColumn: false,
@@ -319,6 +329,7 @@ export default defineVxeComponent({
         const refScrollXSpaceElem = ref();
         const refScrollYSpaceElem = ref();
         const $xeGrid = inject('$xeGrid', null);
+        const $xeGantt = inject('$xeGantt', null);
         let $xeToolbar;
         const computeTableId = computed(() => {
             const { id } = props;
@@ -797,6 +808,8 @@ export default defineVxeComponent({
             getRefMaps: () => refMaps,
             getComputeMaps: () => computeMaps,
             xeGrid: $xeGrid,
+            xeGantt: $xeGantt,
+            // 已废弃
             xegrid: $xeGrid
         };
         const eqCellValue = (row1, row2, field) => {
@@ -1576,6 +1589,8 @@ export default defineVxeComponent({
             reactData.rowGroupColumn = rowGroupColumn;
             reactData.treeNodeColumn = treeNodeColumn;
             reactData.expandColumn = expandColumn;
+            reactData.checkboxColumn = checkboxColumn;
+            reactData.radioColumn = radioColumn;
             reactData.isAllOverflow = isAllOverflow;
         };
         const updateHeight = () => {
@@ -2141,50 +2156,67 @@ export default defineVxeComponent({
         const updateStyle = () => {
             const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
             const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData;
-            const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+            const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData;
+            const $xeGanttView = internalData.xeGanttView;
             const el = refElem.value;
-            if (!el) {
+            if (!el || !el.clientHeight) {
                 return;
             }
             const containerList = ['main', 'left', 'right'];
-            const osbWidth = overflowY ? scrollbarWidth : 0;
-            const osbHeight = overflowX ? scrollbarHeight : 0;
+            let osbWidth = overflowY ? scrollbarWidth : 0;
+            let osbHeight = overflowX ? scrollbarHeight : 0;
             const emptyPlaceholderElem = refEmptyPlaceholder.value;
+            const scrollbarOpts = computeScrollbarOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const expandOpts = computeExpandOpts.value;
             const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
             const bodyTableElem = getRefElem(elemStore['main-body-table']);
             if (emptyPlaceholderElem) {
-                emptyPlaceholderElem.style.top = `${headerHeight}px`;
+                emptyPlaceholderElem.style.top = `${tHeaderHeight}px`;
                 emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
             }
-            let bodyHeight = 0;
+            const scrollbarXToTop = computeScrollbarXToTop.value;
+            const scrollbarYToLeft = computeScrollbarYToLeft.value;
+            let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
+            if ($xeGanttView) {
+                osbHeight = scrollbarHeight;
+                xScrollbarVisible = 'visible';
+            }
+            else if (scrollbarOpts.x && scrollbarOpts.x.visible === false) {
+                osbHeight = 0;
+                xScrollbarVisible = 'hidden';
+            }
+            let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+            if ((scrollbarOpts.y && scrollbarOpts.y.visible === false) || ($xeGanttView && !scrollbarYToLeft)) {
+                osbWidth = 0;
+                yScrollbarVisible = 'hidden';
+            }
+            let tbHeight = 0;
             let bodyMaxHeight = 0;
-            const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight;
+            const bodyMinHeight = customMinHeight - tHeaderHeight - tFooterHeight - osbHeight;
             if (customMaxHeight) {
-                bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight);
+                bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - tHeaderHeight - tFooterHeight - osbHeight);
             }
             if (customHeight) {
-                bodyHeight = customHeight - headerHeight - footerHeight - osbHeight;
+                tbHeight = customHeight - tHeaderHeight - tFooterHeight - osbHeight;
             }
-            if (!bodyHeight) {
+            if (!tbHeight) {
                 if (bodyTableElem) {
-                    bodyHeight = bodyTableElem.clientHeight;
+                    tbHeight = bodyTableElem.clientHeight;
                 }
             }
-            if (bodyHeight) {
+            if (tbHeight) {
                 if (bodyMaxHeight) {
-                    bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
+                    tbHeight = Math.min(bodyMaxHeight, tbHeight);
                 }
-                bodyHeight = Math.max(bodyMinHeight, bodyHeight);
+                tbHeight = Math.max(bodyMinHeight, tbHeight);
             }
-            const scrollbarXToTop = computeScrollbarXToTop.value;
             const xLeftCornerEl = refScrollXLeftCornerElem.value;
             const xRightCornerEl = refScrollXRightCornerElem.value;
             const scrollXVirtualEl = refScrollXVirtualElem.value;
             if (scrollXVirtualEl) {
                 scrollXVirtualEl.style.height = `${osbHeight}px`;
-                scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden';
+                scrollXVirtualEl.style.visibility = xScrollbarVisible;
             }
             const xWrapperEl = refScrollXWrapperElem.value;
             if (xWrapperEl) {
@@ -2202,30 +2234,31 @@ export default defineVxeComponent({
             const scrollYVirtualEl = refScrollYVirtualElem.value;
             if (scrollYVirtualEl) {
                 scrollYVirtualEl.style.width = `${osbWidth}px`;
-                scrollYVirtualEl.style.height = `${bodyHeight + headerHeight + footerHeight}px`;
-                scrollYVirtualEl.style.visibility = overflowY ? 'visible' : 'hidden';
+                scrollYVirtualEl.style.height = `${tbHeight + tHeaderHeight + tFooterHeight}px`;
+                scrollYVirtualEl.style.visibility = yScrollbarVisible;
             }
             const yTopCornerEl = refScrollYTopCornerElem.value;
             if (yTopCornerEl) {
-                yTopCornerEl.style.height = `${headerHeight}px`;
-                yTopCornerEl.style.display = overflowY && headerHeight ? 'block' : '';
+                yTopCornerEl.style.height = `${tHeaderHeight}px`;
+                yTopCornerEl.style.display = overflowY && tHeaderHeight ? 'block' : '';
             }
             const yWrapperEl = refScrollYWrapperElem.value;
             if (yWrapperEl) {
-                yWrapperEl.style.height = `${bodyHeight}px`;
-                yWrapperEl.style.top = `${headerHeight}px`;
+                yWrapperEl.style.height = `${tbHeight}px`;
+                yWrapperEl.style.top = `${tHeaderHeight}px`;
             }
             const yBottomCornerEl = refScrollYBottomCornerElem.value;
             if (yBottomCornerEl) {
-                yBottomCornerEl.style.height = `${footerHeight}px`;
-                yBottomCornerEl.style.top = `${headerHeight + bodyHeight}px`;
-                yBottomCornerEl.style.display = overflowY && footerHeight ? 'block' : '';
+                yBottomCornerEl.style.height = `${tFooterHeight}px`;
+                yBottomCornerEl.style.top = `${tHeaderHeight + tbHeight}px`;
+                yBottomCornerEl.style.display = overflowY && tFooterHeight ? 'block' : '';
             }
             const rowExpandEl = refRowExpandElem.value;
             if (rowExpandEl) {
-                rowExpandEl.style.height = `${bodyHeight}px`;
-                rowExpandEl.style.top = `${headerHeight}px`;
+                rowExpandEl.style.height = `${tbHeight}px`;
+                rowExpandEl.style.top = `${tHeaderHeight}px`;
             }
+            internalData.tBodyHeight = tbHeight;
             containerList.forEach((name, index) => {
                 const fixedType = index > 0 ? name : '';
                 const layoutList = ['header', 'body', 'footer'];
@@ -2289,7 +2322,7 @@ export default defineVxeComponent({
                             }
                         }
                         if (currScrollElem) {
-                            currScrollElem.style.height = `${headerHeight}px`;
+                            currScrollElem.style.height = `${tHeaderHeight}px`;
                         }
                         if (tableElem) {
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
@@ -2298,15 +2331,15 @@ export default defineVxeComponent({
                     else if (layout === 'body') {
                         if (currScrollElem) {
                             currScrollElem.style.maxHeight = customMaxHeight ? `${bodyMaxHeight}px` : '';
-                            currScrollElem.style.height = customHeight ? `${bodyHeight}px` : '';
+                            currScrollElem.style.height = customHeight ? `${tbHeight}px` : '';
                             currScrollElem.style.minHeight = `${bodyMinHeight}px`;
                         }
                         // 如果是固定列
                         if (fixedWrapperElem) {
                             if (wrapperElem) {
-                                wrapperElem.style.top = `${headerHeight}px`;
+                                wrapperElem.style.top = `${tHeaderHeight}px`;
                             }
-                            fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : (tableHeight + headerHeight + footerHeight + osbHeight)}px`;
+                            fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : (tableHeight + tHeaderHeight + tFooterHeight + osbHeight)}px`;
                             fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
                         }
                         let renderColumnList = tableColumn;
@@ -2383,11 +2416,11 @@ export default defineVxeComponent({
                             }
                         }
                         if (currScrollElem) {
-                            currScrollElem.style.height = `${footerHeight}px`;
+                            currScrollElem.style.height = `${tFooterHeight}px`;
                             // 如果是固定列
                             if (fixedWrapperElem) {
                                 if (wrapperElem) {
-                                    wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - osbHeight : tableHeight + headerHeight}px`;
+                                    wrapperElem.style.top = `${customHeight > 0 ? customHeight - tFooterHeight - osbHeight : tableHeight + tHeaderHeight}px`;
                                 }
                             }
                         }
@@ -2403,6 +2436,9 @@ export default defineVxeComponent({
             if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
                 $xeTable.addCellSelectedClass();
             }
+            if ($xeGanttView) {
+                $xeGanttView.handleUpdateStyle();
+            }
             return nextTick();
         };
         const checkValidate = (type) => {
@@ -2978,13 +3014,13 @@ export default defineVxeComponent({
                 if (xHandleEl) {
                     reactData.scrollbarHeight = scrollbarOpts.height || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14;
                 }
-                const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0;
-                const footerHeight = footerTableElem ? footerTableElem.clientHeight : 0;
+                const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
+                const fHeight = footerTableElem ? footerTableElem.clientHeight : 0;
                 internalData.tableHeight = bodyWrapperElem.offsetHeight;
-                internalData.headerHeight = headerHeight;
-                internalData.footerHeight = footerHeight;
+                internalData.tHeaderHeight = hHeight;
+                internalData.tFooterHeight = fHeight;
                 reactData.overflowX = overflowX;
-                reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
+                reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight());
             }
             if (overflowX) {
                 $xeTable.checkScrolling();
@@ -3037,6 +3073,7 @@ export default defineVxeComponent({
         };
         const handleLazyRecalculate = (reFull, reWidth, reHeight) => {
             return new Promise(resolve => {
+                const $xeGanttView = internalData.xeGanttView;
                 const { rceTimeout, rceRunTime } = internalData;
                 const resizeOpts = computeResizeOpts.value;
                 const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -3059,12 +3096,18 @@ export default defineVxeComponent({
                 else {
                     resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                 }
+                if ($xeGanttView) {
+                    $xeGanttView.handleLazyRecalculate();
+                }
                 internalData.rceTimeout = setTimeout(() => {
                     internalData.rceTimeout = undefined;
                     handleRecalculateStyle(reFull, reWidth, reHeight);
                 }, refreshDelay);
             });
         };
+        const handleResizeEvent = () => {
+            handleLazyRecalculate(true, true, true);
+        };
         const handleUpdateAggValues = () => {
             const { visibleColumn } = internalData;
             const aggCols = [];
@@ -3931,13 +3974,13 @@ export default defineVxeComponent({
             }, fpsTime);
         };
         const checkLastSyncScroll = (isRollX, isRollY) => {
-            const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
             const { lcsTimeout } = internalData;
             reactData.lazScrollLoading = true;
             if (lcsTimeout) {
                 clearTimeout(lcsTimeout);
             }
             internalData.lcsTimeout = setTimeout(() => {
+                const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
                 internalData.lcsRunTime = Date.now();
                 internalData.lcsTimeout = undefined;
                 internalData.intoRunScroll = false;
@@ -4015,6 +4058,17 @@ export default defineVxeComponent({
             };
             requestAnimationFrame(step);
         };
+        const syncGanttScrollTop = (scrollTop) => {
+            const $xeGanttView = internalData.xeGanttView;
+            if ($xeGanttView) {
+                const ganttInternalData = $xeGanttView.internalData;
+                const { elemStore: ganttElemStore } = ganttInternalData;
+                const ganttBodyScrollElem = getRefElem(ganttElemStore['main-body-scroll']);
+                if (ganttBodyScrollElem) {
+                    ganttBodyScrollElem.scrollTop = scrollTop;
+                }
+            }
+        };
         const dispatchEvent = (type, params, evnt) => {
             emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
         };
@@ -6907,11 +6961,18 @@ export default defineVxeComponent({
                 internalData.isActivated = false;
                 return nextTick();
             },
+            /**
+             * 已废弃，被 connectToolbar 替换
+             * @deprecated
+             */
+            connect($toolbar) {
+                return $xeTable.connectToolbar($toolbar);
+            },
             /**
              * 连接工具栏
              * @param $toolbar
              */
-            connect($toolbar) {
+            connectToolbar($toolbar) {
                 if ($toolbar) {
                     $xeToolbar = $toolbar;
                     $xeToolbar.syncUpdate({ collectColumn: internalData.collectColumn, $table: $xeTable });
@@ -7491,7 +7552,7 @@ export default defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
-            handleLazyRecalculate(true, true, true);
+            handleResizeEvent();
             $xeTable.updateCellAreas();
         };
         const handleTargetEnterEvent = (isClear) => {
@@ -7843,6 +7904,7 @@ export default defineVxeComponent({
             handleTableData(force) {
                 const { scrollYLoad } = reactData;
                 const { scrollYStore, fullDataRowIdData } = internalData;
+                const $xeGanttView = internalData.xeGanttView;
                 let fullList = internalData.afterFullData;
                 // 是否进行数据处理
                 if (force) {
@@ -7863,6 +7925,9 @@ export default defineVxeComponent({
                 });
                 reactData.tableData = tableData;
                 internalData.visibleDataRowIdData = visibleDataRowIdMaps;
+                if ($xeGanttView) {
+                    $xeGanttView.updateViewData();
+                }
                 return nextTick();
             },
             /**
@@ -8940,8 +9005,8 @@ export default defineVxeComponent({
              * 如果是双击模式，则单击后选中状态
              */
             triggerCellClickEvent(evnt, params) {
-                const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
-                const { editStore, isDragResize } = reactData;
+                const { treeConfig, highlightCurrentRow, highlightCurrentColumn, editConfig, aggregateConfig, rowGroupConfig } = props;
+                const { editStore, isDragResize, expandColumn, checkboxColumn, radioColumn } = reactData;
                 if (isDragResize) {
                     return;
                 }
@@ -8970,15 +9035,15 @@ export default defineVxeComponent({
                 params = Object.assign({ cell, triggerRadio, triggerCheckbox, triggerTreeNode, triggerExpandNode }, params);
                 if (!triggerCheckbox && !triggerRadio) {
                     // 如果是展开行
-                    if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
+                    if (!triggerExpandNode && ((expandColumn && expandOpts.trigger === 'row') || (isExpandType && expandOpts.trigger === 'cell'))) {
                         $xeTable.triggerRowExpandEvent(evnt, params);
                     }
                     // 如果是树形表格
-                    if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
+                    if (treeConfig && (treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
                         $xeTable.triggerTreeExpandEvent(evnt, params);
                     }
                     // 如果是行分组
-                    if ((aggregateOpts.trigger === 'row' || (rowGroupNode && aggregateOpts.trigger === 'cell'))) {
+                    if ((aggregateConfig || rowGroupConfig) && (aggregateOpts.trigger === 'row' || (rowGroupNode && aggregateOpts.trigger === 'cell'))) {
                         $xeTable.triggerRowGroupExpandEvent(evnt, params);
                     }
                 }
@@ -8998,11 +9063,11 @@ export default defineVxeComponent({
                             }
                         }
                         // 如果是单选框
-                        if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
+                        if (!triggerRadio && ((radioColumn && radioOpts.trigger === 'row') || (isRadioType && radioOpts.trigger === 'cell'))) {
                             $xeTable.triggerRadioRowEvent(evnt, params);
                         }
                         // 如果是复选框
-                        if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
+                        if (!triggerCheckbox && ((checkboxColumn && checkboxOpts.trigger === 'row') || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
                             $xeTable.handleToggleCheckRowEvent(evnt, params);
                         }
                     }
@@ -10379,6 +10444,7 @@ export default defineVxeComponent({
                     }
                     setScrollTop(yHandleEl, scrollTop);
                     setScrollTop(rowExpandEl, scrollTop);
+                    syncGanttScrollTop(scrollTop);
                     if (scrollYLoad) {
                         $xeTable.triggerScrollYEvent(evnt);
                     }
@@ -10567,6 +10633,7 @@ export default defineVxeComponent({
                         setScrollTop(leftScrollElem, currTopNum);
                         setScrollTop(rightScrollElem, currTopNum);
                         setScrollTop(rowExpandEl, currTopNum);
+                        syncGanttScrollTop(currTopNum);
                         if (scrollYLoad) {
                             $xeTable.triggerScrollYEvent(evnt);
                         }
@@ -10584,6 +10651,7 @@ export default defineVxeComponent({
                             setScrollTop(leftScrollElem, currTopNum);
                             setScrollTop(rightScrollElem, currTopNum);
                             setScrollTop(rowExpandEl, currTopNum);
+                            syncGanttScrollTop(currTopNum);
                             if (scrollYLoad) {
                                 $xeTable.triggerScrollYEvent(evnt);
                             }
@@ -10657,6 +10725,7 @@ export default defineVxeComponent({
                 setScrollTop(leftScrollElem, scrollTop);
                 setScrollTop(rightScrollElem, scrollTop);
                 setScrollTop(rowExpandEl, scrollTop);
+                syncGanttScrollTop(scrollTop);
                 if (scrollYLoad) {
                     $xeTable.triggerScrollYEvent(evnt);
                 }
@@ -10696,6 +10765,7 @@ export default defineVxeComponent({
             updateScrollXSpace() {
                 const { scrollXLoad, overflowX, scrollXWidth } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
+                const $xeGanttView = internalData.xeGanttView;
                 const mouseOpts = computeMouseOpts.value;
                 const tableBody = refTableBody.value;
                 const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -10757,10 +10827,13 @@ export default defineVxeComponent({
                     if (scrollXSpaceEl) {
                         scrollXSpaceEl.style.width = `${ySpaceWidth}px`;
                     }
+                    calcScrollbar();
                     if (isScrollXBig && mouseOpts.area) {
                         errLog('vxe.error.notProp', ['mouse-config.area']);
                     }
-                    calcScrollbar();
+                    if ($xeGanttView) {
+                        $xeGanttView.updateScrollXSpace();
+                    }
                     return nextTick().then(() => {
                         updateStyle();
                     });
@@ -10770,6 +10843,7 @@ export default defineVxeComponent({
             updateScrollYSpace() {
                 const { isAllOverflow, overflowY, scrollYLoad, expandColumn } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
+                const $xeGanttView = internalData.xeGanttView;
                 const { startIndex } = scrollYStore;
                 const mouseOpts = computeMouseOpts.value;
                 const expandOpts = computeExpandOpts.value;
@@ -10865,10 +10939,13 @@ export default defineVxeComponent({
                 reactData.scrollYTop = scrollYTop;
                 reactData.scrollYHeight = scrollYHeight;
                 reactData.isScrollYBig = isScrollYBig;
+                calcScrollbar();
                 if (isScrollYBig && mouseOpts.area) {
                     errLog('vxe.error.notProp', ['mouse-config.area']);
                 }
-                calcScrollbar();
+                if ($xeGanttView) {
+                    $xeGanttView.updateScrollYSpace();
+                }
                 return nextTick().then(() => {
                     updateStyle();
                 });
@@ -10974,6 +11051,13 @@ export default defineVxeComponent({
                     return getRowid($xeTable, row1) === getRowid($xeTable, row2);
                 }
                 return false;
+            },
+            handleConnectGanttView($ganttView) {
+                if ($ganttView && $ganttView.connectUpdate) {
+                    $ganttView.connectUpdate({ $table: $xeTable });
+                    internalData.xeGanttView = $ganttView;
+                }
+                return nextTick();
             }
         };
         // 检测对应模块是否安装
@@ -11998,7 +12082,7 @@ export default defineVxeComponent({
                     const parentEl = tablePrivateMethods.getParentElem();
                     resizeObserver = globalResize.create(() => {
                         if (props.autoResize) {
-                            tableMethods.recalculate(true);
+                            handleResizeEvent();
                         }
                     });
                     if (el) {

package/es/table/src/util.js

@@ -33,10 +33,6 @@ export function createInternalData() {
         tableWidth: 0,
         // 表格高度
         tableHeight: 0,
-        // 表头高度
-        headerHeight: 0,
-        // 表尾高度
-        footerHeight: 0,
         customHeight: 0,
         customMinHeight: 0,
         customMaxHeight: 0,
@@ -113,6 +109,12 @@ export function createInternalData() {
         // 已删除行
         removeRowMaps: {},
         cvCacheMaps: {},
+        // 表头高度
+        tHeaderHeight: 0,
+        // 表体高度
+        tBodyHeight: 0,
+        // 表尾高度
+        tFooterHeight: 0,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,

package/es/toolbar/src/toolbar.js

@@ -276,7 +276,7 @@ export default defineVxeComponent({
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $event };
+                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {
@@ -303,7 +303,7 @@ export default defineVxeComponent({
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $event };
+                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {