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

Feature/result #431

Merged
merged 11 commits into from
Aug 6, 2024
Merged

Feature/result #431

merged 11 commits into from
Aug 6, 2024

Conversation

slatejack
Copy link
Collaborator

@slatejack slatejack commented Aug 1, 2024

🤔 这个 PR 的性质是?

  • 日常 bug 修复
  • 新特性提交
  • 文档改进
  • 演示代码改进
  • 组件样式/交互改进
  • CI/CD 改进
  • 重构
  • 代码风格优化
  • 测试用例
  • 分支合并
  • 其他

🔗 相关 Issue

fix #397

💡 需求背景和解决方案

📝 更新日志

  • feat(Result): 新增 Result 组件

  • 本条 PR 不需要纳入 Changelog

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项⚠️

  • 文档已补充或无须补充
  • 代码演示已提供或无须提供
  • TypeScript 定义已补充或无须补充
  • Changelog 已提供或无须提供

Copy link
Contributor

github-actions bot commented Aug 1, 2024

完成

@ZWkang
Copy link
Collaborator

ZWkang commented Aug 1, 2024

/update-snapshot

@anlyyao
Copy link
Collaborator

anlyyao commented Aug 6, 2024

/update-snapshot

@slatejack slatejack requested a review from anlyyao August 6, 2024 08:06
@liweijie0812
Copy link
Collaborator

merge develop 分支处理下冲突

Conflicting files
test/snap/__snapshots__/csr.test.jsx.snap
test/snap/__snapshots__/ssr.test.jsx.snap

# Conflicts:
#	test/snap/__snapshots__/csr.test.jsx.snap   resolved by develop version
#	test/snap/__snapshots__/ssr.test.jsx.snap   resolved by develop version
src/result/Result.tsx Outdated Show resolved Hide resolved
@slatejack slatejack requested a review from anlyyao August 6, 2024 08:25
@anlyyao anlyyao merged commit e0f4055 into Tencent:develop Aug 6, 2024
6 checks passed
@github-actions github-actions bot mentioned this pull request Aug 16, 2024
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.

【Result新组件】任务单
4 participants