From 2b7109ab85e18d331e6f370fc482b99aac87c830 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 21 Jul 2021 10:59:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BC=BA=E9=99=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/workspace/template/CustomFieldFormList.vue   | 4 +---
 .../settings/workspace/template/CustomFieldList.vue       | 7 +++----
 .../settings/workspace/template/CustomFieldRelateList.vue | 1 +
 .../settings/workspace/template/FieldTemplateEdit.vue     | 1 +
 .../settings/workspace/template/IssuesTemplateList.vue    | 7 +++----
 .../settings/workspace/template/TestCaseTemplateList.vue  | 7 +++----
 .../business/components/track/issue/IssueEditDetail.vue   | 8 ++++----
 .../business/components/track/issue/TestCaseIssueList.vue | 1 +
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue
index 48e89f9d3a..70c0fb001c 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue
@@ -122,6 +122,7 @@ export default {
       this.tableData.splice(index, 1);
     },
     refreshTable() {
+      this.$refs.table.reloadTable();
     },
     appendData(customFieldIds) {
       let condition = {};
@@ -148,7 +149,4 @@ export default {
 </script>
 
 <style scoped>
-/*.default-value-item >>> .custom-with {*/
-/*  width: 207px;*/
-/*}*/
 </style>
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
index f22d631d40..3d3da3a2b4 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
@@ -18,7 +18,8 @@
       field-key="CUSTOM_FIELD"
       :screen-height="tableHeight"
       @handlePageChange="getCustomFields"
-      @refresh="getCustomFields">
+      @refresh="getCustomFields"
+      ref="table">
 
       <div v-for="(item) in fields" :key="item.key">
 
@@ -200,6 +201,7 @@ export default {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
+        this.$refs.table.reloadTable();
       });
     },
     handleEdit(data) {
@@ -232,7 +234,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-table__fixed-body-wrapper {
-  top: 47PX !IMPORTANT;
-}
 </style>
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldRelateList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldRelateList.vue
index b7ab7c9dd3..687146fbf6 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldRelateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldRelateList.vue
@@ -159,6 +159,7 @@ export default {
             let data = response.data;
             this.total = data.itemCount;
             this.tableData = data.listObject;
+            this.$refs.table.reloadTable();
           });
       }
     },
diff --git a/frontend/src/business/components/settings/workspace/template/FieldTemplateEdit.vue b/frontend/src/business/components/settings/workspace/template/FieldTemplateEdit.vue
index 9b9a4431dd..db3f9281af 100644
--- a/frontend/src/business/components/settings/workspace/template/FieldTemplateEdit.vue
+++ b/frontend/src/business/components/settings/workspace/template/FieldTemplateEdit.vue
@@ -199,6 +199,7 @@ export default {
               }
               this.templateContainIds.add(item.fieldId);
             });
+            this.$refs.customFieldFormList.refreshTable();
           });
       } else {
         this.appendDefaultFiled();
diff --git a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
index b80fe18aa2..7b10660715 100644
--- a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
@@ -17,7 +17,8 @@
       :screen-height="tableHeight"
       :enable-selection="false"
       @handlePageChange="initTableData"
-      @refresh="initTableData">
+      @refresh="initTableData"
+      ref="table">
 
       <ms-table-column
         :label="$t('commons.name')"
@@ -147,6 +148,7 @@ export default {
           let data = response.data;
           this.total = data.itemCount;
           this.tableData = data.listObject;
+          this.$refs.table.reloadTable();
         });
     },
     handleEdit(data) {
@@ -178,7 +180,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-table__fixed-body-wrapper {
-  top: 47PX !IMPORTANT;
-}
 </style>
diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
index bcd1dee187..e6f0469c22 100644
--- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
@@ -16,7 +16,8 @@
       :screen-height="tableHeight"
       :enable-selection="false"
       @handlePageChange="initTableData"
-      @refresh="initTableData">
+      @refresh="initTableData"
+      ref="table">
 
       <ms-table-column
         :label="$t('commons.name')"
@@ -155,6 +156,7 @@ export default {
           let data = response.data;
           this.total = data.itemCount;
           this.tableData = data.listObject;
+          this.$refs.table.reloadTable();
         });
     },
     handleEdit(data) {
@@ -186,7 +188,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-table__fixed-body-wrapper {
-  top: 47PX !IMPORTANT;
-}
 </style>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 193da33394..be4796b50d 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -24,7 +24,7 @@
 
         <el-row class="custom-field-row">
           <el-col :span="8" v-if="hasTapdId">
-            <el-form-item :label="$t('test_track.issue.tapd_current_owner')" prop="tapdUsers">
+            <el-form-item :label-width="formLabelWidth" :label="$t('test_track.issue.tapd_current_owner')" prop="tapdUsers">
               <el-select v-model="form.tapdUsers" multiple filterable
                          :placeholder="$t('test_track.issue.please_choose_current_owner')">
                 <el-option v-for="(userInfo, index) in tapdUsers" :key="index" :label="userInfo.user"
@@ -33,7 +33,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="hasZentaoId">
-            <el-form-item :label="$t('test_track.issue.zentao_bug_build')" prop="zentaoBuilds">
+            <el-form-item :label-width="formLabelWidth" :label="$t('test_track.issue.zentao_bug_build')" prop="zentaoBuilds">
               <el-select v-model="form.zentaoBuilds" multiple filterable
                          :placeholder="$t('test_track.issue.zentao_bug_build')">
                 <el-option v-for="(build, index) in Builds" :key="index" :label="build.name"
@@ -42,7 +42,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="hasZentaoId">
-            <el-form-item :label="$t('test_track.issue.zentao_bug_assigned')" prop="zentaoAssigned">
+            <el-form-item :label-width="formLabelWidth" :label="$t('test_track.issue.zentao_bug_assigned')" prop="zentaoAssigned">
               <el-select v-model="form.zentaoAssigned" filterable
                          :placeholder="$t('test_track.issue.please_choose_current_owner')">
                 <el-option v-for="(userInfo, index) in zentaoUsers" :key="index" :label="userInfo.name"
@@ -96,7 +96,7 @@ export default {
       result: {},
       relateFields: [],
       isFormAlive: true,
-      formLabelWidth: "100px",
+      formLabelWidth: "150px",
       issueTemplate: {},
       customFieldForm: {},
       customFieldRules: {},
diff --git a/frontend/src/business/components/track/issue/TestCaseIssueList.vue b/frontend/src/business/components/track/issue/TestCaseIssueList.vue
index e8dbe0295c..8ccb0bfe5b 100644
--- a/frontend/src/business/components/track/issue/TestCaseIssueList.vue
+++ b/frontend/src/business/components/track/issue/TestCaseIssueList.vue
@@ -99,6 +99,7 @@ export default {
           this.tableData.forEach(item => {
             this.testCaseContainIds.add(item.id);
           });
+          this.$refs.table.reloadTable();
         });
       }
     },