From 0ce5cf411fc0d27f45ec9a01374428a42e82e965 Mon Sep 17 00:00:00 2001 From: danranVm Date: Sat, 3 Jun 2023 10:21:56 +0800 Subject: [PATCH] fix(comp:config): the weekStartsOn does not work in the enUS locale (#1570) --- packages/components/config/src/dateConfig.ts | 2 +- packages/components/dropdown/demo/Basic.vue | 8 ++++++-- packages/site/src/iduxInstall.ts | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/components/config/src/dateConfig.ts b/packages/components/config/src/dateConfig.ts index 05e2a67ad..0e63a6a2f 100644 --- a/packages/components/config/src/dateConfig.ts +++ b/packages/components/config/src/dateConfig.ts @@ -106,7 +106,7 @@ function createDefaultDateConfig(): DateConfig { const parse = (dateString: string, format: string) => parseDate(dateString, format, now(), { locale: locale.date }) return { now, - weekStartsOn: () => locale.date.options?.weekStartsOn || 1, + weekStartsOn: () => locale.date.options?.weekStartsOn ?? 1, get: (date, type) => { switch (type) { case 'year': diff --git a/packages/components/dropdown/demo/Basic.vue b/packages/components/dropdown/demo/Basic.vue index a753ae524..74e2917eb 100644 --- a/packages/components/dropdown/demo/Basic.vue +++ b/packages/components/dropdown/demo/Basic.vue @@ -1,6 +1,6 @@