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: 修复 collapse 组件同时设置 activeKey 和 defaultActiveKey 属性属性导致的 bug #698

Merged
merged 6 commits into from
Jun 30, 2021

Conversation

BestDingSheng
Copy link
Contributor

No description provided.

@JeromeLin
Copy link
Collaborator

/rebase

@codecov
Copy link

codecov bot commented Jun 29, 2021

Codecov Report

Merging #698 (bb0b526) into master (2365033) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #698   +/-   ##
=======================================
  Coverage   82.75%   82.76%           
=======================================
  Files         180      180           
  Lines        5110     5105    -5     
  Branches     1108     1122   +14     
=======================================
- Hits         4229     4225    -4     
+ Misses        874      872    -2     
- Partials        7        8    +1     
Impacted Files Coverage Δ
packages/zarm/src/collapse/Collapse.tsx 96.61% <100.00%> (+1.29%) ⬆️
packages/zarm/src/modal/index.tsx 11.76% <0.00%> (ø)

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 2365033...bb0b526. Read the comment docs.

@netlify
Copy link

netlify bot commented Jun 29, 2021

✔️ Deploy Preview for zarm ready!

🔨 Explore the source changes: d3fa7cb

🔍 Inspect the deploy log: https://app.netlify.com/sites/zarm/deploys/60daee18341d160007304690

😎 Browse the preview: https://deploy-preview-698--zarm.netlify.app

@netlify
Copy link

netlify bot commented Jun 29, 2021

✔️ Deploy Preview for zarm ready!

🔨 Explore the source changes: bb0b526

🔍 Inspect the deploy log: https://app.netlify.com/sites/zarm/deploys/60dc54e41e179f0008f48097

😎 Browse the preview: https://deploy-preview-698--zarm.netlify.app

@JeromeLin
Copy link
Collaborator

只需要 修改下 getActiveKey 方法就行了吧,大可不必这么麻烦。

判断下 activeKey 有值,立马 return

}
if ('multiple' in nextProps) {
newState.multiple = nextProps.multiple;

Copy link
Collaborator

Choose a reason for hiding this comment

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

删除 animated 后,动画效果丢失了

@JeromeLin JeromeLin merged commit 1e2216f into ZhongAnTech:master Jun 30, 2021
@JeromeLin
Copy link
Collaborator

fix #697

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants