fix(DatePicker): date range picker select time error

fixed alibaba-fusion#388
pyxhr · Mar 6, 2019 · 59eaa9c · 59eaa9c
1 parent d39a9ca
commit 59eaa9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/date-picker/module/panel-footer.jsx b/src/date-picker/module/panel-footer.jsx
@@ -23,6 +23,7 @@ class PanelFooter extends React.PureComponent {
             locale,
             panel,
             value,
+            disabledOk,
             onPanelChange,
             onOk,
         } = this.props;
@@ -44,7 +45,11 @@ class PanelFooter extends React.PureComponent {
                         {panelBtnLabel}
                     </Button>
                 ) : null}
-                <Button {...sharedBtnProps} onClick={onOk}>
+                <Button
+                    {...sharedBtnProps}
+                    disabled={disabledOk || !value}
+                    onClick={onOk}
+                >
                     {locale.ok}
                 </Button>
             </div>

diff --git a/src/date-picker/range-picker.jsx b/src/date-picker/range-picker.jsx
@@ -804,6 +804,11 @@ export default class RangePicker extends Component {
             <PanelFooter
                 prefix={prefix}
                 value={state.startValue && state.endValue}
+                disabledOk={
+                    !state.startValue ||
+                    !state.endValue ||
+                    state.startValue.valueOf() > state.endValue.valueOf()
+                }
                 locale={locale}
                 panel={state.panel}
                 onPanelChange={showTime ? this.changePanel : null}