Merge pull request #135 from dderbentsov/UC-47
WIP Добавила отступ на странице, отступы скролла
This commit is contained in:
@@ -70,7 +70,7 @@ export default {
|
|||||||
showModal: false,
|
showModal: false,
|
||||||
timeInformation: {
|
timeInformation: {
|
||||||
dayStartTime: "08:00",
|
dayStartTime: "08:00",
|
||||||
dayEndTime: "24:00",
|
dayEndTime: "20:00",
|
||||||
},
|
},
|
||||||
eventsData: [],
|
eventsData: [],
|
||||||
employeesData: [],
|
employeesData: [],
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<template lang="pug">
|
<template lang="pug">
|
||||||
.schedule.ml-2(
|
.schedule.mx-2.pb-22px(
|
||||||
|
ref="schedule"
|
||||||
:style="scheduleWidth"
|
:style="scheduleWidth"
|
||||||
)
|
)
|
||||||
calendar-header(
|
calendar-header(
|
||||||
@@ -9,7 +10,10 @@
|
|||||||
@next-date="nextDate"
|
@next-date="nextDate"
|
||||||
@selected-layout="selectedLayout"
|
@selected-layout="selectedLayout"
|
||||||
)
|
)
|
||||||
.schedule-body(@scroll="changeScrollingState", ref="scheduleBody")
|
.schedule-body(
|
||||||
|
@scroll="changeScrollingState"
|
||||||
|
ref="scheduleBody"
|
||||||
|
)
|
||||||
.hiding-container.fixed(v-if="isScrolling")
|
.hiding-container.fixed(v-if="isScrolling")
|
||||||
.column-wrapper.flex.ml-20(:style="columnWrapperWidth")
|
.column-wrapper.flex.ml-20(:style="columnWrapperWidth")
|
||||||
calendar-column(
|
calendar-column(
|
||||||
@@ -324,6 +328,17 @@ export default {
|
|||||||
transmitDeleteEvent(eventData) {
|
transmitDeleteEvent(eventData) {
|
||||||
this.$emit("delete-event", eventData);
|
this.$emit("delete-event", eventData);
|
||||||
},
|
},
|
||||||
|
bodyScroll() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
let presenceScroll =
|
||||||
|
this.$refs["scheduleBody"].scrollHeight !==
|
||||||
|
this.$refs["scheduleBody"].clientHeight;
|
||||||
|
if (presenceScroll) {
|
||||||
|
this.$refs["scheduleBody"].classList.add("pr-10px");
|
||||||
|
this.$refs["schedule"].classList.add("pr-10px");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
currentTime() {
|
currentTime() {
|
||||||
@@ -357,6 +372,7 @@ export default {
|
|||||||
this.timeCoilInitialization();
|
this.timeCoilInitialization();
|
||||||
this.startTimer();
|
this.startTimer();
|
||||||
this.showCuttentTime();
|
this.showCuttentTime();
|
||||||
|
this.bodyScroll();
|
||||||
},
|
},
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
this.stopTimer();
|
this.stopTimer();
|
||||||
@@ -370,7 +386,7 @@ export default {
|
|||||||
position: relative
|
position: relative
|
||||||
border-top-left-radius: 4px
|
border-top-left-radius: 4px
|
||||||
background-color: var(--default-white)
|
background-color: var(--default-white)
|
||||||
width: calc(100% - (var(--sidebar-width) + 8px))
|
width: calc(100% - (var(--sidebar-width) + 16px))
|
||||||
height: calc(100vh - 56px - 8px)
|
height: calc(100vh - 56px - 8px)
|
||||||
|
|
||||||
.time-line-indicator
|
.time-line-indicator
|
||||||
@@ -398,16 +414,25 @@ export default {
|
|||||||
|
|
||||||
.schedule-body
|
.schedule-body
|
||||||
width: 100%
|
width: 100%
|
||||||
height: calc(100vh - 56px - 8px - 56px)
|
height: calc(100vh - 56px * 2 - 8px - 22px)
|
||||||
overflow-y: auto
|
overflow-y: auto
|
||||||
overflow-x: auto
|
overflow-x: auto
|
||||||
&::-webkit-scrollbar
|
&::-webkit-scrollbar
|
||||||
width: 8px
|
width: 8px
|
||||||
height: 8px
|
height: 8px
|
||||||
&::-webkit-scrollbar-track
|
&::-webkit-scrollbar-track:horizontal
|
||||||
background-color: var(--bg-ligth-blue-color)
|
margin: 0 24px 0 104px
|
||||||
|
pddding-bottom: 22px
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
&::-webkit-scrollbar-thumb
|
background-color: var(--bg-ligth-blue-color)
|
||||||
|
&::-webkit-scrollbar-thumb:horizontal
|
||||||
|
background-color: var(--btn-blue-color-2)
|
||||||
|
border-radius: 4px
|
||||||
|
&::-webkit-scrollbar-track:vertical
|
||||||
|
margin: 56px 0 24px 0
|
||||||
|
border-radius: 4px
|
||||||
|
background-color: var(--bg-ligth-blue-color)
|
||||||
|
&::-webkit-scrollbar-thumb:vertical
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
background-color: var(--btn-blue-color-2)
|
background-color: var(--btn-blue-color-2)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user