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 2020-12-24 15:54:33 +08:00
parent 42ab7247fb 9bc45b83dd
commit d8d10051e1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -981,8 +981,4 @@
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
} }
/deep/ .fab-item-title {
background-color: white !important;
}
</style> </style>

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

@ -242,8 +242,12 @@
this.showCasePage = true; this.showCasePage = true;
}, },
exportAPI() { exportAPI() {
if (!this.isApiListEnable) {
this.$warning('用例列表暂不支持导出，请切换成接口列表');
return;
}
let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol} let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.length > 0) { if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
let arr = Array.from(this.$refs.apiList[0].selectRows); let arr = Array.from(this.$refs.apiList[0].selectRows);
obj.data = arr; obj.data = arr;
downloadFile("导出API.json", JSON.stringify(obj)); downloadFile("导出API.json", JSON.stringify(obj));

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

@ -48,6 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable="custom"
prop="path" prop="path"
:label="$t('api_test.definition.api_path')" :label="$t('api_test.definition.api_path')"
show-overflow-tooltip/> show-overflow-tooltip/>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182 Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433