Skip to content

Commit 36e8367

Browse files
committed
Update.
1 parent 967d38e commit 36e8367

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

cmd/dashboard/controller/controller.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@ func loadThirdPartyTemplates(tmpl *template.Template) *template.Template {
113113
continue
114114
}
115115

116+
// 处理公共模板目录
117+
if themeDir == "common" || themeDir == "component" {
118+
// load common/component templates
119+
ret = loadTemplates(ret, themeDir)
120+
continue
121+
}
122+
116123
if !strings.HasPrefix(themeDir, "theme-") {
117124
log.Printf("NG>> Invalid theme name: %s", themeDir)
118125
continue

resource/static/main.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ function addOrEditAlertRule(rule) {
250250
// 需要在 showFormModal 进一步拼接数组
251251
modal
252252
.find("input[name=FailTriggerTasksRaw]")
253-
.val(rule ? "[]," + failTriggerTasks.substr(1, failTriggerTasks.length - 2) : "[]");
253+
.val(rule ? failTriggerTasks : "[]");
254254
modal
255255
.find("input[name=RecoverTriggerTasksRaw]")
256-
.val(rule ? "[]," + recoverTriggerTasks.substr(1, recoverTriggerTasks.length - 2) : "[]");
256+
.val(rule ? recoverTriggerTasks : "[]");
257257

258258
showFormModal(".rule.modal", "#ruleForm", "/api/alert-rule");
259259
}
@@ -563,14 +563,14 @@ function addOrEditMonitor(monitor) {
563563
// 需要在 showFormModal 进一步拼接数组
564564
modal
565565
.find("input[name=FailTriggerTasksRaw]")
566-
.val(monitor ? "[]," + failTriggerTasks.substr(1, failTriggerTasks.length - 2) : "[]");
566+
.val(monitor ? failTriggerTasks : "[]");
567567
modal
568568
.find("input[name=RecoverTriggerTasksRaw]")
569-
.val(monitor ? "[]," + recoverTriggerTasks.substr(1, recoverTriggerTasks.length - 2) : "[]");
569+
.val(monitor ? recoverTriggerTasks : "[]");
570570

571571
modal
572572
.find("input[name=SkipServersRaw]")
573-
.val(monitor ? "[]," + servers.substr(1, servers.length - 2) : "[]");
573+
.val(monitor ? servers : "[]");
574574
showFormModal(".monitor.modal", "#monitorForm", "/api/monitor");
575575
}
576576
function addOrEditCron(cron) {
@@ -608,7 +608,7 @@ function addOrEditCron(cron) {
608608
// 需要在 showFormModal 进一步拼接数组
609609
modal
610610
.find("input[name=ServersRaw]")
611-
.val(cron ? "[]," + servers.substr(1, servers.length - 2) : "[]");
611+
.val(cron ? servers : "[]");
612612
modal.find("textarea[name=Command]").val(cron ? cron.Command : null);
613613
if (cron && cron.PushSuccessful) {
614614
modal.find(".ui.push-successful.checkbox").checkbox("set checked");

0 commit comments

Comments
 (0)