From 3ebbeae35c090a768c17291e256cad9c00be6cf7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 27 Oct 2022 11:14:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=B3=E8=81=94=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=92=8C=E6=80=A7=E8=83=BD=E7=94=A8=E4=BE=8B=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=BC=BA=E5=B0=91=E7=89=88=E6=9C=AC=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018847 --user=陈建星 【测试跟踪】测试计划-关联性能测试时弹框页面的版本列表字段不可筛选 https://www.tapd.cn/55049933/s/1279626
---
 .../view/comonents/functional/FunctionalRelevance.vue     | 6 +++---
 .../comonents/functional/TestPlanFunctionalRelevance.vue  | 8 ++++----
 .../plan/view/comonents/load/TestCaseLoadRelevance.vue    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
index eb1014e581..278c16905f 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
@@ -25,7 +25,7 @@
     </ms-table-header>
 
     <ms-table
-      v-loading="page.result.loading"
+      v-loading="page.loading"
       :data="page.data"
       :condition="page.condition"
       :total="page.total"
@@ -53,7 +53,7 @@
       <ms-table-column prop="name" :label="$t('commons.name')"/>
 
       <ms-table-column
-        v-if="versionEnable"
+        v-if="versionEnable && versionFilters"
         prop="versionId"
         :filters="versionFilters"
         :label="$t('commons.version')"
@@ -167,7 +167,7 @@ export default {
         {text: 'P2', value: 'P2'},
         {text: 'P3', value: 'P3'}
       ],
-      versionFilters: []
+      versionFilters: null
     };
   },
   props: {
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalRelevance.vue
index e53aac0ab1..4437c00d9e 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalRelevance.vue
@@ -54,12 +54,12 @@ export default {
       }
     },
     saveCaseRelevance(param, vueObj) {
-      vueObj.page.result.loading = true;
+      vueObj.page.loading = true;
       if (param.ids.length > 0) {
         param.planId = this.planId;
         testPlanRelevance(param)
           .then(() => {
-            vueObj.page.result.loading = false;
+            vueObj.page.loading = false;
             vueObj.isSaving = false;
             this.$success(this.$t('commons.save_success'));
             vueObj.$refs.baseRelevance.close();
@@ -82,10 +82,10 @@ export default {
       if (this.planId) {
         condition.planId = this.planId;
       }
-      this.loading = true;
+      this.page.loading = true;
       testCaseRelateList({pageNum: this.page.currentPage, pageSize: this.page.pageSize}, condition)
         .then(response => {
-          this.loading = false;
+          this.page.loading = false;
           getPageDate(response, this.page);
           let data = this.page.data;
           data.forEach(item => {
diff --git a/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
index 837a5672e3..f9ebb7fdaa 100644
--- a/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
@@ -53,7 +53,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="versionEnable"
+        v-if="versionEnable && versionFilters"
         prop="versionId"
         :column-key="'versionId'"
         :filters="versionFilters"
@@ -156,7 +156,7 @@ export default {
         {text: 'Completed', value: 'Completed'},
         {text: 'Error', value: 'Error'}
       ],
-      versionFilters: [],
+      versionFilters: null,
     };
   },
   props: {