fix(DatePicker2): pressing enter should correctly display the formatt…

…ed value
alibaba-fusion · Sep 24, 2024 · 3ce02ed · 3ce02ed
1 parent 9726d5b
commit 3ce02ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/components/date-picker2/__tests__/index-spec.js b/components/date-picker2/__tests__/index-spec.js
@@ -528,6 +528,17 @@ describe('Picker', () => {
             wrapper.unmount();
         });
 
+        it('pressing enter should correctly display the formatted value', () => {
+            wrapper = mount(
+                <DatePicker
+                    defaultValue={'2020/02/12'}
+                    format={'DD/MM/YYYY'}
+                />
+            );
+            findInput().simulate('keydown', { keyCode: KEYCODE.ENTER });
+            assert(getStrValue(wrapper) === dayjs('2020/02/12').format('DD/MM/YYYY'));
+        });
+
         it('outputFormat', () => {
             wrapper = mount(
                 <DatePicker

diff --git a/components/date-picker2/picker.jsx b/components/date-picker2/picker.jsx
@@ -440,7 +440,7 @@ class Picker extends React.Component {
         const isTemporary = showOk && !forceEvents.includes(eventType);
 
         // 面板收起时候，将值设置为确认值
-        v = eventType === 'VISIBLE_CHANGE' ? value : this.checkValue(v, !isTemporary);
+        v = eventType === 'VISIBLE_CHANGE' ? value : this.checkValue(v, !isTemporary, format);
 
         this.setState({
             curValue: v,