Hotfixy; dodano przyciski powrotu do dla wszystkich widoków

This commit is contained in:
2022-05-28 01:03:51 +02:00
parent 9345697d07
commit 0b5b0f5178
7 changed files with 54 additions and 9 deletions
@@ -258,13 +258,15 @@ export default defineComponent({
handleScroll() {
this.showReturnButton = window.scrollY > window.innerHeight;
console.log(window.scrollY > window.innerHeight);
const element = this.$refs.scrollElement as HTMLElement;
if (
element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
this.scrollDataLoaded &&
!this.scrollNoMoreData &&
window.scrollY > window.innerHeight
this.historyDataStatus.status == DataStatus.Loaded
)
this.addHistoryData();
},
@@ -297,7 +297,7 @@ export default defineComponent({
element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
this.scrollDataLoaded &&
!this.scrollNoMoreData &&
window.scrollY > window.innerHeight
this.historyDataStatus.status == DataStatus.Loaded
)
this.addHistoryData();
},
+6 -1
View File
@@ -1,5 +1,9 @@
<template>
<section class="station_table">
<button class="return-btn" @click="scrollToTop" v-if="showReturnButton">
<img :src="icons.arrow" alt="return arrow" />
</button>
<div class="table_wrapper">
<table>
<thead>
@@ -231,6 +235,7 @@
import styleMixin from '@/mixins/styleMixin';
import dateMixin from '@/mixins/dateMixin';
import stationInfoMixin from '@/mixins/stationInfoMixin';
import returnBtnMixin from '@/mixins/returnBtnMixin';
import { DataStatus } from '@/scripts/enums/DataStatus';
import { computed, ComputedRef, defineComponent } from '@vue/runtime-core';
@@ -255,7 +260,7 @@ export default defineComponent({
changeSorter: { type: Function, required: true },
},
mixins: [styleMixin, dateMixin, stationInfoMixin],
mixins: [styleMixin, dateMixin, stationInfoMixin, returnBtnMixin],
data: () => ({
likeIcon: require('@/assets/icon-like.svg'),
+10 -3
View File
@@ -1,5 +1,9 @@
<template>
<div class="train-table" @keydown.esc="closeTimetable" v-click-outside="closeTimetable">
<button class="return-btn" @click="scrollToTop" v-if="showReturnButton">
<img :src="icons.arrowAsc" alt="return arrow" />
</button>
<transition name="anim" mode="out-in">
<div :key="trainsDataStatus">
<!-- <div class="traffic-warning" v-if="data.">
@@ -45,6 +49,7 @@ import TrainInfo from '@/components/TrainsView/TrainInfo.vue';
import { DataStatus } from '@/scripts/enums/DataStatus';
import { GETTERS } from '@/constants/storeConstants';
import returnBtnMixin from '@/mixins/returnBtnMixin';
export default defineComponent({
components: {
@@ -52,6 +57,8 @@ export default defineComponent({
TrainInfo,
},
mixins: [returnBtnMixin],
props: {
trains: {
type: Array as () => Train[],
@@ -107,9 +114,9 @@ export default defineComponent({
this.searchedDriver = query.driverName.toString();
this.searchedTrain = query.trainNo.toString();
setTimeout(() => {
this.chosenTrainId = query.driverName + <string>query.trainNo;
}, 20);
setTimeout(() => {
this.chosenTrainId = query.driverName + <string>query.trainNo;
}, 20);
}
},