fix(项目管理): 修复环境相关bug
--bug=1037797 --user=王孝刚 【项目管理】项目管理员查看项目环境管理页面-环境组,报错了 https://www.tapd.cn/55049933/s/1484387
This commit is contained in:
parent
c7c8734ced
commit
fa1016566f
|
@ -132,7 +132,6 @@ public class EnvironmentController {
|
|||
|
||||
@GetMapping("/get-options/{projectId}")
|
||||
@Operation(summary = "项目管理-环境-环境目录-列表")
|
||||
@RequiresPermissions(PermissionConstants.PROJECT_ENVIRONMENT_READ)
|
||||
@CheckOwner(resourceId = "#projectId", resourceType = "project")
|
||||
public List<EnvironmentOptionsDTO> list(@PathVariable String projectId) {
|
||||
return environmentService.listOption(projectId);
|
||||
|
|
|
@ -21,7 +21,6 @@ import io.metersphere.sdk.util.Translator;
|
|||
import io.metersphere.system.domain.UserRoleRelationExample;
|
||||
import io.metersphere.system.dto.sdk.BaseSystemConfigDTO;
|
||||
import io.metersphere.system.dto.sdk.OptionDTO;
|
||||
import io.metersphere.system.dto.sdk.enums.MoveTypeEnum;
|
||||
import io.metersphere.system.dto.sdk.request.NodeMoveRequest;
|
||||
import io.metersphere.system.dto.sdk.request.PosRequest;
|
||||
import io.metersphere.system.mapper.UserRoleRelationMapper;
|
||||
|
@ -39,7 +38,10 @@ import org.mybatis.spring.SqlSessionUtils;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
|
@ -72,7 +74,6 @@ public class EnvironmentGroupService extends MoveNodeService{
|
|||
environmentGroup.setId(IDGenerator.nextStr());
|
||||
this.checkEnvironmentGroup(environmentGroup);
|
||||
|
||||
environmentGroup.setId(UUID.randomUUID().toString());
|
||||
environmentGroup.setCreateTime(System.currentTimeMillis());
|
||||
environmentGroup.setUpdateTime(System.currentTimeMillis());
|
||||
environmentGroup.setCreateUser(userId);
|
||||
|
|
|
@ -103,7 +103,7 @@ const useProjectEnvStore = defineStore(
|
|||
currentEnvDetailInfo.value = {
|
||||
projectId: appStore.currentProjectId,
|
||||
name: '',
|
||||
config: envParamsDefaultConfig,
|
||||
config: cloneDeep(envParamsDefaultConfig),
|
||||
};
|
||||
backupEnvDetailInfo.value = {
|
||||
projectId: appStore.currentProjectId,
|
||||
|
|
|
@ -14,12 +14,24 @@
|
|||
>{{ t('project.environmental.addHttp') }}</a-button
|
||||
>
|
||||
<div class="flex flex-row gap-[8px]">
|
||||
<a-input-number v-model:model-value="form.requestTimeout" :min="0" class="w-[180px]" :disabled="isDisabled">
|
||||
<a-input-number
|
||||
v-model:model-value="form.requestTimeout"
|
||||
:min="0"
|
||||
:step="100"
|
||||
class="w-[180px]"
|
||||
:disabled="isDisabled"
|
||||
>
|
||||
<template #prefix>
|
||||
<span class="text-[var(--color-text-3)]">{{ t('project.environmental.http.linkTimeOut') }}</span>
|
||||
</template>
|
||||
</a-input-number>
|
||||
<a-input-number v-model:model-value="form.responseTimeout" :min="0" class="w-[180px]" :disabled="isDisabled">
|
||||
<a-input-number
|
||||
v-model:model-value="form.responseTimeout"
|
||||
:min="0"
|
||||
:step="100"
|
||||
class="w-[180px]"
|
||||
:disabled="isDisabled"
|
||||
>
|
||||
<template #prefix>
|
||||
<span class="text-[var(--color-text-3)]">{{ t('project.environmental.http.resTimeOut') }}</span>
|
||||
</template>
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
|
||||
// 判断是否已存在type为NONE的数据 如果存在则不允许添加 数量大于1 则提示
|
||||
const noneData = store.currentEnvDetailInfo.config.httpConfig.filter((item) => item.type === 'NONE');
|
||||
if (noneData.length >= 1) {
|
||||
if (noneData.length >= 1 && (props.isCopy || !props.currentId)) {
|
||||
Message.error(t('project.environmental.http.noneDataExist'));
|
||||
return;
|
||||
}
|
||||
|
@ -326,6 +326,9 @@
|
|||
const title = ref<string>('');
|
||||
watchEffect(() => {
|
||||
title.value = props.currentId ? t('project.environmental.http.edit') : t('project.environmental.http.add');
|
||||
if (props.isCopy) {
|
||||
title.value = t('project.environmental.http.copy');
|
||||
}
|
||||
if (props.currentId) {
|
||||
const currentItem = store.currentEnvDetailInfo.config.httpConfig.find(
|
||||
(item) => item.id === props.currentId
|
||||
|
|
|
@ -50,6 +50,7 @@ export default {
|
|||
'project.environmental.http.value': 'Value',
|
||||
'project.environmental.http.add': 'Add HTTP',
|
||||
'project.environmental.http.edit': 'Update HTTP',
|
||||
'project.environmental.http.copy': 'Copy HTTP',
|
||||
'project.environmental.http.hostName': 'Host Name',
|
||||
'project.environmental.http.hostNameRequired': 'Host name is required',
|
||||
'project.environmental.http.httpHostNamePlaceholder': 'For example: http://127.0.0.1',
|
||||
|
|
|
@ -55,6 +55,7 @@ export default {
|
|||
'project.environmental.http.value': '值',
|
||||
'project.environmental.http.add': '添加HTTP',
|
||||
'project.environmental.http.edit': '更新HTTP',
|
||||
'project.environmental.http.copy': '复制HTTP',
|
||||
'project.environmental.http.hostName': '域名',
|
||||
'project.environmental.http.hostNameRequired': '域名必填',
|
||||
'project.environmental.http.httpHostNamePlaceholder': '例如:http://127.0.0.1',
|
||||
|
|
Loading…
Reference in New Issue