From 398466a852c1ca646a7fd7273db69b02260c0d62 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 19 Jun 2024 17:32:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E5=85=81=E8=AE=B8=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/group/modules/group-search.vue        |  2 +-
 .../job/batch/modules/job-batch-search.vue      |  6 +++---
 src/views/job/task/modules/job-task-search.vue  |  5 +++--
 .../namespace/modules/namespace-search.vue      |  2 +-
 .../modules/notify-recipient-search.vue         |  6 +++++-
 .../modules/notify-config-operate-drawer.vue    | 15 +++++++++------
 .../scene/modules/notify-config-search.vue      | 17 ++++++++++++-----
 src/views/pods/modules/pods-search.vue          |  2 +-
 .../dead-letter/modules/dead-letter-search.vue  |  4 ++--
 .../retry/log/modules/retry-log-search.vue      | 10 +++++-----
 src/views/retry/scene/modules/scene-search.vue  |  4 ++--
 .../retry/task/modules/retry-task-search.vue    | 11 ++++++-----
 .../manager/modules/user-manager-search.vue     |  2 +-
 .../batch/modules/workflow-batch-search.vue     |  4 ++--
 .../workflow/task/modules/workflow-search.vue   |  5 +++--
 15 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/src/views/group/modules/group-search.vue b/src/views/group/modules/group-search.vue
index 66406b0..394e659 100644
--- a/src/views/group/modules/group-search.vue
+++ b/src/views/group/modules/group-search.vue
@@ -28,7 +28,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupName')" path="groupName" class="pr-24px">
-      <NInput v-model:value="model.groupName" :placeholder="$t('page.groupConfig.form.groupName')" />
+      <NInput v-model:value="model.groupName" :placeholder="$t('page.groupConfig.form.groupName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.groupConfig.groupStatus')" path="groupStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 7d10a61..557c5d6 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -28,13 +28,13 @@ function search() {
 <template>
   <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.jobName')" path="jobName" class="pr-24px">
-      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobBatch.form.jobName')" />
+      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobBatch.form.jobName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobBatch.taskBatchStatus')" path="taskBatchStatus" class="pr-24px">
-      <TaskBatchStatus v-model:value="model.taskBatchStatus" />
+      <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/job/task/modules/job-task-search.vue b/src/views/job/task/modules/job-task-search.vue
index 8fd52f4..2411c56 100644
--- a/src/views/job/task/modules/job-task-search.vue
+++ b/src/views/job/task/modules/job-task-search.vue
@@ -29,16 +29,17 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobName')" path="jobName" class="pr-24px">
-      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobTask.form.jobName')" />
+      <NInput v-model:value="model.jobName" :placeholder="$t('page.jobTask.form.jobName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.jobTask.jobStatus')" path="jobStatus" class="pr-24px">
       <NSelect
         v-model:value="model.jobStatus"
         :placeholder="$t('page.jobTask.form.jobStatus')"
         :options="translateOptions(enableStatusNumberOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>
diff --git a/src/views/namespace/modules/namespace-search.vue b/src/views/namespace/modules/namespace-search.vue
index 8ebd551..7a314a5 100644
--- a/src/views/namespace/modules/namespace-search.vue
+++ b/src/views/namespace/modules/namespace-search.vue
@@ -26,7 +26,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.namespace.keyword')" path="keyword" class="pr-24px">
-      <NInput v-model:value="model.keyword" :placeholder="$t('page.namespace.form.keyword')" />
+      <NInput v-model:value="model.keyword" :placeholder="$t('page.namespace.form.keyword')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/notify/recipient/modules/notify-recipient-search.vue b/src/views/notify/recipient/modules/notify-recipient-search.vue
index 08847c2..1920aea 100644
--- a/src/views/notify/recipient/modules/notify-recipient-search.vue
+++ b/src/views/notify/recipient/modules/notify-recipient-search.vue
@@ -35,7 +35,11 @@ function search() {
       path="recipientName"
       class="pr-24px"
     >
-      <NInput v-model:value="model.recipientName" :placeholder="$t('page.notifyRecipient.form.recipientName')" />
+      <NInput
+        v-model:value="model.recipientName"
+        :placeholder="$t('page.notifyRecipient.form.recipientName')"
+        clearable
+      />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyRecipient.notifyType')" path="notifyType" class="pr-24px">
       <NSelect
diff --git a/src/views/notify/scene/modules/notify-config-operate-drawer.vue b/src/views/notify/scene/modules/notify-config-operate-drawer.vue
index 87e33db..f6dab5b 100644
--- a/src/views/notify/scene/modules/notify-config-operate-drawer.vue
+++ b/src/views/notify/scene/modules/notify-config-operate-drawer.vue
@@ -115,12 +115,20 @@ function createDefaultModel(): Model {
 
 type RuleKey = Extract<
   keyof Model,
-  'groupName' | 'businessId' | 'recipientIds' | 'notifyStatus' | 'notifyScene' | 'rateLimiterStatus' | 'notifyThreshold'
+  | 'groupName'
+  | 'businessId'
+  | 'systemTaskType'
+  | 'recipientIds'
+  | 'notifyStatus'
+  | 'notifyScene'
+  | 'rateLimiterStatus'
+  | 'notifyThreshold'
 >;
 
 const rules: Record<RuleKey, App.Global.FormRule> = {
   groupName: defaultRequiredRule,
   businessId: defaultRequiredRule,
+  systemTaskType: defaultRequiredRule,
   notifyStatus: defaultRequiredRule,
   notifyScene: defaultRequiredRule,
   recipientIds: defaultRequiredRule,
@@ -277,7 +285,6 @@ watch(visible, () => {
           v-model:value="model.systemTaskType"
           :placeholder="$t('page.notifyConfig.form.systemTaskType')"
           :options="translateOptions(systemTaskTypeOptions)"
-          clearable
           @update:value="systemTaskTypeChange"
         />
       </NFormItem>
@@ -288,7 +295,6 @@ watch(visible, () => {
           :options="retryScenes"
           label-field="sceneName"
           value-field="sceneName"
-          clearable
         />
       </NFormItem>
       <NFormItem v-if="model.systemTaskType === 3" :label="$t('page.notifyConfig.job')" path="businessId">
@@ -298,7 +304,6 @@ watch(visible, () => {
           :options="jobs"
           label-field="jobName"
           value-field="id"
-          clearable
         />
       </NFormItem>
       <NFormItem v-if="model.systemTaskType === 4" :label="$t('page.notifyConfig.workflow')" path="businessId">
@@ -308,7 +313,6 @@ watch(visible, () => {
           :options="workflows"
           label-field="workflowName"
           value-field="id"
-          clearable
         />
       </NFormItem>
       <NFormItem :label="$t('page.notifyConfig.notifyScene')" path="notifyScene">
@@ -316,7 +320,6 @@ watch(visible, () => {
           v-model:value="model.notifyScene"
           :placeholder="$t('page.notifyConfig.form.notifyScene')"
           :options="notifySceneOptions"
-          clearable
           @update:value="retrySceneChange"
         />
       </NFormItem>
diff --git a/src/views/notify/scene/modules/notify-config-search.vue b/src/views/notify/scene/modules/notify-config-search.vue
index fbb3ca9..baf6ceb 100644
--- a/src/views/notify/scene/modules/notify-config-search.vue
+++ b/src/views/notify/scene/modules/notify-config-search.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
+import { translateOptions } from '@/utils/common';
+import { enableStatusNumberOptions } from '@/constants/business';
 
 defineOptions({
   name: 'NotifyConfigSearch'
@@ -26,13 +28,18 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.notifyConfig.groupName')" path="groupName" class="pr-24px">
-      <NSelect v-model:value="model.groupName" :placeholder="$t('page.notifyConfig.groupName')" 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" :placeholder="$t('page.notifyConfig.notifyStatus')" clearable />
+      <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">
-      <NSelect v-model:value="model.notifyScene" :placeholder="$t('page.notifyConfig.notifyScene')" clearable />
+      <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"
+        :placeholder="$t('page.notifyConfig.notifyStatus')"
+        :options="translateOptions(enableStatusNumberOptions)"
+        clearable
+      />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/pods/modules/pods-search.vue b/src/views/pods/modules/pods-search.vue
index 53b1814..33bc8f9 100644
--- a/src/views/pods/modules/pods-search.vue
+++ b/src/views/pods/modules/pods-search.vue
@@ -27,7 +27,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.pods.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" :placeholder="$t('page.pods.form.groupName')" />
+      <SelectGroup v-model:value="model.groupName" :placeholder="$t('page.pods.form.groupName')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/retry/dead-letter/modules/dead-letter-search.vue b/src/views/retry/dead-letter/modules/dead-letter-search.vue
index c4ba3ca..a14b005 100644
--- a/src/views/retry/dead-letter/modules/dead-letter-search.vue
+++ b/src/views/retry/dead-letter/modules/dead-letter-search.vue
@@ -28,10 +28,10 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index 469141b..083aa05 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -30,19 +30,19 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.UniqueId')" path="UniqueId" class="pr-24px">
-      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryLog.form.UniqueId')" />
+      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryLog.form.UniqueId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.idempotentId')" path="idempotentId" class="pr-24px">
-      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryLog.form.idempotentId')" />
+      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryLog.form.idempotentId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.bizNo')" path="bizNo" class="pr-24px">
-      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryLog.form.bizNo')" />
+      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryLog.form.bizNo')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.retryStatus')" path="taskBatchStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue
index f553dc7..8cc9b73 100644
--- a/src/views/retry/scene/modules/scene-search.vue
+++ b/src/views/retry/scene/modules/scene-search.vue
@@ -29,10 +29,10 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneName')" path="sceneName" class="pr-24px">
-      <NInput v-model:value="model.sceneName" :placeholder="$t('page.retryScene.form.sceneName')" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneStatus')" path="sceneStatus" class="pr-24px">
       <NSelect
diff --git a/src/views/retry/task/modules/retry-task-search.vue b/src/views/retry/task/modules/retry-task-search.vue
index f0078a8..39f133d 100644
--- a/src/views/retry/task/modules/retry-task-search.vue
+++ b/src/views/retry/task/modules/retry-task-search.vue
@@ -30,25 +30,26 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.sceneName')" path="sceneName" class="pr-24px">
-      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
+      <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.uniqueId')" path="uniqueId" class="pr-24px">
-      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryTask.form.uniqueId')" />
+      <NInput v-model:value="model.uniqueId" :placeholder="$t('page.retryTask.form.uniqueId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.idempotentId')" path="idempotentId" class="pr-24px">
-      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryTask.form.idempotentId')" />
+      <NInput v-model:value="model.idempotentId" :placeholder="$t('page.retryTask.form.idempotentId')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.bizNo')" path="bizNo" class="pr-24px">
-      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryTask.form.bizNo')" />
+      <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryTask.form.bizNo')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryTask.retryStatus')" path="retryStatus" class="pr-24px">
       <NSelect
         v-model:value="model.retryStatus"
         :placeholder="$t('page.retryTask.form.retryStatus')"
         :options="translateOptions(retryTaskStatusTypeOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>
diff --git a/src/views/user/manager/modules/user-manager-search.vue b/src/views/user/manager/modules/user-manager-search.vue
index 44005c9..5aaef6e 100644
--- a/src/views/user/manager/modules/user-manager-search.vue
+++ b/src/views/user/manager/modules/user-manager-search.vue
@@ -26,7 +26,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.userManager.username')" path="username" class="pr-24px">
-      <NInput v-model:value="model.username" :placeholder="$t('page.userManager.form.username')" />
+      <NInput v-model:value="model.username" :placeholder="$t('page.userManager.form.username')" clearable />
     </NFormItemGi>
   </SearchForm>
 </template>
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 17ba4ec..b9b8ea2 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -40,7 +40,7 @@ groupNameUpdate('');
 <template>
   <SearchForm btn-span="24 s:24 m:9 l:12 xl:15" :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflowBatch.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" @update:value="groupNameUpdate" />
+      <SelectGroup v-model:value="model.groupName" clearable @update:value="groupNameUpdate" />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"
@@ -65,7 +65,7 @@ groupNameUpdate('');
       path="taskBatchStatus"
       class="pr-24px"
     >
-      <TaskBatchStatus v-model:value="model.taskBatchStatus" />
+      <TaskBatchStatus v-model:value="model.taskBatchStatus" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:24 m:15 l:12 xl:9"
diff --git a/src/views/workflow/task/modules/workflow-search.vue b/src/views/workflow/task/modules/workflow-search.vue
index 622755b..aec3b40 100644
--- a/src/views/workflow/task/modules/workflow-search.vue
+++ b/src/views/workflow/task/modules/workflow-search.vue
@@ -29,7 +29,7 @@ function search() {
 <template>
   <SearchForm :model="model" @search="search" @reset="reset">
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.groupName')" path="groupName" class="pr-24px">
-      <SelectGroup v-model:value="model.groupName" />
+      <SelectGroup v-model:value="model.groupName" clearable />
     </NFormItemGi>
     <NFormItemGi
       span="24 s:12 m:6"
@@ -38,13 +38,14 @@ function search() {
       class="pr-24px"
       :label-width="100"
     >
-      <NInput v-model:value="model.workflowName" :placeholder="$t('page.workflow.form.workflowName')" />
+      <NInput v-model:value="model.workflowName" :placeholder="$t('page.workflow.form.workflowName')" clearable />
     </NFormItemGi>
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.workflow.workflowStatus')" path="workflowStatus" class="pr-24px">
       <NSelect
         v-model:value="model.workflowStatus"
         :placeholder="$t('page.workflow.form.workflowStatus')"
         :options="translateOptions(enableStatusNumberOptions)"
+        clearable
       />
     </NFormItemGi>
   </SearchForm>