vxe-table 3.15.53 → 3.15.56

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.15.53";
+const version = "3.15.56";
 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.53"}`;
+const log_version = `table v${"3.15.56"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3929,6 +3930,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     const proxyOpts = $xeGrid ? $xeGrid.proxyOpts : null;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
@@ -3974,6 +3979,14 @@ class ColumnInfo {
         errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
       }
     }
+    if (field && editRender) {
+      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+      }
+      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+      }
+    }
     Object.assign(this, {
       // 基本属性
       type: _vm.type,
@@ -8838,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,
@@ -8848,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 {
@@ -8873,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);
@@ -16344,12 +16375,11 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    // 已废弃，即将去掉事件触发 new Event('click') -> null
-    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    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);
   },
   /**
    * 清空指定列的排序条件
@@ -16382,6 +16412,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -16401,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,
@@ -16409,8 +16448,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -16456,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();
   },
@@ -16522,6 +16557,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -16551,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,
@@ -16559,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();
   },
@@ -32245,9 +32306,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;
@@ -33488,6 +33551,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,
@@ -33511,6 +33599,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;
@@ -35112,6 +35223,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
@@ -35149,7 +35261,8 @@ const Toolbar = VxeToolbar;
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
-      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
+      useNew: '不建议使用 {0}，请使用 {1}'
     },
     table: {
       emptyText: '暂无数据',
@@ -35191,8 +35304,26 @@ const Toolbar = VxeToolbar;
       operError: '发生错误，操作失败！'
     },
     select: {
+      clear: '清除',
+      allChecked: '全选',
+      total: '{0} / {1}',
       search: '搜索',
       loadingText: '加载中',
+      emptyText: '暂无数据',
+      maxSize: '最大可选择的数量不能超过 {0} 个',
+      overSizeErr: '已超出最大可选数量 {0} 个，超出部分将被忽略！',
+      searchEmpty: '未匹配到数据！'
+    },
+    tree: {
+      searchEmpty: '未匹配到数据！'
+    },
+    treeSelect: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      allExpand: '全部展开',
+      clearExpand: '全部收起',
+      total: '已选 {0}',
+      search: '搜索',
       emptyText: '暂无数据'
     },
     pager: {