From 84cccc52972beceae5d1dc97c00440889f607bee Mon Sep 17 00:00:00 2001 From: MrXhh <2791341417@qq.com> Date: Mon, 11 Jul 2022 16:27:43 +0800 Subject: [PATCH] date-picker: fix you want to add a validity date selector. (#21477) --- packages/date-picker/src/picker.vue | 7 +++++++ src/locale/lang/zh-CN.js | 1 + 2 files changed, 8 insertions(+) diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 802e48c7b..484a5b9d0 100644 --- a/packages/date-picker/src/picker.vue +++ b/packages/date-picker/src/picker.vue @@ -91,6 +91,7 @@ import Popper from 'element-ui/src/utils/vue-popper'; import Emitter from 'element-ui/src/mixins/emitter'; import ElInput from 'element-ui/packages/input'; import merge from 'element-ui/src/utils/merge'; +import { t } from 'element-ui/src/locale'; const NewPopper = { props: { @@ -258,6 +259,9 @@ const TYPE_VALUE_RESOLVER_MAP = { } } }; + +const S_LONG_TERM = new Date(9999, 11, 31).toDateString(); + const PLACEMENT_MAP = { left: 'bottom-start', center: 'bottom', @@ -276,6 +280,9 @@ const parseAsFormatAndType = (value, customFormat, type, rangeSeparator = '-') = const formatAsFormatAndType = (value, customFormat, type) => { if (!value) return null; + + if (value.toDateString() === S_LONG_TERM) return t('el.datepicker.longTerm'); + const formatter = ( TYPE_VALUE_RESOLVER_MAP[type] || TYPE_VALUE_RESOLVER_MAP['default'] diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index d0f70e92a..eba86d494 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -7,6 +7,7 @@ export default { datepicker: { now: '此刻', today: '今天', + longTerm: '长期', cancel: '取消', clear: '清空', confirm: '确定',