improve & fix : 主题优化及bug修复 (#409)

* 主题优化及bug修复

default主题
1.修复主box过宽导致的系列问题（pc和移动端）
2.network页面适配深色模式和浅色模式

status-server主题
1. network页面折线图取数逻辑优化，丢包率一直是100%时，不显示丢包markline线
2. 隐藏所有table横向滚动条
3. 关闭折线图hover效果，大幅提升echarts图表渲染速度
4. 移动端页底显示位置优化

* 刷新cdn缓存

* 修复default深色模式在ios设备不生效bug

* 1. 恢复主baox 1680px宽度，用其他方式修复上一版存在bug（移动端左右留空不一致等）
2. 首页echarts自动适配深色浅色模式

* fix

README.md

@@ -72,6 +72,7 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/acgpiano" title="Acgpiano"><img src="https://avatars.githubusercontent.com/u/15900800?v=4" width="50;" alt="Acgpiano"/></a>
 <a href="https://github.com/eya46" title="eya46"><img src="https://avatars.githubusercontent.com/u/61458340?v=4" width="50;" alt="eya46"/></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/hiDandelion" title="hiDandelion"><img src="https://avatars.githubusercontent.com/u/77157418?v=4" width="50;" alt="hiDandelion"/></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/lvyaoting" title="lvyaoting"><img src="https://avatars.githubusercontent.com/u/166296299?v=4" width="50;" alt="lvyaoting"/></a>
 <a href="https://github.com/unclezs" title="unclezs"><img src="https://avatars.githubusercontent.com/u/42318775?v=4" width="50;" alt="unclezs"/></a>

cmd/dashboard/controller/common_page.go

@@ -99,7 +99,6 @@ func (p *commonPage) service(c *gin.Context) {
 		"Title":              singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "ServicesStatus"}),
 		"Services":           res.([]interface{})[0],
 		"CycleTransferStats": res.([]interface{})[1],
-		"CustomCode":         singleton.Conf.Site.CustomCode,
 	}))
 }
 
@@ -204,7 +203,6 @@ func (cp *commonPage) network(c *gin.Context) {
 	c.HTML(http.StatusOK, mygin.GetPreferredTheme(c, "/network"), mygin.CommonEnvironment(c, gin.H{
 		"Servers":         string(serversBytes),
 		"MonitorInfos":    string(monitorInfos),
-		"CustomCode":      singleton.Conf.Site.CustomCode,
 		"MaxTCPPingValue": singleton.Conf.MaxTCPPingValue,
 	}))
 }
@@ -254,8 +252,7 @@ func (cp *commonPage) home(c *gin.Context) {
 		return
 	}
 	c.HTML(http.StatusOK, mygin.GetPreferredTheme(c, "/home"), mygin.CommonEnvironment(c, gin.H{
-		"Servers":    string(stat),
+		"Servers": string(stat),
-		"CustomCode": singleton.Conf.Site.CustomCode,
 	}))
 }
 

cmd/dashboard/controller/controller.go

@@ -35,20 +35,27 @@ func ServeWeb(port uint) *http.Server {
 		pprof.Register(r)
 	}
 	r.Use(natGateway)
-	tmpl := template.New("").Funcs(funcMap)
+	if os.Getenv("NZ_LOCAL_TEMPLATE") == "true" {
-	var err error
+		r.SetFuncMap(funcMap)
-	tmpl, err = tmpl.ParseFS(resource.TemplateFS, "template/**/*.html")
+		r.Use(mygin.RecordPath)
-	if err != nil {
+		r.Static("/static", "resource/static")
-		panic(err)
+		r.LoadHTMLGlob("resource/template/**/*.html")
+	} else {
+		tmpl := template.New("").Funcs(funcMap)
+		var err error
+		tmpl, err = tmpl.ParseFS(resource.TemplateFS, "template/**/*.html")
+		if err != nil {
+			panic(err)
+		}
+		tmpl = loadThirdPartyTemplates(tmpl)
+		r.SetHTMLTemplate(tmpl)
+		r.Use(mygin.RecordPath)
+		staticFs, err := fs.Sub(resource.StaticFS, "static")
+		if err != nil {
+			panic(err)
+		}
+		r.StaticFS("/static", http.FS(staticFs))
 	}
-	tmpl = loadThirdPartyTemplates(tmpl)
-	r.SetHTMLTemplate(tmpl)
-	r.Use(mygin.RecordPath)
-	staticFs, err := fs.Sub(resource.StaticFS, "static")
-	if err != nil {
-		panic(err)
-	}
-	r.StaticFS("/static", http.FS(staticFs))
 	r.Static("/static-custom", "resource/static/custom")
 	routers(r)
 	page404 := func(c *gin.Context) {

cmd/dashboard/controller/member_api.go

@@ -908,6 +908,7 @@ type settingForm struct {
 	Theme                   string
 	DashboardTheme          string
 	CustomCode              string
+	CustomCodeDashboard     string
 	ViewPassword            string
 	IgnoredIPNotification   string
 	IPChangeNotificationTag string // IP变更提醒的通知组
@@ -973,6 +974,7 @@ func (ma *memberAPI) updateSetting(c *gin.Context) {
 	singleton.Conf.Site.Theme = sf.Theme
 	singleton.Conf.Site.DashboardTheme = sf.DashboardTheme
 	singleton.Conf.Site.CustomCode = sf.CustomCode
+	singleton.Conf.Site.CustomCodeDashboard = sf.CustomCodeDashboard
 	singleton.Conf.Site.ViewPassword = sf.ViewPassword
 	singleton.Conf.Oauth2.Admin = sf.Admin
 	// 保证NotificationTag不为空

model/config.go

@@ -80,12 +80,13 @@ type Config struct {
 	Debug    bool   // debug模式开关
 	Language string // 系统语言，默认 zh-CN
 	Site     struct {
-		Brand          string // 站点名称
+		Brand               string // 站点名称
-		CookieName     string // 浏览器 Cookie 名称
+		CookieName          string // 浏览器 Cookie 名称
-		Theme          string
+		Theme               string
-		DashboardTheme string
+		DashboardTheme      string
-		CustomCode     string
+		CustomCode          string
-		ViewPassword   string // 前台查看密码
+		CustomCodeDashboard string
+		ViewPassword        string // 前台查看密码
 	}
 	Oauth2 struct {
 		Type            string

model/notification.go

@@ -170,14 +170,23 @@ func (ns *NotificationServerBundle) replaceParamsInString(str string, message st
 
 	if ns.Server != nil {
 		str = strings.ReplaceAll(str, "#SERVER.NAME#", mod(ns.Server.Name))
+		str = strings.ReplaceAll(str, "#SERVER.ID#", mod(fmt.Sprintf("%d", ns.Server.ID)))
 		str = strings.ReplaceAll(str, "#SERVER.CPU#", mod(fmt.Sprintf("%f", ns.Server.State.CPU)))
 		str = strings.ReplaceAll(str, "#SERVER.MEM#", mod(fmt.Sprintf("%d", ns.Server.State.MemUsed)))
 		str = strings.ReplaceAll(str, "#SERVER.SWAP#", mod(fmt.Sprintf("%d", ns.Server.State.SwapUsed)))
 		str = strings.ReplaceAll(str, "#SERVER.DISK#", mod(fmt.Sprintf("%d", ns.Server.State.DiskUsed)))
+		str = strings.ReplaceAll(str, "#SERVER.MEMUSED#", mod(fmt.Sprintf("%d", ns.Server.State.MemUsed)))
+		str = strings.ReplaceAll(str, "#SERVER.SWAPUSED#", mod(fmt.Sprintf("%d", ns.Server.State.SwapUsed)))
+		str = strings.ReplaceAll(str, "#SERVER.DISKUSED#", mod(fmt.Sprintf("%d", ns.Server.State.DiskUsed)))
+		str = strings.ReplaceAll(str, "#SERVER.MEMTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.MemTotal)))
+		str = strings.ReplaceAll(str, "#SERVER.SWAPTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.SwapTotal)))
+		str = strings.ReplaceAll(str, "#SERVER.DISKTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.DiskTotal)))
 		str = strings.ReplaceAll(str, "#SERVER.NETINSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetInSpeed)))
 		str = strings.ReplaceAll(str, "#SERVER.NETOUTSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutSpeed)))
 		str = strings.ReplaceAll(str, "#SERVER.TRANSFERIN#", mod(fmt.Sprintf("%d", ns.Server.State.NetInTransfer)))
 		str = strings.ReplaceAll(str, "#SERVER.TRANSFEROUT#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutTransfer)))
+		str = strings.ReplaceAll(str, "#SERVER.NETINTRANSFER#", mod(fmt.Sprintf("%d", ns.Server.State.NetInTransfer)))
+		str = strings.ReplaceAll(str, "#SERVER.NETOUTTRANSFER#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutTransfer)))
 		str = strings.ReplaceAll(str, "#SERVER.LOAD1#", mod(fmt.Sprintf("%f", ns.Server.State.Load1)))
 		str = strings.ReplaceAll(str, "#SERVER.LOAD5#", mod(fmt.Sprintf("%f", ns.Server.State.Load5)))
 		str = strings.ReplaceAll(str, "#SERVER.LOAD15#", mod(fmt.Sprintf("%f", ns.Server.State.Load15)))

pkg/mygin/mygin.go

@@ -26,6 +26,8 @@ func CommonEnvironment(c *gin.Context, data map[string]interface{}) gin.H {
 	data["Version"] = singleton.Version
 	data["Conf"] = singleton.Conf
 	data["Themes"] = model.Themes
+	data["CustomCode"] = singleton.Conf.Site.CustomCode
+	data["CustomCodeDashboard"] = singleton.Conf.Site.CustomCodeDashboard
 	// 是否是管理页面
 	data["IsAdminPage"] = adminPage[data["MatchedPath"].(string)]
 	// 站点标题

pkg/mygin/view_password.go

@@ -37,8 +37,7 @@ func ValidateViewPassword(opt ValidateViewPasswordOption) gin.HandlerFunc {
 		}
 		if opt.IsPage {
 			c.HTML(http.StatusOK, GetPreferredTheme(c, "/viewpassword"), CommonEnvironment(c, gin.H{
-				"Title":      singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "VerifyPassword"}),
+				"Title": singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "VerifyPassword"}),
-				"CustomCode": singleton.Conf.Site.CustomCode,
 			}))
 
 		} else {

resource/l10n/en-US.toml

@@ -331,6 +331,9 @@ other = "Frontend Theme"
 [CustomCodes]
 other = "Custom Codes (Style and Script)"
 
+[CustomCodesDashboard]
+other = "Custom Codes for Dashboard"
+
 [AccessPassword]
 other = "Frontend Access Password"
 

resource/l10n/es-ES.toml

@@ -331,6 +331,9 @@ other = "Tema de Frontend"
 [CustomCodes]
 other = "Códigos Personalizados (Incluye style y script)"
 
+[CustomCodesDashboard]
+other = "Custom Codes for Dashboard"
+
 [AccessPassword]
 other = "Contraseña de Acceso al Frontend"
 

resource/l10n/zh-CN.toml

@@ -331,6 +331,9 @@ other = "前台界面主题"
 [CustomCodes]
 other = "自定义代码（包括 style 和 script）"
 
+[CustomCodesDashboard]
+other = "Custom Codes for Dashboard"
+
 [AccessPassword]
 other = "前台访问密码"
 

resource/l10n/zh-TW.toml

@@ -331,6 +331,9 @@ other = "前台界面主題"
 [CustomCodes]
 other = "自定義代碼（包括 style 和 script）"
 
+[CustomCodesDashboard]
+other = "Custom Codes for Dashboard"
+
 [AccessPassword]
 other = "前台訪問密碼"
 

resource/static/darkmode.css

@@ -0,0 +1,141 @@
+html[nz-theme='dark'] body {
+    background-color: #121212 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark']  .ui.menu {
+    background-color: #282828 !important;
+}
+
+html[nz-theme='dark'] .ui.menu * {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .accordion {
+    background-color: #282828 !important;
+}
+
+html[nz-theme='dark'] .accordion .title {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.card {
+    background-color: #3f3f3f !important;
+    border: none !important;
+    box-shadow: none !important;
+}
+
+html[nz-theme='dark'] .header {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .description {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .icon {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.popup {
+    background-color: #575757 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.table {
+    background-color: #282828 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui thead th {
+    background-color: #3f3f3f !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.buttons .button {
+    background-color: #3f3f3f !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.modal {
+    background-color: #282828 !important;
+}
+
+html[nz-theme='dark'] .ui.modal * {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] textarea,
+html[nz-theme='dark'] input,
+html[nz-theme='dark'] select,
+html[nz-theme='dark'] .dropdown {
+    background-color: #3f3f3f !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.message {
+    background-color: unset !important;
+}
+
+html[nz-theme='dark'] .ui.dropdown .menu {
+    background-color: #575757 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.modal>.header {
+    background-color: #3f3f3f !important;
+}
+
+html[nz-theme='dark'] .ui.modal>.content {
+    background-color: #282828 !important;
+}
+
+html[nz-theme='dark'] .ui.modal>.actions {
+    background-color: #3f3f3f !important;
+}
+
+html[nz-theme='dark'] #alert {
+    background-color: #3f3f3f !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.form .field>label {
+    color: unset !important;
+}
+
+html[nz-theme='dark'] .ui.segment {
+    background-color: #3f3f3f !important;
+}
+
+html[nz-theme='dark'] .ui.segment textarea,
+html[nz-theme='dark'] input,
+html[nz-theme='dark'] select,
+html[nz-theme='dark'] .dropdown {
+    background-color: #575757 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] form label {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.inverted.segment {
+    background-color: #121212 !important;
+}
+
+html[nz-theme='dark'] .ui.inverted.segment * {
+    color: #8b8b8b !important;
+}
+
+html[nz-theme='dark'] .menu .dropdown {
+    background-color: #282828 !important;
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .ui.menu .ui.dropdown .menu>.item {
+    color: #fff !important;
+}
+
+html[nz-theme='dark'] .login .ui.message{
+    color: #8b8b8b !important;
+}

resource/static/main.css

@@ -9,6 +9,11 @@ td {
   word-break: break-all;
 }
 
+.ui.container{
+  width: 95vw !important;
+  max-width: 1680px !important;
+}
+
 .nb-container {
   padding-top: 75px;
   min-height: 100vh;

resource/static/theme-default/css/main.css

@@ -1,46 +1,35 @@
 /* 屏幕适配 */
-@media only screen and (min-width:1200px) {
-  .ui.container {
-    width:95% !important;
-    font-size: 90% !important;
-    max-width: 1300px !important;
-  }
-}
 @media only screen and (max-width:767px) {
-  .ui.card>.content>.header:not(.ui),.ui.cards>.card>.content>.header:not(.ui) {
+  .ui.card>.content>.header:not(.ui),
-    margin-top:0.4em !important;
+  .ui.cards>.card>.content>.header:not(.ui) {
+    margin-top: 0.4em !important;
   }
-  .ui.menu .item>img:not(.ui){
+
+  .ui.menu .item>img:not(.ui) {
     width: 2.2rem;
   }
-  .ui.menu .item:before{
+
-    width:0.5px;
+  .ui.menu .item:before {
+    width: 0.5px;
   }
-  .ui.menu .item{
+
+  .ui.menu .item {
     padding: 0.9rem 0.55rem;
   }
-  .ui.large.menu{
+
+  .ui.large.menu {
     font-size: 1rem;
   }
 }
 
 i.icon {
-  color:#000;
+  color: #000;
-  width:1.2em !important;
+  width: 1.2em !important;
-}
-i.fi {
-    width:0.9em;
-    margin:0px 6px 0px 2px;
 }
 
-body {
+i.fi {
-  content:" " !important;
+  width: 0.9em;
-  background:fixed !important;
+  margin: 0px 6px 0px 2px;
-  z-index:-1 !important;
-  top:0 !important;
-  right:0 !important;
-  bottom:0 !important;
-  left:0 !important;
 }
 
 td {
@@ -55,6 +44,11 @@ td {
   margin-bottom: -47px;
 }
 
+.ui.container {
+  width: 95%;
+  max-width: 1680px !important;
+}
+
 #app .ui.fluid.accordion {
   margin-bottom: 1rem;
 }
@@ -65,79 +59,80 @@ td {
   padding-top: unset;
 }
 
-.login.nb-container > .grid {
+.login.nb-container>.grid {
   width: 100%;
   margin: 0 auto;
 }
 
-.login.nb-container > .grid .column {
+.login.nb-container>.grid .column {
   max-width: 450px;
 }
 
-.ui.menu .item-right:before{
+.ui.menu .item-right:before {
-  width:0px;
+  width: 0px;
 }
 
 .status.cards .flag {
   margin-right: 0 !important;
 }
 
-.status.cards .header > .info.icon {
+.status.cards .header>.info.icon {
   float: right;
   margin-right: 0;
 }
 
 .ui.grid {
-  margin-bottom:-0.5em
+  margin-bottom: -0.5em
 }
 
-.ui.card>.content>.header:not(.ui), .ui.cards>.card>.content>.header:not(.ui){
+.ui.card>.content>.header:not(.ui),
+.ui.cards>.card>.content>.header:not(.ui) {
   line-height: 1em;
 }
 
 .status.cards .wide.column {
   padding-top: 0 !important;
   padding-bottom: 0 !important;
-  height:2.3rem !important;
+  height: 2.3rem !important;
 }
 
 .status.cards .wide.column:nth-child(1) {
-  margin-top:1.2rem !important;
+  margin-top: 1.2rem !important;
 }
 
 .status.cards .wide.column:nth-child(2) {
-  margin-top:1.2rem !important;
+  margin-top: 1.2rem !important;
 }
 
 .status.cards .three.wide.column {
   text-align: center;
-  width: 22%!important;
+  width: 22% !important;
 }
 
-.status.cards .thirteen.wide.column{
+.status.cards .thirteen.wide.column {
-  width: 78%!important;
+  width: 78% !important;
-  padding-left:0;
+  padding-left: 0;
 }
 
 .status.cards .description {
-  padding-bottom:0 !important;
+  padding-bottom: 0 !important;
 }
 
 .status.cards .flag {
-  margin-right:0.5rem !important;
+  margin-right: 0.5rem !important;
 }
 
-.status.cards .header > .info.icon {
+.status.cards .header>.info.icon {
   float: right;
-  margin-right:0 !important;
+  margin-right: 0 !important;
 }
 
 .ui.popup:before {
   display: none;
 }
 
-.closePopup{
+.closePopup {
-  color:rgb(10, 148, 242) !important;
+  color: rgb(10, 148, 242) !important;
   position: absolute;
   top: 7px;
   right: 10px;
@@ -150,26 +145,26 @@ td {
 }
 
 .ui.content {
-  margin:0 !important;
+  margin: 0 !important;
-  padding:1em !important;
+  padding: 1em !important;
 }
 
 .status.cards .ui.content.popup {
-  min-width:calc(100%)!important;
+  min-width: calc(100%) !important;
-  line-height:2rem !important;
+  line-height: 2rem !important;
-  border-radius:5px !important;
+  border-radius: 5px !important;
-  border:1px solid transparent !important;
+  border: 1px solid transparent !important;
-  font-family:Arial,Helvetica,sans-serif !important;
+  font-family: Arial, Helvetica, sans-serif !important;
 }
 
 .status.cards .outline.icon {
-  margin-right:1px !important;
+  margin-right: 1px !important;
 }
 
 .ui.progress .bar {
-  min-width:1.8em !important;
+  min-width: 1.8em !important;
-  border-radius:5px !important;
+  border-radius: 5px !important;
-  line-height:1.65em !important;
+  line-height: 1.65em !important;
   text-align: right;
   padding-right: 0.4em;
   color: rgba(255, 255, 255, 0.7);
@@ -182,7 +177,7 @@ td {
   align-items: center;
 }
 
-.service-status .delay-today > i {
+.service-status .delay-today>i {
   display: inline-block;
   width: 1.2em;
   height: 1.2em;

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

@@ -9,6 +9,10 @@ body {
     margin: 0 auto;
 }
 
+.container-fluid::-webkit-scrollbar {
+    display: none;
+}
+
 .nezha {
     min-height: calc(100vh - 100px);
 }
@@ -470,14 +474,13 @@ footer p{
     background-image: url(/static/theme-server-status/img/rb.png);
 }
 
-
 @media only screen and (max-width: 767px) {
     body {
         font-size: 10px !important;
         padding-top:60px !important;
     }
     .nezha {
-        min-height: calc(100vh - 80px);
+        min-height: calc(74.5vh);
     }
     .content {
         padding: 0;

resource/template/common/footer.html

@@ -17,5 +17,6 @@
     })();
 </script>
 </body>
+
 </html>
 {{end}}

resource/template/common/header.html

@@ -11,7 +11,12 @@
     <link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/semantic.min.css">
     <link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/assets/font-logos.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/main.css?v2022042314">
+    <link rel="stylesheet" type="text/css" href="/static/main.css?v20240813">
+    <link rel="stylesheet" type="text/css" href="/static/darkmode.css?v20240813">
+    <script>
+        document.documentElement.setAttribute('nz-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+    </script>
 </head>
+{{if ts .CustomCodeDashboard}} {{.CustomCodeDashboard|safe}} {{end}}
 <body>
 {{end}}

resource/template/component/api.html

@@ -10,7 +10,7 @@
             </div>
         </form>
     </div>
-    <div class=" actions">
+    <div class="actions">
         <div class="ui negative button">{{tr "Cancel"}}</div>
         <button class="ui positive nezha-primary-btn right labeled icon button">{{tr "Confirm"}}<i class="checkmark icon"></i>
         </button>

resource/template/component/cron.html

@@ -60,7 +60,7 @@
             </p>
         </div>
     </div>
-    <div class=" actions">
+    <div class="actions">
         <div class="ui negative button">{{tr "Cancel"}}</div>
         <button class="ui positive nezha-primary-btn right labeled icon button">{{tr "Confirm"}}<i class="checkmark icon"></i>
         </button>

resource/template/component/server.html

@@ -71,7 +71,7 @@
             </div>
         </form>
     </div>
-    <div class=" actions">
+    <div class="actions">
         <div class="ui negative button">{{tr "Cancel"}}</div>
         <button class="ui positive nezha-primary-btn right labeled icon button">{{tr "Confirm"}}<i class="checkmark icon"></i>
         </button>

resource/template/dashboard-default/api.html

@@ -10,7 +10,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
             <tr>
                 <th>{{tr "Token"}}</th>

resource/template/dashboard-default/cron.html

@@ -10,7 +10,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
                 <tr>
                     <th>ID</th>

resource/template/dashboard-default/monitor.html

@@ -9,7 +9,7 @@
         </button>
       </div>
     </div>
-    <table class="ui very basic table">
+    <table class="ui basic table">
       <thead>
         <tr>
           <th>ID</th>

resource/template/dashboard-default/nat.html

@@ -10,7 +10,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
                 <tr>
                     <th>ID</th>

resource/template/dashboard-default/notification.html

@@ -10,7 +10,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
                 <tr>
                     <th>ID</th>
@@ -52,7 +52,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
                 <tr>
                     <th>ID</th>

resource/template/dashboard-default/server.html

@@ -19,7 +19,7 @@
                 </button>
             </div>
         </div>
-        <table class="ui very basic table">
+        <table class="ui basic table">
             <thead>
                 <tr>
                     <th><button onclick="checkAllServer()" class="ui mini nezha-primary-btn button">{{tr "SelectAll"}}</button></th>

resource/template/dashboard-default/setting.html

@@ -41,6 +41,10 @@
                 <label>{{tr "CustomCodes"}}</label>
                 <textarea name="CustomCode">{{.Conf.Site.CustomCode}}</textarea>
             </div>
+            <div class="field">
+                <label>{{tr "CustomCodesDashboard"}}</label>
+                <textarea name="CustomCodeDashboard">{{.Conf.Site.CustomCodeDashboard}}</textarea>
+            </div>
             <div class="field">
                 <label>{{tr "AccessPassword"}}</label>
                 <input type="text" name="ViewPassword" placeholder="" value="{{.Conf.Site.ViewPassword}}">
@@ -128,13 +132,13 @@
     })
     $('.checkbox').checkbox()
     $('#settingForm').find("select[name=Cover]").val({{.Conf.Cover }});
-    {{if .Conf.EnableIPChangeNotification}}
+    {{ if .Conf.EnableIPChangeNotification}}
     $('.checkbox.ip-change').checkbox('set checked')
     {{ end }}
-    {{if .Conf.EnablePlainIPInNotification}}
+    {{ if .Conf.EnablePlainIPInNotification}}
     $('.checkbox.plain-ip').checkbox('set checked')
     {{ end }}
-    {{if .Conf.DisableSwitchTemplateInFrontend }}
+    {{ if .Conf.DisableSwitchTemplateInFrontend }}
     $('.checkbox.disable-switch-template').checkbox('set checked')
     {{ end }}
 </script>

resource/template/dashboard-default/terminal.html

@@ -1,6 +1,7 @@
 {{define "dashboard-default/terminal"}}
 <!DOCTYPE html>
 <html lang="{{.Conf.Language}}">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -23,16 +24,19 @@
         background-color: black;
     }
 </style>
+
 <body onresize="onResize()">
     <div id="terminal-container"></div>
     <script src="https://unpkg.com/[email protected]/lib/xterm.js"></script>
-    <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-attach.js"></script>
     <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-fit.js"></script>
+    <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-web-links.js"></script>
+    <script src="https://unpkg.com/[email protected]/lib/trzsz.js"></script>
     <script>
         let sendResizing = false;
 
         function doResize() {
             fitAddon.fit()
+
             const w = fitAddon.proposeDimensions();
             const prefix = new Int8Array([1]);
             const resizeMessage = new TextEncoder().encode(JSON.stringify({
@@ -70,10 +74,13 @@
             cursorBlink: true,
         });
         const socket = new WebSocket((window.location.protocol == 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/terminal/' + '{{.SessionID}}');
-        const attachAddon = new AttachAddon.AttachAddon(socket);
+        socket.binaryType = 'arraybuffer';
+
+        const trzszAddon = new TrzszAddon(socket);
+        term.loadAddon(trzszAddon);
         const fitAddon = new FitAddon.FitAddon();
-        term.loadAddon(attachAddon);
         term.loadAddon(fitAddon);
+
         term.open(document.getElementById('terminal-container'));
 
         socket.onopen = () => {
@@ -90,5 +97,6 @@
         }
     </script>
 </body>
+
 </html>
 {{end}}

resource/template/theme-default/footer.html

@@ -10,14 +10,12 @@
 {{ if not .Conf.DisableSwitchTemplateInFrontend }}
 <script>
     function showSwitchTemplate(list, currentBackendTheme) {
-        console.log(list, currentBackendTheme);
+        // console.log(list, currentBackendTheme);
-        console.log("currentBackendTheme:",currentBackendTheme);
+        // console.log("currentBackendTheme:",currentBackendTheme);
     }
     showSwitchTemplate({{ .Themes }}, {{ .Conf.Site.Theme }})
 </script>
 {{ end }}
-<script>
-</script>
 </body>
 </html>
 {{end}}

resource/template/theme-default/header.html

@@ -1,6 +1,7 @@
 {{define "theme-default/header"}}
 <!DOCTYPE html>
 <html lang="{{.Conf.Language}}">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -13,14 +14,18 @@
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/css/flag-icons.min.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240616">
+    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240816">
+    <link rel="stylesheet" type="text/css" href="/static/darkmode.css?v20240816">
     <script src="https://unpkg.com/[email protected]/dist/jquery.min.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/semantic.min.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/echarts.min.js"></script>
     <script src="/static/semantic-ui-alerts.min.js"></script>
     <script src="/static/theme-default/js/mixin.js?v20240302"></script>
+    <script>
+        document.documentElement.setAttribute('nz-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
+    </script>
 </head>
+
 <body>
-{{end}} 
+    {{end}}
-            

resource/template/theme-default/home.html

@@ -240,12 +240,12 @@
                 const itemHeight = isMobile ? 10 : 10;
                 const gridLeft = 25;
                 const gridRight = 12;
-                const fontColor = "rgba(0, 0, 0, 0.68)";
                 const backgroundColor = '';
                 const borderColor = "#ffffff";
                 const chartData = this.chartDataList[id - 1];
                 const chartContainer = this.$refs[`chart${id}`][0];
-                const chart = echarts.init(chartContainer, null, {
+                const chartTheme = $('html').attr('nz-theme') == "dark" ? "dark" : "";
+                const chart = echarts.init(chartContainer, chartTheme, {
                     renderer: 'canvas',
                     useDirtyRect: false,
                     width: 'auto',
@@ -283,7 +283,6 @@
                         trigger: 'axis',
                         textStyle: {
                             fontSize: fontSize,
-                            color: fontColor
                         }
                     },
                     legend: {
@@ -292,7 +291,6 @@
                         show: true,
                         textStyle: {
                             fontSize: fontSize,
-                            color: fontColor
                         },
                         lineStyle: {
                             cap: 'butt'
@@ -332,7 +330,6 @@
                     series: seriesData,
                     textStyle: {
                         fontSize: fontSize,
-                        color: fontColor
                     },
                     grid: {
                         top: '30',

resource/template/theme-default/network.html

@@ -18,7 +18,7 @@
         </div>
     </div>
     <div class="ui container">
-        <div ref="chartDom" style="border-radius: 28px; margin-top: 15px;height: 520px;max-width: 1400px;overflow: hidden"></div>
+        <div ref="chartDom" style="margin-top: 15px;height: 520px;overflow: hidden"></div>
     </div>
 </div>
 
@@ -65,10 +65,10 @@
                     }
                 },
                 grid: {
-                    left: '8%',
+                    left: this.isMobile ? '8%' : '3.8%',
-                    right: '8%',
+                    right: this.isMobile ? '8%' : '3.8%',
                 },
-                backgroundColor: 'rgba(255, 255, 255, 0.8)',
+                backgroundColor: '',
                 toolbox: {
                     feature: {
                         dataZoom: {
@@ -243,7 +243,8 @@
                 return str.includes('Windows')
             },
             renderChart() {
-              this.myChart = echarts.init(this.$refs.chartDom);
+              const chartTheme = $('html').attr('nz-theme') == "dark" ? "dark" : "";
+              this.myChart = echarts.init(this.$refs.chartDom,chartTheme);
               this.myChart.setOption(this.option);
             },
             resizeHandle () {

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

@@ -1,36 +1,36 @@
 {{define "theme-server-status/footer"}}
-	</div>
+    </div>
-	<footer class="container-fluid">
+    <footer class="container-fluid">
-	    <p>{{ .Conf.Site.Brand }} | Theme ServerStatus | Powered by <a target="_blank" href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}</p>
+        <p>{{ .Conf.Site.Brand }} | Theme ServerStatus | Powered by <a target="_blank" href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}</p>
-	</footer>
+    </footer>
-	<aside class="toolbox">
+    <aside class="toolbox">
-		<template v-if="showTools">
+        <template v-if="showTools">
-		    <span v-if="page=='index' && countryMapChartData.length!=0" class="showMapChart">
+            <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>
+                <i @click="showMapChart" data-toggle="modal" data-target="#mapChartBox" class="bi bi-geo-alt"></i>
-		    </span>
+            </span>
-		    <span class="toggleView">
+            <span class="toggleView">
-		        <i v-if="showGroup" @click="toggleShowGroup" class="show-nogroup bi bi-justify"></i>
+                <i v-if="showGroup" @click="toggleShowGroup" class="show-nogroup bi bi-justify"></i>
-		        <i v-else @click="toggleShowGroup" class="show-group bi bi-view-stacked"></i>
+                <i v-else @click="toggleShowGroup" class="show-group bi bi-view-stacked"></i>
-		    </span>
+            </span>
-			<span class="toggleSemiTransparent" @click="toggleSemiTransparent">
+            <span class="toggleSemiTransparent" @click="toggleSemiTransparent">
-			    <i class="bi" :class="semiTransparent ? 'bi-droplet' : 'bi-droplet-half'"></i>
+                <i class="bi" :class="semiTransparent ? 'bi-droplet' : 'bi-droplet-half'"></i>
-			</span>
+            </span>
-	    </template>
+        </template>
-	   	<span v-if="!showTools">
+           <span v-if="!showTools">
-	    	<i @click="toggleShowTools" class="bi bi-three-dots"></i>
+            <i @click="toggleShowTools" class="bi bi-three-dots"></i>
-	    </span>
+        </span>
-	    <span class="setTheme">
+        <span class="setTheme">
-	        <i v-if="theme === 'light'" @click="setTheme('dark')" class="setTheme-dark bi bi-moon-fill"></i>
+            <i v-if="theme === 'light'" @click="setTheme('dark')" class="setTheme-dark bi bi-moon-fill"></i>
-	        <i v-else @click="setTheme('light')" class="setTheme-light bi bi-brightness-high-fill"></i>
+            <i v-else @click="setTheme('light')" class="setTheme-light bi bi-brightness-high-fill"></i>
-	    </span>
+        </span>
-	    <span v-if="showGoTop" class="showGoTop">
+        <span v-if="showGoTop" class="showGoTop">
-	        <i @click="goTop" class="goTop bi bi-arrow-up"></i>
+            <i @click="goTop" class="goTop bi bi-arrow-up"></i>
-	    </span>
+        </span>
-	</aside>
+    </aside>
-	<template v-if="semiTransparent">
+    <template v-if="semiTransparent">
-   		<link rel="stylesheet" href="/static/theme-server-status/css/light.plus.css?v20240807">
+        <link rel="stylesheet" href="/static/theme-server-status/css/light.plus.css?v20240807">
-   		<link rel="stylesheet" href="/static/theme-server-status/css/dark.plus.css?v20240807"> 
+    	<link rel="stylesheet" href="/static/theme-server-status/css/dark.plus.css?v20240807"> 
-	</template>
+    </template>
 </div>
 {{if ts .CustomCode}}{{.CustomCode|safe}}{{end}}
 </body>

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

@@ -16,7 +16,7 @@
     <script src="https://unpkg.com/[email protected]/dist/js/bootstrap.min.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
     <script src="https://unpkg.com/[email protected]/dist/echarts.min.js"></script>
-    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v202408011">
+    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v202408016">
     <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v202408011">
     <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240811">
     <script src="/static/theme-server-status/js/mixin.js?v20240811"></script>

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

@@ -551,6 +551,10 @@
                         symbol: 'none',
                         data: data,
                         connectNulls: true,
+                        legendHoverLink: false,
+                        emphasis: {
+                            disabled: true
+                        },
                         lineStyle: {
                             width: lineStyleWidth
                         }  
@@ -560,7 +564,7 @@
                 const legendData = chartData.map(item => item.monitor_name);
                 const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 3;
                 const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
-                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28)
+                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28);
                 const height = 300 + autoIncrement;
                 const gridTop = 40 + autoIncrement;
                 const legendIcon = this.isMobile ? 'rect' : ""; 

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

@@ -12,7 +12,7 @@
             </li>
             <li class="dropdown-item" v-for="server in servers" @click="showCharts(server.ID)">
                 <a><i :class="'fi fi-' + (server.Host.CountryCode || 'rb')"></i> @#server.Name#@ <i v-if="server.ID == currentServerId" class="check icon"></i></a>
-            </li>          
+            </li>
         </ul>
     </div>
     <div class="chartTitle"><i class="chartCountryCode" :class="'fi fi-' + chartCountryCode"></i> @#chartTitle#@</div>
@@ -44,7 +44,6 @@
         },
         methods: {
             showCharts(id) {
-                const chartContainer = document.getElementById('chartbox');
                 // 发起数据请求
                 const url = `/api/v1/monitor/${id}`;
                 fetch(url)
@@ -64,17 +63,13 @@
                     });
             },
             renderCharts(id, reload = false) {
-                if (!this.chartDataList[id]) return;  
+                if(!this.chartDataList[id]) return;
-                this.disposeCharts();
+                if(this.chart) this.disposeCharts(this.chart);
                 this.currentServerId = id;
                 this.chartCountryCode = this.getServerCountryCode(id);
+                this.chartTitle = this.chartDataList[id][0].server_name;
                 const chartData = this.chartDataList[id];
                 const chartContainer = document.getElementById('chartbox');
-                this.chartTitle = chartData[0].server_name;
-                if (reload) {
-                    const existingChart = echarts.getInstanceByDom(chartContainer);
-                    if (existingChart) existingChart.dispose();
-                }
                 // 定义图表参数值
                 const MaxTCPPingValue = {{.Conf.MaxTCPPingValue}} ? {{.Conf.MaxTCPPingValue}} : 300;
                 const autoheight = this.isMobile ? (window.innerHeight - 200) : (window.innerHeight - 250);
@@ -111,34 +106,35 @@
                     let data = { main: [], markLine: []};
                     item.avg_delay.forEach((avgDelay, index) => {
                         const threshold = 0.9 * MaxTCPPingValue; // 定义阀值,用于判断是否丢包
-                        const filterAvgDelay = item.avg_delay.filter(value => value !== 0 && value !== MaxTCPPingValue);
-                        const max = Math.max(...filterAvgDelay).toFixed(1);
-                        const autoAvgDelay = 1.05 * max > 0.91 * MaxTCPPingValue ? 1.05 * max : 0.91 * MaxTCPPingValue;
                         // 定义丢包 1. avgDelay==0  2. avgDelay>=MaxTCPPingValue 3. avgDelay>=threshold
                         if(avgDelay == 0 || avgDelay >= MaxTCPPingValue){ //绝对丢包
                             loss += 1;
                             const lossrate = 100 * loss / (index + 1);
-                            data['main'].push(
+                            if(lossrate != 100) {
-                                [item.created_at[index], autoAvgDelay, lossrate]
+                                data['main'].push(
-                            );
+                                    [item.created_at[index], MaxTCPPingValue, lossrate]
-                            data['markLine'].push({
+                                );
-                                xAxis: item.created_at[index],
+                                data['markLine'].push({
-                                label: { show: false },
+                                    xAxis: item.created_at[index],
-                                emphasis: { disabled: true },
+                                    label: { show: false },
-                                lineStyle: { type: "solid" }
+                                    emphasis: { disabled: true },
-                            });
+                                    lineStyle: { type: "solid" }
+                                });
+                            }
                         } else if (avgDelay >= threshold && avgDelay < MaxTCPPingValue){ // 相对丢包
                             loss += 1;
                             const lossrate = 100 * loss / (index + 1);
-                            data['main'].push(
+                            if(lossrate != 100) {
-                                [item.created_at[index], avgDelay, lossrate]
+                                data['main'].push(
-                            );
+                                    [item.created_at[index], avgDelay, lossrate]
-                            data['markLine'].push({
+                                );
-                                xAxis: item.created_at[index],
+                                data['markLine'].push({
-                                label: { show: false },
+                                    xAxis: item.created_at[index],
-                                emphasis: { disabled: true },
+                                    label: { show: false },
-                                lineStyle: { type: "solid" }
+                                    emphasis: { disabled: true },
-                            });
+                                    lineStyle: { type: "solid" }
+                                });
+                            }
                         } else { // 未丢包
                             const lossrate = 100 * loss / (index + 1);
                             data['main'].push(
@@ -158,6 +154,10 @@
                             smooth: true,
                             symbol: 'none',
                             connectNulls: true,
+                            legendHoverLink: false,
+                            emphasis: {
+                                disabled: true
+                            },
                             lineStyle: {
                                 width: lineStyleWidth
                             },  
@@ -216,7 +216,7 @@
                 });
                 const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 3;
                 const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
-                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28)
+                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28);
                 const height = autoheight + autoIncrement;
                 const gridTop = 40 + autoIncrement;
                 const legendIcon = this.isMobile ? 'rect' : ""; 
@@ -333,11 +333,9 @@
                     }
                 });
             },
-            disposeCharts(){
+            disposeCharts(chart){
-                if(this.chart) {
+                chart.dispose();
-                    this.chart.dispose();
+                chart = null;
-                    this.chart = null;
-                }
             },
             getServerCountryCode(id){
                 const result = this.servers.find(item => item.ID == id);