From 4a4856663dbc520b6e498371993347ba905c86ae Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 5 Jul 2022 17:16:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=AF=BC=E5=85=A5TCP=E6=8E=A5=E5=8F=A3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1014631 --user=王孝刚 【接口测试】-接口定义-导入TCP接口页面的下载模板位置优化
https://www.tapd.cn/55049933/s/1195195
---
 .../api/automation/scenario/common/ScenarioImport.vue | 11 ++++++-----
 .../api/definition/components/import/ApiImport.vue    |  9 ++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index 1a234e7aeb..d36dc7b8a7 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -25,7 +25,7 @@
             <ms-select-tree size="small" :data="moduleOptions" :defaultKey="formData.moduleId" @getValue="setModule"
                             :obj="moduleObj" clearable checkStrictly/>
           </el-form-item>
-          <el-form-item v-if="!isHar" :label="$t('commons.import_mode')">
+          <el-form-item :label="$t('commons.import_mode')" prop="modeId">
             <el-select size="small" v-model="formData.modeId" class="project-select" clearable>
               <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
@@ -173,7 +173,11 @@ export default {
         moduleId: '',
         coverModule: false
       },
-      rules: {},
+      rules: {
+        modeId: [
+          {required: true, message: this.$t('commons.please_select_import_mode'), trigger: 'change'},
+        ],
+      },
       currentModule: {},
       fileList: [],
       moduleObj: {
@@ -203,9 +207,6 @@ export default {
     }
   },
   computed: {
-    isHar() {
-      return this.selectedPlatformValue === 'Har';
-    },
     projectId() {
       return getCurrentProjectID();
     },
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index fe670a1287..0d388da001 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -56,10 +56,9 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="showTemplate">
-            <el-link type="primary" class="download-template"
-                     @click="downloadTemplate"
-            >{{ $t('test_track.case.import.download_template') }}
-            </el-link>
+            <el-button type="small" @click="downloadTemplate">
+              {{ $t('test_track.case.import.download_template') }}
+            </el-button>
           </el-form-item>
           <el-form-item v-if="isSwagger2">
             <el-switch
@@ -341,7 +340,7 @@ export default {
       return this.selectedPlatformValue === 'Swagger2';
     },
     showImportModel() {
-      return this.selectedPlatformValue !== 'Har' && this.selectedPlatformValue !== 'ESB';
+      return this.selectedPlatformValue !== 'ESB';
     },
     showTemplate() {
       return this.selectedPlatformValue === 'ESB';