vxe-table 3.15.27 → 3.15.29

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.27";
+const version = "3.15.29";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2864,7 +2864,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.27"}`;
+const log_version = `table v${"3.15.29"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5327,8 +5327,11 @@ function eqCellValue(row1, row2, field) {
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1, val2);
 }
-function getNextSortOrder(_vm, column) {
-  const orders = _vm.sortOpts.orders;
+function getNextSortOrder($xeTable, column) {
+  const sortOpts = $xeTable.computeSortOpts;
+  const {
+    orders = []
+  } = sortOpts;
   const currOrder = column.order || null;
   const oIndex = orders.indexOf(currOrder) + 1;
   return orders[oIndex < orders.length ? oIndex : 0];
@@ -7685,8 +7688,66 @@ function removeFooterMerges($xeTable, merges) {
   }
   return rest;
 }
-function clearAllSort(_vm) {
-  _vm.tableFullColumn.forEach(column => {
+function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+  const sortOpts = $xeTable.computeSortOpts;
+  const {
+    multiple,
+    remote,
+    orders
+  } = sortOpts;
+  if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortConfs)) {
+    sortConfs = [sortConfs];
+  }
+  if (sortConfs && sortConfs.length) {
+    if (!multiple) {
+      sortConfs = [sortConfs[0]];
+      clearAllSort($xeTable);
+    }
+    let firstColumn = null;
+    sortConfs.forEach((confs, index) => {
+      let {
+        field,
+        order
+      } = confs;
+      let column = field;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
+        column = $xeTable.getColumnByField(field);
+      }
+      if (!firstColumn) {
+        firstColumn = column;
+      }
+      if (column && column.sortable) {
+        if (orders && orders.indexOf(order) === -1) {
+          order = getNextSortOrder($xeTable, column);
+        }
+        if (column.order !== order) {
+          column.order = order;
+        }
+        column.sortTime = Date.now() + index;
+      }
+    });
+    if (isUpdate) {
+      if (!remote) {
+        $xeTable.handleTableData(true);
+      }
+    }
+    if (evnt) {
+      $xeTable.handleColumnSortEvent(evnt, firstColumn);
+    }
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      $xeTable.updateCellAreas();
+      return updateStyle($xeTable);
+    });
+  }
+  return $xeTable.$nextTick();
+}
+function clearAllSort($xeTable) {
+  const internalData = $xeTable;
+  const {
+    tableFullColumn
+  } = internalData;
+  tableFullColumn.forEach(column => {
     column.order = null;
   });
 }
@@ -9051,7 +9112,8 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const internalData = $xeTable;
   const {
     scrollXLoad,
-    scrollYLoad
+    scrollYLoad,
+    isAllOverflow
   } = reactData;
   const {
     lcsTimeout
@@ -9069,13 +9131,19 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     internalData.inBodyScroll = false;
     internalData.inFooterScroll = false;
     internalData.scrollRenderType = '';
-    calcCellHeight($xeTable);
+    if (!isAllOverflow) {
+      calcCellHeight($xeTable);
+      updateRowOffsetTop($xeTable);
+    }
     if (isRollX && scrollXLoad) {
       $xeTable.updateScrollXData();
     }
     if (isRollY && scrollYLoad) {
       $xeTable.updateScrollYData().then(() => {
-        calcCellHeight($xeTable);
+        if (!isAllOverflow) {
+          calcCellHeight($xeTable);
+          updateRowOffsetTop($xeTable);
+        }
         $xeTable.updateScrollYSpace();
       });
     }
@@ -10730,6 +10798,7 @@ const Methods = {
         }
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
           column.fixed = fixed;
+          column.renderFixed = fixed;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -10755,6 +10824,7 @@ const Methods = {
       if (targetColumn && targetColumn.fixed) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
           column.fixed = null;
+          column.renderFixed = null;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -12535,7 +12605,16 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+      let ovEl = null;
+      let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
+      if (column.treeNode) {
+        ovEl = tdEl.querySelector('.vxe-tree-cell');
+      }
+      if (!tipEl) {
+        tipEl = ctEl;
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   /**
@@ -12553,7 +12632,16 @@ const Methods = {
     const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+      let ovEl = null;
+      let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
+      if (column.type === 'html') {
+        ovEl = tdEl.querySelector('.vxe-cell--html');
+      }
+      if (!tipEl) {
+        tipEl = ctEl;
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   openTooltip(target, content) {
@@ -13925,7 +14013,8 @@ const Methods = {
     const mouseOpts = $xeTable.computeMouseOpts;
     const {
       field,
-      sortable
+      sortable,
+      order
     } = column;
     if (sortable) {
       const params = {
@@ -13934,13 +14023,16 @@ const Methods = {
         column,
         field,
         property: field,
-        order: column.order,
+        order,
         sortList: $xeTable.getSortColumns(),
         sortTime: column.sortTime
       };
       if (mouseConfig && mouseOpts.area && $xeTable.handleSortEvent) {
         $xeTable.handleSortEvent(evnt, params);
       }
+      if (!order) {
+        $xeTable.dispatchEvent('clear-sort', params, evnt);
+      }
       $xeTable.dispatchEvent('sort-change', params, evnt);
     }
   },
@@ -14963,56 +15055,12 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    const sortOpts = $xeTable.computeSortOpts;
-    const {
-      multiple,
-      remote,
-      orders
-    } = sortOpts;
-    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortConfs)) {
-      sortConfs = [sortConfs];
-    }
-    if (sortConfs && sortConfs.length) {
-      if (!multiple) {
-        sortConfs = [sortConfs[0]];
-        clearAllSort($xeTable);
-      }
-      let firstColumn = null;
-      sortConfs.forEach((confs, index) => {
-        let {
-          field,
-          order
-        } = confs;
-        let column = field;
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
-          column = $xeTable.getColumnByField(field);
-        }
-        if (!firstColumn) {
-          firstColumn = column;
-        }
-        if (column && column.sortable) {
-          if (orders && orders.indexOf(order) === -1) {
-            order = getNextSortOrder($xeTable, column);
-          }
-          if (column.order !== order) {
-            column.order = order;
-          }
-          column.sortTime = Date.now() + index;
-        }
-      });
-      if (isUpdate) {
-        if (!remote) {
-          $xeTable.handleTableData(true);
-        }
-        $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
-      }
-      return $xeTable.$nextTick().then(() => {
-        updateRowOffsetTop($xeTable);
-        $xeTable.updateCellAreas();
-        return updateStyle($xeTable);
-      });
-    }
-    return $xeTable.$nextTick();
+    // 已废弃，即将去掉事件触发 new Event('click') -> null
+    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+  },
+  setSortByEvent(evnt, sortConfs, isUpdate) {
+    const $xeTable = this;
+    return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
   },
   /**
    * 清空指定列的排序条件
@@ -15038,6 +15086,49 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
+  clearSortByEvent(evnt, fieldOrColumn) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      tableFullColumn
+    } = internalData;
+    const sortOpts = $xeTable.computeSortOpts;
+    const sortCols = [];
+    let column = null;
+    if (evnt) {
+      if (fieldOrColumn) {
+        column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (column) {
+          column.order = null;
+        }
+      } else {
+        tableFullColumn.forEach(column => {
+          if (column.order) {
+            column.order = null;
+            sortCols.push(column);
+          }
+        });
+      }
+      if (!sortOpts.remote) {
+        $xeTable.handleTableData(true);
+      }
+      if (sortCols.length) {
+        const params = {
+          $table: $xeTable,
+          $event: evnt,
+          cols: sortCols,
+          sortList: []
+        };
+        $xeTable.dispatchEvent('clear-all-sort', params, evnt);
+      } else if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column);
+      }
+    }
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      return updateStyle($xeTable);
+    });
+  },
   // 在 v3 中废弃
   getSortColumn() {
     if (true) {
@@ -15078,6 +15169,17 @@ const Methods = {
     }
     return sortList;
   },
+  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+    const $xeTable = this;
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+    if (column && column.filters) {
+      column.filters = toFilters(options || []);
+      if (isUpdate) {
+        return $xeTable.handleColumnConfirmFilter(column, evnt);
+      }
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 关闭筛选
    * @param {Event} evnt 事件
@@ -15122,6 +15224,61 @@ const Methods = {
   isFilter(fieldOrColumn) {
     return this.isActiveFilterByColumn(fieldOrColumn);
   },
+  clearFilterByEvent(evnt, fieldOrColumn) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      filterStore
+    } = reactData;
+    const {
+      tableFullColumn
+    } = internalData;
+    const filterOpts = $xeTable.computeFilterOpts;
+    const filterCols = [];
+    let column = null;
+    if (fieldOrColumn) {
+      column = handleFieldOrColumn($xeTable, fieldOrColumn);
+      if (column) {
+        $xeTable.handleClearFilter(column);
+      }
+    } else {
+      tableFullColumn.forEach(column => {
+        if (column.filters) {
+          filterCols.push(column);
+          $xeTable.handleClearFilter(column);
+        }
+      });
+    }
+    if (!fieldOrColumn || column !== filterStore.column) {
+      Object.assign(filterStore, {
+        isAllSelected: false,
+        isIndeterminate: false,
+        style: null,
+        options: [],
+        column: null,
+        multiple: false,
+        visible: false
+      });
+    }
+    if (!filterOpts.remote) {
+      $xeTable.updateData();
+    }
+    if (filterCols.length) {
+      const params = {
+        $table: $xeTable,
+        $event: evnt,
+        cols: filterCols,
+        filterList: []
+      };
+      $xeTable.dispatchEvent('clear-all-filter', params, evnt);
+    } else if (column) {
+      $xeTable.dispatchEvent('clear-filter', {
+        filterList: () => $xeTable.getCheckedFilters()
+      }, evnt);
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 判断展开行是否懒加载完成
    * @param {Row} row 行对象
@@ -21625,6 +21782,7 @@ const {
       if (column && column.filters) {
         column.filters = toFilters(options || []);
         if (isUpdate) {
+          // 已废弃，即将去掉事件触发 new Event('click') -> null
           return $xeTable.handleColumnConfirmFilter(column, new Event('click'));
         }
       }
@@ -21948,8 +22106,18 @@ const {
      * @param {Event} evnt 事件
      */
     handleFilterResetFilter(evnt) {
-      this.handleClearFilter(this.filterStore.column);
-      this.confirmFilterEvent(evnt);
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        filterStore
+      } = reactData;
+      $xeTable.handleClearFilter(filterStore.column);
+      $xeTable.confirmFilterEvent(evnt);
+      if (evnt) {
+        $xeTable.dispatchEvent('clear-filter', {
+          filterList: []
+        }, evnt);
+      }
     },
     /**
      * 清空指定列的筛选条件
@@ -21957,17 +22125,23 @@ const {
      * @param {String} fieldOrColumn 列
      */
     _clearFilter(fieldOrColumn) {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
         filterStore
-      } = this;
+      } = reactData;
+      const {
+        tableFullColumn
+      } = internalData;
       let column;
       if (fieldOrColumn) {
-        column = handleFieldOrColumn(this, fieldOrColumn);
+        column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column) {
-          this.handleClearFilter(column);
+          $xeTable.handleClearFilter(column);
         }
       } else {
-        this.visibleColumn.forEach(this.handleClearFilter);
+        tableFullColumn.forEach($xeTable.handleClearFilter);
       }
       if (!fieldOrColumn || column !== filterStore.column) {
         Object.assign(filterStore, {
@@ -21980,12 +22154,13 @@ const {
           visible: false
         });
       }
-      return this.updateData();
+      return $xeTable.updateData();
     },
     _updateFilterOptionStatus(item, checked) {
+      const $xeTable = this;
       item._checked = checked;
       item.checked = checked;
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     }
   }
 });
@@ -28852,6 +29027,7 @@ function renderBody(h, $xeTable) {
     const columnOpts = $xeTable.computeColumnOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg();
     }
@@ -28891,11 +29067,13 @@ function renderBody(h, $xeTable) {
       resizeObserver.observe(this.getParentElem());
       this.$resize = resizeObserver;
     }
-    const tableViewportEl = $xeTable.$refs.refTableViewportElem;
-    if (tableViewportEl) {
-      tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
-        passive: false
-      });
+    if (virtualYOpts.mode !== 'scroll') {
+      const tableViewportEl = $xeTable.$refs.refTableViewportElem;
+      if (tableViewportEl) {
+        tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
+          passive: false
+        });
+      }
     }
     this.preventEvent(null, 'mounted');
   },
@@ -32975,9 +33153,16 @@ render_renderer.mixin({
 let isReg = false;
 const VxeTable = Object.assign({}, table, {
   install(app) {
-    if (typeof window !== 'undefined' && window.VXETableMixin) {
-      table.mixins.push(window.VXETableMixin);
-      delete window.VXETableMixin;
+    if (typeof window !== 'undefined') {
+      if (window.VxeTableExtendCellArea && window.VxeTableExtendCellArea.use) {
+        window.VxeTableExtendCellArea.use(core_.VxeUI);
+      } else if (window.VXETableMixin) {
+        table.mixins.push(window.VXETableMixin);
+        delete window.VXETableMixin;
+      }
+      if (window.VxeTableExtendPivotTable && window.VxeTableExtendPivotTable.use) {
+        window.VxeTableExtendPivotTable.use(core_.VxeUI);
+      }
     }
     // 兼容老版本
     if (typeof window !== 'undefined' && window.VxeTableExtendCellArea && window.VxeTableExtendCellArea.init) {