vxe-table 3.16.6 → 3.16.7

package/es/table/src/cell.js

@@ -375,7 +375,7 @@ export const Cell = {
             const { fullColumnFieldData } = tableInternalData;
             const aggregateOpts = $table.computeAggregateOpts;
             const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
-            const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod;
+            const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
             const groupField = aggRow.groupField;
             const groupContent = aggRow.groupContent;
             const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
@@ -409,9 +409,9 @@ export const Cell = {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
-                if (aggMethod) {
+                if (aggCalcMethod) {
                     ctParams.aggValue = childCount;
-                    cellValue = `${aggMethod(ctParams)}`;
+                    cellValue = `${aggCalcMethod(ctParams)}`;
                 }
             }
         }
@@ -461,14 +461,14 @@ export const Cell = {
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
         const aggregateOpts = $table.computeAggregateOpts;
-        const { padding, indent } = aggregateOpts;
+        const { mode, padding, indent } = aggregateOpts;
         const rowid = getRowid($table, row);
         const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
         return h('div', {
             class: ['vxe-row-group--tree-node', {
                     'is--expanded': isExpand
                 }],
-            style: padding && indent
+            style: mode !== 'column' && padding && indent
                 ? {
                     paddingLeft: `${level * indent}px`
                 }

package/es/table/src/methods.js

@@ -8672,9 +8672,9 @@ const Methods = {
         const $xeTable = this;
         return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
-    setSortByEvent(evnt, sortConfs, isUpdate) {
+    setSortByEvent(evnt, sortConfs) {
         const $xeTable = this;
-        return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
+        return handleSortEvent($xeTable, evnt, sortConfs, true);
     },
     /**
      * 清空指定列的排序条件
@@ -8706,6 +8706,7 @@ const Methods = {
         const internalData = $xeTable;
         const { tableFullColumn } = internalData;
         const sortOpts = $xeTable.computeSortOpts;
+        const { multiple } = sortOpts;
         const sortCols = [];
         let column = null;
         if (evnt) {
@@ -8726,13 +8727,16 @@ const Methods = {
             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);
+            if (!multiple) {
+                column = sortCols[0];
             }
-            else if (column) {
+            if (column) {
                 $xeTable.handleColumnSortEvent(evnt, column);
             }
+            if (multiple && sortCols.length) {
+                const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] };
+                $xeTable.dispatchEvent('clear-all-sort', params, evnt);
+            }
         }
         return $xeTable.$nextTick().then(() => {
             updateRowOffsetTop($xeTable);
@@ -8765,14 +8769,12 @@ const Methods = {
         }
         return sortList;
     },
-    setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+    setFilterByEvent(evnt, fieldOrColumn, options) {
         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.handleColumnConfirmFilter(column, evnt);
         }
         return $xeTable.$nextTick();
     },
@@ -8822,6 +8824,7 @@ const Methods = {
         const { filterStore } = reactData;
         const { tableFullColumn } = internalData;
         const filterOpts = $xeTable.computeFilterOpts;
+        const { multiple } = filterOpts;
         const filterCols = [];
         let column = null;
         if (fieldOrColumn) {
@@ -8852,13 +8855,37 @@ const Methods = {
         if (!filterOpts.remote) {
             $xeTable.updateData();
         }
-        if (filterCols.length) {
+        if (!multiple) {
+            column = filterCols[0];
+        }
+        if (column) {
+            const filterList = () => $xeTable.getCheckedFilters();
+            const values = [];
+            const datas = [];
+            column.filters.forEach((item) => {
+                if (item.checked) {
+                    values.push(item.value);
+                    datas.push(item.data);
+                }
+            });
+            const params = {
+                $table: $xeTable,
+                $event: evnt,
+                column,
+                field: column.field,
+                property: column.field,
+                values,
+                datas,
+                filters: filterList,
+                filterList
+            };
+            $xeTable.dispatchEvent('filter-change', params, evnt);
+            $xeTable.dispatchEvent('clear-filter', params, evnt);
+        }
+        if (multiple && 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();
     },
     /**

package/es/table/src/table.js

@@ -1607,7 +1607,10 @@ export default {
             warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
         }
         if (aggregateOpts.aggregateMethod) {
-            warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod']);
+            warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
+        }
+        if (aggregateOpts.countMethod) {
+            warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
         }
         if (props.treeConfig && treeOpts.children) {
             warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.16.6";
+export const version = "3.16.7";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -134,6 +134,7 @@ VxeUI.setConfig({
             // filterMethod: null,
             // destroyOnClose: false,
             // isEvery: false,
+            multiple: true,
             showIcon: true
         },
         aggregateConfig: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.16.6"}`;
+const version = `table v${"3.16.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.16.6";
+const version = "3.16.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3368,6 +3368,7 @@ core_.VxeUI.setConfig({
       // filterMethod: null,
       // destroyOnClose: false,
       // isEvery: false,
+      multiple: true,
       showIcon: true
     },
     aggregateConfig: {
@@ -3907,7 +3908,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.6"}`;
+const log_version = `table v${"3.16.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5216,7 +5217,7 @@ const Cell = {
         contentMethod,
         mapChildrenField
       } = aggregateOpts;
-      const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod;
+      const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       const groupField = aggRow.groupField;
       const groupContent = aggRow.groupContent;
       const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
@@ -5248,9 +5249,9 @@ const Cell = {
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
       } else if (aggFunc === true || countFields && countFields.includes(field)) {
-        if (aggMethod) {
+        if (aggCalcMethod) {
           ctParams.aggValue = childCount;
-          cellValue = `${aggMethod(ctParams)}`;
+          cellValue = `${aggCalcMethod(ctParams)}`;
         }
       }
     } else {
@@ -5306,6 +5307,7 @@ const Cell = {
     } = tableInternalData;
     const aggregateOpts = $table.computeAggregateOpts;
     const {
+      mode,
       padding,
       indent
     } = aggregateOpts;
@@ -5315,7 +5317,7 @@ const Cell = {
       class: ['vxe-row-group--tree-node', {
         'is--expanded': isExpand
       }],
-      style: padding && indent ? {
+      style: mode !== 'column' && padding && indent ? {
         paddingLeft: `${level * indent}px`
       } : undefined
     }, [row.isAggregate ? h('span', {
@@ -16618,9 +16620,9 @@ const Methods = {
     const $xeTable = this;
     return handleSortEvent($xeTable, null, sortConfs, isUpdate);
   },
-  setSortByEvent(evnt, sortConfs, isUpdate) {
+  setSortByEvent(evnt, sortConfs) {
     const $xeTable = this;
-    return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
+    return handleSortEvent($xeTable, evnt, sortConfs, true);
   },
   /**
    * 清空指定列的排序条件
@@ -16653,6 +16655,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -16672,7 +16677,13 @@ const Methods = {
       if (!sortOpts.remote) {
         $xeTable.handleTableData(true);
       }
-      if (sortCols.length) {
+      if (!multiple) {
+        column = sortCols[0];
+      }
+      if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column);
+      }
+      if (multiple && sortCols.length) {
         const params = {
           $table: $xeTable,
           $event: evnt,
@@ -16680,8 +16691,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -16727,14 +16736,12 @@ const Methods = {
     }
     return sortList;
   },
-  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+  setFilterByEvent(evnt, fieldOrColumn, options) {
     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.handleColumnConfirmFilter(column, evnt);
     }
     return $xeTable.$nextTick();
   },
@@ -16793,6 +16800,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -16822,7 +16832,34 @@ const Methods = {
     if (!filterOpts.remote) {
       $xeTable.updateData();
     }
-    if (filterCols.length) {
+    if (!multiple) {
+      column = filterCols[0];
+    }
+    if (column) {
+      const filterList = () => $xeTable.getCheckedFilters();
+      const values = [];
+      const datas = [];
+      column.filters.forEach(item => {
+        if (item.checked) {
+          values.push(item.value);
+          datas.push(item.data);
+        }
+      });
+      const params = {
+        $table: $xeTable,
+        $event: evnt,
+        column,
+        field: column.field,
+        property: column.field,
+        values,
+        datas,
+        filters: filterList,
+        filterList
+      };
+      $xeTable.dispatchEvent('filter-change', params, evnt);
+      $xeTable.dispatchEvent('clear-filter', params, evnt);
+    }
+    if (multiple && filterCols.length) {
       const params = {
         $table: $xeTable,
         $event: evnt,
@@ -16830,10 +16867,6 @@ const Methods = {
         filterList: []
       };
       $xeTable.dispatchEvent('clear-all-filter', params, evnt);
-    } else if (column) {
-      $xeTable.dispatchEvent('clear-filter', {
-        filterList: () => $xeTable.getCheckedFilters()
-      }, evnt);
     }
     return $xeTable.$nextTick();
   },
@@ -30835,7 +30868,10 @@ function renderBody(h, $xeTable) {
       warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
     }
     if (aggregateOpts.aggregateMethod) {
-      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod']);
+      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
+    }
+    if (aggregateOpts.countMethod) {
+      warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
     }
     if (props.treeConfig && treeOpts.children) {
       warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
@@ -35517,7 +35553,7 @@ const Toolbar = VxeToolbar;
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
-      useNew: '{0} 已经不建议使用，请使用新的方式 {1}'
+      useNew: '不建议使用 {0}，请使用 {1}'
     },
     table: {
       emptyText: '暂无数据',