From 46e7d070a297fac1d9bf0a8cf2656484dd74f59c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail>
Date: 星期五, 05 五月 2023 11:06:32 +0800
Subject: [PATCH] 恢复翻页/切换路由滚动功能
---
src/layout/components/TagsView/ScrollPane.vue | 2
src/layout/index.vue | 38 ++++++++-----------
src/layout/components/AppMain.vue | 22 +++++++++++
src/layout/components/TagsView/index.vue | 2
4 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 463224d..8a73232 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -56,3 +56,25 @@
}
}
</style>
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+ .fixed-header {
+ padding-right: 6px;
+ }
+}
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #c0c0c0;
+ border-radius: 3px;
+}
+</style>
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index e4624dc..64d9fdb 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -96,7 +96,7 @@
bottom: 0px;
}
:deep(.el-scrollbar__wrap) {
- height: 49px;
+ height: 39px;
}
}
</style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 43b122f..cbf0a84 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -246,7 +246,7 @@
position: relative;
cursor: pointer;
height: 26px;
- line-height: 26px;
+ line-height: 23px;
border: 1px solid #d8dce5;
color: #495060;
background: #fff;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d49de04..5c01f90 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,16 +1,22 @@
<template>
<div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
- <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+ <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
<side-bar v-if="!sidebar.hide" class="sidebar-container" />
<div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
- <el-scrollbar>
+ <!-- <el-scrollbar>
<div :class="{ 'fixed-header': fixedHeader }">
- <navbar ref="navbarRef" @setLayout="setLayout" />
- <tags-view v-if="needTagsView" />
+ <navbar ref="navbarRef" @setLayout="setLayout" />
+ <tags-view v-if="needTagsView" />
</div>
<app-main />
<settings ref="settingRef" />
- </el-scrollbar>
+ </el-scrollbar> -->
+ <div :class="{ 'fixed-header': fixedHeader }">
+ <navbar ref="navbarRef" @setLayout="setLayout" />
+ <tags-view v-if="needTagsView" />
+ </div>
+ <app-main />
+ <settings ref="settingRef" />
</div>
</div>
</template>
@@ -54,17 +60,17 @@
const settingRef = ref(Settings);
onMounted(() => {
- nextTick(() => {
- navbarRef.value.initTenantList();
- })
+ nextTick(() => {
+ navbarRef.value.initTenantList();
+ })
})
const handleClickOutside = () => {
- useAppStore().closeSideBar({ withoutAnimation: false })
+ useAppStore().closeSideBar({ withoutAnimation: false })
}
const setLayout = () => {
- settingRef.value.openSetting();
+ settingRef.value.openSetting();
}
</script>
@@ -77,18 +83,6 @@
position: relative;
height: 100%;
width: 100%;
-
- .el-scrollbar {
- height: 100%;
- }
-
- :deep(.el-scrollbar__bar).is-vertical {
- z-index: 10;
- }
-
- :deep(.el-scrollbar__wrap) {
- overflow-x: hidden;
- }
&.mobile.openSidebar {
position: fixed;
--
Gitblit v1.9.3