@visactor/vtable 1.17.1-alpha.2 → 1.17.1-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/PivotTable.d.ts +0 -1
- package/cjs/PivotTable.js +14 -13
- package/cjs/PivotTable.js.map +1 -1
- package/cjs/body-helper/body-helper.js +1 -2
- package/cjs/body-helper/style.js +2 -1
- package/cjs/core/BaseTable.js +1 -1
- package/cjs/core/BaseTable.js.map +1 -1
- package/cjs/dataset/dataset.js +2 -1
- package/cjs/dataset/dataset.js.map +1 -1
- package/cjs/edit/editors.js +2 -1
- package/cjs/event/util.js +1 -2
- package/cjs/header-helper/header-helper.js +1 -1
- package/cjs/header-helper/style.js +1 -1
- package/cjs/index.d.ts +1 -1
- package/cjs/index.js +1 -1
- package/cjs/index.js.map +1 -1
- package/cjs/layout/index.js +2 -1
- package/cjs/layout/pivot-header-layout.js +0 -1
- package/cjs/plugins/custom-cell-style.js +1 -1
- package/cjs/plugins/icons.js +1 -1
- package/cjs/scenegraph/scenegraph.js +1 -1
- package/cjs/scenegraph/scenegraph.js.map +1 -1
- package/cjs/ts-types/new-data-set.d.ts +1 -0
- package/cjs/ts-types/new-data-set.js.map +1 -1
- package/cjs/vrender.js.map +1 -1
- package/dist/vtable.js +16 -10
- package/dist/vtable.min.js +1 -1
- package/es/PivotTable.d.ts +0 -1
- package/es/PivotTable.js +14 -13
- package/es/PivotTable.js.map +1 -1
- package/es/body-helper/body-helper.js +1 -2
- package/es/body-helper/style.js +2 -1
- package/es/core/BaseTable.js +1 -1
- package/es/core/BaseTable.js.map +1 -1
- package/es/dataset/dataset.js +1 -1
- package/es/dataset/dataset.js.map +1 -1
- package/es/edit/editors.js +2 -1
- package/es/event/util.js +1 -2
- package/es/header-helper/header-helper.js +1 -1
- package/es/header-helper/style.js +1 -1
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/index.js.map +1 -1
- package/es/layout/index.js +2 -1
- package/es/layout/pivot-header-layout.js +1 -2
- package/es/plugins/custom-cell-style.js +1 -1
- package/es/plugins/icons.js +1 -1
- package/es/scenegraph/scenegraph.js +1 -1
- package/es/scenegraph/scenegraph.js.map +1 -1
- package/es/ts-types/new-data-set.d.ts +1 -0
- package/es/ts-types/new-data-set.js.map +1 -1
- package/es/vrender.js.map +1 -1
- package/package.json +4 -4
package/cjs/PivotTable.d.ts
CHANGED
|
@@ -102,6 +102,5 @@ export declare class PivotTable extends BaseTable implements PivotTableAPI {
|
|
|
102
102
|
setTreeNodeChildren(children: IHeaderTreeDefine[], records: any[], col: number, row: number): void;
|
|
103
103
|
updateFilterRules(filterRules: FilterRules): void;
|
|
104
104
|
getFilteredRecords(): FilterRules;
|
|
105
|
-
setLoadingHierarchyState(col: number, row: number): void;
|
|
106
105
|
release(): void;
|
|
107
106
|
}
|
package/cjs/PivotTable.js
CHANGED
|
@@ -567,7 +567,7 @@ class PivotTable extends BaseTable_1.BaseTable {
|
|
|
567
567
|
this.pivotSortState = pivotSortStateConfig;
|
|
568
568
|
}
|
|
569
569
|
sort(col, row, order) {
|
|
570
|
-
var _a;
|
|
570
|
+
var _a, _b;
|
|
571
571
|
let dimensions;
|
|
572
572
|
if (this.isCornerHeader(col, row)) {
|
|
573
573
|
const dimensionInfo = this.getHeaderDefine(col, row);
|
|
@@ -585,16 +585,20 @@ class PivotTable extends BaseTable_1.BaseTable {
|
|
|
585
585
|
const cacheOldDimensionSortRule = {};
|
|
586
586
|
for (let i = this.dataset.sortRules.length - 1; i >= 0; i--) {
|
|
587
587
|
const sortRule = this.dataset.sortRules[i];
|
|
588
|
-
headerDefine.dimensionKey && sortRule.sortField === headerDefine.dimensionKey ? (cacheOldDimensionSortRule[sortRule.sortField] = sortRule,
|
|
589
|
-
this.dataset.sortRules.splice(i, 1))
|
|
588
|
+
(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,
|
|
589
|
+
this.dataset.sortRules.splice(i, 1));
|
|
590
590
|
}
|
|
591
|
-
sortIndicator
|
|
592
|
-
sortField
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
591
|
+
if (sortIndicator) {
|
|
592
|
+
const sortField = this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1];
|
|
593
|
+
this.dataset.sortRules.push({
|
|
594
|
+
sortField: sortField,
|
|
595
|
+
sortType: ts_types_1.SortType[order],
|
|
596
|
+
sortByIndicator: sortIndicator,
|
|
597
|
+
query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value),
|
|
598
|
+
arr)), []),
|
|
599
|
+
sortFunc: null === (_a = cacheOldDimensionSortRule[sortField]) || void 0 === _a ? void 0 : _a.sortFunc
|
|
600
|
+
});
|
|
601
|
+
} else this.dataset.sortRules.push(Object.assign(null !== (_b = cacheOldDimensionSortRule[headerDefine.dimensionKey]) && void 0 !== _b ? _b : {}, {
|
|
598
602
|
sortField: headerDefine.dimensionKey,
|
|
599
603
|
sortType: ts_types_1.SortType[order]
|
|
600
604
|
}));
|
|
@@ -960,9 +964,6 @@ class PivotTable extends BaseTable_1.BaseTable {
|
|
|
960
964
|
var _a;
|
|
961
965
|
return null === (_a = this.dataset) || void 0 === _a ? void 0 : _a.filterRules;
|
|
962
966
|
}
|
|
963
|
-
setLoadingHierarchyState(col, row) {
|
|
964
|
-
this.scenegraph.setLoadingHierarchyState(col, row);
|
|
965
|
-
}
|
|
966
967
|
release() {
|
|
967
968
|
this.editorManager.release(), super.release();
|
|
968
969
|
}
|