vxe-table 3.17.8 → 3.17.9

package/lib/table/src/methods.js

@@ -458,6 +458,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) {
@@ -1235,9 +1237,7 @@ function updateStyle($xeTable) {
     editStore,
     isAllOverflow,
     expandColumn,
-    isColLoading,
-    tHeaderHeight,
-    tFooterHeight
+    isColLoading
   } = reactData;
   const {
     visibleColumn,
@@ -1245,7 +1245,9 @@ function updateStyle($xeTable) {
     elemStore,
     customHeight,
     customMinHeight,
-    customMaxHeight
+    customMaxHeight,
+    tHeaderHeight,
+    tFooterHeight
   } = internalData;
   const $xeGanttView = internalData.xeGanttView;
   const el = $xeTable.$refs.refElem;
@@ -1254,8 +1256,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 = (0, _util.getRefElem)(elemStore['main-body-wrapper']);
@@ -1266,13 +1269,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;
@@ -1341,7 +1349,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'];
@@ -3230,8 +3238,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());
   }
@@ -3321,6 +3329,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;
@@ -4123,11 +4134,6 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    scrollXLoad,
-    scrollYLoad,
-    isAllOverflow
-  } = reactData;
   const {
     lcsTimeout
   } = internalData;
@@ -4135,6 +4141,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;
@@ -6952,6 +6963,10 @@ const Methods = {
       }, 10);
     });
   },
+  handleResizeEvent() {
+    const $xeTable = this;
+    handleResizeEvent($xeTable);
+  },
   /**
    * 重新渲染布局
    * 刷新布局
@@ -7635,7 +7650,7 @@ const Methods = {
     const $xeTable = this;
     $xeTable.closeMenu();
     $xeTable.updateCellAreas();
-    handleLazyRecalculate($xeTable, true, true, true);
+    handleResizeEvent($xeTable);
     $xeTable.updateCellAreas();
   },
   /**
@@ -9063,13 +9078,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;
@@ -9115,15 +9136,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);
       }
     }
@@ -9143,11 +9164,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);
         }
       }