From a9f230103364628e8f9395dc044d69fc2bfc0302 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 16 Jun 2021 19:53:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AD=97=E6=AE=B5=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/table/MsCustomTableHeader.vue  |  6 ++--
 .../common/components/table/MsTable.vue       |  9 +++--
 .../track/case/components/TestCaseList.vue    |  1 +
 .../components/track/issue/IssueList.vue      |  1 +
 .../src/common/js/default-table-header.js     |  1 -
 frontend/src/common/js/tableUtils.js          | 34 +++++++++++++++++--
 6 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/common/components/table/MsCustomTableHeader.vue b/frontend/src/business/components/common/components/table/MsCustomTableHeader.vue
index 6b4c12662e..3171aa1e6a 100644
--- a/frontend/src/business/components/common/components/table/MsCustomTableHeader.vue
+++ b/frontend/src/business/components/common/components/table/MsCustomTableHeader.vue
@@ -18,8 +18,7 @@
 <script>
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import treeTransfer from 'el-tree-transfer'
-import {saveCustomTableHeader} from "@/common/js/tableUtils";
-import {CUSTOM_TABLE_HEADER} from "@/common/js/default-table-header";
+import {getAllFieldWithCustomFields, saveCustomTableHeader} from "@/common/js/tableUtils";
 
 export default {
   name: "MsCustomTableHeader",
@@ -37,6 +36,7 @@ export default {
   },
   props: {
     type: String,
+    customFields: Array
   },
   methods: {
     allowDrop(draggingNode, dropNode, type) {
@@ -44,7 +44,7 @@ export default {
     },
     open(items) {
       items = JSON.parse(JSON.stringify(items));
-      let fields = JSON.parse(JSON.stringify(CUSTOM_TABLE_HEADER[this.type]));
+      let fields = getAllFieldWithCustomFields(this.type, this.customFields);
       this.selectedKeys = [];
       this.fromFields = [];
       this.selectedKeys = items.map(item => item.key);
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index b1a8c50576..3a7e00613e 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -56,8 +56,9 @@
 
     <ms-custom-table-header
       v-if="fieldKey"
-      @reload="reloadTable"
+      @reload="resetHeader"
       :type="fieldKey"
+      :custom-fields="customFields"
       ref="customTableHeader"/>
 
   </div>
@@ -187,6 +188,7 @@ export default {
     },
     fields: Array,
     fieldKey: String,
+    customFields: Array
   },
   mounted() {
     getLabel(this, TEST_CASE_LIST);
@@ -291,8 +293,11 @@ export default {
     openCustomHeader() {
       this.$refs.customTableHeader.open(this.fields);
     },
+    resetHeader() {
+      this.$emit('update:fields', getCustomTableHeader(this.fieldKey, this.customFields));
+      this.reloadTable();
+    },
     reloadTable() {
-      this.$emit('update:fields', getCustomTableHeader(this.fieldKey));
       this.tableActive = false;
       this.$nextTick(() => {
         this.tableActive = true;
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 643220b09b..aa662ddd01 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -19,6 +19,7 @@
       :fields.sync="fields"
       field-key="TRACK_TEST_CASE"
       @refresh="initTableData"
+      :custom-fields="testCaseTemplate.customFields"
       ref="table">
 
       <span v-for="item in fields" :key="item.key">
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index d5941b0091..66127f3c96 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -22,6 +22,7 @@
           :fields.sync="fields"
           field-key="ISSUE_LIST"
           @refresh="getIssues"
+          :custom-fields="issueTemplate.customFields"
           ref="table"
         >
     <span v-for="(item) in fields" :key="item.key">
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index b8ebe16db9..64495079aa 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -171,7 +171,6 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'nodePath', key: '5', label: i18n.t('test_track.case.module')},
     {id: 'updateTime', key: '6', label: i18n.t('commons.update_time')},
     {id: 'createUser', key: '7', label: i18n.t('commons.create_user')},
-    {id: 'maintainer', key: '8', label: i18n.t('custom_field.case_maintainer')},
   ],
   //缺陷列表
   ISSUE_LIST: [
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 7256235c1e..99b901aba6 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -237,11 +237,17 @@ export function getPageDate(response, page) {
  * @param key
  * @returns {[]|*}
  */
-export function getCustomTableHeader(key) {
-  let fieldSetting = CUSTOM_TABLE_HEADER[key];
+export function getCustomTableHeader(key, customFields) {
+  let fieldSetting = getAllFieldWithCustomFields(key, customFields);
   return getCustomTableHeaderByFiledSetting(key, fieldSetting);
 }
 
+/**
+ * 获取 localStorage 的值，过滤
+ * @param key
+ * @param fieldSetting
+ * @returns {[]|*}
+ */
 function getCustomTableHeaderByFiledSetting(key, fieldSetting) {
   let fieldStr = localStorage.getItem(key);
   if (fieldStr !== null) {
@@ -268,7 +274,7 @@ function getCustomTableHeaderByFiledSetting(key, fieldSetting) {
  * @returns {[]|*}
  */
 export function getTableHeaderWithCustomFields(key, customFields) {
-  let fieldSetting = [CUSTOM_TABLE_HEADER[key]];
+  let fieldSetting = [...CUSTOM_TABLE_HEADER[key]]; // 复制
   let keys = getCustomFieldsKeys(customFields);
   customFields.forEach(item => {
     if (!item.key) {
@@ -287,6 +293,28 @@ export function getTableHeaderWithCustomFields(key, customFields) {
   return getCustomTableHeaderByFiledSetting(key, fieldSetting);
 }
 
+/**
+ * 获取所有字段
+ * @param key
+ * @param customFields
+ * @returns {*[]}
+ */
+export function getAllFieldWithCustomFields(key, customFields) {
+  let fieldSetting = [...CUSTOM_TABLE_HEADER[key]];
+  if (customFields) {
+    customFields.forEach(item => {
+      let field = {
+        id: item.name,
+        key: item.key,
+        label: item.name,
+        isCustom: true
+      }
+      fieldSetting.push(field);
+    });
+  }
+  return fieldSetting;
+}
+
 export function generateTableHeaderKey(keys) {
   let customFieldKeys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
   for (let i = 0; i < customFieldKeys.length; i++) {