@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.
Files changed (53) hide show
  1. package/cjs/PivotTable.d.ts +0 -1
  2. package/cjs/PivotTable.js +14 -13
  3. package/cjs/PivotTable.js.map +1 -1
  4. package/cjs/body-helper/body-helper.js +1 -2
  5. package/cjs/body-helper/style.js +2 -1
  6. package/cjs/core/BaseTable.js +1 -1
  7. package/cjs/core/BaseTable.js.map +1 -1
  8. package/cjs/dataset/dataset.js +2 -1
  9. package/cjs/dataset/dataset.js.map +1 -1
  10. package/cjs/edit/editors.js +2 -1
  11. package/cjs/event/util.js +1 -2
  12. package/cjs/header-helper/header-helper.js +1 -1
  13. package/cjs/header-helper/style.js +1 -1
  14. package/cjs/index.d.ts +1 -1
  15. package/cjs/index.js +1 -1
  16. package/cjs/index.js.map +1 -1
  17. package/cjs/layout/index.js +2 -1
  18. package/cjs/layout/pivot-header-layout.js +0 -1
  19. package/cjs/plugins/custom-cell-style.js +1 -1
  20. package/cjs/plugins/icons.js +1 -1
  21. package/cjs/scenegraph/scenegraph.js +1 -1
  22. package/cjs/scenegraph/scenegraph.js.map +1 -1
  23. package/cjs/ts-types/new-data-set.d.ts +1 -0
  24. package/cjs/ts-types/new-data-set.js.map +1 -1
  25. package/cjs/vrender.js.map +1 -1
  26. package/dist/vtable.js +16 -10
  27. package/dist/vtable.min.js +1 -1
  28. package/es/PivotTable.d.ts +0 -1
  29. package/es/PivotTable.js +14 -13
  30. package/es/PivotTable.js.map +1 -1
  31. package/es/body-helper/body-helper.js +1 -2
  32. package/es/body-helper/style.js +2 -1
  33. package/es/core/BaseTable.js +1 -1
  34. package/es/core/BaseTable.js.map +1 -1
  35. package/es/dataset/dataset.js +1 -1
  36. package/es/dataset/dataset.js.map +1 -1
  37. package/es/edit/editors.js +2 -1
  38. package/es/event/util.js +1 -2
  39. package/es/header-helper/header-helper.js +1 -1
  40. package/es/header-helper/style.js +1 -1
  41. package/es/index.d.ts +1 -1
  42. package/es/index.js +1 -1
  43. package/es/index.js.map +1 -1
  44. package/es/layout/index.js +2 -1
  45. package/es/layout/pivot-header-layout.js +1 -2
  46. package/es/plugins/custom-cell-style.js +1 -1
  47. package/es/plugins/icons.js +1 -1
  48. package/es/scenegraph/scenegraph.js +1 -1
  49. package/es/scenegraph/scenegraph.js.map +1 -1
  50. package/es/ts-types/new-data-set.d.ts +1 -0
  51. package/es/ts-types/new-data-set.js.map +1 -1
  52. package/es/vrender.js.map +1 -1
  53. package/package.json +4 -4
package/cjs/dataset/dataset.js CHANGED
@@ -450,7 +450,8 @@ class Dataset {
450
450
  colKey.length < that.columns.length && colKey[colKey.length - 1] !== that.colSubTotalLabel && colKey[colKey.length - 1] !== that.colGrandTotalLabel && colKey.push(that.colSubTotalLabel),
451
451
  that.getAggregator(rowKey, colKey, sortRule.sortByIndicator).value();
452
452
  };
453
- return isSortRow ? (0, aggregation_1.naturalSort)(getValue(a, sortRule.query), getValue(b, sortRule.query), sortType) : (0,
453
+ return isSortRow ? sortRule.sortFunc ? sortRule.sortFunc(getValue(a, sortRule.query), getValue(b, sortRule.query), a, b, sortType) : (0,
454
+ aggregation_1.naturalSort)(getValue(a, sortRule.query), getValue(b, sortRule.query), sortType) : sortRule.sortFunc ? sortRule.sortFunc(getValue(sortRule.query, a), getValue(sortRule.query, b), a, b, sortType) : (0,
454
455
  aggregation_1.naturalSort)(getValue(sortRule.query, a), getValue(sortRule.query, b), sortType);
455
456
  } : sortRule.sortBy ? (0, aggregation_1.sortBy)(sortRule.sortBy) : sortRule.sortFunc ? sortRule.sortFunc : sortRule.sortType ? aggregation_1.typeSort : aggregation_1.naturalSort;
456
457
  }