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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
wenyann 2021-03-19 18:07:39 +08:00
parent e23c4d84a8 5350cc1634
commit 4a3f44daf4
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java
View File

@ -144,12 +144,12 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
String[] stepRes = new String[1]; String[] stepRes = new String[1];
if (data.getStepDesc() != null) { if (data.getStepDesc() != null) {
stepDesc = data.getStepDesc().split("\n"); stepDesc = data.getStepDesc().split("\r\n");
} else { } else {
stepDesc[0] = ""; stepDesc[0] = "";
} }
if (data.getStepResult() != null) { if (data.getStepResult() != null) {
stepRes = data.getStepResult().split("\n"); stepRes = data.getStepResult().split("\r\n");
} else { } else {
stepRes[0] = ""; stepRes[0] = "";
} }

4
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -520,8 +520,8 @@ public class TestCaseService {
for (int j = 0; j < jsonArray.size(); j++) { for (int j = 0; j < jsonArray.size(); j++) {
int num = j + 1; int num = j + 1;
step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\n"); step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\r\n");
result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\n"); result.append(num + "." + jsonArray.getJSONObject(j).getString("result") + "\r\n");
} }
data.setStepDesc(step.toString()); data.setStepDesc(step.toString());

2
frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
View File

@ -159,7 +159,7 @@ export default {
data() { data() {
return { return {
timeout: 60000, timeout: 60000,
responseTimeout: null, responseTimeout: 60000,
statusCode: [], statusCode: [],
domains: [], domains: [],
params: [], params: [],

1
frontend/src/business/components/track/case/TestCase.vue
View File

@ -8,6 +8,7 @@
@setTreeNodes="setTreeNodes" @setTreeNodes="setTreeNodes"
@exportTestCase="exportTestCase" @exportTestCase="exportTestCase"
@saveAsEdit="editTestCase" @saveAsEdit="editTestCase"
@refreshAll="refreshAll"
:type="'edit'" :type="'edit'"
ref="nodeTree" ref="nodeTree"
/> />

2
frontend/src/business/components/track/common/TestCaseNodeTree.vue
View File

@ -101,7 +101,7 @@ export default {
this.$emit("refreshTable"); this.$emit("refreshTable");
}, },
refreshAll() { refreshAll() {
this.selectRows.clear(); // this.selectRows.clear();
this.$emit('refreshAll'); this.$emit('refreshAll');
}, },
handleCommand(e) { handleCommand(e) {

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

@ -2,7 +2,7 @@
<el-card class="table-card" v-loading="result.loading" body-style="padding:10px;"> <el-card class="table-card" v-loading="result.loading" body-style="padding:10px;">
<div slot="header"> <div slot="header">
<span class="title"> <span class="title">
遗留缺陷统计 用例评审
</span> </span>
<ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view" <ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view"
:content="$t('test_track.review.my_create')" @click="searchMyCreator" style="float: right"/> :content="$t('test_track.review.my_create')" @click="searchMyCreator" style="float: right"/>