From 32ff3432c1f45201b5ae7a43770f2c9e1a3043c0 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 18 Jan 2022 19:12:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=85=B3=E9=97=AD=E7=89=88=E6=9C=AC=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009707 --user=刘瑞斌 【接口测试】没开启版本，接口定义右上角显示了版本字段 https://www.tapd.cn/55049933/s/1093635
---
 .../components/list/ApiCaseSimpleList.vue     |  6 +++--
 .../definition/components/mock/MockTab.vue    | 18 ++++++++++++---
 .../components/runtest/RunTestDubboPage.vue   | 20 ++++++++++++----
 .../components/runtest/RunTestHTTPPage.vue    | 18 ++++++++++++---
 .../components/runtest/RunTestSQLPage.vue     | 20 ++++++++++++----
 .../components/runtest/RunTestTCPPage.vue     | 23 +++++++++++++++----
 6 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 060a69a015..33661a4d84 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -1,7 +1,7 @@
 <template>
   <span>
     <span>
-      <div class="ms-opt-btn" v-if="apiDefinitionId">
+      <div class="ms-opt-btn" v-if="apiDefinitionId && versionEnable">
           {{ $t('project.version.name') }}:  {{ apiDefinition.versionName }}
       </div>
       <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" @keyup.enter.native="search"
@@ -429,7 +429,8 @@ export default {
       timeoutIndex: 0,
       versionFilters: [],
       versionName: '',
-      runCaseIds: []
+      runCaseIds: [],
+      versionEnable: false,
     };
   },
   props: {
@@ -1214,6 +1215,7 @@ export default {
       }
       if (hasLicense()) {
         this.$get('/project/version/enable/' + this.projectId, response => {
+          this.versionEnable = response.data;
           if (!response.data) {
             this.fields = this.fields.filter(f => f.id !== 'versionId');
           }
diff --git a/frontend/src/business/components/api/definition/components/mock/MockTab.vue b/frontend/src/business/components/api/definition/components/mock/MockTab.vue
index 1ebcec7d60..faf46488b5 100644
--- a/frontend/src/business/components/api/definition/components/mock/MockTab.vue
+++ b/frontend/src/business/components/api/definition/components/mock/MockTab.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <div>
-      <div class="ms-opt-btn">
-        {{ $t('project.version.name') }}:  {{ mockConfigData.versionName }}
+      <div class="ms-opt-btn" v-if="versionEnable">
+        {{ $t('project.version.name') }}: {{ mockConfigData.versionName }}
       </div>
       <el-input :placeholder="$t('commons.search_by_name')" class="search-input" size="small"
                 :clearable="true"
@@ -81,7 +81,7 @@
 
 <script>
 
-import {getCurrentProjectID, getUUID} from "@/common/js/utils";
+import {getCurrentProjectID, hasLicense} from "@/common/js/utils";
 import MockEditDrawer from "@/business/components/api/definition/components/mock/MockEditDrawer";
 import MsTable from "@/business/components/common/components/table/MsTable";
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
@@ -124,6 +124,7 @@ export default {
           permissions: ['PROJECT_TRACK_REVIEW:READ+RELEVANCE_OR_CANCEL']
         }
       ],
+      versionEnable: false,
     };
   },
 
@@ -131,6 +132,7 @@ export default {
   },
   created() {
     this.mockConfigData = this.baseMockConfigData;
+    this.checkVersionEnable();
   },
   computed: {
     projectId() {
@@ -250,6 +252,16 @@ export default {
         this.mockConfigData = response.data;
       });
     },
+    checkVersionEnable() {
+      if (!this.projectId) {
+        return;
+      }
+      if (hasLicense()) {
+        this.$get('/project/version/enable/' + this.projectId, response => {
+          this.versionEnable = response.data;
+        });
+      }
+    }
   }
 };
 </script>
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
index 063daf1bad..7680acd455 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
@@ -1,8 +1,8 @@
 <template>
 
   <div class="card-container">
-    <div class="ms-opt-btn">
-      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    <div class="ms-opt-btn" v-if="versionEnable">
+      {{ $t('project.version.name') }}: {{ apiData.versionName }}
     </div>
     <el-card class="card-content">
       <!-- 操作按钮 -->
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import {getUUID} from "@/common/js/utils";
+import {getUUID, hasLicense} from "@/common/js/utils";
 import MsApiCaseList from "../case/ApiCaseList";
 import MsContainer from "../../../../common/components/MsContainer";
 import MsBottomContainer from "../BottomContainer";
@@ -94,7 +94,8 @@ export default {
       },
       runData: [],
       reportId: "",
-      runLoading: false
+      runLoading: false,
+      versionEnable: false,
     }
   },
   props: {apiData: {}, currentProtocol: String, syncTabs: Array, projectId: String},
@@ -277,6 +278,16 @@ export default {
         this.$success(this.$t('report.test_stop_success'));
       });
     },
+    checkVersionEnable() {
+      if (!this.projectId) {
+        return;
+      }
+      if (hasLicense()) {
+        this.$get('/project/version/enable/' + this.projectId, response => {
+          this.versionEnable = response.data;
+        });
+      }
+    }
   },
   created() {
     // 深度复制
@@ -286,6 +297,7 @@ export default {
     this.runLoading = false;
     this.getEnvironments();
     this.getResult();
+    this.checkVersionEnable();
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 471dfb90e7..d0fde4f36b 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -1,8 +1,8 @@
 <template>
 
   <div class="card-container">
-    <div class="ms-opt-btn">
-      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    <div class="ms-opt-btn" v-if="versionEnable">
+      {{ $t('project.version.name') }}: {{ apiData.versionName }}
     </div>
     <el-card class="card-content">
 
@@ -79,7 +79,7 @@
 
 <script>
 import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-import {getUUID} from "@/common/js/utils";
+import {getUUID, hasLicense} from "@/common/js/utils";
 import MsApiCaseList from "../case/ApiCaseList";
 import MsContainer from "../../../../common/components/MsContainer";
 import MsRequestResultTail from "../response/RequestResultTail";
@@ -121,6 +121,7 @@ export default {
       envMap: new Map,
       runLoading: false,
       versionName: '',
+      versionEnable: false,
     }
   },
   props: {apiData: {}, currentProtocol: String, syncTabs: Array, projectId: String},
@@ -292,6 +293,16 @@ export default {
         this.$success(this.$t('report.test_stop_success'));
       });
     },
+    checkVersionEnable() {
+      if (!this.projectId) {
+        return;
+      }
+      if (hasLicense()) {
+        this.$get('/project/version/enable/' + this.projectId, response => {
+          this.versionEnable = response.data;
+        });
+      }
+    }
   },
   created() {
     // 深度复制
@@ -303,6 +314,7 @@ export default {
     }
     this.runLoading = false;
     //this.getResult();
+    this.checkVersionEnable();
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
index f0a5dbee67..213274e4bc 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
@@ -1,8 +1,8 @@
 <template>
 
   <div class="card-container">
-    <div class="ms-opt-btn">
-      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    <div class="ms-opt-btn" v-if="versionEnable">
+      {{ $t('project.version.name') }}: {{ apiData.versionName }}
     </div>
     <el-card class="card-content">
       <!-- 操作按钮 -->
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import {getUUID} from "@/common/js/utils";
+import {getUUID, hasLicense} from "@/common/js/utils";
 import MsApiCaseList from "../case/ApiCaseList";
 import MsContainer from "../../../../common/components/MsContainer";
 import MsBottomContainer from "../BottomContainer";
@@ -93,7 +93,8 @@ export default {
         },
         runData: [],
         reportId: "",
-        runLoading: false
+        runLoading: false,
+        versionEnable: false,
       }
     },
     props: {apiData: {}, currentProtocol: String,syncTabs: Array, projectId: String},
@@ -275,6 +276,16 @@ export default {
           this.$success(this.$t('report.test_stop_success'));
         });
       },
+      checkVersionEnable() {
+        if (!this.projectId) {
+          return;
+        }
+        if (hasLicense()) {
+          this.$get('/project/version/enable/' + this.projectId, response => {
+            this.versionEnable = response.data;
+          });
+        }
+      }
     },
     created() {
       // 深度复制
@@ -284,6 +295,7 @@ export default {
       this.runLoading = false;
       this.getEnvironments();
       this.getResult();
+      this.checkVersionEnable();
     }
   }
 </script>
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
index af08718175..00c19b4436 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
@@ -1,8 +1,8 @@
 <template>
 
   <div class="card-container">
-    <div class="ms-opt-btn">
-      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    <div class="ms-opt-btn" v-if="versionEnable">
+      {{ $t('project.version.name') }}: {{ apiData.versionName }}
     </div>
     <el-card class="card-content">
 
@@ -73,7 +73,7 @@
 
 <script>
 import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-import {getUUID} from "@/common/js/utils";
+import {getUUID, hasLicense} from "@/common/js/utils";
 import MsApiCaseList from "../case/ApiCaseList";
 import MsContainer from "../../../../common/components/MsContainer";
 import MsBottomContainer from "../BottomContainer";
@@ -84,6 +84,7 @@ import {REQ_METHOD} from "../../model/JsonData";
 import EnvironmentSelect from "../environment/EnvironmentSelect";
 import MsJmxStep from "../step/JmxStep";
 import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
+
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const esbDefinition = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
 const esbDefinitionResponse = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};
@@ -119,8 +120,9 @@ export default {
       },
       runData: [],
       reportId: "",
-      showXpackCompnent:false,
-      runLoading: false
+      showXpackCompnent: false,
+      runLoading: false,
+      versionEnable: false,
     }
   },
   props: {apiData: {}, currentProtocol: String,syncTabs: Array, projectId: String},
@@ -274,6 +276,16 @@ export default {
         this.$success(this.$t('report.test_stop_success'));
       });
     },
+    checkVersionEnable() {
+      if (!this.projectId) {
+        return;
+      }
+      if (hasLicense()) {
+        this.$get('/project/version/enable/' + this.projectId, response => {
+          this.versionEnable = response.data;
+        });
+      }
+    }
   },
   created() {
     // 深度复制
@@ -285,6 +297,7 @@ export default {
     if (requireComponent != null && JSON.stringify(esbDefinition) !== '{}') {
       this.showXpackCompnent = true;
     }
+    this.checkVersionEnable();
   }
 }
 </script>