From 61d1a576417ed91819d09f748ebfdfcde2b4f490 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 20 Jun 2023 16:22:03 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=20=D0=BB=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/Calendar/BaseCalendar.vue | 24 +++- .../base/Calendar/CalendarDates.vue | 7 +- .../base/Calendar/CalendarMonths.vue | 31 +----- .../base/Calendar/CalendarYears.vue | 104 ++++++++++++++++-- .../newCalendar/components/CalendarHeader.vue | 2 +- 5 files changed, 122 insertions(+), 46 deletions(-) diff --git a/src/components/base/Calendar/BaseCalendar.vue b/src/components/base/Calendar/BaseCalendar.vue index 38a4e1d..43da3ce 100644 --- a/src/components/base/Calendar/BaseCalendar.vue +++ b/src/components/base/Calendar/BaseCalendar.vue @@ -5,9 +5,12 @@ v-model:internal-date="internalDate", v-model:external-date="externalDate", :range="range", + :start-year="startYear", + :end-year="endYear", :range-count="rangeCount", :next-form="nextForm", - :previous-form="previousForm" + :previous-form="previousForm", + :internal-month="internalMonth", ) .footer.flex.justify-end.items-center.px-5.py-3 q-btn( @@ -33,14 +36,23 @@ - + diff --git a/src/components/base/Calendar/CalendarYears.vue b/src/components/base/Calendar/CalendarYears.vue index 5a6afae..d2fea67 100644 --- a/src/components/base/Calendar/CalendarYears.vue +++ b/src/components/base/Calendar/CalendarYears.vue @@ -1,17 +1,107 @@ - + diff --git a/src/pages/newCalendar/components/CalendarHeader.vue b/src/pages/newCalendar/components/CalendarHeader.vue index b58a25a..d81579d 100644 --- a/src/pages/newCalendar/components/CalendarHeader.vue +++ b/src/pages/newCalendar/components/CalendarHeader.vue @@ -46,7 +46,7 @@ range, :range-count="7", :save="saveNewDate", - :cancel="cancelDateChanges" + :cancel="cancelDateChanges", ) q-btn( color="secondary",