vxe-table 3.10.7 → 3.10.9

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.7";
+const version = "3.10.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2769,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.7"}`;
+const log_version = `table v${"3.10.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3545,23 +3545,30 @@ function renderCellBaseVNs(h, params, content) {
   const {
     $table,
     column,
-    row
+    row,
+    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;
+  const {
+    treeConfig
+  } = tableProps;
   const rowOpts = $table.computeRowOpts;
   const dragOpts = $table.computeDragOpts;
   const {
     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({
     row,
     column
   }))) {
-    vns.unshift(renderCellDragIcon(h, params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(h, params));
+    }
   }
   return vns;
 }
@@ -5147,6 +5154,16 @@ function clearRowDropOrigin($xeTable) {
     });
   }
 }
+function updateRowDropOrigin($xeTable, row) {
+  const el = $xeTable.$el;
+  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);
+    });
+  }
+}
 function clearRowDropTarget($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -5156,6 +5173,17 @@ function clearRowDropTarget($xeTable) {
     });
   }
 }
+function updateRowDropTarget($xeTable, row, dragPos) {
+  const el = $xeTable.$el;
+  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);
+    });
+  }
+}
 function showRowDropTip(evnt, $xeTable) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem;
   if (!rdTipEl) {
@@ -6919,85 +6947,132 @@ const Methods = {
    * 设置为固定列
    */
   setColumnFixed(fieldOrColumn, fixed) {
-    const {
-      isMaxFixedColumn,
-      columnOpts
-    } = this;
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    const targetColumn = getRootColumn(this, column);
-    if (targetColumn && targetColumn.fixed !== fixed) {
-      // 是否超过最大固定列数量
-      if (!targetColumn.fixed && isMaxFixedColumn) {
-        if (core_.VxeUI.modal) {
-          core_.VxeUI.modal.message({
-            status: 'error',
-            content: methods_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-          });
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    const columnOpts = $xeTable.computeColumnOpts;
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
+    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: methods_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+            });
+          }
+          return $xeTable.$nextTick();
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
+          column.fixed = fixed;
+        });
+        $xeTable.saveCustomStore('update:fixed');
+        if (!status) {
+          status = true;
         }
-        return this.$nextTick();
       }
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-        column.fixed = fixed;
-      });
-      this.saveCustomStore('update:fixed');
-      return this.refreshColumn();
     }
-    return this.$nextTick();
+    if (status) {
+      return $xeTable.refreshColumn();
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 取消指定固定列
    */
   clearColumnFixed(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    const targetColumn = getRootColumn(this, column);
-    if (targetColumn && targetColumn.fixed) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-        column.fixed = null;
-      });
-      this.saveCustomStore('update:fixed');
-      return this.refreshColumn();
+    const $xeTable = this;
+    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;
+        });
+        $xeTable.saveCustomStore('update:fixed');
+        if (!status) {
+          status = true;
+        }
+      }
+    });
+    if (status) {
+      return $xeTable.refreshColumn();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 隐藏指定列
    */
   hideColumn(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && column.visible) {
-      column.visible = false;
-      return this.handleCustom();
+    const $xeTable = this;
+    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 $xeTable.handleCustom();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 显示指定列
    */
   showColumn(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && !column.visible) {
-      column.visible = true;
-      return this.handleCustom();
+    const $xeTable = this;
+    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 $xeTable.handleCustom();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   setColumnWidth(fieldOrColumn, width) {
-    const column = handleFieldOrColumn(this, 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
-        } = this.$refs;
-        const tableBodyElem = tableBody ? tableBody.$el : null;
-        const bodyWidth = tableBodyElem ? tableBodyElem.clientWidth - 1 : 0;
-        rdWidth = Math.floor(colWidth * bodyWidth);
+    const $xeTable = this;
+    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 = $xeTable.$refs.tableBody;
+          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;
-      return this.refreshColumn();
+    });
+    if (status) {
+      return $xeTable.refreshColumn();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   getColumnWidth(fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn);
@@ -10252,7 +10327,9 @@ const Methods = {
     } = reactData;
     const {
       afterFullData,
+      afterTreeFullData,
       tableFullData,
+      tableFullTreeData,
       prevDragRow,
       prevDragPos
     } = internalData;
@@ -10267,18 +10344,35 @@ const Methods = {
             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();
@@ -10330,8 +10424,7 @@ const Methods = {
       } = 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($xeTable, row, dragPos);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
       $xeTable.dispatchEvent('row-dragover', {
@@ -10366,7 +10459,7 @@ const Methods = {
     }
     reactData.dragRow = row;
     trEl.draggable = true;
-    addClass(trEl, 'row--drag-origin');
+    updateRowDropOrigin($xeTable, row);
     showRowDropTip(evnt, $xeTable);
     updateRowDropTipContent($xeTable, tdEl);
     $xeTable.dispatchEvent('row-dragstart', params, evnt);
@@ -11461,7 +11554,7 @@ const Methods = {
     }
     this.closeTooltip();
   },
-  handleScrollEvent(evnt, isRollY, isRollX, params) {
+  handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
     const $xeTable = this;
     const props = $xeTable;
     const {
@@ -11488,13 +11581,35 @@ const Methods = {
     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;
+      }
+      $xeTable.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
     };
     $xeTable.dispatchEvent('scroll', evntParams, evnt);
@@ -11552,11 +11667,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollX(scrollLeft);
     $xeTable.triggerScrollXEvent(evnt);
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     });
   },
   debounceScrollYCalculate: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().debounce(function () {
@@ -11592,11 +11705,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollY(scrollTop);
     $xeTable.triggerScrollYEvent(evnt);
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     });
   },
   /**
@@ -11843,22 +11954,41 @@ const Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo(scrollLeft, scrollTop) {
+    const $xeTable = this;
     const {
       $refs
     } = this;
     const {
       tableBody,
+      tableHeader,
+      leftBody,
       rightBody,
       tableFooter
     } = $refs;
     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 = $xeTable.$refs.refScrollXHandleElem;
+      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 = $xeTable.$refs.refScrollYHandleElem;
+      if (yHandleEl) {
+        setScrollTop(yHandleEl, scrollTop);
+      } else {
+        setScrollTop(tableBodyElem, scrollTop);
+        setScrollTop(leftBodyElem, scrollTop);
+        setScrollTop(rightBodyElem, scrollTop);
+      }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));
@@ -13000,11 +13130,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
           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) {
@@ -13014,11 +13142,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         $xeTable.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
         });
       }
     },
@@ -13230,7 +13356,7 @@ const cellType = 'header';
       tId,
       isGroup,
       visibleColumn,
-      resizable,
+      resizable: allResizable,
       border,
       columnKey,
       headerRowClassName,
@@ -13401,7 +13527,7 @@ const cellType = 'header';
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? h('div', {
+        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],
@@ -13872,11 +13998,9 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         $xeTable.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
         });
       }
     }
@@ -14416,6 +14540,7 @@ const renderPopupPanel = (h, _vm) => {
     customStore
   } = _vm;
   const {
+    resizable: allResizable,
     customOpts,
     customColumnList,
     columnOpts,
@@ -14550,7 +14675,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, colTitle)]), allowResizable ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--resizable'
-      }, [column.children && column.children.length ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
+      }, [column.children && column.children.length || !(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
         props: {
           type: 'integer',
           disabled: isDisabled || isHidden,