@visactor/vtable 1.17.1-alpha.1 → 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.
Files changed (61) hide show
  1. package/cjs/PivotTable.js +14 -10
  2. package/cjs/PivotTable.js.map +1 -1
  3. package/cjs/body-helper/body-helper.js +1 -2
  4. package/cjs/body-helper/style.js +2 -1
  5. package/cjs/core/BaseTable.js +1 -1
  6. package/cjs/core/BaseTable.js.map +1 -1
  7. package/cjs/dataset/dataset.js +2 -1
  8. package/cjs/dataset/dataset.js.map +1 -1
  9. package/cjs/edit/editors.js +2 -1
  10. package/cjs/event/listener/table-group.js +7 -24
  11. package/cjs/event/listener/table-group.js.map +1 -1
  12. package/cjs/event/util.js +1 -2
  13. package/cjs/header-helper/header-helper.js +1 -1
  14. package/cjs/header-helper/style.js +1 -1
  15. package/cjs/index.d.ts +1 -1
  16. package/cjs/index.js +1 -1
  17. package/cjs/index.js.map +1 -1
  18. package/cjs/layout/pivot-header-layout.js +1 -2
  19. package/cjs/layout/pivot-layout.js +0 -2
  20. package/cjs/layout/row-height-map.js +1 -1
  21. package/cjs/layout/simple-header-layout.js +1 -1
  22. package/cjs/layout/tree-helper.js +1 -1
  23. package/cjs/plugins/chartModules.js +2 -1
  24. package/cjs/plugins/invert-highlight.js +1 -1
  25. package/cjs/plugins/list-tree-stick-cell.js +1 -1
  26. package/cjs/plugins/themes.js +1 -1
  27. package/cjs/ts-types/new-data-set.d.ts +1 -0
  28. package/cjs/ts-types/new-data-set.js.map +1 -1
  29. package/cjs/vrender.js.map +1 -1
  30. package/dist/vtable.js +15 -29
  31. package/dist/vtable.min.js +1 -1
  32. package/es/PivotTable.js +14 -10
  33. package/es/PivotTable.js.map +1 -1
  34. package/es/body-helper/body-helper.js +1 -2
  35. package/es/body-helper/style.js +2 -1
  36. package/es/core/BaseTable.js +1 -1
  37. package/es/core/BaseTable.js.map +1 -1
  38. package/es/dataset/dataset.js +1 -1
  39. package/es/dataset/dataset.js.map +1 -1
  40. package/es/edit/editors.js +2 -1
  41. package/es/event/listener/table-group.js +7 -23
  42. package/es/event/listener/table-group.js.map +1 -1
  43. package/es/event/util.js +1 -2
  44. package/es/header-helper/header-helper.js +1 -1
  45. package/es/header-helper/style.js +1 -1
  46. package/es/index.d.ts +1 -1
  47. package/es/index.js +1 -1
  48. package/es/index.js.map +1 -1
  49. package/es/layout/pivot-header-layout.js +1 -2
  50. package/es/layout/pivot-layout.js +0 -2
  51. package/es/layout/row-height-map.js +1 -1
  52. package/es/layout/simple-header-layout.js +1 -1
  53. package/es/layout/tree-helper.js +1 -1
  54. package/es/plugins/chartModules.js +2 -1
  55. package/es/plugins/invert-highlight.js +1 -1
  56. package/es/plugins/list-tree-stick-cell.js +1 -1
  57. package/es/plugins/themes.js +1 -1
  58. package/es/ts-types/new-data-set.d.ts +1 -0
  59. package/es/ts-types/new-data-set.js.map +1 -1
  60. package/es/vrender.js.map +1 -1
  61. package/package.json +4 -4
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)) : 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);
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 ? this.dataset.sortRules.push({
592
- sortField: this.dataset.indicatorsAsCol ? this.dataset.rows[this.dataset.rows.length - 1] : this.dataset.columns[this.dataset.columns.length - 1],
593
- sortType: ts_types_1.SortType[order],
594
- sortByIndicator: sortIndicator,
595
- query: dimensions.reduce(((arr, dimension) => (dimension.dimensionKey && arr.push(dimension.value),
596
- arr)), [])
597
- }) : this.dataset.sortRules.push(Object.assign(null !== (_a = cacheOldDimensionSortRule[headerDefine.dimensionKey]) && void 0 !== _a ? _a : {}, {
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
  }));