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/drawer #271

Merged
merged 12 commits into from
Jul 25, 2022
Merged

Feature/drawer #271

merged 12 commits into from
Jul 25, 2022

Conversation

APlanckFish
Copy link
Contributor

@APlanckFish APlanckFish commented Jul 11, 2022

🤔 这个 PR 的性质是?

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

🔗 相关 Issue

暂无

💡 需求背景和解决方案

与tdesign-mobile-vue对齐,实现Drawer抽屉组件

📝 更新日志

  • feat(Drawer): 新增抽屉组件

  • [] 本条 PR 不需要纳入 Changelog

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

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

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

chenpanbo added 5 commits May 25, 2022 18:40
# Conflicts:
#	site/mobile/mobile.config.js
#	site/web/site.config.js
#	src/index.ts
与tdesgin-mobile-vue对齐,新增了drawer组件的基础功能,实现了基本的props与methods
@LeeJim
Copy link
Collaborator

LeeJim commented Jul 12, 2022

代码冲突了,记得处理下

@APlanckFish
Copy link
Contributor Author

冲突已修复,src/_common改动是pull其他分支变更的代码,未做过修改

@LeeJim
Copy link
Collaborator

LeeJim commented Jul 14, 2022

还是冲突。你应该合并 develop 处理下

chenpanbo added 4 commits July 14, 2022 18:16
merge src/index.ts to develop branch
merge index.ts conflicts
change index.ts to same
@APlanckFish
Copy link
Contributor Author

还是冲突。你应该合并 develop 处理下

src/index.ts为解决冲突,目前已与devlop分支保持一致。
但是此处应该有Drawer组件导出,我没有写入权限,还请麻烦添加一下。

@github-actions
Copy link
Contributor

github-actions bot commented Jul 18, 2022

失败

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (develop@c3c69c8). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             develop    #271   +/-   ##
=========================================
  Coverage           ?   7.16%           
=========================================
  Files              ?     383           
  Lines              ?    4134           
  Branches           ?     969           
=========================================
  Hits               ?     296           
  Misses             ?    3838           
  Partials           ?       0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c3c69c8...2fe3cff. Read the comment docs.

@LeeJim
Copy link
Collaborator

LeeJim commented Jul 20, 2022

CI 挂了,麻烦关注一下

@APlanckFish
Copy link
Contributor Author

CI 挂了,麻烦关注一下

已重新推送,CI中有一条src/index.ts未导出Drawer,我这里没有写入权限,修改就会直接报文件冲突,不修改CI会报Drawer未全局导出,麻烦管理员手动添加一下这里

Copy link
Collaborator

@LeeJim LeeJim left a comment

Choose a reason for hiding this comment

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

LGTM

@LeeJim LeeJim merged commit 860ec9c into Tencent:develop Jul 25, 2022
@github-actions github-actions bot mentioned this pull request Jul 25, 2022
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.

3 participants