vxe-table 3.17.8 → 3.17.9

package/es/table/src/methods.js

@@ -362,6 +362,8 @@ function cacheColumnMap($xeTable) {
     reactData.rowGroupColumn = rowGroupColumn;
     reactData.treeNodeColumn = treeNodeColumn;
     reactData.expandColumn = expandColumn;
+    reactData.checkboxColumn = checkboxColumn;
+    reactData.radioColumn = radioColumn;
     reactData.isAllOverflow = isAllOverflow;
 }
 function updateScrollXStatus($xeTable, fullColumn) {
@@ -931,8 +933,8 @@ function updateStyle($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     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, tHeaderHeight, tFooterHeight } = reactData;
-    const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+    const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData;
+    const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData;
     const $xeGanttView = internalData.xeGanttView;
     const el = $xeTable.$refs.refElem;
     if (!el || !el.clientHeight) {
@@ -940,8 +942,9 @@ function updateStyle($xeTable) {
     }
     const containerList = ['main', 'left', 'right'];
     let osbWidth = overflowY ? scrollbarWidth : 0;
-    const osbHeight = overflowX ? scrollbarHeight : 0;
+    let osbHeight = overflowX ? scrollbarHeight : 0;
     const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
+    const scrollbarOpts = $xeTable.computeScrollbarOpts;
     const mouseOpts = $xeTable.computeMouseOpts;
     const expandOpts = $xeTable.computeExpandOpts;
     const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -952,13 +955,19 @@ function updateStyle($xeTable) {
     }
     const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
     const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
-    const xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-    let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+    let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
     if ($xeGanttView) {
-        if (!scrollbarYToLeft) {
-            osbWidth = 0;
-            yScrollbarVisible = 'hidden';
-        }
+        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;
@@ -1027,7 +1036,7 @@ function updateStyle($xeTable) {
         rowExpandEl.style.height = `${tbHeight}px`;
         rowExpandEl.style.top = `${tHeaderHeight}px`;
     }
-    reactData.tBodyHeight = tbHeight;
+    internalData.tBodyHeight = tbHeight;
     containerList.forEach((name, index) => {
         const fixedType = index > 0 ? name : '';
         const layoutList = ['header', 'body', 'footer'];
@@ -2673,8 +2682,8 @@ function calcScrollbar($xeTable) {
         const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
         const fHeight = footerTableElem ? footerTableElem.clientHeight : 0;
         internalData.tableHeight = bodyWrapperElem.offsetHeight;
-        reactData.tHeaderHeight = hHeight;
-        reactData.tFooterHeight = fHeight;
+        internalData.tHeaderHeight = hHeight;
+        internalData.tFooterHeight = fHeight;
         reactData.overflowX = overflowX;
         reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight());
     }
@@ -2763,6 +2772,9 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
         }, refreshDelay);
     });
 }
+function handleResizeEvent($xeTable) {
+    handleLazyRecalculate($xeTable, true, true, true);
+}
 function handleUpdateAggValues($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -3453,12 +3465,12 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
     const { lcsTimeout } = internalData;
     if (lcsTimeout) {
         clearTimeout(lcsTimeout);
     }
     internalData.lcsTimeout = setTimeout(() => {
+        const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
         internalData.lcsRunTime = Date.now();
         internalData.lcsTimeout = undefined;
         internalData.intoRunScroll = false;
@@ -5919,6 +5931,10 @@ const Methods = {
             }, 10);
         });
     },
+    handleResizeEvent() {
+        const $xeTable = this;
+        handleResizeEvent($xeTable);
+    },
     /**
      * 重新渲染布局
      * 刷新布局
@@ -6538,7 +6554,7 @@ const Methods = {
         const $xeTable = this;
         $xeTable.closeMenu();
         $xeTable.updateCellAreas();
-        handleLazyRecalculate($xeTable, true, true, true);
+        handleResizeEvent($xeTable);
         $xeTable.updateCellAreas();
     },
     /**
@@ -7723,8 +7739,8 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
-        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;
         }
@@ -7753,15 +7769,15 @@ const Methods = {
         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);
             }
         }
@@ -7781,11 +7797,11 @@ const Methods = {
                     }
                 }
                 // 如果是单选框
-                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);
                 }
             }

package/es/table/src/table.js

@@ -489,12 +489,6 @@ export default {
             scrollbarHeight: 0,
             // 行高
             rowHeight: 0,
-            // 表头高度
-            tHeaderHeight: 0,
-            // 表体高度
-            tBodyHeight: 0,
-            // 表尾高度
-            tFooterHeight: 0,
             // 表格父容器的高度
             parentHeight: 0,
             // 是否使用分组表头
@@ -516,6 +510,8 @@ export default {
             rowGroupColumn: null,
             // 展开列信息
             expandColumn: null,
+            checkboxColumn: null,
+            radioColumn: null,
             hasFixedColumn: false,
             // 树节点列信息
             treeNodeColumn: null,
@@ -1713,7 +1709,7 @@ export default {
             if (this.autoResize) {
                 const resizeObserver = globalResize.create(() => {
                     if (this.autoResize) {
-                        this.recalculate(true);
+                        this.handleResizeEvent();
                     }
                 });
                 resizeObserver.observe(this.$el);

package/es/table/src/util.js

@@ -109,6 +109,12 @@ export function createInternalData() {
         // 已删除行
         removeRowMaps: {},
         cvCacheMaps: {},
+        // 表头高度
+        tHeaderHeight: 0,
+        // 表体高度
+        tBodyHeight: 0,
+        // 表尾高度
+        tFooterHeight: 0,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,

package/es/ui/index.js

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

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.8";
+const version = "3.17.9";
 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.8"}`;
+const log_version = `table v${"3.17.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2994,6 +2994,12 @@ function createInternalData() {
     // 已删除行
     removeRowMaps: {},
     cvCacheMaps: {},
+    // 表头高度
+    tHeaderHeight: 0,
+    // 表体高度
+    tBodyHeight: 0,
+    // 表尾高度
+    tFooterHeight: 0,
     inited: false,
     tooltipTimeout: null,
     initStatus: false,
@@ -6127,6 +6133,8 @@ function cacheColumnMap($xeTable) {
   reactData.rowGroupColumn = rowGroupColumn;
   reactData.treeNodeColumn = treeNodeColumn;
   reactData.expandColumn = expandColumn;
+  reactData.checkboxColumn = checkboxColumn;
+  reactData.radioColumn = radioColumn;
   reactData.isAllOverflow = isAllOverflow;
 }
 function updateScrollXStatus($xeTable, fullColumn) {
@@ -6904,9 +6912,7 @@ function updateStyle($xeTable) {
     editStore,
     isAllOverflow,
     expandColumn,
-    isColLoading,
-    tHeaderHeight,
-    tFooterHeight
+    isColLoading
   } = reactData;
   const {
     visibleColumn,
@@ -6914,7 +6920,9 @@ function updateStyle($xeTable) {
     elemStore,
     customHeight,
     customMinHeight,
-    customMaxHeight
+    customMaxHeight,
+    tHeaderHeight,
+    tFooterHeight
   } = internalData;
   const $xeGanttView = internalData.xeGanttView;
   const el = $xeTable.$refs.refElem;
@@ -6923,8 +6931,9 @@ function updateStyle($xeTable) {
   }
   const containerList = ['main', 'left', 'right'];
   let osbWidth = overflowY ? scrollbarWidth : 0;
-  const osbHeight = overflowX ? scrollbarHeight : 0;
+  let osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
+  const scrollbarOpts = $xeTable.computeScrollbarOpts;
   const mouseOpts = $xeTable.computeMouseOpts;
   const expandOpts = $xeTable.computeExpandOpts;
   const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -6935,13 +6944,18 @@ function updateStyle($xeTable) {
   }
   const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
   const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
-  const xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-  let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+  let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
   if ($xeGanttView) {
-    if (!scrollbarYToLeft) {
-      osbWidth = 0;
-      yScrollbarVisible = 'hidden';
-    }
+    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;
@@ -7010,7 +7024,7 @@ function updateStyle($xeTable) {
     rowExpandEl.style.height = `${tbHeight}px`;
     rowExpandEl.style.top = `${tHeaderHeight}px`;
   }
-  reactData.tBodyHeight = tbHeight;
+  internalData.tBodyHeight = tbHeight;
   containerList.forEach((name, index) => {
     const fixedType = index > 0 ? name : '';
     const layoutList = ['header', 'body', 'footer'];
@@ -8899,8 +8913,8 @@ function calcScrollbar($xeTable) {
     const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
     const fHeight = footerTableElem ? footerTableElem.clientHeight : 0;
     internalData.tableHeight = bodyWrapperElem.offsetHeight;
-    reactData.tHeaderHeight = hHeight;
-    reactData.tFooterHeight = fHeight;
+    internalData.tHeaderHeight = hHeight;
+    internalData.tFooterHeight = fHeight;
     reactData.overflowX = overflowX;
     reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight());
   }
@@ -8990,6 +9004,9 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
     }, refreshDelay);
   });
 }
+function handleResizeEvent($xeTable) {
+  handleLazyRecalculate($xeTable, true, true, true);
+}
 function handleUpdateAggValues($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -9792,11 +9809,6 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    scrollXLoad,
-    scrollYLoad,
-    isAllOverflow
-  } = reactData;
   const {
     lcsTimeout
   } = internalData;
@@ -9804,6 +9816,11 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     clearTimeout(lcsTimeout);
   }
   internalData.lcsTimeout = setTimeout(() => {
+    const {
+      scrollXLoad,
+      scrollYLoad,
+      isAllOverflow
+    } = reactData;
     internalData.lcsRunTime = Date.now();
     internalData.lcsTimeout = undefined;
     internalData.intoRunScroll = false;
@@ -12627,6 +12644,10 @@ const Methods = {
       }, 10);
     });
   },
+  handleResizeEvent() {
+    const $xeTable = this;
+    handleResizeEvent($xeTable);
+  },
   /**
    * 重新渲染布局
    * 刷新布局
@@ -13311,7 +13332,7 @@ const Methods = {
     const $xeTable = this;
     $xeTable.closeMenu();
     $xeTable.updateCellAreas();
-    handleLazyRecalculate($xeTable, true, true, true);
+    handleResizeEvent($xeTable);
     $xeTable.updateCellAreas();
   },
   /**
@@ -14743,13 +14764,19 @@ const Methods = {
     const props = $xeTable;
     const reactData = $xeTable;
     const {
+      treeConfig,
       highlightCurrentRow,
       highlightCurrentColumn,
-      editConfig
+      editConfig,
+      aggregateConfig,
+      rowGroupConfig
     } = props;
     const {
       editStore,
-      isDragResize
+      isDragResize,
+      expandColumn,
+      checkboxColumn,
+      radioColumn
     } = reactData;
     if (isDragResize) {
       return;
@@ -14795,15 +14822,15 @@ const Methods = {
     }, 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);
       }
     }
@@ -14823,11 +14850,11 @@ const Methods = {
           }
         }
         // 如果是单选框
-        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);
         }
       }
@@ -28890,12 +28917,6 @@ function renderBody(h, $xeTable) {
       scrollbarHeight: 0,
       // 行高
       rowHeight: 0,
-      // 表头高度
-      tHeaderHeight: 0,
-      // 表体高度
-      tBodyHeight: 0,
-      // 表尾高度
-      tFooterHeight: 0,
       // 表格父容器的高度
       parentHeight: 0,
       // 是否使用分组表头
@@ -28917,6 +28938,8 @@ function renderBody(h, $xeTable) {
       rowGroupColumn: null,
       // 展开列信息
       expandColumn: null,
+      checkboxColumn: null,
+      radioColumn: null,
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
@@ -30212,7 +30235,7 @@ function renderBody(h, $xeTable) {
       if (this.autoResize) {
         const resizeObserver = table_globalResize.create(() => {
           if (this.autoResize) {
-            this.recalculate(true);
+            this.handleResizeEvent();
           }
         });
         resizeObserver.observe(this.$el);