From be9431a7c4debf5cd0004ad8d4b0a0bc90e3b9d0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 25 Aug 2022 16:13:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=92=E7=89=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016306 --user=陈建星 基础字段展示模板中的系统字段，自定义字段展示模板中的非系统字段 https://www.tapd.cn/55049933/s/1233907
---
 .../export/TestCaseExportFieldSelect.vue      | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/export/TestCaseExportFieldSelect.vue b/frontend/src/business/components/track/case/components/export/TestCaseExportFieldSelect.vue
index 7e0f00be76..82fe007a11 100644
--- a/frontend/src/business/components/track/case/components/export/TestCaseExportFieldSelect.vue
+++ b/frontend/src/business/components/track/case/components/export/TestCaseExportFieldSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="export-title"
          @click="showSelect = !showSelect">
       <span>
@@ -62,7 +62,9 @@ export default {
     return {
       selectAll: false,
       showSelect: true,
-      baseFields: [
+      baseFields: [],
+      loading: false,
+      originBaseFields: [
         {
           id: 'ID',
           key: 'A',
@@ -173,14 +175,22 @@ export default {
   },
   created() {
     this.projectId = getCurrentProjectID();
+    this.loading = true;
     getTestTemplate()
       .then((template) => {
         template.customFields.forEach(item => {
           item.enable = true;
         });
-        this.customFields = template.customFields;
-        // 系统字段排前面
-        this.customFields.sort((a, b) => a.system && !b.system ? -1 : 1);
+        this.customFields = [];
+        this.baseFields = [...this.originBaseFields];
+        template.customFields.forEach(item => {
+          if (item.system) {
+            this.baseFields.push(item);
+          } else {
+            this.customFields.push(item);
+          }
+        });
+        this.loading = false;
       });
   },
   methods: {