From 76884c597363c7f657a5fcca490c646ef079b702 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 19 Jul 2022 15:01:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E6=A0=87=E7=AD=BE=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BF=BD=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1014990 --user=李玉号 【测试跟踪】功能用例-批量编辑用例-属性-标签-不追加标签保存失败-提示请选择属性对应的值
https://www.tapd.cn/55049933/s/1204091
---
 .../definition/components/basis/BatchEdit.vue   | 12 ++++++------
 .../track/case/components/BatchEdit.vue         | 17 +++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/basis/BatchEdit.vue b/frontend/src/business/components/api/definition/components/basis/BatchEdit.vue
index 6d3a43ba9b..49f54f3058 100644
--- a/frontend/src/business/components/api/definition/components/basis/BatchEdit.vue
+++ b/frontend/src/business/components/api/definition/components/basis/BatchEdit.vue
@@ -20,8 +20,8 @@
         <el-form-item v-else-if="form.type === 'tags'" :label="$t('test_track.case.updated_attr_value')">
           <ms-input-tag :currentScenario="form" v-if="showInputTag" ref="tag" class="ms-case-input"></ms-input-tag>
           <el-checkbox v-model="form.appendTag">
-            追加标签
-            <el-tooltip class="item" effect="dark" content="勾选：新增标签；不勾选：覆盖原有标签；" placement="top">
+            {{ $t('commons.append_tag') }}
+            <el-tooltip class="item" effect="dark" :content="$t('commons.append_tag_tip')" placement="top">
               <i class="el-icon-info"></i>
             </el-tooltip>
           </el-checkbox>
@@ -46,11 +46,11 @@
 </template>
 
 <script>
-  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
-  import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
-  export default {
+export default {
     name: "BatchEdit",
     components: {
       MsDialogFooter,
diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index c2e489e073..886d011dd7 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -30,11 +30,7 @@
                        ref="envPopover"/>
         </el-form-item>
 
-        <el-form-item v-else-if="fieldType === 'custom'" prop="customFieldValue" :label="$t('test_track.case.updated_attr_value')">
-          <custom-filed-component :data="customField" prop="defaultValue"/>
-        </el-form-item>
-
-        <el-form-item v-else-if="form.type === 'tags'" prop="tags" :label="$t('test_track.case.updated_attr_value')">
+        <el-form-item v-else-if="form.type === 'tags'" :label="$t('test_track.case.updated_attr_value')">
           <ms-input-tag :currentScenario="form" v-if="showInputTag" ref="tag" class="ms-case-input"></ms-input-tag>
           <el-checkbox v-model="form.appendTag">
             {{ $t('commons.append_tag') }}
@@ -44,6 +40,10 @@
           </el-checkbox>
         </el-form-item>
 
+        <el-form-item v-else-if="fieldType === 'custom'" prop="customFieldValue" :label="$t('test_track.case.updated_attr_value')">
+          <custom-filed-component :data="customField" prop="defaultValue"/>
+        </el-form-item>
+
         <el-form-item v-else :label="$t('test_track.case.updated_attr_value')" prop="value">
           <el-select v-model="form.value" style="width: 100%" :filterable="filterable">
             <el-option v-for="(option, index) in options" :key="index" :value="option.id" :label="option.name">
@@ -214,7 +214,12 @@ export default {
         if (val && val.startsWith("custom")) {
           this._handleCustomField(val);
         }
-        this.$set(this.form, "value", "");
+        if (val === 'tags') {
+          // 跳过form rules的检查
+          this.$set(this.form, "value", "tags");
+        } else {
+          this.$set(this.form, "value", "");
+        }
         if (val === 'projectEnv' && this.isScenario !== '') {
           this.projectIds.clear();
           this.map.clear();