diff --git a/src/components/common/system-task-type.vue b/src/components/common/system-task-type.vue new file mode 100644 index 0000000..701a19b --- /dev/null +++ b/src/components/common/system-task-type.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 44e3149..72abf5c 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: '通知场景', @@ -552,7 +552,7 @@ const local: App.I18n.Schema = { job: '定时任务', workflow: '工作流', form: { - notifyName: '请选择告警通知名称', + notifyName: '请输入通知名称', description: '请输入描述', notifyType: '请选择通知类型', notifyAttribute: '请求输入通知属性', diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index e12ce0f..af34254 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -600,7 +600,10 @@ declare namespace Api { /** notify-config search params */ type NotifySearchParams = CommonType.RecordNullable< - Pick & + Pick< + Api.NotifyConfig.NotifyConfig, + 'groupName' | 'systemTaskType' | 'notifyStatus' | 'notifyScene' | 'notifyName' + > & CommonSearchParams >; diff --git a/src/views/notify/config/index.vue b/src/views/notify/config/index.vue index d3e3630..7445efb 100644 --- a/src/views/notify/config/index.vue +++ b/src/views/notify/config/index.vue @@ -31,7 +31,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP // the value can not be undefined, otherwise the property in Form will not be reactive groupName: null, notifyStatus: null, - notifyScene: null + notifyScene: null, + notifyName: null, + systemTaskType: null }, columns: () => [ { @@ -102,6 +104,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP return ; } }, + { + key: 'notifyName', + title: $t('page.notifyConfig.notifyName'), + align: 'left', + width: 120 + }, { key: 'notifyScene', title: $t('page.notifyConfig.notifyScene'), diff --git a/src/views/notify/config/modules/notify-config-search.vue b/src/views/notify/config/modules/notify-config-search.vue index baf6ceb..470ef72 100644 --- a/src/views/notify/config/modules/notify-config-search.vue +++ b/src/views/notify/config/modules/notify-config-search.vue @@ -9,6 +9,7 @@ defineOptions({ interface Emits { (e: 'reset'): void; + (e: 'search'): void; } @@ -30,9 +31,19 @@ function search() { - - + + + + + +