@visactor/vtable 1.26.7 → 1.26.9-alpha.0

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 (257) hide show
  1. package/cjs/ListTable.d.ts +1 -1
  2. package/cjs/ListTable.js +21 -13
  3. package/cjs/ListTable.js.map +1 -1
  4. package/cjs/PivotChart.js +16 -16
  5. package/cjs/PivotChart.js.map +1 -1
  6. package/cjs/PivotTable.d.ts +1 -1
  7. package/cjs/PivotTable.js +65 -63
  8. package/cjs/PivotTable.js.map +1 -1
  9. package/cjs/components/index.js +1 -2
  10. package/cjs/components/menu/dom/logic/MenuElement.js +17 -17
  11. package/cjs/components/menu/dom/logic/MenuElement.js.map +1 -1
  12. package/cjs/components/menu/dom/logic/menu-icon.d.ts +1 -0
  13. package/cjs/components/menu/dom/logic/menu-icon.js +41 -0
  14. package/cjs/components/menu/dom/logic/menu-icon.js.map +1 -0
  15. package/cjs/core/BaseTable.js +4 -4
  16. package/cjs/core/BaseTable.js.map +1 -1
  17. package/cjs/core/record-helper.d.ts +1 -1
  18. package/cjs/core/record-helper.js +60 -12
  19. package/cjs/core/record-helper.js.map +1 -1
  20. package/cjs/core/tableHelper.js +2 -1
  21. package/cjs/data/DataSource.d.ts +3 -1
  22. package/cjs/data/DataSource.js +70 -21
  23. package/cjs/data/DataSource.js.map +1 -1
  24. package/cjs/dataset/dataset.d.ts +9 -1
  25. package/cjs/dataset/dataset.js +344 -187
  26. package/cjs/dataset/dataset.js.map +1 -1
  27. package/cjs/event/event.d.ts +94 -8
  28. package/cjs/event/event.js +701 -194
  29. package/cjs/event/event.js.map +1 -1
  30. package/cjs/event/helper.js +1 -1
  31. package/cjs/event/media-click.js +4 -1
  32. package/cjs/event/media-click.js.map +1 -1
  33. package/cjs/event/scroll.js +1 -1
  34. package/cjs/event/sparkline-event.js +1 -1
  35. package/cjs/event/util.js +2 -2
  36. package/cjs/event/util.js.map +1 -1
  37. package/cjs/header-helper/header-helper.js +1 -2
  38. package/cjs/index.d.ts +1 -1
  39. package/cjs/index.js +1 -1
  40. package/cjs/index.js.map +1 -1
  41. package/cjs/layout/index.js +1 -1
  42. package/cjs/layout/layout-helper.js +1 -1
  43. package/cjs/layout/pivot-header-layout.js +35 -18
  44. package/cjs/layout/pivot-header-layout.js.map +1 -1
  45. package/cjs/layout/row-height-map.js +1 -1
  46. package/cjs/layout/simple-header-layout.js +1 -1
  47. package/cjs/layout/tree-helper.js +1 -1
  48. package/cjs/plugins/custom-cell-style.d.ts +17 -2
  49. package/cjs/plugins/custom-cell-style.js +120 -30
  50. package/cjs/plugins/custom-cell-style.js.map +1 -1
  51. package/cjs/plugins/index.js +2 -1
  52. package/cjs/scenegraph/component/table-component.d.ts +2 -0
  53. package/cjs/scenegraph/component/table-component.js +22 -6
  54. package/cjs/scenegraph/component/table-component.js.map +1 -1
  55. package/cjs/scenegraph/group-creater/cell-helper.js +27 -10
  56. package/cjs/scenegraph/group-creater/cell-helper.js.map +1 -1
  57. package/cjs/scenegraph/group-creater/cell-type/text-cell.d.ts +1 -1
  58. package/cjs/scenegraph/group-creater/cell-type/text-cell.js +14 -10
  59. package/cjs/scenegraph/group-creater/cell-type/text-cell.js.map +1 -1
  60. package/cjs/scenegraph/group-creater/column-helper.js +1 -1
  61. package/cjs/scenegraph/group-creater/column-helper.js.map +1 -1
  62. package/cjs/scenegraph/group-creater/progress/create-group-for-first-screen.js +17 -4
  63. package/cjs/scenegraph/group-creater/progress/create-group-for-first-screen.js.map +1 -1
  64. package/cjs/scenegraph/layout/compute-col-width.js +6 -1
  65. package/cjs/scenegraph/layout/compute-col-width.js.map +1 -1
  66. package/cjs/scenegraph/layout/compute-row-height.js +11 -3
  67. package/cjs/scenegraph/layout/compute-row-height.js.map +1 -1
  68. package/cjs/scenegraph/layout/frozen.js +3 -0
  69. package/cjs/scenegraph/layout/frozen.js.map +1 -1
  70. package/cjs/scenegraph/layout/update-height.d.ts +4 -3
  71. package/cjs/scenegraph/layout/update-height.js +43 -29
  72. package/cjs/scenegraph/layout/update-height.js.map +1 -1
  73. package/cjs/scenegraph/layout/update-width.d.ts +2 -1
  74. package/cjs/scenegraph/layout/update-width.js +49 -37
  75. package/cjs/scenegraph/layout/update-width.js.map +1 -1
  76. package/cjs/scenegraph/scenegraph.d.ts +3 -2
  77. package/cjs/scenegraph/scenegraph.js +14 -6
  78. package/cjs/scenegraph/scenegraph.js.map +1 -1
  79. package/cjs/scenegraph/select/create-select-border.d.ts +1 -0
  80. package/cjs/scenegraph/select/create-select-border.js +8 -3
  81. package/cjs/scenegraph/select/create-select-border.js.map +1 -1
  82. package/cjs/scenegraph/select/delete-select-border.d.ts +2 -0
  83. package/cjs/scenegraph/select/delete-select-border.js +16 -5
  84. package/cjs/scenegraph/select/delete-select-border.js.map +1 -1
  85. package/cjs/scenegraph/select/move-select-border.js +2 -2
  86. package/cjs/scenegraph/select/move-select-border.js.map +1 -1
  87. package/cjs/scenegraph/utils/corner-custom-merge.d.ts +10 -0
  88. package/cjs/scenegraph/utils/corner-custom-merge.js +68 -0
  89. package/cjs/scenegraph/utils/corner-custom-merge.js.map +1 -0
  90. package/cjs/state/resize/update-resize-column.js +25 -13
  91. package/cjs/state/resize/update-resize-column.js.map +1 -1
  92. package/cjs/state/resize/update-resize-row.js +24 -12
  93. package/cjs/state/resize/update-resize-row.js.map +1 -1
  94. package/cjs/state/select/auto-merge-ranges.d.ts +9 -0
  95. package/cjs/state/select/auto-merge-ranges.js +164 -0
  96. package/cjs/state/select/auto-merge-ranges.js.map +1 -0
  97. package/cjs/state/select/update-position.js +7 -3
  98. package/cjs/state/select/update-position.js.map +1 -1
  99. package/cjs/state/state.d.ts +3 -1
  100. package/cjs/state/state.js +18 -9
  101. package/cjs/state/state.js.map +1 -1
  102. package/cjs/themes/theme-define.js.map +1 -1
  103. package/cjs/themes.d.ts +4 -2
  104. package/cjs/themes.js +12 -4
  105. package/cjs/themes.js.map +1 -1
  106. package/cjs/tools/get-data-path/create-dataset.js +4 -4
  107. package/cjs/tools/get-data-path/create-dataset.js.map +1 -1
  108. package/cjs/tools/get-data-path/index.js +4 -4
  109. package/cjs/tools/get-data-path/index.js.map +1 -1
  110. package/cjs/tools/style.d.ts +3 -1
  111. package/cjs/tools/style.js +2 -2
  112. package/cjs/tools/style.js.map +1 -1
  113. package/cjs/ts-types/base-table.d.ts +1 -0
  114. package/cjs/ts-types/base-table.js.map +1 -1
  115. package/cjs/ts-types/common.d.ts +1 -0
  116. package/cjs/ts-types/common.js.map +1 -1
  117. package/cjs/ts-types/dataset/aggregation.d.ts +1 -0
  118. package/cjs/ts-types/dataset/aggregation.js +21 -3
  119. package/cjs/ts-types/dataset/aggregation.js.map +1 -1
  120. package/cjs/ts-types/menu.js.map +1 -1
  121. package/cjs/ts-types/new-data-set.d.ts +1 -0
  122. package/cjs/ts-types/new-data-set.js.map +1 -1
  123. package/cjs/ts-types/table-engine.d.ts +3 -2
  124. package/cjs/ts-types/table-engine.js.map +1 -1
  125. package/cjs/ts-types/theme.d.ts +1 -1
  126. package/cjs/ts-types/theme.js.map +1 -1
  127. package/cjs/vrender.js.map +1 -1
  128. package/dist/vtable.js +4634 -883
  129. package/dist/vtable.min.js +5 -1
  130. package/es/ListTable.d.ts +1 -1
  131. package/es/ListTable.js +21 -15
  132. package/es/ListTable.js.map +1 -1
  133. package/es/PivotChart.js +16 -16
  134. package/es/PivotChart.js.map +1 -1
  135. package/es/PivotTable.d.ts +1 -1
  136. package/es/PivotTable.js +65 -63
  137. package/es/PivotTable.js.map +1 -1
  138. package/es/components/index.js +1 -2
  139. package/es/components/menu/dom/logic/MenuElement.js +16 -17
  140. package/es/components/menu/dom/logic/MenuElement.js.map +1 -1
  141. package/es/components/menu/dom/logic/menu-icon.d.ts +1 -0
  142. package/es/components/menu/dom/logic/menu-icon.js +29 -0
  143. package/es/components/menu/dom/logic/menu-icon.js.map +1 -0
  144. package/es/core/BaseTable.js +4 -4
  145. package/es/core/BaseTable.js.map +1 -1
  146. package/es/core/record-helper.d.ts +1 -1
  147. package/es/core/record-helper.js +60 -12
  148. package/es/core/record-helper.js.map +1 -1
  149. package/es/core/tableHelper.js +2 -1
  150. package/es/data/DataSource.d.ts +3 -1
  151. package/es/data/DataSource.js +69 -21
  152. package/es/data/DataSource.js.map +1 -1
  153. package/es/dataset/dataset.d.ts +9 -1
  154. package/es/dataset/dataset.js +341 -187
  155. package/es/dataset/dataset.js.map +1 -1
  156. package/es/event/event.d.ts +94 -8
  157. package/es/event/event.js +700 -193
  158. package/es/event/event.js.map +1 -1
  159. package/es/event/helper.js +1 -1
  160. package/es/event/media-click.js +4 -1
  161. package/es/event/media-click.js.map +1 -1
  162. package/es/event/scroll.js +1 -1
  163. package/es/event/sparkline-event.js +1 -1
  164. package/es/event/util.js +2 -2
  165. package/es/event/util.js.map +1 -1
  166. package/es/header-helper/header-helper.js +1 -2
  167. package/es/index.d.ts +1 -1
  168. package/es/index.js +1 -1
  169. package/es/index.js.map +1 -1
  170. package/es/layout/index.js +1 -1
  171. package/es/layout/layout-helper.js +1 -1
  172. package/es/layout/pivot-header-layout.js +31 -18
  173. package/es/layout/pivot-header-layout.js.map +1 -1
  174. package/es/layout/row-height-map.js +1 -1
  175. package/es/layout/simple-header-layout.js +1 -1
  176. package/es/layout/tree-helper.js +1 -1
  177. package/es/plugins/custom-cell-style.d.ts +17 -2
  178. package/es/plugins/custom-cell-style.js +120 -28
  179. package/es/plugins/custom-cell-style.js.map +1 -1
  180. package/es/plugins/index.js +2 -1
  181. package/es/scenegraph/component/table-component.d.ts +2 -0
  182. package/es/scenegraph/component/table-component.js +21 -6
  183. package/es/scenegraph/component/table-component.js.map +1 -1
  184. package/es/scenegraph/group-creater/cell-helper.js +23 -9
  185. package/es/scenegraph/group-creater/cell-helper.js.map +1 -1
  186. package/es/scenegraph/group-creater/cell-type/text-cell.d.ts +1 -1
  187. package/es/scenegraph/group-creater/cell-type/text-cell.js +13 -8
  188. package/es/scenegraph/group-creater/cell-type/text-cell.js.map +1 -1
  189. package/es/scenegraph/group-creater/column-helper.js +1 -1
  190. package/es/scenegraph/group-creater/column-helper.js.map +1 -1
  191. package/es/scenegraph/group-creater/progress/create-group-for-first-screen.js +17 -5
  192. package/es/scenegraph/group-creater/progress/create-group-for-first-screen.js.map +1 -1
  193. package/es/scenegraph/layout/compute-col-width.js +6 -1
  194. package/es/scenegraph/layout/compute-col-width.js.map +1 -1
  195. package/es/scenegraph/layout/compute-row-height.js +11 -3
  196. package/es/scenegraph/layout/compute-row-height.js.map +1 -1
  197. package/es/scenegraph/layout/frozen.js +3 -0
  198. package/es/scenegraph/layout/frozen.js.map +1 -1
  199. package/es/scenegraph/layout/update-height.d.ts +4 -3
  200. package/es/scenegraph/layout/update-height.js +40 -26
  201. package/es/scenegraph/layout/update-height.js.map +1 -1
  202. package/es/scenegraph/layout/update-width.d.ts +2 -1
  203. package/es/scenegraph/layout/update-width.js +46 -34
  204. package/es/scenegraph/layout/update-width.js.map +1 -1
  205. package/es/scenegraph/scenegraph.d.ts +3 -2
  206. package/es/scenegraph/scenegraph.js +16 -7
  207. package/es/scenegraph/scenegraph.js.map +1 -1
  208. package/es/scenegraph/select/create-select-border.d.ts +1 -0
  209. package/es/scenegraph/select/create-select-border.js +5 -1
  210. package/es/scenegraph/select/create-select-border.js.map +1 -1
  211. package/es/scenegraph/select/delete-select-border.d.ts +2 -0
  212. package/es/scenegraph/select/delete-select-border.js +9 -0
  213. package/es/scenegraph/select/delete-select-border.js.map +1 -1
  214. package/es/scenegraph/select/move-select-border.js +2 -2
  215. package/es/scenegraph/select/move-select-border.js.map +1 -1
  216. package/es/scenegraph/utils/corner-custom-merge.d.ts +10 -0
  217. package/es/scenegraph/utils/corner-custom-merge.js +59 -0
  218. package/es/scenegraph/utils/corner-custom-merge.js.map +1 -0
  219. package/es/state/resize/update-resize-column.js +19 -10
  220. package/es/state/resize/update-resize-column.js.map +1 -1
  221. package/es/state/resize/update-resize-row.js +19 -9
  222. package/es/state/resize/update-resize-row.js.map +1 -1
  223. package/es/state/select/auto-merge-ranges.d.ts +9 -0
  224. package/es/state/select/auto-merge-ranges.js +155 -0
  225. package/es/state/select/auto-merge-ranges.js.map +1 -0
  226. package/es/state/select/update-position.js +7 -1
  227. package/es/state/select/update-position.js.map +1 -1
  228. package/es/state/state.d.ts +3 -1
  229. package/es/state/state.js +19 -8
  230. package/es/state/state.js.map +1 -1
  231. package/es/themes/theme-define.js.map +1 -1
  232. package/es/themes.d.ts +4 -2
  233. package/es/themes.js +11 -3
  234. package/es/themes.js.map +1 -1
  235. package/es/tools/get-data-path/create-dataset.js +4 -4
  236. package/es/tools/get-data-path/create-dataset.js.map +1 -1
  237. package/es/tools/get-data-path/index.js +4 -4
  238. package/es/tools/get-data-path/index.js.map +1 -1
  239. package/es/tools/style.d.ts +3 -1
  240. package/es/tools/style.js +2 -2
  241. package/es/tools/style.js.map +1 -1
  242. package/es/ts-types/base-table.d.ts +1 -0
  243. package/es/ts-types/base-table.js.map +1 -1
  244. package/es/ts-types/common.d.ts +1 -0
  245. package/es/ts-types/common.js.map +1 -1
  246. package/es/ts-types/dataset/aggregation.d.ts +1 -0
  247. package/es/ts-types/dataset/aggregation.js +21 -3
  248. package/es/ts-types/dataset/aggregation.js.map +1 -1
  249. package/es/ts-types/menu.js.map +1 -1
  250. package/es/ts-types/new-data-set.d.ts +1 -0
  251. package/es/ts-types/new-data-set.js.map +1 -1
  252. package/es/ts-types/table-engine.d.ts +3 -2
  253. package/es/ts-types/table-engine.js.map +1 -1
  254. package/es/ts-types/theme.d.ts +1 -1
  255. package/es/ts-types/theme.js.map +1 -1
  256. package/es/vrender.js.map +1 -1
  257. package/package.json +12 -7
package/cjs/PivotChart.js CHANGED
@@ -30,9 +30,9 @@ class PivotChart extends BaseTable_1.BaseTable {
30
30
  vutils_1.cloneDeep)(options.rowTree) : [], this.internalProps.records = options.records,
31
31
  this.setCustomStateNameToSpec(), this.internalProps.columnResizeType = null !== (_e = null !== (_d = null === (_c = options.resize) || void 0 === _c ? void 0 : _c.columnResizeType) && void 0 !== _d ? _d : options.columnResizeType) && void 0 !== _e ? _e : "column",
32
32
  this.internalProps.rowResizeType = null !== (_h = null !== (_g = null === (_f = options.resize) || void 0 === _f ? void 0 : _f.rowResizeType) && void 0 !== _g ? _g : options.rowResizeType) && void 0 !== _h ? _h : "row",
33
- this.internalProps.dataConfig = {
33
+ this.internalProps.dataConfig = Object.assign(Object.assign({}, (0, vutils_1.cloneDeep)(options.dataConfig)), {
34
34
  isPivotChart: !0
35
- }, this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader,
35
+ }), this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader,
36
36
  this._axes = (0, vutils_1.isArray)(options.axes) ? options.axes : [], options.columnTree && (!1 !== options.indicatorsAsCol && (this.internalProps.columnTree = (0,
37
37
  layout_helper_1.supplementIndicatorNodesForCustomTree)(this.internalProps.columnTree, options.indicators)),
38
38
  columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_j = this.internalProps.columnTree) && void 0 !== _j ? _j : [], this.layoutNodeId)),
@@ -126,9 +126,9 @@ class PivotChart extends BaseTable_1.BaseTable {
126
126
  vutils_1.cloneDeep)(options.rowTree) : [], options.records && (this.internalProps.records = options.records),
127
127
  this.setCustomStateNameToSpec(), this._selectedDataItemsInChart = [], internalProps.columnResizeType = null !== (_f = null !== (_e = null === (_d = options.resize) || void 0 === _d ? void 0 : _d.columnResizeType) && void 0 !== _e ? _e : options.columnResizeType) && void 0 !== _f ? _f : "column",
128
128
  internalProps.rowResizeType = null !== (_j = null !== (_h = null === (_g = options.resize) || void 0 === _g ? void 0 : _g.rowResizeType) && void 0 !== _h ? _h : options.rowResizeType) && void 0 !== _j ? _j : "row",
129
- internalProps.dataConfig = {
129
+ internalProps.dataConfig = Object.assign(Object.assign({}, (0, vutils_1.cloneDeep)(options.dataConfig)), {
130
130
  isPivotChart: !0
131
- }, this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader,
131
+ }), this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader,
132
132
  this._axes = (0, vutils_1.isArray)(options.axes) ? options.axes : [], options.columnTree && (!1 !== options.indicatorsAsCol && (this.internalProps.columnTree = (0,
133
133
  layout_helper_1.supplementIndicatorNodesForCustomTree)(this.internalProps.columnTree, options.indicators)),
134
134
  columnDimensionTree = new tree_helper_1.DimensionTree(null !== (_k = this.internalProps.columnTree) && void 0 !== _k ? _k : [], this.layoutNodeId)),
@@ -239,17 +239,17 @@ class PivotChart extends BaseTable_1.BaseTable {
239
239
  if (this.dataset) {
240
240
  let indicatorPosition;
241
241
  const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
242
- var _a;
242
+ var _a, _b;
243
243
  return colPath.indicatorKey && (indicatorPosition = {
244
244
  position: "col",
245
245
  index: index
246
- }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
246
+ }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
247
247
  })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
248
- var _a;
248
+ var _a, _b;
249
249
  return rowPath.indicatorKey && (indicatorPosition = {
250
250
  position: "row",
251
251
  index: index
252
- }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
252
+ }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
253
253
  })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
254
254
  return aggregator.value ? aggregator.value() : void 0;
255
255
  }
@@ -277,17 +277,17 @@ class PivotChart extends BaseTable_1.BaseTable {
277
277
  if (this.dataset) {
278
278
  let indicatorPosition;
279
279
  const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
280
- var _a;
280
+ var _a, _b;
281
281
  return colPath.indicatorKey && (indicatorPosition = {
282
282
  position: "col",
283
283
  index: index
284
- }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
284
+ }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
285
285
  })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
286
- var _a;
286
+ var _a, _b;
287
287
  return rowPath.indicatorKey && (indicatorPosition = {
288
288
  position: "row",
289
289
  index: index
290
- }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
290
+ }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
291
291
  })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
292
292
  return aggregator.value ? aggregator.value() : void 0;
293
293
  }
@@ -301,17 +301,17 @@ class PivotChart extends BaseTable_1.BaseTable {
301
301
  if (!this.internalProps.layoutMap.isHeader(col, row) && this.dataset) {
302
302
  let indicatorPosition;
303
303
  const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
304
- var _a;
304
+ var _a, _b;
305
305
  return colPath.indicatorKey && (indicatorPosition = {
306
306
  position: "col",
307
307
  index: index
308
- }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
308
+ }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
309
309
  })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
310
- var _a;
310
+ var _a, _b;
311
311
  return rowPath.indicatorKey && (indicatorPosition = {
312
312
  position: "row",
313
313
  index: index
314
- }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
314
+ }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
315
315
  }));
316
316
  return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition).records;
317
317
  }