@visactor/vtable 0.19.2-alpha.2 → 0.20.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 (231) hide show
  1. package/cjs/ListTable.d.ts +12 -2
  2. package/cjs/ListTable.js +81 -24
  3. package/cjs/ListTable.js.map +1 -1
  4. package/cjs/PivotChart.d.ts +2 -1
  5. package/cjs/PivotChart.js +5 -1
  6. package/cjs/PivotChart.js.map +1 -1
  7. package/cjs/PivotTable.d.ts +5 -2
  8. package/cjs/PivotTable.js +13 -5
  9. package/cjs/PivotTable.js.map +1 -1
  10. package/cjs/body-helper/body-helper.js +1 -0
  11. package/cjs/body-helper/body-helper.js.map +1 -1
  12. package/cjs/core/BaseTable.d.ts +2 -2
  13. package/cjs/core/BaseTable.js +22 -18
  14. package/cjs/core/BaseTable.js.map +1 -1
  15. package/cjs/core/tableHelper.d.ts +2 -2
  16. package/cjs/core/tableHelper.js +4 -6
  17. package/cjs/core/tableHelper.js.map +1 -1
  18. package/cjs/data/CachedDataSource.d.ts +4 -3
  19. package/cjs/data/CachedDataSource.js +5 -4
  20. package/cjs/data/CachedDataSource.js.map +1 -1
  21. package/cjs/data/DataSource.d.ts +22 -3
  22. package/cjs/data/DataSource.js +93 -7
  23. package/cjs/data/DataSource.js.map +1 -1
  24. package/cjs/dataset/dataset-pivot-table.d.ts +3 -3
  25. package/cjs/dataset/dataset-pivot-table.js +1 -0
  26. package/cjs/dataset/dataset-pivot-table.js.map +1 -1
  27. package/cjs/dataset/dataset.d.ts +3 -3
  28. package/cjs/dataset/dataset.js +3 -0
  29. package/cjs/dataset/dataset.js.map +1 -1
  30. package/cjs/dataset/statistics-helper.d.ts +24 -3
  31. package/cjs/dataset/statistics-helper.js +75 -9
  32. package/cjs/dataset/statistics-helper.js.map +1 -1
  33. package/cjs/edit/edit-manager.js +5 -4
  34. package/cjs/edit/edit-manager.js.map +1 -1
  35. package/cjs/event/listener/table-group.js +14 -4
  36. package/cjs/event/listener/table-group.js.map +1 -1
  37. package/cjs/event/media-click.js +2 -1
  38. package/cjs/event/scroll.js +0 -1
  39. package/cjs/event/sparkline-event.js +1 -1
  40. package/cjs/event/sparkline-event.js.map +1 -1
  41. package/cjs/index.d.ts +1 -1
  42. package/cjs/index.js +1 -1
  43. package/cjs/index.js.map +1 -1
  44. package/cjs/layout/chart-helper/get-chart-spec.d.ts +1 -0
  45. package/cjs/layout/chart-helper/get-chart-spec.js +34 -9
  46. package/cjs/layout/chart-helper/get-chart-spec.js.map +1 -1
  47. package/cjs/layout/layout-helper.d.ts +4 -63
  48. package/cjs/layout/layout-helper.js +25 -247
  49. package/cjs/layout/layout-helper.js.map +1 -1
  50. package/cjs/layout/pivot-header-layout.d.ts +6 -3
  51. package/cjs/layout/pivot-header-layout.js +26 -15
  52. package/cjs/layout/pivot-header-layout.js.map +1 -1
  53. package/cjs/layout/row-height-map.js +2 -1
  54. package/cjs/layout/row-height-map.js.map +1 -1
  55. package/cjs/layout/simple-header-layout.d.ts +25 -2
  56. package/cjs/layout/simple-header-layout.js +130 -18
  57. package/cjs/layout/simple-header-layout.js.map +1 -1
  58. package/cjs/layout/tree-helper.d.ts +63 -0
  59. package/cjs/layout/tree-helper.js +259 -0
  60. package/cjs/layout/tree-helper.js.map +1 -0
  61. package/cjs/scenegraph/graphic/chart.d.ts +2 -1
  62. package/cjs/scenegraph/graphic/chart.js +21 -18
  63. package/cjs/scenegraph/graphic/chart.js.map +1 -1
  64. package/cjs/scenegraph/graphic/contributions/chart-render-helper.js +4 -1
  65. package/cjs/scenegraph/graphic/contributions/chart-render-helper.js.map +1 -1
  66. package/cjs/scenegraph/graphic/contributions/chart-render.js +2 -2
  67. package/cjs/scenegraph/graphic/contributions/chart-render.js.map +1 -1
  68. package/cjs/scenegraph/group-creater/cell-helper.js +19 -8
  69. package/cjs/scenegraph/group-creater/cell-helper.js.map +1 -1
  70. package/cjs/scenegraph/group-creater/cell-type/chart-cell.d.ts +1 -1
  71. package/cjs/scenegraph/group-creater/cell-type/chart-cell.js +2 -2
  72. package/cjs/scenegraph/group-creater/cell-type/chart-cell.js.map +1 -1
  73. package/cjs/scenegraph/group-creater/cell-type/image-cell.d.ts +1 -1
  74. package/cjs/scenegraph/group-creater/cell-type/image-cell.js +9 -5
  75. package/cjs/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  76. package/cjs/scenegraph/group-creater/cell-type/video-cell.js +1 -1
  77. package/cjs/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  78. package/cjs/scenegraph/group-creater/column-helper.js +5 -5
  79. package/cjs/scenegraph/group-creater/column-helper.js.map +1 -1
  80. package/cjs/scenegraph/group-creater/progress/update-position/sort-vertical.js +5 -2
  81. package/cjs/scenegraph/group-creater/progress/update-position/sort-vertical.js.map +1 -1
  82. package/cjs/scenegraph/scenegraph.js +24 -11
  83. package/cjs/scenegraph/scenegraph.js.map +1 -1
  84. package/cjs/scenegraph/style/frame-border.js +7 -4
  85. package/cjs/scenegraph/style/frame-border.js.map +1 -1
  86. package/cjs/state/hover/is-cell-hover.js +1 -1
  87. package/cjs/state/hover/is-cell-hover.js.map +1 -1
  88. package/cjs/state/sort/index.js +2 -5
  89. package/cjs/state/sort/index.js.map +1 -1
  90. package/cjs/state/state.d.ts +0 -1
  91. package/cjs/state/state.js +3 -4
  92. package/cjs/state/state.js.map +1 -1
  93. package/cjs/themes/theme.js +3 -0
  94. package/cjs/themes/theme.js.map +1 -1
  95. package/cjs/tools/get-data-path/create-dataset.js.map +1 -1
  96. package/cjs/tools/isx.d.ts +1 -1
  97. package/cjs/tools/util.d.ts +1 -1
  98. package/cjs/ts-types/base-table.d.ts +6 -5
  99. package/cjs/ts-types/base-table.js.map +1 -1
  100. package/cjs/ts-types/list-table/define/basic-define.d.ts +2 -0
  101. package/cjs/ts-types/list-table/define/basic-define.js.map +1 -1
  102. package/cjs/ts-types/list-table/layout-map/api.d.ts +5 -4
  103. package/cjs/ts-types/list-table/layout-map/api.js.map +1 -1
  104. package/cjs/ts-types/new-data-set.d.ts +27 -6
  105. package/cjs/ts-types/new-data-set.js +1 -1
  106. package/cjs/ts-types/new-data-set.js.map +1 -1
  107. package/cjs/ts-types/table-engine.d.ts +17 -5
  108. package/cjs/ts-types/table-engine.js.map +1 -1
  109. package/cjs/ts-types/theme.d.ts +1 -0
  110. package/cjs/ts-types/theme.js.map +1 -1
  111. package/cjs/vrender.js.map +1 -1
  112. package/dist/vtable.js +1306 -544
  113. package/dist/vtable.min.js +2 -2
  114. package/es/ListTable.d.ts +12 -2
  115. package/es/ListTable.js +81 -24
  116. package/es/ListTable.js.map +1 -1
  117. package/es/PivotChart.d.ts +2 -1
  118. package/es/PivotChart.js +5 -1
  119. package/es/PivotChart.js.map +1 -1
  120. package/es/PivotTable.d.ts +5 -2
  121. package/es/PivotTable.js +13 -5
  122. package/es/PivotTable.js.map +1 -1
  123. package/es/body-helper/body-helper.js +1 -0
  124. package/es/body-helper/body-helper.js.map +1 -1
  125. package/es/core/BaseTable.d.ts +2 -2
  126. package/es/core/BaseTable.js +22 -18
  127. package/es/core/BaseTable.js.map +1 -1
  128. package/es/core/tableHelper.d.ts +2 -2
  129. package/es/core/tableHelper.js +4 -6
  130. package/es/core/tableHelper.js.map +1 -1
  131. package/es/data/CachedDataSource.d.ts +4 -3
  132. package/es/data/CachedDataSource.js +5 -4
  133. package/es/data/CachedDataSource.js.map +1 -1
  134. package/es/data/DataSource.d.ts +22 -3
  135. package/es/data/DataSource.js +91 -7
  136. package/es/data/DataSource.js.map +1 -1
  137. package/es/dataset/dataset-pivot-table.d.ts +3 -3
  138. package/es/dataset/dataset-pivot-table.js +1 -0
  139. package/es/dataset/dataset-pivot-table.js.map +1 -1
  140. package/es/dataset/dataset.d.ts +3 -3
  141. package/es/dataset/dataset.js +3 -0
  142. package/es/dataset/dataset.js.map +1 -1
  143. package/es/dataset/statistics-helper.d.ts +24 -3
  144. package/es/dataset/statistics-helper.js +72 -8
  145. package/es/dataset/statistics-helper.js.map +1 -1
  146. package/es/edit/edit-manager.js +5 -4
  147. package/es/edit/edit-manager.js.map +1 -1
  148. package/es/event/listener/table-group.js +14 -4
  149. package/es/event/listener/table-group.js.map +1 -1
  150. package/es/event/media-click.js +2 -1
  151. package/es/event/scroll.js +1 -2
  152. package/es/event/sparkline-event.js +1 -1
  153. package/es/event/sparkline-event.js.map +1 -1
  154. package/es/index.d.ts +1 -1
  155. package/es/index.js +1 -1
  156. package/es/index.js.map +1 -1
  157. package/es/layout/chart-helper/get-chart-spec.d.ts +1 -0
  158. package/es/layout/chart-helper/get-chart-spec.js +29 -4
  159. package/es/layout/chart-helper/get-chart-spec.js.map +1 -1
  160. package/es/layout/layout-helper.d.ts +4 -63
  161. package/es/layout/layout-helper.js +19 -246
  162. package/es/layout/layout-helper.js.map +1 -1
  163. package/es/layout/pivot-header-layout.d.ts +6 -3
  164. package/es/layout/pivot-header-layout.js +17 -6
  165. package/es/layout/pivot-header-layout.js.map +1 -1
  166. package/es/layout/row-height-map.js +2 -1
  167. package/es/layout/row-height-map.js.map +1 -1
  168. package/es/layout/simple-header-layout.d.ts +25 -2
  169. package/es/layout/simple-header-layout.js +130 -17
  170. package/es/layout/simple-header-layout.js.map +1 -1
  171. package/es/layout/tree-helper.d.ts +63 -0
  172. package/es/layout/tree-helper.js +256 -0
  173. package/es/layout/tree-helper.js.map +1 -0
  174. package/es/scenegraph/graphic/chart.d.ts +2 -1
  175. package/es/scenegraph/graphic/chart.js +21 -17
  176. package/es/scenegraph/graphic/chart.js.map +1 -1
  177. package/es/scenegraph/graphic/contributions/chart-render-helper.js +4 -1
  178. package/es/scenegraph/graphic/contributions/chart-render-helper.js.map +1 -1
  179. package/es/scenegraph/graphic/contributions/chart-render.js +2 -2
  180. package/es/scenegraph/graphic/contributions/chart-render.js.map +1 -1
  181. package/es/scenegraph/group-creater/cell-helper.js +20 -7
  182. package/es/scenegraph/group-creater/cell-helper.js.map +1 -1
  183. package/es/scenegraph/group-creater/cell-type/chart-cell.d.ts +1 -1
  184. package/es/scenegraph/group-creater/cell-type/chart-cell.js +2 -2
  185. package/es/scenegraph/group-creater/cell-type/chart-cell.js.map +1 -1
  186. package/es/scenegraph/group-creater/cell-type/image-cell.d.ts +1 -1
  187. package/es/scenegraph/group-creater/cell-type/image-cell.js +9 -5
  188. package/es/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  189. package/es/scenegraph/group-creater/cell-type/video-cell.js +1 -1
  190. package/es/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  191. package/es/scenegraph/group-creater/column-helper.js +5 -5
  192. package/es/scenegraph/group-creater/column-helper.js.map +1 -1
  193. package/es/scenegraph/group-creater/progress/update-position/sort-vertical.js +6 -3
  194. package/es/scenegraph/group-creater/progress/update-position/sort-vertical.js.map +1 -1
  195. package/es/scenegraph/scenegraph.js +24 -11
  196. package/es/scenegraph/scenegraph.js.map +1 -1
  197. package/es/scenegraph/style/frame-border.js +7 -4
  198. package/es/scenegraph/style/frame-border.js.map +1 -1
  199. package/es/state/hover/is-cell-hover.js +1 -1
  200. package/es/state/hover/is-cell-hover.js.map +1 -1
  201. package/es/state/sort/index.js +2 -5
  202. package/es/state/sort/index.js.map +1 -1
  203. package/es/state/state.d.ts +0 -1
  204. package/es/state/state.js +3 -4
  205. package/es/state/state.js.map +1 -1
  206. package/es/themes/theme.js +3 -0
  207. package/es/themes/theme.js.map +1 -1
  208. package/es/tools/get-data-path/create-dataset.js.map +1 -1
  209. package/es/tools/isx.d.ts +1 -1
  210. package/es/tools/util.d.ts +1 -1
  211. package/es/ts-types/base-table.d.ts +6 -5
  212. package/es/ts-types/base-table.js.map +1 -1
  213. package/es/ts-types/list-table/define/basic-define.d.ts +2 -0
  214. package/es/ts-types/list-table/define/basic-define.js.map +1 -1
  215. package/es/ts-types/list-table/layout-map/api.d.ts +5 -4
  216. package/es/ts-types/list-table/layout-map/api.js.map +1 -1
  217. package/es/ts-types/new-data-set.d.ts +27 -6
  218. package/es/ts-types/new-data-set.js +1 -1
  219. package/es/ts-types/new-data-set.js.map +1 -1
  220. package/es/ts-types/table-engine.d.ts +17 -5
  221. package/es/ts-types/table-engine.js.map +1 -1
  222. package/es/ts-types/theme.d.ts +1 -0
  223. package/es/ts-types/theme.js.map +1 -1
  224. package/es/vrender.js.map +1 -1
  225. package/package.json +3 -3
  226. package/cjs/data/FilterDataSource.d.ts +0 -1
  227. package/cjs/data/FilterDataSource.js +0 -1
  228. package/cjs/data/FilterDataSource.js.map +0 -1
  229. package/es/data/FilterDataSource.d.ts +0 -1
  230. package/es/data/FilterDataSource.js +0 -1
  231. package/es/data/FilterDataSource.js.map +0 -1
@@ -76,7 +76,7 @@ export class BaseTable extends EventTarget {
76
76
  }
77
77
  constructor(container, options = {}) {
78
78
  var _a, _b, _c, _d, _e, _f, _g;
79
- if (super(), this.showFrozenIcon = !0, this.version = "0.19.2-alpha.2", this.id = `VTable${Date.now()}`,
79
+ if (super(), this.showFrozenIcon = !0, this.version = "0.20.0", this.id = `VTable${Date.now()}`,
80
80
  this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200),
81
81
  !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
82
82
  const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, eventOptions: eventOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
@@ -325,7 +325,7 @@ export class BaseTable extends EventTarget {
325
325
  this.internalProps.pixelRatio = pixelRatio, this.scenegraph.setPixelRatio(pixelRatio);
326
326
  }
327
327
  _updateSize() {
328
- 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;
328
+ 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;
329
329
  const {padding: padding} = this;
330
330
  let widthP = 0, heightP = 0;
331
331
  if ("browser" === Env.mode) {
@@ -342,10 +342,12 @@ export class BaseTable extends EventTarget {
342
342
  const width = Math.floor(widthP - style.getScrollBarSize(this.getTheme().scrollStyle)), height = Math.floor(heightP - style.getScrollBarSize(this.getTheme().scrollStyle));
343
343
  if (null === (_k = this.internalProps.theme) || void 0 === _k ? void 0 : _k.frameStyle) {
344
344
  const lineWidths = toBoxArray(null !== (_m = null === (_l = this.internalProps.theme.frameStyle) || void 0 === _l ? void 0 : _l.borderLineWidth) && void 0 !== _m ? _m : [ null ]), shadowWidths = toBoxArray(null !== (_p = null === (_o = this.internalProps.theme.frameStyle) || void 0 === _o ? void 0 : _o.shadowBlur) && void 0 !== _p ? _p : [ 0 ]);
345
- this.tableX = (null !== (_q = lineWidths[3]) && void 0 !== _q ? _q : 0) + (null !== (_r = shadowWidths[3]) && void 0 !== _r ? _r : 0),
346
- this.tableY = (null !== (_s = lineWidths[0]) && void 0 !== _s ? _s : 0) + (null !== (_t = shadowWidths[0]) && void 0 !== _t ? _t : 0),
347
- this.tableNoFrameWidth = width - ((null !== (_u = lineWidths[1]) && void 0 !== _u ? _u : 0) + (null !== (_v = shadowWidths[1]) && void 0 !== _v ? _v : 0)) - ((null !== (_w = lineWidths[3]) && void 0 !== _w ? _w : 0) + (null !== (_x = shadowWidths[3]) && void 0 !== _x ? _x : 0)),
348
- this.tableNoFrameHeight = height - ((null !== (_y = lineWidths[0]) && void 0 !== _y ? _y : 0) + (null !== (_z = shadowWidths[0]) && void 0 !== _z ? _z : 0)) - ((null !== (_0 = lineWidths[2]) && void 0 !== _0 ? _0 : 0) + (null !== (_1 = shadowWidths[2]) && void 0 !== _1 ? _1 : 0));
345
+ (null === (_q = this.theme.frameStyle) || void 0 === _q ? void 0 : _q.innerBorder) ? (this.tableX = 0,
346
+ this.tableY = 0, this.tableNoFrameWidth = width - (null !== (_r = shadowWidths[1]) && void 0 !== _r ? _r : 0),
347
+ this.tableNoFrameHeight = height - (null !== (_s = shadowWidths[2]) && void 0 !== _s ? _s : 0)) : (this.tableX = (null !== (_t = lineWidths[3]) && void 0 !== _t ? _t : 0) + (null !== (_u = shadowWidths[3]) && void 0 !== _u ? _u : 0),
348
+ this.tableY = (null !== (_v = lineWidths[0]) && void 0 !== _v ? _v : 0) + (null !== (_w = shadowWidths[0]) && void 0 !== _w ? _w : 0),
349
+ this.tableNoFrameWidth = width - ((null !== (_x = lineWidths[1]) && void 0 !== _x ? _x : 0) + (null !== (_y = shadowWidths[1]) && void 0 !== _y ? _y : 0)) - ((null !== (_z = lineWidths[3]) && void 0 !== _z ? _z : 0) + (null !== (_0 = shadowWidths[3]) && void 0 !== _0 ? _0 : 0)),
350
+ this.tableNoFrameHeight = height - ((null !== (_1 = lineWidths[0]) && void 0 !== _1 ? _1 : 0) + (null !== (_2 = shadowWidths[0]) && void 0 !== _2 ? _2 : 0)) - ((null !== (_3 = lineWidths[2]) && void 0 !== _3 ? _3 : 0) + (null !== (_4 = shadowWidths[2]) && void 0 !== _4 ? _4 : 0)));
349
351
  }
350
352
  }
351
353
  get rowHierarchyType() {
@@ -922,6 +924,10 @@ export class BaseTable extends EventTarget {
922
924
  this.stateManager.endSelectCells(!1), this.stateManager.updateInteractionState(InteractionState.default);
923
925
  })), this.setScrollTop(scrollTop), this.setScrollLeft(scrollLeft);
924
926
  }
927
+ get recordsCount() {
928
+ var _a;
929
+ return null === (_a = this.records) || void 0 === _a ? void 0 : _a.length;
930
+ }
925
931
  get allowFrozenColCount() {
926
932
  return this.internalProps.allowFrozenColCount;
927
933
  }
@@ -991,9 +997,6 @@ export class BaseTable extends EventTarget {
991
997
  getHeaderField(col, row) {
992
998
  return this.internalProps.layoutMap.getHeaderField(col, row);
993
999
  }
994
- getHeaderFieldKey(col, row) {
995
- return this.internalProps.layoutMap.getHeaderFieldKey(col, row);
996
- }
997
1000
  getHeaderDefine(col, row) {
998
1001
  const hd = this.internalProps.layoutMap.getHeader(col, row);
999
1002
  return null == hd ? void 0 : hd.define;
@@ -1033,19 +1036,18 @@ export class BaseTable extends EventTarget {
1033
1036
  return this.internalProps.layoutMap.getRecordStartRowByRecordIndex(index);
1034
1037
  }
1035
1038
  _getHeaderCellBySortState(sortState) {
1036
- const {layoutMap: layoutMap} = this.internalProps;
1037
- let hd;
1038
- if (hd = sortState.fieldKey ? layoutMap.headerObjects.find((col => col && col.fieldKey === sortState.fieldKey)) : layoutMap.headerObjects.find((col => col && col.field === sortState.field)),
1039
- hd) {
1039
+ const {layoutMap: layoutMap} = this.internalProps, hd = layoutMap.headerObjects.find((col => col && col.field === sortState.field));
1040
+ if (hd) {
1040
1041
  return layoutMap.getHeaderCellAdressById(hd.id);
1041
1042
  }
1042
1043
  }
1043
1044
  getCellRange(col, row) {
1045
+ var _a;
1044
1046
  if (this.internalProps.customMergeCell) {
1045
1047
  const customMerge = this.internalProps.customMergeCell(col, row, this);
1046
1048
  if (customMerge && customMerge.range && customMerge.text) return customMerge.range;
1047
1049
  }
1048
- return this.internalProps.layoutMap.getCellRange(col, row);
1050
+ return null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.getCellRange(col, row);
1049
1051
  }
1050
1052
  hasCustomMerge() {
1051
1053
  return !!this.internalProps.customMergeCell;
@@ -1142,7 +1144,7 @@ export class BaseTable extends EventTarget {
1142
1144
  field: this.getHeaderField(col, row),
1143
1145
  cellHeaderPaths: this.internalProps.layoutMap.getCellHeaderPaths(col, row),
1144
1146
  title: null == colDef ? void 0 : colDef.title,
1145
- cellType: (null == colDef ? void 0 : colDef.cellType) ? "string" == typeof colDef.cellType ? colDef.cellType : "progressbar" : "text",
1147
+ cellType: this.getCellType(col, row),
1146
1148
  originData: this.getCellOriginRecord(col, row),
1147
1149
  cellRange: this.getCellRangeRelativeRect({
1148
1150
  col: col,
@@ -1215,11 +1217,13 @@ export class BaseTable extends EventTarget {
1215
1217
  }
1216
1218
  return this.headerStyleCache.set(cacheKey, cacheStyle), cacheStyle;
1217
1219
  }
1218
- let cacheKey, cacheStyle;
1219
- if (cacheKey = this.isListTable() && !this.transpose || this.isPivotTable() && this.internalProps.layoutMap.indicatorsAsCol ? col : row,
1220
+ let cacheKey;
1221
+ const cellType = this.getCellType(col, row);
1222
+ let cacheStyle;
1223
+ if (cacheKey = this.isListTable() && !this.transpose || this.isPivotTable() && this.internalProps.layoutMap.indicatorsAsCol ? col + cellType : row + cellType,
1220
1224
  cacheStyle = layoutMap.isBottomFrozenRow(row) ? this.bodyBottomStyleCache.get(cacheKey) : this.bodyStyleCache.get(cacheKey),
1221
1225
  cacheStyle) return cacheStyle;
1222
- const column = layoutMap.getBody(col, row), styleClass = this.internalProps.bodyHelper.getStyleClass(column.cellType), style = null == column ? void 0 : column.style;
1226
+ const column = layoutMap.getBody(col, row), styleClass = this.internalProps.bodyHelper.getStyleClass(this.getCellType(col, row)), style = null == column ? void 0 : column.style;
1223
1227
  return cacheStyle = columnStyleContents.of(style, layoutMap.isBottomFrozenRow(row) && this.theme.bottomFrozenStyle ? this.theme.bottomFrozenStyle : layoutMap.isRightFrozenColumn(col) && this.theme.rightFrozenStyle ? this.theme.rightFrozenStyle : this.theme.bodyStyle, {
1224
1228
  col: col,
1225
1229
  row: row,