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

refactor(接口测试): 优化接口排序

This commit is contained in:
wxg0103 2024-03-13 14:35:51 +08:00 committed by 刘瑞斌
parent a9d680bacb
commit effb35b4e1
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/api-test/src/main/java/io/metersphere/api/dto/request/ApiEditPosRequest.java
View File

@ -2,7 +2,6 @@ package io.metersphere.api.dto.request;
import io.metersphere.system.dto.sdk.request.PosRequest; import io.metersphere.system.dto.sdk.request.PosRequest;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -12,8 +11,7 @@ public class ApiEditPosRequest extends PosRequest implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "模块id", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "模块id 模块树列表拖拽的时候 这个字段必传 ,其他情况不传")
@NotBlank(message = "{api_definition.module_id.not_blank}")
private String moduleId; private String moduleId;
} }

3
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
View File

@ -1057,8 +1057,9 @@ public class ApiDefinitionService extends MoveNodeService {
public void editPos(ApiEditPosRequest request, String userId) { public void editPos(ApiEditPosRequest request, String userId) {
ApiDefinition apiDefinition = checkApiDefinition(request.getMoveId()); ApiDefinition apiDefinition = checkApiDefinition(request.getMoveId());
if (!StringUtils.equals(request.getModuleId(), apiDefinition.getModuleId())) { if (StringUtils.isNotBlank(request.getModuleId()) && !StringUtils.equals(request.getModuleId(), apiDefinition.getModuleId())) {
checkModuleExist(request.getModuleId()); checkModuleExist(request.getModuleId());
apiDefinition.setModuleId(request.getModuleId());
apiDefinition.setUpdateTime(System.currentTimeMillis()); apiDefinition.setUpdateTime(System.currentTimeMillis());
apiDefinition.setUpdateUser(userId); apiDefinition.setUpdateUser(userId);
apiDefinitionMapper.updateByPrimaryKeySelective(apiDefinition); apiDefinitionMapper.updateByPrimaryKeySelective(apiDefinition);

1
frontend/src/views/api-test/management/components/management/api/apiTable.vue
View File

@ -764,7 +764,6 @@
try { try {
await sortDefinition({ await sortDefinition({
...params, ...params,
moduleId: moduleIds.value[0] || '',
}); });
Message.success(t('caseManagement.featureCase.sortSuccess')); Message.success(t('caseManagement.featureCase.sortSuccess'));
} catch (error) { } catch (error) {

10
frontend/src/views/api-test/management/components/management/api/preview/quote.vue
View File

@ -45,8 +45,8 @@
const columns: MsTableColumn = [ const columns: MsTableColumn = [
{ {
title: 'ID', title: 'ID',
dataIndex: 'id', dataIndex: 'num',
slotName: 'id', slotName: 'num',
width: 150, width: 150,
}, },
{ {
@ -62,18 +62,18 @@
}, },
{ {
title: 'apiTestManagement.quoteType', title: 'apiTestManagement.quoteType',
dataIndex: 'quoteType', dataIndex: 'refType',
width: 100, width: 100,
}, },
{ {
title: 'apiTestManagement.belongOrg', title: 'apiTestManagement.belongOrg',
dataIndex: 'belongOrg', dataIndex: 'organizationName',
showTooltip: true, showTooltip: true,
width: 150, width: 150,
}, },
{ {
title: 'apiTestManagement.belongProject', title: 'apiTestManagement.belongProject',
dataIndex: 'belongProject', dataIndex: 'projectName',
showTooltip: true, showTooltip: true,
width: 150, width: 150,
}, },