diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 9ea7f2b1b8..362b97ffdd 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -95,6 +95,7 @@ module.exports = { '^jsencrypt$', '^echarts$', '^color$', + '^localforage$', ], // node依赖 ['.*/assets/.*', '^@/assets$'], // 项目静态资源 ['^@/components/pure/.*', '^@/components/business/.*', '.*\\.vue$'], // 组件 diff --git a/frontend/src/api/modules/project-management/fileManagement.ts b/frontend/src/api/modules/project-management/fileManagement.ts index 7616dda895..b594a19ca2 100644 --- a/frontend/src/api/modules/project-management/fileManagement.ts +++ b/frontend/src/api/modules/project-management/fileManagement.ts @@ -2,6 +2,7 @@ import MSR from '@/api/http/index'; import { AddModuleUrl, BatchDownloadFileUrl, + BatchMoveFileUrl, DeleteFileUrl, DeleteModuleUrl, DownloadFileUrl, @@ -113,3 +114,8 @@ export function getFileDetail(id: string) { export function toggleJarFileStatus(id: string, status: boolean) { return MSR.get({ url: `${ToggleJarFileUrl}/${id}/${status}` }); } + +// 批量移动文件 +export function batchMoveFile(data: BatchFileApiParams) { + return MSR.post({ url: BatchMoveFileUrl, data }); +} diff --git a/frontend/src/api/requrls/project-management/fileManagement.ts b/frontend/src/api/requrls/project-management/fileManagement.ts index 3064d3cdb8..67f56de707 100644 --- a/frontend/src/api/requrls/project-management/fileManagement.ts +++ b/frontend/src/api/requrls/project-management/fileManagement.ts @@ -16,3 +16,4 @@ export const CompressImgUrl = '/file/preview/compressed'; // 预览图片文件 export const GetFileTypesUrl = '/project/file/type'; // 获取文件类型集合 export const GetFileDetailUrl = '/project/file/get'; // 查看文件详情 export const ToggleJarFileUrl = '/project/file/jar-file-status'; // jar 文件启用禁用 +export const BatchMoveFileUrl = '/project/file/batch-move'; // jar 文件启用禁用 diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 90c2ee610e..e53fbb0073 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -532,52 +532,6 @@ } } -/** 穿梭框 **/ -.arco-transfer { - @apply grid; - - grid-template-columns: 4fr 1fr 4fr; - .arco-transfer-view { - @apply w-auto; - - height: 370px; - .arco-transfer-view-header { - @apply bg-white; - } - } - .arco-transfer-operations { - .arco-btn-secondary { - border-color: rgb(var(--primary-5)); - border-radius: var(--border-radius-small); - background-color: rgb(var(--primary-1)) !important; - .arco-btn-icon { - color: rgb(var(--primary-5)); - } - &:disabled { - border-color: var(--color-text-input-border) !important; - background-color: var(--color-text-n8) !important; - .arco-btn-icon { - color: var(--color-text-4); - } - } - &:not(:disabled):hover { - border-color: rgb(var(--primary-4)) !important; - background-color: rgb(var(--primary-1)) !important; - .arco-btn-icon { - color: rgb(var(--primary-7)); - } - } - &:not(:disabled):active { - border-color: rgb(var(--primary-7)) !important; - background-color: rgb(var(--primary-9)) !important; - .arco-btn-icon { - color: rgb(var(--primary-7)); - } - } - } - } -} - /** 滚动条 **/ .arco-scrollbar-track-direction-horizontal { height: 6px; @@ -768,22 +722,6 @@ } } -/** 穿梭框节点溢出省略 **/ -.arco-transfer { - .arco-tree-node-title-text { - overflow: hidden; - width: 206px; - text-overflow: ellipsis; - white-space: nowrap; - } - .arco-checkbox-label { - overflow: hidden; - width: 207px; - text-overflow: ellipsis; - white-space: nowrap; - } -} - /** Alter **/ .arco-alert-title { font-size: 14px; diff --git a/frontend/src/components/business/ms-transfer/index.vue b/frontend/src/components/business/ms-transfer/index.vue index dae4a5a097..3c3ec3daab 100644 --- a/frontend/src/components/business/ms-transfer/index.vue +++ b/frontend/src/components/business/ms-transfer/index.vue @@ -20,7 +20,13 @@ block-node default-expand-all @check="onSelect" - /> + > + + @@ -45,6 +51,7 @@ data: MsTreeNodeData[]; // 树结构数据 treeFiled?: MsTreeFieldNames; // 自定义树结构字段 showSearch?: boolean; // 是否显示搜索框 + height?: string; // 穿梭框高度 sourceInputSearchProps?: Record; targetInputSearchProps?: Record; }>(), @@ -139,4 +146,46 @@ ); - + diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue index 7a956eacd7..854d700750 100644 --- a/frontend/src/components/business/ms-tree/index.vue +++ b/frontend/src/components/business/ms-tree/index.vue @@ -13,7 +13,13 @@ @check="checked" >