From a756753d12946a9607e2c3c9279aeb07a56b3687 Mon Sep 17 00:00:00 2001 From: xiemx Date: Tue, 17 Dec 2019 14:18:26 +0800 Subject: [PATCH] feat: add `prefixClass` prop (#401) --- src/calendar/calendar-panel.vue | 41 +++++++------ src/calendar/calendar-range.js | 10 +++- src/calendar/table-date.vue | 15 +++-- src/calendar/table-month.vue | 5 +- src/calendar/table-year.vue | 7 ++- src/date-picker.vue | 43 ++++++++----- src/datetime/datetime-panel.js | 10 +++- src/datetime/datetime-range.js | 10 +++- src/popup.js | 15 +++-- src/scrollbar/scrollbar-vertical.vue | 13 ++-- src/style/animation.scss | 10 ++-- src/style/btn.scss | 4 +- src/style/icon.scss | 24 ++++---- src/style/index.scss | 90 ++++++++++++++-------------- src/style/scrollbar.scss | 12 ++-- src/style/var.scss | 2 + src/time/list-columns.vue | 21 ++++--- src/time/list-options.vue | 6 +- src/time/time-panel.vue | 11 ++-- src/time/time-range.js | 10 +++- 20 files changed, 229 insertions(+), 130 deletions(-) diff --git a/src/calendar/calendar-panel.vue b/src/calendar/calendar-panel.vue index 2bfac77..05c4148 100644 --- a/src/calendar/calendar-panel.vue +++ b/src/calendar/calendar-panel.vue @@ -1,54 +1,54 @@ -
+
getLocaleFieldValue, }, + prefixClass: { + default: 'mx', + }, }, props: { value: {}, @@ -356,7 +361,7 @@ export default { const time = v.getTime(); return time >= start && time <= end; }); - return active ? 'mx-active-week' : ''; + return active ? `${this.prefixClass}-active-week` : ''; }, }, }; diff --git a/src/calendar/calendar-range.js b/src/calendar/calendar-range.js index 403f5c6..059b61b 100644 --- a/src/calendar/calendar-range.js +++ b/src/calendar/calendar-range.js @@ -5,6 +5,11 @@ import { getValidDate, isValidDate, isValidRangeDate } from '../util/date'; export default { name: 'CalendarRange', components: { CalendarPanel }, + inject: { + prefixClass: { + default: 'mx', + }, + }, props: { ...CalendarPanel.props, }, @@ -124,6 +129,9 @@ export default { }; return ; }); - return
{calendarRange}
; + + const { prefixClass } = this; + + return
{calendarRange}
; }, }; diff --git a/src/calendar/table-date.vue b/src/calendar/table-date.vue index 0990ed1..fa537cf 100644 --- a/src/calendar/table-date.vue +++ b/src/calendar/table-date.vue @@ -1,14 +1,18 @@