vxe-table 3.15.27 → 3.15.28

package/es/table/module/filter/mixin.js

@@ -287,8 +287,14 @@ export default {
          * @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);
+            }
         },
         /**
          * 清空指定列的筛选条件
@@ -296,16 +302,20 @@ export default {
          * @param {String} fieldOrColumn 列
          */
         _clearFilter(fieldOrColumn) {
-            const { filterStore } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { filterStore } = 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, {
@@ -318,12 +328,13 @@ export default {
                     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();
         }
     }
 };

package/es/table/src/methods.js

@@ -6231,7 +6231,12 @@ 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;
+            if (column.treeNode) {
+                ovEl = tdEl.querySelector('.vxe-tree-cell');
+            }
+            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     /**
@@ -7371,12 +7376,15 @@ const Methods = {
         const props = $xeTable;
         const { mouseConfig } = props;
         const mouseOpts = $xeTable.computeMouseOpts;
-        const { field, sortable } = column;
+        const { field, sortable, order } = column;
         if (sortable) {
-            const params = { $table: $xeTable, $event: evnt, column, field, property: field, order: column.order, sortList: $xeTable.getSortColumns(), sortTime: column.sortTime };
+            const params = { $table: $xeTable, $event: evnt, column, field, property: field, 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);
         }
     },
@@ -8328,6 +8336,44 @@ 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 (process.env.NODE_ENV === 'development') {
@@ -8395,6 +8441,52 @@ 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 行对象

package/es/table/src/table.js

@@ -1682,6 +1682,7 @@ export default {
         const columnOpts = $xeTable.computeColumnOpts;
         const rowOpts = $xeTable.computeRowOpts;
         const customOpts = $xeTable.computeCustomOpts;
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
             initTpImg();
         }
@@ -1722,9 +1723,11 @@ export default {
             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');
     },

package/lib/index.umd.js

@@ -12535,7 +12535,12 @@ 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;
+      if (column.treeNode) {
+        ovEl = tdEl.querySelector('.vxe-tree-cell');
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   /**
@@ -13925,7 +13930,8 @@ const Methods = {
     const mouseOpts = $xeTable.computeMouseOpts;
     const {
       field,
-      sortable
+      sortable,
+      order
     } = column;
     if (sortable) {
       const params = {
@@ -13934,13 +13940,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);
     }
   },
@@ -15038,6 +15047,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) {
@@ -15122,6 +15174,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 行对象
@@ -21948,8 +22055,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 +22074,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 +22103,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 +28976,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 +29016,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 +33102,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) {