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

fix(用例管理): 修复用例关联文件后再继续关联文件时统计出错的问题 

--bug=1036164 --user=宋天阳 【用例管理】功能用例，关联文件，文件数量显示错误 https://www.tapd.cn/55049933/s/1465543
This commit is contained in:
song-tianyang 2024-02-27 15:35:58 +08:00 committed by 刘瑞斌
parent 51bb45d2df
commit 95586e1efa
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
View File

@ -113,6 +113,8 @@
functional_case.update_time,
functional_case.review_status,
functional_case.last_execute_result,
functional_case.delete_user,
functional_case.delete_time,
functional_case.tags
FROM
functional_case

1
backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java
View File

@ -457,6 +457,7 @@ public class FileMetadataService {
FileManagementQuery myFileCountDTO = new FileManagementQuery();
myFileCountDTO.setProjectId(request.getProjectId());
myFileCountDTO.setStorage(null);
myFileCountDTO.setHiddenIds(pageDTO.getHiddenIds());
long allCount = extFileMetadataMapper.fileCount(myFileCountDTO);
myFileCountDTO.setOperator(operator);
long myFileCount = extFileMetadataMapper.fileCount(myFileCountDTO);

36
frontend/src/components/business/ms-link-file/linkFileTable.vue
View File

@ -50,27 +50,27 @@
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { debounce } from 'lodash-es';
import {ref} from 'vue';
import {debounce} from 'lodash-es';
import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
import type { MsTableColumn } from '@/components/pure/ms-table/type';
import useTable from '@/components/pure/ms-table/useTable';
import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
import type {MsTableColumn} from '@/components/pure/ms-table/type';
import useTable from '@/components/pure/ms-table/useTable';
import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
import { getFileTypes, getRepositoryFileTypes } from '@/api/modules/project-management/fileManagement';
import { useI18n } from '@/hooks/useI18n';
import useAppStore from '@/store/modules/app';
import useUserStore from '@/store/modules/user';
import { findNodeByKey, formatFileSize } from '@/utils';
import {getFileTypes, getRepositoryFileTypes} from '@/api/modules/project-management/fileManagement';
import {useI18n} from '@/hooks/useI18n';
import useAppStore from '@/store/modules/app';
import useUserStore from '@/store/modules/user';
import {findNodeByKey, formatFileSize} from '@/utils';
import type { AssociatedList } from '@/models/caseManagement/featureCase';
import type { CommonList, ModuleTreeNode, TableQueryParams } from '@/models/common';
import type { FileListQueryParams } from '@/models/projectManagement/file';
import { Repository } from '@/models/projectManagement/file';
import { TableKeyEnum } from '@/enums/tableEnum';
import type {AssociatedList} from '@/models/caseManagement/featureCase';
import type {CommonList, ModuleTreeNode, TableQueryParams} from '@/models/common';
import type {FileListQueryParams} from '@/models/projectManagement/file';
import {Repository} from '@/models/projectManagement/file';
import {TableKeyEnum} from '@/enums/tableEnum';
const { t } = useI18n();
const { t } = useI18n();
const props = defineProps<{
activeFolder: string;
@ -163,7 +163,7 @@
projectId: appStore.currentProjectId,
current: propsRes.value.msPagination?.current,
pageSize: propsRes.value.msPagination?.pageSize,
combine: combine.value,
combine: { ...combine.value, ...props.getListFunParams.combine },
storageItemCount: storageItemCount.value,
});
}