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.6'

This commit is contained in:
Captain.B 2020-12-28 16:52:50 +08:00
parent 883fff3808 bee13b6b94
commit 5d9da617be
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/resources/db/migration/V58__add_index.sql Normal file
View File

@ -0,0 +1,3 @@
create index project_workspace_id_index on project (workspace_id);
create index test_case_review_creator_index on test_case_review (creator);
create index test_case_review_project_project_id_index on test_case_review_project (project_id);

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

@ -91,6 +91,7 @@
name: "MsApiComponent",
props: {
request: {},
currentScenario: {},
node: {},
currentEnvironmentId: String,
},
@ -178,7 +179,13 @@
this.loading = true;
this.runData = [];
this.request.useEnvironment = this.currentEnvironmentId;
this.runData.push(this.request);
let debugData = {
id: this.currentScenario.id, name: this.currentScenario.name, type: "scenario",
variables: this.currentScenario.variables, referenced: 'Created', enableCookieShare: this.enableCookieShare,
environmentId: this.currentEnvironmentId, hashTree: [this.request]
};
this.runData.push(debugData);
/*触发执行操作*/
this.reportId = getUUID().substring(0, 8);

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

@ -169,7 +169,7 @@
<!--提取规则-->
<ms-api-extract @remove="remove" @copyRow="copyRow" v-if="data.type==='Extract'" customizeStyle="margin-top: 0px" :extract="data" :node="node"/>
<!--API 导入 -->
<ms-api-component :request="data" :currentEnvironmentId="currentEnvironmentId" @remove="remove" @copyRow="copyRow" v-if="data.type==='HTTPSamplerProxy'||data.type==='DubboSampler'||data.type==='JDBCSampler'||data.type==='TCPSampler'" :node="node"/>
<ms-api-component :request="data" :currentScenario="currentScenario" :currentEnvironmentId="currentEnvironmentId" @remove="remove" @copyRow="copyRow" v-if="data.type==='HTTPSamplerProxy'||data.type==='DubboSampler'||data.type==='JDBCSampler'||data.type==='TCPSampler'" :node="node"/>
</template>
</span>
</el-tree>

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

@ -372,9 +372,9 @@ export default {
test_error_log: 'Test Error Log',
test_log_details: 'Test Log Details',
test_details: 'Test Details',
test_duration: 'Test Duration：{0} minutes {1} seconds',
test_start_time: 'Test Start Time',
test_end_time: 'Test End Time',
test_duration: 'Current Execution Time：{0} minutes {1} seconds',
test_start_time: 'Start Execution Time',
test_end_time: 'Plan End Time',
test_stop_now: 'Test Stop Now',
test_stop_now_confirm: 'Are you sure you want to stop the current test immediately?',
test_rerun_confirm: 'Are you sure you want to rerun the current test immediately?',

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

@ -369,9 +369,9 @@ export default {
test_error_log: '错误记录',
test_log_details: '日志详情',
test_details: '测试详情',
test_duration: '持续时间：{0} 分钟 {1} 秒',
test_start_time: '开始时间',
test_end_time: '结束时间',
test_duration: '当前执行时长：{0} 分钟 {1} 秒',
test_start_time: '开始执行时间',
test_end_time: '计划结束时间',
test_stop_now: '立即停止',
test_stop_now_confirm: '确定要立即停止当前测试吗？',
test_rerun_confirm: '确定要再次执行当前测试吗？',

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

@ -369,9 +369,9 @@ export default {
test_error_log: '錯誤記錄',
test_log_details: '日誌詳情',
test_details: '測試詳情',
test_duration: '持續時間：{0} 分鐘 {1} 秒',
test_start_time: '開始時間',
test_end_time: '結束時間',
test_duration: '當前執行時長：{0} 分鐘 {1} 秒',
test_start_time: '開始執行時間',
test_end_time: '計劃結束時間',
test_stop_now: '立即停止',
test_stop_now_confirm: '確定要立即停止當前測試嗎？',
test_rerun_confirm: '確定要再次執行當前測試嗎？',