@visactor/vtable 0.23.1 → 0.23.2

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 (177) hide show
  1. package/cjs/ListTable.js +6 -5
  2. package/cjs/ListTable.js.map +1 -1
  3. package/cjs/PivotChart.js +61 -58
  4. package/cjs/PivotChart.js.map +1 -1
  5. package/cjs/PivotTable.js +5 -3
  6. package/cjs/PivotTable.js.map +1 -1
  7. package/cjs/body-helper/body-helper.d.ts +1 -0
  8. package/cjs/body-helper/body-helper.js +3 -0
  9. package/cjs/body-helper/body-helper.js.map +1 -1
  10. package/cjs/core/BaseTable.d.ts +1 -0
  11. package/cjs/core/BaseTable.js +13 -8
  12. package/cjs/core/BaseTable.js.map +1 -1
  13. package/cjs/core/FouseInput.js +1 -2
  14. package/cjs/core/row-series-number-helper.js +2 -1
  15. package/cjs/core/tableHelper.d.ts +1 -0
  16. package/cjs/core/tableHelper.js +29 -2
  17. package/cjs/core/tableHelper.js.map +1 -1
  18. package/cjs/dataset/dataset.js +6 -2
  19. package/cjs/dataset/dataset.js.map +1 -1
  20. package/cjs/event/listener/container-dom.js +2 -2
  21. package/cjs/event/listener/container-dom.js.map +1 -1
  22. package/cjs/event/listener/table-group.js +7 -3
  23. package/cjs/event/listener/table-group.js.map +1 -1
  24. package/cjs/header-helper/header-helper.d.ts +1 -0
  25. package/cjs/header-helper/header-helper.js +3 -0
  26. package/cjs/header-helper/header-helper.js.map +1 -1
  27. package/cjs/index.d.ts +1 -1
  28. package/cjs/index.js +1 -1
  29. package/cjs/index.js.map +1 -1
  30. package/cjs/layout/chart-helper/get-axis-config.d.ts +2 -0
  31. package/cjs/layout/chart-helper/get-axis-config.js +9 -6
  32. package/cjs/layout/chart-helper/get-axis-config.js.map +1 -1
  33. package/cjs/layout/pivot-header-layout.d.ts +1 -0
  34. package/cjs/layout/pivot-header-layout.js +3 -2
  35. package/cjs/layout/pivot-header-layout.js.map +1 -1
  36. package/cjs/layout/simple-header-layout.d.ts +1 -0
  37. package/cjs/layout/simple-header-layout.js +1 -1
  38. package/cjs/layout/simple-header-layout.js.map +1 -1
  39. package/cjs/layout/tree-helper.js +0 -1
  40. package/cjs/plugins/themes.js +2 -1
  41. package/cjs/scenegraph/graphic/contributions/group-contribution-render.js.map +1 -1
  42. package/cjs/scenegraph/group-creater/cell-helper.js +6 -6
  43. package/cjs/scenegraph/group-creater/cell-helper.js.map +1 -1
  44. package/cjs/scenegraph/group-creater/cell-type/chart-cell.js +1 -1
  45. package/cjs/scenegraph/group-creater/cell-type/chart-cell.js.map +1 -1
  46. package/cjs/scenegraph/group-creater/cell-type/checkbox-cell.js +2 -2
  47. package/cjs/scenegraph/group-creater/cell-type/checkbox-cell.js.map +1 -1
  48. package/cjs/scenegraph/group-creater/cell-type/image-cell.js +1 -1
  49. package/cjs/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  50. package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js +13 -5
  51. package/cjs/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
  52. package/cjs/scenegraph/group-creater/cell-type/spark-line-cell.js +1 -1
  53. package/cjs/scenegraph/group-creater/cell-type/spark-line-cell.js.map +1 -1
  54. package/cjs/scenegraph/group-creater/cell-type/text-cell.js +2 -2
  55. package/cjs/scenegraph/group-creater/cell-type/text-cell.js.map +1 -1
  56. package/cjs/scenegraph/group-creater/cell-type/video-cell.js +1 -1
  57. package/cjs/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  58. package/cjs/scenegraph/group-creater/column-helper.js +1 -1
  59. package/cjs/scenegraph/group-creater/column-helper.js.map +1 -1
  60. package/cjs/scenegraph/group-creater/progress/update-position/update-auto-row.js +10 -6
  61. package/cjs/scenegraph/group-creater/progress/update-position/update-auto-row.js.map +1 -1
  62. package/cjs/scenegraph/layout/update-height.js +2 -2
  63. package/cjs/scenegraph/layout/update-height.js.map +1 -1
  64. package/cjs/scenegraph/layout/update-row.js +59 -14
  65. package/cjs/scenegraph/layout/update-row.js.map +1 -1
  66. package/cjs/scenegraph/layout/update-width.js +12 -12
  67. package/cjs/scenegraph/layout/update-width.js.map +1 -1
  68. package/cjs/scenegraph/scenegraph.js +3 -2
  69. package/cjs/scenegraph/scenegraph.js.map +1 -1
  70. package/cjs/scenegraph/style/corner-cell.js +1 -1
  71. package/cjs/scenegraph/style/corner-cell.js.map +1 -1
  72. package/cjs/scenegraph/style/frame-border.js +1 -1
  73. package/cjs/scenegraph/style/frame-border.js.map +1 -1
  74. package/cjs/scenegraph/utils/get-hierarchy-offset.js +5 -3
  75. package/cjs/scenegraph/utils/get-hierarchy-offset.js.map +1 -1
  76. package/cjs/state/state.js +16 -14
  77. package/cjs/state/state.js.map +1 -1
  78. package/cjs/tools/global.d.ts +2 -2
  79. package/cjs/tools/global.js +2 -2
  80. package/cjs/tools/global.js.map +1 -1
  81. package/cjs/ts-types/base-table.d.ts +1 -0
  82. package/cjs/ts-types/base-table.js.map +1 -1
  83. package/cjs/ts-types/new-data-set.d.ts +1 -0
  84. package/cjs/ts-types/new-data-set.js.map +1 -1
  85. package/cjs/ts-types/table-engine.d.ts +2 -0
  86. package/cjs/ts-types/table-engine.js.map +1 -1
  87. package/cjs/vrender.js.map +1 -1
  88. package/dist/vtable.js +640 -785
  89. package/dist/vtable.min.js +2 -2
  90. package/es/ListTable.js +6 -5
  91. package/es/ListTable.js.map +1 -1
  92. package/es/PivotChart.js +63 -57
  93. package/es/PivotChart.js.map +1 -1
  94. package/es/PivotTable.js +5 -2
  95. package/es/PivotTable.js.map +1 -1
  96. package/es/body-helper/body-helper.d.ts +1 -0
  97. package/es/body-helper/body-helper.js +3 -0
  98. package/es/body-helper/body-helper.js.map +1 -1
  99. package/es/core/BaseTable.d.ts +1 -0
  100. package/es/core/BaseTable.js +13 -8
  101. package/es/core/BaseTable.js.map +1 -1
  102. package/es/core/FouseInput.js +1 -2
  103. package/es/core/row-series-number-helper.js +2 -1
  104. package/es/core/tableHelper.d.ts +1 -0
  105. package/es/core/tableHelper.js +26 -0
  106. package/es/core/tableHelper.js.map +1 -1
  107. package/es/dataset/dataset.js +6 -2
  108. package/es/dataset/dataset.js.map +1 -1
  109. package/es/event/listener/container-dom.js +2 -2
  110. package/es/event/listener/container-dom.js.map +1 -1
  111. package/es/event/listener/table-group.js +7 -3
  112. package/es/event/listener/table-group.js.map +1 -1
  113. package/es/header-helper/header-helper.d.ts +1 -0
  114. package/es/header-helper/header-helper.js +3 -0
  115. package/es/header-helper/header-helper.js.map +1 -1
  116. package/es/index.d.ts +1 -1
  117. package/es/index.js +1 -1
  118. package/es/index.js.map +1 -1
  119. package/es/layout/chart-helper/get-axis-config.d.ts +2 -0
  120. package/es/layout/chart-helper/get-axis-config.js +9 -6
  121. package/es/layout/chart-helper/get-axis-config.js.map +1 -1
  122. package/es/layout/pivot-header-layout.d.ts +1 -0
  123. package/es/layout/pivot-header-layout.js +3 -2
  124. package/es/layout/pivot-header-layout.js.map +1 -1
  125. package/es/layout/simple-header-layout.d.ts +1 -0
  126. package/es/layout/simple-header-layout.js +1 -1
  127. package/es/layout/simple-header-layout.js.map +1 -1
  128. package/es/layout/tree-helper.js +1 -2
  129. package/es/plugins/themes.js +2 -1
  130. package/es/scenegraph/graphic/contributions/group-contribution-render.js.map +1 -1
  131. package/es/scenegraph/group-creater/cell-helper.js +6 -6
  132. package/es/scenegraph/group-creater/cell-helper.js.map +1 -1
  133. package/es/scenegraph/group-creater/cell-type/chart-cell.js +1 -1
  134. package/es/scenegraph/group-creater/cell-type/chart-cell.js.map +1 -1
  135. package/es/scenegraph/group-creater/cell-type/checkbox-cell.js +2 -2
  136. package/es/scenegraph/group-creater/cell-type/checkbox-cell.js.map +1 -1
  137. package/es/scenegraph/group-creater/cell-type/image-cell.js +1 -1
  138. package/es/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  139. package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js +13 -4
  140. package/es/scenegraph/group-creater/cell-type/progress-bar-cell.js.map +1 -1
  141. package/es/scenegraph/group-creater/cell-type/spark-line-cell.js +1 -1
  142. package/es/scenegraph/group-creater/cell-type/spark-line-cell.js.map +1 -1
  143. package/es/scenegraph/group-creater/cell-type/text-cell.js +2 -2
  144. package/es/scenegraph/group-creater/cell-type/text-cell.js.map +1 -1
  145. package/es/scenegraph/group-creater/cell-type/video-cell.js +1 -1
  146. package/es/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  147. package/es/scenegraph/group-creater/column-helper.js +1 -1
  148. package/es/scenegraph/group-creater/column-helper.js.map +1 -1
  149. package/es/scenegraph/group-creater/progress/update-position/update-auto-row.js +5 -3
  150. package/es/scenegraph/group-creater/progress/update-position/update-auto-row.js.map +1 -1
  151. package/es/scenegraph/layout/update-height.js +2 -2
  152. package/es/scenegraph/layout/update-height.js.map +1 -1
  153. package/es/scenegraph/layout/update-row.js +59 -15
  154. package/es/scenegraph/layout/update-row.js.map +1 -1
  155. package/es/scenegraph/layout/update-width.js +12 -12
  156. package/es/scenegraph/layout/update-width.js.map +1 -1
  157. package/es/scenegraph/scenegraph.js +3 -2
  158. package/es/scenegraph/scenegraph.js.map +1 -1
  159. package/es/scenegraph/style/corner-cell.js +1 -1
  160. package/es/scenegraph/style/corner-cell.js.map +1 -1
  161. package/es/scenegraph/style/frame-border.js +1 -1
  162. package/es/scenegraph/style/frame-border.js.map +1 -1
  163. package/es/scenegraph/utils/get-hierarchy-offset.js +6 -2
  164. package/es/scenegraph/utils/get-hierarchy-offset.js.map +1 -1
  165. package/es/state/state.js +16 -14
  166. package/es/state/state.js.map +1 -1
  167. package/es/tools/global.d.ts +2 -2
  168. package/es/tools/global.js +2 -2
  169. package/es/tools/global.js.map +1 -1
  170. package/es/ts-types/base-table.d.ts +1 -0
  171. package/es/ts-types/base-table.js.map +1 -1
  172. package/es/ts-types/new-data-set.d.ts +1 -0
  173. package/es/ts-types/new-data-set.js.map +1 -1
  174. package/es/ts-types/table-engine.d.ts +2 -0
  175. package/es/ts-types/table-engine.js.map +1 -1
  176. package/es/vrender.js.map +1 -1
  177. package/package.json +5 -5
package/cjs/PivotChart.js CHANGED
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: !0
5
5
  }), exports.PivotChart = void 0;
6
6
 
7
- const ts_types_1 = require("./ts-types"), ts_types_2 = require("./ts-types"), pivot_header_layout_1 = require("./layout/pivot-header-layout"), PIVOT_TABLE_EVENT_TYPE_1 = require("./ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE"), helper_1 = require("./tools/helper"), dataset_1 = require("./dataset/dataset"), BaseTable_1 = require("./core/BaseTable"), update_chart_1 = require("./scenegraph/refresh-node/update-chart"), vutils_1 = require("@visactor/vutils"), title_1 = require("./components/title/title"), env_1 = require("./tools/env"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE");
7
+ const ts_types_1 = require("./ts-types"), ts_types_2 = require("./ts-types"), pivot_header_layout_1 = require("./layout/pivot-header-layout"), PIVOT_TABLE_EVENT_TYPE_1 = require("./ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE"), helper_1 = require("./tools/helper"), dataset_1 = require("./dataset/dataset"), tableHelper_1 = require("./core/tableHelper"), BaseTable_1 = require("./core/BaseTable"), update_chart_1 = require("./scenegraph/refresh-node/update-chart"), vutils_1 = require("@visactor/vutils"), title_1 = require("./components/title/title"), env_1 = require("./tools/env"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), vutils_extension_1 = require("@visactor/vutils-extension");
8
8
 
9
9
  class PivotChart extends BaseTable_1.BaseTable {
10
10
  constructor(container, options) {
@@ -14,7 +14,8 @@ class PivotChart extends BaseTable_1.BaseTable {
14
14
  this._selectedDataItemsInChart = [], this._selectedDimensionInChart = [], this._chartEventMap = {},
15
15
  options.layout && Object.assign(options, options.layout), this.internalProps.columns = (0,
16
16
  vutils_1.cloneDeep)(options.columns), this.internalProps.rows = (0, vutils_1.cloneDeep)(options.rows),
17
- this.internalProps.indicators = (0, vutils_1.cloneDeep)(options.indicators), this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_a = options.columns) || void 0 === _a ? void 0 : _a.length) || options.columnTree ? (0,
17
+ this.internalProps.indicators = (0, vutils_extension_1.cloneDeepSpec)(options.indicators),
18
+ this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_a = options.columns) || void 0 === _a ? void 0 : _a.length) || options.columnTree ? (0,
18
19
  vutils_1.cloneDeep)(options.columnTree) : [], this.internalProps.rowTree = options.indicatorsAsCol || (null === (_b = options.rows) || void 0 === _b ? void 0 : _b.length) || options.rowTree ? (0,
19
20
  vutils_1.cloneDeep)(options.rowTree) : [], this.internalProps.records = options.records,
20
21
  this.setCustomStateNameToSpec(), this.internalProps.columnResizeType = null !== (_c = options.columnResizeType) && void 0 !== _c ? _c : "column",
@@ -67,7 +68,7 @@ class PivotChart extends BaseTable_1.BaseTable {
67
68
  const internalProps = this.internalProps;
68
69
  super.updateOption(options), this.internalProps.columns = (0, vutils_1.cloneDeep)(options.columns),
69
70
  this.internalProps.rows = (0, vutils_1.cloneDeep)(options.rows), this.internalProps.indicators = (null === (_a = options.indicators) || void 0 === _a ? void 0 : _a.length) ? (0,
70
- vutils_1.cloneDeep)(options.indicators) : [], this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_b = options.columns) || void 0 === _b ? void 0 : _b.length) || options.columnTree ? (0,
71
+ vutils_extension_1.cloneDeepSpec)(options.indicators) : [], this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_b = options.columns) || void 0 === _b ? void 0 : _b.length) || options.columnTree ? (0,
71
72
  vutils_1.cloneDeep)(options.columnTree) : [], this.internalProps.rowTree = options.indicatorsAsCol || (null === (_c = options.rows) || void 0 === _c ? void 0 : _c.length) || options.rowTree ? (0,
72
73
  vutils_1.cloneDeep)(options.rowTree) : [], options.records && (this.internalProps.records = options.records),
73
74
  this.setCustomStateNameToSpec(), this._selectedDataItemsInChart = [], internalProps.columnResizeType = null !== (_d = options.columnResizeType) && void 0 !== _d ? _d : "column",
@@ -306,65 +307,65 @@ class PivotChart extends BaseTable_1.BaseTable {
306
307
  };
307
308
  }
308
309
  _generateCollectValuesConfig(columnKeys, rowKeys) {
309
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10;
310
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
310
311
  const indicators = this.internalProps.indicators, collectValuesBy = {};
311
312
  for (let i = 0, len = null == indicators ? void 0 : indicators.length; i < len; i++) if ("string" != typeof indicators[i] && indicators[i].chartSpec) {
312
313
  if ("pie" === (null === (_a = indicators[i].chartSpec) || void 0 === _a ? void 0 : _a.type)) continue;
313
- if (!1 === this.options.indicatorsAsCol) {
314
- const indicatorDefine = indicators[i];
315
- if (!1 !== (null === (_b = indicatorDefine.chartSpec) || void 0 === _b ? void 0 : _b.stack) && ("bar" === (null === (_c = indicatorDefine.chartSpec) || void 0 === _c ? void 0 : _c.type) || "area" === (null === (_d = indicatorDefine.chartSpec) || void 0 === _d ? void 0 : _d.type)) && (indicatorDefine.chartSpec.stack = !0),
316
- collectValuesBy[indicatorDefine.indicatorKey] = {
314
+ const indicatorDefine = indicators[i], indicatorSpec = indicatorDefine.chartSpec;
315
+ if (!1 === this.options.indicatorsAsCol) if (!1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0),
316
+ collectValuesBy[indicatorDefine.indicatorKey] = {
317
+ by: rowKeys,
318
+ range: !0,
319
+ sumBy: (null == indicatorSpec ? void 0 : indicatorSpec.stack) && columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField)
320
+ }, indicatorSpec.series) indicatorSpec.series.forEach((chartSeries => {
321
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
322
+ const xField = "string" == typeof chartSeries.xField ? chartSeries.xField : chartSeries.xField[0];
323
+ collectValuesBy[xField] = {
324
+ by: columnKeys,
325
+ type: "horizontal" !== chartSeries.direction ? "xField" : void 0,
326
+ range: "horizontal" === chartSeries.direction,
327
+ sortBy: "horizontal" !== chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[xField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[xField]) || void 0 === _g ? void 0 : _g.domain : void 0
328
+ };
329
+ const yField = chartSeries.yField;
330
+ !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0),
331
+ collectValuesBy[yField] = {
317
332
  by: rowKeys,
318
- range: !0,
319
- sumBy: (null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.stack) && columnKeys.concat(null === (_f = indicatorDefine.chartSpec) || void 0 === _f ? void 0 : _f.xField)
320
- }, indicatorDefine.chartSpec.series) indicatorDefine.chartSpec.series.forEach((chartSeries => {
321
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
322
- const xField = "string" == typeof chartSeries.xField ? chartSeries.xField : chartSeries.xField[0];
323
- collectValuesBy[xField] = {
324
- by: columnKeys,
325
- type: "horizontal" !== chartSeries.direction ? "xField" : void 0,
326
- range: "horizontal" === chartSeries.direction,
327
- sortBy: "horizontal" !== chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[xField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_h = null === (_g = null === (_f = null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.data) || void 0 === _f ? void 0 : _f.fields) || void 0 === _g ? void 0 : _g[xField]) || void 0 === _h ? void 0 : _h.domain : void 0
328
- };
329
- const yField = chartSeries.yField;
330
- !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0),
331
- collectValuesBy[yField] = {
332
- by: rowKeys,
333
- range: "horizontal" !== chartSeries.direction,
334
- sumBy: chartSeries.stack && columnKeys.concat(null == chartSeries ? void 0 : chartSeries.xField),
335
- sortBy: "horizontal" === chartSeries.direction ? null !== (_m = null === (_l = null === (_k = null === (_j = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _j ? void 0 : _j.fields) || void 0 === _k ? void 0 : _k[yField]) || void 0 === _l ? void 0 : _l.domain) && void 0 !== _m ? _m : null === (_r = null === (_q = null === (_p = null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.data) || void 0 === _p ? void 0 : _p.fields) || void 0 === _q ? void 0 : _q[yField]) || void 0 === _r ? void 0 : _r.domain : void 0
336
- };
337
- })); else {
338
- const xField = "string" == typeof indicatorDefine.chartSpec.xField ? indicatorDefine.chartSpec.xField : indicatorDefine.chartSpec.xField[0];
339
- collectValuesBy[xField] = {
340
- by: columnKeys,
341
- type: "horizontal" !== indicatorDefine.chartSpec.direction ? "xField" : void 0,
342
- range: "horizontal" === indicatorDefine.chartSpec.direction,
343
- sortBy: "horizontal" !== indicatorDefine.chartSpec.direction ? null === (_k = null === (_j = null === (_h = null === (_g = indicatorDefine.chartSpec) || void 0 === _g ? void 0 : _g.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[xField]) || void 0 === _k ? void 0 : _k.domain : void 0
344
- }, !1 !== (null === (_l = indicatorDefine.chartSpec) || void 0 === _l ? void 0 : _l.stack) && ("bar" === (null === (_m = indicatorDefine.chartSpec) || void 0 === _m ? void 0 : _m.type) || "area" === (null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.type)) && (indicatorDefine.chartSpec.stack = !0);
345
- const yField = indicatorDefine.chartSpec.yField;
346
- collectValuesBy[yField] = {
347
- by: rowKeys,
348
- range: "horizontal" !== indicators[i].chartSpec.direction,
349
- sumBy: indicatorDefine.chartSpec.stack && columnKeys.concat(null === (_p = indicatorDefine.chartSpec) || void 0 === _p ? void 0 : _p.xField),
350
- sortBy: "horizontal" === indicatorDefine.chartSpec.direction ? null === (_t = null === (_s = null === (_r = null === (_q = indicatorDefine.chartSpec) || void 0 === _q ? void 0 : _q.data) || void 0 === _r ? void 0 : _r.fields) || void 0 === _s ? void 0 : _s[yField]) || void 0 === _t ? void 0 : _t.domain : void 0
351
- };
352
- }
333
+ range: "horizontal" !== chartSeries.direction,
334
+ sumBy: chartSeries.stack && columnKeys.concat(null == chartSeries ? void 0 : chartSeries.xField),
335
+ sortBy: "horizontal" === chartSeries.direction ? null !== (_l = null === (_k = null === (_j = null === (_h = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[yField]) || void 0 === _k ? void 0 : _k.domain) && void 0 !== _l ? _l : null === (_p = null === (_o = null === (_m = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _m ? void 0 : _m.fields) || void 0 === _o ? void 0 : _o[yField]) || void 0 === _p ? void 0 : _p.domain : void 0,
336
+ extendRange: (0, tableHelper_1.parseMarkLineGetExtendRange)(indicatorSpec.markLine)
337
+ };
338
+ })); else {
339
+ const xField = "string" == typeof indicatorSpec.xField ? indicatorSpec.xField : indicatorSpec.xField[0];
340
+ collectValuesBy[xField] = {
341
+ by: columnKeys,
342
+ type: "horizontal" !== indicatorSpec.direction ? "xField" : void 0,
343
+ range: "horizontal" === indicatorSpec.direction,
344
+ sortBy: "horizontal" !== indicatorSpec.direction ? null === (_d = null === (_c = null === (_b = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _b ? void 0 : _b.fields) || void 0 === _c ? void 0 : _c[xField]) || void 0 === _d ? void 0 : _d.domain : void 0
345
+ }, !1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0);
346
+ const yField = indicatorSpec.yField;
347
+ collectValuesBy[yField] = {
348
+ by: rowKeys,
349
+ range: "horizontal" !== indicatorSpec.direction,
350
+ sumBy: indicatorSpec.stack && columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField),
351
+ sortBy: "horizontal" === indicatorSpec.direction ? null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[yField]) || void 0 === _g ? void 0 : _g.domain : void 0,
352
+ extendRange: (0, tableHelper_1.parseMarkLineGetExtendRange)(indicatorSpec.markLine)
353
+ };
353
354
  } else {
354
355
  const indicatorDefine = indicators[i];
355
- if (!1 !== (null === (_u = indicatorDefine.chartSpec) || void 0 === _u ? void 0 : _u.stack) && ("bar" === (null === (_v = indicatorDefine.chartSpec) || void 0 === _v ? void 0 : _v.type) || "area" === (null === (_w = indicatorDefine.chartSpec) || void 0 === _w ? void 0 : _w.type)) && (indicatorDefine.chartSpec.stack = !0),
356
+ if (!1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0),
356
357
  collectValuesBy[indicatorDefine.indicatorKey] = {
357
358
  by: columnKeys,
358
359
  range: !0,
359
- sumBy: (null === (_x = indicatorDefine.chartSpec) || void 0 === _x ? void 0 : _x.stack) && rowKeys.concat(null === (_y = indicatorDefine.chartSpec) || void 0 === _y ? void 0 : _y.yField)
360
- }, indicatorDefine.chartSpec.series) indicatorDefine.chartSpec.series.forEach((chartSeries => {
361
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
360
+ sumBy: (null == indicatorSpec ? void 0 : indicatorSpec.stack) && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField)
361
+ }, indicatorSpec.series) indicatorSpec.series.forEach((chartSeries => {
362
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
362
363
  const yField = "string" == typeof chartSeries.yField ? chartSeries.yField : chartSeries.yField[0];
363
364
  collectValuesBy[yField] = {
364
365
  by: rowKeys,
365
366
  type: "horizontal" === chartSeries.direction ? "yField" : void 0,
366
367
  range: "horizontal" !== chartSeries.direction,
367
- sortBy: "horizontal" === chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[yField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_h = null === (_g = null === (_f = null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.data) || void 0 === _f ? void 0 : _f.fields) || void 0 === _g ? void 0 : _g[yField]) || void 0 === _h ? void 0 : _h.domain : void 0
368
+ sortBy: "horizontal" === chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[yField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[yField]) || void 0 === _g ? void 0 : _g.domain : void 0
368
369
  };
369
370
  const xField = chartSeries.xField;
370
371
  !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0),
@@ -372,22 +373,24 @@ class PivotChart extends BaseTable_1.BaseTable {
372
373
  by: columnKeys,
373
374
  range: "horizontal" === chartSeries.direction,
374
375
  sumBy: chartSeries.stack && rowKeys.concat(null == chartSeries ? void 0 : chartSeries.yField),
375
- sortBy: "horizontal" !== chartSeries.direction ? null !== (_m = null === (_l = null === (_k = null === (_j = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _j ? void 0 : _j.fields) || void 0 === _k ? void 0 : _k[xField]) || void 0 === _l ? void 0 : _l.domain) && void 0 !== _m ? _m : null === (_r = null === (_q = null === (_p = null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.data) || void 0 === _p ? void 0 : _p.fields) || void 0 === _q ? void 0 : _q[xField]) || void 0 === _r ? void 0 : _r.domain : void 0
376
+ sortBy: "horizontal" !== chartSeries.direction ? null !== (_l = null === (_k = null === (_j = null === (_h = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[xField]) || void 0 === _k ? void 0 : _k.domain) && void 0 !== _l ? _l : null === (_p = null === (_o = null === (_m = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _m ? void 0 : _m.fields) || void 0 === _o ? void 0 : _o[xField]) || void 0 === _p ? void 0 : _p.domain : void 0,
377
+ extendRange: (0, tableHelper_1.parseMarkLineGetExtendRange)(indicatorSpec.markLine)
376
378
  };
377
379
  })); else {
378
- const yField = "string" == typeof indicatorDefine.chartSpec.yField ? indicatorDefine.chartSpec.yField : indicatorDefine.chartSpec.yField[0];
380
+ const yField = "string" == typeof indicatorSpec.yField ? indicatorSpec.yField : indicatorSpec.yField[0];
379
381
  collectValuesBy[yField] = {
380
382
  by: rowKeys,
381
- type: "horizontal" === indicatorDefine.chartSpec.direction ? "yField" : void 0,
382
- range: "horizontal" !== indicatorDefine.chartSpec.direction,
383
- sortBy: "horizontal" === indicatorDefine.chartSpec.direction ? null === (_2 = null === (_1 = null === (_0 = null === (_z = indicatorDefine.chartSpec) || void 0 === _z ? void 0 : _z.data) || void 0 === _0 ? void 0 : _0.fields) || void 0 === _1 ? void 0 : _1[yField]) || void 0 === _2 ? void 0 : _2.domain : void 0
384
- }, !1 !== (null === (_3 = indicatorDefine.chartSpec) || void 0 === _3 ? void 0 : _3.stack) && ("bar" === (null === (_4 = indicatorDefine.chartSpec) || void 0 === _4 ? void 0 : _4.type) || "area" === (null === (_5 = indicatorDefine.chartSpec) || void 0 === _5 ? void 0 : _5.type)) && (indicatorDefine.chartSpec.stack = !0);
385
- const xField = indicatorDefine.chartSpec.xField;
383
+ type: "horizontal" === indicatorSpec.direction ? "yField" : void 0,
384
+ range: "horizontal" !== indicatorSpec.direction,
385
+ sortBy: "horizontal" === indicatorSpec.direction ? null === (_k = null === (_j = null === (_h = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[yField]) || void 0 === _k ? void 0 : _k.domain : void 0
386
+ }, !1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0);
387
+ const xField = indicatorSpec.xField;
386
388
  collectValuesBy[xField] = {
387
389
  by: columnKeys,
388
- range: "horizontal" === indicators[i].chartSpec.direction,
389
- sumBy: indicatorDefine.chartSpec.stack && rowKeys.concat(null === (_6 = indicatorDefine.chartSpec) || void 0 === _6 ? void 0 : _6.yField),
390
- sortBy: "horizontal" !== indicatorDefine.chartSpec.direction ? null === (_10 = null === (_9 = null === (_8 = null === (_7 = indicatorDefine.chartSpec) || void 0 === _7 ? void 0 : _7.data) || void 0 === _8 ? void 0 : _8.fields) || void 0 === _9 ? void 0 : _9[xField]) || void 0 === _10 ? void 0 : _10.domain : void 0
390
+ range: "horizontal" === indicatorSpec.direction,
391
+ sumBy: indicatorSpec.stack && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField),
392
+ sortBy: "horizontal" !== indicatorSpec.direction ? null === (_o = null === (_m = null === (_l = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _l ? void 0 : _l.fields) || void 0 === _m ? void 0 : _m[xField]) || void 0 === _o ? void 0 : _o.domain : void 0,
393
+ extendRange: (0, tableHelper_1.parseMarkLineGetExtendRange)(indicatorSpec.markLine)
391
394
  };
392
395
  }
393
396
  }