From 407b2e54849009482c10934bd0df270d4ec38533 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 30 Dec 2021 15:08:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BC=96=E8=BE=91api=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=8E=B0=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/EditCompleteContainer.vue   | 11 +++++++++++
 .../definition/components/list/ApiCaseSimpleList.vue  |  8 +++++---
 .../api/definition/components/mock/MockTab.vue        |  3 +++
 .../components/runtest/RunTestDubboPage.vue           |  3 +++
 .../definition/components/runtest/RunTestHTTPPage.vue |  6 +++++-
 .../definition/components/runtest/RunTestSQLPage.vue  |  3 +++
 .../definition/components/runtest/RunTestTCPPage.vue  |  3 +++
 7 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
index 93b12f5f2a..6e11051e4d 100644
--- a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
+++ b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
@@ -91,6 +91,7 @@
       <api-case-simple-list
         class="api-case-simple-list"
         :apiDefinitionId="currentApi.id"
+        :current-version="currentApi.versionId"
         :trash-enable="false"
         @changeSelectDataRangeAll="changeSelectDataRangeAll"
         @handleCase="handleCase"
@@ -239,6 +240,7 @@ export default {
         this.$post('/mockConfig/genMockConfig', mockParam, response => {
           let mockConfig = response.data;
           mockConfig.apiName = this.currentApi.name;
+          mockConfig.versionName = this.currentApi.versionName;
           this.baseMockConfigData = mockConfig;
         });
       }
@@ -359,4 +361,13 @@ export default {
   height: calc(100vh - 262px) !important;
 }
 
+/deep/ .ms-opt-btn {
+  position: fixed;
+  right: 50px;
+  z-index: 1;
+  top: 128px;
+  float: right;
+  margin-right: 20px;
+  margin-top: 5px;
+}
 </style>
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 39c108e239..b62a215503 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -1,9 +1,9 @@
 <template>
   <span>
     <span>
-      <el-link type="primary" style="float:right;margin-top: 5px" @click="open">{{ $t('commons.adv_search.title') }}
-      </el-link>
-
+      <div class="ms-opt-btn" v-if="apiDefinitionId">
+          {{ $t('project.version.name') }}:  {{ versionName }}
+      </div>
       <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" @keyup.enter.native="search"
                 class="search-input" size="small"
                 v-model="condition.name"/>
@@ -404,6 +404,7 @@ export default {
       response: {},
       timeoutIndex: 0,
       versionFilters: [],
+      versionName: '',
     };
   },
   props: {
@@ -1165,6 +1166,7 @@ export default {
     getVersionOptions() {
       if (hasLicense()) {
         this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionName = response.data.filter(v => v.id === this.currentVersion)[0].name;
           this.versionFilters = response.data.map(u => {
             return {text: u.name, value: u.id};
           });
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 674e9f2a05..1ebcec7d60 100644
--- a/frontend/src/business/components/api/definition/components/mock/MockTab.vue
+++ b/frontend/src/business/components/api/definition/components/mock/MockTab.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
     <div>
+      <div class="ms-opt-btn">
+        {{ $t('project.version.name') }}:  {{ mockConfigData.versionName }}
+      </div>
       <el-input :placeholder="$t('commons.search_by_name')" class="search-input" size="small"
                 :clearable="true"
                 v-model="tableSearch"/>
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 f4ee9b1f1e..063daf1bad 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
@@ -1,6 +1,9 @@
 <template>
 
   <div class="card-container">
+    <div class="ms-opt-btn">
+      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    </div>
     <el-card class="card-content">
       <!-- 操作按钮 -->
       <el-dropdown split-button type="primary" class="ms-api-buttion" @click="handleCommand('add')"
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 8cf0c95ff9..471dfb90e7 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -1,6 +1,9 @@
 <template>
 
   <div class="card-container">
+    <div class="ms-opt-btn">
+      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    </div>
     <el-card class="card-content">
 
       <el-form :model="api" :rules="rules" ref="apiData" :inline="true" label-position="right">
@@ -116,7 +119,8 @@ export default {
       runData: [],
       reportId: "",
       envMap: new Map,
-      runLoading: false
+      runLoading: false,
+      versionName: '',
     }
   },
   props: {apiData: {}, currentProtocol: String, syncTabs: Array, projectId: String},
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 80c5b014a9..f0a5dbee67 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
@@ -1,6 +1,9 @@
 <template>
 
   <div class="card-container">
+    <div class="ms-opt-btn">
+      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    </div>
     <el-card class="card-content">
       <!-- 操作按钮 -->
       <el-dropdown split-button type="primary" class="ms-api-buttion" @click="handleCommand('add')"
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 be5a4a1efa..af08718175 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
@@ -1,6 +1,9 @@
 <template>
 
   <div class="card-container">
+    <div class="ms-opt-btn">
+      {{ $t('project.version.name') }}:  {{ apiData.versionName }}
+    </div>
     <el-card class="card-content">
 
       <el-form :model="api" :rules="rules" ref="apiData" :inline="true" label-position="right">