From eb1424e832b661a0c3260225522240badcbd0cee Mon Sep 17 00:00:00 2001
From: wodeyangzipingpingwuqi <zhengweilins@foxmail.com>
Date: Thu, 26 Dec 2024 17:50:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.3.0-beta1):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=9C=BA=E6=99=AF=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/system-task-type.vue    | 32 +++++++++++++++++++
 src/locales/langs/zh-cn.ts                    |  4 +--
 src/typings/api.d.ts                          |  5 ++-
 src/views/notify/config/index.vue             | 10 +++++-
 .../config/modules/notify-config-search.vue   | 18 +++++++++--
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 src/components/common/system-task-type.vue

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 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { $t } from '@/locales';
+import { translateOptions } from '@/utils/common';
+import { systemTaskTypeOptions } from '@/constants/business';
+
+defineOptions({
+  name: 'SystemTaskType'
+});
+
+interface Emits {
+  (e: 'update:value', value: Api.NotifyConfig.SystemTaskType): void;
+}
+const emit = defineEmits<Emits>();
+
+const valueRef = ref<Api.NotifyConfig.SystemTaskType>();
+
+const handleUpdate = (value: Api.NotifyConfig.SystemTaskType) => {
+  emit('update:value', value);
+};
+</script>
+
+<template>
+  <NSelect
+    v-model:value="valueRef"
+    :placeholder="$t('page.notifyConfig.systemTaskType')"
+    :options="translateOptions(systemTaskTypeOptions)"
+    @update:value="handleUpdate"
+  />
+</template>
+
+<style scoped></style>
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<Api.NotifyConfig.NotifyConfig, 'groupName' | 'systemTaskType' | 'notifyStatus' | 'notifyScene'> &
+      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 <StatusSwitch v-model:value={row.notifyStatus} onSubmitted={fetchFn} />;
       }
     },
+    {
+      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() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.groupName')" path="groupName" class="pr-24px">
       <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
-    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyScene')" path="notifyScene" class="pr-24px">
-      <SelectScene v-model:value="model.notifyScene" :group-name="model.groupName as string" clearable />
+    <NFormItemGi
+      span="24 s:12 m:6"
+      :label="$t('page.notifyConfig.systemTaskType')"
+      path="systemTaskType"
+      class="pr-24px"
+    >
+      <SystemTaskType v-model:value="model.systemTaskType" clearable />
     </NFormItemGi>
+    <!--
+<NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyScene')" path="notifyScene" class="pr-24px">
+      <SelectScene v-model:value="model.notifyScene" :group-name="model.groupName as string" clearable/>
+    </NFormItemGi>
+-->
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyStatus')" path="notifyStatus" class="pr-24px">
       <NSelect
         v-model:value="model.notifyStatus"
@@ -41,6 +52,9 @@ function search() {
         clearable
       />
     </NFormItemGi>
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.notifyName')" path="notifyName" class="pr-24px">
+      <NInput v-model:value="model.notifyName" :placeholder="$t('page.notifyConfig.form.notifyName')" clearable />
+    </NFormItemGi>
   </SearchForm>
 </template>