Merge pull request #67 from suyuan32/dev

Dev
suyuan32 · Jun 20, 2023 · d9d2d56 · d9d2d56
2 parents 9268f63 + 2677f0e
commit d9d2d56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/api/file/file.ts b/src/api/file/file.ts
@@ -1,7 +1,7 @@
 import { UploadApiResp } from '/@/api/sys/model/uploadModel';
 import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode, UploadFileParams } from '/#/axios';
-import { BaseDataResp, BaseIDsReq, BaseListReq, BaseResp } from '../model/baseModel';
+import { BaseDataResp, BaseListReq, BaseResp, BaseUUIDsReq } from '../model/baseModel';
 import { FileListResp, updateFileInfoReq } from './model/fileModel';
 import { AxiosProgressEvent } from 'axios';
 
@@ -11,6 +11,7 @@ enum Api {
   UpdateFileInfo = '/fms-api/file/update',
   SetFileStatus = '/fms-api/file/status',
   DownloadFile = '/fms-api/file/download',
+  DeleteFile = '/fms-api/file/delete',
 }
 
 /**
@@ -53,11 +54,11 @@ export const UpdateFileInfo = (params: updateFileInfoReq, mode: ErrorMessageMode
 
 /**
  *  author: Ryan Su
- *  @description: delete api
+ *  @description: delete files
  */
-export const deleteFile = (params: BaseIDsReq, mode: ErrorMessageMode = 'modal') => {
-  return defHttp.delete<BaseResp>(
-    { url: Api.UpdateFileInfo, params: params },
+export const deleteFile = (params: BaseUUIDsReq, mode: ErrorMessageMode = 'notice') => {
+  return defHttp.post<BaseResp>(
+    { url: Api.DeleteFile, params: params },
     {
       errorMessageMode: mode,
       successMessageMode: mode,
@@ -69,7 +70,7 @@ export const deleteFile = (params: BaseIDsReq, mode: ErrorMessageMode = 'modal')
  *  author: Ryan Su
  *  @description: set file's status
  */
-export const setFileStatus = (id: number, status: number, mode: ErrorMessageMode = 'notice') =>
+export const setFileStatus = (id: string, status: number, mode: ErrorMessageMode = 'notice') =>
   defHttp.post(
     { url: Api.SetFileStatus, params: { id, status } },
     {

diff --git a/src/api/file/model/fileModel.ts b/src/api/file/model/fileModel.ts
@@ -5,7 +5,7 @@ import { BaseListResp } from '../../model/baseModel';
  *  @description: file info response
  */
 export interface fileInfo {
-  id: number;
+  id: string;
   createdAt?: number;
   name: string;
   fileType: string;
@@ -26,7 +26,7 @@ export type FileListResp = BaseListResp<fileInfo>;
  *  @description: change status request
  */
 export interface changeStatusReq {
-  id: number;
+  id: string;
   status: boolean;
 }
 
@@ -35,6 +35,6 @@ export interface changeStatusReq {
  *  @description: update file info request
  */
 export interface updateFileInfoReq {
-  id: number;
+  id: string;
   name: string;
 }
diff --git a/src/views/file/FileDrawer.vue b/src/views/file/FileDrawer.vue
@@ -56,7 +56,7 @@
           const values = await validate();
           setDrawerProps({ confirmLoading: true });
           let params: updateFileInfoReq = {
-            id: Number(values['id']),
+            id: values['id'],
             name: values['name'],
           };
           await UpdateFileInfo(params);

diff --git a/src/views/file/index.vue b/src/views/file/index.vue
@@ -143,6 +143,7 @@
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
+        clickToRowSelect: false,
         showIndexColumn: false,
         actionColumn: {
           width: 50,
@@ -244,7 +245,7 @@
           title: t('common.deleteConfirm'),
           icon: createVNode(ExclamationCircleOutlined),
           async onOk() {
-            const ids = selectedIds.value as number[];
+            const ids = selectedIds.value as string[];
             const result = await deleteFile({ ids: ids });
             if (result.code === 0) {
               await reload();