diff --git a/src/components/Menu/src/Menu.vue b/src/components/Menu/src/Menu.vue index 1f63d12..74e2d7d 100644 --- a/src/components/Menu/src/Menu.vue +++ b/src/components/Menu/src/Menu.vue @@ -7,7 +7,6 @@ import { useRenderMenuItem } from './components/useRenderMenuItem' import { useRouter } from 'vue-router' import { isUrl } from '@/utils/is' import { useDesign } from '@/hooks/web/useDesign' -import { LayoutType } from '@/types/layout' const { getPrefixCls } = useDesign() @@ -124,15 +123,15 @@ export default defineComponent({ diff --git a/src/components/Setting/src/Setting.vue b/src/components/Setting/src/Setting.vue index 49828ce..20f0eb9 100644 --- a/src/components/Setting/src/Setting.vue +++ b/src/components/Setting/src/Setting.vue @@ -47,7 +47,6 @@ const setHeaderTheme = (color: string) => { setCssVar('--top-header-bg-color', color) setCssVar('--top-header-text-color', textColor) setCssVar('--top-header-hover-color', textHoverColor) - setCssVar('--layout-border-color', topToolBorderColor) appStore.setTheme({ topHeaderBgColor: color, topHeaderTextColor: textColor, diff --git a/src/components/TagsView/src/TagsView.vue b/src/components/TagsView/src/TagsView.vue index ffcab3e..b8383a6 100644 --- a/src/components/TagsView/src/TagsView.vue +++ b/src/components/TagsView/src/TagsView.vue @@ -482,7 +482,7 @@ watch( left: 0; width: 100%; height: calc(~'100% - 1px'); - border-left: 1px solid var(--layout-border-color); + border-left: 1px solid var(--el-border-color); content: ''; } @@ -496,7 +496,7 @@ watch( left: 0; width: 100%; height: calc(~'100% - 1px'); - border-right: 1px solid var(--layout-border-color); + border-right: 1px solid var(--el-border-color); content: ''; } } diff --git a/src/router/index.ts b/src/router/index.ts index ad611d7..57e380e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -313,94 +313,94 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ // } ] }, - // { - // path: '/hooks', - // component: Layout, - // redirect: '/hooks/useWatermark', - // name: 'Hooks', - // meta: { - // title: 'hooks', - // icon: 'ic:outline-webhook', - // alwaysShow: true - // }, - // children: [ - // { - // path: 'useWatermark', - // component: () => import('@/views/hooks/useWatermark.vue'), - // name: 'UseWatermark', - // meta: { - // title: 'useWatermark' - // } - // }, - // { - // path: 'useCrudSchemas', - // component: () => import('@/views/hooks/useCrudSchemas.vue'), - // name: 'UseCrudSchemas', - // meta: { - // title: 'useCrudSchemas' - // } - // } - // ] - // }, - // { - // path: '/level', - // component: Layout, - // redirect: '/level/menu1/menu1-1/menu1-1-1', - // name: 'Level', - // meta: { - // title: t('router.level'), - // icon: 'carbon:skill-level-advanced' - // }, - // children: [ - // { - // path: 'menu1', - // name: 'Menu1', - // component: getParentLayout(), - // redirect: '/level/menu1/menu1-1/menu1-1-1', - // meta: { - // title: t('router.menu1') - // }, - // children: [ - // { - // path: 'menu1-1', - // name: 'Menu11', - // component: getParentLayout(), - // redirect: '/level/menu1/menu1-1/menu1-1-1', - // meta: { - // title: t('router.menu11'), - // alwaysShow: true - // }, - // children: [ - // { - // path: 'menu1-1-1', - // name: 'Menu111', - // component: () => import('@/views/Level/Menu111.vue'), - // meta: { - // title: t('router.menu111') - // } - // } - // ] - // }, - // { - // path: 'menu1-2', - // name: 'Menu12', - // component: () => import('@/views/Level/Menu12.vue'), - // meta: { - // title: t('router.menu12') - // } - // } - // ] - // }, - // { - // path: 'menu2', - // name: 'Menu2', - // component: () => import('@/views/Level/Menu2.vue'), - // meta: { - // title: t('router.menu2') - // } - // } - // ] - // }, + { + path: '/hooks', + component: Layout, + redirect: '/hooks/useWatermark', + name: 'Hooks', + meta: { + title: 'hooks', + icon: 'ic:outline-webhook', + alwaysShow: true + }, + children: [ + { + path: 'useWatermark', + component: () => import('@/views/hooks/useWatermark.vue'), + name: 'UseWatermark', + meta: { + title: 'useWatermark' + } + }, + { + path: 'useCrudSchemas', + component: () => import('@/views/hooks/useCrudSchemas.vue'), + name: 'UseCrudSchemas', + meta: { + title: 'useCrudSchemas' + } + } + ] + }, + { + path: '/level', + component: Layout, + redirect: '/level/menu1/menu1-1/menu1-1-1', + name: 'Level', + meta: { + title: t('router.level'), + icon: 'carbon:skill-level-advanced' + }, + children: [ + { + path: 'menu1', + name: 'Menu1', + component: getParentLayout(), + redirect: '/level/menu1/menu1-1/menu1-1-1', + meta: { + title: t('router.menu1') + }, + children: [ + { + path: 'menu1-1', + name: 'Menu11', + component: getParentLayout(), + redirect: '/level/menu1/menu1-1/menu1-1-1', + meta: { + title: t('router.menu11'), + alwaysShow: true + }, + children: [ + { + path: 'menu1-1-1', + name: 'Menu111', + component: () => import('@/views/Level/Menu111.vue'), + meta: { + title: t('router.menu111') + } + } + ] + }, + { + path: 'menu1-2', + name: 'Menu12', + component: () => import('@/views/Level/Menu12.vue'), + meta: { + title: t('router.menu12') + } + } + ] + }, + { + path: 'menu2', + name: 'Menu2', + component: () => import('@/views/Level/Menu2.vue'), + meta: { + title: t('router.menu2') + } + } + ] + }, // { // path: '/example', // component: Layout, diff --git a/src/styles/var.css b/src/styles/var.css index 61895d2..5b1778f 100644 --- a/src/styles/var.css +++ b/src/styles/var.css @@ -36,8 +36,6 @@ --top-tool-p-x: 0; - --layout-border-color: #eee; - --tags-view-height: 35px; --tags-view-border-color: #eee; @@ -61,7 +59,5 @@ } .dark { - --layout-border-color: var(--el-border-color); - --app-content-bg-color: var(--el-bg-color); } diff --git a/uno.config.ts b/uno.config.ts index d6cf78c..0645fe6 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -39,7 +39,7 @@ ${selector}:before { left: 0; width: 1px; height: 100%; - background-color: var(--layout-border-color); + background-color: var(--el-border-color); z-index: 3; } ` @@ -57,7 +57,7 @@ ${selector}:after { right: 0; width: 1px; height: 100%; - background-color: var(--layout-border-color); + background-color: var(--el-border-color); z-index: 3; } ` @@ -75,7 +75,7 @@ ${selector}:before { left: 0; width: 100%; height: 1px; - background-color: var(--layout-border-color); + background-color: var(--el-border-color); z-index: 3; } ` @@ -93,7 +93,7 @@ ${selector}:after { left: 0; width: 100%; height: 1px; - background-color: var(--layout-border-color); + background-color: var(--el-border-color); z-index: 3; } `