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:
q4speed 2020-08-25 17:48:13 +08:00
parent 954262a631 a34cb53bbb
commit 54f025e6a2
7 changed files with 699 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
frontend/src/business/components/api/test/ApiTestConfig.vue
View File

@ -15,35 +15,35 @@
</el-input>
<el-button type="primary" plain :disabled="isReadOnly" @click="saveTest">
{{$t('commons.save')}}
{{ $t('commons.save') }}
</el-button>
<el-button type="primary" plain :disabled="isReadOnly"
@click="saveRunTest">
{{$t('load_test.save_and_run')}}
{{ $t('load_test.save_and_run') }}
</el-button>
<!-- <el-button :disabled="isReadOnly" type="primary" plain v-if="isShowRun" @click="runTest">-->
<!-- {{$t('api_test.run')}}-->
<!-- </el-button>-->
<!-- <el-button :disabled="isReadOnly" type="primary" plain v-if="isShowRun" @click="runTest">-->
<!-- {{$t('api_test.run')}}-->
<!-- </el-button>-->
<el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{$t('commons.cancel')}}
<el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{ $t('commons.cancel') }}
</el-button>
<el-dropdown trigger="click" @command="handleCommand">
<el-button class="el-dropdown-link more" icon="el-icon-more" plain/>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="report">
{{$t('api_report.title')}}
{{ $t('api_report.title') }}
</el-dropdown-item>
<el-dropdown-item command="performance" :disabled="create || isReadOnly">
{{$t('api_test.create_performance_test')}}
{{ $t('api_test.create_performance_test') }}
</el-dropdown-item>
<el-dropdown-item command="export" :disabled="isReadOnly || create">
{{$t('api_test.export_config')}}
{{ $t('api_test.export_config') }}
</el-dropdown-item>
<el-dropdown-item command="import" :disabled="isReadOnly">
{{$t('api_test.api_import.label')}}
{{ $t('api_test.api_import.label') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -52,10 +52,12 @@
<ms-api-report-dialog :test-id="id" ref="reportDialog"/>
<ms-schedule-config :schedule="test.schedule" :is-read-only="isReadOnly" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit"/>
<ms-schedule-config :schedule="test.schedule" :is-read-only="isReadOnly" :save="saveCronExpression"
@scheduleChange="saveSchedule" :check-open="checkScheduleEdit"/>
</el-row>
</el-header>
<ms-api-scenario-config :debug-report-id="debugReportId" @runDebug="runDebug" :is-read-only="isReadOnly" :scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/>
<ms-api-scenario-config :debug-report-id="debugReportId" @runDebug="runDebug" :is-read-only="isReadOnly"
:scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/>
</el-container>
</el-card>
</div>
@ -63,16 +65,17 @@
</template>
<script>
import MsApiScenarioConfig from "./components/ApiScenarioConfig";
import {Test} from "./model/ScenarioModel"
import MsApiReportStatus from "../report/ApiReportStatus";
import MsApiReportDialog from "./ApiReportDialog";
import {checkoutTestManagerOrTestUser, downloadFile} from "@/common/js/utils";
import MsScheduleConfig from "../../common/components/MsScheduleConfig";
import ApiImport from "./components/import/ApiImport";
import {getUUID} from "../../../../common/js/utils";
import MsApiScenarioConfig from "./components/ApiScenarioConfig";
import {Test} from "./model/ScenarioModel"
import MsApiReportStatus from "../report/ApiReportStatus";
import MsApiReportDialog from "./ApiReportDialog";
import {checkoutTestManagerOrTestUser, downloadFile} from "@/common/js/utils";
import MsScheduleConfig from "../../common/components/MsScheduleConfig";
import ApiImport from "./components/import/ApiImport";
import {getUUID} from "../../../../common/js/utils";
import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
export default {
export default {
name: "MsApiTestConfig",
components: {ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig},
@ -155,7 +158,7 @@
let jmx = this.test.toJMX();
let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
let file = new File([blob], jmx.name);
this.result = this.$fileUpload(url, file, bodyFiles, this.test,response => {
this.result = this.$fileUpload(url, file, bodyFiles, this.test, response => {
if (callback) callback();
this.create = false;
this.resetBodyFile();
@ -169,6 +172,8 @@
path: '/api/test/edit?id=' + this.test.id
})
}
// 发送广播，刷新 head 上的最新列表
ApiEvent.$emit(LIST_CHANGE);
})
},
runTest() {
@ -185,6 +190,8 @@
this.save(() => {
this.$success(this.$t('commons.save_success'));
this.runTest();
// 发送广播，刷新 head 上的最新列表
ApiEvent.$emit(LIST_CHANGE);
})
},
getBodyUploadFiles() {
@ -193,7 +200,7 @@
this.test.scenarioDefinition.forEach(scenario => {
scenario.requests.forEach(request => {
if (request.body) {
request.body.kvs.forEach( param => {
request.body.kvs.forEach(param => {
if (param.files) {
param.files.forEach(item => {
if (item.file) {
@ -217,7 +224,7 @@
this.test.scenarioDefinition.forEach(scenario => {
scenario.requests.forEach(request => {
if (request.body) {
request.body.kvs.forEach( param => {
request.body.kvs.forEach(param => {
if (param.files) {
param.files.forEach(item => {
if (item.file) {
@ -302,7 +309,7 @@
let jmx = runningTest.toJMX();
let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
let file = new File([blob], jmx.name);
this.$fileUpload(url, file, null, this.test,response => {
this.$fileUpload(url, file, null, this.test, response => {
this.debugReportId = response.data;
});
}
@ -311,26 +318,26 @@
created() {
this.init();
}
}
}
</script>
<style scoped>
.test-container {
.test-container {
height: calc(100vh - 150px);
min-height: 600px;
}
}
.test-name {
.test-name {
width: 600px;
margin-left: -20px;
margin-right: 20px;
}
}
.test-project {
.test-project {
min-width: 150px;
}
}
.test-container .more {
.test-container .more {
margin-left: 10px;
}
}
</style>

19
frontend/src/business/components/api/test/components/processor/BeanShellProcessor.vue
View File

@ -7,7 +7,7 @@
<el-col :span="4" class="script-index">
<div class="template-title">{{$t('api_test.request.processor.code_template')}}</div>
<div v-for="(template, index) in codeTemplates" :key="index" class="code-template">
<el-link @click="addTemplate(template)">{{template.title}}</el-link>
<el-link :disabled="template.disabled" @click="addTemplate(template)">{{template.title}}</el-link>
</div>
<div class="document-url">
<el-link href="https://jmeter.apache.org/usermanual/component_reference.html#BeanShell_PostProcessor" type="primary">{{$t('commons.reference_documentation')}}</el-link>
@ -29,23 +29,26 @@
codeTemplates: [
{
title: this.$t('api_test.request.processor.code_template_get_variable'),
value: 'vars.get("variable_name");'
value: 'vars.get("variable_name");',
},
{
title: this.$t('api_test.request.processor.code_template_set_variable'),
value: 'vars.put("variable_name", "variable_value");'
value: 'vars.put("variable_name", "variable_value");',
},
{
title: this.$t('api_test.request.processor.code_template_get_response_header'),
value: 'prev.getResponseHeaders();'
value: 'prev.getResponseHeaders();',
disabled: this.isPreProcessor
},
{
title: this.$t('api_test.request.processor.code_template_get_response_code'),
value: 'prev.getResponseCode();'
value: 'prev.getResponseCode();',
disabled: this.isPreProcessor
},
{
title: this.$t('api_test.request.processor.code_template_get_response_result'),
value: 'prev.getResponseDataAsString();'
value: 'prev.getResponseDataAsString();',
disabled: this.isPreProcessor
}
],
isCodeEditAlive: true
@ -61,6 +64,10 @@
},
beanShellProcessor: {
type: Object,
},
isPreProcessor: {
type: Boolean,
default: false
}
},
methods: {

2
frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
View File

@ -68,7 +68,7 @@
<ms-api-extract :is-read-only="isReadOnly" :extract="request.extract"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.request.processor.pre_exec_script')" name="beanShellPreProcessor">
<ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
<ms-bean-shell-processor :is-pre-processor="true" :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
</el-tab-pane>
<el-tab-pane :label="$t('api_test.request.processor.post_exec_script')" name="beanShellPostProcessor">
<ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPostProcessor"/>

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

@ -60,6 +60,7 @@ import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
import MsScheduleConfig from "../../common/components/MsScheduleConfig";
import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
export default {
name: "EditPerformanceTestPlan",
@ -172,6 +173,8 @@ export default {
this.$success(this.$t('commons.save_success'));
this.$refs.advancedConfig.cancelAllEdit();
this.$router.push({path: '/performance/test/all'})
// 发送广播，刷新 head 上的最新列表
PerformanceEvent.$emit(LIST_CHANGE);
});
},
saveAndRun() {
@ -187,6 +190,8 @@ export default {
this.result = this.$post(this.runPath, {id: this.testPlan.id, triggerMode: 'MANUAL'}, (response) => {
let reportId = response.data;
this.$router.push({path: '/performance/report/view/' + reportId})
// 发送广播，刷新 head 上的最新列表
PerformanceEvent.$emit(LIST_CHANGE);
})
});
},

35
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -105,12 +105,12 @@
</el-col>
<el-col :span="9" :offset="1" v-if="form.testId=='other'">
<el-form-item :label="$t('test_track.case.test_name')" :label-width="formLabelWidth" prop="testId">
<el-input v-model="form.otherTestName" :placeholder="$t('test_track.case.input_test_case')" ></el-input>
<el-input v-model="form.otherTestName" :placeholder="$t('test_track.case.input_test_case')"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-top: 15px;">
<el-col :offset="2">{{$t('test_track.case.prerequisite')}}:</el-col>
<el-col :offset="2">{{ $t('test_track.case.prerequisite') }}:</el-col>
</el-row>
<el-row type="flex" justify="center" style="margin-top: 10px;">
<el-col :span="20">
@ -125,7 +125,7 @@
</el-row>
<el-row v-if="form.method && form.method != 'auto'" style="margin-bottom: 10px">
<el-col :offset="2">{{$t('test_track.case.steps')}}:</el-col>
<el-col :offset="2">{{ $t('test_track.case.steps') }}:</el-col>
</el-row>
<el-row v-if="form.method && form.method != 'auto'" type="flex" justify="center">
@ -187,7 +187,7 @@
</el-row>
<el-row style="margin-top: 15px;margin-bottom: 10px">
<el-col :offset="2">{{$t('commons.remark')}}:</el-col>
<el-col :offset="2">{{ $t('commons.remark') }}:</el-col>
</el-row>
<el-row type="flex" justify="center">
<el-col :span="20">
@ -222,11 +222,12 @@
<script>
import {WORKSPACE_ID, TokenKey} from '../../../../../common/js/constants';
import MsDialogFooter from '../../../common/components/MsDialogFooter'
import {listenGoBack, removeGoBackListener, removeListenGoBack} from "../../../../../common/js/utils";
import {TokenKey, WORKSPACE_ID} from '../../../../../common/js/constants';
import MsDialogFooter from '../../../common/components/MsDialogFooter'
import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
export default {
export default {
name: "TestCaseEdit",
components: {MsDialogFooter},
data() {
@ -242,7 +243,7 @@
method: '',
prerequisite: '',
testId: '',
otherTestName:'',
otherTestName: '',
steps: [{
num: 1,
desc: '',
@ -386,6 +387,8 @@
}
this.dialogFormVisible = false;
this.$emit("refresh");
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
});
}
} else {
@ -450,7 +453,7 @@
if (this.currentProject && this.form.type != '' && this.form.type != 'functional') {
this.result = this.$get('/' + this.form.type + '/list/' + this.currentProject.id, response => {
this.testOptions = response.data;
this.testOptions.unshift({id:'other',name:this.$t('test_track.case.other')})
this.testOptions.unshift({id: 'other', name: this.$t('test_track.case.other')})
});
}
},
@ -496,7 +499,7 @@
this.form.prerequisite = '';
this.form.remark = '';
this.form.testId = '';
this.form.testName='';
this.form.testName = '';
this.form.steps = [{
num: 1,
desc: '',
@ -507,17 +510,17 @@
}
}
}
}
}
</script>
<style scoped>
.el-switch {
.el-switch {
margin-bottom: 10px;
}
}
.case-name {
.case-name {
width: 194px;
}
}
</style>

1
frontend/src/business/components/track/common/NodeTree.vue
View File

@ -108,7 +108,6 @@ export default {
methods: {
handleDragEnd(draggingNode, dropNode, dropType, ev) {
let param = this.buildParam(draggingNode, dropNode, dropType);
console.log(this.treeNodes);
this.$post("/case/node/drag", param, () => {
draggingNode.data.level = param.level;
this.refreshTable();

37
frontend/src/business/components/track/plan/components/TestPlanEdit.vue
View File

@ -92,12 +92,12 @@
<div class="dialog-footer">
<el-button
@click="dialogFormVisible = false">
{{$t('test_track.cancel')}}
{{ $t('test_track.cancel') }}
</el-button>
<el-button
type="primary"
@click="savePlan">
{{$t('test_track.confirm')}}
{{ $t('test_track.confirm') }}
</el-button>
</div>
</template>
@ -110,11 +110,12 @@
<script>
import {WORKSPACE_ID} from '../../../../../common/js/constants';
import TestPlanStatusButton from "../common/TestPlanStatusButton";
import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
import {WORKSPACE_ID} from '../../../../../common/js/constants';
import TestPlanStatusButton from "../common/TestPlanStatusButton";
import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
export default {
export default {
name: "TestPlanEdit",
components: {TestPlanStatusButton},
data() {
@ -127,15 +128,15 @@
stage: '',
description: ''
},
rules:{
name :[
rules: {
name: [
{required: true, message: this.$t('test_track.plan.input_plan_name'), trigger: 'blur'},
{ max: 30, message: this.$t('test_track.length_less_than') + '30', trigger: 'blur' }
{max: 30, message: this.$t('test_track.length_less_than') + '30', trigger: 'blur'}
],
projectId :[{required: true, message: this.$t('test_track.plan.input_plan_project'), trigger: 'change'}],
principal :[{required: true, message: this.$t('test_track.plan.input_plan_principal'), trigger: 'change'}],
stage :[{required: true, message: this.$t('test_track.plan.input_plan_stage'), trigger: 'change'}],
description :[{ max: 200, message: this.$t('test_track.length_less_than') + '200', trigger: 'blur'}]
projectId: [{required: true, message: this.$t('test_track.plan.input_plan_project'), trigger: 'change'}],
principal: [{required: true, message: this.$t('test_track.plan.input_plan_principal'), trigger: 'change'}],
stage: [{required: true, message: this.$t('test_track.plan.input_plan_stage'), trigger: 'change'}],
description: [{max: 200, message: this.$t('test_track.length_less_than') + '200', trigger: 'blur'}]
},
formLabelWidth: "120px",
operationType: '',
@ -149,7 +150,7 @@
this.getProjects();
this.setPrincipalOptions();
this.operationType = 'add';
if(testPlan){
if (testPlan) {
//修改
this.operationType = 'edit';
let tmp = {};
@ -159,7 +160,7 @@
listenGoBack(this.close);
this.dialogFormVisible = true;
},
savePlan(){
savePlan() {
this.$refs['planFrom'].validate((valid) => {
if (valid) {
let param = {};
@ -174,6 +175,8 @@
this.$success(this.$t('commons.save_success'));
this.dialogFormVisible = false;
this.$emit("refresh");
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
});
} else {
return false;
@ -191,7 +194,7 @@
},
setPrincipalOptions() {
let workspaceId = localStorage.getItem(WORKSPACE_ID);
this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => {
this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
this.principalOptions = response.data;
});
},
@ -219,7 +222,7 @@
}
}
}
}
}
</script>
<style scoped>