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

fix: Fixed the problem that internationalization of table columns fails when searching #48126

Merged
merged 3 commits into from Mar 29, 2024

Conversation

LingJinT
Copy link
Contributor

@LingJinT LingJinT commented Mar 27, 2024

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Workflow
  • Other (about what?)

🔗 Related issue link

close #48110

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Fixed the problem that internationalization of table columns fails when searching
🇨🇳 Chinese 修复表格列在搜索情况下,国际化失效

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

Copy link

stackblitz bot commented Mar 27, 2024

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

github-actions bot commented Mar 27, 2024

Preview is ready

Copy link
Contributor

github-actions bot commented Mar 27, 2024

👁 Visual Regression Report for PR #48126 Passed ✅

🎯 Target branch: master (b0e4a3a)
📖 View Full Report ↗︎

🎊 Congrats! No visual-regression diff found.

Copy link

codesandbox-ci bot commented Mar 27, 2024

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Copy link

codecov bot commented Mar 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (268d601) to head (a35ef82).
Report is 8 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##            master    #48126   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          736       736           
  Lines        12684     12690    +6     
  Branches      3326      3329    +3     
=========================================
+ Hits         12684     12690    +6     

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

@li-jia-nan
Copy link
Member

pr title 需要用英文

@afc163
Copy link
Member

afc163 commented Mar 27, 2024

图片

需要测试用例。

@LingJinT LingJinT changed the title fix: 表格列在搜索情况下,国际化失效 #48110 fix: Fixed the problem that internationalization of table columns fails when searching #48110 Mar 27, 2024
@LingJinT LingJinT changed the title fix: Fixed the problem that internationalization of table columns fails when searching #48110 fix: Fixed the problem that internationalization of table columns fails when searching Mar 27, 2024
@LingJinT
Copy link
Contributor Author

pr title 需要用英文

@LingJinT LingJinT closed this Mar 27, 2024
@LingJinT LingJinT reopened this Mar 27, 2024
LingJinT and others added 2 commits March 27, 2024 22:03
Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>
@afc163 afc163 merged commit 5a9dca2 into ant-design:master Mar 29, 2024
62 checks passed
Copy link
Contributor

🎉 Thank you for your contribution! If you have not yet joined our DingTalk community group, please feel free to join us (when joining, please provide the link to this PR).

🎉 感谢您的贡献!如果您还没有加入钉钉社区群,请扫描下方二维码加入我们(加群时请提供此 PR 链接)。

@@ -2079,6 +2079,44 @@ describe('Table.filter', () => {
fireEvent.change(container.querySelector('.ant-input')!, { target: { value: '111' } });
});

it('renders empty element when search not found', () => {
jest.spyOn(console, 'error').mockImplementation(() => undefined);
Copy link
Member

@crazyair crazyair Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个不 mockRestore 清理掉吗

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

得清理

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LingJinT 来补一个?

CooperHash pushed a commit to CooperHash/ant-design that referenced this pull request Mar 29, 2024
…ls when searching (ant-design#48126)

* fix: 表格列在搜索情况下,国际化失效 ant-design#48110

* Update components/table/hooks/useFilter/FilterDropdown.tsx

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>

* fix: 补充测试用例

---------

Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>
Co-authored-by: l2015 <lingjt@dtdream.com>
Co-authored-by: afc163 <afc163@gmail.com>
CooperHash pushed a commit to CooperHash/ant-design that referenced this pull request Mar 29, 2024
…ls when searching (ant-design#48126)

* fix: 表格列在搜索情况下,国际化失效 ant-design#48110

* Update components/table/hooks/useFilter/FilterDropdown.tsx

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>

* fix: 补充测试用例

---------

Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>
Co-authored-by: l2015 <lingjt@dtdream.com>
Co-authored-by: afc163 <afc163@gmail.com>
@MadCcc MadCcc mentioned this pull request Mar 31, 2024
CooperHash pushed a commit to CooperHash/ant-design that referenced this pull request Apr 10, 2024
…ls when searching (ant-design#48126)

* fix: 表格列在搜索情况下,国际化失效 ant-design#48110

* Update components/table/hooks/useFilter/FilterDropdown.tsx

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>

* fix: 补充测试用例

---------

Signed-off-by: LingJinT <63446949+LingJinT@users.noreply.github.com>
Co-authored-by: l2015 <lingjt@dtdream.com>
Co-authored-by: afc163 <afc163@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

表格列在搜索情况下,国际化失效
4 participants