@visactor/vtable 1.17.1-alpha.9 → 1.17.2-alpha.0

package/es/PivotTable.js

@@ -562,7 +562,7 @@ export class PivotTable extends BaseTable {
         this.pivotSortState = pivotSortStateConfig;
     }
     sort(col, row, order) {
-        var _a;
+        var _a, _b;
         let dimensions;
         if (this.isCornerHeader(col, row)) {
             const dimensionInfo = this.getHeaderDefine(col, row);
@@ -580,16 +580,20 @@ export class PivotTable extends BaseTable {
                 const cacheOldDimensionSortRule = {};
                 for (let i = this.dataset.sortRules.length - 1; i >= 0; i--) {
                     const sortRule = this.dataset.sortRules[i];
-                    headerDefine.dimensionKey && sortRule.sortField === headerDefine.dimensionKey ? (cacheOldDimensionSortRule[sortRule.sortField] = sortRule, 
-                    this.dataset.sortRules.splice(i, 1)) : sortIndicator && sortRule.sortField === (this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1]) && this.dataset.sortRules.splice(i, 1);
+                    (headerDefine.dimensionKey && sortRule.sortField === headerDefine.dimensionKey || sortIndicator && sortRule.sortField === (this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1])) && (cacheOldDimensionSortRule[sortRule.sortField] = sortRule, 
+                    this.dataset.sortRules.splice(i, 1));
                 }
-                sortIndicator ? this.dataset.sortRules.push({
-                    sortField: this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1],
-                    sortType: SortType[order],
-                    sortByIndicator: sortIndicator,
-                    query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value), 
-                    arr)), [])
-                }) : this.dataset.sortRules.push(Object.assign(null !== (_a = cacheOldDimensionSortRule[headerDefine.dimensionKey]) && void 0 !== _a ? _a : {}, {
+                if (sortIndicator) {
+                    const sortField = this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1];
+                    this.dataset.sortRules.push({
+                        sortField: sortField,
+                        sortType: SortType[order],
+                        sortByIndicator: sortIndicator,
+                        query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value), 
+                        arr)), []),
+                        sortFunc: null === (_a = cacheOldDimensionSortRule[sortField]) || void 0 === _a ? void 0 : _a.sortFunc
+                    });
+                } else this.dataset.sortRules.push(Object.assign(null !== (_b = cacheOldDimensionSortRule[headerDefine.dimensionKey]) && void 0 !== _b ? _b : {}, {
                     sortField: headerDefine.dimensionKey,
                     sortType: SortType[order]
                 }));
@@ -953,6 +957,9 @@ export class PivotTable extends BaseTable {
         var _a;
         return null === (_a = this.dataset) || void 0 === _a ? void 0 : _a.filterRules;
     }
+    setLoadingHierarchyState(col, row) {
+        this.scenegraph.setLoadingHierarchyState(col, row);
+    }
     release() {
         this.editorManager.release(), super.release();
     }