From 5be38d0a4a5b22c0e491c6c8e515b47c5756cf00 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 25 Dec 2024 23:34:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.3.0-beta1):=20=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/locales/langs/zh-cn.ts | 2 +-
src/views/notify/config/index.vue | 6 +++---
.../config/modules/notify-config-detail-drawer.vue | 4 ++--
.../config/modules/notify-config-operate-drawer.vue | 13 +++++++++----
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 44e3149..ec6c141 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -541,7 +541,7 @@ const local: App.I18n.Schema = {
title: '告警通知列表',
groupName: '组名称',
businessName: '业务ID',
- notifyName: '告警通知名称',
+ notifyName: '通知名称',
notifyStatus: '通知状态',
notifyType: '通知类型',
notifyScene: '通知场景',
diff --git a/src/views/notify/config/index.vue b/src/views/notify/config/index.vue
index d3e3630..87c657f 100644
--- a/src/views/notify/config/index.vue
+++ b/src/views/notify/config/index.vue
@@ -46,8 +46,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
width: 64
},
{
- key: 'businessName',
- title: $t('page.notifyConfig.businessName'),
+ key: 'notifyName',
+ title: $t('page.notifyConfig.notifyName'),
align: 'left',
width: 120,
render: row => {
@@ -58,7 +58,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
return (
- {row.businessName}
+ {row.notifyName}
);
}
diff --git a/src/views/notify/config/modules/notify-config-detail-drawer.vue b/src/views/notify/config/modules/notify-config-detail-drawer.vue
index 48c1579..1d0104d 100644
--- a/src/views/notify/config/modules/notify-config-detail-drawer.vue
+++ b/src/views/notify/config/modules/notify-config-detail-drawer.vue
@@ -22,8 +22,8 @@ const visible = defineModel('visible', {
-
- {{ rowData?.businessName }}
+
+ {{ rowData?.notifyName }}
{{ rowData?.groupName }}
diff --git a/src/views/notify/config/modules/notify-config-operate-drawer.vue b/src/views/notify/config/modules/notify-config-operate-drawer.vue
index 92e0bfc..727f9df 100644
--- a/src/views/notify/config/modules/notify-config-operate-drawer.vue
+++ b/src/views/notify/config/modules/notify-config-operate-drawer.vue
@@ -61,7 +61,7 @@ const retrySceneDisable = defineModel('retrySceneDisable', {
default: true
});
-const notifySceneOptions = ref[]>(translateOptions(retryNotifySceneOptions));
+const notifySceneOptions = ref[]>([]);
const { formRef, validate, restoreValidation } = useNaiveForm();
const { defaultRequiredRule } = useFormRules();
@@ -145,6 +145,7 @@ function handleUpdateModelWhenEdit() {
Object.assign(model, createDefaultModel());
retrySceneDisable.value = true;
retryNotifyStatusDisable.value = true;
+ notifySceneOptions.value = [];
return;
}
@@ -292,6 +293,13 @@ watch(visible, () => {
+
+
+
@@ -303,9 +311,6 @@ watch(visible, () => {
@update:value="systemTaskTypeChange"
/>
-
-
-