fix menu mutli active item #1438
Conversation
|
@DavidSuns, thanks for your PR! By analyzing the history of the files in this pull request, we identified @warmhug, @yiminghe and @paranoidjk to be potential reviewers. |
Codecov Report
@@ Coverage Diff @@
## master #1438 +/- ##
=======================================
Coverage 63.44% 63.44%
=======================================
Files 222 222
Lines 4336 4336
Branches 1272 1271 -1
=======================================
Hits 2751 2751
Misses 1584 1584
Partials 1 1
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #1438 +/- ##
==========================================
+ Coverage 61.85% 63.45% +1.59%
==========================================
Files 222 101 -121
Lines 4336 2126 -2210
Branches 1272 668 -604
==========================================
- Hits 2682 1349 -1333
+ Misses 1653 777 -876
+ Partials 1 0 -1
Continue to review full report at Codecov.
|
|
@DavidSuns You should write close #1427 |
|
@DavidSuns Please follow git-commit-guidelines |
components/menu/PropsType.tsx
Outdated
| @@ -7,6 +7,7 @@ export interface DataItem { | |||
| isLeaf?: boolean; | |||
| disabled?: boolean; | |||
| [key: string]: any; | |||
| showSelect: boolean; | |||
components/menu/SubMenu.web.tsx
Outdated
| @@ -5,32 +5,14 @@ import List from '../list/index.web'; | |||
| import Radio from '../radio/Radio.web'; | |||
|
|
|||
| export default class SubMenu extends React.Component<any, any> { | |||
There was a problem hiding this comment.
This component is a stateless component, just write it with pure function.
|
Please fix the commit message and the review problem, then i am going to merge this. |
|
@paranoidjk , i will update a commit today |
two menu bugs which are described in ant-design#1427 ant-design#1427
| @@ -37,37 +39,47 @@ export default class Menu extends React.Component<MenuProps, any> { | |||
| } | |||
There was a problem hiding this comment.
getNewFsv的写法也改写下吧，这个写法很难阅读。
components/menu/index.web.tsx
Outdated
|
|
||
| let subMenuData = data[0].children || []; | ||
| if (level !== 2) { |
There was a problem hiding this comment.
subMenuData的处理逻辑也比较啰嗦，可以优化下。
| @@ -97,6 +98,9 @@ | |||
| &:only-child { | |||
| .@{listPrefixCls} { | |||
| .@{listPrefixCls}-item { | |||
| .@{listPrefixCls}-line { | |||
| .hairline-bottom(@border-color-base); | |||
1. refactor function getNewFsv 2. refactor function render 3. fix css-lint error
| const { firstLevelSelectValue, value } = this.state; | ||
| let subMenuData = data; // menu only has one level as init | ||
|
|
||
| if (level === 2) { |
There was a problem hiding this comment.
重新梳理了一下逻辑，加入了isLeaf ＝＝＝ true 就不显示children 的判断
There was a problem hiding this comment.
isLeaf的使用场景是干啥？demo里的isLeaf用来显示全部类型？也不太对啊
要问下这个组件最初的开发者
There was a problem hiding this comment.
这个跟@pingan1927 沟通过。
isLeaf 表明它是叶子节点，无法展开二级节点，在文档中说，isLeaf的优先级大于children。之前代码中没有这个判断。
demo中叶子节点显示全部类型，是有些令人困惑，我去修正一下demo。
|
@DavidSuns .menu-active:after {
content: ' ';
position: absolute;
width: 100%;
height: 100%;
background-color: #000;
opacity: 0.4;
z-index: 1;
} |
|
好，我明天看一下 |
|
@DavidSuns |
* fix menu bug * fix menu two menu bugs which are described in ant-design#1427 ant-design#1427 * improve menu style * refactor menu 1. refactor function getNewFsv 2. refactor function render 3. fix css-lint error * update snap and fix PropsType * enhance menu demo * 修复demo 蒙层撑开屏幕的问题
related to issue #1427
This change is