vxe-table 3.17.0-beta.9 → 3.17.0

package/lib/table/src/methods.js

@@ -149,44 +149,122 @@ function handleVirtualXVisible($xeTable) {
   };
 }
 function handleCustomRestore($xeTable, storeData) {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  let {
+  const {
+    aggregateConfig,
+    rowGroupConfig
+  } = props;
+  const {
     collectColumn
   } = internalData;
+  const customOpts = $xeTable.computeCustomOpts;
   const {
+    storage,
+    storeOptions
+  } = customOpts;
+  const isAllCustom = storage === true;
+  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+  const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+  const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+  const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+  const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+  const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
+  const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
+  let {
     resizableData,
     sortData,
     visibleData,
-    fixedData
+    fixedData,
+    aggGroupData,
+    aggFuncData
   } = storeData;
-  let hasCustomSort = false;
   // 处理还原
-  if (resizableData || sortData || visibleData || fixedData) {
+  if (isCustomResizable && resizableData || isCustomSort && sortData || isCustomVisible && visibleData || isCustomFixed && fixedData || isCustomAggGroup && aggGroupData || isCustomAggFunc && aggFuncData) {
+    const sortColMaps = {};
+    if (isCustomSort && sortData) {
+      // 转换兼容老版本数据，即将废弃兼容
+      if (!_xeUtils.default.isArray(sortData)) {
+        const sortRests = [];
+        _xeUtils.default.each(sortData, (index, colKey) => {
+          sortRests.push({
+            key: colKey,
+            index
+          });
+        });
+        sortData = _xeUtils.default.orderBy(sortRests, {
+          field: 'index',
+          order: 'asc'
+        }).map(item => ({
+          k: item.key
+        }));
+      }
+      let colNum = 1;
+      _xeUtils.default.eachTree(sortData, (sObj, index, sOjs, path, pSObj) => {
+        sortColMaps[sObj.k] = {
+          key: sObj.k,
+          sNum: colNum++,
+          pKey: pSObj ? pSObj.k : null
+        };
+      }, {
+        children: 'c'
+      });
+    }
+    const colKeyMaps = {};
+    const allCols = [];
+    const aggGroupConfs = [];
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       // 支持一级
       if (!parentColumn) {
-        if (fixedData && fixedData[colKey] !== undefined) {
+        if (isCustomFixed && fixedData && fixedData[colKey] !== undefined) {
           column.fixed = fixedData[colKey];
         }
-        if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
-          hasCustomSort = true;
-          column.renderSortNumber = sortData[colKey];
-        }
       }
-      if (resizableData && _xeUtils.default.isNumber(resizableData[colKey])) {
+      if (isCustomResizable && resizableData && _xeUtils.default.isNumber(resizableData[colKey])) {
         column.resizeWidth = resizableData[colKey];
       }
-      if (visibleData && _xeUtils.default.isBoolean(visibleData[colKey])) {
+      if (isCustomVisible && visibleData && _xeUtils.default.isBoolean(visibleData[colKey])) {
         column.visible = visibleData[colKey];
       }
+      if (isCustomAggFunc && aggFuncData && (aggregateConfig || rowGroupConfig) && aggFuncData[colKey]) {
+        column.aggFunc = aggFuncData[colKey];
+      }
+      if (isCustomAggGroup && aggGroupData && aggGroupData[colKey]) {
+        aggGroupConfs.push({
+          field: column.field
+        });
+      }
+      colKeyMaps[colKey] = column;
+      allCols.push(column);
     });
+    if ((aggregateConfig || rowGroupConfig) && aggGroupConfs.length) {
+      const groupRest = handleGroupData($xeTable, internalData.tableFullData, aggGroupConfs);
+      internalData.tableFullTreeData = [];
+      internalData.tableFullGroupData = groupRest.treeData;
+      reactData.isRowGroupStatus = true;
+      reactData.rowGroupList = aggGroupConfs;
+      $xeTable.cacheRowMap(false);
+    }
     // 如果自定义了顺序
-    if (hasCustomSort) {
-      collectColumn = _xeUtils.default.orderBy(collectColumn, 'renderSortNumber');
-      internalData.collectColumn = collectColumn;
-      internalData.tableFullColumn = getColumnList(collectColumn);
+    if (isCustomSort && sortData) {
+      allCols.forEach(column => {
+        const colKey = column.getKey();
+        const scItem = sortColMaps[colKey];
+        if (scItem) {
+          const parentColumn = scItem.pKey ? colKeyMaps[scItem.pKey] : null;
+          column.parentId = parentColumn ? parentColumn.id : null;
+          column.renderSortNumber = scItem.sNum;
+        }
+      });
+      const newCollectCols = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(allCols, 'renderSortNumber'), {
+        key: 'id',
+        parentKey: 'parentId',
+        children: 'children'
+      });
+      internalData.collectColumn = newCollectCols;
+      internalData.tableFullColumn = (0, _util.getColumnList)(newCollectCols);
     }
     reactData.isCustomStatus = true;
   } else {
@@ -661,6 +739,7 @@ function updateAfterListIndex($xeTable) {
         $index: -1,
         _index: index,
         treeIndex: -1,
+        _tIndex: -1,
         items: [],
         parent: null,
         level: 0,
@@ -699,6 +778,7 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    let _treeIndex = 0;
     const {
       handleGetRowId
     } = (0, _util.createHandleGetRowId)($xeTable);
@@ -709,6 +789,7 @@ function updateAfterDataIndex($xeTable) {
       if (rowRest) {
         rowRest.seq = seq;
         rowRest.treeIndex = index;
+        rowRest._tIndex = _treeIndex;
       } else {
         const rest = {
           row,
@@ -718,6 +799,7 @@ function updateAfterDataIndex($xeTable) {
           $index: -1,
           _index: -1,
           treeIndex: -1,
+          _tIndex: _treeIndex,
           items: [],
           parent: null,
           level: 0,
@@ -729,6 +811,7 @@ function updateAfterDataIndex($xeTable) {
         fullAllDataRowIdData[rowid] = rest;
         fullDataRowIdData[rowid] = rest;
       }
+      _treeIndex++;
       fullMaps[rowid] = row;
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
@@ -2432,6 +2515,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,
@@ -2442,10 +2529,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 {
@@ -2467,8 +2560,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
           column.order = order;
         }
         column.sortTime = Date.now() + index;
+        sortColMpps[column.id] = column;
       }
     });
+    if (!multiple) {
+      _xeUtils.default.each(orderActiveMaps, (oaCol, oaId) => {
+        if (!sortColMpps[oaId]) {
+          oaCol.order = null;
+        }
+      });
+    }
     if (isUpdate) {
       if (!remote) {
         $xeTable.handleTableData(true);
@@ -2673,7 +2774,7 @@ const calcCellHeight = $xeTable => {
   } = internalData;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && scrollYLoad && el) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
     const {
       handleGetRowId
     } = (0, _util.createHandleGetRowId)($xeTable);
@@ -3212,18 +3313,18 @@ function handleUpdateAggValues($xeTable) {
 }
 function handleUpdateRowGroup($xeTable, groupFields) {
   const reactData = $xeTable;
-  const aggFields = [];
-  const aggConfs = [];
+  const aggGroupFields = [];
+  const aggGroupConfs = [];
   if (groupFields) {
     (_xeUtils.default.isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
-      aggFields.push(field);
-      aggConfs.push({
+      aggGroupFields.push(field);
+      aggGroupConfs.push({
         field
       });
     });
   }
-  reactData.rowGroupList = aggConfs;
-  reactData.aggHandleFields = aggFields;
+  reactData.rowGroupList = aggGroupConfs;
+  reactData.aggHandleFields = aggGroupFields;
   handleUpdateAggValues($xeTable);
 }
 function handleeGroupSummary($xeTable, aggList) {
@@ -3604,7 +3705,7 @@ function handleUpdateColumn($xeTable) {
   const internalData = $xeTable;
   const columnList = _xeUtils.default.orderBy(internalData.collectColumn, 'renderSortNumber');
   internalData.collectColumn = columnList;
-  const tableFullColumn = getColumnList(columnList);
+  const tableFullColumn = (0, _util.getColumnList)(columnList);
   internalData.tableFullColumn = tableFullColumn;
   cacheColumnMap($xeTable);
 }
@@ -3649,14 +3750,6 @@ function loadScrollXData($xeTable) {
   }
   $xeTable.closeTooltip();
 }
-// 获取所有的列，排除分组
-function getColumnList(columns) {
-  const result = [];
-  columns.forEach(column => {
-    result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]));
-  });
-  return result;
-}
 function parseColumns($xeTable, isReset) {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -3687,7 +3780,7 @@ function parseColumns($xeTable, isReset) {
       if (parentColumn && parentColumn.fixed) {
         column.fixed = parentColumn.fixed;
       }
-      if (parentColumn && column.fixed !== parentColumn.fixed) {
+      if (parentColumn && (column.fixed || '') !== (parentColumn.fixed || '')) {
         (0, _log.errLog)('vxe.error.groupFixed');
       }
       if (isColGroup) {
@@ -3795,27 +3888,31 @@ function parseColumns($xeTable, isReset) {
   }
   return $xeTable.updateFooter();
 }
-function initColumnSort($xeTable) {
+function initColumnHierarchy($xeTable) {
   const internalData = $xeTable;
   const {
     collectColumn
   } = internalData;
-  collectColumn.forEach((column, index) => {
-    const sortIndex = index + 1;
+  let sortIndex = 1;
+  _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+    const parentId = parentColumn ? parentColumn.id : null;
+    column.parentId = parentId;
+    column.defaultParentId = parentId;
     column.sortNumber = sortIndex;
     column.renderSortNumber = sortIndex;
+    sortIndex++;
   });
 }
-function handleColumn($xeTable, collectColumn) {
+function handleInitColumn($xeTable, collectColumn) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
   const reactData = $xeTable;
   const internalData = $xeTable;
   const expandOpts = $xeTable.computeExpandOpts;
   internalData.collectColumn = collectColumn;
-  const tableFullColumn = getColumnList(collectColumn);
+  const tableFullColumn = (0, _util.getColumnList)(collectColumn);
   internalData.tableFullColumn = tableFullColumn;
   reactData.isColLoading = true;
-  initColumnSort($xeTable);
+  initColumnHierarchy($xeTable);
   return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
     const {
       scrollXLoad,
@@ -4542,7 +4639,7 @@ const Methods = {
     const collectColumn = _xeUtils.default.mapTree(columns, column => _cell.default.createColumn($xeTable, column), {
       children: 'children'
     });
-    return handleColumn($xeTable, collectColumn).then(() => {
+    return handleInitColumn($xeTable, collectColumn).then(() => {
       let targetScrollLeft = lastScrollLeft;
       let targetScrollTop = lastScrollTop;
       const virtualXOpts = $xeTable.computeVirtualXOpts;
@@ -4567,9 +4664,9 @@ const Methods = {
       return this.loadColumn(columns);
     });
   },
-  handleColumn(collectColumn) {
+  handleInitColumn(collectColumn) {
     const $xeTable = this;
-    return handleColumn($xeTable, collectColumn);
+    return handleInitColumn($xeTable, collectColumn);
   },
   /**
    * 更新数据行的 Map
@@ -4608,6 +4705,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: index,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level,
@@ -4751,6 +4849,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
@@ -5876,8 +5975,9 @@ const Methods = {
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomAggGroup || isCustomSort)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
@@ -5903,12 +6003,18 @@ const Methods = {
   getCustomStoreData() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       id
     } = props;
     const customOpts = $xeTable.computeCustomOpts;
     const {
+      isRowGroupStatus,
+      rowGroupList
+    } = reactData;
+    const {
+      fullColumnFieldData,
       collectColumn
     } = internalData;
     const {
@@ -5922,17 +6028,20 @@ const Methods = {
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
     const resizableData = {};
-    const sortData = {};
+    const sortData = [];
     const visibleData = {};
     const fixedData = {};
+    const aggGroupData = {};
     const aggFuncData = {};
     const storeData = {
       resizableData: undefined,
       sortData: undefined,
       visibleData: undefined,
       fixedData: undefined,
+      aggGroupData: undefined,
       aggFuncData: undefined
     };
     if (!id) {
@@ -5946,19 +6055,40 @@ const Methods = {
     let hasFixed = 0;
     let hasVisible = 0;
     let hasAggFunc = 0;
+    const sortMaps = {};
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       if (!colKey) {
         (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
         return;
       }
-      // 只支持一级
-      if (!parentColumn) {
+      if (parentColumn) {
+        if (isCustomSort) {
+          const pColKey = parentColumn.getKey();
+          const psObj = sortMaps[pColKey];
+          hasSort = 1;
+          if (psObj) {
+            const sObj = {
+              k: colKey
+            };
+            sortMaps[colKey] = sObj;
+            if (!psObj.c) {
+              psObj.c = [];
+            }
+            psObj.c.push(sObj);
+          }
+        }
+      } else {
         if (isCustomSort) {
           hasSort = 1;
-          sortData[colKey] = column.renderSortNumber;
+          const sObj = {
+            k: colKey
+          };
+          sortMaps[colKey] = sObj;
+          sortData.push(sObj);
         }
-        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+        // 只支持一级
+        if (isCustomFixed && (column.fixed || '') !== (column.defaultFixed || '')) {
           hasFixed = 1;
           fixedData[colKey] = column.fixed;
         }
@@ -5979,7 +6109,7 @@ const Methods = {
           visibleData[colKey] = true;
         }
       }
-      if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+      if (isCustomAggFunc && (column.aggFunc || '') !== (column.defaultAggFunc || '')) {
         hasAggFunc = 1;
         aggFuncData[colKey] = column.aggFunc;
       }
@@ -5996,6 +6126,15 @@ const Methods = {
     if (hasVisible) {
       storeData.visibleData = visibleData;
     }
+    if (isCustomAggGroup && isRowGroupStatus) {
+      rowGroupList.forEach(aggConf => {
+        const colRest = fullColumnFieldData[aggConf.field];
+        if (colRest) {
+          aggGroupData[colRest.column.getKey()] = true;
+        }
+      });
+      storeData.aggGroupData = aggGroupData;
+    }
     if (hasAggFunc) {
       storeData.aggFuncData = aggFuncData;
     }
@@ -6021,11 +6160,12 @@ const Methods = {
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
     if (type !== 'reset') {
       reactData.isCustomStatus = true;
     }
-    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
+    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return this.$nextTick();
@@ -6034,7 +6174,9 @@ const Methods = {
         resizableData: {},
         sortData: {},
         visibleData: {},
-        fixedData: {}
+        fixedData: {},
+        aggGroupData: {},
+        aggFuncData: {}
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
@@ -10181,9 +10323,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);
   },
   /**
    * 清空指定列的排序条件
@@ -10216,6 +10358,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -10235,7 +10380,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,
@@ -10243,8 +10394,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -10290,22 +10439,12 @@ const Methods = {
     }
     return sortList;
   },
-  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+  setFilterByEvent(evnt, fieldOrColumn, options) {
     const $xeTable = this;
-    const reactData = $xeTable;
-    const {
-      filterStore
-    } = reactData;
     const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
     if (column && column.filters) {
       column.filters = (0, _util.toFilters)(options || []);
-      if (isUpdate) {
-        return $xeTable.handleColumnConfirmFilter(column, evnt);
-      } else {
-        if (filterStore.visible) {
-          $xeTable.handleFilterOptions(column);
-        }
-      }
+      return $xeTable.handleColumnConfirmFilter(column, evnt);
     }
     return $xeTable.$nextTick();
   },
@@ -10364,6 +10503,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -10393,7 +10535,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,
@@ -10401,10 +10570,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();
   },