From bf30e14c3073d5f7bf2a2a4869ffc7d8a18b126a Mon Sep 17 00:00:00 2001
From: hi2hi <code@hi2hi.cc>
Date: Fri, 20 Dec 2024 16:43:48 +0000
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=96=B0=E5=A2=9E=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=20?=
 =?UTF-8?q?=E2=9C=A8=20=E6=96=B0=E5=A2=9E=E6=B5=85=E8=89=B2=E7=B3=BB?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=AE=BE=E5=AE=9A=EF=BC=8C=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=20=F0=9F=AA=84=20=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=96=B9=E5=BC=8F=E4=B8=BASVG=20=F0=9F=94=A7?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9A=84=E7=8A=B6=E6=80=81=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.js                              |  2 +
 readme.md                                     |  2 +
 src/App.vue                                   |  6 +-
 src/components/charts/donut.js                | 16 +++--
 src/components/charts/line.js                 |  4 +-
 src/components/dot-dot-box.vue                | 14 ++++-
 src/components/world-map/world-map.vue        | 63 +++++++++++++++----
 src/layout/components/header.vue              | 11 ++++
 src/layout/main.vue                           | 29 ++++++++-
 src/router/index.js                           | 13 ++--
 .../server-list/server-option-box.vue         | 36 ++++++++++-
 src/views/composable/server-status.js         | 29 ++++++---
 src/views/home.vue                            | 22 +++++++
 13 files changed, 209 insertions(+), 38 deletions(-)

diff --git a/public/config.js b/public/config.js
index fb731ca..0c99c80 100644
--- a/public/config.js
+++ b/public/config.js
@@ -3,6 +3,8 @@ window.$$nazhuaConfig = {
   // freeAmount: '白嫖', // 免费服务的费用名称
   // infinityCycle: '长期有效', // 无限周期名称
   // buyBtnText: '购买', // 购买按钮文案
+  // customBackgroundImage: '', // 自定义的背景图片地址
+  // lightBackground: true, // 启用了浅色系背景图，会强制关闭点点背景
   // listServerItemType: 'row', // 服务器列表项类型 card/row row列表模式移动端自动切换至card
   // listServerStatusType: 'progress', // 服务器状态类型--列表
   // listServerRealTimeShowLoad: false, // 列表显示服务器实时负载
diff --git a/readme.md b/readme.md
index 835f1e6..4c8673a 100644
--- a/readme.md
+++ b/readme.md
@@ -185,6 +185,8 @@ window.$$nazhuaConfig = {
   freeAmount: '白嫖', // 免费服务的费用名称
   infinityCycle: '长期有效', // 无限周期名称
   buyBtnText: '购买', // 购买按钮文案
+  customBackgroundImage: '', // 自定义的背景图片地址
+  lightBackground: true, // 启用了浅色系背景图，会强制关闭点点背景
   listServerItemType: 'row', // 服务器列表项类型 card/row row列表模式目前不兼容移动端
   listServerStatusType: 'progress', // 服务器状态类型--列表
   listServerRealTimeShowLoad: false, // 列表显示服务器实时负载
diff --git a/src/App.vue b/src/App.vue
index 2948965..0be9a15 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,10 @@
 <template>
   <layout-main>
-    <router-view />
+    <router-view v-slot="{ Component }">
+      <keep-alive>
+        <component :is="Component" />
+      </keep-alive>
+    </router-view>
   </layout-main>
 </template>
 
diff --git a/src/components/charts/donut.js b/src/components/charts/donut.js
index 7f1168a..a009836 100644
--- a/src/components/charts/donut.js
+++ b/src/components/charts/donut.js
@@ -1,5 +1,5 @@
 import { use } from 'echarts/core';
-import { CanvasRenderer } from 'echarts/renderers';
+import { SVGRenderer } from 'echarts/renderers';
 import {
   BarChart,
 } from 'echarts/charts';
@@ -10,7 +10,7 @@ import {
 import config from '@/config';
 
 use([
-  CanvasRenderer,
+  SVGRenderer,
   BarChart,
   PolarComponent,
 ]);
@@ -80,8 +80,16 @@ export default (used, total, itemColors, size = 100) => ({
     itemStyle: {
       color: typeof itemColors === 'string' ? itemColors : handleColor(itemColors?.used),
       borderRadius: 5,
-      shadowColor: config.nazhua.serverStatusLinear ? 'rgba(0, 0, 0, 0.5)' : undefined,
-      shadowBlur: config.nazhua.serverStatusLinear ? 10 : undefined,
+      shadowColor: (() => {
+        if (config.nazhua.serverStatusLinear) {
+          return 'rgba(0, 0, 0, 0.5)';
+        }
+        if (config.nazhua.lightBackground) {
+          return 'rgba(0, 0, 0, 0.2)';
+        }
+        return undefined;
+      })(),
+      shadowBlur: (config.nazhua.serverStatusLinear || config.nazhua.lightBackground) ? 10 : undefined,
     },
     coordinateSystem: 'polar',
     cursor: 'default',
diff --git a/src/components/charts/line.js b/src/components/charts/line.js
index 491713f..28b902b 100644
--- a/src/components/charts/line.js
+++ b/src/components/charts/line.js
@@ -1,5 +1,5 @@
 import { use } from 'echarts/core';
-import { CanvasRenderer } from 'echarts/renderers';
+import { SVGRenderer } from 'echarts/renderers';
 import { LineChart } from 'echarts/charts';
 import {
   TooltipComponent,
@@ -12,7 +12,7 @@ import dayjs from 'dayjs';
 import config from '@/config';
 
 use([
-  CanvasRenderer,
+  SVGRenderer,
   LineChart,
   TooltipComponent,
   // LegendComponent,
diff --git a/src/components/dot-dot-box.vue b/src/components/dot-dot-box.vue
index 5d334e4..a594356 100644
--- a/src/components/dot-dot-box.vue
+++ b/src/components/dot-dot-box.vue
@@ -2,7 +2,7 @@
   <div
     class="dot-dot-box"
     :class="{
-      'dot-dot-box--hide': $config.nazhua?.hideDotBG === true,
+      'dot-dot-box--hide': hideDotBG,
     }"
     :style="boxStyle"
   >
@@ -16,6 +16,7 @@
  */
 
 import { computed } from 'vue';
+import config from '@/config';
 
 const props = defineProps({
   borderRadius: {
@@ -32,6 +33,10 @@ const props = defineProps({
   },
 });
 
+const lightBackground = computed(() => config.nazhua.lightBackground);
+
+const hideDotBG = computed(() => lightBackground.value || config.nazhua?.hideDotBG === true);
+
 const boxStyle = computed(() => {
   const style = {};
   if (props.borderRadius) {
@@ -68,9 +73,14 @@ const boxStyle = computed(() => {
   backdrop-filter: saturate(50%) blur(3px);
 
   &--hide {
-    background-color: rgba(#000, 0.8);
+    background-color: rgba(#000, 0.5);
     background-image: none;
     backdrop-filter: none;
+    transition: all 0.3s linear;
+
+    &:hover {
+      background-color: rgba(#000, 0.8);
+    }
   }
 
   @media screen and (max-width: 768px) {
diff --git a/src/components/world-map/world-map.vue b/src/components/world-map/world-map.vue
index ee54982..39e236f 100644
--- a/src/components/world-map/world-map.vue
+++ b/src/components/world-map/world-map.vue
@@ -1,6 +1,9 @@
 <template>
   <div
     class="world-map-group"
+    :class="{
+      'world-map-group--light-background': lightBackground,
+    }"
     :style="mapStyle"
   >
     <div class="world-map-img" />
@@ -39,6 +42,7 @@ import {
   computed,
   watch,
 } from 'vue';
+import config from '@/config';
 import validate from '@/utils/validate';
 
 import WorldMapPoint from './world-map-point.vue';
@@ -63,37 +67,46 @@ const props = defineProps({
   },
 });
 
+const lightBackground = computed(() => config.nazhua.lightBackground);
+const boxPadding = computed(() => (lightBackground.value ? 20 : 0));
+
 // 计算地图大小 保持1280:621的比例 保证地图不变形
 const computedSize = computed(() => {
+  // 考虑内边距，从总宽高中减去padding
+  const adjustedWidth = Number(props.width) - (boxPadding.value * 2);
+  const adjustedHeight = Number(props.height) - (boxPadding.value * 2);
+
   if (!validate.isEmpty(props.width) && !validate.isEmpty(props.height)) {
     return {
       width: 1280,
       height: 621,
     };
   }
-  const width = Number(props.width);
-  const height = Number(props.height);
+
   if (!validate.isEmpty(props.width) && validate.isEmpty(props.height)) {
     return {
-      width,
-      height: Math.ceil((621 / 1280) * width),
+      width: adjustedWidth,
+      height: Math.ceil((621 / 1280) * adjustedWidth),
     };
   }
+
   if (validate.isEmpty(props.width) && !validate.isEmpty(props.height)) {
     return {
-      width: Math.ceil((1280 / 621) * height),
-      height,
+      width: Math.ceil((1280 / 621) * adjustedHeight),
+      height: adjustedHeight,
     };
   }
-  if (width / height > 1280 / 621) {
+
+  if (adjustedWidth / adjustedHeight > 1280 / 621) {
     return {
-      width: Math.ceil(height * (1280 / 621)),
-      height,
+      width: Math.ceil(adjustedHeight * (1280 / 621)),
+      height: adjustedHeight,
     };
   }
+
   return {
-    width,
-    height: Math.ceil(width * (621 / 1280)),
+    width: adjustedWidth,
+    height: Math.ceil(adjustedWidth * (621 / 1280)),
   };
 });
 
@@ -118,8 +131,8 @@ function computeMapPoints() {
     const points = props.locations.map((i) => {
       const item = {
         key: i.key,
-        left: (computedSize.value.width / 1280) * i.x,
-        top: (computedSize.value.height / 621) * i.y,
+        left: (computedSize.value.width / 1280) * i.x + boxPadding.value,
+        top: (computedSize.value.height / 621) * i.y + boxPadding.value,
         size: i.size || 4,
         label: i.label,
         servers: i.servers,
@@ -219,6 +232,30 @@ function handlePointTap(e) {
   height: var(--world-map-height, 621px);
   position: relative;
 
+  &--light-background {
+    padding: 20px;
+    background: rgba(#000, 0.6);
+    border-radius: 12px;
+    box-sizing: content-box;
+    transition: background-color 0.3s linear;
+
+    .world-map-img {
+      opacity: 1;
+    }
+
+    &:hover {
+      background: rgba(#000, 0.9);
+    }
+
+    @media screen and (max-width: 768px) {
+      background: rgba(#000, 0.8);
+
+      &:hover {
+        background: rgba(#000, 0.8);
+      }
+    }
+  }
+
   .world-map-img {
     width: var(--world-map-width, 1280px);
     height: var(--world-map-height, 621px);
diff --git a/src/layout/components/header.vue b/src/layout/components/header.vue
index e530404..621b577 100644
--- a/src/layout/components/header.vue
+++ b/src/layout/components/header.vue
@@ -143,6 +143,8 @@ const store = useStore();
 const route = useRoute();
 const router = useRouter();
 
+const lightBackground = computed(() => config.nazhua.lightBackground);
+
 const headerStyle = computed(() => {
   const style = {};
   if (route.name === 'ServerDetail') {
@@ -267,6 +269,9 @@ const headerClass = computed(() => {
   if (showServerCount.value) {
     classes.push('layout-header--show-server-count');
   }
+  if (lightBackground.value) {
+    classes.push('layout-header--light-background');
+  }
   return classes;
 });
 
@@ -304,6 +309,12 @@ const dashboardUrl = computed(() => config.nazhua.v1DashboardUrl || '/dashboard'
     }
   }
 
+  &--light-background {
+    background-color: rgba(#000, 0.7);
+    background-image: none;
+    backdrop-filter: none;
+  }
+
   .site-name {
     line-height: calc(var(--layout-header-height) - 20px);
     font-size: 24px;
diff --git a/src/layout/main.vue b/src/layout/main.vue
index 99463f9..d57810d 100644
--- a/src/layout/main.vue
+++ b/src/layout/main.vue
@@ -1,6 +1,12 @@
 <template>
-  <div class="layout-group">
-    <div class="layout-bg" />
+  <div
+    class="layout-group"
+    :style="layoutGroupStyle"
+  >
+    <div
+      class="layout-bg"
+      :style="layoutBGStyle"
+    />
     <div class="layout-main">
       <layout-header />
       <slot />
@@ -13,8 +19,27 @@
 /**
  * LayoutMain
  */
+import { computed } from 'vue';
+import config from '@/config';
 import LayoutHeader from './components/header.vue';
 import LayoutFooter from './components/footer.vue';
+
+const layoutGroupStyle = computed(() => {
+  const style = {};
+  if (config.nazhua.lightBackground) {
+    style['--layout-main-bg-color'] = 'rgba(20, 30, 40, 0.2)';
+  }
+  return style;
+});
+
+const layoutBGStyle = computed(() => {
+  const style = {};
+  if (config.nazhua.customBackgroundImage) {
+    style.background = `url(${config.nazhua.customBackgroundImage}) 50% 50%`;
+    style.backgroundSize = 'cover';
+  }
+  return style;
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 63a4695..c702868 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,10 +27,15 @@ const constantRoutes = [{
 
 const routerOptions = {
   history: config.nazhua.routeMode === 'h5' ? createWebHistory() : createWebHashHistory(),
-  scrollBehavior: () => ({
-    top: 0,
-    behavior: 'smooth',
-  }),
+  scrollBehavior: (to, from, savedPosition) => {
+    if (savedPosition) {
+      return savedPosition;
+    }
+    return {
+      top: 0,
+      behavior: 'smooth',
+    };
+  },
   routes: constantRoutes,
 };
 const router = createRouter(routerOptions);
diff --git a/src/views/components/server-list/server-option-box.vue b/src/views/components/server-list/server-option-box.vue
index 1dab833..cb7ffa0 100644
--- a/src/views/components/server-list/server-option-box.vue
+++ b/src/views/components/server-list/server-option-box.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="server-option-box">
+  <div
+    class="server-option-box"
+    :class="{
+      'server-option-box--light-background': lightBackground,
+    }"
+  >
     <div
       v-for="item in options"
       :key="item.key"
@@ -22,6 +27,7 @@
 import {
   computed,
 } from 'vue';
+import config from '@/config';
 
 const props = defineProps({
   modelValue: {
@@ -42,6 +48,8 @@ const emits = defineEmits([
   'update:modelValue',
 ]);
 
+const lightBackground = computed(() => config.nazhua.lightBackground);
+
 const activeValue = computed({
   get: () => props.modelValue,
   set: (val) => {
@@ -75,6 +83,7 @@ function toggleModelValue(item) {
     line-height: 1.2;
     border-radius: 6px;
     background: rgba(#000, 0.3);
+    transition: all 0.3s linear;
     cursor: pointer;
     @media screen and (max-width: 768px) {
       background-color: rgba(#000, 0.8);
@@ -83,10 +92,35 @@ function toggleModelValue(item) {
 
     .option-label {
       color: #fff;
+      transition: all 0.3s linear;
+    }
+
+    @media screen and (min-width: 768px) {
+      &:hover {
+        .option-label {
+          color: #ff7500;
+        }
+      }
     }
 
     &.active {
       background: rgba(#ff7500, 0.75);
+
+      .option-label {
+        color: #fff;
+      }
+    }
+  }
+
+  @media screen and (min-width: 768px) {
+    &--light-background {
+      .server-option-item {
+        background: rgba(#000, 0.5);
+
+        &:hover {
+          background: rgba(#000, 0.8);
+        }
+      }
     }
   }
 }
diff --git a/src/views/composable/server-status.js b/src/views/composable/server-status.js
index f8211a1..b771de4 100644
--- a/src/views/composable/server-status.js
+++ b/src/views/composable/server-status.js
@@ -13,6 +13,10 @@ export default (params) => {
   if (!props?.info) {
     return {};
   }
+
+  const lightBackground = computed(() => config.nazhua.lightBackground);
+  const serverStatusLinear = computed(() => config.nazhua.serverStatusLinear || lightBackground.value);
+
   const cpuInfo = computed(() => {
     if (props.info?.Host?.CPU?.[0]) {
       return hostUtils.getCPUInfo(props.info.Host.CPU[0]);
@@ -60,11 +64,12 @@ export default (params) => {
    * 状态列表
    */
   const serverStatusList = computed(() => statusListTpl.split(',').map((i) => {
+    const totalColor = lightBackground.value ? 'rgba(125, 125, 125, 0.5)' : 'rgba(255, 255, 255, 0.25)';
     switch (i) {
       case 'cpu':
       {
         const CoresVal = cpuInfo.value?.cores ? `${cpuInfo.value?.cores}C` : '-';
-        const usedColor = config.nazhua.serverStatusLinear ? ['#0088FF', '#72B7FF'] : '#0088FF';
+        const usedColor = serverStatusLinear.value ? ['#0088FF', '#72B7FF'] : '#0088FF';
         const valPercent = `${(props.info.State?.CPU || 0).toFixed(1) * 1}%`;
         const valText = valPercent;
         return {
@@ -72,7 +77,7 @@ export default (params) => {
           used: (props.info.State?.CPU || 0).toFixed(1) * 1,
           colors: {
             used: usedColor,
-            total: 'rgba(255, 255, 255, 0.25)',
+            total: totalColor,
           },
           valText,
           valPercent,
@@ -97,13 +102,13 @@ export default (params) => {
         } else {
           contentVal = `${Math.ceil(useMemAndTotalMem.value.total.m)}M`;
         }
-        const usedColor = config.nazhua.serverStatusLinear ? ['#2B6939', '#0AA344'] : '#0AA344';
+        const usedColor = serverStatusLinear.value ? ['#2B6939', '#0AA344'] : '#0AA344';
         return {
           type: 'mem',
           used: useMemAndTotalMem.value.usePercent,
           colors: {
             used: usedColor,
-            total: 'rgba(255, 255, 255, 0.25)',
+            total: totalColor,
           },
           valText,
           valPercent: `${useMemAndTotalMem.value.usePercent.toFixed(1) * 1}%`,
@@ -131,13 +136,13 @@ export default (params) => {
         } else {
           contentVal = `${Math.ceil(useSwapAndTotalSwap.value.total.m)}M`;
         }
-        const usedColor = config.nazhua.serverStatusLinear ? ['#FF8C00', '#F38100'] : '#FF8C00';
+        const usedColor = serverStatusLinear.value ? ['#FF8C00', '#F38100'] : '#FF8C00';
         return {
           type: 'swap',
           used: useSwapAndTotalSwap.value.usePercent,
           colors: {
             used: usedColor,
-            total: 'rgba(255, 255, 255, 0.25)',
+            total: totalColor,
           },
           valText,
           valPercent: `${useSwapAndTotalSwap.value.usePercent.toFixed(1) * 1}%`,
@@ -150,21 +155,27 @@ export default (params) => {
       }
       case 'disk':
       {
+        let valText;
+        if (useDiskAndTotalDisk.value.used.t >= 1 && useDiskAndTotalDisk.value.total.t >= 1) {
+          valText = `${(useDiskAndTotalDisk.value.used.t).toFixed(1) * 1}T`;
+        } else {
+          valText = `${Math.ceil(useDiskAndTotalDisk.value.used.g)}G`;
+        }
         let contentValue;
         if (useDiskAndTotalDisk.value.total.t >= 1) {
           contentValue = `${(useDiskAndTotalDisk.value.total.t).toFixed(1) * 1}T`;
         } else {
           contentValue = `${Math.ceil(useDiskAndTotalDisk.value.total.g)}G`;
         }
-        const usedColor = config.nazhua.serverStatusLinear ? ['#00848F', '#70F3FF'] : '#70F3FF';
+        const usedColor = serverStatusLinear.value ? ['#00848F', '#70F3FF'] : '#70F3FF';
         return {
           type: 'disk',
           used: useDiskAndTotalDisk.value.usePercent,
           colors: {
             used: usedColor,
-            total: 'rgba(255, 255, 255, 0.25)',
+            total: totalColor,
           },
-          valText: `${(useDiskAndTotalDisk.value.used.g).toFixed(1) * 1}G`,
+          valText,
           valPercent: `${useDiskAndTotalDisk.value.usePercent.toFixed(1) * 1}%`,
           label: '磁盘',
           content: {
diff --git a/src/views/home.vue b/src/views/home.vue
index 3ff7b38..1fe661a 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -74,6 +74,9 @@ import {
   computed,
   onMounted,
   onUnmounted,
+  onActivated,
+  onDeactivated,
+  nextTick,
 } from 'vue';
 import {
   useStore,
@@ -279,6 +282,25 @@ onMounted(() => {
 onUnmounted(() => {
   window.removeEventListener('resize', handleResize);
 });
+
+const scrollPosition = ref(0);
+
+onDeactivated(() => {
+  // 保存滚动位置
+  scrollPosition.value = document.documentElement.scrollTop || document.body.scrollTop;
+});
+
+onActivated(() => {
+  // 如果有保存的位置，则恢复到该位置
+  if (scrollPosition.value > 0) {
+    nextTick(() => {
+      window.scrollTo({
+        top: scrollPosition.value,
+        behavior: 'instant',
+      });
+    });
+  }
+});
 </script>
 
 <style lang="scss" scoped>