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

feat(Dialog&Drawer): Support BeforeOpen and BeforeClose API #464

Closed
wants to merge 2 commits into from
Closed

feat(Dialog&Drawer): Support BeforeOpen and BeforeClose API #464

wants to merge 2 commits into from

Conversation

Wesley-0808
Copy link
Contributor

@Wesley-0808
Copy link
Contributor Author

有一些不是我做的修改 是之前有同学改了没生成文档？

@uyarn
Copy link
Contributor

uyarn commented Nov 13, 2024

/resolve-conflict

@uyarn
Copy link
Contributor

uyarn commented Nov 13, 2024

@Wesley-0808 应该是dialog之前没有把其他API备份到这个仓库 所以会全量更新下DB的内容 UI库那边手动提交下要新增的API就可以

@Wesley-0808
Copy link
Contributor Author

啥意思？下一步要干嘛😦😦😦

@uyarn
Copy link
Contributor

uyarn commented Nov 13, 2024 •
edited
Loading

啥意思？下一步要干嘛😦😦😦

  1. /resolve-conflict 可以忽略 这个是解决冲突的指令而已
  2. Vue-next的仓库实现API的时候只在PR里带上beforeOpen和beforeClose这些改动就可以 其他改动点不要带上（就是可能需要手动删除的意思

@Wesley-0808
Copy link
Contributor Author

这个我懂 这个分支要合并吗？
我要在各个技术栈提交这些：md和prop（type）的变更对吗？

@uyarn
Copy link
Contributor

uyarn commented Nov 13, 2024

这个我懂 这个分支要合并吗？ 我要在各个技术栈提交这些：md和prop（type）的变更对吗？

是的，要合并的，合并完再在vue-3的本地仓库执行命令行更新md/props https://github.com/TDesignOteam/tdesign-api/?tab=readme-ov-file#%E5%91%BD%E4%BB%A4%E8%A1%8C%E6%93%8D%E4%BD%9C

@uyarn
Copy link
Contributor

uyarn commented Nov 13, 2024

解决冲突的指令分支不能同名.. 你可以在你的main分支上重新checkout个其他分支再提交个PR吗，不然就得自己解决DB的冲突了

@Wesley-0808
Copy link
Contributor Author

好

@Wesley-0808 Wesley-0808 reopened this Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chaishi chaishi Awaiting requested review from chaishi chaishi is a code owner

@uyarn uyarn Awaiting requested review from uyarn uyarn is a code owner

@anlyyao anlyyao Awaiting requested review from anlyyao anlyyao is a code owner

@liweijie0812 liweijie0812 Awaiting requested review from liweijie0812 liweijie0812 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Wesley-0808 @uyarn