diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java index 2ccdd2b503..358ab56d8c 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java @@ -16,7 +16,6 @@ import io.metersphere.api.service.ApiModuleService; import io.metersphere.base.domain.ApiDefinitionWithBLOBs; import io.metersphere.base.domain.ApiModule; import io.metersphere.commons.exception.MSException; -import io.metersphere.commons.json.JSONSchemaGenerator; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.XMLUtils; diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index de0e6620db..e43ffd7d4b 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -537,6 +537,7 @@ public class ApiDefinitionService { apiDefinition.setModuleId(sameRequest.get(0).getModuleId()); apiDefinition.setModulePath(sameRequest.get(0).getModulePath()); apiDefinition.setNum(sameRequest.get(0).getNum()); //id 不变 + apiDefinition.setOrder(sameRequest.get(0).getOrder()); apiDefinitionMapper.updateByPrimaryKeyWithBLOBs(apiDefinition); apiDefinition.setRequest(request); importApiCase(apiDefinition, apiTestCaseMapper, apiTestImportRequest, false); @@ -553,6 +554,7 @@ public class ApiDefinitionService { if (StringUtils.equalsAnyIgnoreCase(apiDefinition.getProtocol(), RequestType.TCP)) { String request = setImportTCPHashTree(apiDefinition); } + apiDefinition.setOrder(sameRequest.get(0).getOrder()); apiDefinitionMapper.updateByPrimaryKeyWithBLOBs(apiDefinition); } @@ -640,6 +642,7 @@ public class ApiDefinitionService { apiTestCase.setPriority(sameCase.getPriority()); apiTestCase.setCreateUserId(sameCase.getCreateUserId()); apiTestCase.setNum(sameCase.getNum()); + apiTestCase.setOrder(sameCase.getOrder()); apiTestCase.setProjectId(sameCase.getProjectId()); apiTestCase.setVersion((sameCase.getVersion() == null ? 0 : sameCase.getVersion()) + 1); apiTestCaseMapper.updateByPrimaryKeySelective(apiTestCase); diff --git a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue index 4ef96351c2..449d43606b 100644 --- a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue +++ b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue @@ -47,6 +47,13 @@ + + + + + + @@ -84,7 +91,8 @@ needMock: { type: Boolean, default: false - } + }, + showDesc: Boolean }, data() { return { diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue index d11e78bb1c..cea1f3a56b 100644 --- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue +++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue @@ -17,7 +17,7 @@ {{ $t("commons.batch_add") }} - +