Merge pull request #1876 from XiaoMi/hotfix/#1875

fix: #1854 #1875
XiaoMi · Aug 20, 2021 · 3bda485 · 3bda485
2 parents 81c2935 + 4f861af
commit 3bda485
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/components/cascader/Cascader.js b/components/cascader/Cascader.js
@@ -57,6 +57,7 @@ const Cascader = (props) => {
   const [filterOptions, setFilterOptions] = useState(false)
   // 缓存原始value，用户可能点击option但是没选中，用于恢复初始value
   const [cacheValue, setCacheValue] = useState(value || defaultValue || [])
+  // 选中态 value
   const [cascaderValue, setCascaderValue] = useState(value || defaultValue || [])
   const [cascaderLabel, setCascaderLabel] = useState(
     getCascaderLabel(value || defaultValue || [], fieldNames, displayRender, data)
@@ -80,7 +81,7 @@ const Cascader = (props) => {
   useEffect(() => {
     setFocusOptionIndex(-1)
     currentDeep.current = 0
-    if (onOpen) {
+    if (onOpen && popperShow) {
       const dataSource = onOpen()
       if (dataSource && dataSource.toString() === '[object Promise]') {
         dataSource.then((res) => {

diff --git a/docs/demo/cascader/section-advanced.jsx b/docs/demo/cascader/section-advanced.jsx
@@ -166,18 +166,22 @@ class Demo extends React.Component {
   constructor () {
     super()
     this.state = {
-      options: []
+      options: [],
+      value: ['手机','手机2']
     }
   }
   render(){
     return(
       <Cascader
         onChange={(value)=>{
           console.log('on change', value)
+          this.setState({
+            value: value
+          })
         }}
         data={this.state.options}
         style={{ width: 240 }}
-        defaultValue={['电视','小米电视4C']}
+        value={this.state.value}
         onOpen={()=>{
           const {options} = this.state
           if(options.length === 0){

diff --git a/docs/zh-CN/components/cascader.mdx b/docs/zh-CN/components/cascader.mdx
@@ -54,6 +54,7 @@ import DemoAdvanced from '../../demo/cascader/section-advanced.jsx'
 | 名称     | 说明         | 类型                       | 参数               | 返回值 |
 | -------- | ------------ | -------------------------- | ------------------ | ------ |
 | onChange | 选择后的回调 | (values: string[]) => void | values: 选中项集合 | -      |
+| onActiveItemChange | 选中项改变时的回调 | (values: string[]) => void | values: 选中项集合 | -      |
 | onOpen | 下拉菜单打开时回调 | () => void | - | -      |
 | onClose | 下拉菜单关闭时回调 | () => void | - | -      |