test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2021-01-26 19:43:04 +08:00
parent 2ff8b766e5 0b893278af
commit ef5dbf4581
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/business/components/api/definition/ApiDefinition.vue
View File

@ -222,7 +222,6 @@
} }
if (this.$refs.apiConfig) { if (this.$refs.apiConfig) {
this.$refs.apiConfig.forEach(item => { this.$refs.apiConfig.forEach(item => {
console.log(item);
item.removeListener(); item.removeListener();
}); // 删除所有tab的 ctrl + s 监听 }); // 删除所有tab的 ctrl + s 监听
let tabs = this.apiTabs; let tabs = this.apiTabs;

25
frontend/src/business/components/api/definition/components/import/ApiImport.vue
View File

@ -20,19 +20,13 @@
<el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form"> <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
<el-row> <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-col :span="11">
<el-form-item :label="$t('commons.import_module')" <el-form-item :label="$t('commons.import_module')">
v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
<el-select size="small" v-model="formData.moduleId" class="project-select" clearable> <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-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('commons.import_mode')" <el-form-item :label="$t('commons.import_mode')">
v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
<el-select size="small" v-model="formData.modeId" class="project-select" clearable> <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-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
@ -43,7 +37,16 @@
:active-text="$t('api_test.api_import.swagger_url_import')"> :active-text="$t('api_test.api_import.swagger_url_import')">
</el-switch> </el-switch>
</el-form-item> </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 <el-switch
v-model="swaggerSynchronization" v-model="swaggerSynchronization"
@click.native="scheduleEdit" @click.native="scheduleEdit"
@ -51,10 +54,6 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1"
v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
<el-divider direction="vertical"/>
</el-col>
<el-col :span="12" <el-col :span="12"
v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)"> v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
<el-upload <el-upload

3
frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
View File

@ -104,7 +104,8 @@
search() { search() {
this.selectRows = new Set(); this.selectRows = new Set();
this.loading = true; this.loading = true;
this.condition.filters = ["Prepare", "Underway", "Completed"];
this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
this.condition.moduleIds = this.selectNodeIds; this.condition.moduleIds = this.selectNodeIds;