vxe-table 3.16.6 → 3.16.8

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.8";
 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.8"}`;
 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', {
@@ -8907,6 +8909,10 @@ function removeFooterMerges($xeTable, merges) {
   return rest;
 }
 function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+  const internalData = $xeTable;
+  const {
+    tableFullColumn
+  } = internalData;
   const sortOpts = $xeTable.computeSortOpts;
   const {
     multiple,
@@ -8917,10 +8923,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
     sortConfs = [sortConfs];
   }
   if (sortConfs && sortConfs.length) {
+    const orderActiveMaps = {};
     if (!multiple) {
       sortConfs = [sortConfs[0]];
-      clearAllSort($xeTable);
+      tableFullColumn.forEach(column => {
+        if (column.order) {
+          orderActiveMaps[column.id] = column;
+        }
+      });
     }
+    const sortColMpps = {};
     let firstColumn = null;
     sortConfs.forEach((confs, index) => {
       let {
@@ -8942,8 +8954,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
           column.order = order;
         }
         column.sortTime = Date.now() + index;
+        sortColMpps[column.id] = column;
       }
     });
+    if (!multiple) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(orderActiveMaps, (oaCol, oaId) => {
+        if (!sortColMpps[oaId]) {
+          oaCol.order = null;
+        }
+      });
+    }
     if (isUpdate) {
       if (!remote) {
         $xeTable.handleTableData(true);
@@ -16618,9 +16638,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 +16673,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -16672,7 +16695,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 +16709,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -16727,14 +16754,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 +16818,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -16822,7 +16850,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 +16885,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 +30886,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']);
@@ -32296,9 +32350,11 @@ function getTableOns(_vm) {
   if (proxyConfig) {
     if (proxyOpts.sort) {
       ons['sort-change'] = _vm.sortChangeEvent;
+      ons['clear-all-sort'] = _vm.clearAllSortEvent;
     }
     if (proxyOpts.filter) {
       ons['filter-change'] = _vm.filterChangeEvent;
+      ons['clear-all-filter'] = _vm.clearAllFilterEvent;
     }
   }
   return ons;
@@ -33394,6 +33450,31 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         tool
       }, evnt);
     },
+    pageChangeEvent(params) {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      const reactData = $xeGrid.reactData;
+      const {
+        proxyConfig
+      } = props;
+      const {
+        tablePage
+      } = reactData;
+      const {
+        $event,
+        currentPage,
+        pageSize
+      } = params;
+      const proxyOpts = $xeGrid.computeProxyOpts;
+      tablePage.currentPage = currentPage;
+      tablePage.pageSize = pageSize;
+      $xeGrid.dispatchEvent('page-change', params, $event);
+      if (proxyConfig && isEnableConf(proxyOpts)) {
+        $xeGrid.commitProxy('query').then(rest => {
+          $xeGrid.dispatchEvent('proxy-query', rest, $event);
+        });
+      }
+    },
     sortChangeEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -33416,30 +33497,27 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       }
       $xeGrid.dispatchEvent('sort-change', params, params.$event);
     },
-    pageChangeEvent(params) {
+    clearAllSortEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
       const reactData = $xeGrid.reactData;
+      const $xeTable = $xeGrid.$refs.refTable;
       const {
         proxyConfig
       } = props;
-      const {
-        tablePage
-      } = reactData;
-      const {
-        $event,
-        currentPage,
-        pageSize
-      } = params;
       const proxyOpts = $xeGrid.computeProxyOpts;
-      tablePage.currentPage = currentPage;
-      tablePage.pageSize = pageSize;
-      $xeGrid.dispatchEvent('page-change', params, $event);
-      if (proxyConfig && isEnableConf(proxyOpts)) {
-        $xeGrid.commitProxy('query').then(rest => {
-          $xeGrid.dispatchEvent('proxy-query', rest, $event);
-        });
+      const sortOpts = $xeTable.computeSortOpts;
+      // 如果是服务端排序
+      if (sortOpts.remote) {
+        reactData.sortData = params.sortList;
+        if (proxyConfig && isEnableConf(proxyOpts)) {
+          reactData.tablePage.currentPage = 1;
+          $xeGrid.commitProxy('query').then(rest => {
+            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
+          });
+        }
       }
+      $xeGrid.dispatchEvent('clear-all-sort', params, params.$event);
     },
     filterChangeEvent(params) {
       const $xeGrid = this;
@@ -33463,6 +33541,28 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       }
       $xeGrid.dispatchEvent('filter-change', params, params.$event);
     },
+    clearAllFilterEvent(params) {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      const reactData = $xeGrid.reactData;
+      const $xeTable = $xeGrid.$refs.refTable;
+      const {
+        proxyConfig
+      } = props;
+      const proxyOpts = $xeGrid.computeProxyOpts;
+      const filterOpts = $xeTable.computeFilterOpts;
+      // 如果是服务端过滤
+      if (filterOpts.remote) {
+        reactData.filterData = params.filterList;
+        if (proxyConfig && isEnableConf(proxyOpts)) {
+          reactData.tablePage.currentPage = 1;
+          $xeGrid.commitProxy('query').then(rest => {
+            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
+          });
+        }
+      }
+      $xeGrid.dispatchEvent('clear-all-filter', params, params.$event);
+    },
     submitFormEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -35517,7 +35617,7 @@ const Toolbar = VxeToolbar;
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
-      useNew: '{0} 已经不建议使用，请使用新的方式 {1}'
+      useNew: '不建议使用 {0}，请使用 {1}'
     },
     table: {
       emptyText: '暂无数据',