From f463d479d4a3788a0cbb7187d109063cb45d887a Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 6 Mar 2024 17:53:51 +0800
Subject: [PATCH] =?UTF-8?q?style(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E6=96=87=E6=A1=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036619 --user=宋天阳 【缺陷管理】批量编辑缺陷标签-页面名称错误&提交后未关闭弹框，建议和用例管理保持一致 https://www.tapd.cn/55049933/s/1470475
---
 .../components/batchEditModal.vue             | 43 ++++++++-----------
 .../src/views/bug-management/locale/zh-CN.ts  |  4 +-
 .../components/batchEditModal.vue             |  2 +-
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/frontend/src/views/bug-management/components/batchEditModal.vue b/frontend/src/views/bug-management/components/batchEditModal.vue
index cd82b19168..edd1857567 100644
--- a/frontend/src/views/bug-management/components/batchEditModal.vue
+++ b/frontend/src/views/bug-management/components/batchEditModal.vue
@@ -20,7 +20,7 @@
           field="attribute"
           asterisk-position="end"
           :label="t('bugManagement.batchUpdate.attribute')"
-          :rules="[{ required: true, message:t('bugManagement.batchUpdate.required.attribute') }]"
+          :rules="[{ required: true, message: t('bugManagement.batchUpdate.required.attribute') }]"
         >
           <a-select v-model:model-value="form.attribute" @change="handleAttributeChange">
             <a-optgroup :label="t('bugManagement.batchUpdate.systemFiled')">
@@ -28,12 +28,6 @@
                 item.label
               }}</a-option>
             </a-optgroup>
-            <!-- V3.0 先不上自定义字段的批量更新 -->
-            <!-- <a-optgroup :label="t('bugManagement.batchUpdate.customFiled')">
-              <a-option v-for="item in customOptionList" :disabled="form.attribute === 'status'" :key="item.value" :value="item.value">{{
-                item.label
-              }}</a-option>
-            </a-optgroup> -->
           </a-select>
         </a-form-item>
         <a-form-item
@@ -41,7 +35,7 @@
           field="inputValue"
           asterisk-position="end"
           :label="t('bugManagement.batchUpdate.update')"
-          :rules="[{ required: true, message:t('bugManagement.batchUpdate.required.value') }]"
+          :rules="[{ required: true, message: t('bugManagement.batchUpdate.required.value') }]"
         >
           <template v-if="valueMode === 'input'">
             <a-input v-model:model-value="form.inputValue" :disabled="!form.attribute" />
@@ -63,7 +57,7 @@
           asterisk-position="end"
           :label="t('bugManagement.batchUpdate.update')"
           validate-trigger="blur"
-          :rules="[{ required: true, message:t('bugManagement.batchUpdate.required.value') }]"
+          :rules="[{ required: true, message: t('bugManagement.batchUpdate.required.value') }]"
         >
           <template v-if="valueMode === 'tags'">
             <MsTagsInput v-model:modelValue="form.value" :disabled="!form.attribute"></MsTagsInput>
@@ -118,24 +112,24 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, reactive, ref} from 'vue';
-import {type FormInstance, Message, type ValidatedError} from '@arco-design/web-vue';
+  import { computed, reactive, ref } from 'vue';
+  import { type FormInstance, Message, type ValidatedError } from '@arco-design/web-vue';
 
-import {BatchActionQueryParams} from '@/components/pure/ms-table/type';
-import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
-import {MsUserSelector} from '@/components/business/ms-user-selector';
-import {UserRequestTypeEnum} from '@/components/business/ms-user-selector/utils';
+  import { BatchActionQueryParams } from '@/components/pure/ms-table/type';
+  import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
+  import { MsUserSelector } from '@/components/business/ms-user-selector';
+  import { UserRequestTypeEnum } from '@/components/business/ms-user-selector/utils';
 
-import {updateBatchBug} from '@/api/modules/bug-management';
-import {useI18n} from '@/hooks/useI18n';
-import {useAppStore} from '@/store';
-import {tableParamsToRequestParams} from '@/utils';
+  import { updateBatchBug } from '@/api/modules/bug-management';
+  import { useI18n } from '@/hooks/useI18n';
+  import { useAppStore } from '@/store';
+  import { tableParamsToRequestParams } from '@/utils';
 
-import type {BugBatchUpdateFiledType} from '@/models/bug-management';
-import {BugBatchUpdateFiledForm, BugEditCustomField} from '@/models/bug-management';
-import {SelectValue} from '@/models/projectManagement/menuManagement';
+  import type { BugBatchUpdateFiledType } from '@/models/bug-management';
+  import { BugBatchUpdateFiledForm, BugEditCustomField } from '@/models/bug-management';
+  import { SelectValue } from '@/models/projectManagement/menuManagement';
 
-const { t } = useI18n();
+  const { t } = useI18n();
   const props = defineProps<{
     visible: boolean;
     selectParam: BatchActionQueryParams;
@@ -188,7 +182,7 @@ const { t } = useI18n();
   const handleCancel = () => {
     formReset();
     currentVisible.value = false;
-    showAppend.value=false;
+    showAppend.value = false;
     loading.value = false;
   };
   const customFiledOption = ref<{ text: string; value: string }[]>([]);
@@ -235,6 +229,7 @@ const { t } = useI18n();
           await updateBatchBug(tmpObj);
           Message.success(t('common.updateSuccess'));
           emit('submit');
+          handleCancel();
         } catch (error) {
           // eslint-disable-next-line no-console
           console.error(error);
diff --git a/frontend/src/views/bug-management/locale/zh-CN.ts b/frontend/src/views/bug-management/locale/zh-CN.ts
index 72d54b9885..8e71040f2c 100644
--- a/frontend/src/views/bug-management/locale/zh-CN.ts
+++ b/frontend/src/views/bug-management/locale/zh-CN.ts
@@ -85,8 +85,8 @@ export default {
       systemFiled: '系统字段',
       customFiled: '自定义字段',
       append: '追加',
-      openAppend: '开启: 追加字段',
-      closeAppend: '关闭: 覆盖原有字段',
+      openAppend: '开启: 追加标签',
+      closeAppend: '关闭: 覆盖原有标签',
       handleUser: '处理人',
       tag: '标签',
       required: {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
index 9a51cee8e0..479499b918 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
@@ -3,7 +3,7 @@
     v-model:visible="isVisible"
     dialog-size="small"
     :title="t('caseManagement.featureCase.batchEdit', { number: props.batchParams.currentSelectCount })"
-    ok-text="common.confirm"
+    ok-text="common.update"
     :confirm="confirmHandler"
     :close="closeHandler"
     unmount-on-close