diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml index 962d812144..bf9a62a3bd 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml +++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml @@ -611,7 +611,7 @@ select a.id as id, max(a.num) as num, - max(a.name) as resourceName, + max(a.name) as resource_name, 'API' as resourceType, ass.ref_type as refType, max(p.id) as projectId , diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLocalConfigService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLocalConfigService.java index 89f679a5a7..23ae5a6123 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLocalConfigService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLocalConfigService.java @@ -92,7 +92,7 @@ public class UserLocalConfigService { public void update(UserLocalConfigUpdateRequest request) { UserLocalConfig userLocalConfig = checkResourceById(request.getId()); userLocalConfig.setUserUrl(request.getUserUrl()); - userLocalConfigMapper.updateByPrimaryKeySelective(userLocalConfig); + userLocalConfigMapper.updateByPrimaryKey(userLocalConfig); LogDTO dto = LogDTOBuilder.builder() .projectId(OperationLogConstants.SYSTEM) .organizationId(OperationLogConstants.SYSTEM) diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue index 3ab13c4f61..456101a43d 100644 --- a/frontend/src/views/api-test/components/requestComposition/index.vue +++ b/frontend/src/views/api-test/components/requestComposition/index.vue @@ -98,6 +98,7 @@ v-else-if="!requestVModel.executeLoading" class="mr-[12px]" type="primary" + :disabled="requestVModel.executeLoading || (isHttpProtocol && !requestVModel.url)" @click="() => execute('serverExec')" > {{ t('apiTestDebug.serverExec') }} diff --git a/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue b/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue index ec3a5a9aac..7640855a65 100644 --- a/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue +++ b/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue @@ -94,10 +94,14 @@ value: `${key}-PENDING`, label: t(`report.detail.pendingCount`), }, - { - value: `${key}-scriptIdentifier`, - label: t(`report.detail.api.scriptError`), - }, + ...(key === ScenarioStepType.API_SCENARIO + ? [] + : [ + { + value: `${key}-scriptIdentifier`, + label: t(`report.detail.api.scriptError`), + }, + ]), ]; const cascaderOptions = ref([ {