From feae1540d0f0f1dbc7625dd877d8bf59c2c9a467 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 9 Nov 2022 14:06:52 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=A2=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ClientDetailInfoSection.vue | 77 +++++++++++++++---- .../clients/components/ClientsTableRow.vue | 6 +- .../clients/components/TableAddingNewDoc.vue | 2 +- 3 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index a7c78cf..3d87d5e 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -1,29 +1,73 @@ @@ -66,18 +110,19 @@ export default { copyValue(text) { navigator.clipboard.writeText(text); }, - openInterfaceChange() { - this.isOpenChange = !this.isOpenChange; - }, changeClientData() { - this.isChange = true; + if (!this.isOpenAddingWrap) { + this.isChange = true; + } }, saveChange() { this.isOpenChange = false; this.isChange = false; }, openAddingWrap() { - this.isOpenAddingWrap = true; + if (!this.isChange) { + this.isOpenAddingWrap = !this.isOpenAddingWrap; + } }, addNewDoc(e) { this.docData = [...this.docData, ...e.target.files]; diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index 93615cc..8ce2e14 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -1,6 +1,6 @@ From 202db1d200c6c3f17a290958ee8bceb140c638e6 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 9 Nov 2022 17:35:31 +0300 Subject: [PATCH 2/9] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D1=83=D1=88=D0=BA=D1=83=20=D0=B2=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BF=D0=BE=D0=B4=20=D1=85=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calendar/components/CalendarSchedule.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index b857fac..d563513 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -9,7 +9,8 @@ @next-date="nextDate" @selected-layout="selectedLayout" ) - .schedule-body + .schedule-body(@scroll="changeScrollingState") + .hiding-container.fixed(v-if="isScrolling") .column-wrapper.flex.ml-20(:style="columnWrapperWidth") calendar-column( v-for="(owner, index) in filteredOwners" @@ -115,6 +116,7 @@ export default { columnHeaderHeight: 48, defaultColumnWidth: 470, selectedEvent: {}, + isScrolling: false, }; }, computed: { @@ -315,6 +317,9 @@ export default { transmitUpdateEvents() { this.$emit("update-events"); }, + changeScrollingState(e) { + this.isScrolling = e.target.scrollTop !== 0; + }, }, watch: { currentTime() { @@ -389,4 +394,11 @@ export default { height: calc(100vh - 56px - 8px - 56px) overflow-y: auto overflow-x: auto + +.hiding-container + width: 80px + height: 48px + top: calc(56px * 2 + 8px) + background-color: var(--default-white) + z-index: 6 From 9f9007e16aab52a92005f33c2157b9dadea4c6bb Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 9 Nov 2022 14:59:31 +0300 Subject: [PATCH 3/9] =?UTF-8?q?WIP=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=BE=D0=BD?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D1=8B=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TheHeader.vue | 2 +- src/pages/calendar/components/CalendarFormAddEvent.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue index 99e567f..8d4f529 100644 --- a/src/components/TheHeader.vue +++ b/src/components/TheHeader.vue @@ -1,6 +1,6 @@