From 98a8cd8c228b1a133d41210800a8b6a03d072c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=B1=EC=97=BD?= Date: Mon, 29 Jul 2019 10:40:17 +0900 Subject: [PATCH 1/3] Calendar : Fix weekdays i18n issue --- packages/calendar/src/date-table.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/calendar/src/date-table.vue b/packages/calendar/src/date-table.vue index 14f1d9c763..160c050c02 100644 --- a/packages/calendar/src/date-table.vue +++ b/packages/calendar/src/date-table.vue @@ -2,7 +2,6 @@ import fecha from 'element-ui/src/utils/date'; import { range as rangeArr, getFirstDayOfMonth, getPrevMonthLastDays, getMonthDays, getI18nSettings, validateRangeInOneMonth } from 'element-ui/src/utils/date-util'; -const WEEK_DAYS = getI18nSettings().dayNames; export default { props: { selectedDay: String, // formated date yyyy-MM-dd @@ -21,6 +20,12 @@ export default { inject: ['elCalendar'], + data() { + return { + WEEK_DAYS: getI18nSettings().dayNames + }; + }, + methods: { toNestedArr(days) { return rangeArr(days.length / 7).map((_, index) => { @@ -143,9 +148,9 @@ export default { weekDays() { const start = this.firstDayOfWeek; if (typeof start !== 'number' || start === 0) { - return WEEK_DAYS.slice(); + return this.WEEK_DAYS.slice(); } else { - return WEEK_DAYS.slice(start).concat(WEEK_DAYS.slice(0, start)); + return this.WEEK_DAYS.slice(start).concat(this.WEEK_DAYS.slice(0, start)); } } }, From e1117cb351553796268541fb4f84ed9796aabe8a Mon Sep 17 00:00:00 2001 From: SeongYeob Jeong Date: Tue, 6 Aug 2019 10:57:17 +0900 Subject: [PATCH 2/3] Calendar : Fix weekdays i18n issue destructing WEEK_DAYS assignment --- packages/calendar/src/date-table.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/calendar/src/date-table.vue b/packages/calendar/src/date-table.vue index 160c050c02..6641c1f077 100644 --- a/packages/calendar/src/date-table.vue +++ b/packages/calendar/src/date-table.vue @@ -147,10 +147,12 @@ export default { weekDays() { const start = this.firstDayOfWeek; + const { WEEK_DAYS } = this; + if (typeof start !== 'number' || start === 0) { - return this.WEEK_DAYS.slice(); + return WEEK_DAYS.slice(); } else { - return this.WEEK_DAYS.slice(start).concat(this.WEEK_DAYS.slice(0, start)); + return WEEK_DAYS.slice(start).concat(WEEK_DAYS.slice(0, start)); } } }, From fb0acf2bd8c41abf49043a0417cf9f8b4022ff0d Mon Sep 17 00:00:00 2001 From: SeongYeob Jeong Date: Tue, 6 Aug 2019 11:36:37 +0900 Subject: [PATCH 3/3] Calendar : Fix weekdays i18n issue --- packages/calendar/src/date-table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/calendar/src/date-table.vue b/packages/calendar/src/date-table.vue index 6641c1f077..6e78cf2671 100644 --- a/packages/calendar/src/date-table.vue +++ b/packages/calendar/src/date-table.vue @@ -148,7 +148,7 @@ export default { weekDays() { const start = this.firstDayOfWeek; const { WEEK_DAYS } = this; - + if (typeof start !== 'number' || start === 0) { return WEEK_DAYS.slice(); } else {