From d33fdf69a3d9c8978cb70d8d606f9a78131e4766 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 27 Dec 2024 21:37:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.3.0-beta1):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                             |  2 +-
 src/views/job/task/index.vue                     |  7 ++++++-
 .../job/task/modules/job-task-operate-drawer.vue | 16 ++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 43f478a..104768d 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -961,7 +961,7 @@ declare namespace Api {
       /** 负责人id */
       owerId: string;
       /** 负责人名 */
-      owerName: string;
+      owerName?: string;
       /** 通知场景ids */
       notifyIds: number[];
       /** 任务名称 */
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 3701482..e6d5f64 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -299,6 +299,11 @@ async function handleBatchDelete() {
   onBatchDeleted();
 }
 
+function add() {
+  editingData.value = null;
+  handleAdd();
+}
+
 function edit(id: string) {
   handleEdit(id);
 }
@@ -353,7 +358,7 @@ function handleExport() {
           :loading="loading"
           :disabled-delete="checkedRowKeys.length === 0"
           :show-delete="hasAuth('R_ADMIN')"
-          @add="handleAdd"
+          @add="add"
           @delete="handleBatchDelete"
           @refresh="getData"
         >
diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue
index 838048b..8d5838e 100644
--- a/src/views/job/task/modules/job-task-operate-drawer.vue
+++ b/src/views/job/task/modules/job-task-operate-drawer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { type FormInst, NInputNumber } from 'naive-ui';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
@@ -62,7 +62,6 @@ type Model = Pick<
   | 'id'
   | 'groupName'
   | 'owerId'
-  | 'owerName'
   | 'notifyIds'
   | 'jobName'
   | 'argsStr'
@@ -83,12 +82,6 @@ type Model = Pick<
   | 'notifyScene'
 >;
 
-onMounted(() => {
-  nextTick(() => {
-    getNotifyConfigSystemTaskTypeList();
-  });
-});
-
 async function getNotifyConfigSystemTaskTypeList() {
   const res = await fetchGetNotifyConfigSystemTaskTypeList(3);
   notifyNameList.value = res.data as CommonType.Option<number>[];
@@ -100,7 +93,8 @@ function createDefaultModel(): Model {
   return {
     // @ts-expect-error groupName is required
     groupName: undefined,
-    owerId: '',
+    // @ts-expect-error owerId is required
+    owerId: undefined,
     notifyIds: [],
     jobName: '',
     argsStr: '',
@@ -272,7 +266,6 @@ async function handleSubmit() {
     id,
     groupName,
     owerId,
-    owerName,
     notifyIds,
     jobName,
     argsType,
@@ -309,7 +302,6 @@ async function handleSubmit() {
     const { error } = await fetchAddJob({
       groupName,
       owerId,
-      owerName,
       notifyIds,
       jobName,
       argsStr,
@@ -337,7 +329,6 @@ async function handleSubmit() {
       id,
       groupName,
       owerId,
-      owerName,
       notifyIds,
       jobName,
       argsStr,
@@ -384,6 +375,7 @@ watch(visible, () => {
   if (visible.value) {
     handleUpdateModelWhenEdit();
     restoreValidation();
+    getNotifyConfigSystemTaskTypeList();
     customformRef.value?.restoreValidation();
   }
 });