@visactor/vtable-calendar 1.16.0 → 1.16.1

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.
@@ -26396,7 +26396,9 @@
26396
26396
  reset() {
26397
26397
  this.records = [], this.fieldValue = void 0;
26398
26398
  }
26399
- recalculate() {}
26399
+ recalculate() {
26400
+ this.fieldValue = void 0, this._formatedValue = void 0;
26401
+ }
26400
26402
  }
26401
26403
  class SumAggregator extends Aggregator {
26402
26404
  constructor(config) {
@@ -28829,6 +28831,10 @@
28829
28831
  get labelVisible() {
28830
28832
  var _a;
28831
28833
  return null === (_a = columnResize.labelVisible) || void 0 === _a || _a;
28834
+ },
28835
+ get visibleOnHover() {
28836
+ var _a;
28837
+ return null !== (_a = columnResize.visibleOnHover) && void 0 !== _a && _a;
28832
28838
  }
28833
28839
  };
28834
28840
  }
@@ -33695,15 +33701,10 @@
33695
33701
  }
33696
33702
  });
33697
33703
  }
33698
- let customElementsGroup,
33699
- renderDefault = !0;
33700
- if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else {
33701
- let customRender, customLayout;
33702
- if ("body" !== table.getCellLocation(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
33703
- const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, !1, table.isAutoRowHeight(row), padding, range, table);
33704
- customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
33705
- }
33706
- }
33704
+ const {
33705
+ customElementsGroup: customElementsGroup,
33706
+ renderDefault: renderDefault
33707
+ } = _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult);
33707
33708
  cellGroup = Factory.getFunction("createTextCellGroup")(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme, range, isAsync);
33708
33709
  const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
33709
33710
  if (axisConfig) {
@@ -33721,9 +33722,13 @@
33721
33722
  const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);
33722
33723
  cellGroup = Factory.getFunction("createChartCellGroup")(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, value, define.chartModule, table.internalProps.layoutMap.getChartSpec(col, row), chartInstance, null !== (_b = table.internalProps.layoutMap.getChartDataId(col, row)) && void 0 !== _b ? _b : "data", table, cellTheme, table.internalProps.layoutMap.isShareChartSpec(col, row), isAsync, table.internalProps.layoutMap.isNoChartDataRenderNothing(col, row));
33723
33724
  } else if ("progressbar" === type) {
33724
- const style = table._getCellStyle(col, row),
33725
+ const {
33726
+ customElementsGroup: customElementsGroup,
33727
+ renderDefault: renderDefault
33728
+ } = _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult),
33729
+ style = table._getCellStyle(col, row),
33725
33730
  dataValue = table.getCellOriginValue(col, row);
33726
- cellGroup = Factory.getFunction("createTextCellGroup")(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, null, !0, cellTheme, range, isAsync);
33731
+ cellGroup = Factory.getFunction("createTextCellGroup")(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, customElementsGroup, renderDefault, cellTheme, range, isAsync);
33727
33732
  const progressBarGroup = Factory.getFunction("createProgressBarCell")(define, style, colWidth, value, dataValue, col, row, padding, table, range);
33728
33733
  cellGroup.firstChild ? cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild) : cellGroup.appendChild(progressBarGroup);
33729
33734
  } else if ("sparkline" === type) {
@@ -33735,6 +33740,21 @@
33735
33740
  }
33736
33741
  return cellGroup.onBeforeAttributeUpdate = onBeforeAttributeUpdateForInvertHighlight, cellGroup;
33737
33742
  }
33743
+ function _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult) {
33744
+ let customElementsGroup,
33745
+ renderDefault = !0;
33746
+ if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else {
33747
+ let customRender, customLayout;
33748
+ if ("body" !== table.getCellLocation(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
33749
+ const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, !1, table.isAutoRowHeight(row), padding, range, table);
33750
+ customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
33751
+ }
33752
+ }
33753
+ return {
33754
+ customElementsGroup: customElementsGroup,
33755
+ renderDefault: renderDefault
33756
+ };
33757
+ }
33738
33758
  function updateCell$1(col, row, table, addNew, isShadow, forceFastUpdate) {
33739
33759
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
33740
33760
  const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0),
@@ -36055,6 +36075,10 @@
36055
36075
  borderBottom = group.border.attribute.strokeArrayWidth ? group.border.attribute.strokeArrayWidth[2] : null !== (_c = group.border.attribute.lineWidth) && void 0 !== _c ? _c : 0,
36056
36076
  borderLeft = group.border.attribute.strokeArrayWidth ? group.border.attribute.strokeArrayWidth[3] : null !== (_d = group.border.attribute.lineWidth) && void 0 !== _d ? _d : 0;
36057
36077
  group.border.setAttributes({
36078
+ borderLeft: borderLeft,
36079
+ borderTop: borderTop,
36080
+ borderRight: borderRight,
36081
+ borderBottom: borderBottom,
36058
36082
  width: group.attribute.width - borderLeft / 2 - borderRight / 2,
36059
36083
  height: group.attribute.height - borderTop / 2 - borderBottom / 2
36060
36084
  }), "group" === group.border.type && group.border.firstChild.setAttributes({
@@ -37893,9 +37917,12 @@
37893
37917
  });
37894
37918
  }
37895
37919
  function updateColumnContainerWidth(containerGroup) {
37896
- var _a;
37920
+ var _a, _b;
37897
37921
  const lastColGroup = getLastChild(containerGroup);
37898
- lastColGroup && (containerGroup.setAttribute("width", lastColGroup.attribute.x + lastColGroup.attribute.width), null === (_a = containerGroup.border) || void 0 === _a || _a.setAttribute("width", lastColGroup.attribute.x + lastColGroup.attribute.width));
37922
+ if (lastColGroup && (containerGroup.setAttribute("width", lastColGroup.attribute.x + lastColGroup.attribute.width), containerGroup.border)) {
37923
+ const border = containerGroup.border;
37924
+ border.setAttribute("width", lastColGroup.attribute.x + lastColGroup.attribute.width - (null !== (_a = border.attribute.borderLeft) && void 0 !== _a ? _a : 0) / 2 - (null !== (_b = border.attribute.borderRight) && void 0 !== _b ? _b : 0) / 2);
37925
+ }
37899
37926
  }
37900
37927
 
37901
37928
  function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table) {
@@ -38068,7 +38095,17 @@
38068
38095
  const cellGroup = proxy.highPerformanceGetCell(col, row);
38069
38096
  proxy.updateCellGroupContent(cellGroup);
38070
38097
  }
38071
- return proxy.table.scenegraph.updateNextFrame(), sync;
38098
+ return updateColumnContainerHeight(proxy.table.scenegraph.rowHeaderGroup), updateColumnContainerHeight(proxy.table.scenegraph.rightFrozenGroup), updateColumnContainerHeight(proxy.table.scenegraph.bodyGroup), proxy.table.scenegraph.updateNextFrame(), sync;
38099
+ }
38100
+ function updateColumnContainerHeight(containerGroup) {
38101
+ var _a, _b;
38102
+ const lastColGroup = getLastChild(containerGroup);
38103
+ if (!lastColGroup) return;
38104
+ const lastCellGroup = getLastChild(lastColGroup);
38105
+ if (lastCellGroup && (containerGroup.setAttribute("height", lastCellGroup.attribute.y + lastCellGroup.attribute.height), containerGroup.border)) {
38106
+ const border = containerGroup.border;
38107
+ border.setAttribute("height", lastCellGroup.attribute.y + lastCellGroup.attribute.height - (null !== (_a = border.attribute.borderTop) && void 0 !== _a ? _a : 0) / 2 - (null !== (_b = border.attribute.borderBottom) && void 0 !== _b ? _b : 0) / 2);
38108
+ }
38072
38109
  }
38073
38110
 
38074
38111
  var __awaiter$3 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
@@ -40899,9 +40936,10 @@
40899
40936
  "image" !== type && "video" !== type || updateImageCellContentWhileResize(cellGroup, col, row, 0, 0, this.table);
40900
40937
  }
40901
40938
  createFrameBorder() {
40939
+ var _a, _b, _c, _d, _e;
40902
40940
  this.updateTableSize();
40903
40941
  const isListTableWithFrozen = !this.isPivot && !this.table.internalProps.transpose;
40904
- createFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle, this.bodyGroup.role, isListTableWithFrozen ? [!0, !0, !0, !1] : void 0), createFrameBorder(this.rowHeaderGroup, this.isPivot || this.table.internalProps.transpose ? this.table.theme.rowHeaderStyle.frameStyle : this.table.theme.bodyStyle.frameStyle, this.rowHeaderGroup.role, isListTableWithFrozen ? [!0, !1, !0, !0] : void 0), createFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, this.colHeaderGroup.role, isListTableWithFrozen ? [!0, !0, !0, !1] : void 0), createFrameBorder(this.cornerHeaderGroup, this.isPivot ? this.table.theme.cornerHeaderStyle.frameStyle : this.table.theme.headerStyle.frameStyle, this.cornerHeaderGroup.role, isListTableWithFrozen ? [!0, !1, !0, !0] : void 0), createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, void 0);
40942
+ createFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle, this.bodyGroup.role, isListTableWithFrozen ? [!0, !0, !0, !1] : void 0), createFrameBorder(this.rowHeaderGroup, this.isPivot || this.table.internalProps.transpose ? this.table.theme.rowHeaderStyle.frameStyle : this.table.theme.bodyStyle.frameStyle, this.rowHeaderGroup.role, isListTableWithFrozen ? [!0, !1, !0, !0] : void 0), createFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, this.colHeaderGroup.role, isListTableWithFrozen ? [!0, !0, !0, !1] : void 0), createFrameBorder(this.cornerHeaderGroup, this.isPivot ? this.table.theme.cornerHeaderStyle.frameStyle : this.table.theme.headerStyle.frameStyle, this.cornerHeaderGroup.role, isListTableWithFrozen ? [!0, !1, !0, !0] : void 0), (null === (_a = this.table.theme.cornerLeftBottomCellStyle) || void 0 === _a ? void 0 : _a.frameStyle) && createFrameBorder(this.leftBottomCornerGroup, this.table.theme.cornerLeftBottomCellStyle.frameStyle, this.leftBottomCornerGroup.role, isListTableWithFrozen ? [!0, !1, !0, !0] : void 0), (null === (_b = this.table.theme.bottomFrozenStyle) || void 0 === _b ? void 0 : _b.frameStyle) && createFrameBorder(this.bottomFrozenGroup, this.table.theme.bottomFrozenStyle.frameStyle, this.bottomFrozenGroup.role, isListTableWithFrozen ? [!0, !0, !0, !1] : void 0), (null === (_c = this.table.theme.rightFrozenStyle) || void 0 === _c ? void 0 : _c.frameStyle) && createFrameBorder(this.rightFrozenGroup, this.table.theme.rightFrozenStyle.frameStyle, this.rightFrozenGroup.role, void 0), (null === (_d = this.table.theme.cornerRightTopCellStyle) || void 0 === _d ? void 0 : _d.frameStyle) && createFrameBorder(this.rightTopCornerGroup, this.table.theme.cornerRightTopCellStyle.frameStyle, this.rightTopCornerGroup.role, void 0), (null === (_e = this.table.theme.cornerRightBottomCellStyle) || void 0 === _e ? void 0 : _e.frameStyle) && createFrameBorder(this.rightBottomCornerGroup, this.table.theme.cornerRightBottomCellStyle.frameStyle, this.rightBottomCornerGroup.role, void 0), createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, void 0);
40905
40943
  }
40906
40944
  getResizeColAt(abstractX, abstractY, cellGroup) {
40907
40945
  const offset = this.table.theme.columnResize.resizeHotSpotSize / 2;
@@ -40961,7 +40999,7 @@
40961
40999
  this.clear ? this.table.internalProps.bottomFrozenRowCount = bottomFrozenRowCount : dealBottomFrozen(bottomFrozenRowCount, this);
40962
41000
  }
40963
41001
  updateBorderSizeAndPosition() {
40964
- this.bodyGroup.border && (this.bodyGroup.appendChild(this.bodyGroup.border), updateFrameBorderSize(this.bodyGroup), this.rowHeaderGroup.attribute.width, updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle)), this.colHeaderGroup.border && (this.colHeaderGroup.appendChild(this.colHeaderGroup.border), updateFrameBorderSize(this.colHeaderGroup), this.cornerHeaderGroup.attribute.width, updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle)), this.rowHeaderGroup.border && (this.rowHeaderGroup.appendChild(this.rowHeaderGroup.border), updateFrameBorderSize(this.rowHeaderGroup)), this.cornerHeaderGroup.border && (this.cornerHeaderGroup.appendChild(this.cornerHeaderGroup.border), updateFrameBorderSize(this.cornerHeaderGroup)), updateCornerRadius(this.table);
41002
+ this.bodyGroup.border && (this.bodyGroup.appendChild(this.bodyGroup.border), updateFrameBorderSize(this.bodyGroup), this.rowHeaderGroup.attribute.width, updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle)), this.colHeaderGroup.border && (this.colHeaderGroup.appendChild(this.colHeaderGroup.border), updateFrameBorderSize(this.colHeaderGroup), this.cornerHeaderGroup.attribute.width, updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle)), this.rowHeaderGroup.border && (this.rowHeaderGroup.appendChild(this.rowHeaderGroup.border), updateFrameBorderSize(this.rowHeaderGroup)), this.cornerHeaderGroup.border && (this.cornerHeaderGroup.appendChild(this.cornerHeaderGroup.border), updateFrameBorderSize(this.cornerHeaderGroup)), this.leftBottomCornerGroup.border && (this.leftBottomCornerGroup.appendChild(this.leftBottomCornerGroup.border), updateFrameBorderSize(this.leftBottomCornerGroup)), this.bottomFrozenGroup.border && (this.bottomFrozenGroup.appendChild(this.bottomFrozenGroup.border), updateFrameBorderSize(this.bottomFrozenGroup)), this.rightFrozenGroup.border && (this.rightFrozenGroup.appendChild(this.rightFrozenGroup.border), updateFrameBorderSize(this.rightFrozenGroup)), this.rightTopCornerGroup.border && (this.rightTopCornerGroup.appendChild(this.rightTopCornerGroup.border), updateFrameBorderSize(this.rightTopCornerGroup)), this.rightBottomCornerGroup.border && (this.rightBottomCornerGroup.appendChild(this.rightBottomCornerGroup.border), updateFrameBorderSize(this.rightBottomCornerGroup)), updateCornerRadius(this.table);
40965
41003
  }
40966
41004
  sortCell() {
40967
41005
  this.isPivot || (this.table.transpose ? this.proxy.sortCellHorizontal() : this.proxy.sortCellVertical());
@@ -42680,13 +42718,13 @@
42680
42718
  hideMenu() {
42681
42719
  this.menu.isShow && (this.table.fireListeners(TABLE_EVENT_TYPE.DROPDOWN_MENU_CLEAR, null), this.table.fireListeners(TABLE_EVENT_TYPE.HIDE_MENU, null), this.menu.isShow = !1, this.table.scenegraph.component.menu.detach(), this.residentHoverIcon && (this.table.scenegraph.setIconNormalStyle(this.residentHoverIcon.icon, this.residentHoverIcon.col, this.residentHoverIcon.row), this.table.scenegraph.resetResidentHoverIcon(this.residentHoverIcon.col, this.residentHoverIcon.row), this.residentHoverIcon = null));
42682
42720
  }
42683
- setDropDownMenuHighlight(cells) {
42684
- this.menu.dropDownMenuHighlight = cells;
42685
- for (let i = 0; i < cells.length; i++) {
42721
+ setDropDownMenuHighlight(dropDownMenuInfo) {
42722
+ this.menu.dropDownMenuHighlight = dropDownMenuInfo;
42723
+ for (let i = 0; i < dropDownMenuInfo.length; i++) {
42686
42724
  const {
42687
42725
  col: col,
42688
42726
  row: row
42689
- } = cells[i],
42727
+ } = dropDownMenuInfo[i],
42690
42728
  range = this.table.getCellRange(col, row);
42691
42729
  if (range) for (let col = range.start.col; col <= range.end.col; col++) for (let row = range.start.row; row <= range.end.row; row++) this.table.scenegraph.updateCellContent(col, row);
42692
42730
  }
@@ -43139,7 +43177,7 @@
43139
43177
  event: e.nativeEvent,
43140
43178
  target: null === (_p = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _p ? void 0 : _p.target,
43141
43179
  mergeCellInfo: null === (_q = eventArgsSet.eventArgs) || void 0 === _q ? void 0 : _q.mergeInfo
43142
- })), eventManager.dealIconHover(eventArgsSet), eventManager.dealTableHover(eventArgsSet), eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.MOUSEMOVE_CELL)) {
43180
+ })), eventManager.dealIconHover(eventArgsSet), eventManager.dealTableHover(eventArgsSet), table.theme.columnResize.visibleOnHover && eventManager.checkColumnResize(eventArgsSet, !0), eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.MOUSEMOVE_CELL)) {
43143
43181
  let icon, position;
43144
43182
  if (null === (_r = eventArgsSet.eventArgs) || void 0 === _r ? void 0 : _r.target) {
43145
43183
  const iconInfo = getIconAndPositionFromTarget(null === (_s = eventArgsSet.eventArgs) || void 0 === _s ? void 0 : _s.target);
@@ -44254,7 +44292,7 @@
44254
44292
  if (e.federatedEvent) {
44255
44293
  const eventArgsSet = getCellEventArgsSet(e.federatedEvent),
44256
44294
  resizeCol = this.table.scenegraph.getResizeColAt(eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.targetCell);
44257
- if (this.table.eventManager.checkCellFillhandle(eventArgsSet)) this.table.fireListeners(TABLE_EVENT_TYPE.DBLCLICK_FILL_HANDLE, {});else if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {
44295
+ if (this.table.eventManager.checkCellFillhandle(eventArgsSet)) this.table.fireListeners(TABLE_EVENT_TYPE.DBLCLICK_FILL_HANDLE, {});else if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0 && !this.table.options.disableDblclickAutoResizeColWidth) {
44258
44296
  this.table.scenegraph.updateAutoColWidth(resizeCol.col), this.table.internalProps._widthResizedColMap.add(resizeCol.col), this.table.scenegraph.updateChartSizeForResizeColWidth(resizeCol.col);
44259
44297
  const state = this.table.stateManager;
44260
44298
  state.columnResize.col < state.table.frozenColCount && !state.table.isPivotTable() && !state.table.transpose && state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen);
@@ -44331,7 +44369,7 @@
44331
44369
  } = eventArgsSet;
44332
44370
  if (this.table.options.enableTreeStickCell && !eventArgs) return !1;
44333
44371
  const resizeCol = this.table.scenegraph.getResizeColAt(eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, null == eventArgs ? void 0 : eventArgs.targetCell);
44334
- return !!(this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) && (update && this.table.stateManager.startResizeCol(resizeCol.col, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, resizeCol.rightFrozen), !0);
44372
+ return this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0 ? (update && this.table.stateManager.startResizeCol(resizeCol.col, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, resizeCol.rightFrozen), !0) : (this.table.stateManager.isResizeCol() && this.table.stateManager.endResizeCol(), !1);
44335
44373
  }
44336
44374
  checkRowResize(eventArgsSet, update) {
44337
44375
  const {
@@ -46951,7 +46989,7 @@
46951
46989
  constructor(container) {
46952
46990
  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
46953
46991
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
46954
- if (super(), this.showFrozenIcon = !0, this.version = "1.16.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
46992
+ if (super(), this.showFrozenIcon = !0, this.version = "1.16.1", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
46955
46993
  !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
46956
46994
  const {
46957
46995
  frozenColCount = 0,
@@ -51939,7 +51977,7 @@
51939
51977
  return null;
51940
51978
  }
51941
51979
  getHierarchyState(col, row) {
51942
- if (!this.options.groupBy) {
51980
+ if (!this.options.groupBy || isArray$7(this.options.groupBy) && 0 === this.options.groupBy.length) {
51943
51981
  if (!this.getBodyColumnDefine(col, row).tree) return HierarchyState.none;
51944
51982
  }
51945
51983
  const index = this.getRecordShowIndexByCell(col, row);
@@ -52030,7 +52068,7 @@
52030
52068
  }
52031
52069
  getCheckboxState(field) {
52032
52070
  if (this.stateManager.checkedState.size < this.rowCount - this.columnHeaderLevelCount && this.stateManager.initLeftRecordsCheckState(this.records), isValid$3(field)) {
52033
- let stateArr = this.stateManager.checkedState.values();
52071
+ let stateArr = Array.from(this.stateManager.checkedState.keys()).sort().map(key => this.stateManager.checkedState.get(key));
52034
52072
  return this.options.groupBy && (stateArr = getGroupCheckboxState(this)), Array.from(stateArr, state => state[field]);
52035
52073
  }
52036
52074
  return new Array(...this.stateManager.checkedState.values());