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

fix(缺陷管理): 缺陷管理部分问题 

--bug=1036445 --user=宋昌昌 【缺陷管理】分享缺陷，用户从项目中移除，刷新分享缺陷链接页面提示信息优化 https://www.tapd.cn/55049933/s/1480367
--bug=1036347 --user=宋昌昌 【缺陷管理】项目集成禅道-同步缺陷失败 https://www.tapd.cn/55049933/s/1480473
--bug=1036389 --user=宋昌昌 【缺陷管理】用户组禁用了缺陷的编辑权限，用户点击ID查看详情可编辑，修改基本信息，提交时提示无权限 https://www.tapd.cn/55049933/s/1480474
--bug=1036868 --user=宋昌昌 【缺陷管理】已经存在一条评论的前提下-再添加一条评论-查看展开/收起评论的变化 https://www.tapd.cn/55049933/s/1480478
--bug=1036917 --user=宋昌昌 【缺陷管理】缺陷详情-拖拽上传附件遮罩层调整 https://www.tapd.cn/55049933/s/1480479
This commit is contained in:
song-cc-rock 2024-03-25 18:13:46 +08:00 committed by Craftsman
parent c84c4ba8e7
commit 3e42d29b6e
14 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java
View File

@ -228,14 +228,14 @@ public class BugController {
@GetMapping("/follow/{id}")
@Operation(summary = "缺陷管理-详情-关注缺陷")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
public void follow(@PathVariable String id) {
bugService.follow(id, SessionUtils.getUserId());
}
@GetMapping("/unfollow/{id}")
@Operation(summary = "缺陷管理-详情-取消关注缺陷")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
public void unfollow(@PathVariable String id) {
bugService.unfollow(id, SessionUtils.getUserId());
}

8
backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugRelateCaseController.java
View File

@ -42,7 +42,7 @@ public class BugRelateCaseController {
@PostMapping("/un-relate/page")
@Operation(description = "缺陷管理-关联用例-未关联用例-列表分页")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
public Pager<List<TestCaseProviderDTO>> unRelatedPage(@Validated @RequestBody TestCasePageProviderRequest request) {
// 目前只保留功能用例的Provider接口, 后续其他用例根据RelateCaseType扩展
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
@ -51,7 +51,7 @@ public class BugRelateCaseController {
@PostMapping("/un-relate/module/count")
@Operation(summary = "缺陷管理-关联用例-未关联用例-模块树数量")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
@CheckOwner(resourceId = "#request.projectId", resourceType = "project")
public Map<String, Long> countTree(@RequestBody @Validated TestCasePageProviderRequest request) {
return bugRelateCaseCommonService.countTree(request);
@ -59,7 +59,7 @@ public class BugRelateCaseController {
@PostMapping("/un-relate/module/tree")
@Operation(summary = "缺陷管理-关联用例-未关联用例-模块树")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
@CheckOwner(resourceId = "#request.projectId", resourceType = "project")
public List<BaseTreeNode> getTree(@RequestBody @Validated AssociateCaseModuleRequest request) {
return bugRelateCaseCommonService.getRelateCaseTree(request);
@ -75,7 +75,7 @@ public class BugRelateCaseController {
@PostMapping("/page")
@Operation(description = "缺陷管理-关联用例-列表分页查询")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
public Pager<List<BugRelateCaseDTO>> page(@Validated @RequestBody BugRelatedCasePageRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
return PageUtils.setPageInfo(page, bugRelateCaseCommonService.page(request));

1
backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectController.java
View File

@ -42,7 +42,6 @@ public class ProjectController {
@GetMapping("/list/options/{organizationId}")
@Operation(summary = "根据组织ID获取所有有权限的项目")
@RequiresPermissions(PermissionConstants.PROJECT_BASE_INFO_READ)
public List<Project> getUserProject(@PathVariable String organizationId) {
return projectService.getUserProject(organizationId, SessionUtils.getUserId());
}

3
backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectControllerTests.java
View File

@ -252,9 +252,6 @@ public class ProjectControllerTests extends BaseTest {
list = parseObjectFromMvcResult(mvcResult, List.class);
//断言list是空的
Assertions.assertEquals(0, list.size());
//权限校验
requestGetPermissionTest(PermissionConstants.PROJECT_BASE_INFO_READ, getOptions + DEFAULT_ORGANIZATION_ID);
}
@Test

7
frontend/src/components/business/ms-comment/comment.tsx
View File

@ -140,6 +140,13 @@ export default defineComponent({
);
};
watch(
() => props.commentList,
() => {
expendedIds.value = [];
}
);
const renderChildrenList = (list?: CommentItem[]) => {
if (!list || list.length === 0) {
return null;

1
frontend/src/components/business/ms-comment/input.vue
View File

@ -92,6 +92,7 @@
<style scoped lang="less">
.commentWrapper {
box-shadow: 1px -1px 4px rgba(2 2 2 / 10%);
z-index: 101;
@apply absolute bottom-0 w-full bg-white px-4 py-4;
}
</style>

3
frontend/src/components/business/ms-project-select/index.vue
View File

@ -14,7 +14,6 @@
<script setup lang="ts">
import { getProjectList } from '@/api/modules/project-management/project';
import useAppStore from '@/store/modules/app';
import { hasAnyPermission } from '@/utils/permission';
import type { ProjectListItem } from '@/models/setting/project';
@ -46,7 +45,7 @@
onBeforeMount(async () => {
try {
if (appStore.currentOrgId && hasAnyPermission(['PROJECT_BASE_INFO:READ'])) {
if (appStore.currentOrgId) {
const res = await getProjectList(appStore.getCurrentOrgId);
projectList.value = res;
} else {

2
frontend/src/components/pure/ms-upload/index.vue
View File

@ -12,7 +12,7 @@
:disabled="props.disabled"
:class="getAllScreenClass"
:style="{
width: props.isAllScreen ? `calc(100% - ${menuWidth}px - 16px)` : '',
width: props.isAllScreen ? `calc(90% - ${menuWidth}px - 16px)` : '',
}"
@change="handleChange"
@before-upload="beforeUpload"

1
frontend/src/router/routes/modules/projectManagement.ts
View File

@ -15,7 +15,6 @@ const ProjectManagement: AppRouteRecordRaw = {
hideChildrenInMenu: true,
roles: [
'PROJECT_BASE_INFO:READ',
'SYSTEM_PARAMETER_SETTING_BASE:READ',
'PROJECT_TEMPLATE:READ',
'PROJECT_FILE_MANAGEMENT:READ',
'PROJECT_MESSAGE:READ',

4
frontend/src/views/base/no-project/index.vue
View File

@ -32,7 +32,7 @@
import { getProjectList, switchProject } from '@/api/modules/project-management/project';
import { useI18n } from '@/hooks/useI18n';
import { useAppStore, useUserStore } from '@/store';
import { getFirstRouteNameByPermission, hasAnyPermission } from '@/utils/permission';
import { getFirstRouteNameByPermission } from '@/utils/permission';
import { SelectValue } from '@/models/projectManagement/menuManagement';
import type { ProjectListItem } from '@/models/setting/project';
@ -49,7 +49,7 @@
async function initProjects() {
try {
if (appStore.getCurrentOrgId && hasAnyPermission(['PROJECT_BASE_INFO:READ'])) {
if (appStore.getCurrentOrgId) {
const res = await getProjectList(appStore.getCurrentOrgId); // TODO:
projectList.value = res;
} else {

4
frontend/src/views/bug-management/components/bug-detail-drawer.vue
View File

@ -44,7 +44,6 @@
{{ t('common.edit') }}
</MsButton>
<MsButton
v-permission="['PROJECT_BUG:READ+UPDATE']"
type="icon"
status="secondary"
class="mr-4 !rounded-[var(--border-radius-small)]"
@ -56,7 +55,6 @@
{{ t('caseManagement.featureCase.share') }}
</MsButton>
<MsButton
v-permission="['PROJECT_BUG:READ+UPDATE']"
type="icon"
status="secondary"
class="mr-4 !rounded-[var(--border-radius-small)]"
@ -115,7 +113,7 @@
v-if="activeTab === 'detail'"
ref="bugDetailTabRef"
:form-item="formItem"
:allow-edit="true"
:allow-edit="hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
:detail-info="detailInfo"
:is-platform-default-template="isPlatformDefaultTemplate"
:platform-system-fields="platformSystemFields"

11
frontend/src/views/bug-management/components/bugCaseTab.vue
View File

@ -1,7 +1,9 @@
<template>
<div>
<div class="flex items-center justify-between">
<a-button type="primary" @click="handleSelect">{{ t('caseManagement.featureCase.linkCase') }}</a-button>
<a-button type="primary" :disabled="!hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])" @click="handleSelect">{{
t('caseManagement.featureCase.linkCase')
}}</a-button>
<a-input-search
v-model:model-value="keyword"
:placeholder="t('caseManagement.featureCase.searchByIdAndName')"
@ -25,12 +27,14 @@
><span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
</template>
<template #operation="{ record }">
<MsButton @click="cancelLink(record)">{{ t('caseManagement.featureCase.cancelLink') }}</MsButton>
<MsButton :disabled="!hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])" @click="cancelLink(record)">{{
t('caseManagement.featureCase.cancelLink')
}}</MsButton>
</template>
<template v-if="(keyword || '').trim() === ''" #empty>
<div class="flex w-full items-center justify-center text-[var(--color-text-4)]">
{{ t('caseManagement.caseReview.tableNoData') }}
<MsButton class="ml-[8px]" @click="handleSelect">
<MsButton class="ml-[8px]" :disabled="!hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])" @click="handleSelect">
{{ t('caseManagement.featureCase.linkCase') }}
</MsButton>
</div>
@ -105,6 +109,7 @@
import { NO_RESOURCE_ROUTE_NAME } from '@/router/constants';
import { useAppStore } from '@/store';
import useFeatureCaseStore from '@/store/modules/case/featureCase';
import { hasAnyPermission } from '@/utils/permission';
import type { TableQueryParams } from '@/models/common';
import { CaseManagementRouteEnum } from '@/enums/routeEnum';

12
frontend/src/views/bug-management/components/bugDetailTab.vue
View File

@ -66,7 +66,11 @@
</div>
<!-- 附件布局 -->
<div class="mt-6">
<AddAttachment v-model:file-list="fileList" @link-file="associatedFile" />
<AddAttachment
v-model:file-list="fileList"
:disabled="!hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
@link-file="associatedFile"
/>
</div>
</a-form>
<MsFileList
@ -96,7 +100,7 @@
{{ t('ms.upload.preview') }}
</MsButton>
<MsButton
v-if="item.status === 'done'"
v-if="item.status === 'done' && hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
type="button"
status="primary"
class="!mr-[4px]"
@ -146,7 +150,7 @@
{{ t('caseManagement.featureCase.download') }}
</MsButton>
<MsButton
v-if="item.isUpdateFlag"
v-if="item.isUpdateFlag && hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
type="button"
status="primary"
class="!mr-[4px]"
@ -226,6 +230,7 @@
import { useI18n } from '@/hooks/useI18n';
import { useAppStore } from '@/store';
import { downloadByteFile, sleep } from '@/utils';
import { hasAnyPermission } from '@/utils/permission';
import { findParents, Option } from '@/utils/recursion';
import { BugEditCustomField, BugEditCustomFieldItem, BugEditFormObject } from '@/models/bug-management';
@ -299,6 +304,7 @@
...fileInfo,
name: fileInfo.fileName,
isUpdateFlag: checkUpdateFileIds.includes(fileInfo.fileId),
showDelete: hasAnyPermission(['PROJECT_BUG:READ+UPDATE']),
};
})
.map((fileInfo: any) => {

6
frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
View File

@ -258,6 +258,12 @@
if (res && res.platform_key) {
formCreateValue.value = JSON.parse(res.bug_platform_config);
// 如果平台key存在调用平台change拉取插件字段
const findKey = platformOption.value.find((item) => item.id === res.platform_key);
if (!findKey) {
formRef.value?.resetFields();
platformRules.value = [];
return;
}
await handlePlatformChange(res.platform_key);
form.SYNC_ENABLE = res.sync_enable;
form.PLATFORM_KEY = res.platform_key;