diff --git a/src/enum/uploadFile/aqd/index.d.ts b/src/enum/uploadFile/aqd/index.d.ts index e363429..cb4ed04 100644 --- a/src/enum/uploadFile/aqd/index.d.ts +++ b/src/enum/uploadFile/aqd/index.d.ts @@ -2,12 +2,12 @@ * 文件上传类型枚举 */ export declare const UPLOAD_FILE_TYPE_ENUM: { - 1: 1; // template_task - 模板任务附件 + 1000: 1000; // template_task - 模板任务附件 }; /** * 文件上传类型对应的 path 枚举 */ export declare const UPLOAD_FILE_PATH_ENUM: { - 1: "template_task"; + 1000: "template_task"; }; diff --git a/src/enum/uploadFile/aqd/index.js b/src/enum/uploadFile/aqd/index.js index 3e9f86f..d90c831 100644 --- a/src/enum/uploadFile/aqd/index.js +++ b/src/enum/uploadFile/aqd/index.js @@ -5,12 +5,12 @@ * 文件上传类型枚举 */ export const UPLOAD_FILE_TYPE_ENUM = { - 1: 1, // template_task - 模板任务附件 + 1000: 1000, // template_task - 模板任务附件 }; /** * 文件上传类型对应的 path 枚举 */ export const UPLOAD_FILE_PATH_ENUM = { - 1: "template_task", + 1000: "template_task", }; diff --git a/src/hooks/useGetFile/index.js b/src/hooks/useGetFile/index.js index d320051..ab15dc8 100644 --- a/src/hooks/useGetFile/index.js +++ b/src/hooks/useGetFile/index.js @@ -1,6 +1,7 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; -import { UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj"; +import { UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_AQD } from "../../enum/uploadFile/aqd"; +import { UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_GWJ } from "../../enum/uploadFile/gwj"; import { addingPrefixToFile, getBaseGateway } from "../../utils"; /** @@ -34,7 +35,8 @@ function useGetFile(returnType = "object") { } // 检查eqType是否在UPLOAD_FILE_TYPE_ENUM中 - if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(eqType)) { + const isValidEqType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(eqType) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(eqType); + if (!isValidEqType) { console.error(`【getFile】 传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中,当前传入的 eqType 是 ${eqType}`); return; } diff --git a/src/hooks/useUploadFile/index.js b/src/hooks/useUploadFile/index.js index f79298b..5e14fd3 100644 --- a/src/hooks/useUploadFile/index.js +++ b/src/hooks/useUploadFile/index.js @@ -1,6 +1,7 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; -import { UPLOAD_FILE_PATH_ENUM, UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj"; +import { UPLOAD_FILE_PATH_ENUM as UPLOAD_FILE_PATH_ENUM_AQD, UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_AQD } from "../../enum/uploadFile/aqd"; +import { UPLOAD_FILE_PATH_ENUM as UPLOAD_FILE_PATH_ENUM_GWJ, UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_GWJ } from "../../enum/uploadFile/gwj"; import { getBaseGateway } from "../../utils"; /** @@ -46,13 +47,14 @@ function useUploadFile(returnType = "object") { } // 检查type是否在UPLOAD_FILE_TYPE_ENUM中 - if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(params.type)) { + const isValidType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(params.type) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(params.type); + if (!isValidType) { console.error(`【uploadFile】 传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中,当前传入的 type 是 ${params.type}`); return; } // 根据type获取对应的path - const path = UPLOAD_FILE_PATH_ENUM[params.type]; + const path = UPLOAD_FILE_PATH_ENUM_GWJ[params.type] || UPLOAD_FILE_PATH_ENUM_AQD[params.type]; if (!path) { console.error(`【uploadFile】未找到 type ${params.type} 对应的 path `); return;