fix: 修改value和panelValue的变化

tinper-bee · Feb 3, 2021 · 03c7e48 · 03c7e48
1 parent 7e18fe6
commit 03c7e48
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 70 deletions.
diff --git a/demo/demolist/Demo13.js b/demo/demolist/Demo13.js
@@ -17,22 +17,22 @@ class Demo13 extends Component {
     state = {
         datePickerPanelValue: '2004-05-09',
         rangePickerPanelValues: '2014-01-02',
-        dateValue: '2020-02-03',
+        // dateValue: '2020-02-03',
         // rangeValue: ['2098-09-02', '2099-08-06']
     }
     onSelect = d => {
         console.log(d);
     }
     onDateChange = (d) => {
         this.setState({
-            datePickerPanelValue: null,
+            // datePickerPanelValue: null,
             dateValue: d
         })
     };
     onRangeChange = (d) => {
         this.setState({
             rangeValue: d,
-            rangePickerPanelValues: null
+            // rangePickerPanelValues: null
         })
     };
     render() {

diff --git a/demo/index.js b/demo/index.js
diff --git a/dist/demo.css.map b/dist/demo.css.map
diff --git a/dist/demo.js b/dist/demo.js
diff --git a/dist/demo.js.map b/dist/demo.js.map
diff --git a/src/DatePicker.js b/src/DatePicker.js
@@ -63,7 +63,7 @@ class DatePicker extends Component {
     }
     if ("panelValue" in nextProps) {
       this.setState({
-        panelValue: value ? null : nextProps.panelValue
+        panelValue: value ? null : moment(nextProps.panelValue)
       });
     }
     if ("open" in nextProps) {
@@ -273,7 +273,8 @@ class DatePicker extends Component {
     e.stopPropagation();
     this.setState({
       inputValue:'',
-      value:''
+      value:'',
+      panelValue: null
     })
     this.fireChange('','');
   }

diff --git a/src/RangePicker.js b/src/RangePicker.js
@@ -51,11 +51,12 @@ if (cn) {
 class RangePicker extends Component {
     constructor(props, context) {
         super(props, context);
+        const initialValue = props.value || props.defaultValue
         this.state = {
             hoverValue: [],
             value: this.initValue(props),
             open: props.open||false,
-            panelValues: (props.value || props.defaultValue) ? null : this.modifyPanelValues(props.panelValues)
+            panelValues: (initialValue && initialValue.length) ? null : this.modifyPanelValues(props.panelValues)
         };
     }
     modifyPanelValues = values => {
@@ -108,8 +109,9 @@ class RangePicker extends Component {
             });
         }
         if ("panelValues" in nextProps) {
+            const isValueEmpty = !value.some(item => item)
             this.setState({
-                panelValues: value ? null : this.modifyPanelValues(nextProps.panelValues)
+                panelValues: !isValueEmpty ? null : this.modifyPanelValues(nextProps.panelValues)
             });
         }
         if ("open" in nextProps) {