refactor(uploadFile): 调整aqd文件上传类型枚举及相关hook适配
- 将aqd上传类型枚举KEY由1调整为1000,保持唯一且合理 - useGetFile hook支持同时校验gwj和aqd两套上传类型枚举 - useUploadFile hook支持同时根据gwj和aqd两套上传枚举获取路径和类型校验 - 修正相关导入和使用,避免因枚举冲突导致逻辑错误2.0
parent
dc93ad7edf
commit
233aab315b
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue