Skip to content

fix(vtable): refresh custom merged corner layout #5288

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.

Sign up for GitHub

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

Open
fangsmile wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix(vtable): refresh custom merged corner layout #5288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5999b31
fix(vtable): refresh custom merged corner layout
fangsmile Aug 20, 2026
5be858d
Merge remote-tracking branch 'origin/develop' into fix/issue-765-cust…
fangsmile Aug 20, 2026
ec25f7d
fix(vtable): harden custom merged corner rendering
fangsmile Aug 21, 2026
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
37 changes: 24 additions & 13 deletions docs/assets/demo/en/custom-render/complex-corner.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,31 @@ const option = {
},
corner: {
titleOnDimension: 'row',
disableHeaderHover: true,
disableHeaderSelect: true,
customLayout: args => {
const { table, row, col, rect } = args;
const { height, width } = rect ?? table.getCellRect(col, row);
const provinceWidth = table.getColWidth(0);
const cityWidth = table.getColWidth(1);
const categoryHeight = table.getRowHeight(0);
const provinceCenterX = provinceWidth / 2;
const cityCenterX = provinceWidth + cityWidth / 2;
const indicatorX = provinceWidth + cityWidth + 6;
const endCategoryX = width - 80;
const container = createGroup({
height,
width
});

// 定义文本内容的数组
const texts = [
{ text: 'province', fontSize: 18, x: 10, y: rect.height - 25 },
{ text: 'city', fontSize: 18, x: 105, y: rect.height - 25 },
{ text: 'data', fontSize: 18, x: rect.width - 50, y: rect.height - 35 },
{ text: 'subCategory', fontSize: 18, x: rect.width - 100, y: rect.height - 85 },
{ text: 'category', fontSize: 18, x: rect.width - 80, y: 18 },
{ text: 'indicator', fontSize: 16, x: 176, y: rect.height - 20 }
{ text: 'province', fontSize: 18, x: provinceCenterX - 36, y: height - 25 },
{ text: 'city', fontSize: 18, x: cityCenterX - 14, y: height - 25 },
{ text: 'data', fontSize: 18, x: endCategoryX + 30, y: height - 35 },
{ text: 'subCategory', fontSize: 18, x: endCategoryX - 20, y: height - 85 },
{ text: 'category', fontSize: 18, x: endCategoryX, y: Math.max(18, categoryHeight / 2 - 9) },
{ text: 'indicator', fontSize: 16, x: indicatorX, y: height - 20 }
];

// 循环添加文本
Expand All @@ -105,17 +114,15 @@ const option = {

// 定义线段的点
const linePoints = [
{ x: rect.left, y: rect.top },
{ x: 0, y: 0 },
{ x: rect.width - 40, y: rect.height },
{ x: width - 40, y: height },
{ x: provinceWidth + cityWidth + 3, y: height },
{ x: 0, y: 0 },
{ x: 173, y: rect.height },
{ x: provinceWidth, y: height },
{ x: 0, y: 0 },
{ x: 84, y: rect.height },
{ x: width, y: categoryHeight },
{ x: 0, y: 0 },
{ x: rect.width, y: rect.height - 90 },
{ x: 0, y: 0 },
{ x: rect.width, y: rect.height - 38 },
{ x: width, y: height - 38 },
{ x: 0, y: 0 }
];

Expand Down Expand Up @@ -398,6 +405,10 @@ const option = {
rightFrozenColCount: 1,
dragOrder:{
dragHeaderMode: 'all'
},
resize: {
columnResizeMode: 'all',
rowResizeMode: 'all'
}
};

Expand Down
37 changes: 24 additions & 13 deletions docs/assets/demo/zh/custom-render/complex-corner.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,31 @@ const option = {
},
corner: {
titleOnDimension: 'row',
disableHeaderHover: true,
disableHeaderSelect: true,
customLayout: args => {
const { table, row, col, rect } = args;
const { height, width } = rect ?? table.getCellRect(col, row);
const provinceWidth = table.getColWidth(0);
const cityWidth = table.getColWidth(1);
const categoryHeight = table.getRowHeight(0);
const provinceCenterX = provinceWidth / 2;
const cityCenterX = provinceWidth + cityWidth / 2;
const indicatorX = provinceWidth + cityWidth + 6;
const endCategoryX = width - 50;
const container = createGroup({
height,
width
});

// 定义文本内容的数组
const texts = [
{ text: '省份', fontSize: 18, x: 30, y: rect.height - 25 },
{ text: '城市', fontSize: 18, x: 105, y: rect.height - 25 },
{ text: '数据', fontSize: 18, x: rect.width - 50, y: rect.height - 35 },
{ text: '子类别', fontSize: 18, x: rect.width - 50, y: rect.height - 85 },
{ text: '类别', fontSize: 18, x: rect.width - 50, y: 18 },
{ text: '指标', fontSize: 16, x: 176, y: rect.height - 20 }
{ text: '省份', fontSize: 18, x: provinceCenterX - 18, y: height - 25 },
{ text: '城市', fontSize: 18, x: cityCenterX - 18, y: height - 25 },
{ text: '数据', fontSize: 18, x: endCategoryX, y: height - 35 },
{ text: '子类别', fontSize: 18, x: endCategoryX, y: height - 85 },
{ text: '类别', fontSize: 18, x: endCategoryX, y: Math.max(18, categoryHeight / 2 - 9) },
{ text: '指标', fontSize: 16, x: indicatorX, y: height - 20 }
];

// 循环添加文本
Expand All @@ -105,17 +114,15 @@ const option = {

// 定义线段的点
const linePoints = [
{ x: rect.left, y: rect.top },
{ x: 0, y: 0 },
{ x: rect.width - 40, y: rect.height },
{ x: width - 40, y: height },
{ x: provinceWidth + cityWidth + 3, y: height },
{ x: 0, y: 0 },
{ x: 173, y: rect.height },
{ x: provinceWidth, y: height },
{ x: 0, y: 0 },
{ x: 84, y: rect.height },
{ x: width, y: categoryHeight },
{ x: 0, y: 0 },
{ x: rect.width, y: rect.height - 90 },
{ x: 0, y: 0 },
{ x: rect.width, y: rect.height - 38 },
{ x: width, y: height - 38 },
{ x: 0, y: 0 }
];

Expand Down Expand Up @@ -398,6 +405,10 @@ const option = {
rightFrozenColCount: 1,
dragOrder: {
dragHeaderMode: 'all'
},
resize: {
columnResizeMode: 'all',
rowResizeMode: 'all'
}
};

Expand Down
Loading
Loading