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

fix(接口定义): 修复场景创建新版本，不显示创建人的缺陷 

--bug=1017226 --user=王孝刚 【接口测试】github #18185，创建版本设置为最新版，场景内新建版本关闭后创建人丢失
https://www.tapd.cn/55049933/s/1251705
This commit is contained in:
wxg0103 2022-09-26 14:25:10 +08:00 committed by wxg0103
parent 25a8eee0d9
commit 6ca7a6ef42
4 changed files with 4 additions and 15 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/ExtApiScenarioMapper.xml
View File

@ -199,10 +199,10 @@
api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time, api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time,
project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time
,u2.name as principal_name, ,u2.name as principal_name,
api_scenario.create_user as creator , user.name as creator_name api_scenario.create_user as create_user , user.name as creator_name
from api_scenario from api_scenario
left join project on api_scenario.project_id = project.id left join project on api_scenario.project_id = project.id
left join user on api_scenario.user_id = user.id and api_scenario.create_user = user.id left join user on api_scenario.create_user = user.id
left join user deleteUser on api_scenario.delete_user_id = deleteUser.id left join user deleteUser on api_scenario.delete_user_id = deleteUser.id
left join user u2 on api_scenario.principal = u2.id left join user u2 on api_scenario.principal = u2.id
left join project_version on api_scenario.project_id = project_version.project_id AND project_version.id = left join project_version on api_scenario.project_id = project_version.project_id AND project_version.id =

3
frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
View File

@ -502,7 +502,4 @@ export default {
height: calc(100vh - 100px); height: calc(100vh - 100px);
} }
.ms-api-card >>> .el-card__body {
padding: 0px;
}
</style> </style>

2
frontend/src/business/components/api/definition/components/mock/MockConfigHeader.vue
View File

@ -18,7 +18,7 @@
ref="tag"/> ref="tag"/>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" style="float: right;margin-right: 65px;margin-top: 5px" type="primary" <el-button size="small" style="float: right;margin-right: 65px" type="primary"
@click="saveMockExpectConfig" @click="saveMockExpectConfig"
title="ctrl + s" v-permission="['PROJECT_API_DEFINITION:READ+EDIT_API']">{{ title="ctrl + s" v-permission="['PROJECT_API_DEFINITION:READ+EDIT_API']">{{
$t('commons.save') $t('commons.save')

10
frontend/src/business/components/api/definition/components/mock/MockTab.vue
View File

@ -7,7 +7,7 @@
Mock地址： Mock地址：
<el-link v-if="this.getUrlPrefix !== '' " :href="getUrlPrefix" style="color: black" target="_blank" <el-link v-if="this.getUrlPrefix !== '' " :href="getUrlPrefix" style="color: black" target="_blank"
type="primary"> type="primary">
<span :style="{width: urlWidth}" class="ms-tab-name-width">{{ this.getUrlPrefix }}</span> <span>{{ this.getUrlPrefix }}</span>
</el-link> </el-link>
<el-link v-else style="color: darkred" target="_blank" <el-link v-else style="color: darkred" target="_blank"
type="primary">当前项目未开启Mock服务 type="primary">当前项目未开启Mock服务
@ -441,12 +441,4 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
} }
.ms-tab-name-width {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
vertical-align: middle;
white-space: nowrap;
max-width: 1030px;
}
</style> </style>