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/dev' into dev

This commit is contained in:
q4speed 2020-05-18 13:54:37 +08:00
parent fd52e37069 2315c97940
commit 902b3f3225
10 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
View File

@ -124,11 +124,17 @@ public class TestCaseNodeService {
testCases.forEach(testCase -> { testCases.forEach(testCase -> {
StringBuilder path = new StringBuilder(testCase.getNodePath()); StringBuilder path = new StringBuilder(testCase.getNodePath());
List<String> list = Arrays.asList(path.toString().split("/")); List<String> pathLists = Arrays.asList(path.toString().split("/"));
list.set(request.getLevel(), request.getName());
if (request.getLevel() <= pathLists.size()) {
pathLists.set(request.getLevel(), request.getName());
} else {
pathLists.add(request.getName());
}
path.delete( 0, path.length()); path.delete( 0, path.length());
for (int i = 1; i < list.size(); i++) { for (int i = 1; i < pathLists.size(); i++) {
path = path.append("/").append(list.get(i)); path = path.append("/").append(pathLists.get(i));
} }
testCase.setNodePath(path.toString()); testCase.setNodePath(path.toString());
}); });

16
frontend/src/business/components/performance/report/PerformanceReportView.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div v-loading="result.loading" class="container"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card> <el-card v-loading="result.loading">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-row> <el-row>
@ -51,8 +51,8 @@
</el-tabs> </el-tabs>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
@ -60,6 +60,8 @@
import MsReportLogDetails from './components/LogDetails'; import MsReportLogDetails from './components/LogDetails';
import MsReportRequestStatistics from './components/RequestStatistics'; import MsReportRequestStatistics from './components/RequestStatistics';
import MsReportTestOverview from './components/TestOverview'; import MsReportTestOverview from './components/TestOverview';
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
name: "PerformanceReportView", name: "PerformanceReportView",
@ -67,7 +69,9 @@
MsReportErrorLog, MsReportErrorLog,
MsReportLogDetails, MsReportLogDetails,
MsReportRequestStatistics, MsReportRequestStatistics,
MsReportTestOverview MsReportTestOverview,
MsContainer,
MsMainContainer
}, },
data() { data() {
return { return {

16
frontend/src/business/components/performance/report/PerformanceTestReport.vue
View File

@ -1,8 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<ms-main-container>
<div class="main-content"> <el-card class="table-card" v-loading="result.loading">
<el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<div> <div>
<el-row type="flex" justify="space-between" align="middle"> <el-row type="flex" justify="space-between" align="middle">
@ -84,17 +83,18 @@
<ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize" <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/> :total="total"/>
</el-card> </el-card>
</div> </ms-main-container>
</ms-container>
</div>
</template> </template>
<script> <script>
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
name: "PerformanceTestReport", name: "PerformanceTestReport",
components: {MsTablePagination}, components: {MsTablePagination, MsContainer, MsMainContainer},
created: function () { created: function () {
this.initTableData(); this.initTableData();
}, },

16
frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card> <el-card v-loading="result.loading">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-input :placeholder="$t('load_test.input_name')" v-model="testPlan.name" class="input-with-select"> <el-input :placeholder="$t('load_test.input_name')" v-model="testPlan.name" class="input-with-select">
@ -37,21 +37,25 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
import PerformanceBasicConfig from "./components/PerformanceBasicConfig"; import PerformanceBasicConfig from "./components/PerformanceBasicConfig";
import PerformancePressureConfig from "./components/PerformancePressureConfig"; import PerformancePressureConfig from "./components/PerformancePressureConfig";
import PerformanceAdvancedConfig from "./components/PerformanceAdvancedConfig"; import PerformanceAdvancedConfig from "./components/PerformanceAdvancedConfig";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
name: "EditPerformanceTestPlan", name: "EditPerformanceTestPlan",
components: { components: {
PerformancePressureConfig, PerformancePressureConfig,
PerformanceBasicConfig, PerformanceBasicConfig,
PerformanceAdvancedConfig PerformanceAdvancedConfig,
MsContainer,
MsMainContainer
}, },
data() { data() {
return { return {

19
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card class="table-card"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<div> <div>
<el-row type="flex" justify="space-between" align="middle"> <el-row type="flex" justify="space-between" align="middle">
@ -85,16 +85,23 @@
<ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize" <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/> :total="total"/>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableOperator from "../../common/components/MsTableOperator"; import MsTableOperator from "../../common/components/MsTableOperator";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
components: {MsTablePagination, MsTableOperator}, components: {
MsTablePagination,
MsTableOperator,
MsContainer,
MsMainContainer
},
data() { data() {
return { return {
result: {}, result: {},

2
frontend/src/business/components/project/MsProject.vue
View File

@ -9,7 +9,7 @@
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
<el-table-column prop="description" :label="$t('commons.description')"/> <el-table-column prop="description" :label="$t('commons.description')"/>
<el-table-column prop="workspaceName" label="所属工作空间"/> <el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>
<el-table-column> <el-table-column>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>

2
frontend/src/business/components/settings/Setting.vue
View File

@ -35,7 +35,7 @@
padding: 20px; padding: 20px;
} }
.ms-main-container { ms-main-container {
height: calc(100vh - 40px); height: calc(100vh - 40px);
} }

4
frontend/src/business/components/settings/personal/PersonSetting.vue
View File

@ -12,10 +12,10 @@
<!--Personal information menu--> <!--Personal information menu-->
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="id" label="ID"/> <el-table-column prop="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')" width="120"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>
<el-table-column prop="createTime" :label="$t('commons.create_time')" width="180"> <el-table-column prop="createTime" :label="$t('commons.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span> <span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template> </template>

1
frontend/src/business/components/settings/system/Organization.vue
View File

@ -8,7 +8,6 @@
</template> </template>
<!-- system menu organization table--> <!-- system menu organization table-->
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column type="selection" width="55"/>
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
<el-table-column prop="description" :label="$t('commons.description')"/> <el-table-column prop="description" :label="$t('commons.description')"/>
<el-table-column :label="$t('commons.member')"> <el-table-column :label="$t('commons.member')">

5
frontend/src/business/components/settings/system/User.vue
View File

@ -8,12 +8,11 @@
</template> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column type="selection" width="55"/>
<el-table-column prop="id" label="ID"/> <el-table-column prop="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')" width="120"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>
<el-table-column prop="status" :label="$t('commons.status')" width="100"> <el-table-column prop="status" :label="$t('commons.status')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-switch v-model="scope.row.status" <el-switch v-model="scope.row.status"
active-color="#13ce66" active-color="#13ce66"