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

fix: 调整维值生成规则, 修复导出格式化数据时空数据占位符未生效 close #2808 #2810

Merged
merged 12 commits into from
Aug 5, 2024
+2,614 −1,488
Merged

fix: 调整维值生成规则, 修复导出格式化数据时空数据占位符未生效 close #2808 #2810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5cba31a
fix: 修复导出格式化数据时空数据占位符未生效 close #2808
lijinke666 Jul 5, 2024
816e6e0
Merge branch 'next' into fix-null-dimestion-value
lijinke666 Jul 5, 2024
1232a84
fix: 避免维值为 null 时转换成 'null'
lijinke666 Jul 9, 2024
07c4f85
test: 增加单测和文档说明
lijinke666 Jul 10, 2024
267b529
fix: 统一格式化逻辑
lijinke666 Jul 10, 2024
e043a90
Merge branch 'next' into fix-null-dimestion-value
lijinke666 Jul 10, 2024
055aad2
test: 单测修复
lijinke666 Jul 10, 2024
7104c23
Merge branch 'next' into fix-null-dimestion-value
lijinke666 Jul 26, 2024
439205e
Merge branch 'next' into fix-null-dimestion-value
lijinke666 Jul 26, 2024
b5cbb09
Merge branch 'next' into fix-null-dimestion-value
lijinke666 Jul 29, 2024
5209bb5
test: 更新快照
lijinke666 Jul 29, 2024
e4c40b8
Merge remote-tracking branch 'origin/next' into fix-null-dimestion-value
lijinke666 Jul 29, 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
6 changes: 3 additions & 3 deletions packages/s2-core/__tests__/bugs/__snapshots__/issue-2684-spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Array [
Object {
"content": " 两片罐事业部 宝翼制罐 河北制罐 成都制罐 哈尔滨制罐
dq dq dq dq dq
2018年-三月 53332
2019年-三月 53332
2018年-三月 53332 - - - -
2019年-三月 53332 - - - -
2023年-三月 53332 67456 53332 66293.333333 97192.090909
2023年-四月 67454 0 70442.733333 56665 100535.760606
2023年-五月 23566 -10000 73786.40303 65554 103879.430303
Expand All @@ -17,7 +17,7 @@ Array [
"type": "text/plain",
},
Object {
"content": "<meta charset=\\"utf-8\\"><table><tbody><tr><td></td><td>两片罐事业部</td><td>宝翼制罐</td><td>河北制罐</td><td>成都制罐</td><td>哈尔滨制罐</td></tr><tr><td></td><td>dq</td><td>dq</td><td>dq</td><td>dq</td><td>dq</td></tr><tr><td>2018年-三月</td><td>53332</td><td></td><td></td><td></td><td></td></tr><tr><td>2019年-三月</td><td>53332</td><td></td><td></td><td></td><td></td></tr><tr><td>2023年-三月</td><td>53332</td><td>67456</td><td>53332</td><td>66293.333333</td><td>97192.090909</td></tr><tr><td>2023年-四月</td><td>67454</td><td>0</td><td>70442.733333</td><td>56665</td><td>100535.760606</td></tr><tr><td>2023年-五月</td><td>23566</td><td>-10000</td><td>73786.40303</td><td>65554</td><td>103879.430303</td></tr><tr><td>2023年-六月</td><td>67456</td><td>22222</td><td>77130.072727</td><td>53332</td><td>107223.1</td></tr><tr><td>2023年-七月</td><td>0</td><td>39998</td><td>80473.742424</td><td>70442.733333</td><td>61292.833333</td></tr><tr><td>2023年-八月</td><td>0</td><td>48877</td><td>83817.412121</td><td>73786.40303</td><td>66293.333333</td></tr><tr><td>2023年-九月</td><td>22222</td><td>49999</td><td>87161.081818</td><td>77130.072727</td><td>56665</td></tr></tbody></table>",
"content": "<meta charset=\\"utf-8\\"><table><tbody><tr><td></td><td>两片罐事业部</td><td>宝翼制罐</td><td>河北制罐</td><td>成都制罐</td><td>哈尔滨制罐</td></tr><tr><td></td><td>dq</td><td>dq</td><td>dq</td><td>dq</td><td>dq</td></tr><tr><td>2018年-三月</td><td>53332</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr><td>2019年-三月</td><td>53332</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr><td>2023年-三月</td><td>53332</td><td>67456</td><td>53332</td><td>66293.333333</td><td>97192.090909</td></tr><tr><td>2023年-四月</td><td>67454</td><td>0</td><td>70442.733333</td><td>56665</td><td>100535.760606</td></tr><tr><td>2023年-五月</td><td>23566</td><td>-10000</td><td>73786.40303</td><td>65554</td><td>103879.430303</td></tr><tr><td>2023年-六月</td><td>67456</td><td>22222</td><td>77130.072727</td><td>53332</td><td>107223.1</td></tr><tr><td>2023年-七月</td><td>0</td><td>39998</td><td>80473.742424</td><td>70442.733333</td><td>61292.833333</td></tr><tr><td>2023年-八月</td><td>0</td><td>48877</td><td>83817.412121</td><td>73786.40303</td><td>66293.333333</td></tr><tr><td>2023年-九月</td><td>22222</td><td>49999</td><td>87161.081818</td><td>77130.072727</td><td>56665</td></tr></tbody></table>",
"type": "text/html",
},
]
Expand Down
Loading
Loading