From 24aa3e5f96c649b7c9fdaf6ae79bce8aabff66a3 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 26 Jan 2021 19:25:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/definition/ApiDefinition.vue   | 1 -
 .../track/plan/view/comonents/api/RelevanceScenarioList.vue    | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 56a5fda42e..c592ab32b1 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -222,7 +222,6 @@
         }
         if (this.$refs.apiConfig) {
           this.$refs.apiConfig.forEach(item => {
-            console.log(item);
             item.removeListener();
           }); //  删除所有tab的 ctrl + s 监听
           let tabs = this.apiTabs;
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index dfae67b1c5..b50dbfa2b3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -104,7 +104,8 @@
       search() {
         this.selectRows = new Set();
         this.loading = true;
-        this.condition.filters = ["Prepare", "Underway", "Completed"];
+
+        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
 
         this.condition.moduleIds = this.selectNodeIds;
 

From 54de49325f732e032220d2e44246f1d97db1e038 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:26:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/import/ApiImport.vue           | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

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 c15783b710..a808a985f2 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -20,19 +20,13 @@
 
     <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
       <el-row>
-        <el-form-item :label="'Swagger URL'" prop="swaggerUrl" v-if="isSwagger2 && swaggerUrlEable" class="swagger-url">
-          <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit/>
-        </el-form-item>
-
         <el-col :span="11">
-          <el-form-item :label="$t('commons.import_module')"
-                        v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
+          <el-form-item :label="$t('commons.import_module')">
             <el-select size="small" v-model="formData.moduleId" class="project-select" clearable>
               <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('commons.import_mode')"
-                        v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
+          <el-form-item :label="$t('commons.import_mode')">
             <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>
@@ -43,7 +37,16 @@
               :active-text="$t('api_test.api_import.swagger_url_import')">
             </el-switch>
           </el-form-item>
-          <el-form-item v-show="isSwagger2 && swaggerUrlEable">
+
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+        <el-col :span="12" v-show="isSwagger2 && swaggerUrlEable" style="margin-top: 40px">
+          <el-form-item :label="'Swagger URL'" prop="swaggerUrl" class="swagger-url">
+            <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit/>
+          </el-form-item>
+          <el-form-item>
             <el-switch
               v-model="swaggerSynchronization"
               @click.native="scheduleEdit"
@@ -51,10 +54,6 @@
             </el-switch>
           </el-form-item>
         </el-col>
-        <el-col :span="1"
-                v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
-          <el-divider direction="vertical"/>
-        </el-col>
         <el-col :span="12"
                 v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
           <el-upload