From 9fde8c447dd574b0e4cd85d7a0ee7c875194b49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Mon, 21 Jul 2025 19:02:42 +0800
Subject: [PATCH] fix: Improve alert notifications (#9591)

---
 agent/app/service/cronjob_helper.go                      | 1 +
 frontend/src/views/setting/alert/dash/task/index.vue     | 4 ----
 frontend/src/views/setting/alert/setting/email/index.vue | 9 ++-------
 frontend/src/views/setting/alert/setting/index.vue       | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go
index f2ef92aca..cbb0ba690 100644
--- a/agent/app/service/cronjob_helper.go
+++ b/agent/app/service/cronjob_helper.go
@@ -48,6 +48,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 			global.LOG.Debugf("preper to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err)
 			record.TaskID = ""
 			cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), record.Records)
+			handleCronJobAlert(cronjob)
 			return
 		}
 		if err := taskItem.Execute(); err != nil {
diff --git a/frontend/src/views/setting/alert/dash/task/index.vue b/frontend/src/views/setting/alert/dash/task/index.vue
index aef0fa574..6530c54a1 100644
--- a/frontend/src/views/setting/alert/dash/task/index.vue
+++ b/frontend/src/views/setting/alert/dash/task/index.vue
@@ -288,10 +288,6 @@
                         <el-select class="selectClass" v-model="dialogData.rowData!.sendMethod" multiple cleanable>
                             <el-option value="mail" :label="$t('xpack.alert.mail')" />
                             <el-option value="sms" :label="$t('xpack.alert.sms')" />
-                            <el-option value="wechat" disabled :label="$t('xpack.alert.wechat')" />
-                            <el-option value="weCom" disabled :label="$t('xpack.alert.weCom')" />
-                            <el-option value="dingTalk" disabled :label="$t('xpack.alert.dingTalk')" />
-                            <el-option value="feiShu" disabled :label="$t('xpack.alert.feiShu')" />
                         </el-select>
                     </el-form-item>
                     <span class="input-help">
diff --git a/frontend/src/views/setting/alert/setting/email/index.vue b/frontend/src/views/setting/alert/setting/email/index.vue
index 8c9721557..d01ff8fa0 100644
--- a/frontend/src/views/setting/alert/setting/email/index.vue
+++ b/frontend/src/views/setting/alert/setting/email/index.vue
@@ -36,30 +36,25 @@
                     </el-form-item>
                     <el-form-item :label="$t('xpack.alert.port')" prop="port">
                         <el-input v-model.number="form.config.port" :min="1" :max="65535" />
-                        <span class="input-help">
-                            {{ $t('xpack.alert.portHelper') }}
-                        </span>
                     </el-form-item>
                     <el-form-item :label="$t('xpack.alert.encryption')" prop="encryption">
                         <div class="flex items-center gap-2">
-                            <span>SSL</span>
+                            <span class="el-form-item__label">SSL</span>
                             <el-switch
                                 v-model="form.config.encryption"
                                 :active-value="'SSL'"
                                 :inactive-value="form.config.encryption === 'SSL' ? 'NONE' : form.config.encryption"
-                                @change="handleEncryptionSwitch('SSL')"
                             />
                         </div>
                         <span class="input-help">
                             {{ $t('xpack.alert.sslHelper') }}
                         </span>
                         <div class="flex items-center gap-2">
-                            <span>TLS</span>
+                            <span class="el-form-item__label">TLS</span>
                             <el-switch
                                 v-model="form.config.encryption"
                                 :active-value="'TLS'"
                                 :inactive-value="form.config.encryption === 'TLS' ? 'NONE' : form.config.encryption"
-                                @change="handleEncryptionSwitch('TLS')"
                             />
                         </div>
                         <span class="input-help">
diff --git a/frontend/src/views/setting/alert/setting/index.vue b/frontend/src/views/setting/alert/setting/index.vue
index c82b6afea..850d5772f 100644
--- a/frontend/src/views/setting/alert/setting/index.vue
+++ b/frontend/src/views/setting/alert/setting/index.vue
@@ -106,7 +106,7 @@
                             </el-button>
                         </el-alert>
                     </el-card>
-                    <el-card class="rounded-2xl shadow hover:shadow-md transition-all">
+                    <el-card class="rounded-2xl shadow hover:shadow-md transition-all" v-if="globalStore.isProductPro">
                         <div class="flex items-center justify-between mb-2">
                             <div class="text-lg font-semibold">{{ $t('xpack.alert.smsConfig') }}</div>
                             <div>