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: Update rc-dialog to 8.3.0, support Modal drag and drop. #26507

Merged
merged 9 commits into from Sep 3, 2020
Merged

feat: Update rc-dialog to 8.3.0, support Modal drag and drop. #26507

merged 9 commits into from Sep 3, 2020

Conversation

jhoneybee
Copy link
Contributor

@jhoneybee jhoneybee commented Aug 31, 2020 •
edited

🤔 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
  • Other (about what?)

🔗 Related issue link

see react-component/dialog#195

💡 Background and solution

modal

📝 Changelog

Language Changelog
🇺🇸 English -
🇨🇳 Chinese 添加一个modalRender 属性，方便的扩展Modal

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • 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

View rendered components/drawer/index.en-US.md
View rendered components/modal/demo/draggable.md
View rendered components/modal/index.zh-CN.md

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Aug 31, 2020 •
edited

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Aug 31, 2020 •
edited

@codesandbox-ci
Copy link

codesandbox-ci bot commented Aug 31, 2020 •
edited

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.

Latest deployment of this branch, based on commit 5d92a9c:

Sandbox Source
antd reproduction template Configuration

@jhoneybee
Copy link
Contributor Author

jhoneybee commented Aug 31, 2020 •
edited

@afc163 大佬能帮我看以下吗？ 我看这边单元测试执行失败。但是我好像没有改过Upload组件。

image

@abenhamdine
Copy link
Contributor

good to see that !

close also react-component/dialog#37

xrkffgg
xrkffgg reviewed Sep 1, 2020
View reviewed changes
components/drawer/index.en-US.md Outdated Show resolved Hide resolved
components/modal/demo/draggable.md Outdated Show resolved Hide resolved
components/modal/index.zh-CN.md Outdated Show resolved Hide resolved
@xrkffgg
Copy link
Member

xrkffgg commented Sep 1, 2020

PR 标题 改成英文的

@jhoneybee jhoneybee changed the title feat: 更新到rc-dialog@8.3.0 添加Modal组件对拖拽的支持。 feat: Update rc-dialog to 8.3.0, support Modal drag and drop。 Sep 1, 2020
@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop。 feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 1, 2020
@jhoneybee
Copy link
Contributor Author

PR 标题 改成英文的

好的，已经调整完毕了。

卖萌

@xrkffgg
Copy link
Member

xrkffgg commented Sep 1, 2020

等一下，我同步下分支，然后你 rebase 下

@jhoneybee
Copy link
Contributor Author

等一下，我同步下分支，然后你 rebase 下

好哒 Uploading 卖萌.gif

@xrkffgg
Copy link
Member

xrkffgg commented Sep 1, 2020

rebase 下

@xrkffgg
Copy link
Member

xrkffgg commented Sep 1, 2020

新的 API 按照 字母顺序放位置

@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. [WIP] feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 1, 2020
@pr-triage pr-triage bot removed the PR: unreviewed label Sep 1, 2020
@jhoneybee jhoneybee changed the title [WIP] feat: Update rc-dialog to 8.3.0, support Modal drag and drop. feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 1, 2020
@jhoneybee
Copy link
Contributor Author

jhoneybee commented Sep 1, 2020 •
edited

新的 API 按照 字母顺序放位置

已经调整了 (0^◇^0)/

@codecov
Copy link

codecov bot commented Sep 1, 2020 •
edited

Codecov Report

Merging #26507 into feature will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           feature   #26507   +/-   ##
========================================
  Coverage    99.75%   99.75%           
========================================
  Files          383      383           
  Lines         7353     7353           
  Branches      2056     2059    +3     
========================================
  Hits          7335     7335           
  Misses          18       18

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 09e19b7...5d92a9c. Read the comment docs.

@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. feat: Update rc-dialog to 8.3.0, support Modal drag and drop. WIP Sep 1, 2020
@xrkffgg
Copy link
Member

xrkffgg commented Sep 1, 2020

snap 忘更新了吧

@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. WIP feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 1, 2020
@jhoneybee
Copy link
Contributor Author

snap 忘更新了吧

(/ω＼) 是的，忘记更新snap了 ~

@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. WIP feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 2, 2020
jhoneybee
jhoneybee commented Sep 2, 2020
View reviewed changes
Copy link
Contributor Author

@jhoneybee jhoneybee left a comment •
edited

Choose a reason for hiding this comment

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

已经调整完成，包括按钮的调整，以及PR的内容

@zombieJ
Copy link
Member

zombieJ commented Sep 2, 2020

第一个例子看起来没有必要直接去了，让 Demo 简单一点。别人很可能直接拷贝这个 Demo 去实现拖拽。

@jhoneybee
Copy link
Contributor Author

jhoneybee commented Sep 2, 2020 •
edited

第一个例子看起来没有必要直接去了，让 Demo 简单一点。别人很可能直接拷贝这个 Demo 去实现拖拽。

卖萌

已经去掉第一个例子 ~

@jhoneybee
Copy link
Contributor Author

jhoneybee commented Sep 2, 2020 •
edited

image

@xrkffgg 大佬，有空能帮我看看CI问题么？ (/ω＼)

@xrkffgg
Copy link
Member

xrkffgg commented Sep 2, 2020 •
edited

因为这个 #26542 ， 等同步到 feature

@hengkx
Copy link
Member

hengkx commented Sep 3, 2020

rebase

@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. feat: Update rc-dialog to 8.3.0, support Modal drag and drop. WIP Sep 3, 2020
@jhoneybee jhoneybee changed the title feat: Update rc-dialog to 8.3.0, support Modal drag and drop. WIP feat: Update rc-dialog to 8.3.0, support Modal drag and drop. Sep 3, 2020
@jhoneybee
Copy link
Contributor Author

jhoneybee commented Sep 3, 2020 •
edited

rebase

好的，已经调整 卖萌

@hengkx hengkx merged commit 0c52196 into ant-design:feature Sep 3, 2020
@afc163 afc163 mentioned this pull request Sep 14, 2020
Closed
1 task
@afc163 afc163 mentioned this pull request Oct 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hengkx hengkx hengkx approved these changes

@xrkffgg xrkffgg xrkffgg approved these changes

@afc163 afc163 Awaiting requested review from afc163

@zombieJ zombieJ Awaiting requested review from zombieJ

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

Successfully merging this pull request may close these issues.

None yet
7 participants
@jhoneybee @ant-design-bot @abenhamdine @xrkffgg @hengkx @kerm1it @zombieJ