fix menu mutli active item #1438
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,56 +21,80 @@ export default class Menu extends React.Component<MenuProps, any> { | |
| super(props); | ||
| this.state = { | ||
| firstLevelSelectValue: this.getNewFsv(props), | ||
| value: props.value, | ||
| }; | ||
| } | ||
| componentWillReceiveProps(nextProps) { | ||
| if (nextProps.value !== this.props.value) { | ||
| this.setState({ | ||
| firstLevelSelectValue: this.getNewFsv(nextProps), | ||
| value: nextProps.value, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| getNewFsv(props) { | ||
| const { value, data } = props; | ||
| let firstValue = ''; | ||
| if (value && value.length) { // if has init path, chose init first value | ||
| firstValue = value[0]; | ||
| } else if (!data[0].isLeaf) { // chose the first menu item if it's not leaf. | ||
| firstValue = data[0].value; | ||
| } | ||
|
|
||
| return firstValue; | ||
| } | ||
|
|
||
| onClickFirstLevelItem = (dataItem) => { | ||
| const { onChange } = this.props; | ||
| this.setState({ | ||
| firstLevelSelectValue: dataItem.value, | ||
| }); | ||
| if (dataItem.isLeaf && onChange) { | ||
| onChange([dataItem.value]); | ||
| } | ||
| } | ||
|
|
||
| onClickSubMenuItem = (dataItem) => { | ||
| const { level, onChange } = this.props; | ||
| const value = (level === 2) ? [this.state.firstLevelSelectValue, dataItem.value] : [dataItem.value]; | ||
| this.setState({ value }); | ||
| setTimeout(() => { | ||
| if (onChange) { | ||
| onChange(value); | ||
| } | ||
| }, 300); | ||
| } | ||
|
|
||
| render() { | ||
| const { className, style, height, data = [], prefixCls, level } = this.props; | ||
| 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 沟通过。 |
||
| let parent = data; | ||
| if (firstLevelSelectValue && firstLevelSelectValue !== '') { | ||
| parent = data.filter(dataItem => dataItem.value === firstLevelSelectValue); | ||
| } | ||
|
|
||
| if (parent[0] && parent[0].children && parent[0].isLeaf !== true ) { | ||
| subMenuData = parent[0].children; | ||
| } else { | ||
| subMenuData = []; | ||
| } | ||
| } | ||
|
|
||
| const subValue = value && (value.length > 0) && value[value.length - 1]; | ||
| const parentValue = (value && (value.length > 1)) ? value[0] : null; | ||
| const subSelInitItem = subMenuData.filter(dataItem => dataItem.value === subValue); | ||
|
|
||
| let showSelect = true; | ||
| if (level === 2 && parentValue !== firstLevelSelectValue) { | ||
| showSelect = false; | ||
| } | ||
|
|
||
| const heightStyle = { | ||
| height: `${Math.round(height || document.documentElement.clientHeight / 2)}px`, | ||
| }; | ||
|
|
||
| return ( | ||
|
|
@@ -106,6 +130,7 @@ export default class Menu extends React.Component<MenuProps, any> { | |
| subMenuData={subMenuData} | ||
| selItem={subSelInitItem} | ||
| onSel={this.onClickSubMenuItem} | ||
| showSelect={showSelect} | ||
| /> | ||
| </Flex.Item> | ||
| </Flex> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getNewFsv的写法也改写下吧，这个写法很难阅读。