vxe-table 3.12.14 → 3.12.15

package/lib/table/src/methods.js

@@ -1263,7 +1263,7 @@ const calcCellHeight = $xeTable => {
     reactData.calcCellHeightFlag++;
   }
 };
-function getOrderField(_vm, column) {
+function getOrderField($xeTable, column) {
   const {
     sortBy,
     sortType
@@ -1276,7 +1276,7 @@ function getOrderField(_vm, column) {
         column
       }) : _xeUtils.default.get(row, sortBy);
     } else {
-      cellValue = _vm.getCellLabel(row, column);
+      cellValue = $xeTable.getCellLabel(row, column);
     }
     if (!sortType || sortType === 'auto') {
       return isNaN(cellValue) ? cellValue : _xeUtils.default.toNumber(cellValue);
@@ -3336,15 +3336,26 @@ const Methods = {
    */
   updateAfterFullData() {
     const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
       tableFullColumn,
       tableFullData,
-      filterOpts,
-      sortOpts,
-      treeConfig,
-      treeOpts,
       tableFullTreeData
-    } = this;
+    } = internalData;
+    const filterOpts = $xeTable.computeFilterOpts;
+    const sortOpts = $xeTable.computeSortOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const {
+      transform,
+      rowField,
+      parentField,
+      mapChildrenField
+    } = treeOpts;
     const {
       remote: allRemoteFilter,
       filterMethod: allFilterMethod
@@ -3355,63 +3366,61 @@ const Methods = {
       multiple: sortMultiple,
       chronological
     } = sortOpts;
-    const {
-      transform
-    } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     let tableData = [];
     let tableTree = [];
-    const filterColumns = [];
-    let orderColumns = [];
-    tableFullColumn.forEach(column => {
-      const {
-        field,
-        sortable,
-        order,
-        filters
-      } = column;
-      if (!allRemoteFilter && filters && filters.length) {
-        const valueList = [];
-        const itemList = [];
-        filters.forEach(item => {
-          if (item.checked) {
-            itemList.push(item);
-            valueList.push(item.value);
+    // 处理数据
+    if (!allRemoteFilter || !allRemoteSort) {
+      const filterColumns = [];
+      let orderColumns = [];
+      tableFullColumn.forEach(column => {
+        const {
+          field,
+          sortable,
+          order,
+          filters
+        } = column;
+        if (!allRemoteFilter && filters && filters.length) {
+          const valueList = [];
+          const itemList = [];
+          filters.forEach(item => {
+            if (item.checked) {
+              itemList.push(item);
+              valueList.push(item.value);
+            }
+          });
+          if (itemList.length) {
+            filterColumns.push({
+              column,
+              valueList,
+              itemList
+            });
           }
-        });
-        if (itemList.length) {
-          filterColumns.push({
+        }
+        if (!allRemoteSort && sortable && order) {
+          orderColumns.push({
             column,
-            valueList,
-            itemList
+            field,
+            property: field,
+            order: order,
+            sortTime: column.sortTime
           });
         }
-      }
-      if (!allRemoteSort && sortable && order) {
-        orderColumns.push({
-          column,
-          field,
-          property: field,
-          order,
-          sortTime: column.sortTime
-        });
-      }
-    });
-    if (sortMultiple && chronological && orderColumns.length > 1) {
-      orderColumns = _xeUtils.default.orderBy(orderColumns, 'sortTime');
-    }
-    if (filterColumns.length) {
-      const handleFilter = row => {
-        return filterColumns.every(({
-          column,
-          valueList,
-          itemList
-        }) => {
-          if (valueList.length && !allRemoteFilter) {
+      });
+      if (sortMultiple && chronological && orderColumns.length > 1) {
+        orderColumns = _xeUtils.default.orderBy(orderColumns, 'sortTime');
+      }
+      // 处理筛选
+      // 支持单列、多列、组合筛选
+      if (!allRemoteFilter && filterColumns.length) {
+        const handleFilter = row => {
+          return filterColumns.every(({
+            column,
+            valueList,
+            itemList
+          }) => {
             const {
               filterMethod,
-              filterRender,
-              field
+              filterRender
             } = column;
             const compConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
             const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
@@ -3424,7 +3433,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (compFilterMethod) {
               return itemList.some(item => compFilterMethod({
@@ -3433,7 +3442,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (allFilterMethod) {
               return allFilterMethod({
@@ -3450,96 +3459,119 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             }
-            return valueList.indexOf(_xeUtils.default.get(row, field)) > -1;
-          }
-          return true;
-        });
-      };
-      if (treeConfig && transform) {
-        // 筛选虚拟树
-        tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
-        tableTree = tableData;
-      }
-    } else {
-      if (treeConfig && transform) {
-        // 还原虚拟树
-        tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-        tableTree = tableData;
-      }
-    }
-    const firstOrderColumn = orderColumns[0];
-    if (!allRemoteSort && firstOrderColumn) {
-      if (treeConfig && transform) {
-        // 虚拟树和列表一样，只能排序根级节点
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableTree,
-            sortList: orderColumns,
-            $table: this
+            return valueList.indexOf(_xeUtils.default.get(row, column.field)) > -1;
           });
-          tableTree = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
+        };
+        if (treeConfig && transform) {
+          // 筛选虚拟树
+          tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
+          });
+          tableData = tableTree;
         } else {
-          tableTree = _xeUtils.default.orderBy(tableTree, orderColumns.map(({
-            column,
-            order
-          }) => [getOrderField(this, column), order]));
+          tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+          tableTree = tableData;
         }
-        tableData = tableTree;
       } else {
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableData,
-            column: firstOrderColumn.column,
-            property: firstOrderColumn.field,
-            field: firstOrderColumn.field,
-            order: firstOrderColumn.order,
-            sortList: orderColumns,
-            $table: this
+        if (treeConfig && transform) {
+          // 还原虚拟树
+          tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
           });
-          tableData = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
+          tableData = tableTree;
         } else {
-          // 兼容 v4
-          if (sortMultiple) {
-            tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
+          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+          tableTree = tableData;
+        }
+      }
+      // 处理排序（不能用于树形结构）
+      // 支持单列、多列、组合排序
+      if (!allRemoteSort && orderColumns.length) {
+        if (treeConfig && transform) {
+          // 虚拟树和列表一样，只能排序根级节点
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableTree,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableTree = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
+          } else {
+            const treeList = _xeUtils.default.toTreeArray(tableTree, {
+              children: mapChildrenField
+            });
+            tableTree = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(treeList, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order])), {
+              key: rowField,
+              parentKey: parentField,
+              children: childrenField,
+              mapChildren: mapChildrenField
+            });
+          }
+          tableData = tableTree;
+        } else {
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableData,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableData = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
           } else {
-            // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
-            let sortByConfs;
-            if (_xeUtils.default.isArray(firstOrderColumn.sortBy)) {
-              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+            // 兼容 v4
+            if (sortMultiple) {
+              tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
+            } else {
+              const firstOrderColumn = orderColumns[0];
+              let sortByConfs;
+              // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
+              if (_xeUtils.default.isArray(firstOrderColumn.sortBy)) {
+                sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+              }
+              tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
             }
-            tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+            tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order]));
           }
+          tableTree = tableData;
         }
+      }
+    } else {
+      if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
+          original: true,
+          isEvery: true,
+          children: treeOpts.mapChildrenField,
+          mapChildren: childrenField
+        });
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
         tableTree = tableData;
       }
     }
-    this.afterFullData = tableData;
-    this.afterTreeFullData = tableTree;
+    internalData.afterFullData = tableData;
+    internalData.afterTreeFullData = tableTree;
     updateAfterDataIndex($xeTable);
   },
   /**