Parcourir la source

style: 移除不必要样式

kailong321200875 il y a 1 an
Parent
commit
366db45282

+ 27 - 28
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({
 <style lang="less" scoped>
 @prefix-cls: ~'@{namespace}-menu';
 
-.is-active--after {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 4px;
-  height: 100%;
-  background-color: var(--el-color-primary);
-  content: '';
-}
+// .is-active--after {
+//   position: absolute;
+//   top: 0;
+//   right: 0;
+//   width: 4px;
+//   height: 100%;
+//   background-color: var(--el-color-primary);
+//   content: '';
+// }
 
 .@{prefix-cls} {
   position: relative;
@@ -182,9 +181,9 @@ export default defineComponent({
     .@{elNamespace}-menu-item.is-active {
       position: relative;
 
-      &:after {
-        .is-active--after;
-      }
+      // &:after {
+      //   .is-active--after;
+      // }
     }
 
     // 设置子菜单的背景颜色
@@ -205,9 +204,9 @@ export default defineComponent({
       position: relative;
       background-color: var(--left-menu-collapse-bg-active-color) !important;
 
-      &:after {
-        .is-active--after;
-      }
+      // &:after {
+      //   .is-active--after;
+      // }
     }
   }
 
@@ -255,15 +254,15 @@ export default defineComponent({
 <style lang="less">
 @prefix-cls: ~'@{namespace}-menu-popper';
 
-.is-active--after {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 4px;
-  height: 100%;
-  background-color: var(--el-color-primary);
-  content: '';
-}
+// .is-active--after {
+//   position: absolute;
+//   top: 0;
+//   right: 0;
+//   width: 4px;
+//   height: 100%;
+//   background-color: var(--el-color-primary);
+//   content: '';
+// }
 
 .@{prefix-cls}--vertical,
 .@{prefix-cls}--horizontal {
@@ -292,9 +291,9 @@ export default defineComponent({
       background-color: var(--left-menu-bg-active-color) !important;
     }
 
-    &:after {
-      .is-active--after;
-    }
+    // &:after {
+    //   .is-active--after;
+    // }
   }
 }
 </style>

+ 0 - 1
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,

+ 2 - 2
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: '';
       }
     }

+ 88 - 88
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,

+ 0 - 4
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);
 }

+ 4 - 4
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;
 }
 `