Default主题fixbug (#421)

* default主题fixbug 1.补上误删的网页title 2.修复network页纵坐标数值显示不全 3.修复network，多个legend导致的遮挡主图表问题 * fix * fix * fix * fix * fix * fix
naiba · Sep 7, 2024 · f78ba28 · f78ba28
1 parent 7f9f9a9
commit f78ba28
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/resource/static/manifest-en-US.json b/resource/static/manifest-en-US.json
@@ -15,13 +15,13 @@
             "purpose": "maskable"
         },
         {
-            "src": "//static/manifest-512x512.png",
+            "src": "/static/manifest-512x512.png",
             "sizes": "512x512",
             "type": "image/png",
             "purpose": "any"
         },
         {
-            "src": "//static/manifest-512x512.png",
+            "src": "/static/manifest-512x512.png",
             "sizes": "512x512",
             "type": "image/png",
             "purpose": "maskable"

diff --git a/resource/template/theme-default/header.html b/resource/template/theme-default/header.html
@@ -3,11 +3,13 @@
 <html lang="{{.Conf.Language}}">
 
 <head>
+    <title>{{ .Title }}</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta content="telephone=no" name="format-detection">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="theme-color" content="#000000" />
     {{ if eq .Conf.Language "zh-CN" }}
         <link rel="manifest" href="/static/manifest-zh-CN.json?v20240905" />

diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
@@ -194,7 +194,7 @@
             ]
         },
         mixins: [mixinsVue],
-            created() {
+        created() {
             this.servers = JSON.parse('{{.Servers}}').servers;
             this.group()
         },

diff --git a/resource/template/theme-default/network.html b/resource/template/theme-default/network.html
@@ -36,7 +36,11 @@
             defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servers: initData,
-            option: {
+            option: {}
+        },
+        mixins: [mixinsVue],
+        created() {
+            this.option = {
                 tooltip: {
                     trigger: 'axis',
                     position: function (pt) {
@@ -69,15 +73,6 @@
                     right: this.isMobile ? '8%' : '3.8%',
                 },
                 backgroundColor: '',
-                toolbox: {
-                    feature: {
-                        dataZoom: {
-                            yAxisIndex: 'none'
-                        },
-                        restore: {},
-                        saveAsImage: {}
-                    }
-                },
                 dataZoom: [
                     {
                         type: 'slider',
@@ -94,10 +89,8 @@
                     boundaryGap: false
                 },
                 series: [],
-            },
-            chartOnOff: true,
+            }
         },
-        mixins: [mixinsVue],
         mounted() {
             this.renderChart();
             this.parseMonitorInfo(monitorInfo);
@@ -237,6 +230,20 @@
                 this.option.title.text = monitorInfo.result[0].server_name;
                 this.option.series = tSeries;
                 this.option.legend.data = tLegendData;
+                const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 2;
+                const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
+                const autoIncrement = Math.floor((tLegendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 28 : 34);
+                const height = 520 + autoIncrement;
+                const gridTop = 60 + autoIncrement;
+                this.option.grid = {
+                    left: this.isMobile ? '8%' : '3.8%',
+                    right: this.isMobile ? '8%' : '3.8%',
+                    top: gridTop
+                };
+                this.myChart.resize({
+                    width: 'auto',
+                    height: height
+                });
                 this.myChart.clear();
                 this.myChart.setOption(this.option);
             },

diff --git a/resource/template/theme-server-status/header.html b/resource/template/theme-server-status/header.html
@@ -8,6 +8,7 @@
     <meta content="telephone=no" name="format-detection">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="theme-color" content="#000000" />
     {{if eq .Conf.Language "zh-CN"}}
         <link rel="manifest" href="/static/manifest-zh-CN.json?v20240905" />