mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-04-12 14:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(date-picker): use local week and local year as default weekFormat (#6234)

Browse Source 
Co-authored-by: 07akioni <07akioni2@gmail.com>
This commit is contained in:
JianJroh 2024-08-11 21:41:06 +08:00 committed by GitHub
parent b60bd7fad6
commit b2eb69e534
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.en-US.md
View File

@ -7,6 +7,7 @@
### Breaking Changes
- Fix `n-config-provider` inherit the class prefix from it's parent by default, closes [#5970](https://github.com/tusen-ai/naive-ui/issues/5970).
- Fix `n-date-picker` default `weekFormat` that year and week standards are different and use local week and local year
### Fixes

1
CHANGELOG.zh-CN.md
View File

@ -7,6 +7,7 @@
### Breaking Changes
- 修复 `n-config-provider` 默认继承父级的类前缀 `cls-prefix`, 关闭 [#5970](https://github.com/tusen-ai/naive-ui/issues/5970)
- 修复 `n-date-picker` 默认 `weekFormat` 中 year 和 week 标准不同，使用 local year 和 local week
### Fixes

2
src/date-picker/demos/enUS/index.demo-entry.md
View File

@ -178,7 +178,7 @@ panel.vue
| --- | --- | --- | --- | --- |
| actions | `Array<'clear' \| 'now'> \| null` | `['clear', 'now']` | Operations supported for the `week` type date picker. | 2.37.0 |
| default-calendar-start-time | `number` | `undefined` | Default panel calendar start month timestamp. | 2.38.1 |
| format | `string` | `'yyyy-w'` for en-US, Locale specific. | Format of the input. For detail please see [format](https://date-fns.org/v2.23.0/docs/format). | 2.37.0 |
| format | `string` | `'YYYY-w'` for en-US, Locale specific. | Format of the input. For detail please see [format](https://date-fns.org/v2.23.0/docs/format). | 2.37.0 |
| placeholder | `string` | `'Select Week'` for en-US, Locale specific. | Placeholder. | 2.37.0 |
| on-update:formatted-value | `(value: string \| null, timestampValue: number \| null) => void` | `undefined` | Formatted value changed callback. | 2.37.0 |
| on-update:value | `(value: number \| null, formattedValue: string \| null) => void` | `undefined` | Value changed callback. | 2.37.0 |

2
src/date-picker/demos/zhCN/index.demo-entry.md
View File

@ -178,7 +178,7 @@ form-debug.vue
| --- | --- | --- | --- | --- |
| actions | `Array<'clear' \| 'now'> \| null` | `['clear', 'now']` | Week 类型的 Date Picker 中支持的操作 | 2.37.0 |
| default-calendar-start-time | `number` | `undefined` | 面板日历默认开始的月份时间戳 | 2.38.1 |
| format | `string` | 中文为 `'yyyy-w'`，随语言变化 | 时间格式化字符串，详情见 [format](https://date-fns.org/v2.23.0/docs/format) | 2.37.0 |
| format | `string` | 中文为 `'YYYY-w'`，随语言变化 | 时间格式化字符串，详情见 [format](https://date-fns.org/v2.23.0/docs/format) | 2.37.0 |
| placeholder | `string` | 中文为 `'选择周'`，随语言变化 | 没有值时的占位信息 | 2.37.0 |
| on-update:formatted-value | `(value: string \| null, timestampValue: number \| null) => void` | `undefined` | 受控数据更新时触发的回调函数 | 2.37.0 |
| on-update:value | `(value: number \| null, formattedValue: string \| null) => void` | `undefined` | 受控数据更新时触发的回调函数 | 2.37.0 |

3
src/date-picker/src/DatePicker.tsx
View File

@ -99,7 +99,8 @@ export default defineComponent({
const mergedShowRef = useMergedState(controlledShowRef, uncontrolledShowRef)
const dateFnsOptionsRef = computed(() => {
return {
locale: dateLocaleRef.value.locale
locale: dateLocaleRef.value.locale,
useAdditionalWeekYearTokens: true
}
})

2
src/locales/common/arDZ.ts
View File

@ -31,7 +31,7 @@ const arDZ: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'مسح',
now: 'الآن',
confirm: 'تأكيد',

2
src/locales/common/azAZ.ts
View File

@ -31,7 +31,7 @@ const azAZ: NLocale = {
dateFormat: 'dd MMMM yyyy',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'yyyy-w',
weekFormat: 'YYYY-w',
clear: 'Təmizlə',
now: 'İndi',
confirm: 'Təsdiqlə',

2
src/locales/common/csCZ.ts
View File

@ -31,7 +31,7 @@ const csCZ: NLocale = {
dateFormat: 'd-M-yyyy',
dateTimeFormat: 'd-M-yyyy HH:mm:ss',
quarterFormat: 'qqq-yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Vyčistit',
now: 'Teď',
confirm: 'Potvrdit',

2
src/locales/common/deDE.ts
View File

@ -31,7 +31,7 @@ const deDE: NLocale = {
dateFormat: 'dd.MM.yyyy',
dateTimeFormat: 'dd.MM.yyyy HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Löschen',
now: 'Jetzt',
confirm: 'Bestätigen',

2
src/locales/common/enGB.ts
View File

@ -31,7 +31,7 @@ const enGB: NLocale = {
dateFormat: 'yyyy/MM/dd',
dateTimeFormat: 'yyyy/MM/dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Clear',
now: 'Now',
confirm: 'Confirm',

2
src/locales/common/enUS.ts
View File

@ -29,7 +29,7 @@ const enUS = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Clear',
now: 'Now',
confirm: 'Confirm',

2
src/locales/common/eo.ts
View File

@ -31,7 +31,7 @@ const eo: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Malplenigi',
now: 'Nun',
confirm: 'Konfirmi',

2
src/locales/common/esAR.ts
View File

@ -31,7 +31,7 @@ const esAR: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Borrar',
now: 'Ahora',
confirm: 'Confirmar',

2
src/locales/common/etEE.ts
View File

@ -31,7 +31,7 @@ const etEE: NLocale = {
dateFormat: 'dd.MM.yyyy',
dateTimeFormat: 'dd.MM.yyyy HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Tühjenda',
now: 'Nüüd',
confirm: 'Kinnita',

2
src/locales/common/faIR.ts
View File

@ -31,7 +31,7 @@ const faIR: NLocale = {
dateFormat: 'yyyy/MM/dd',
dateTimeFormat: 'yyyy/MM/dd HH:mm:ss',
quarterFormat: 'سه ماهه yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'پاک کردن',
now: 'اکنون',
confirm: 'تأیید',

2
src/locales/common/frFR.ts
View File

@ -31,7 +31,7 @@ const frFR: NLocale = {
dateFormat: 'dd/MM/yyyy',
dateTimeFormat: 'dd/MM/yyyy HH:mm:ss',
quarterFormat: 'qqq yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Effacer',
now: 'Maintenant',
confirm: 'Confirmer',

2
src/locales/common/idID.ts
View File

@ -31,7 +31,7 @@ const idID: NLocale = {
dateFormat: 'dd-MM-yyyy',
dateTimeFormat: 'dd-MM-yyyy HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Bersihkan',
now: 'Sekarang',
confirm: 'Setuju',

2
src/locales/common/itIT.ts
View File

@ -31,7 +31,7 @@ const itIT: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Cancella',
now: 'Adesso',
confirm: 'Conferma',

2
src/locales/common/jaJP.ts
View File

@ -31,7 +31,7 @@ const jaJP: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'クリア',
now: '現在',
confirm: 'OK',

2
src/locales/common/koKR.ts
View File

@ -31,7 +31,7 @@ const koKR: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: '지우기',
now: '현재',
confirm: '확인',

2
src/locales/common/nbNO.ts
View File

@ -31,7 +31,7 @@ const nbNO: NLocale = {
dateFormat: 'dd.MM.yyyy',
dateTimeFormat: 'dd.MM.yyyy HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Tøm',
now: 'Nå',
confirm: 'Bekreft',

2
src/locales/common/nlNL.ts
View File

@ -31,7 +31,7 @@ const nlNL: NLocale = {
dateFormat: 'dd/MM/yyyy',
dateTimeFormat: 'dd/MM/yyyy HH:mm:ss',
quarterFormat: 'qqq yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Wis',
now: 'Nu',
confirm: 'Bevestig',

2
src/locales/common/plPL.ts
View File

@ -31,7 +31,7 @@ const plPL: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Wyczyść',
now: 'Teraz',
confirm: 'Potwierdź',

2
src/locales/common/ptBR.ts
View File

@ -31,7 +31,7 @@ const ptBR: NLocale = {
dateFormat: 'dd/MM/yyyy',
dateTimeFormat: 'dd/MM/yyyy HH:mm:ss',
quarterFormat: 'yyyy/qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Limpar',
now: 'Agora',
confirm: 'Confirmar',

2
src/locales/common/ruRU.ts
View File

@ -31,7 +31,7 @@ const ruRu: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Очистить',
now: 'Сейчас',
confirm: 'Подтвердить',

2
src/locales/common/skSK.ts
View File

@ -31,7 +31,7 @@ const skSK: NLocale = {
dateFormat: 'd-M-yyyy',
dateTimeFormat: 'd-M-yyyy HH:mm:ss',
quarterFormat: 'qqq-yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Vyčistiť',
now: 'Teraz',
confirm: 'Potvrdiť',

2
src/locales/common/svSE.ts
View File

@ -31,7 +31,7 @@ const svSE: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Rensa',
now: 'Nu',
confirm: 'Bekräfta',

2
src/locales/common/thTH.ts
View File

@ -31,7 +31,7 @@ const thTH: NLocale = {
dateFormat: 'dd/MMMM/yyyy',
dateTimeFormat: 'dd/MMMM/yyyy HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'ล้าง',
now: 'วันนี้',
confirm: 'ยืนยัน',

2
src/locales/common/trTR.ts
View File

@ -31,7 +31,7 @@ const trTR: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Temizle',
now: 'Şimdi',
confirm: 'Onayla',

2
src/locales/common/ukUA.ts
View File

@ -31,7 +31,7 @@ const ukUA: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Стерти',
now: 'Зараз',
confirm: 'Підтвердити',

2
src/locales/common/uzUZ.ts
View File

@ -31,7 +31,7 @@ const uzUZ: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Tozalash',
now: 'Hozir',
confirm: 'Tasdiqlash',

2
src/locales/common/viVN.ts
View File

@ -31,7 +31,7 @@ const viVN: NLocale = {
dateFormat: 'dd-MM-yyyy',
dateTimeFormat: 'HH:mm:ss dd-MM-yyyy',
quarterFormat: 'qqq-yyyy',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: 'Xóa',
now: 'Hôm nay',
confirm: 'Xác nhận',

2
src/locales/common/zhCN.ts
View File

@ -31,7 +31,7 @@ const zhCN: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w周',
weekFormat: 'YYYY-w周',
clear: '清除',
now: '此刻',
confirm: '确认',

2
src/locales/common/zhTW.ts
View File

@ -31,7 +31,7 @@ const zhTW: NLocale = {
dateFormat: 'yyyy-MM-dd',
dateTimeFormat: 'yyyy-MM-dd HH:mm:ss',
quarterFormat: 'yyyy-qqq',
weekFormat: 'RRRR-w',
weekFormat: 'YYYY-w',
clear: '清除',
now: '現在',
confirm: '確定',