vxe-table 4.8.7 → 4.8.9

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.7";
+const version = "4.8.9";
 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.7"}`;
+const log_version = `table v${"4.8.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3388,12 +3388,16 @@ function renderCellDragIcon(params) {
 function renderCellBaseVNs(params, content) {
   const {
     $table,
-    column
+    column,
+    level
   } = params;
   const {
     dragSort
   } = column;
-  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
+  const tableProps = $table.props;
+  const {
+    treeConfig
+  } = tableProps;
   const {
     computeRowOpts,
     computeDragOpts
@@ -3404,8 +3408,11 @@ function renderCellBaseVNs(params, content) {
     showRowIcon,
     rowVisibleMethod
   } = dragOpts;
+  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && showRowIcon && (!rowVisibleMethod || rowVisibleMethod(params))) {
-    vns.unshift(renderCellDragIcon(params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(params));
+    }
   }
   return vns;
 }
@@ -5371,11 +5378,9 @@ 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) {
@@ -5385,11 +5390,9 @@ const lineOffsetSizes = {
         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
         });
       }
     };
@@ -6179,11 +6182,9 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         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
         });
       }
     };
@@ -11860,11 +11861,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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 () {
@@ -11896,11 +11895,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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;
@@ -12651,25 +12648,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)();
@@ -12678,13 +12685,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)();
@@ -12693,9 +12709,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)();
@@ -12704,25 +12729,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)();
@@ -13850,16 +13893,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 => {
@@ -14813,6 +14874,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       }
     };
+    const updateRowDropOrigin = row => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-origin';
+        const rowid = getRowid($xeTable, row);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          addClass(elem, clss);
+        });
+      }
+    };
     const clearRowDropTarget = () => {
       const el = refElem.value;
       if (el) {
@@ -14822,6 +14893,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       }
     };
+    const updateRowDropTarget = (row, dragPos) => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-active-target';
+        const rowid = getRowid($xeTable, row);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          addClass(elem, clss);
+          elem.setAttribute('drag-pos', dragPos);
+        });
+      }
+    };
     const showRowDropTip = evnt => {
       const rdTipEl = refRowDragTipElem.value;
       if (!rdTipEl) {
@@ -16207,7 +16289,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = reactData;
         const {
           afterFullData,
+          afterTreeFullData,
           tableFullData,
+          tableFullTreeData,
           prevDragRow,
           prevDragPos
         } = internalData;
@@ -16222,18 +16306,35 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 return;
               }
               const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-              // 移出源位置
-              const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-              const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-              afterFullData.splice(oafIndex, 1);
-              tableFullData.splice(otfIndex, 1);
-              // 插新位置
-              const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-              const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-              const nafIndex = pafIndex + dragOffsetIndex;
-              const ntfIndex = ptfIndex + dragOffsetIndex;
-              afterFullData.splice(nafIndex, 0, dragRow);
-              tableFullData.splice(ntfIndex, 0, dragRow);
+              let oafIndex = -1;
+              let nafIndex = -1;
+              if (treeConfig) {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+                afterTreeFullData.splice(oafIndex, 1);
+                tableFullTreeData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterTreeFullData.splice(nafIndex, 0, dragRow);
+                tableFullTreeData.splice(ntfIndex, 0, dragRow);
+              } else {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+                afterFullData.splice(oafIndex, 1);
+                tableFullData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterFullData.splice(nafIndex, 0, dragRow);
+                tableFullData.splice(ntfIndex, 0, dragRow);
+              }
               reactData.isDragRowMove = true;
               $xeTable.cacheRowMap();
               $xeTable.updateScrollYStatus();
@@ -16282,8 +16383,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           } = reactData;
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-          addClass(trEl, 'row--drag-active-target');
-          trEl.setAttribute('drag-pos', dragPos);
+          updateRowDropTarget(row, dragPos);
           internalData.prevDragRow = row;
           internalData.prevDragPos = dragPos;
           dispatchEvent('row-dragover', {
@@ -16316,7 +16416,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         reactData.dragRow = row;
         trEl.draggable = true;
-        addClass(trEl, 'row--drag-origin');
+        updateRowDropOrigin(row);
         showRowDropTip(evnt);
         updateRowDropTipContent(tdEl);
         dispatchEvent('row-dragstart', params, evnt);
@@ -16333,7 +16433,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       triggerScrollXEvent() {
         loadScrollXData();
       },
-      handleScrollEvent(evnt, isRollY, isRollX, params) {
+      handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const {
           highlightHoverRow
         } = props;
@@ -16351,20 +16451,39 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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 = {
+          scrollTop,
+          scrollLeft,
           bodyHeight,
           bodyWidth,
           scrollHeight,
           scrollWidth,
           isX: isRollX,
           isY: isRollY,
+          isTop,
+          isBottom,
+          isLeft,
+          isRight,
           ...params
         };
         dispatchEvent('scroll', evntParams, evnt);