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

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

Merged
merged 12 commits into from
Aug 5, 2024
Merged

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

merged 12 commits into from
Aug 5, 2024

Conversation

lijinke666
Copy link
Member

@lijinke666 lijinke666 commented Jul 5, 2024 •
edited
Loading

👀 PR includes

🐛 Bugfix

📝 Description

  {
    "number": 7789,
    "province": null,
    "city": null,
    "type": null,
    "sub_type": null
  }

维值为空时, null 会转换成 字符串的 "null", 转换前增加标识, 避免原始值丢失, 解决两个问题

{
-  id: 'root[&]null',
-  value: 'null'

+  id: 'root[&]$$null$$',
+  value: null
}
  1. 行列头 展示/导出 placehoder 不生效的问题
  2. 单元格文本展示成 null 的问题

🖼️ Screenshot

Before After
image image

🔗 Related issue link

🔍 Self-Check before the merge

  • Add or update relevant docs.
  • Add or update relevant demos.
  • Add or update test case.
  • Add or update relevant TypeScript definitions.

@vercel Vercel
Copy link

vercel bot commented Jul 5, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
antvis-s2 ❌ Failed (Inspect) Jul 29, 2024 9:19am

@github-actions github-actions bot added pr(fix) bug fix next 2.0-next 版本的问题 labels Jul 5, 2024
@lijinke666 lijinke666 changed the title fix: 修复导出格式化数据时空数据占位符未生效 close #2808 [WIP] fix: 修复导出格式化数据时空数据占位符未生效 close #2808 Jul 5, 2024
@github-actions github-actions bot removed the pr(fix) bug fix label Jul 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 5, 2024 •
edited
Loading

Size Change: +83 B (+0.03%)

Total Size: 326 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 228 kB +83 B (+0.04%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 388 B
./packages/s2-react/dist/index.min.js 69.9 kB
./packages/s2-react/dist/style.min.css 3.88 kB
./packages/s2-vue/dist/index.min.js 22 kB
./packages/s2-vue/dist/style.min.css 1.97 kB

compressed-size-action

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 5, 2024 •
edited
Loading

你好, @lijinke666 CI 执行失败, 请点击 [Details] 按钮查看, 并根据日志修复。

Hello, @lijinke666 CI run failed, please click the [Details] button for detailed log information and fix it.

@github-actions github-actions bot added the 🚨 test failed 单元测试挂了 label Jul 5, 2024
@lijinke666 lijinke666 linked an issue Jul 5, 2024 that may be closed by this pull request
🐛使用 asyncGetAllPlainData 导出的数据与表格渲染结果不一致 #2808
Closed
5 tasks
@lijinke666 lijinke666 marked this pull request as ready for review July 9, 2024 11:09
@lijinke666 lijinke666 changed the title [WIP] fix: 修复导出格式化数据时空数据占位符未生效 close #2808 fix: 修复导出格式化数据时空数据占位符未生效 close #2808 Jul 10, 2024
@github-actions github-actions bot added the pr(fix) bug fix label Jul 10, 2024
@lijinke666 lijinke666 changed the title fix: 修复导出格式化数据时空数据占位符未生效 close #2808 fix: 调整维值生成规则, 修复导出格式化数据时空数据占位符未生效 close #2808 Jul 10, 2024
@lijinke666 lijinke666 linked an issue Jul 10, 2024 that may be closed by this pull request
🤔 rowCell和colCell中对数据String()处理后导致拿不到原始值 #2766
Closed
5 tasks
@github-actions github-actions bot removed the 🚨 test failed 单元测试挂了 label Jul 11, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 72.22222% with 20 lines in your changes missing coverage. Please review.

Project coverage is 80.59%. Comparing base (ecdc9c8) to head (e4c40b8).
Report is 415 commits behind head on next.

Files Patch % Lines
packages/s2-core/src/utils/layout/generate-id.ts 76.19% 0 Missing and 5 partials ⚠️
packages/s2-core/src/utils/text.ts 50.00% 0 Missing and 3 partials ⚠️
packages/s2-core/src/cell/base-cell.ts 71.42% 0 Missing and 2 partials ⚠️
packages/s2-core/src/data-set/pivot-data-set.ts 33.33% 1 Missing and 1 partial ⚠️
packages/s2-core/src/utils/export/copy/common.ts 80.00% 0 Missing and 2 partials ⚠️
...es/s2-react/src/components/export/strategy-copy.ts 75.00% 0 Missing and 2 partials ⚠️
...s/s2-core/src/facet/layout/build-gird-hierarchy.ts 0.00% 0 Missing and 1 partial ⚠️
...core/src/utils/export/copy/pivot-data-cell-copy.ts 75.00% 1 Missing ⚠️
packages/s2-core/src/utils/export/method.ts 0.00% 0 Missing and 1 partial ⚠️
.../s2-core/src/utils/layout/generate-header-nodes.ts 83.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             next    #2810      +/-   ##
==========================================
+ Coverage   75.77%   80.59%   +4.82%     
==========================================
  Files         257      180      -77     
  Lines       11994    10359    -1635     
  Branches     2464     2346     -118     
==========================================
- Hits         9088     8349     -739     
+ Misses       1398      562     -836     
+ Partials     1508     1448      -60

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lijinke666 lijinke666 linked an issue Jul 26, 2024 that may be closed by this pull request
🐛数据为 null, ‘null’和‘’ 的呈现不一致 #2833
Closed
5 tasks
@lijinke666 lijinke666 mentioned this pull request Jul 26, 2024
Closed
5 tasks
@github-actions github-actions bot added the 🚨 test failed 单元测试挂了 label Jul 26, 2024
@github-actions github-actions bot removed the 🚨 test failed 单元测试挂了 label Jul 29, 2024
@wjgogogo wjgogogo merged commit ad14ff4 into next Aug 5, 2024
8 of 9 checks passed
@wjgogogo wjgogogo deleted the fix-null-dimestion-value branch August 5, 2024 08:23
@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-v2.0.0-next.26 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-react-v2.0.0-next.25 🎉

The release is available on:

Your semantic-release bot 📦🚀

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjgogogo wjgogogo wjgogogo approved these changes

@wuhaiyang wuhaiyang Awaiting requested review from wuhaiyang

Assignees

@lijinke666 lijinke666

Labels
next 2.0-next 版本的问题 pr(fix) bug fix released on @next
Projects
None yet
Milestone
No milestone
3 participants
@lijinke666 @codecov-commenter @wjgogogo