vxe-table 3.15.54 → 3.15.57

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.15.54";
+const version = "3.15.57";
 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: {
@@ -3906,7 +3907,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.54"}`;
+const log_version = `table v${"3.15.57"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6805,10 +6806,10 @@ function cacheColumnMap($xeTable) {
   }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
-      errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
     }
     if (!rowOpts.useKey) {
-      errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
     }
   }
   reactData.isGroup = isGroup;
@@ -8850,6 +8851,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,
@@ -8860,10 +8865,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 {
@@ -8885,8 +8896,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);
@@ -16358,9 +16377,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);
   },
   /**
    * 清空指定列的排序条件
@@ -16393,6 +16412,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -16412,7 +16434,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,
@@ -16420,8 +16448,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -16467,14 +16493,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();
   },
@@ -16533,6 +16557,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -16562,7 +16589,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,
@@ -16570,10 +16624,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();
   },
@@ -29703,12 +29753,46 @@ function renderBody(h, $xeTable) {
     computeVirtualXOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualXConfig || table_getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+      const {
+        virtualXConfig,
+        scrollX
+      } = props;
+      const globalVirtualXConfig = table_getConfig().table.virtualXConfig;
+      const globalScrollX = table_getConfig().table.scrollX;
+      if (virtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      if (scrollX) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollX, scrollX);
+      }
+      if (globalVirtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollX, scrollX);
     },
     computeVirtualYOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualYConfig || table_getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+      const {
+        virtualYConfig,
+        scrollY
+      } = props;
+      const globalVirtualYConfig = table_getConfig().table.virtualYConfig;
+      const globalScrollY = table_getConfig().table.scrollY;
+      if (virtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+      }
+      if (scrollY) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollY, scrollY);
+      }
+      if (globalVirtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollY, scrollY);
     },
     computeScrollbarOpts() {
       const $xeTable = this;
@@ -32256,9 +32340,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;
@@ -33499,6 +33585,31 @@ Object.keys(table.methods).forEach(name => {
         $grid: this
       }, params));
     },
+    clearAllSortEvent(params) {
+      const {
+        $table,
+        column,
+        sortList
+      } = params;
+      const isRemote = column && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote;
+      // 如果是服务端排序
+      if (isRemote) {
+        this.sortData = sortList;
+        if (this.proxyConfig) {
+          this.tablePage.currentPage = 1;
+          this.commitProxy('query').then(rest => {
+            this.$emit('proxy-query', {
+              ...rest,
+              $grid: this,
+              $event: params.$event
+            });
+          });
+        }
+      }
+      this.$emit('clear-all-sort', Object.assign({
+        $grid: this
+      }, params));
+    },
     filterChangeEvent(params) {
       const {
         $table,
@@ -33522,6 +33633,29 @@ Object.keys(table.methods).forEach(name => {
         $grid: this
       }, params));
     },
+    clearAllFilterEvent(params) {
+      const {
+        $table,
+        filterList
+      } = params;
+      // 如果是服务端过滤
+      if ($table.filterOpts.remote) {
+        this.filterData = filterList;
+        if (this.proxyConfig) {
+          this.tablePage.currentPage = 1;
+          this.commitProxy('query').then(rest => {
+            this.$emit('proxy-query', {
+              ...rest,
+              $grid: this,
+              $event: params.$event
+            });
+          });
+        }
+      }
+      this.$emit('clear-all-filter', Object.assign({
+        $grid: this
+      }, params));
+    },
     submitEvent(params) {
       const $xeGrid = this;
       const reactData = $xeGrid;
@@ -35161,7 +35295,8 @@ const Toolbar = VxeToolbar;
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
-      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
+      useNew: '不建议使用 {0}，请使用 {1}'
     },
     table: {
       emptyText: '暂无数据',