diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json index bf18b9eae..d6145c3b6 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json @@ -132,6 +132,7 @@ }, "oss": { "title": "Object storage", - "containers": "Containers" + "containers": "Containers", + "objects": "Files" } } diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json index 8cdbf8324..8edd4ab47 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json @@ -132,6 +132,7 @@ }, "oss": { "title": "对象存储", - "containers": "容器管理" + "containers": "容器管理", + "objects": "文件管理" } } diff --git a/apps/vben5/apps/app-antd/src/views/oss/objects/index.vue b/apps/vben5/apps/app-antd/src/views/oss/objects/index.vue new file mode 100644 index 000000000..7cbd43a2f --- /dev/null +++ b/apps/vben5/apps/app-antd/src/views/oss/objects/index.vue @@ -0,0 +1,15 @@ + + + + + + + diff --git a/apps/vben5/packages/@abp/oss/package.json b/apps/vben5/packages/@abp/oss/package.json index 9bf32f938..ad7022566 100644 --- a/apps/vben5/packages/@abp/oss/package.json +++ b/apps/vben5/packages/@abp/oss/package.json @@ -17,6 +17,9 @@ ".": { "types": "./src/index.ts", "default": "./src/index.ts" + }, + "./global": { + "types": "./global.d.ts" } }, "dependencies": { @@ -32,8 +35,10 @@ "@vben/icons": "workspace:*", "@vben/layouts": "workspace:*", "@vben/locales": "workspace:*", + "@vben/stores": "workspace:*", "ant-design-vue": "catalog:", "vue": "catalog:*", + "vue-simple-uploader": "catalog:", "vxe-table": "catalog:" } } diff --git a/apps/vben5/packages/@abp/oss/src/api/index.ts b/apps/vben5/packages/@abp/oss/src/api/index.ts index cba485d84..b72d0ebb1 100644 --- a/apps/vben5/packages/@abp/oss/src/api/index.ts +++ b/apps/vben5/packages/@abp/oss/src/api/index.ts @@ -1 +1,2 @@ export { useContainesApi } from './useContainesApi'; +export { useObjectsApi } from './useObjectsApi'; diff --git a/apps/vben5/packages/@abp/oss/src/api/useContainesApi.ts b/apps/vben5/packages/@abp/oss/src/api/useContainesApi.ts index 6043b7435..0fb560cf3 100644 --- a/apps/vben5/packages/@abp/oss/src/api/useContainesApi.ts +++ b/apps/vben5/packages/@abp/oss/src/api/useContainesApi.ts @@ -1,8 +1,10 @@ import type { GetOssContainersInput, + GetOssObjectsInput, OssContainerDto, OssContainersResultDto, } from '../types/containes'; +import type { OssObjectsResultDto } from '../types/objects'; import { useRequest } from '@abp/request'; @@ -30,6 +32,18 @@ export function useContainesApi() { }); } + function getObjectsApi( + input: GetOssObjectsInput, + ): Promise { + return request( + `/api/oss-management/containes/objects`, + { + method: 'GET', + params: input, + }, + ); + } + function createApi(name: string): Promise { return request(`/api/oss-management/containes/${name}`, { method: 'POST', @@ -42,5 +56,6 @@ export function useContainesApi() { deleteApi, getApi, getListApi, + getObjectsApi, }; } diff --git a/apps/vben5/packages/@abp/oss/src/api/useObjectsApi.ts b/apps/vben5/packages/@abp/oss/src/api/useObjectsApi.ts new file mode 100644 index 000000000..67bb1a608 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/api/useObjectsApi.ts @@ -0,0 +1,50 @@ +import type { + CreateOssObjectInput, + GetOssObjectInput, + OssObjectDto, +} from '../types/objects'; + +import { useRequest } from '@abp/request'; + +export function useObjectsApi() { + const { cancel, request } = useRequest(); + + function createApi(input: CreateOssObjectInput): Promise { + const formData = new window.FormData(); + formData.append('bucket', input.bucket); + formData.append('fileName', input.fileName); + formData.append('overwrite', String(input.overwrite)); + input.expirationTime && + formData.append('expirationTime', input.expirationTime.toString()); + input.path && formData.append('path', input.path); + input.file && formData.append('file', input.file); + return request(`/api/oss-management/objects`, { + data: formData, + headers: { + 'Content-Type': 'multipart/form-data;charset=utf-8', + }, + method: 'POST', + }); + } + + function generateUrlApi(input: GetOssObjectInput): Promise { + return request('/api/oss-management/objects/generate-url', { + method: 'GET', + params: input, + }); + } + + function deleteApi(input: GetOssObjectInput): Promise { + return request('/api/oss-management/objects', { + method: 'DELETE', + params: input, + }); + } + + return { + cancel, + createApi, + deleteApi, + generateUrlApi, + }; +} diff --git a/apps/vben5/packages/@abp/oss/src/components/index.ts b/apps/vben5/packages/@abp/oss/src/components/index.ts index 8f45d9807..af5101805 100644 --- a/apps/vben5/packages/@abp/oss/src/components/index.ts +++ b/apps/vben5/packages/@abp/oss/src/components/index.ts @@ -1 +1,2 @@ export { default as ContainerTable } from './containers/ContainerTable.vue'; +export { default as ObjectPage } from './objects/ObjectPage.vue'; diff --git a/apps/vben5/packages/@abp/oss/src/components/objects/FileList.vue b/apps/vben5/packages/@abp/oss/src/components/objects/FileList.vue new file mode 100644 index 000000000..019a84e87 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/components/objects/FileList.vue @@ -0,0 +1,282 @@ + + + + + + + {{ $t('AbpOssManagement.Objects:UploadFile') }} + + + + + + {{ $t('AbpOssManagement.Objects:Download') }} + + + {{ $t('AbpUi.Delete') }} + + + + + gridApi.query()" /> + + + diff --git a/apps/vben5/packages/@abp/oss/src/components/objects/FileUploadModal.vue b/apps/vben5/packages/@abp/oss/src/components/objects/FileUploadModal.vue new file mode 100644 index 000000000..69b38a1f8 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/components/objects/FileUploadModal.vue @@ -0,0 +1,286 @@ + + + + + + + + + + + {{ $t('AbpOssManagement.Upload:SelectFile') }} + + + + + + + + + + + {{ formatSize(row.size) }} + + + + + + {{ $t('AbpOssManagement.Upload:Completed') }} + + + + {{ $t('AbpOssManagement.Upload:Error') }} + + + + {{ $t('AbpOssManagement.Upload:Pause') }} + + {{ + `${row.progressText} ${formatSize(row.averageSpeed)}/s` + }} + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/vben5/packages/@abp/oss/src/components/objects/FolderModal.vue b/apps/vben5/packages/@abp/oss/src/components/objects/FolderModal.vue new file mode 100644 index 000000000..983087636 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/components/objects/FolderModal.vue @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/apps/vben5/packages/@abp/oss/src/components/objects/FolderTree.vue b/apps/vben5/packages/@abp/oss/src/components/objects/FolderTree.vue new file mode 100644 index 000000000..4da8b4514 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/components/objects/FolderTree.vue @@ -0,0 +1,192 @@ + + + + + + onBucketChange(e!.toString())" + /> + + {{ $t('AbpOssManagement.Objects:CreateFolder') }} + + + + + + + + + diff --git a/apps/vben5/packages/@abp/oss/src/components/objects/ObjectPage.vue b/apps/vben5/packages/@abp/oss/src/components/objects/ObjectPage.vue new file mode 100644 index 000000000..63a9c4efa --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/components/objects/ObjectPage.vue @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/apps/vben5/packages/@abp/oss/src/constants/permissions.ts b/apps/vben5/packages/@abp/oss/src/constants/permissions.ts new file mode 100644 index 000000000..4d60a901e --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/constants/permissions.ts @@ -0,0 +1,18 @@ +/** 容器权限 */ +export const ContainerPermissions = { + /** 新增 */ + Create: 'AbpOssManagement.Container.Create', + Default: 'AbpOssManagement.Container', + /** 删除 */ + Delete: 'AbpOssManagement.Container.Delete', +}; +/** 容器权限 */ +export const OssObjectPermissions = { + /** 新增 */ + Create: 'AbpOssManagement.OssObject.Create', + Default: 'AbpOssManagement.OssObject', + /** 删除 */ + Delete: 'AbpOssManagement.OssObject.Delete', + /** 下载 */ + Download: 'AbpOssManagement.OssObject.Download', +}; diff --git a/apps/vben5/packages/@abp/oss/src/global.d.ts b/apps/vben5/packages/@abp/oss/src/global.d.ts new file mode 100644 index 000000000..a0956a4a5 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/global.d.ts @@ -0,0 +1 @@ +declare module 'vue-simple-uploader'; diff --git a/apps/vben5/packages/@abp/oss/src/types/objects.ts b/apps/vben5/packages/@abp/oss/src/types/objects.ts new file mode 100644 index 000000000..da6d2cf28 --- /dev/null +++ b/apps/vben5/packages/@abp/oss/src/types/objects.ts @@ -0,0 +1,50 @@ +interface OssObjectDto { + creationDate: Date; + isFolder: boolean; + lastModifiedDate?: Date; + mD5?: string; + metadata: Record; + name: string; + path: string; + size: number; +} + +interface CreateOssObjectInput { + bucket: string; + expirationTime?: string; + file?: File; + fileName: string; + overwrite: boolean; + path?: string; +} + +interface GetOssObjectInput { + bucket: string; + mD5: boolean; + object: string; + path?: string; +} + +interface BulkDeleteOssObjectInput { + bucket: string; + object: string; + path?: string; +} + +interface OssObjectsResultDto { + bucket: string; + delimiter?: string; + marker?: string; + maxKeys: number; + nextMarker?: string; + objects: OssObjectDto[]; + prefix?: string; +} + +export type { + BulkDeleteOssObjectInput, + CreateOssObjectInput, + GetOssObjectInput, + OssObjectDto, + OssObjectsResultDto, +};