From 5737fcaec7035e9620c822afbb68f0f7e5b2b27a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 30 Mar 2023 18:45:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BC=BA=E9=99=B7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=87=E5=A4=9A=E6=98=AF=E4=BC=9A=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024987 --user=陈建星 【测试跟踪】功能用例编辑-关联缺陷-多次点击创建缺陷-创建缺陷页面数据显示重复-创建失败 https://www.tapd.cn/55049933/s/1357764
---
 .../components/case/CaseIssueEditDetail.vue   | 72 ++++++++++---------
 .../common/CaseCustomFiledFormItem.vue        | 42 ++---------
 .../components/common/MsDrawerComponent.vue   |  6 +-
 3 files changed, 48 insertions(+), 72 deletions(-)

diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
index 8d745f974f..21a5046526 100644
--- a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="add-issue-box">
+  <div class="add-issue-box" v-loading="this.result.loading">
     <el-form
       :model="form"
       :rules="rules"
@@ -9,37 +9,40 @@
       ref="form"
     >
       <!-- 标题 -->
-      <div class="title-row" v-if="!(this.issueTemplate.platform === 'Local')">
-        <el-form-item :label="$t('commons.title')" prop="title">
-          <div slot="label" class="required-item">
-            {{ $t("commons.title") }}
-          </div>
-          <el-input
-            v-model="form.title"
-            autocomplete="off"
-            class="top-input-class"
-            maxlength="255"
-            show-word-limit
-          >
-          </el-input>
-        </el-form-item>
+      <div v-if="!enableThirdPartTemplate">
+        <div class="title-row" v-if="!(this.issueTemplate.platform === 'Local')">
+          <el-form-item :label="$t('commons.title')" prop="title">
+            <div slot="label" class="required-item">
+              {{ $t("commons.title") }}
+            </div>
+            <el-input
+              v-model="form.title"
+              autocomplete="off"
+              class="top-input-class"
+              maxlength="255"
+              show-word-limit
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+
+        <div class="title-row" v-else>
+          <el-form-item :label="$t('commons.title')" prop="title">
+            <div slot="label" class="required-item">
+              {{ $t("commons.title") }}
+            </div>
+            <el-input
+              v-model="form.title"
+              autocomplete="off"
+              class="top-input-class"
+              maxlength="300"
+              show-word-limit
+            >
+            </el-input>
+          </el-form-item>
+        </div>
       </div>
 
-      <div class="title-row" v-else>
-        <el-form-item :label="$t('commons.title')" prop="title">
-          <div slot="label" class="required-item">
-            {{ $t("commons.title") }}
-          </div>
-          <el-input
-            v-model="form.title"
-            autocomplete="off"
-            class="top-input-class"
-            maxlength="300"
-            show-word-limit
-          >
-          </el-input>
-        </el-form-item>
-      </div>
       <!-- 自定义字段 -->
       <div class="custom-field-wrap">
         <el-form
@@ -351,15 +354,16 @@ export default {
         this.$refs.testCaseIssueList.clear();
         this.$refs.testCaseIssueList.isXpack = hasLicense();
       }
+
+      enableThirdPartTemplate(this.projectId).then((r) => {
+        this.enableThirdPartTemplate = r.data;
+      });
+
       this.$nextTick(() => {
         getIssuePartTemplateWithProject((template, project) => {
           this.currentProject = project;
           this.init(template, data);
           this.getDataInfoAsync(data);
-
-          enableThirdPartTemplate(this.currentProject.id).then((r) => {
-            this.enableThirdPartTemplate = r.data;
-          });
         });
       });
     },
diff --git a/test-track/frontend/src/business/case/components/common/CaseCustomFiledFormItem.vue b/test-track/frontend/src/business/case/components/common/CaseCustomFiledFormItem.vue
index 41d952c449..83e55836c8 100644
--- a/test-track/frontend/src/business/case/components/common/CaseCustomFiledFormItem.vue
+++ b/test-track/frontend/src/business/case/components/common/CaseCustomFiledFormItem.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="field-item-wrap">
-    <div v-for="i in customFieldRowNums" :key="i" class="field-item-iterator">
+    <div class="field-item-iterator">
       <div
         class="custom-field-item"
         v-for="item in sortCustomFields"
@@ -48,34 +48,6 @@
       </div>
     </div>
 
-    <!-- <el-row v-for="(i) in (customFieldRowNums)" :key="i">
-      <span class="custom-item" v-for="(item, j) in sortCustomFields" :key="j">
-        <span v-if="j >= (i - 1)*3 && j < (i - 1)*3+3">
-          <el-col :span="8" v-if="item.type !== 'richText'">
-            <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
-                          :label-width="formLabelWidth">
-              <custom-filed-component
-                prop="defaultValue"
-                :data="item"
-                :form="form"
-                :default-open="defaultOpen"
-                :disabled="isPublic"/>
-            </el-form-item>
-          </el-col>
-          <div v-else>
-            <el-col :span="24">
-              <el-form-item
-                :label="item.system ? $t(systemNameMap[item.name]) : item.name"
-                :prop="item.name"
-                :default-open="defaultOpen"
-                :label-width="formLabelWidth">
-                 <custom-filed-component :data="item" :form="form" prop="defaultValue"/>
-              </el-form-item>
-            </el-col>
-          </div>
-        </span>
-      </span>
-      </el-row> -->
   </div>
 </template>
 
@@ -119,19 +91,15 @@ export default {
     },
   },
   computed: {
-    customFieldRowNums() {
-      let size = this.issueTemplate.customFields
-        ? this.issueTemplate.customFields.length
-        : 0;
-      let val = parseInt(size / 3);
-      return size % 3 == 0 ? val : val + 1;
-    },
     systemNameMap() {
       return SYSTEM_FIELD_NAME_MAP;
     },
     sortCustomFields() {
       let total = 0; //定义total用于控制循环结束
       let customFields = this.issueTemplate.customFields;
+      if (!customFields) {
+        return;
+      }
       for (let i = 0; total < customFields.length; total++) {
         if (customFields[i].type === "richText") {
           //循环到是0的位置就删除该元素0并且在arr末尾push进这个元素0，由于splice删除了该位置元素，所以i不用+1，下次循环仍然检查i位置的元素
@@ -159,7 +127,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
   }
-  .custom-field-item:not(:first-child) {
+  .custom-field-item {
     :deep(.el-form-item) {
       margin-left: 26px !important;
     }
diff --git a/test-track/frontend/src/business/case/components/common/MsDrawerComponent.vue b/test-track/frontend/src/business/case/components/common/MsDrawerComponent.vue
index c8b647004d..bbfea43928 100644
--- a/test-track/frontend/src/business/case/components/common/MsDrawerComponent.vue
+++ b/test-track/frontend/src/business/case/components/common/MsDrawerComponent.vue
@@ -2,7 +2,7 @@
   <el-drawer
     :close-on-click-modal="false"
     :visible.sync="visible"
-    :size="1100"
+    :size="size"
     @close="close"
     destroy-on-close
     ref="editFile"
@@ -108,6 +108,10 @@ export default {
   components: {},
   props: {
     title: String,
+    size: {
+      type: Number,
+      default: 1100,
+    },
     enablePagination: {
       type: Boolean,
       default: true,