@visactor/vtable 1.2.1-alpha.2 → 1.3.1-alpha.0

package/cjs/PivotTable.d.ts

@@ -1,4 +1,4 @@
-import type { FieldData, FieldDef, PivotTableAPI, SortRules, PivotSortState, CellAddress, ICellHeaderPaths, DropDownMenuEventInfo, FieldKeyDef, PivotTableConstructorOptions, IHeaderTreeDefine, IDimensionInfo, SortOrder, IPagination, CellLocation } from './ts-types';
+import type { FieldData, FieldDef, PivotTableAPI, SortRules, CellAddress, ICellHeaderPaths, DropDownMenuEventInfo, FieldKeyDef, PivotTableConstructorOptions, IHeaderTreeDefine, IDimensionInfo, SortOrder, IPagination, CellLocation } from './ts-types';
 import { HierarchyState } from './ts-types';
 import { FlatDataToObjects } from './dataset/flatDataToObject';
 import { PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';
@@ -14,7 +14,10 @@ export declare class PivotTable extends BaseTable implements PivotTableAPI {
     };
     internalProps: PivotTableProtected;
     options: PivotTableConstructorOptions;
-    pivotSortState: PivotSortState[];
+    pivotSortState: {
+        dimensions: IDimensionInfo[];
+        order: SortOrder;
+    }[];
     editorManager: EditManeger;
     dataset?: Dataset;
     flatDataToObjects?: FlatDataToObjects;
@@ -46,10 +49,12 @@ export declare class PivotTable extends BaseTable implements PivotTableAPI {
     getCellOriginRecord(col: number, row: number): any;
     getCellRawRecord(col: number, row: number): any;
     updateSortRules(sortRules: SortRules): void;
+    _changePivotSortStateBySortRules(): void;
     updatePivotSortState(pivotSortStateConfig: {
         dimensions: IDimensionInfo[];
         order: SortOrder;
     }[]): void;
+    sort(col: number, row: number, order: SortOrder): void;
     getPivotSortState(col: number, row: number): SortOrder;
     _moveHeaderPosition(source: CellAddress, target: CellAddress): {
         sourceIndex: number;

package/cjs/PivotTable.js

@@ -33,7 +33,7 @@ const ts_types_1 = require("./ts-types"), pivot_header_layout_1 = require("./lay
 
 class PivotTable extends BaseTable_1.BaseTable {
     constructor(container, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         if ("node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), super(container, options), 
         this.layoutNodeId = {
@@ -68,14 +68,16 @@ class PivotTable extends BaseTable_1.BaseTable {
                 this.dataset = new dataset_1.Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_l = options.indicatorsAsCol) || void 0 === _l || _l, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree), 
                 options.columnTree || (!1 !== options.indicatorsAsCol && (this.dataset.colHeaderTree = (0, 
                 layout_helper_1.supplementIndicatorNodesForCustomTree)(this.dataset.colHeaderTree, options.indicators)), 
-                columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_m = this.dataset.colHeaderTree) && void 0 !== _m ? _m : [], this.layoutNodeId)), 
+                0 !== (null !== (_o = null === (_m = this.records) || void 0 === _m ? void 0 : _m.length) && void 0 !== _o ? _o : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.colHeaderTree = []), 
+                columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_p = this.dataset.colHeaderTree) && void 0 !== _p ? _p : [], this.layoutNodeId)), 
                 options.rowTree || (!1 === options.indicatorsAsCol && (this.dataset.rowHeaderTree = (0, 
                 layout_helper_1.supplementIndicatorNodesForCustomTree)(this.dataset.rowHeaderTree, options.indicators)), 
-                rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_o = this.dataset.rowHeaderTree) && void 0 !== _o ? _o : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_p = this.options.rowExpandLevel) && void 0 !== _p ? _p : 1 : void 0)), 
+                0 !== (null !== (_r = null === (_q = this.records) || void 0 === _q ? void 0 : _q.length) && void 0 !== _r ? _r : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.rowHeaderTree = []), 
+                rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_s = this.dataset.rowHeaderTree) && void 0 !== _s ? _s : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_t = this.options.rowExpandLevel) && void 0 !== _t ? _t : 1 : void 0)), 
                 this.internalProps.layoutMap = new pivot_header_layout_1.PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
             }
-            this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState), 
-            "node" !== env_1.Env.mode && (this.editorManager = new edit_manager_1.EditManeger(this)), 
+            this._changePivotSortStateBySortRules(), (null !== (_v = null === (_u = options.pivotSortState) || void 0 === _u ? void 0 : _u.length) && void 0 !== _v ? _v : 0) > 0 && (this.pivotSortState = [], 
+            this.pivotSortState = options.pivotSortState), "node" !== env_1.Env.mode && (this.editorManager = new edit_manager_1.EditManeger(this)), 
             this.refreshHeader(), this.stateManager.initCheckedState(records), this.scenegraph.createSceneGraph(), 
             options.title && (this.internalProps.title = new title_1.Title(options.title, this), 
             this.scenegraph.resize()), this.options.emptyTip && (this.internalProps.emptyTip || (this.internalProps.emptyTip = new empty_tip_1.EmptyTip(this.options.emptyTip, this)), 
@@ -112,7 +114,7 @@ class PivotTable extends BaseTable_1.BaseTable {
         return ifCan;
     }
     updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const internalProps = this.internalProps;
         if (super.updateOption(options), this.layoutNodeId = {
             seqId: 0
@@ -153,14 +155,16 @@ class PivotTable extends BaseTable_1.BaseTable {
             this.dataset = new dataset_1.Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, null === (_o = options.indicatorsAsCol) || void 0 === _o || _o, records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree), 
             options.columnTree || (!1 !== options.indicatorsAsCol && (this.dataset.colHeaderTree = (0, 
             layout_helper_1.supplementIndicatorNodesForCustomTree)(this.dataset.colHeaderTree, options.indicators)), 
-            columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_p = this.dataset.colHeaderTree) && void 0 !== _p ? _p : [], this.layoutNodeId)), 
+            0 !== (null !== (_q = null === (_p = this.records) || void 0 === _p ? void 0 : _p.length) && void 0 !== _q ? _q : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.colHeaderTree = []), 
+            columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_r = this.dataset.colHeaderTree) && void 0 !== _r ? _r : [], this.layoutNodeId)), 
             options.rowTree || (!1 === options.indicatorsAsCol && (this.dataset.rowHeaderTree = (0, 
             layout_helper_1.supplementIndicatorNodesForCustomTree)(this.dataset.rowHeaderTree, options.indicators)), 
-            rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_q = this.dataset.rowHeaderTree) && void 0 !== _q ? _q : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_r = this.options.rowExpandLevel) && void 0 !== _r ? _r : 1 : void 0)), 
+            0 !== (null !== (_t = null === (_s = this.records) || void 0 === _s ? void 0 : _s.length) && void 0 !== _t ? _t : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.rowHeaderTree = []), 
+            rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_u = this.dataset.rowHeaderTree) && void 0 !== _u ? _u : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_v = this.options.rowExpandLevel) && void 0 !== _v ? _v : 1 : void 0)), 
             internalProps.layoutMap = new pivot_header_layout_1.PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
         }
-        return this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState), 
-        this.refreshHeader(), internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
+        return this._changePivotSortStateBySortRules(), (null !== (_x = null === (_w = options.pivotSortState) || void 0 === _w ? void 0 : _w.length) && void 0 !== _x ? _x : 0) > 0 && (this.pivotSortState = [], 
+        this.pivotSortState = options.pivotSortState), this.refreshHeader(), internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
             var _a;
             return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
         })), internalProps.releaseList = null), this.scenegraph.clearCells(), this.scenegraph.createSceneGraph(), 
@@ -463,26 +467,94 @@ class PivotTable extends BaseTable_1.BaseTable {
         }
     }
     updateSortRules(sortRules) {
-        this.internalProps.dataConfig.sortRules = sortRules, this.dataset.updateSortRules(sortRules), 
+        this.internalProps.dataConfig ? this.internalProps.dataConfig.sortRules = sortRules : this.internalProps.dataConfig = {
+            sortRules: sortRules
+        }, this.dataset.updateSortRules(sortRules), this._changePivotSortStateBySortRules(), 
         this.internalProps.layoutMap.resetHeaderTree(), this.scenegraph.clearCells(), this.refreshHeader(), 
         this.scenegraph.createSceneGraph(), this.render();
     }
+    _changePivotSortStateBySortRules() {
+        var _a, _b, _c, _d;
+        this.pivotSortState = [];
+        const sortRules = null !== (_b = null === (_a = this.internalProps.dataConfig) || void 0 === _a ? void 0 : _a.sortRules) && void 0 !== _b ? _b : [];
+        for (let i = 0; i < sortRules.length; i++) {
+            const sortRule = sortRules[i];
+            if (sortRule.sortType) {
+                const dimensions = [];
+                if (sortRule.sortByIndicator) {
+                    if (sortRule.sortField === (this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1])) {
+                        for (let j = 0; j < sortRule.query.length; j++) dimensions.push({
+                            dimensionKey: this.dataset.indicatorsAsCol ? this.dataset.columns[j] : this.dataset.rows[j],
+                            value: sortRule.query[j]
+                        });
+                        dimensions.push({
+                            indicatorKey: sortRule.sortByIndicator,
+                            value: null !== (_d = null === (_c = this.internalProps.layoutMap.getIndicatorInfo(sortRule.sortByIndicator)) || void 0 === _c ? void 0 : _c.title) && void 0 !== _d ? _d : sortRule.sortByIndicator
+                        });
+                    }
+                } else dimensions.push({
+                    dimensionKey: sortRule.sortField,
+                    isPivotCorner: !0,
+                    value: sortRule.sortField
+                });
+                this.pivotSortState.push({
+                    dimensions: dimensions,
+                    order: sortRule.sortType
+                });
+            }
+        }
+    }
     updatePivotSortState(pivotSortStateConfig) {
-        for (let i = 0; i < pivotSortStateConfig.length; i++) {
-            const {dimensions: dimensions, order: order} = pivotSortStateConfig[i], cellAddress = this.internalProps.layoutMap.getPivotCellAdress(dimensions);
-            cellAddress && this.pivotSortState.push({
-                col: cellAddress.col,
-                row: cellAddress.row,
-                order: order
-            });
+        this.pivotSortState = pivotSortStateConfig;
+    }
+    sort(col, row, order) {
+        let dimensions;
+        if (this.isCornerHeader(col, row)) {
+            const dimensionInfo = this.getHeaderDefine(col, row);
+            dimensions = [];
+            const dimension = {
+                isPivotCorner: !0,
+                dimensionKey: dimensionInfo.value,
+                value: dimensionInfo.value
+            };
+            dimensions.push(dimension);
+        } else dimensions = this.isColumnHeader(col, row) ? this.getCellHeaderPaths(col, row).colHeaderPaths : this.getCellHeaderPaths(col, row).rowHeaderPaths;
+        const sortIndicator = dimensions[dimensions.length - 1].indicatorKey, headerDefine = this.getHeaderDefine(col, row);
+        if (headerDefine.sort) {
+            if (this.dataset.sortRules) {
+                for (let i = this.dataset.sortRules.length - 1; i >= 0; i--) {
+                    const sortRule = this.dataset.sortRules[i];
+                    (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])) && 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: ts_types_1.SortType[order],
+                    sortByIndicator: sortIndicator,
+                    query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value), 
+                    arr)), [])
+                }) : this.dataset.sortRules.push({
+                    sortField: headerDefine.dimensionKey,
+                    sortType: ts_types_1.SortType[order]
+                });
+            } else this.dataset.sortRules = sortIndicator ? [ {
+                sortField: this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1],
+                sortType: ts_types_1.SortType[order],
+                sortByIndicator: sortIndicator,
+                query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value), 
+                arr)), [])
+            } ] : [ {
+                sortField: headerDefine.dimensionKey,
+                sortType: ts_types_1.SortType[order]
+            } ];
+            this.updateSortRules(this.dataset.sortRules);
         }
     }
     getPivotSortState(col, row) {
         if (!this.pivotSortState) return;
         const cellRange = this.getCellRange(col, row);
         for (let i = 0; i < this.pivotSortState.length; i++) {
-            const {col: sortCol, row: sortRow, order: order} = this.pivotSortState[i];
-            if ((0, helper_1.cellInRange)(cellRange, sortCol, sortRow)) return order;
+            const pivotState = this.pivotSortState[i], dimensions = pivotState.dimensions, cell = this.getCellAddressByHeaderPaths(dimensions), order = pivotState.order;
+            if (cell && (0, helper_1.cellInRange)(cellRange, cell.col, cell.row)) return order;
         }
     }
     _moveHeaderPosition(source, target) {
@@ -581,7 +653,7 @@ class PivotTable extends BaseTable_1.BaseTable {
         };
     }
     setRecords(records) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const oldHoverState = {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
@@ -597,10 +669,12 @@ class PivotTable extends BaseTable_1.BaseTable {
             indicatorDimensionKey: internalProps.layoutMap.indicatorDimensionKey
         }, records)); else {
             let columnDimensionTree, rowDimensionTree;
-            this.dataset.setRecords(records), columnDimensionTree = options.columnTree ? internalProps.layoutMap.columnDimensionTree : new tree_helper_1.DimensionTree(null !== (_c = this.dataset.colHeaderTree) && void 0 !== _c ? _c : [], this.layoutNodeId), 
-            rowDimensionTree = options.rowTree ? internalProps.layoutMap.rowDimensionTree : new tree_helper_1.DimensionTree(null !== (_d = this.dataset.rowHeaderTree) && void 0 !== _d ? _d : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_e = this.options.rowExpandLevel) && void 0 !== _e ? _e : 1 : void 0), 
+            this.dataset.setRecords(records), options.columnTree ? columnDimensionTree = internalProps.layoutMap.columnDimensionTree : (0 !== (null !== (_d = null === (_c = this.records) || void 0 === _c ? void 0 : _c.length) && void 0 !== _d ? _d : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.colHeaderTree = []), 
+            columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_e = this.dataset.colHeaderTree) && void 0 !== _e ? _e : [], this.layoutNodeId)), 
+            options.rowTree ? rowDimensionTree = internalProps.layoutMap.rowDimensionTree : (0 !== (null !== (_g = null === (_f = this.records) || void 0 === _f ? void 0 : _f.length) && void 0 !== _g ? _g : 0) || this.dataset.customColTree || this.dataset.customRowTree || (this.dataset.rowHeaderTree = []), 
+            rowDimensionTree = new tree_helper_1.DimensionTree(null !== (_h = this.dataset.rowHeaderTree) && void 0 !== _h ? _h : [], this.layoutNodeId, this.options.rowHierarchyType, "tree" === this.options.rowHierarchyType ? null !== (_j = this.options.rowExpandLevel) && void 0 !== _j ? _j : 1 : void 0)), 
             internalProps.layoutMap = new pivot_header_layout_1.PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree), 
-            this.pivotSortState = [], options.pivotSortState && this.updatePivotSortState(options.pivotSortState);
+            this.pivotSortState = [], options.pivotSortState && (this.pivotSortState = options.pivotSortState);
         }
         this.refreshHeader(), this.scenegraph.clearCells(), this.clearCellStyleCache(), 
         this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row),