修复ServerStatus主题Bug (#346)

README.md

@@ -46,8 +46,8 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/MikoyChinese" title="MikoyChinese"><img src="https://avatars.githubusercontent.com/u/22676744?v=4" width="50;" alt="MikoyChinese"/></a>
 <a href="https://github.com/JackieSung4ev" title="JackieSung4ev"><img src="https://avatars.githubusercontent.com/u/24974735?v=4" width="50;" alt="JackieSung4ev"/></a>
 <a href="https://github.com/lemoeo" title="Lemoe"><img src="https://avatars.githubusercontent.com/u/18618627?v=4" width="50;" alt="Lemoe"/></a>
-<a href="https://github.com/cantoblanco" title="Kris"><img src="https://avatars.githubusercontent.com/u/116849421?v=4" width="50;" alt="Kris"/></a>
 <a href="https://github.com/nap0o" title="nap0o"><img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/></a>
+<a href="https://github.com/cantoblanco" title="Kris"><img src="https://avatars.githubusercontent.com/u/116849421?v=4" width="50;" alt="Kris"/></a>
 <a href="https://github.com/uubulb" title="UUBulb"><img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="UUBulb"/></a>
 <a href="https://github.com/spiritLHLS" title="spiritlhl"><img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/></a>
 <a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
@@ -69,6 +69,7 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/zhucaidan" title="zhucaidan"><img src="https://avatars.githubusercontent.com/u/47970938?v=4" width="50;" alt="zhucaidan"/></a>
 <a href="https://github.com/ysicing" title="缘生"><img src="https://avatars.githubusercontent.com/u/8605565?v=4" width="50;" alt="缘生"/></a>
 <a href="https://github.com/unclezs" title="unclezs"><img src="https://avatars.githubusercontent.com/u/42318775?v=4" width="50;" alt="unclezs"/></a>
+<a href="https://github.com/lvyaoting" title="lvyaoting"><img src="https://avatars.githubusercontent.com/u/166296299?v=4" width="50;" alt="lvyaoting"/></a>
 <a href="https://github.com/yuanweize" title="I"><img src="https://avatars.githubusercontent.com/u/30067203?v=4" width="50;" alt="I"/></a>
 <a href="https://github.com/guoyongchang" title="guoyongchang"><img src="https://avatars.githubusercontent.com/u/10484506?v=4" width="50;" alt="guoyongchang"/></a>
 <a href="https://github.com/acgpiano" title="Acgpiano"><img src="https://avatars.githubusercontent.com/u/15900800?v=4" width="50;" alt="Acgpiano"/></a>

resource/l10n/en-US.toml

@@ -639,3 +639,6 @@ other = "Asset"
 
 [DisableSwitchTemplateInFrontend]
 other = "Disable Switch Template in Frontend"
+
+[ServersOnWorldMap]
+other = "Servers On World Map"

resource/l10n/es-ES.toml

@@ -638,4 +638,7 @@ other = "Plantilla"
 other = "Stat"
 
 [DisableSwitchTemplateInFrontend]
-other = "Deshabilitar Cambio de Plantilla en Frontend"
+other = "Deshabilitar Cambio de Plantilla en Frontend"
+
+[ServersOnWorldMap]
+other = "Servidores en el mapa mundial"

resource/l10n/zh-CN.toml

@@ -639,3 +639,6 @@ other = "信息"
 
 [DisableSwitchTemplateInFrontend]
 other = "禁止前台切换模板"
+
+[ServersOnWorldMap]
+other = "服务器世界分布图"

resource/l10n/zh-TW.toml

@@ -639,3 +639,6 @@ other = "信息"
 
 [DisableSwitchTemplateInFrontend]
 other = "禁止前台切換主題"
+
+[ServersOnWorldMap]
+other = "伺服器世界分布圖"

resource/static/theme-server-status/css/dark.css

@@ -157,3 +157,16 @@ body[theme="dark"] footer p a:hover {
     color: #f1f1f1;
     text-decoration: none;
 }
+
+body[theme="dark"] .modal-content{
+    background-color: #1c1d26;
+    color: #f1f1f1;
+}
+
+body[theme="dark"] .modal-header{
+    border-bottom-color:#080808;
+}
+
+body[theme="dark"] .modal-header i{
+    color: #f1f1f1;
+}

resource/static/theme-server-status/css/light.css

@@ -131,4 +131,17 @@ body[theme="light"] footer p a,
 body[theme="light"] footer p a:hover {
     color: #333333;
     text-decoration: none;
+}
+
+body[theme="light"] .modal-content{
+    background-color: #ffffff;
+    color: rgba(0, 0, 0, 0.87);
+}
+
+body[theme="light"] .modal-header{
+    border-bottom-color:#f1f1f1;
+}
+
+body[theme="light"] .modal-header i{
+    color: rgba(0, 0, 0, 0.87);
 }

resource/static/theme-server-status/css/main.css

@@ -281,10 +281,42 @@ body {
 .service-status .tooltip-inner {
     max-width: 500px;
 }
-
-
-
 /* 服务页 正文结束 */
+
+
+/* 服务器分布图 */
+#mapChartBox{
+    z-index: 999999999;
+}
+
+.modal-content{
+    display: flex;
+    flex-direction: column;
+    pointer-events: auto;
+}
+
+.modal-dialog-centered{
+    margin: 0 auto;
+    width: 1134px;
+    max-width: 1134px;
+    display: flex;
+    align-items: center; /* 垂直居中 */
+    justify-content: center; /* 水平居中 */
+    min-height: calc(100%) /* 确保模态框占据整个视口高度 */
+}
+
+.modal-header{
+    position: relative;
+}
+
+.modal-header i{
+    cursor: pointer;
+    position: absolute;
+    font-size: 2em;
+    top: 13px;
+    right: 13px;
+}
+
 @media only screen and (max-width: 1200px) {
     .accordian-body{
         margin: 5px 0px 5px 10px;        
@@ -365,6 +397,16 @@ body {
     .toolbox {
         right: 18px;
     }
+    .modal-dialog-centered{
+        width: 95%;
+    }
+    .modal-title{
+        line-height: 0.5;
+    }
+    .modal-header i{
+        top: 8px;
+        right: 8px;
+    }
 }
 
 @media only screen and (min-width: 768px) {

resource/static/theme-server-status/js/html5shiv.js

@@ -21,7 +21,7 @@
   /** Name of the expando, to work with multiple documents or to re-shiv one document */
   var expando = '_html5shiv';
 
-  /** The id for the the documents expando */
+  /** The id for the documents expando */
   var expanID = 0;
 
   /** Cached data for each document */

resource/template/theme-server-status/content-footer.html

@@ -5,6 +5,9 @@
     </p>
 </footer>
 <aside class="toolbox">
+    <span v-if="page=='index' && countryMapChartData.length!=0" class="showMapChart">
+        <i @click="showMapChart" data-toggle="modal" data-target="#mapChartBox" class="bi bi-geo-alt"></i>
+    </span>
     <span class="toggleView">
         <i v-if="showGroup" @click="toggleView" class="show-nogroup bi bi-justify"></i>
         <i v-else @click="toggleView" class="show-group bi bi-view-stacked"></i>

resource/template/theme-server-status/header.html

@@ -8,9 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/theme-server-status/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240225">
-    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/light.css">
+    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240407">
+    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v20240407">
+    <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240407">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/assets/font-logos.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/[email protected]/css/flag-icons.min.css">
@@ -28,7 +28,8 @@
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/echarts/map/js/world.js"></script>
     <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
 </head>
 <body>
-{{end}}
+{{end}}

service/singleton/servicesentinel.go

@@ -172,7 +172,7 @@ func (ss *ServiceSentinel) Monitors() []*model.Monitor {
 	return monitors
 }
 
-// LoadStats 加载服务监控器的历史状态信息
+// loadMonitorHistory 加载服务监控器的历史状态信息
 func (ss *ServiceSentinel) loadMonitorHistory() {
 	var monitors []*model.Monitor
 	err := DB.Find(&monitors).Error