vxe-table 3.19.0 → 3.19.1

package/lib/table/src/methods.js

@@ -1274,7 +1274,7 @@ function updateStyle($xeTable) {
   } = internalData;
   const $xeGanttView = internalData.xeGanttView;
   const el = $xeTable.$refs.refElem;
-  if (!el || !el.clientHeight) {
+  if (!el || internalData.tBodyHeight && !el.clientHeight) {
     return;
   }
   const containerList = ['main', 'left', 'right'];
@@ -2778,7 +2778,8 @@ function calcTableHeight($xeTable, key) {
   const props = $xeTable;
   const reactData = $xeTable;
   const {
-    editConfig
+    editConfig,
+    editRules
   } = props;
   const {
     parentHeight
@@ -2789,7 +2790,7 @@ function calcTableHeight($xeTable, key) {
     if (_xeUtils.default.eqNull(val)) {
       if ((0, _utils.eqEmptyValue)(defMinHeight)) {
         // 编辑模式默认最小高度
-        if ((0, _utils.isEnableConf)(editConfig)) {
+        if (editRules && (0, _utils.isEnableConf)(editConfig)) {
           val = 144;
         }
       } else {
@@ -12257,22 +12258,51 @@ const Methods = {
    * 获取表格的滚动状态
    */
   getScroll() {
+    const $xeTable = this;
+    return $xeTable.getScrollData();
+  },
+  /**
+   * 获取表格的滚动数据
+   */
+  getScrollData() {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       scrollXLoad,
-      scrollYLoad
+      scrollYLoad,
+      scrollbarHeight,
+      scrollbarWidth
     } = reactData;
     const {
       elemStore
     } = internalData;
     const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
+    const scrollTop = bodyScrollElem ? bodyScrollElem.scrollTop : 0;
+    const scrollLeft = bodyScrollElem ? bodyScrollElem.scrollLeft : 0;
+    const clientHeight = bodyScrollElem ? bodyScrollElem.clientHeight : 0;
+    const clientWidth = bodyScrollElem ? bodyScrollElem.clientWidth : 0;
+    const scrollHeight = bodyScrollElem ? bodyScrollElem.scrollHeight : 0;
+    const scrollWidth = bodyScrollElem ? bodyScrollElem.scrollWidth : 0;
+    const isTop = scrollTop <= 0;
+    const isBottom = scrollTop + clientHeight >= scrollHeight;
+    const isLeft = scrollLeft <= 0;
+    const isRight = scrollLeft + clientWidth >= scrollWidth;
     return {
       virtualX: scrollXLoad,
       virtualY: scrollYLoad,
-      scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
-      scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
+      isTop,
+      isBottom,
+      isLeft,
+      isRight,
+      scrollbarHeight,
+      scrollbarWidth,
+      scrollTop,
+      scrollLeft,
+      scrollHeight,
+      scrollWidth,
+      clientHeight,
+      clientWidth
     };
   },
   handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
@@ -12629,15 +12659,14 @@ const Methods = {
     } = reactData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
-    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
-      return;
-    }
     const {
       elemStore,
       lastScrollTop,
       lastScrollLeft
     } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
+    const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
+    const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     const leftScrollElem = (0, _util.getRefElem)(elemStore['left-body-scroll']);
@@ -12646,12 +12675,6 @@ const Methods = {
     const footerScrollElem = (0, _util.getRefElem)(elemStore['main-footer-scroll']);
     const rightScrollElem = (0, _util.getRefElem)(elemStore['right-body-scroll']);
     const rowExpandEl = $xeTable.$refs.refRowExpandElem;
-    if (!xHandleEl) {
-      return;
-    }
-    if (!yHandleEl) {
-      return;
-    }
     if (!bodyScrollElem) {
       return;
     }
@@ -12664,13 +12687,28 @@ const Methods = {
     const scrollLeft = currScrollLeft + deltaLeft;
     const isRollX = scrollLeft !== lastScrollLeft;
     const isRollY = scrollTop !== lastScrollTop;
+    if (isRollX) {
+      // 如果禁用滚动
+      if (scrollbarXOpts.visible === 'hidden') {
+        evnt.preventDefault();
+        return;
+      }
+    }
     if (isRollY) {
+      // 如果禁用滚动
+      if (scrollbarYOpts.visible === 'hidden') {
+        evnt.preventDefault();
+        return;
+      }
       const isTopWheel = deltaTop < 0;
       // 如果滚动位置已经是顶部或底部，则不需要触发
       if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
         return;
       }
     }
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
+      return;
+    }
     if (rowOpts.isHover || highlightHoverRow) {
       $xeTable.clearHoverRow();
     }
@@ -13253,6 +13291,8 @@ const Methods = {
     scrollYStore.endIndex = scrollYStore.visibleSize;
     scrollYStore.visibleEndIndex = scrollYStore.visibleSize;
     return $xeTable.$nextTick().then(() => {
+      internalData.lastScrollLeft = 0;
+      internalData.lastScrollTop = 0;
       internalData.intoRunScroll = false;
     });
   },