From 23e0140544b11c29c08c27c7b0da5aeb3586817d Mon Sep 17 00:00:00 2001
From: chaos-zhu <ggchaos1022@gmail.com>
Date: Sat, 17 Aug 2024 23:43:59 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E6=9A=97?=
 =?UTF-8?q?=E9=BB=91=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/app.vue                               |   4 +-
 web/src/assets/scss/animate.scss              |  18 ---
 web/src/assets/scss/element-ui.scss           |  22 ---
 web/src/assets/scss/element/dark.scss         | 146 ++++++++++++++++++
 web/src/assets/scss/element/index.scss        |  37 +++++
 web/src/components/top-bar.vue                |  55 ++++---
 web/src/main.js                               |   2 -
 web/src/store/index.js                        |  23 ++-
 web/src/views/index.vue                       |   2 +-
 web/src/views/login/index.vue                 |   1 -
 web/src/views/onekey/index.vue                |   5 +-
 .../views/server/components/host-table.vue    |   2 +-
 web/src/views/server/index.vue                |   3 +
 .../views/terminal/components/info-side.vue   |   5 +-
 .../terminal/components/terminal-tab.vue      |   1 +
 .../views/terminal/components/terminal.vue    |   3 +-
 web/vite.config.js                            |   7 +
 17 files changed, 259 insertions(+), 77 deletions(-)
 delete mode 100644 web/src/assets/scss/animate.scss
 delete mode 100644 web/src/assets/scss/element-ui.scss
 create mode 100644 web/src/assets/scss/element/dark.scss
 create mode 100644 web/src/assets/scss/element/index.scss

diff --git a/web/src/app.vue b/web/src/app.vue
index 358d39d..515b016 100644
--- a/web/src/app.vue
+++ b/web/src/app.vue
@@ -5,10 +5,12 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
+const { proxy: { $store } } = getCurrentInstance()
 
 const locale = ref(zhCn)
+$store.setDefaultTheme()
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/assets/scss/animate.scss b/web/src/assets/scss/animate.scss
deleted file mode 100644
index 2773856..0000000
--- a/web/src/assets/scss/animate.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-// vue transition 动画
-.list-move, /* apply transition to moving elements */
-.list-enter-active,
-.list-leave-active {
-  transition: all 0.5s ease;
-}
-
-.list-enter-from,
-.list-leave-to {
-  opacity: 0;
-  transform: translateY(-30px);
-}
-
-/* ensure leaving items are taken out of layout flow so that moving
-   animations can be calculated correctly. */
-.list-leave-active {
-  position: absolute;
-}
diff --git a/web/src/assets/scss/element-ui.scss b/web/src/assets/scss/element-ui.scss
deleted file mode 100644
index 94280be..0000000
--- a/web/src/assets/scss/element-ui.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-// element css bug
-.el-notification__content {
-  text-align: initial;
-}
-
-.el-date-editor {
-  --el-date-editor-width: 100%;
-}
-.el-input__wrapper {
-  width: 100%;
-}
-
-.el-tabs__nav-scroll .el-tabs__nav {
-  padding-left: 0;
-}
-.el-tabs__content {
-  padding: 0 10px;
-}
-
-// :root {
-//   --active-color: red;
-// }
\ No newline at end of file
diff --git a/web/src/assets/scss/element/dark.scss b/web/src/assets/scss/element/dark.scss
new file mode 100644
index 0000000..cac72df
--- /dev/null
+++ b/web/src/assets/scss/element/dark.scss
@@ -0,0 +1,146 @@
+// $--colors: (
+//   "primary": (
+//     "base": #589ef8,
+//   ),
+// );
+
+// @forward "element-plus/theme-chalk/src/dark/var.scss" with (
+//   $colors: $--colors
+// );
+/** element内置黑暗主题 */
+@use 'element-plus/theme-chalk/src/dark/css-vars.scss' as *;
+
+/** 自定义黑暗主题 */
+html.dark {
+  // * admin
+  --bg-color: #000;
+  --v-main-bg-color: #181818;
+  --v-border-light: 1px solid #4c4c4d;
+
+  body {
+    background-color: var(--bg-color) !important;
+  }
+
+  .login_container {
+    // background: rgba(171, 181, 196, 0.3);
+    .login_box {
+      background-color: var(--v-main-bg-color) !important;
+    }
+  }
+
+  .top_bar_container {
+    background-color: var(--bg-color) !important;
+  }
+
+  .router_box {
+    background-color: var(--v-main-bg-color) !important;
+  }
+
+  .aside_container {
+    background-color: var(--v-main-bg-color) !important;
+  }
+
+  .terminal_top {
+    border-bottom: 1px solid #454242;
+  }
+  .info_box {
+    border-right: 1px solid #454242;
+    .el-progress-bar__innerText {
+      span {
+        color: #fff !important;
+      }
+    }
+  }
+
+  // scroll-bar
+  ::-webkit-scrollbar {
+    background-color: var(--el-scrollbar-bg-color) !important;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background-color: var(--el-border-color-darker) !important;
+  }
+
+  .layout-sidebar-container {
+    background-color: var(--bg-color) !important;
+  }
+
+  .app-main-container {
+    background-color: var(--v-main-bg-color) !important;
+
+    .card {
+      background-color: var(--bg-color) !important;
+    }
+  }
+
+  .layout-footer-container {
+    color: var(--el-text-color-regular) !important;
+    background-color: var(--v-main-bg-color) !important;
+  }
+
+  .fold-unfold {
+    color: #fff !important;
+  }
+
+  // .el-menu,
+  // .el-sub-menu,
+  // .el-menu-item,
+  // .el-sub-menu__title {
+  //   background-color: var(--bg-color) !important;
+
+  //   &:not(.is-active) {
+  //     color: #bdbdc0 !important;
+  //   }
+
+  //   &.is-active {
+  //     color: #fff !important;
+  //     background-color: #000 !important;
+  //   }
+  // }
+
+  .el-menu-item:not(.is-active):hover {
+    color: var(--el-menu-active-color);
+  }
+
+  .nav-bar-container {
+    background-color: var(--bg-color) !important;
+  }
+
+  .table-header {
+    .el-icon {
+      color: #fff;
+    }
+  }
+
+  .tabs-bar-container {
+    background-color: var(--bg-color) !important;
+    border-top: 1px solid var(--el-border-color-light) !important;
+
+    .tabs-action {
+      .el-icon {
+        color: #fff !important;
+      }
+    }
+
+    .fold-unfold {
+      color: #fff;
+    }
+
+    .el-tabs__item.is-active {
+      color: var(--el-color-primary);
+      background-color: var(--v-main-bg-color) !important;
+
+      .el-icon {
+        color: var(--el-color-primary) !important;
+      }
+    }
+
+    .el-tabs__item:not(.is_active):hover {
+      background-color: var(--v-main-bg-color) !important;
+
+      .el-icon {
+        color: var(--el-color-primary) !important;
+      }
+    }
+  }
+}
diff --git a/web/src/assets/scss/element/index.scss b/web/src/assets/scss/element/index.scss
new file mode 100644
index 0000000..2f9178d
--- /dev/null
+++ b/web/src/assets/scss/element/index.scss
@@ -0,0 +1,37 @@
+// $--colors: (
+//   "primary": (
+//     "base": green,
+//   ),
+//   "success": (
+//     "base": #21ba45,
+//   ),
+//   "warning": (
+//     "base": #f2711c,
+//   ),
+//   "danger": (
+//     "base": #db2828,
+//   ),
+//   "error": (
+//     "base": #db2828,
+//   ),
+//   "info": (
+//     "base": #42b8dd,
+//   ),
+// );
+
+// You should use them in scss, because we calculate it by sass.
+// comment next lines to use default color
+// @forward "element-plus/theme-chalk/src/common/var.scss" with (
+//   // do not use same name, it will override.
+//   // $colors: $--colors,
+//   // $button-padding-horizontal: ("default": 50px)
+// );
+
+// if you want to import all
+// @use "element-plus/theme-chalk/src/index.scss" as *;
+
+// You can comment it to hide debug info.
+// @debug $--colors;
+
+// custom dark variables
+@use "./dark.scss";
\ No newline at end of file
diff --git a/web/src/components/top-bar.vue b/web/src/components/top-bar.vue
index cb7ba67..a8b3c0f 100644
--- a/web/src/components/top-bar.vue
+++ b/web/src/components/top-bar.vue
@@ -3,16 +3,24 @@
     <div class="bar_wrap">
       <h2>{{ title }}</h2>
       <!-- <el-icon><UserFilled /></el-icon> -->
+      <el-switch
+        v-model="isDark"
+        inline-prompt
+        :active-icon="Moon"
+        :inactive-icon="Sunny"
+        class="dark_switch"
+        @change="setTheme"
+      />
       <el-button
         type="info"
-        class="about_btn top_text"
+        class="about_btn"
         link
         @click="visible = true"
       >
         关于 <span class="new_version">{{ isNew ? `(新版本可用)` : '' }}</span>
       </el-button>
       <el-dropdown trigger="click">
-        <span class="username top_text"><el-icon><User /></el-icon> {{ user }}</span>
+        <span class="username"><el-icon><User /></el-icon> {{ user }}</span>
         <template #dropdown>
           <el-dropdown-menu>
             <el-dropdown-item @click="handleLogout">
@@ -45,7 +53,7 @@
 
 <script setup>
 import { ref, getCurrentInstance, computed } from 'vue'
-import { User } from '@element-plus/icons-vue'
+import { User, Sunny, Moon } from '@element-plus/icons-vue'
 import packageJson from '../../package.json'
 
 const { proxy: { $router, $store, $message } } = getCurrentInstance()
@@ -54,11 +62,24 @@ let visible = ref(false)
 let checkVersionErr = ref(false)
 let currentVersion = ref(`v${ packageJson.version }`)
 let latestVersion = ref(null)
+// let isDark = ref(true)
 
-let isNew = computed(() => {
-  return latestVersion.value && latestVersion.value !== currentVersion.value
+let isNew = computed(() => latestVersion.value && latestVersion.value !== currentVersion.value)
+let user = computed(() => $store.user)
+let title = computed(() => $store.title)
+let isDark = computed({
+  get: () => $store.isDark,
+  set: (value) => {
+    $store.setTheme({ isDark: value })
+  }
 })
 
+const handleLogout = () => {
+  $store.clearJwtToken()
+  $message({ type: 'success', message: '已安全退出', center: true })
+  $router.push('/login')
+}
+
 async function checkLatestVersion() {
   const timeout = 3000
   try {
@@ -92,19 +113,6 @@ async function checkLatestVersion() {
 
 checkLatestVersion()
 
-let user = computed(() => {
-  return $store.user
-})
-
-let title = computed(() => {
-  return $store.title
-})
-
-const handleLogout = () => {
-  $store.clearJwtToken()
-  $message({ type: 'success', message: '已安全退出', center: true })
-  $router.push('/login')
-}
 </script>
 
 <style lang="scss" scoped>
@@ -125,16 +133,19 @@ const handleLogout = () => {
       font-size: 18px;
       margin-right: auto;
     }
-    .username {
-      margin-left: 10px;
-      cursor: pointer;
+    .dark_switch {
+      margin-right: 15px;
     }
-    .top_text {
+    .about_btn {
+      margin-right: 15px;
       font-size: 14px;
       .new_version {
         color: red;
       }
     }
+    .username {
+      cursor: pointer;
+    }
   }
   .about_content {
     h1 {
diff --git a/web/src/main.js b/web/src/main.js
index 1a441ca..75830cb 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -10,8 +10,6 @@ import api from './api'
 import App from './app.vue'
 import './assets/scss/reset.scss'
 import './assets/scss/global.scss'
-import './assets/scss/element-ui.scss'
-import './assets/scss/animate.scss'
 
 const app = createApp(App)
 elementPlugins(app)
diff --git a/web/src/store/index.js b/web/src/store/index.js
index 2e0a9de..75eadc0 100644
--- a/web/src/store/index.js
+++ b/web/src/store/index.js
@@ -15,7 +15,8 @@ const useStore = defineStore({
     HostStatusSocket: null,
     user: localStorage.getItem('user') || null,
     token: sessionStorage.getItem('token') || localStorage.getItem('token') || null,
-    title: ''
+    title: '',
+    isDark: false
   }),
   actions: {
     async setJwtToken(token, isSession = true) {
@@ -109,6 +110,26 @@ const useStore = defineStore({
       socketInstance.on('connect_error', (message) => {
         console.error('clients websocket 连接出错: ', message)
       })
+    },
+    setTheme(isDark) {
+      // $store.setThemeConfig({ isDark: val })
+      const html = document.documentElement
+      if (isDark) html.setAttribute('class', 'dark')
+      else html.setAttribute('class', '')
+      localStorage.setItem('isDark', isDark)
+      this.$patch({ isDark })
+    },
+    setDefaultTheme() {
+      let isDark = false
+      if (localStorage.getItem('isDark')) {
+        isDark = localStorage.getItem('isDark') === 'true' ? true : false
+      } else {
+        const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)')
+        const systemTheme = prefersDarkScheme.matches
+        // console.log('当前系统使用的是深色模式：', systemTheme ? '是' : '否')
+        isDark = systemTheme
+      }
+      this.setTheme(isDark)
     }
   }
 })
diff --git a/web/src/views/index.vue b/web/src/views/index.vue
index 637ef75..970673d 100644
--- a/web/src/views/index.vue
+++ b/web/src/views/index.vue
@@ -52,7 +52,7 @@ onBeforeMount(async () => {
       min-height: calc(100vh - 60px - 20px);
       background-color: #fff;
       border-radius: 6px;
-      margin: 10px;
+      margin: 0 10px 10px;
     }
   }
 }
diff --git a/web/src/views/login/index.vue b/web/src/views/login/index.vue
index 6e0a5fe..bdc8bdd 100644
--- a/web/src/views/login/index.vue
+++ b/web/src/views/login/index.vue
@@ -161,7 +161,6 @@ onMounted(async () => {
     padding: 20px;
     border-radius: 6px;
     background-color: #ffffff;
-    border: 1px solid #ebedef;
 
     h2 {
       text-align: center;
diff --git a/web/src/views/onekey/index.vue b/web/src/views/onekey/index.vue
index 469d19e..b5a76be 100644
--- a/web/src/views/onekey/index.vue
+++ b/web/src/views/onekey/index.vue
@@ -40,7 +40,7 @@
       </el-table-column>
       <el-table-column prop="command" label="指令" show-overflow-tooltip>
         <template #default="{ row }">
-          <span style="letter-spacing: 2px;background: rgba(227, 230, 235, 0.7);color: rgb(54, 52, 52);"> {{ row.command }} </span>
+          <span> {{ row.command }} </span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="执行结果" show-overflow-tooltip>
@@ -436,14 +436,13 @@ onActivated(async () => {
     position: sticky;
     top: 0;
     z-index: 1;
-    background-color: #fff;
   }
   .detail_content_box {
     max-height: 200px;
     overflow: auto;
     white-space: pre-line;
     line-height: 1.1;
-    background: rgba(227, 230, 235, .7);
+    // background: rgba(227, 230, 235, .7);
     padding: 25px;
     border-radius: 3px;
   }
diff --git a/web/src/views/server/components/host-table.vue b/web/src/views/server/components/host-table.vue
index 78aef5a..eb0393a 100644
--- a/web/src/views/server/components/host-table.vue
+++ b/web/src/views/server/components/host-table.vue
@@ -146,7 +146,7 @@ const handleOnekey = async (row) => {
 }
 
 let defaultSortLocal = localStorage.getItem('host_table_sort')
-defaultSortLocal = defaultSortLocal ? JSON.parse(defaultSortLocal) : { prop: 'index', order: 'ascending' }
+defaultSortLocal = defaultSortLocal ? JSON.parse(defaultSortLocal) : { prop: 'index', order: null } // 'ascending' or 'descending'
 let defaultSort = ref(defaultSortLocal)
 
 const handleSortChange = (sortObj) => {
diff --git a/web/src/views/server/index.vue b/web/src/views/server/index.vue
index 671e25f..379202a 100644
--- a/web/src/views/server/index.vue
+++ b/web/src/views/server/index.vue
@@ -242,6 +242,9 @@ let hostFormClosed = () => {
   }
 
   .server_group_collapse {
+    :deep(.el-card__body) {
+      padding: 0;
+    }
     :deep(.el-collapse-item__header) {
       padding: 0 35px;
     }
diff --git a/web/src/views/terminal/components/info-side.vue b/web/src/views/terminal/components/info-side.vue
index 6c7b175..ffd9c55 100644
--- a/web/src/views/terminal/components/info-side.vue
+++ b/web/src/views/terminal/components/info-side.vue
@@ -323,8 +323,7 @@ onBeforeUnmount(() => {
 .info_container {
   // border-top: 1px solid var(--el-border-color);
   flex-shrink: 0;
-  overflow: scroll;
-  background-color: #fff; //#E0E2EF;
+  // overflow: scroll;
   transition: all 0.15s;
 
   // header {
@@ -412,7 +411,7 @@ onBeforeUnmount(() => {
       display: flex;
 
       span {
-        color: #000;
+        color: #434343;
       }
     }
   }
diff --git a/web/src/views/terminal/components/terminal-tab.vue b/web/src/views/terminal/components/terminal-tab.vue
index e53da51..a5275f9 100644
--- a/web/src/views/terminal/components/terminal-tab.vue
+++ b/web/src/views/terminal/components/terminal-tab.vue
@@ -429,6 +429,7 @@ defineExpose({
     :deep(.xterm-screen) {
       padding: 0 0 0 10px;
       border-radius: var(--el-border-radius-base);
+      // background-color: rgba(0, 0, 0, 0.6);
     }
   }
   .terminal_command_history {
diff --git a/web/src/views/terminal/components/terminal.vue b/web/src/views/terminal/components/terminal.vue
index f691045..b81b649 100644
--- a/web/src/views/terminal/components/terminal.vue
+++ b/web/src/views/terminal/components/terminal.vue
@@ -405,8 +405,6 @@ const handleInputCommand = async (command) => {
     padding: 0 15px;
     position: sticky;
     top: 0;
-    border-bottom: 1px solid #fff;
-    // background-color: #fff;
     background: var(--el-fill-color-light);
     color: var(--el-text-color-regular);
     z-index: 3;
@@ -462,6 +460,7 @@ const handleInputCommand = async (command) => {
     overflow: auto;
     display: flex;
     flex-direction: column;
+    border: var(--el-descriptions-table-border);
   }
 
   .terminals_sftp_wrap {
diff --git a/web/vite.config.js b/web/vite.config.js
index 9db7654..b7ffbf3 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -59,6 +59,13 @@ export default defineConfig({
       deleteOriginFile: false
     }),
   ],
+  css: {
+    preprocessorOptions: {
+      scss: {
+        additionalData: '@use "@/assets/scss/element/index.scss" as *;'
+      }
+    }
+  },
   resolve: {
     alias: {
       '@': fileURLToPath(new URL(