From c89a858f52fbb7d6839616edbf89c9eb99bc2b3e Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 8 May 2024 14:59:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81cr=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test-plan/testPlan/components/actionModal.vue      |  6 +-----
 .../test-plan/testPlan/components/batchEditModal.vue   | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/test-plan/testPlan/components/actionModal.vue b/frontend/src/views/test-plan/testPlan/components/actionModal.vue
index 8d7cbfdf5c..b66f609210 100644
--- a/frontend/src/views/test-plan/testPlan/components/actionModal.vue
+++ b/frontend/src/views/test-plan/testPlan/components/actionModal.vue
@@ -76,7 +76,7 @@
     }
   }
 
-  function getDeleteTip() {
+  const contentTip = computed(() => {
     switch (props.record && props.record.status) {
       case 'ARCHIVED':
         return t('testPlan.testPlanIndex.deleteArchivedPlan');
@@ -87,10 +87,6 @@
       default:
         return t('testPlan.testPlanIndex.deletePendingPlan');
     }
-  }
-
-  const contentTip = computed(() => {
-    return getDeleteTip();
   });
 </script>
 
diff --git a/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue b/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
index 41e954d774..61a3c32a56 100644
--- a/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
+++ b/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
@@ -71,7 +71,8 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { FormInstance } from '@arco-design/web-vue';
+  import { FormInstance, ValidatedError } from '@arco-design/web-vue';
+  import { cloneDeep } from 'lodash-es';
 
   import MsDialog from '@/components/pure/ms-dialog/index.vue';
   import type { BatchActionQueryParams } from '@/components/pure/ms-table/type';
@@ -108,7 +109,7 @@
     tags: [],
     value: '',
   };
-  const form = ref({ ...initForm });
+  const form = ref(cloneDeep(initForm));
 
   const attrOptions = [
     {
@@ -123,12 +124,11 @@
     isVisible.value = false;
     formRef.value?.resetFields();
     form.value = { ...initForm };
-    form.value.tags = [];
   }
 
   async function confirmHandler(enable: boolean | undefined) {
-    await formRef.value?.validate().then(async (error) => {
-      if (!error) {
+    formRef.value?.validate(async (errors: undefined | Record<string, ValidatedError>) => {
+      if (!errors) {
         try {
           const customField = {
             fieldId: '',