vxe-table 4.8.8 → 4.8.9

package/lib/table/src/table.js

@@ -3360,11 +3360,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reactData.lastScrollTime = Date.now();
       handleSyncScrollX(scrollLeft);
       $xeTable.triggerScrollXEvent(evnt);
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
         type: 'table',
-        fixed: '',
-        scrollTop,
-        scrollLeft
+        fixed: ''
       });
     };
     const debounceScrollYCalculate = _xeUtils.default.debounce(function () {
@@ -3396,11 +3394,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reactData.lastScrollTime = Date.now();
       handleSyncScrollY(scrollTop);
       $xeTable.triggerScrollYEvent(evnt);
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
         type: 'table',
-        fixed: '',
-        scrollTop,
-        scrollLeft
+        fixed: ''
       });
     };
     let keyCtxTimeout;
@@ -4151,25 +4147,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 设置为固定列
        */
       setColumnFixed(fieldOrColumn, fixed) {
-        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
-        const targetColumn = (0, _util.getRootColumn)($xeTable, column);
-        const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        let status = false;
+        const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
         const columnOpts = computeColumnOpts.value;
-        if (targetColumn && targetColumn.fixed !== fixed) {
-          // 是否超过最大固定列数量
-          if (!targetColumn.fixed && isMaxFixedColumn) {
-            if (_ui.VxeUI.modal) {
-              _ui.VxeUI.modal.message({
-                status: 'error',
-                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-              });
+        const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        for (let i = 0; i < cols.length; i++) {
+          const item = cols[i];
+          const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+          const targetColumn = (0, _util.getRootColumn)($xeTable, column);
+          if (targetColumn && targetColumn.fixed !== fixed) {
+            // 是否超过最大固定列数量
+            if (!targetColumn.fixed && isMaxFixedColumn) {
+              if (_ui.VxeUI.modal) {
+                _ui.VxeUI.modal.message({
+                  status: 'error',
+                  content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+                });
+              }
+              return (0, _vue.nextTick)();
+            }
+            _xeUtils.default.eachTree([targetColumn], column => {
+              column.fixed = fixed;
+            });
+            tablePrivateMethods.saveCustomStore('update:fixed');
+            if (!status) {
+              status = true;
             }
-            return (0, _vue.nextTick)();
           }
-          _xeUtils.default.eachTree([targetColumn], column => {
-            column.fixed = fixed;
-          });
-          tablePrivateMethods.saveCustomStore('update:fixed');
+        }
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0, _vue.nextTick)();
@@ -4178,13 +4184,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 取消指定固定列
        */
       clearColumnFixed(fieldOrColumn) {
-        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
-        const targetColumn = (0, _util.getRootColumn)($xeTable, column);
-        if (targetColumn && targetColumn.fixed) {
-          _xeUtils.default.eachTree([targetColumn], column => {
-            column.fixed = null;
-          });
-          tablePrivateMethods.saveCustomStore('update:fixed');
+        let status = false;
+        const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+          const targetColumn = (0, _util.getRootColumn)($xeTable, column);
+          if (targetColumn && targetColumn.fixed) {
+            _xeUtils.default.eachTree([targetColumn], column => {
+              column.fixed = null;
+            });
+            tablePrivateMethods.saveCustomStore('update:fixed');
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0, _vue.nextTick)();
@@ -4193,9 +4208,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 隐藏指定列
        */
       hideColumn(fieldOrColumn) {
-        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
-        if (column && column.visible) {
-          column.visible = false;
+        let status = false;
+        const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+          if (column && column.visible) {
+            column.visible = false;
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tablePrivateMethods.handleCustom();
         }
         return (0, _vue.nextTick)();
@@ -4204,25 +4228,43 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 显示指定列
        */
       showColumn(fieldOrColumn) {
-        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
-        if (column && !column.visible) {
-          column.visible = true;
+        let status = false;
+        const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+          if (column && !column.visible) {
+            column.visible = true;
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tablePrivateMethods.handleCustom();
         }
         return (0, _vue.nextTick)();
       },
       setColumnWidth(fieldOrColumn, width) {
-        const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
-        if (column) {
-          const colWidth = _xeUtils.default.toInteger(width);
-          let rdWidth = colWidth;
-          if ((0, _dom.isScale)(width)) {
-            const tableBody = refTableBody.value;
-            const bodyElem = tableBody ? tableBody.$el : null;
-            const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
-            rdWidth = Math.floor(colWidth * bodyWidth);
-          }
-          column.resizeWidth = rdWidth;
+        let status = false;
+        const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+          if (column) {
+            const colWidth = _xeUtils.default.toInteger(width);
+            let rdWidth = colWidth;
+            if ((0, _dom.isScale)(width)) {
+              const tableBody = refTableBody.value;
+              const bodyElem = tableBody ? tableBody.$el : null;
+              const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
+              rdWidth = Math.floor(colWidth * bodyWidth);
+            }
+            column.resizeWidth = rdWidth;
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0, _vue.nextTick)();
@@ -5344,16 +5386,34 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       scrollTo(scrollLeft, scrollTop) {
         const tableBody = refTableBody.value;
+        const tableHeader = refTableHeader.value;
         const tableFooter = refTableFooter.value;
+        const leftBody = refTableLeftBody.value;
         const rightBody = refTableRightBody.value;
         const tableBodyElem = tableBody ? tableBody.$el : null;
+        const leftBodyElem = leftBody ? leftBody.$el : null;
         const rightBodyElem = rightBody ? rightBody.$el : null;
+        const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;
         if (_xeUtils.default.isNumber(scrollLeft)) {
-          (0, _dom.setScrollLeft)(tableFooterElem || tableBodyElem, scrollLeft);
+          const xHandleEl = refScrollXHandleElem.value;
+          if (xHandleEl) {
+            (0, _dom.setScrollLeft)(xHandleEl, scrollLeft);
+          } else {
+            (0, _dom.setScrollLeft)(tableBodyElem, scrollLeft);
+            (0, _dom.setScrollLeft)(tableHeaderElem, scrollLeft);
+            (0, _dom.setScrollLeft)(tableFooterElem, scrollLeft);
+          }
         }
         if (_xeUtils.default.isNumber(scrollTop)) {
-          (0, _dom.setScrollTop)(rightBodyElem || tableBodyElem, scrollTop);
+          const yHandleEl = refScrollYHandleElem.value;
+          if (yHandleEl) {
+            (0, _dom.setScrollTop)(yHandleEl, scrollTop);
+          } else {
+            (0, _dom.setScrollTop)(tableBodyElem, scrollTop);
+            (0, _dom.setScrollTop)(leftBodyElem, scrollTop);
+            (0, _dom.setScrollTop)(rightBodyElem, scrollTop);
+          }
         }
         if (reactData.scrollXLoad || reactData.scrollYLoad) {
           return new Promise(resolve => {
@@ -7864,7 +7924,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerScrollXEvent() {
         loadScrollXData();
       },
-      handleScrollEvent(evnt, isRollY, isRollX, params) {
+      handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const {
           highlightHoverRow
         } = props;
@@ -7882,20 +7942,39 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (tooltip && tooltip.reactData.visible) {
           tooltip.close();
         }
-        if (isRollX) {
-          tablePrivateMethods.checkScrolling();
-        }
         const bodyHeight = bodyElem ? bodyElem.clientHeight : 0;
         const bodyWidth = bodyElem ? bodyElem.clientWidth : 0;
         const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0;
         const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0;
+        let isTop = false;
+        let isBottom = false;
+        let isLeft = false;
+        let isRight = false;
+        if (isRollX) {
+          isLeft = scrollLeft <= 0;
+          if (!isTop) {
+            isRight = scrollLeft + bodyWidth >= scrollWidth;
+          }
+          tablePrivateMethods.checkScrolling();
+        } else {
+          isTop = scrollTop <= 0;
+          if (!isTop) {
+            isBottom = scrollTop + bodyHeight >= scrollHeight;
+          }
+        }
         const evntParams = Object.assign({
+          scrollTop,
+          scrollLeft,
           bodyHeight,
           bodyWidth,
           scrollHeight,
           scrollWidth,
           isX: isRollX,
-          isY: isRollY
+          isY: isRollY,
+          isTop,
+          isBottom,
+          isLeft,
+          isRight
         }, params);
         dispatchEvent('scroll', evntParams, evnt);
       },