From 4c4903e806c8818e320108cc3e5279d728061c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=87=AF=E9=BE=99?= <502431556@qq.com> Date: Mon, 29 Mar 2021 17:40:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../{AppMain.vue => AppMain/index.vue} | 0 .../layout}/components/Backtop/index.vue | 0 .../components/Breadcrumb/Breadcrumb.vue | 0 .../components/Breadcrumb/BreadcrumbItem.vue | 0 .../layout}/components/Breadcrumb/index.vue | 24 ++-- .../layout}/components/Hamburger/index.vue | 0 .../index/layout}/components/Logo/index.vue | 0 .../index/layout/components/MenuTab/index.vue | 125 ++++++++++++++++++ .../layout}/components/Screenfull/index.vue | 0 .../layout}/components/Setting/index.vue | 14 +- .../index/layout}/components/Sider/Item.vue | 0 .../layout}/components/Sider/SiderItem.vue | 17 ++- .../index/layout}/components/Sider/index.vue | 10 +- .../components/TagsView/ScrollPane.vue | 0 .../layout}/components/TagsView/index.vue | 0 .../layout}/components/UserInfo/index.vue | 0 src/pages/index/layout/modules/Classic.vue | 42 +++--- src/pages/index/layout/modules/LeftTop.vue | 32 +++-- src/pages/index/layout/modules/Top.vue | 20 +-- src/pages/index/layout/modules/style.less | 89 +++++++++++++ src/pages/index/store/modules/app.ts | 10 ++ src/pages/index/store/modules/permission.ts | 20 +++ src/styles/variables.less | 15 +++ src/styles/variables.less.d.ts | 1 + 25 files changed, 362 insertions(+), 59 deletions(-) rename src/pages/index/layout/components/{AppMain.vue => AppMain/index.vue} (100%) rename src/{ => pages/index/layout}/components/Backtop/index.vue (100%) rename src/{ => pages/index/layout}/components/Breadcrumb/Breadcrumb.vue (100%) rename src/{ => pages/index/layout}/components/Breadcrumb/BreadcrumbItem.vue (100%) rename src/{ => pages/index/layout}/components/Breadcrumb/index.vue (79%) rename src/{ => pages/index/layout}/components/Hamburger/index.vue (100%) rename src/{ => pages/index/layout}/components/Logo/index.vue (100%) create mode 100644 src/pages/index/layout/components/MenuTab/index.vue rename src/{ => pages/index/layout}/components/Screenfull/index.vue (100%) rename src/{ => pages/index/layout}/components/Setting/index.vue (93%) rename src/{ => pages/index/layout}/components/Sider/Item.vue (100%) rename src/{ => pages/index/layout}/components/Sider/SiderItem.vue (77%) rename src/{ => pages/index/layout}/components/Sider/index.vue (88%) rename src/{ => pages/index/layout}/components/TagsView/ScrollPane.vue (100%) rename src/{ => pages/index/layout}/components/TagsView/index.vue (100%) rename src/{ => pages/index/layout}/components/UserInfo/index.vue (100%) diff --git a/package.json b/package.json index e8df742..214f8c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "0.0.5", + "version": "0.0.6", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/pages/index/layout/components/AppMain.vue b/src/pages/index/layout/components/AppMain/index.vue similarity index 100% rename from src/pages/index/layout/components/AppMain.vue rename to src/pages/index/layout/components/AppMain/index.vue diff --git a/src/components/Backtop/index.vue b/src/pages/index/layout/components/Backtop/index.vue similarity index 100% rename from src/components/Backtop/index.vue rename to src/pages/index/layout/components/Backtop/index.vue diff --git a/src/components/Breadcrumb/Breadcrumb.vue b/src/pages/index/layout/components/Breadcrumb/Breadcrumb.vue similarity index 100% rename from src/components/Breadcrumb/Breadcrumb.vue rename to src/pages/index/layout/components/Breadcrumb/Breadcrumb.vue diff --git a/src/components/Breadcrumb/BreadcrumbItem.vue b/src/pages/index/layout/components/Breadcrumb/BreadcrumbItem.vue similarity index 100% rename from src/components/Breadcrumb/BreadcrumbItem.vue rename to src/pages/index/layout/components/Breadcrumb/BreadcrumbItem.vue diff --git a/src/components/Breadcrumb/index.vue b/src/pages/index/layout/components/Breadcrumb/index.vue similarity index 79% rename from src/components/Breadcrumb/index.vue rename to src/pages/index/layout/components/Breadcrumb/index.vue index fad6f50..59bdec3 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/pages/index/layout/components/Breadcrumb/index.vue @@ -36,23 +36,23 @@ export default defineComponent({ const levelList = ref([]) function getBreadcrumb() { - let matched: any[] = currentRoute.value.matched.filter((item: RouteLocationMatched) => item.meta && item.meta.title) - const first = matched[0] + const matched: any[] = currentRoute.value.matched.filter((item: RouteLocationMatched) => item.meta && item.meta.title) + // const first = matched[0] - if (!isDashboard(first)) { - matched = [{ path: '/dashboard', meta: { title: '首页', icon: 'dashboard' }}].concat(matched) - } + // if (!isDashboard(first)) { + // matched = [{ path: '/dashboard', meta: { title: '首页', icon: 'dashboard' }}].concat(matched) + // } levelList.value = matched.filter((item: RouteLocationMatched) => item.meta && item.meta.title && item.meta.breadcrumb !== false) } - function isDashboard(route: RouteLocationMatched) { - const name = route && route.name - if (!name) { - return false - } - return (name as any).trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase() - } + // function isDashboard(route: RouteLocationMatched) { + // const name = route && route.name + // if (!name) { + // return false + // } + // return (name as any).trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase() + // } function pathCompile(path: string): string { const { params } = currentRoute.value diff --git a/src/components/Hamburger/index.vue b/src/pages/index/layout/components/Hamburger/index.vue similarity index 100% rename from src/components/Hamburger/index.vue rename to src/pages/index/layout/components/Hamburger/index.vue diff --git a/src/components/Logo/index.vue b/src/pages/index/layout/components/Logo/index.vue similarity index 100% rename from src/components/Logo/index.vue rename to src/pages/index/layout/components/Logo/index.vue diff --git a/src/pages/index/layout/components/MenuTab/index.vue b/src/pages/index/layout/components/MenuTab/index.vue new file mode 100644 index 0000000..24a0d14 --- /dev/null +++ b/src/pages/index/layout/components/MenuTab/index.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/components/Screenfull/index.vue b/src/pages/index/layout/components/Screenfull/index.vue similarity index 100% rename from src/components/Screenfull/index.vue rename to src/pages/index/layout/components/Screenfull/index.vue diff --git a/src/components/Setting/index.vue b/src/pages/index/layout/components/Setting/index.vue similarity index 93% rename from src/components/Setting/index.vue rename to src/pages/index/layout/components/Setting/index.vue index d8e2cf2..ec58bb1 100644 --- a/src/components/Setting/index.vue +++ b/src/pages/index/layout/components/Setting/index.vue @@ -37,6 +37,11 @@
界面显示
+
+ 固定一级菜单 + +
+
固定Header @@ -117,6 +122,7 @@ export default defineComponent({ if (mode === layout.value) return appStore.SetLayout(mode) appStore.SetCollapsed(false) + mode === 'Top' && appStore.SetShowMenuTab(false) } const fixedHeader = ref(appStore.fixedHeader) @@ -179,6 +185,11 @@ export default defineComponent({ appStore.SetShowBackTop(showBackTop) } + const showMenuTab = ref(appStore.showMenuTab) + function setShowMenuTab(showMenuTab: boolean) { + appStore.SetShowMenuTab(showMenuTab) + } + return { drawer, toggleClick, layout, setLayout, @@ -193,7 +204,8 @@ export default defineComponent({ title, setTitle, logoTitle, setLogoTitle, greyMode, setGreyMode, - showBackTop, setShowBackTop + showBackTop, setShowBackTop, + showMenuTab, setShowMenuTab } } }) diff --git a/src/components/Sider/Item.vue b/src/pages/index/layout/components/Sider/Item.vue similarity index 100% rename from src/components/Sider/Item.vue rename to src/pages/index/layout/components/Sider/Item.vue diff --git a/src/components/Sider/SiderItem.vue b/src/pages/index/layout/components/Sider/SiderItem.vue similarity index 77% rename from src/components/Sider/SiderItem.vue rename to src/pages/index/layout/components/Sider/SiderItem.vue index 70dc7cd..82d4bf9 100644 --- a/src/components/Sider/SiderItem.vue +++ b/src/pages/index/layout/components/Sider/SiderItem.vue @@ -1,7 +1,7 @@