Skip to content

Commit 93c1d40

Browse files
committed
feat: datepicker add rangeQuarterPlaceholder
1 parent a7da435 commit 93c1d40

File tree

9 files changed

+73
-3
lines changed

9 files changed

+73
-3
lines changed

components/date-picker/generatePicker/interface.ts

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export type AdditionalPickerLocaleLangProps = {
4747
monthPlaceholder?: string;
4848
weekPlaceholder?: string;
4949
rangeYearPlaceholder?: [string, string];
50+
rangeQuarterPlaceholder?: [string, string];
5051
rangeMonthPlaceholder?: [string, string];
5152
rangeWeekPlaceholder?: [string, string];
5253
rangePlaceholder?: [string, string];

components/date-picker/locale/en_GB.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const locale: PickerLocale = {
1212
weekPlaceholder: 'Select week',
1313
rangePlaceholder: ['Start date', 'End date'],
1414
rangeYearPlaceholder: ['Start year', 'End year'],
15+
rangeQuarterPlaceholder: ['Start quarter', 'End quarter'],
1516
rangeMonthPlaceholder: ['Start month', 'End month'],
1617
rangeWeekPlaceholder: ['Start week', 'End week'],
1718
...CalendarLocale,

components/date-picker/locale/en_US.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const locale: PickerLocale = {
1212
weekPlaceholder: 'Select week',
1313
rangePlaceholder: ['Start date', 'End date'],
1414
rangeYearPlaceholder: ['Start year', 'End year'],
15+
rangeQuarterPlaceholder: ['Start quarter', 'End quarter'],
1516
rangeMonthPlaceholder: ['Start month', 'End month'],
1617
rangeWeekPlaceholder: ['Start week', 'End week'],
1718
...CalendarLocale,

components/date-picker/locale/zh_CN.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const locale: PickerLocale = {
1313
rangePlaceholder: ['开始日期', '结束日期'],
1414
rangeYearPlaceholder: ['开始年份', '结束年份'],
1515
rangeMonthPlaceholder: ['开始月份', '结束月份'],
16+
rangeQuarterPlaceholder: ['开始季度', '结束季度'],
1617
rangeWeekPlaceholder: ['开始周', '结束周'],
1718
...CalendarLocale,
1819
},

components/date-picker/locale/zh_TW.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const locale: PickerLocale = {
1313
rangePlaceholder: ['開始日期', '結束日期'],
1414
rangeYearPlaceholder: ['開始年份', '結束年份'],
1515
rangeMonthPlaceholder: ['開始月份', '結束月份'],
16+
rangeQuarterPlaceholder: ['開始季度', '結束季度'],
1617
rangeWeekPlaceholder: ['開始周', '結束周'],
1718
...CalendarLocale,
1819
},

components/vc-picker/RangePicker.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,9 @@ function RangerPicker<DateType>() {
993993
arrowLeft >
994994
panelDivRef.value.offsetWidth -
995995
arrowRef.value.offsetWidth -
996-
(direction === 'rtl' ? 0 : arrowRef.value.offsetLeft)
996+
(direction === 'rtl' || arrowRef.value.offsetLeft > arrowLeft
997+
? 0
998+
: arrowRef.value.offsetLeft)
997999
) {
9981000
panelLeft = arrowLeft;
9991001
}

components/vc-picker/generate/dayjs.ts

+62-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,70 @@ dayjs.extend((_o, c) => {
2828

2929
type IlocaleMapObject = Record<string, string>;
3030
const localeMap: IlocaleMapObject = {
31+
// ar_EG:
32+
// az_AZ:
33+
// bg_BG:
34+
bn_BD: 'bn-bd',
35+
by_BY: 'be',
36+
// ca_ES:
37+
// cs_CZ:
38+
// da_DK:
39+
// de_DE:
40+
// el_GR:
3141
en_GB: 'en-gb',
3242
en_US: 'en',
43+
// es_ES:
44+
// et_EE:
45+
// fa_IR:
46+
// fi_FI:
47+
fr_BE: 'fr', // todo: dayjs has no fr_BE locale, use fr at present
48+
fr_CA: 'fr-ca',
49+
// fr_FR:
50+
// ga_IE:
51+
// gl_ES:
52+
// he_IL:
53+
// hi_IN:
54+
// hr_HR:
55+
// hu_HU:
56+
hy_AM: 'hy-am',
57+
// id_ID:
58+
// is_IS:
59+
// it_IT:
60+
// ja_JP:
61+
// ka_GE:
62+
// kk_KZ:
63+
// km_KH:
64+
kmr_IQ: 'ku',
65+
// kn_IN:
66+
// ko_KR:
67+
// ku_IQ: // previous ku in antd
68+
// lt_LT:
69+
// lv_LV:
70+
// mk_MK:
71+
// ml_IN:
72+
// mn_MN:
73+
// ms_MY:
74+
// nb_NO:
75+
// ne_NP:
76+
nl_BE: 'nl-be',
77+
// nl_NL:
78+
// pl_PL:
79+
pt_BR: 'pt-br',
80+
// pt_PT:
81+
// ro_RO:
82+
// ru_RU:
83+
// sk_SK:
84+
// sl_SI:
85+
// sr_RS:
86+
// sv_SE:
87+
// ta_IN:
88+
// th_TH:
89+
// tr_TR:
90+
// uk_UA:
91+
// ur_PK:
92+
// vi_VN:
3393
zh_CN: 'zh-cn',
94+
zh_HK: 'zh-hk',
3495
zh_TW: 'zh-tw',
3596
};
3697

@@ -47,7 +108,7 @@ const parseNoMatchNotice = () => {
47108
const generateConfig: GenerateConfig<Dayjs> = {
48109
// get
49110
getNow: () => dayjs(),
50-
getFixedDate: string => dayjs(string, 'YYYY-MM-DD'),
111+
getFixedDate: string => dayjs(string, ['YYYY-M-DD', 'YYYY-MM-DD']),
51112
getEndDate: date => date.endOf('month'),
52113
getWeekDay: date => {
53114
const clone = date.locale('en');

components/vc-picker/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 2.6.4
1+
// 2.6.7
22
import type { PickerProps } from './Picker';
33
import Picker from './Picker';
44
import PickerPanel from './PickerPanel';

components/vc-picker/locale/pt_PT.ts

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ const locale: Locale = {
2727
nextDecade: 'Década seguinte',
2828
previousCentury: 'Século anterior',
2929
nextCentury: 'Século seguinte',
30+
shortWeekDays: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
31+
shortMonths: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
3032
};
3133

3234
export default locale;

0 commit comments

Comments
 (0)