test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-07 14:39:17 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenyann 2021-03-12 11:15:31 +08:00
commit 637739459e
12 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
View File

@ -299,8 +299,8 @@
select test_plan_test_case.*, test_case.*
from test_plan_test_case
inner join test_case on test_plan_test_case.case_id = test_case.id
where status != 'Prepare'
and status != 'Underway'
where test_plan_test_case.status != 'Prepare'
and test_plan_test_case.status != 'Underway'
and test_plan_test_case.Executor = #{request.executor}
and test_plan_test_case.plan_id in
<foreach collection="request.planIds" item="planId" separator="," open="(" close=")">

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit d2fc4b42117be97c679b4d15d6f979923e598f7f
Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837

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

@ -31,10 +31,10 @@
</el-tooltip>
<slot name="button"></slot>
<el-tooltip content="Copy" placement="top">
<el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data.referenced==='REF' || data.disabled"/>
<el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>
</el-tooltip>
<el-tooltip :content="$t('commons.remove')" placement="top">
<el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data.referenced==='REF' || data.disabled"/>
<el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>
</el-tooltip>
</div>

2
frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
View File

@ -216,7 +216,7 @@
}
this.request.requestResult = requestResult;
this.request.id = response.data.id;
this.request.disabled = true;
//this.request.disabled = true;
if (!this.request.projectId) {
this.request.projectId = response.data.projectId;
}

2
frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
View File

@ -58,7 +58,7 @@
if (this.scenario.hashTree) {
this.setDisabled(this.scenario.hashTree);
}
this.scenario.disabled = true;
//this.scenario.disabled = true;
this.scenario.name = response.data.name;
if (!this.scenario.projectId) {
this.scenario.projectId = response.data.projectId;

2
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -325,7 +325,7 @@ export default {
currentPage: 1,
pageSize: 10,
total: 0,
screenHeight: document.documentElement.clientHeight - 270,//屏幕高度,
screenHeight: document.documentElement.clientHeight - 310,//屏幕高度,
environmentId: undefined,
selectDataCounts: 0,
}

4
frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
View File

@ -132,6 +132,7 @@ import MsChart from "@/business/components/common/chart/MsChart";
import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
const HANDLER = "handler";
const THREAD_GROUP_TYPE = "tgType";
const TARGET_LEVEL = "TargetLevel";
const RAMP_UP = "RampUp";
const STEPS = "Steps";
@ -225,6 +226,9 @@ export default {
case HANDLER:
this.threadGroups[i].handler = item.value;
break;
case THREAD_GROUP_TYPE:
this.threadGroups[i].tgType = item.value;
break;
default:
break;
}

2
frontend/src/business/components/settings/system/BaseSetting.vue
View File

@ -42,7 +42,7 @@ export default {
url: [
{
required: true,
message: this.$t('system_par'),
message: this.$t('system_config.base.url_is_null'),
trigger: ['change', 'blur']
},
],

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 17404980aab725889843ce8c65f5f5c00113ae21
Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819

3
frontend/src/i18n/en-US.js
View File

@ -240,7 +240,8 @@ export default {
base_config: 'Base Config',
base: {
url: 'Website URL',
url_tip: 'example：http://localhost:8081'
url_tip: 'example：http://localhost:8081',
url_is_null: 'The current site URL cannot be empty'
}
},
workspace: {

3
frontend/src/i18n/zh-CN.js
View File

@ -241,7 +241,8 @@ export default {
base_config: '基本配置',
base: {
url: '当前站点URL',
url_tip: '例如：http://localhost:8081'
url_tip: '例如：http://localhost:8081',
url_is_null: '当前站点URL不能为空'
}
},
workspace: {

3
frontend/src/i18n/zh-TW.js
View File

@ -241,7 +241,8 @@ export default {
base_config: '基本配置',
base: {
url: '當前站點URL',
url_tip: '例如：http://localhost:8081'
url_tip: '例如：http://localhost:8081',
url_is_null: '當前站點URL不能為空'
}
},
workspace: {