修复一些bug (#367)

* bug修复： 1. serverstatus主题agent详情不显示内存信息 2. windows系统icon错误小优化 1. echarts绘制世界地图所需的world.js坐标信息从本地加载切换为从cdn加载 2. font-logos切换为0.17.0版本，使得图标间距更合适 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。
nezhahq · Jun 15, 2024 · 3eecdc2 · 3eecdc2
1 parent b2740e5
commit 3eecdc2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 29 deletions.
diff --git a/resource/static/theme-server-status/js/world.js b/resource/static/theme-server-status/js/world.js
diff --git a/resource/template/theme-default/header.html b/resource/template/theme-default/header.html
@@ -9,7 +9,7 @@
     <title>{{.Title}}</title>
     <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
     <link rel="stylesheet" href="https://unpkg.com/semantic-ui@2.4.0/dist/semantic.min.css">
-    <link rel="stylesheet" href="https://unpkg.com/font-logos@1.2.0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/font-logos@0.17.0/assets/font-logos.css">
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://unpkg.com/flag-icons@7.2.3/css/flag-icons.min.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">

diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
@@ -16,8 +16,8 @@
                             <div class="content" v-if="server.Host" style="margin-top: 10px; padding-bottom: 5px">
                                 <div class="header">
                                     <i style="width: 22px;border-radius: 4px;" :class="'fi fi-' + server.Host.CountryCode"></i>                                    
-                                    <i v-if='getFontLogoClass(server.Host.Platform) == "" && server.live' class="fl-tux"></i>
-                                    <i v-else-if='isWindowsPlatform(server.Host.Platform)' class="windows icon"></i>
+                                    <i v-if='isWindowsPlatform(server.Host.Platform)' class="windows icon"></i>
+                                    <i v-else-if='getFontLogoClass(server.Host.Platform) == "" && server.State.Uptime > 0' class="fl-tux"></i>
                                     <i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                                     @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
                                     <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon"></i>

diff --git a/resource/template/theme-server-status/header.html b/resource/template/theme-server-status/header.html
@@ -13,14 +13,14 @@
     <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://unpkg.com/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-    <link rel="stylesheet" href="https://unpkg.com/font-logos@1.2.0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/font-logos@0.17.0/assets/font-logos.css">
     <link rel="stylesheet" href="https://unpkg.com/flag-icons@7.2.3/css/flag-icons.min.css">
     <link rel="stylesheet" href="https://unpkg.com/semantic-ui@2.4.0/dist/semantic.min.css">
     <script src="https://unpkg.com/jquery@3.7.1/dist/jquery.min.js"></script>
     <script src="https://unpkg.com/bootstrap@3.4.1/dist/js/bootstrap.min.js"></script>
     <script src="https://unpkg.com/vue@2.6.14/dist/vue.min.js"></script>
     <script src="https://unpkg.com/echarts@5.5.0/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/world.js?v20240613"></script>
+    <script src="https://unpkg.com/echarts@4.9.0/map/js/world.js"></script>
     <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

diff --git a/resource/template/theme-server-status/home-group-false.html b/resource/template/theme-server-status/home-group-false.html
@@ -27,8 +27,8 @@
             </td>
             <td class="node-cell name center">@#node.name#@</td>
             <td class="node-cell os center">
-                <i v-if='getFontLogoClass(node.host.Platform) == "" && node.online' class="fl-tux"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                 <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
                 <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
             </td>

diff --git a/resource/template/theme-server-status/home-group-true.html b/resource/template/theme-server-status/home-group-true.html
@@ -30,8 +30,8 @@
             </td>
             <td class="node-cell name center">@#node.name#@</td>
             <td class="node-cell os center">
-                <i v-if='getFontLogoClass(node.host.Platform) == "" && node.online' class="fl-tux"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                 <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
                 <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
             </td>
@@ -76,6 +76,10 @@
                             <span class="node-cell-expand-label">CPU:</span>
                             @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                         </span>
+                        <span class="node-cell-expand">
+                            <span class="node-cell-expand-label">{{tr "MemUsed"}}:</span>
+                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@ (@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
+                        </span>
                         <span class="node-cell-expand">
                             <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
                             @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)

diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html
@@ -374,6 +374,7 @@ <h4 class="modal-title" id="mapChartTitle">{{tr "ServersOnWorldMap"}}</h4>
                         name: server.Name,
                         os: platform,
                         location: server.Host.CountryCode,
+                        stateuptime: server.State.Uptime,
                         uptime: this.secondToDate(server.State.Uptime),
                         load: this.toFixed2(server.State.Load1),
                         network: this.getNetworkSpeed(server.State.NetInSpeed, server.State.NetOutSpeed),