diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 3548efd75..606aa7371 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -5463,6 +5463,7 @@ const message = { alertNotice: 'Alert Notification', methodConfig: 'Notification Method Configuration', createMethod: 'Create Notification Method', + methodInvalid: 'Invalid configuration {0}', commonConfig: 'Global Configuration', smsConfig: 'SMS', smsConfigHelper: 'Configure phone numbers for SMS notifications', diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index 2ebcfbd20..334b4625c 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -5531,6 +5531,7 @@ const message = { alertNotice: 'Notificación de alerta', methodConfig: 'Config de métodos de notificación', createMethod: 'Crear método de notificación', + methodInvalid: 'Configuración inválida {0}', commonConfig: 'Config global', smsConfig: 'SMS', smsConfigHelper: 'Configura teléfonos para notificaciones SMS', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index b63ca7fd4..0e678ee96 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -5505,6 +5505,7 @@ const message = { alertNotice: 'アラート通知', methodConfig: '通知方法の設定', createMethod: '通知方法を作成', + methodInvalid: '無効な設定 {0}', commonConfig: 'グローバル設定', smsConfig: 'SMS', smsConfigHelper: 'SMS 通知の電話番号を設定する', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 2dd29c962..1c7103de6 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -5390,6 +5390,7 @@ const message = { alertNotice: '알림 통지', methodConfig: '알림 방법 설정', createMethod: '알림 방법 생성', + methodInvalid: '유효하지 않은 설정 {0}', commonConfig: '전역 설정', smsConfig: 'SMS', smsConfigHelper: 'SMS 알림을 받을 전화번호를 설정합니다', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 0217ad0e2..b0d424b85 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -5577,6 +5577,7 @@ const message = { alertNotice: 'Pemberitahuan Amaran', methodConfig: 'Konfigurasi Kaedah Pemberitahuan', createMethod: 'Cipta Kaedah Pemberitahuan', + methodInvalid: 'Konfigurasi tidak sah {0}', commonConfig: 'Konfigurasi Global', smsConfig: 'SMS', smsConfigHelper: 'Konfigurasi nombor untuk pemberitahuan SMS', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 2e9134540..be4d0e046 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -5723,6 +5723,7 @@ const message = { alertNotice: 'Notificação de Alerta', methodConfig: 'Configuração do Método de Notificação', createMethod: 'Criar Método de Notificação', + methodInvalid: 'Configuração inválida {0}', commonConfig: 'Configuração Global', smsConfig: 'SMS', smsConfigHelper: 'Configure os números para notificação por SMS', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 16b690c38..7c4ad9507 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -5575,6 +5575,7 @@ const message = { alertNotice: 'Уведомление об оповещении', methodConfig: 'Настройка способа уведомления', createMethod: 'Создать способ уведомления', + methodInvalid: 'Недопустимая конфигурация {0}', commonConfig: 'Глобальная настройка', smsConfig: 'SMS', smsConfigHelper: 'Настройка номеров для SMS-уведомлений', diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 215f98bda..d3ec9e6b6 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -5567,6 +5567,7 @@ const message = { alertNotice: 'Uyarı Bildirimi', methodConfig: 'Bildirim Yöntemi Ayarı', createMethod: 'Bildirim Yöntemi Oluştur', + methodInvalid: 'Geçersiz yapılandırma {0}', commonConfig: 'Genel Ayar', smsConfig: 'SMS', smsConfigHelper: 'SMS bildirimi için telefon numaralarını yapılandırın', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 1242e3982..6a791ea64 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -5100,6 +5100,7 @@ const message = { alertNotice: '警報通知', methodConfig: '發送方式設定', createMethod: '建立發送方式', + methodInvalid: '失效設定 {0}', commonConfig: '全域設定', smsConfig: '簡訊', smsConfigHelper: '設定簡訊通知號碼', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 21765ebdf..92a34b66d 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -5070,6 +5070,7 @@ const message = { alertNotice: '告警通知', methodConfig: '发送方式配置', createMethod: '创建发送方式', + methodInvalid: '失效配置 {0}', commonConfig: '全局配置', smsConfig: '短信通知', smsConfigHelper: '配置短信通知号码', diff --git a/frontend/src/views/setting/alert/dash/index.vue b/frontend/src/views/setting/alert/dash/index.vue index 9d9da6ec1..b15299ee2 100644 --- a/frontend/src/views/setting/alert/dash/index.vue +++ b/frontend/src/views/setting/alert/dash/index.vue @@ -30,7 +30,7 @@ :label="$t('xpack.alert.licenseException')" /> @@ -214,7 +214,7 @@ const openView = async ( rowData: Partial = { type: isMaster.value && !isEE.value ? 'panelPwdEndTime' : 'sshLogin', cycle: 15, - count: 0, + count: isMaster.value && !isEE.value ? 0 : 3, sendCount: 3, method: '', project: '', @@ -300,9 +300,12 @@ const formatMethod = (row: Alert.AlertInfo) => { return typeLabel; } } + const invalidLabel = /^\d+$/.test(method) + ? i18n.global.t('xpack.alert.methodInvalid', [`#${method}`]) + : i18n.global.t('xpack.alert.methodInvalid', [method]); const oldLabel = i18n.global.t(`xpack.alert.${method}`); if (!oldLabel || oldLabel === `xpack.alert.${method}` || oldLabel.includes('.')) { - return /^\d+$/.test(method) ? `#${method}` : method; + return invalidLabel; } return oldLabel; }; diff --git a/frontend/src/views/setting/alert/dash/task/index.vue b/frontend/src/views/setting/alert/dash/task/index.vue index dba77f910..0818d984d 100644 --- a/frontend/src/views/setting/alert/dash/task/index.vue +++ b/frontend/src/views/setting/alert/dash/task/index.vue @@ -570,6 +570,7 @@ const acceptParams = (params: DialogProps): void => { } initOptions(dialogData.value.rowData.type, dialogData.value.rowData.subType); visible.value = true; + console.log(dialogData.value.rowData); }; const rules = reactive({ diff --git a/frontend/src/views/setting/alert/log/index.vue b/frontend/src/views/setting/alert/log/index.vue index a91026df2..c30649edf 100644 --- a/frontend/src/views/setting/alert/log/index.vue +++ b/frontend/src/views/setting/alert/log/index.vue @@ -21,7 +21,12 @@ - + @@ -245,6 +250,9 @@ const formatMethod = (row: Alert.AlertLog) => { } } + const invalidLabel = /^\d+$/.test(method) + ? i18n.global.t('xpack.alert.methodInvalid', [`#${method}`]) + : i18n.global.t('xpack.alert.methodInvalid', [method]); switch (method) { case 'mail': case 'email': @@ -264,7 +272,7 @@ const formatMethod = (row: Alert.AlertLog) => { case 'bark': return t('xpack.alert.bark'); default: - return /^\d+$/.test(method) ? `#${method}` : method; + return invalidLabel; } };