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

style(接口自动化): 终止事件调整

This commit is contained in:
fit2-zhao 2021-03-17 19:02:28 +08:00
parent ce361d3246
commit 17ebeda90b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7 Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837

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

@ -12,14 +12,14 @@
<span> <span>
<slot name="headerLeft"> <slot name="headerLeft">
<i class="icon el-icon-arrow-right" :class="{'is-active': data.active}" <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
@click="active(data)" v-if="data.type!='scenario' && !isMax "/> @click="active(data)" v-if="data.type!='scenario' && data.type!='JmeterElement' && !isMax " @click.stop/>
<span @click.stop v-if="isShowInput && isShowNameInput"> <span @click.stop v-if="isShowInput && isShowNameInput">
<el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input" <el-input :draggable="draggable" size="mini" v-model="data.name" class="name-input"
@blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/> @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
</span> </span>
<span :class="isMax?'ms-step-name':'scenario-name'" v-else> <span :class="isMax?'ms-step-name':'scenario-name'" v-else>
{{data.name}} {{data.name}}
<i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/> <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled" @click.stop/>
</span> </span>
</slot> </slot>
<slot name="behindHeaderLeft" v-if="!isMax"></slot> <slot name="behindHeaderLeft" v-if="!isMax"></slot>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit b2571e06e8b211821409115cc2c4a7c52cbac1db Subproject commit f2781219889c2f993436bcc3ea90038f588fa73e