Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 抽取明细表冻结行列逻辑,交叉表冻结首行逻辑复用 #2415

Merged
merged 3 commits into from
Nov 17, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor: extract freeze public logic
wuding.why committed Nov 14, 2023
commit 2990b34116ae42bd8dd8a52c899df2d1cb3ca2fb
6 changes: 4 additions & 2 deletions packages/s2-core/src/common/constant/basic.ts
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ export const BACK_GROUND_GROUP_CONTAINER_Z_INDEX = 0;

// foregroundGroup 上的 children 层叠顺序
export const FRONT_GROUND_GROUP_CONTAINER_Z_INDEX = 3; // 约定这个 z-index 为 0 的 container 作为基准
export const FRONT_GROUND_GROUP_COL_SCROLL_Z_INDEX = 3;
export const FRONT_GROUND_GROUP_COL_FROZEN_Z_INDEX = 4;
export const FRONT_GROUND_GROUP_SCROLL_Z_INDEX = 3;
export const FRONT_GROUND_GROUP_FROZEN_Z_INDEX = 4;
export const FRONT_GROUND_GROUP_RESIZE_AREA_Z_INDEX = 5;
export const FRONT_GROUND_GROUP_BRUSH_SELECTION_Z_INDEX = 5;

@@ -45,6 +45,8 @@ export const KEY_GROUP_COL_SCROLL = 'colScrollGroup';
export const KEY_GROUP_COL_FROZEN = 'colFrozenGroup';
export const KEY_GROUP_COL_FROZEN_TRAILING = 'colFrozenTrailingGroup';
export const KEY_GROUP_GRID_GROUP = 'gridGroup';
export const KEY_GROUP_ROW_SCROLL = 'rowScrollGroup';
export const KEY_GROUP_ROW_HEADER_FROZEN = 'RowHeaderFrozenGroup';
lijinke666 marked this conversation as resolved.
Show resolved Hide resolved

// key of series number node in corner header
export const KEY_SERIES_NUMBER_NODE = 'series-number-node';
746 changes: 746 additions & 0 deletions packages/s2-core/src/facet/frozen-facet.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/s2-core/src/facet/header/col.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import type { IGroup, IShape } from '@antv/g-canvas';
import { each } from 'lodash';
import { ColCell } from '../../cell';
import {
FRONT_GROUND_GROUP_COL_SCROLL_Z_INDEX,
FRONT_GROUND_GROUP_SCROLL_Z_INDEX,
KEY_GROUP_COL_SCROLL,
} from '../../common/constant';
import type { SpreadSheet } from '../../sheet-type';
@@ -28,7 +28,7 @@ export class ColHeader extends BaseHeader<ColHeaderConfig> {
super(cfg);
this.scrollGroup = this.addGroup({
name: KEY_GROUP_COL_SCROLL,
zIndex: FRONT_GROUND_GROUP_COL_SCROLL_Z_INDEX,
zIndex: FRONT_GROUND_GROUP_SCROLL_Z_INDEX,
});
}

6 changes: 3 additions & 3 deletions packages/s2-core/src/facet/header/table-col.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IGroup } from '@antv/g-canvas';
import { TableColCell, TableCornerCell } from '../../cell';
import {
FRONT_GROUND_GROUP_COL_FROZEN_Z_INDEX,
FRONT_GROUND_GROUP_FROZEN_Z_INDEX,
KEY_GROUP_COL_FROZEN,
KEY_GROUP_COL_FROZEN_TRAILING,
KEY_GROUP_FROZEN_COL_RESIZE_AREA,
@@ -35,14 +35,14 @@ export class TableColHeader extends ColHeader {
if (frozenColCount) {
this.frozenColGroup = this.addGroup({
name: KEY_GROUP_COL_FROZEN,
zIndex: FRONT_GROUND_GROUP_COL_FROZEN_Z_INDEX,
zIndex: FRONT_GROUND_GROUP_FROZEN_Z_INDEX,
});
}

if (frozenTrailingColCount) {
this.frozenTrailingColGroup = this.addGroup({
name: KEY_GROUP_COL_FROZEN_TRAILING,
zIndex: FRONT_GROUND_GROUP_COL_FROZEN_Z_INDEX,
zIndex: FRONT_GROUND_GROUP_FROZEN_Z_INDEX,
});
}
}
786 changes: 69 additions & 717 deletions packages/s2-core/src/facet/table-facet.ts

Large diffs are not rendered by default.