diff --git a/cmd/dashboard/controller/member_api.go b/cmd/dashboard/controller/member_api.go index 3eef98d..4514d84 100644 --- a/cmd/dashboard/controller/member_api.go +++ b/cmd/dashboard/controller/member_api.go @@ -394,6 +394,7 @@ type monitorForm struct { MaxLatency float32 LatencyNotify string EnableTriggerTask string + EnableShowInService string FailTriggerTasksRaw string RecoverTriggerTasksRaw string } @@ -415,6 +416,7 @@ func (ma *memberAPI) addOrEditMonitor(c *gin.Context) { m.LatencyNotify = mf.LatencyNotify == "on" m.MinLatency = mf.MinLatency m.MaxLatency = mf.MaxLatency + m.EnableShowInService = mf.EnableShowInService == "on" m.EnableTriggerTask = mf.EnableTriggerTask == "on" m.RecoverTriggerTasksRaw = mf.RecoverTriggerTasksRaw m.FailTriggerTasksRaw = mf.FailTriggerTasksRaw diff --git a/model/monitor.go b/model/monitor.go index b32fd3d..69f3ad2 100644 --- a/model/monitor.go +++ b/model/monitor.go @@ -50,6 +50,7 @@ type Monitor struct { Cover uint8 EnableTriggerTask bool `gorm:"default: false"` + EnableShowInService bool `gorm:"default: false"` FailTriggerTasksRaw string `gorm:"default:'[]'"` RecoverTriggerTasksRaw string `gorm:"default:'[]'"` FailTriggerTasks []uint64 `gorm:"-" json:"-"` // 失败时执行的触发任务id diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml index d7161fe..79e3f37 100644 --- a/resource/l10n/en-US.toml +++ b/resource/l10n/en-US.toml @@ -611,4 +611,7 @@ other = "Hide for Guest" other = "Menu" [NetworkSpiter] -other = "Network Monitor" \ No newline at end of file +other = "Network" + +[EnableShowInService] +other = "Enable Show in Service" \ No newline at end of file diff --git a/resource/l10n/es-ES.toml b/resource/l10n/es-ES.toml index 5c5f318..adee1d5 100644 --- a/resource/l10n/es-ES.toml +++ b/resource/l10n/es-ES.toml @@ -611,4 +611,7 @@ other = "Ocultar para Invitados" other = "Menú" [NetworkSpiter] -other = "Supervisión De Redes" +other = "Red" + +[EnableShowInService] +other = "Mostrar en servicio" \ No newline at end of file diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index ab7bfbb..598f306 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -611,4 +611,7 @@ other = "对游客隐藏" other = "菜单" [NetworkSpiter] -other = "网络监控" \ No newline at end of file +other = "网络" + +[EnableShowInService] +other = "在服务中显示" diff --git a/resource/l10n/zh-TW.toml b/resource/l10n/zh-TW.toml index 4bf8974..6d49408 100644 --- a/resource/l10n/zh-TW.toml +++ b/resource/l10n/zh-TW.toml @@ -611,4 +611,7 @@ other = "對遊客隱藏" other = "菜單" [NetworkSpiter] -other = "網絡監控" \ No newline at end of file +other = "網絡" + +[EnableShowInService] +other = "在服務中顯示" \ No newline at end of file diff --git a/resource/static/main.js b/resource/static/main.js index df5dd15..a38b5a0 100644 --- a/resource/static/main.js +++ b/resource/static/main.js @@ -339,6 +339,11 @@ function addOrEditMonitor(monitor) { modal.find("select[name=Type]").val(monitor ? monitor.Type : 1); modal.find("select[name=Cover]").val(monitor ? monitor.Cover : 0); modal.find("input[name=NotificationTag]").val(monitor ? monitor.NotificationTag : null); + if (monitor && monitor.EnableShowInService) { + modal.find(".ui.nb-show-in-service.checkbox").checkbox("set checked") + } else { + modal.find(".ui.nb-show-in-service.checkbox").checkbox("set unchecked") + } if (monitor && monitor.Notify) { modal.find(".ui.nb-notify.checkbox").checkbox("set checked"); } else { diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html index a9a7088..051bda8 100644 --- a/resource/template/common/footer.html +++ b/resource/template/common/footer.html @@ -10,7 +10,7 @@ - + -{{end}} \ No newline at end of file +{{end}} diff --git a/resource/template/theme-angel-kanade/footer.html b/resource/template/theme-angel-kanade/footer.html index 08498fa..a9cf0ba 100644 --- a/resource/template/theme-angel-kanade/footer.html +++ b/resource/template/theme-angel-kanade/footer.html @@ -12,7 +12,7 @@ - +