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: antd config setter conflict with model plugin #12406

Merged
merged 1 commit into from
May 30, 2024

Conversation

fz6m
Copy link
Member

@fz6m fz6m commented May 18, 2024

close #12394

修复使用 useAntdConfigSetter 方法更改主题时,和 model 插件逻辑发生的冲突。

Summary by CodeRabbit

  • 新功能
    • 增加了对 modelPluginCompat 的支持,增强了插件的兼容性。
    • 优化了 getAntdConfig 函数,确保 cacheAntdConfig.theme 在不存在时能被初始化。

Copy link

vercel bot commented May 18, 2024

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

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
umi ⬜️ Ignored (Inspect) Visit Preview May 18, 2024 7:07pm

Copy link

coderabbitai bot commented May 18, 2024

Walkthrough

此次更新主要在 antd.ts 文件中添加了 modelPluginCompat 变量,并在 runtime.ts.tpl 文件中的 getAntdConfig 函数中增加了一个条件块,以初始化 cacheAntdConfig.theme,确保其存在。

Changes

文件路径 变更摘要
packages/plugins/src/antd.ts 在导出的函数中添加了 modelPluginCompat 变量
packages/plugins/templates/antd/runtime.ts.tpl getAntdConfig 函数中增加了条件块,以初始化 cacheAntdConfig.theme

🐰✨
代码如诗,变化如画,
增添变量,兼容无瑕。
初始化主题,配置无差,
代码世界,创新无涯。
🌟🌈


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

if (!cacheAntdConfig.theme) {
cacheAntdConfig.theme = {};
}
{{/modelPluginCompat}}
Copy link
Member Author

Choose a reason for hiding this comment

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

antd 的 config provider 中,如果不配置 theme ,会 fallback 到 || {} ,所以这里使用空对象不会影响到什么。

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 82910f9 and 1538163.
Files selected for processing (2)
  • packages/plugins/src/antd.ts (2 hunks)
  • packages/plugins/templates/antd/runtime.ts.tpl (1 hunks)
Additional comments not posted (2)
packages/plugins/templates/antd/runtime.ts.tpl (1)

47-51: 初始化 cacheAntdConfig.theme 以避免后续访问时出现未定义错误,改动合理。

packages/plugins/src/antd.ts (1)

313-325: 添加 modelPluginCompat 变量以处理主题更改与模型数据更新之间的潜在冲突,逻辑正确。

@sorrycc sorrycc merged commit f614b92 into umijs:master May 30, 2024
23 checks passed
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.

[Bug] model 插件和 antd 改变主题互相冲突
3 participants