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

Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3

This commit is contained in:
shiziyuan9527 2020-09-30 16:24:25 +08:00
parent 794af4605e f32b6b530b
commit c7a3ed933e
10 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/business/components/api/home/ApiReportRecentList.vue
View File

@ -3,7 +3,7 @@
<template v-slot:header>
<span class="title">{{$t('api_report.title')}}</span>
</template>
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
<el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope">

2
frontend/src/business/components/api/home/ApiTestRecentList.vue
View File

@ -3,7 +3,7 @@
<template v-slot:header>
<span class="title">{{$t('commons.test')}}</span>
</template>
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
<el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
<el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')">

4
frontend/src/business/components/api/test/model/ScenarioModel.js
View File

@ -1140,11 +1140,13 @@ class JMXGenerator {
let domain = request.environment.config.httpConfig.domain;
let validHosts = [];
hosts.forEach(item => {
if (item.domain != undefined && domain != undefined) {
let d = item.domain.trim().replace("http://", "").replace("https://", "");
if (item && d === domain.trim()) {
if (d === domain.trim()) {
item.domain = d; // 域名去掉协议
validHosts.push(item);
}
}
});
if (validHosts.length > 0) {
threadGroup.put(new DNSCacheManager(name, validHosts));

4
frontend/src/business/components/common/components/MsTableHeader.vue
View File

@ -7,15 +7,15 @@
</slot>
</el-row>
<el-row type="flex" justify="space-between" align="middle">
<template v-slot:button>
<span class="operate-button">
<ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline"
:content="createTip" @click="create"/>
<ms-table-button :is-tester-permission="isTesterPermission" v-if="showRun" icon="el-icon-video-play"
type="primary"
:content="runTip" @click="runTest"/>
<slot name="button"></slot>
</span>
</template>
<span>
<ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
<ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>

7
frontend/src/business/components/common/router/router.js
View File

@ -41,6 +41,13 @@ router.beforeEach((to, from, next) => {
}
});
//重复点击导航路由报错
const routerPush = VueRouter.prototype.push;
VueRouter.prototype.push = function push(location) {
return routerPush.call(this, location).catch(error => error)
}
// 登入后跳转至原路径
function redirectLoginPath(originPath) {
let redirectUrl = sessionStorage.getItem('redirectUrl');

2
frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
View File

@ -3,7 +3,7 @@
<template v-slot:header>
<span class="title">{{$t('api_report.title')}}</span>
</template>
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
<el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope">

2
frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
View File

@ -3,7 +3,7 @@
<template v-slot:header>
<span class="title">{{$t('commons.test')}}</span>
</template>
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link">
<el-table border :data="tableData" class="adjust-table table-content" @row-click="link" height="300px">
<el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
<el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')">

2
frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
View File

@ -5,7 +5,7 @@
border
:data="tableData"
@row-click="intoPlan"
v-loading="result.loading">
v-loading="result.loading" height="300px">
<el-table-column
prop="name"
fixed

2
frontend/src/business/components/track/home/components/ReviewList.vue
View File

@ -14,7 +14,7 @@
border
:data="tableData"
@row-click="intoPlan"
v-loading="result.loading">
v-loading="result.loading" height="300px">
<el-table-column
prop="name"
fixed

2
frontend/src/business/components/track/home/components/TestCaseSideList.vue
View File

@ -8,7 +8,7 @@
class="adjust-table"
@row-click="editTestCase"
:data="tableData"
v-loading="result.loading">
v-loading="result.loading" height="300px">
<el-table-column
prop="name"