fix: 场景自动化 增加失败继续可选项 默认勾选,未选中则步骤失败后不再继续执行
进入场景创建或编辑页面 全屏tips自动显示 3秒后消失,鼠标移动上去再显示 引导大家全屏编辑
This commit is contained in:
parent
6edb4d55e7
commit
43a3daf525
|
@ -107,13 +107,18 @@
|
||||||
<!-- 调试部分 -->
|
<!-- 调试部分 -->
|
||||||
<div class="ms-debug-div" @click="showAll">
|
<div class="ms-debug-div" @click="showAll">
|
||||||
<el-row style="margin: 5px">
|
<el-row style="margin: 5px">
|
||||||
<el-col :span="6" class="ms-col-one ms-font">
|
<el-col :span="4" class="ms-col-one ms-font">
|
||||||
<el-tooltip placement="top" effect="light">
|
<el-tooltip placement="top" effect="light">
|
||||||
<template v-slot:content>
|
<template v-slot:content>
|
||||||
<div>{{ currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name }}</div>
|
<div>{{
|
||||||
|
currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span class="scenario-name">
|
<span class="scenario-name">
|
||||||
{{ currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name }}
|
{{
|
||||||
|
currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name
|
||||||
|
}}
|
||||||
</span>
|
</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -128,20 +133,27 @@
|
||||||
<el-col :span="3" class="ms-col-one ms-font">
|
<el-col :span="3" class="ms-col-one ms-font">
|
||||||
<el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
|
<el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="5">
|
<el-col :span="4">
|
||||||
<env-popover :disabled="scenarioDefinition.length < 1" :env-map="projectEnvMap"
|
<env-popover :disabled="scenarioDefinition.length < 1" :env-map="projectEnvMap"
|
||||||
:project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap" :result="envResult"
|
:project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap" :result="envResult"
|
||||||
:isReadOnly="scenarioDefinition.length < 1" @showPopover="showPopover"
|
:isReadOnly="scenarioDefinition.length < 1" @showPopover="showPopover"
|
||||||
:project-list="projectList" ref="envPopover"/>
|
:project-list="projectList" ref="envPopover"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="2" class="ms-col-one ms-font">
|
||||||
|
<el-checkbox v-model="enableContinues">{{ $t('commons.failure_continues') }}</el-checkbox>
|
||||||
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click
|
<el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click
|
||||||
@click="runDebug">{{ $t('api_test.request.debug') }}
|
@click="runDebug">{{ $t('api_test.request.debug') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-tooltip class="item" effect="dark" :content="$t('commons.refresh')" placement="right-start">
|
<el-tooltip class="item" effect="dark" :content="$t('commons.refresh')" placement="right-start">
|
||||||
<el-button :disabled="scenarioDefinition.length < 1" size="mini" icon="el-icon-refresh" v-prevent-re-click @click="getApiScenario"></el-button>
|
<el-button :disabled="scenarioDefinition.length < 1" size="mini" icon="el-icon-refresh"
|
||||||
|
v-prevent-re-click @click="getApiScenario"></el-button>
|
||||||
|
</el-tooltip>
|
||||||
|
<el-tooltip class="item" effect="dark" :content="$t('commons.full_screen_editing')"
|
||||||
|
placement="top-start">
|
||||||
|
<font-awesome-icon class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<font-awesome-icon class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
@ -304,6 +316,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
enableContinues: false,
|
||||||
props: {
|
props: {
|
||||||
label: "label",
|
label: "label",
|
||||||
children: "hashTree"
|
children: "hashTree"
|
||||||
|
@ -349,6 +362,7 @@ export default {
|
||||||
debugData: {},
|
debugData: {},
|
||||||
reportId: "",
|
reportId: "",
|
||||||
enableCookieShare: false,
|
enableCookieShare: false,
|
||||||
|
|
||||||
globalOptions: {
|
globalOptions: {
|
||||||
spacing: 30
|
spacing: 30
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
export default {
|
export default {
|
||||||
commons: {
|
commons: {
|
||||||
|
failure_continues: "Failure continues",
|
||||||
|
full_screen_editing: "Full screen editing",
|
||||||
yes: "yes",
|
yes: "yes",
|
||||||
no: "no",
|
no: "no",
|
||||||
default: "default",
|
default: "default",
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
export default {
|
export default {
|
||||||
commons: {
|
commons: {
|
||||||
|
failure_continues: "失败继续",
|
||||||
|
full_screen_editing: "全屏编辑",
|
||||||
yes: "是",
|
yes: "是",
|
||||||
no: "否",
|
no: "否",
|
||||||
default: "默认值",
|
default: "默认值",
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
export default {
|
export default {
|
||||||
commons: {
|
commons: {
|
||||||
|
failure_continues: "失敗繼續",
|
||||||
|
full_screen_editing: "全屏編輯",
|
||||||
yes: "是",
|
yes: "是",
|
||||||
no: "否",
|
no: "否",
|
||||||
default: "默認值",
|
default: "默認值",
|
||||||
|
|
Loading…
Reference in New Issue