From abeb7cfa67062b6f4de1a69a44886c55f4b18bc1 Mon Sep 17 00:00:00 2001 From: zkwolf Date: Sat, 28 Mar 2020 15:45:37 +0800 Subject: [PATCH] feat: datepicker use new icon (#1961) --- components/date-picker/InputIcon.js | 4 +-- components/date-picker/RangePicker.jsx | 9 ++---- components/date-picker/WeekPicker.jsx | 9 ++---- .../__snapshots__/DatePicker.test.js.snap | 2 +- .../__tests__/__snapshots__/demo.test.js.snap | 32 +++++++------------ .../__snapshots__/other.test.js.snap | 6 ++-- components/date-picker/createPicker.js | 12 +++---- 7 files changed, 26 insertions(+), 48 deletions(-) diff --git a/components/date-picker/InputIcon.js b/components/date-picker/InputIcon.js index 51ae79485..ea23a6a71 100644 --- a/components/date-picker/InputIcon.js +++ b/components/date-picker/InputIcon.js @@ -1,4 +1,4 @@ -import Icon from '../icon'; +import CalendarOutlined from '@ant-design/icons-vue/CalendarOutlined'; import { isValidElement } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; @@ -14,7 +14,7 @@ export default { }) ) : ( {suffixIcon} - )) || + )) || ); }, }; diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx index 24c0f4b96..38bb7d5dc 100644 --- a/components/date-picker/RangePicker.jsx +++ b/components/date-picker/RangePicker.jsx @@ -3,7 +3,7 @@ import RangeCalendar from '../vc-calendar/src/RangeCalendar'; import VcDatePicker from '../vc-calendar/src/Picker'; import classNames from 'classnames'; import shallowequal from 'shallowequal'; -import Icon from '../icon'; +import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled'; import Tag from '../tag'; import { ConfigConsumerProps } from '../config-provider'; import interopDefault from '../_util/interopDefault'; @@ -373,12 +373,7 @@ export default { const [startValue, endValue] = value; const clearIcon = !props.disabled && props.allowClear && value && (startValue || endValue) ? ( - + ) : null; const inputIcon = ; diff --git a/components/date-picker/WeekPicker.jsx b/components/date-picker/WeekPicker.jsx index e1f1e7d5d..e96dc7dc7 100644 --- a/components/date-picker/WeekPicker.jsx +++ b/components/date-picker/WeekPicker.jsx @@ -1,7 +1,7 @@ import * as moment from 'moment'; import Calendar from '../vc-calendar'; import VcDatePicker from '../vc-calendar/src/Picker'; -import Icon from '../icon'; +import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled'; import { ConfigConsumerProps } from '../config-provider'; import { hasProp, @@ -182,12 +182,7 @@ export default { ); const clearIcon = !disabled && allowClear && $data._value ? ( - + ) : null; const inputIcon = ; diff --git a/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap b/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap index 7a44dd87b..3019674dc 100644 --- a/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`DatePicker prop locale should works 1`] = `
`; +exports[`DatePicker prop locale should works 1`] = `
`; diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap index ed95ad06a..386727ecd 100644 --- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap @@ -1,38 +1,30 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./antdv-demo/docs/date-picker/demo/basic.md correctly 1`] = `

~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/basic.md correctly 1`] = `

~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/date-render.md correctly 1`] = `
 ~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/date-render.md correctly 1`] = `
 ~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/disabled.md correctly 1`] = `

~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/disabled.md correctly 1`] = `

~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/disabled-date.md correctly 1`] = `

~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/disabled-date.md correctly 1`] = `

~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/extra-footer.md correctly 1`] = `
~ ~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/extra-footer.md correctly 1`] = `
~ ~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/format.md correctly 1`] = ` -


~
-`; +exports[`renders ./antdv-demo/docs/date-picker/demo/format.md correctly 1`] = `


~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/mode.md correctly 1`] = `
~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/mode.md correctly 1`] = `
~
`; exports[`renders ./antdv-demo/docs/date-picker/demo/presetted-ranges.md correctly 1`] = `
~
~
`; exports[`renders ./antdv-demo/docs/date-picker/demo/size.md correctly 1`] = `
-




~
-
+


+

~
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/start-end.md correctly 1`] = `
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/start-end.md correctly 1`] = `
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/suffix.md correctly 1`] = ` -

~

ab
ab
~ ab
ab
-`; +exports[`renders ./antdv-demo/docs/date-picker/demo/suffix.md correctly 1`] = `

~

ab
ab
~ ab
ab
`; exports[`renders ./antdv-demo/docs/date-picker/demo/text.md correctly 1`] = `
SelectTime
@@ -40,4 +32,4 @@ exports[`renders ./antdv-demo/docs/date-picker/demo/text.md correctly 1`] = `
`; -exports[`renders ./antdv-demo/docs/date-picker/demo/time.md correctly 1`] = `
~
`; +exports[`renders ./antdv-demo/docs/date-picker/demo/time.md correctly 1`] = `
~
`; diff --git a/components/date-picker/__tests__/__snapshots__/other.test.js.snap b/components/date-picker/__tests__/__snapshots__/other.test.js.snap index 844dfcbf4..d88f56ded 100644 --- a/components/date-picker/__tests__/__snapshots__/other.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/other.test.js.snap @@ -231,10 +231,10 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = ` `; -exports[`Picker format by locale date 1`] = `
`; +exports[`Picker format by locale date 1`] = `
`; -exports[`Picker format by locale dateTime 1`] = `
`; +exports[`Picker format by locale dateTime 1`] = `
`; -exports[`Picker format by locale month 1`] = `
`; +exports[`Picker format by locale month 1`] = `
`; exports[`Picker format by locale week 1`] = ``; diff --git a/components/date-picker/createPicker.js b/components/date-picker/createPicker.js index 40d9e37b0..e5018bfea 100644 --- a/components/date-picker/createPicker.js +++ b/components/date-picker/createPicker.js @@ -3,7 +3,8 @@ import omit from 'lodash/omit'; import MonthCalendar from '../vc-calendar/src/MonthCalendar'; import VcDatePicker from '../vc-calendar/src/Picker'; import classNames from 'classnames'; -import Icon from '../icon'; +import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled'; +import CalendarOutlined from '@ant-design/icons-vue/CalendarOutlined'; import { ConfigConsumerProps } from '../config-provider'; import interopDefault from '../_util/interopDefault'; import BaseMixin from '../_util/BaseMixin'; @@ -202,12 +203,7 @@ export default function createPicker(TheCalendar, props) { const clearIcon = !props.disabled && props.allowClear && value ? ( - + ) : null; const inputIcon = (suffixIcon && @@ -217,7 +213,7 @@ export default function createPicker(TheCalendar, props) { }) ) : ( {suffixIcon} - ))) || ; + ))) || ; const input = ({ value: inputValue }) => (