diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml index 6bb25523db..1c823d76ee 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml @@ -199,10 +199,10 @@ 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 ,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 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 u2 on api_scenario.principal = u2.id left join project_version on api_scenario.project_id = project_version.project_id AND project_version.id = diff --git a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue index 929e4d5b4c..a7cf52e3ac 100644 --- a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue +++ b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue @@ -502,7 +502,4 @@ export default { height: calc(100vh - 100px); } -.ms-api-card >>> .el-card__body { - padding: 0px; -} diff --git a/frontend/src/business/components/api/definition/components/mock/MockConfigHeader.vue b/frontend/src/business/components/api/definition/components/mock/MockConfigHeader.vue index 1787ddf681..756fa9c719 100644 --- a/frontend/src/business/components/api/definition/components/mock/MockConfigHeader.vue +++ b/frontend/src/business/components/api/definition/components/mock/MockConfigHeader.vue @@ -18,7 +18,7 @@ ref="tag"/> - {{ $t('commons.save') diff --git a/frontend/src/business/components/api/definition/components/mock/MockTab.vue b/frontend/src/business/components/api/definition/components/mock/MockTab.vue index bb77c6950a..a8e2fc8b77 100644 --- a/frontend/src/business/components/api/definition/components/mock/MockTab.vue +++ b/frontend/src/business/components/api/definition/components/mock/MockTab.vue @@ -7,7 +7,7 @@ Mock地址: - {{ this.getUrlPrefix }} + {{ this.getUrlPrefix }} 当前项目未开启Mock服务 @@ -441,12 +441,4 @@ export default { 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; -}