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.

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

Jump to bottom

feat: 明细表新增空数据占位符能力 #2729

Merged
merged 12 commits into from
May 17, 2024
Merged

feat: 明细表新增空数据占位符能力 #2729

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b03838d
feat: 明细表新增空数据占位符能力
lijinke666 May 16, 2024
5c2e3a0
test: 增加单测
lijinke666 May 16, 2024
f34f7fd
fix: 兼容滚动条的展示
lijinke666 May 17, 2024
9528521
test: 单测和文档补充
lijinke666 May 17, 2024
bbf26da
test: 修改滚动条位置单测断言
lijinke666 May 17, 2024
713d81a
test: 更新 shared 包快照
lijinke666 May 17, 2024
2c4178e
fix: 修复英文环境下未展示英文文案
lijinke666 May 17, 2024
79895cf
Merge branch 'next' into feat-empty-placehoder
lijinke666 May 17, 2024
73c56bb
fix: 修复列头单元格宽度很小时占位符坐标错误的问题
lijinke666 May 17, 2024
705b2cb
Merge branch 'feat-empty-placehoder' of github.com:antvis/S2 into fea…
lijinke666 May 17, 2024
eba7b7b
Merge branch 'next' into feat-empty-placehoder
lijinke666 May 17, 2024
25fb09b
fix: 修复趋势分析表导出占位符解析错误
lijinke666 May 17, 2024
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
8 changes: 7 additions & 1 deletion packages/s2-core/__tests__/spreadsheet/__snapshots__/spread-sheet-spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ Object {
"selectedCellHighlight": false,
"selectedCellsSpotlight": false,
},
"placeholder": "-",
"placeholder": Object {
"cell": "-",
"empty": Object {
"description": "暂无数据",
"icon": "Empty",
},
},
"seriesNumber": Object {
"enable": false,
},
Expand Down
296 changes: 296 additions & 0 deletions packages/s2-core/__tests__/spreadsheet/__snapshots__/table-sheet-spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder 1`] = `
Object {
"height": 562,
"stroke": CSSRGB {
"alpha": 1,
"b": 253,
"colorSpace": "rgb",
"g": 233,
"isNone": false,
"r": 224,
},
"strokeOpacity": 1,
"strokeWidth": 1,
"width": 799,
"x": 0,
"y": 32,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder 2`] = `
Object {
"fill": "",
"height": 41,
"margin": Object {
"bottom": 24,
"left": 0,
"right": 0,
"top": 0,
},
"name": "Empty",
"width": 64,
"x": 367.5,
"y": 292.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder 3`] = `
Object {
"fill": CSSRGB {
"alpha": 1,
"b": 0,
"colorSpace": "rgb",
"g": 0,
"isNone": false,
"r": 0,
},
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineWidth": 1,
"opacity": 1,
"text": "暂无数据",
"x": 375.5,
"y": 357.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom col height 1`] = `
Object {
"height": 272,
"stroke": CSSRGB {
"alpha": 1,
"b": 253,
"colorSpace": "rgb",
"g": 233,
"isNone": false,
"r": 224,
},
"strokeOpacity": 1,
"strokeWidth": 1,
"width": 599,
"x": 0,
"y": 202,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom col height 2`] = `
Object {
"fill": "",
"height": 41,
"margin": Object {
"bottom": 24,
"left": 0,
"right": 0,
"top": 0,
},
"name": "Empty",
"width": 64,
"x": 267.5,
"y": 317.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom col height 3`] = `
Object {
"fill": CSSRGB {
"alpha": 1,
"b": 0,
"colorSpace": "rgb",
"g": 0,
"isNone": false,
"r": 0,
},
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineWidth": 1,
"opacity": 1,
"text": "暂无数据",
"x": 275.5,
"y": 382.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description 1`] = `
Object {
"height": 562,
"stroke": CSSRGB {
"alpha": 1,
"b": 253,
"colorSpace": "rgb",
"g": 233,
"isNone": false,
"r": 224,
},
"strokeOpacity": 1,
"strokeWidth": 1,
"width": 799,
"x": 0,
"y": 32,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description 2`] = `
Object {
"fill": "",
"height": 41,
"margin": Object {
"bottom": 24,
"left": 0,
"right": 0,
"top": 0,
},
"name": "Trend",
"width": 64,
"x": 367.5,
"y": 292.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description 3`] = `
Object {
"fill": CSSRGB {
"alpha": 1,
"b": 0,
"colorSpace": "rgb",
"g": 0,
"isNone": false,
"r": 0,
},
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineWidth": 1,
"opacity": 1,
"text": "暂无数据",
"x": 375.5,
"y": 357.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description style 1`] = `
Object {
"height": 562,
"stroke": CSSRGB {
"alpha": 1,
"b": 253,
"colorSpace": "rgb",
"g": 233,
"isNone": false,
"r": 224,
},
"strokeOpacity": 1,
"strokeWidth": 1,
"width": 799,
"x": 0,
"y": 32,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description style 2`] = `
Object {
"fill": "green",
"height": 100,
"margin": Object {
"bottom": 80,
"left": 0,
"right": 0,
"top": 0,
},
"name": "Empty",
"width": 100,
"x": 349.5,
"y": 263,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder by custom icon and description style 3`] = `
Object {
"fill": CSSRGB {
"alpha": 1,
"b": 0,
"colorSpace": "rgb",
"g": 0,
"isNone": false,
"r": 255,
},
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 20,
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineWidth": 1,
"opacity": 1,
"text": "暂无数据",
"x": 359.5,
"y": 443,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder if contains horizontal scrollbar 1`] = `
Object {
"height": 562,
"stroke": CSSRGB {
"alpha": 1,
"b": 253,
"colorSpace": "rgb",
"g": 233,
"isNone": false,
"r": 224,
},
"strokeOpacity": 1,
"strokeWidth": 1,
"width": 799,
"x": 0,
"y": 32,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder if contains horizontal scrollbar 2`] = `
Object {
"fill": "",
"height": 41,
"margin": Object {
"bottom": 24,
"left": 0,
"right": 0,
"top": 0,
},
"name": "Empty",
"width": 64,
"x": 367.5,
"y": 292.5,
}
`;

exports[`TableSheet normal spec Empty Placeholder should render empty placeholder if contains horizontal scrollbar 3`] = `
Object {
"fill": CSSRGB {
"alpha": 1,
"b": 0,
"colorSpace": "rgb",
"g": 0,
"isNone": false,
"r": 0,
},
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineWidth": 1,
"opacity": 1,
"text": "暂无数据",
"x": 375.5,
"y": 357.5,
}
`;
Loading
Loading