vxe-table 4.8.8 → 4.8.10

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.8";
+const version = "4.8.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2389,7 +2389,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.8"}`;
+const log_version = `table v${"4.8.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5366,8 +5366,6 @@ const lineOffsetSizes = {
       if (yHandleEl) {
         yHandleEl.scrollTop = scrollTop;
       } else if (isRollY) {
-        tableInternalData.lastScrollTop = scrollTop;
-        tableInternalData.lastScrollLeft = scrollLeft;
         if (leftElem && fixedType === 'left') {
           setScrollTop(bodyElem, scrollTop);
           setScrollTop(rightElem, scrollTop);
@@ -5378,25 +5376,19 @@ const lineOffsetSizes = {
           setScrollTop(leftElem, scrollTop);
           setScrollTop(rightElem, scrollTop);
         }
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
       if (xHandleEl) {
         xHandleEl.scrollLeft = scrollLeft;
       } else if (isRollX) {
-        tableInternalData.lastScrollTop = scrollTop;
-        tableInternalData.lastScrollLeft = scrollLeft;
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(footerElem, scrollLeft);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
     };
@@ -6182,15 +6174,11 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         const isRollX = true;
         const isRollY = false;
         const scrollTop = bodyElem.scrollTop;
-        tableInternalData.lastScrollLeft = scrollLeft;
-        tableReactData.lastScrollTime = Date.now();
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(bodyElem, scrollLeft);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: footer_renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
     };
@@ -6704,7 +6692,7 @@ const {
   params: Object
 });
 ;// CONCATENATED MODULE: ./packages/table/src/emits.ts
-/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'cell-backspace-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'row-dragstart', 'row-dragover', 'row-dragend', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-selection', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
+/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'cell-backspace-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'row-dragstart', 'row-dragover', 'row-dragend', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'scroll-boundary', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-selection', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
 ;// CONCATENATED MODULE: ./packages/table/module/custom/panel.ts
 
 
@@ -8911,9 +8899,29 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeSXOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.scrollX, props.scrollX);
     });
+    const computeScrollXThreshold = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const sXOpts = computeSXOpts.value;
+      const {
+        threshold
+      } = sXOpts;
+      if (threshold) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold);
+      }
+      return 0;
+    });
     const computeSYOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.scrollY, props.scrollY);
     });
+    const computeScrollYThreshold = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const sYOpts = computeSYOpts.value;
+      const {
+        threshold
+      } = sYOpts;
+      if (threshold) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold);
+      }
+      return 0;
+    });
     const computeRowHeightMaps = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return {
         default: 48,
@@ -11851,9 +11859,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       setScrollLeft(bodyElem, scrollLeft);
       setScrollLeft(headerElem, scrollLeft);
       setScrollLeft(footerElem, scrollLeft);
-      setScrollLeft(bodyElem, scrollLeft);
-      setScrollLeft(headerElem, scrollLeft);
-      setScrollLeft(footerElem, scrollLeft);
     };
     const scrollXEvent = evnt => {
       const wrapperEl = evnt.currentTarget;
@@ -11863,15 +11868,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = wrapperEl;
       const isRollX = true;
       const isRollY = false;
-      internalData.lastScrollLeft = scrollLeft;
-      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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().debounce(function () {
@@ -11899,15 +11900,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = wrapperEl;
       const isRollX = false;
       const isRollY = true;
-      internalData.lastScrollTop = scrollTop;
-      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;
@@ -12658,25 +12655,35 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 设置为固定列
        */
       setColumnFixed(fieldOrColumn, fixed) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-        const targetColumn = getRootColumn($xeTable, column);
-        const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        let status = false;
+        const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
         const columnOpts = computeColumnOpts.value;
-        if (targetColumn && targetColumn.fixed !== fixed) {
-          // 是否超过最大固定列数量
-          if (!targetColumn.fixed && isMaxFixedColumn) {
-            if (core_.VxeUI.modal) {
-              core_.VxeUI.modal.message({
-                status: 'error',
-                content: table_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-              });
+        const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        for (let i = 0; i < cols.length; i++) {
+          const item = cols[i];
+          const column = handleFieldOrColumn($xeTable, item);
+          const targetColumn = getRootColumn($xeTable, column);
+          if (targetColumn && targetColumn.fixed !== fixed) {
+            // 是否超过最大固定列数量
+            if (!targetColumn.fixed && isMaxFixedColumn) {
+              if (core_.VxeUI.modal) {
+                core_.VxeUI.modal.message({
+                  status: 'error',
+                  content: table_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+                });
+              }
+              return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+            }
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
+              column.fixed = fixed;
+            });
+            tablePrivateMethods.saveCustomStore('update:fixed');
+            if (!status) {
+              status = true;
             }
-            return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
           }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-            column.fixed = fixed;
-          });
-          tablePrivateMethods.saveCustomStore('update:fixed');
+        }
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -12685,13 +12692,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 取消指定固定列
        */
       clearColumnFixed(fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-        const targetColumn = getRootColumn($xeTable, column);
-        if (targetColumn && targetColumn.fixed) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-            column.fixed = null;
-          });
-          tablePrivateMethods.saveCustomStore('update:fixed');
+        let status = false;
+        const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item);
+          const targetColumn = getRootColumn($xeTable, column);
+          if (targetColumn && targetColumn.fixed) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
+              column.fixed = null;
+            });
+            tablePrivateMethods.saveCustomStore('update:fixed');
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -12700,9 +12716,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 隐藏指定列
        */
       hideColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-        if (column && column.visible) {
-          column.visible = false;
+        let status = false;
+        const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item);
+          if (column && column.visible) {
+            column.visible = false;
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tablePrivateMethods.handleCustom();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -12711,25 +12736,43 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 显示指定列
        */
       showColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-        if (column && !column.visible) {
-          column.visible = true;
+        let status = false;
+        const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item);
+          if (column && !column.visible) {
+            column.visible = true;
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
           return tablePrivateMethods.handleCustom();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       setColumnWidth(fieldOrColumn, width) {
-        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-        if (column) {
-          const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
-          let rdWidth = colWidth;
-          if (isScale(width)) {
-            const tableBody = refTableBody.value;
-            const bodyElem = tableBody ? tableBody.$el : null;
-            const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
-            rdWidth = Math.floor(colWidth * bodyWidth);
+        let status = false;
+        const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+          const column = handleFieldOrColumn($xeTable, item);
+          if (column) {
+            const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
+            let rdWidth = colWidth;
+            if (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;
+            }
           }
-          column.resizeWidth = rdWidth;
+        });
+        if (status) {
           return tableMethods.refreshColumn();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -13857,16 +13900,34 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
-          setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft);
+          const xHandleEl = refScrollXHandleElem.value;
+          if (xHandleEl) {
+            setScrollLeft(xHandleEl, scrollLeft);
+          } else {
+            setScrollLeft(tableBodyElem, scrollLeft);
+            setScrollLeft(tableHeaderElem, scrollLeft);
+            setScrollLeft(tableFooterElem, scrollLeft);
+          }
         }
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
-          setScrollTop(rightBodyElem || tableBodyElem, scrollTop);
+          const yHandleEl = refScrollYHandleElem.value;
+          if (yHandleEl) {
+            setScrollTop(yHandleEl, scrollTop);
+          } else {
+            setScrollTop(tableBodyElem, scrollTop);
+            setScrollTop(leftBodyElem, scrollTop);
+            setScrollTop(rightBodyElem, scrollTop);
+          }
         }
         if (reactData.scrollXLoad || reactData.scrollYLoad) {
           return new Promise(resolve => {
@@ -16379,40 +16440,100 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       triggerScrollXEvent() {
         loadScrollXData();
       },
-      handleScrollEvent(evnt, isRollY, isRollX, params) {
+      handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const {
           highlightHoverRow
         } = props;
+        const {
+          lastScrollLeft,
+          lastScrollTop
+        } = internalData;
         const tableBody = refTableBody.value;
         const bodyElem = tableBody ? tableBody.$el : null;
         const rowOpts = computeRowOpts.value;
         const validTip = refValidTooltip.value;
         const tooltip = refTooltip.value;
-        if (rowOpts.isHover || highlightHoverRow) {
-          $xeTable.clearHoverRow();
-        }
-        if (validTip && validTip.reactData.visible) {
-          validTip.close();
-        }
-        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;
+        let direction = '';
+        let isTopBoundary = false;
+        let isBottomBoundary = false;
+        let isLeftBoundary = false;
+        let isRightBoundary = false;
+        if (isRollX) {
+          const xThreshold = computeScrollXThreshold.value;
+          isLeft = scrollLeft <= 0;
+          if (!isLeft) {
+            isRight = scrollLeft + bodyWidth >= scrollWidth;
+          }
+          if (scrollLeft > lastScrollLeft) {
+            direction = 'right';
+            if (scrollLeft + bodyWidth >= scrollWidth - xThreshold) {
+              isRightBoundary = true;
+            }
+          } else {
+            direction = 'left';
+            if (scrollLeft <= xThreshold) {
+              isLeftBoundary = true;
+            }
+          }
+          tablePrivateMethods.checkScrolling();
+          internalData.lastScrollLeft = scrollLeft;
+          reactData.lastScrollTime = Date.now();
+        } else {
+          const yThreshold = computeScrollYThreshold.value;
+          isTop = scrollTop <= 0;
+          if (!isTop) {
+            isBottom = scrollTop + bodyHeight >= scrollHeight;
+          }
+          if (scrollTop > lastScrollTop) {
+            direction = 'bottom';
+            if (scrollTop + bodyHeight >= scrollHeight - yThreshold) {
+              isBottomBoundary = true;
+            }
+          } else {
+            direction = 'top';
+            if (scrollTop <= yThreshold) {
+              isTopBoundary = true;
+            }
+          }
+          internalData.lastScrollTop = scrollTop;
+          reactData.lastScrollTime = Date.now();
+        }
         const evntParams = {
+          scrollTop,
+          scrollLeft,
           bodyHeight,
           bodyWidth,
           scrollHeight,
           scrollWidth,
           isX: isRollX,
           isY: isRollY,
+          isTop,
+          isBottom,
+          isLeft,
+          isRight,
+          direction,
           ...params
         };
+        if (rowOpts.isHover || highlightHoverRow) {
+          $xeTable.clearHoverRow();
+        }
+        if (validTip && validTip.reactData.visible) {
+          validTip.close();
+        }
+        if (tooltip && tooltip.reactData.visible) {
+          tooltip.close();
+        }
+        if (isBottomBoundary || isTopBoundary || isRightBoundary || isLeftBoundary) {
+          dispatchEvent('scroll-boundary', evntParams, evnt);
+        }
         dispatchEvent('scroll', evntParams, evnt);
       },
       /**