FIX: options 后加载,无法回填文案

uxcore · May 23, 2019 · 8b491b0 · 8b491b0
1 parent 229f56a
commit 8b491b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/demo/CascadeMultiSelectDemo.js b/demo/CascadeMultiSelectDemo.js
@@ -58,6 +58,7 @@ class Demo extends React.Component {
       demo10: ['bingjiang', 'ningbo', 'anhui', 'shandong', 'jiangsu', 'longname-0'],
       asyncOptions6: options,
       dynamicData,
+      dynamicOptions: [],
       size,
     };
   }
@@ -149,17 +150,18 @@ class Demo extends React.Component {
         </div>
         <div style={{ margin: 15, width: 200 }}>
           <CascadeMultiSelect
-            options={this.state.dynamicData}
+            options={this.state.dynamicOptions}
             onOk={(...params) => console.log('onOk', params)}
             onChange={(...params) => console.log('onChange', params)}
             cascadeSize={4}
             size={'middle'}
+            value={[4]}
           />
           <br/>
           <button
             onClick={() => {
-              this.state.dynamicData[0].children[0].children[0].children = [{ value: 5, label: 'five' }];
-              this.setState({ dynamicData: this.state.dynamicData }, () => {
+              // this.state.dynamicData[0].children[0].children[0].children = [{ value: 5, label: 'five' }];
+              this.setState({ dynamicOptions: dynamicData }, () => {
                 // console.log(this.state.dynamicData);
               });
             }}

diff --git a/src/CascadeMultiSelect.jsx b/src/CascadeMultiSelect.jsx
@@ -49,14 +49,13 @@ class CascadeMultiSelect extends React.Component {
   static getDerivedStateFromProps(props, state) {
     const { value: propValue } = props;
     const { value: stateValue, prevPropValue } = state;
-    let { displayValue } = state;
     let value;
     if (!valueEqual(propValue, prevPropValue)) {
       value = propValue;
-      displayValue = CascadeMultiSelect.getInputValue(props, value);
     } else {
       value = stateValue;
     }
+    const displayValue = CascadeMultiSelect.getInputValue(props, value);
     return { value, prevPropValue: propValue, displayValue };
   }