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 @@ watch(()=> useSettingsStore().animationEnable, (val) => { } } + 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 @@ defineExpose({ bottom: 0px; } :deep(.el-scrollbar__wrap) { - height: 49px; + height: 39px; } } 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 @@ onMounted(() => { 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 @@ @@ -54,17 +60,17 @@ const navbarRef = ref(Navbar); 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(); } @@ -78,18 +84,6 @@ const setLayout = () => { 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; top: 0;