From 23bf8406845fafe46060b67105ccab4fffdabd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 1 Sep 2023 11:41:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0debuger=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20update=20=E4=BC=98=E5=8C=96=20TopNav=20?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=20fix=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui-vue3/package.json | 2 +- ruoyi-ui-vue3/src/components/TopNav/index.vue | 38 +++++++++++++++---- .../src/layout/components/Navbar.vue | 2 +- .../src/layout/components/TagsView/index.vue | 4 +- ruoyi-ui-vue3/src/settings.js | 2 +- .../src/views/system/user/profile/index.vue | 2 +- ruoyi-ui-vue3/vite/plugins/setup-extend.js | 4 +- ruoyi-ui/src/components/TopNav/index.vue | 20 ++++++---- .../src/views/system/user/profile/index.vue | 2 +- .../views/system/user/profile/userAvatar.vue | 5 --- 10 files changed, 51 insertions(+), 30 deletions(-) diff --git a/ruoyi-ui-vue3/package.json b/ruoyi-ui-vue3/package.json index b570f1c64..d6390b733 100644 --- a/ruoyi-ui-vue3/package.json +++ b/ruoyi-ui-vue3/package.json @@ -38,6 +38,6 @@ "vite": "3.2.3", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", - "vite-plugin-vue-setup-extend": "0.4.0" + "unplugin-vue-setup-extend-plus": "0.4.9" } } diff --git a/ruoyi-ui-vue3/src/components/TopNav/index.vue b/ruoyi-ui-vue3/src/components/TopNav/index.vue index 811cd9f1e..52b40ea13 100644 --- a/ruoyi-ui-vue3/src/components/TopNav/index.vue +++ b/ruoyi-ui-vue3/src/components/TopNav/index.vue @@ -6,10 +6,12 @@ :ellipsis="false" > @@ -19,10 +21,12 @@ - {{ item.meta.title }} + v-if="index >= visibleNumber"> + + {{ item.meta.title }} + @@ -189,4 +193,22 @@ onMounted(() => { padding: 0 5px !important; margin: 0 10px !important; } + +/* 背景色隐藏 */ +.topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover { + background-color: #ffffff !important; +} + +/* 图标右间距 */ +.topmenu-container .svg-icon { + margin-right: 4px; +} + +/* topmenu more arrow */ +.topmenu-container .el-sub-menu .el-sub-menu__icon-arrow { + position: static; + vertical-align: middle; + margin-left: 8px; + margin-top: 0px; +} diff --git a/ruoyi-ui-vue3/src/layout/components/Navbar.vue b/ruoyi-ui-vue3/src/layout/components/Navbar.vue index c46ebe24c..202282983 100644 --- a/ruoyi-ui-vue3/src/layout/components/Navbar.vue +++ b/ruoyi-ui-vue3/src/layout/components/Navbar.vue @@ -33,7 +33,7 @@ 个人中心 - + 布局设置 diff --git a/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue b/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue index 1f996234f..91138ad10 100644 --- a/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue +++ b/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue @@ -280,7 +280,7 @@ function handleScroll() { height: 8px; border-radius: 50%; position: relative; - margin-right: 2px; + margin-right: 5px; } } } @@ -335,4 +335,4 @@ function handleScroll() { } } } - \ No newline at end of file + diff --git a/ruoyi-ui-vue3/src/settings.js b/ruoyi-ui-vue3/src/settings.js index 10e1db414..08a010826 100644 --- a/ruoyi-ui-vue3/src/settings.js +++ b/ruoyi-ui-vue3/src/settings.js @@ -10,7 +10,7 @@ export default { /** * 是否系统布局配置 */ - showSettings: false, + showSettings: true, /** * 是否显示顶部导航 diff --git a/ruoyi-ui-vue3/src/views/system/user/profile/index.vue b/ruoyi-ui-vue3/src/views/system/user/profile/index.vue index 09e4c326a..006893ab2 100644 --- a/ruoyi-ui-vue3/src/views/system/user/profile/index.vue +++ b/ruoyi-ui-vue3/src/views/system/user/profile/index.vue @@ -10,7 +10,7 @@
- +
  • diff --git a/ruoyi-ui-vue3/vite/plugins/setup-extend.js b/ruoyi-ui-vue3/vite/plugins/setup-extend.js index a4980f300..ed8342e98 100644 --- a/ruoyi-ui-vue3/vite/plugins/setup-extend.js +++ b/ruoyi-ui-vue3/vite/plugins/setup-extend.js @@ -1,5 +1,5 @@ -import setupExtend from 'vite-plugin-vue-setup-extend' +import setupExtend from 'unplugin-vue-setup-extend-plus/vite' export default function createSetupExtend() { - return setupExtend() + return setupExtend({}) } diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index 9fb8dd81d..cbed27339 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -5,10 +5,12 @@ @select="handleSelect" > @@ -18,10 +20,12 @@ - {{ item.meta.title }} + v-if="index >= visibleNumber"> + + {{ item.meta.title }} + diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue index 2cc7c2f71..2520eb27f 100644 --- a/ruoyi-ui/src/views/system/user/profile/index.vue +++ b/ruoyi-ui/src/views/system/user/profile/index.vue @@ -8,7 +8,7 @@
- +
  • diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue index 18b23a4b7..bc2991e59 100644 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue @@ -61,11 +61,6 @@ import { debounce } from '@/utils' export default { components: { VueCropper }, - props: { - user: { - type: Object - } - }, data() { return { // 是否显示弹出层