From 498298ef66cd7d4fe77b6179afe76889ae37beec Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 18 Jan 2023 14:07:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9A=97=E9=BB=91=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 83dc3250edd859af22c13cf12835327c71709f55
---
 src/components/Breadcrumb/index.vue      | 16 ++++----
 src/components/Hamburger/index.vue       |  6 +--
 src/components/RightPanel/index.vue      | 17 +++------
 src/layout/components/AppMain.vue        |  1 +
 src/layout/components/Settings/index.vue | 47 ++++++++----------------
 src/layout/components/Sidebar/Logo.vue   |  2 +-
 src/layout/components/Sidebar/index.vue  | 20 +++-------
 src/styles/element.scss                  | 16 --------
 src/styles/global.scss                   |  3 +-
 src/styles/index.scss                    |  1 -
 src/styles/sidebar.scss                  |  2 +-
 src/views/dashboard/index.vue            |  6 +--
 12 files changed, 43 insertions(+), 94 deletions(-)
 delete mode 100644 src/styles/element.scss

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 9823bb4..d582fac 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,15 +1,12 @@
 <template>
-  <el-breadcrumb
-    separator-class="el-icon-arrow-right"
-    class="h-[50px] flex items-center"
-  >
+  <el-breadcrumb class="h-[50px] flex items-center">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
         <span
           v-if="
             item.redirect === 'noredirect' || index === breadcrumbs.length - 1
           "
-          class="text-[#97a8be]"
+          class="text-[var(--el-disabled-text-color)]"
           >{{ translateRouteTitleI18n(item.meta.title) }}</span
         >
         <a v-else @click.prevent="handleLink(item)">
@@ -96,10 +93,11 @@ onBeforeMount(() => {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
+}
 
-  .no-redirect {
-    color: #97a8be;
-    cursor: text;
-  }
+// 覆盖 element-plus 的样式
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
 }
 </style>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 1e34583..6af6c41 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -4,11 +4,11 @@
     class="px-[15px] hover:bg-gray-50 cursor-pointer h-[50px] leading-[50px] dark:hover:bg-[var(--el-fill-color-light)]"
   >
     <svg
-      :class="{ 'is-active': isActive  } "
+      :class="{ 'is-active': isActive }"
       class="hamburger"
       viewBox="0 0 1024 1024"
       xmlns="http://www.w3.org/2000/svg"
-      style="color:#FFF!important"
+      style="color: #fff !important"
     >
       <path
         d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"
@@ -37,7 +37,7 @@ function toggleClick() {
 .hamburger {
   width: 20px;
   height: 20px;
-  vertical-align:-4px;
+  vertical-align: -4px;
   &.is-active {
     transform: rotate(180deg);
   }
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index b8b3632..085ed82 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -104,6 +104,7 @@ onBeforeUnmount(() => {
 }
 
 .right-panel {
+  background-color: var(--el-bg-color);
   width: 100%;
   max-width: 300px;
   height: 100vh;
@@ -113,7 +114,6 @@ onBeforeUnmount(() => {
   box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.05);
   transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
   transform: translate(100%);
-  background: #fff;
   z-index: 199;
 
   .icon {
@@ -125,7 +125,6 @@ onBeforeUnmount(() => {
 
 .show {
   transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
-
   .right-panel-background {
     z-index: 99;
     opacity: 1;
@@ -139,22 +138,18 @@ onBeforeUnmount(() => {
 }
 
 .right-panel__button {
+  background-color: var(--el-color-primary);
+  color: var(--el-color-white);
   width: 48px;
   height: 48px;
-  position: absolute;
   left: -48px;
+  line-height: 48px;
+  position: absolute;
   text-align: center;
   font-size: 24px;
-  border-radius: 6px 0 0 6px !important;
+  border-radius: 6px 0 0 6px;
   z-index: 0;
   pointer-events: auto;
   cursor: pointer;
-  color: #fff;
-  line-height: 48px;
-
-  i {
-    font-size: 24px;
-    line-height: 48px;
-  }
 }
 </style>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b1b1154..43f8b13 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -23,6 +23,7 @@ const tagsViewStore = useTagsViewStore();
   width: 100%;
   position: relative;
   overflow: hidden;
+  background-color: var(--el-bg-color-page);
 }
 
 .fixed-header + .app-main {
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 8c5a4aa..d43e4da 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -9,7 +9,7 @@ import { useDark, useToggle } from '@vueuse/core';
  */
 const settingsStore = useSettingsStore();
 const isDark = useDark();
-const toggleDark = useToggle(isDark);
+const toggleDark = () => useToggle(isDark);
 
 /**
  * 切换布局
@@ -28,30 +28,32 @@ onMounted(() => {
   <div class="settings-container">
     <h3 class="text-base font-bold">项目配置</h3>
     <el-divider />
-    <div class="drawer-item">
-      <span>开启 Tags-View</span>
-      <el-switch v-model="settingsStore.tagsView" class="drawer-switch" />
+    <div class="py-[8px] flex justify-between">
+      <span class="text-xs">开启 Tags-View</span>
+      <el-switch v-model="settingsStore.tagsView" />
     </div>
 
-    <div class="drawer-item">
-      <span>固定 Header</span>
-      <el-switch v-model="settingsStore.fixedHeader" class="drawer-switch" />
+    <div class="py-[8px] flex justify-between">
+      <span class="text-xs">固定 Header</span>
+      <el-switch v-model="settingsStore.fixedHeader" />
     </div>
 
-    <div class="drawer-item">
-      <span>侧边栏 Logo</span>
-      <el-switch v-model="settingsStore.sidebarLogo" class="drawer-switch" />
+    <div class="py-[8px] flex justify-between">
+      <span class="text-xs">侧边栏 Logo</span>
+      <el-switch v-model="settingsStore.sidebarLogo" />
     </div>
 
     <el-divider>主题</el-divider>
 
     <div class="flex justify-center" @click.stop>
-     <el-switch
+      <el-switch
         v-model="isDark"
         @change="toggleDark"
         inline-prompt
-        :active-icon="Sunny"
-        :inactive-icon="Moon"
+        :active-icon="Moon"
+        :inactive-icon="Sunny"
+        active-color="var(--el-fill-color-dark)"
+        inactive-color="var(--el-color-primary)"
       />
     </div>
 
@@ -101,25 +103,6 @@ onMounted(() => {
 <style lang="scss" scoped>
 .settings-container {
   padding: 16px;
-  font-size: 14px;
-
-  .drawer-title {
-    margin-bottom: 12px;
-    color: rgba(0, 0, 0, 0.85);
-    font-size: 14px;
-    line-height: 22px;
-  }
-
-  .drawer-item {
-    color: rgba(0, 0, 0, 0.65);
-    font-size: 14px;
-    padding: 12px 0;
-  }
-
-  .drawer-switch {
-    float: right;
-  }
-
   .layout {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 0ece40c..d4b3ff6 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -17,7 +17,7 @@ const logo = ref<string>(
 </script>
 
 <template>
-  <transition class="bg-gray-800">
+  <transition class="bg-gray-800 dark:bg-[var(--el-bg-color-overlay)]">
     <router-link
       v-if="collapse"
       key="collapse"
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index de6b5b2..345b688 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -8,7 +8,7 @@ import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
 import { useAppStore } from '@/store/modules/app';
 import { storeToRefs } from 'pinia';
-import variables from '@/styles/ts-variables.module.scss'
+import variables from '@/styles/ts-variables.module.scss';
 
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
@@ -16,25 +16,15 @@ const appStore = useAppStore();
 
 const { sidebarLogo } = storeToRefs(settingsStore);
 const route = useRoute();
-
-const isCollapse = computed(() => !appStore.sidebar.opened);
-
-const activeMenu = computed<string>(() => {
-  const { meta, path } = route;
-  if (meta?.activeMenu) {
-    return meta.activeMenu;
-  }
-  return path;
-});
 </script>
 
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
-    <logo v-if="sidebarLogo" :collapse="isCollapse" />
+    <logo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
     <el-scrollbar>
       <el-menu
-        :default-active="activeMenu"
-        :collapse="isCollapse"
+        :default-active="route.path"
+        :collapse="!appStore.sidebar.opened"
         :background-color="variables.menuBg"
         :text-color="variables.menuText"
         :active-text-color="variables.menuActiveText"
@@ -47,7 +37,7 @@ const activeMenu = computed<string>(() => {
           :item="route"
           :key="route.path"
           :base-path="route.path"
-          :is-collapse="isCollapse"
+          :is-collapse="!appStore.sidebar.opened"
         />
       </el-menu>
     </el-scrollbar>
diff --git a/src/styles/element.scss b/src/styles/element.scss
deleted file mode 100644
index 99cac74..0000000
--- a/src/styles/element.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-:root {
-  // 这里可以设置你自定义的颜色变量
-  // 这个是element主要按钮:active的颜色，当主题更改后此变量的值也随之更改
-  --el-color-primary-dark: #0d84ff;
-}
-
-// 覆盖 element-plus 的样式
-.el-breadcrumb__inner,
-.el-breadcrumb__inner a {
-  font-weight: 400 !important;
-}
-
-// 选中行背景色值
-.el-table__body tr.current-row td {
-  background-color: #e1f3d8b5 !important;
-}
diff --git a/src/styles/global.scss b/src/styles/global.scss
index b17338e..32c8050 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -20,4 +20,5 @@ svg {
     border-radius: var(--el-card-border-radius);
     border: 1px solid var(--el-border-color-light);
     box-shadow: var(--el-box-shadow-light);
-}
\ No newline at end of file
+    background-color: var(--el-bg-color-overlay);
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 864b181..6ea07ba 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,4 +1,3 @@
-@import './element.scss';
 @import './sidebar.scss';
 @import './tailwind.scss';
 @import './global.scss';
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 8334ae6..6499734 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -222,4 +222,4 @@
       border-radius: 20px;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ffda4cf..bf6d475 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -116,7 +116,6 @@ import Team from './components/Team/index.vue';
 <style lang="scss" scoped>
 .dashboard-container {
   padding: 24px;
-  background-color:var(--el-bg-color-page);
   position: relative;
 
   .github-corner {
@@ -156,7 +155,6 @@ import Team from './components/Team/index.vue';
     }
   }
 
-
   .card-panel {
     height: 108px;
     cursor: pointer;
@@ -165,8 +163,8 @@ import Team from './components/Team/index.vue';
     overflow: hidden;
     color: var(--el-text-color-regular);
     background: var(--el-bg-color-overlay);
-    box-shadow:var(--el-box-shadow-dark);
-    border-color:var(--el-border-color);
+    box-shadow: var(--el-box-shadow-dark);
+    border-color: var(--el-border-color);
 
     .icon-message {
       color: #36a3f7;
-- 
GitLab