diff --git a/README.md b/README.md index 76a543f..8e574f4 100644 --- a/README.md +++ b/README.md @@ -92,14 +92,14 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; ### 其他枚举 -| 枚举 | 引入路径 | 简要说明 | -| --- | --- | --- | +| 枚举 | 引入路径 | 简要说明 | +| --- |------------------------------------| --- | | `DICTIONARY_APP_KEY_ENUM` | `zy-react-library/enum/dictionary` | 字典接口使用的 `appKey` 常量,包含 `DEFAULT`、`GWJ`。 | | `HIDDEN_SOURCE_ENUM` | `zy-react-library/enum/hidden/gwj` | 隐患来源选项列表。 | | `HIDDEN_STATE_ENUM` | `zy-react-library/enum/hidden/gwj` | 隐患状态选项列表。 | | `HIDDEN_RECTIFICATION_TYPE_ENUM` | `zy-react-library/enum/hidden/gwj` | 隐患整改类型选项列表。 | -| `UPLOAD_FILE_TYPE_ENUM` | `zy-react-library/enum/uploadFile/gwj` | 文件上传类型编码枚举。 | -| `UPLOAD_FILE_PATH_ENUM` | `zy-react-library/enum/uploadFile/gwj` | 文件上传类型编码到服务端路径标识的映射。 | +| `UPLOAD_FILE_TYPE_ENUM` | `zy-react-library/enum/uploadFile` | 文件上传类型编码枚举。 | +| `UPLOAD_FILE_PATH_ENUM` | `zy-react-library/enum/uploadFile` | 文件上传类型编码到服务端路径标识的映射。 | ## 表单配置类型 @@ -251,7 +251,7 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; | `DepartmentLeftTree` | `params={}`、`searchType="current"`,内部固定 `childrenKey="childrenList"`。 | | `Map` | `longitudeProps="longitude"`、`latitudeProps="latitude"`、`required=true`、`area=""`、`showArea=false`、`disable=false`、`type="baidu"`。 | | `MapSelector` | `area=""`、`showArea=false`、`disable=false`、`type="baidu"`;弹窗宽度 `1000`、`maskClosable=false`、地图容器高度 `500px`。 | -| `SeamlessScroll` | `value=true`、`list=[]`、`step=1`、`limitScrollNum=3`、`hover=true`、`direction="up"`、`singleHeight=0`、`singleWidth=0`、`singleWaitTime=1000`、`isRemUnit=false`、`isWatch=true`、`delay=0`、`ease="ease-in"`、`count=-1`、`copyNum=1`、`wheel=false`、`singleLine=false`。 | +| `SeamlessScroll` | `isAutoScroll=true`、`list=[]`、`step=1`、`limitScrollNum=3`、`hover=true`、`direction="up"`、`singleHeight=0`、`singleWidth=0`、`singleWaitTime=1000`、`isRemUnit=false`、`isWatch=true`、`delay=0`、`ease="ease-in"`、`count=-1`、`copyNum=1`、`wheel=false`、`singleLine=false`。 | | `HiddenInfo` | `id=""`、`idKey="id"`、`hiddenId=""`、`hiddenIdKey="hiddenId"`、`history=false`。 | ### Table @@ -734,7 +734,7 @@ import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; | 参数 | 类型 | 必填 | 默认值 | 说明 | | --- | --- | --- | --- | --- | -| `value` | `boolean` | 否 | `true` | 是否启用滚动。 | +| `isAutoScroll` | `boolean` | 否 | `true` | 是否启用滚动。 | | `list` | `unknown[]` | 是 | `[]` | 滚动数据列表。 | | `step` | `number` | 否 | `1` | 滚动步长。 | | `limitScrollNum` | `number` | 否 | `3` | 触发滚动的最小数据条数。 | diff --git a/src/components/HiddenInfo/gwj/index.js b/src/components/HiddenInfo/gwj/index.js index 93ba972..77e75eb 100644 --- a/src/components/HiddenInfo/gwj/index.js +++ b/src/components/HiddenInfo/gwj/index.js @@ -3,7 +3,7 @@ import { Button, Descriptions, Divider, Space, Spin } from "antd"; import dayjs from "dayjs"; import { useEffect, useState } from "react"; import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "../../../enum/hidden/gwj"; -import { UPLOAD_FILE_TYPE_ENUM } from "../../../enum/uploadFile/gwj"; +import { UPLOAD_FILE_TYPE_ENUM } from "../../../enum/uploadFile/index.d.ts"; import useDownloadFile from "../../../hooks/useDownloadFile"; import useGetFile from "../../../hooks/useGetFile"; import useGetUrlQuery from "../../../hooks/useGetUrlQuery"; diff --git a/src/enum/uploadFile/aqd/index.d.ts b/src/enum/uploadFile/aqd/index.d.ts deleted file mode 100644 index f127454..0000000 --- a/src/enum/uploadFile/aqd/index.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * 文件上传类型枚举 - */ -export declare const UPLOAD_FILE_TYPE_ENUM: { - 1000: 1000; // template_task - 模板任务附件 - 1001: 1001; // task_fill - 任务填写附件 -}; - -/** - * 文件上传类型对应的 path 枚举 - */ -export declare const UPLOAD_FILE_PATH_ENUM: { - 1000: "template_task"; - 1001: "task_fill"; -}; diff --git a/src/enum/uploadFile/aqd/index.js b/src/enum/uploadFile/aqd/index.js deleted file mode 100644 index 4112c0d..0000000 --- a/src/enum/uploadFile/aqd/index.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 文件上传类型枚举 - */ -/** - * 文件上传类型枚举 - */ -export const UPLOAD_FILE_TYPE_ENUM = { - 1000: 1000, // template_task - 模板任务附件 - 1001: 1001, // task_fill - 任务填写附件 -}; - -/** - * 文件上传类型对应的 path 枚举 - */ -export const UPLOAD_FILE_PATH_ENUM = { - 1000: "template_task", - 1001: "task_fill", -}; diff --git a/src/enum/uploadFile/gwj/index.d.ts b/src/enum/uploadFile/index.d.ts similarity index 98% rename from src/enum/uploadFile/gwj/index.d.ts rename to src/enum/uploadFile/index.d.ts index dc00661..a1dbe50 100644 --- a/src/enum/uploadFile/gwj/index.d.ts +++ b/src/enum/uploadFile/index.d.ts @@ -1,5 +1,7 @@ /** * 文件上传类型枚举 + * 1 - 1000 港务局使用 + * 1000 - 2000 安全岛使用 */ export declare const UPLOAD_FILE_TYPE_ENUM: { 10: 10; // labor_contract_image - 劳动合同图片 @@ -139,10 +141,15 @@ export declare const UPLOAD_FILE_TYPE_ENUM: { 709: 709; // emergency_knowledge_library_generation_process - 应急知识库-生成工艺库 800: 800; // lot_alarm_handling_image - 物联网报警处置图片 801: 801; // lot_alarm_handling_video - 物联网报警处置视频 + + 1000: 1000; // template_task - 模板任务附件 + 1001: 1001; // task_fill - 任务填写附件 }; /** * 文件上传类型对应的 path 枚举 + * 1 - 1000 港务局使用 + * 1000 - 2000 安全岛使用 */ export declare const UPLOAD_FILE_PATH_ENUM: { 10: "labor_contract_image"; @@ -282,4 +289,7 @@ export declare const UPLOAD_FILE_PATH_ENUM: { 709: "emergency_knowledge_library_generation_process"; 800: "lot_alarm_handling_image"; 801: "lot_alarm_handling_video"; + + 1000: "template_task"; + 1001: "task_fill"; }; diff --git a/src/enum/uploadFile/gwj/index.js b/src/enum/uploadFile/index.js similarity index 98% rename from src/enum/uploadFile/gwj/index.js rename to src/enum/uploadFile/index.js index fa5cd2d..997e90d 100644 --- a/src/enum/uploadFile/gwj/index.js +++ b/src/enum/uploadFile/index.js @@ -1,8 +1,7 @@ /** * 文件上传类型枚举 - */ -/** - * 文件上传类型枚举 + * 1 - 1000 港务局使用 + * 1000 - 2000 安全岛使用 */ export const UPLOAD_FILE_TYPE_ENUM = { 10: 10, // labor_contract_image - 劳动合同图片 @@ -142,10 +141,15 @@ export const UPLOAD_FILE_TYPE_ENUM = { 709: 709, // emergency_knowledge_library_generation_process - 应急知识库-生成工艺库 800: 800, // lot_alarm_handling_image - 物联网报警处置图片 801: 801, // lot_alarm_handling_video - 物联网报警处置视频 + + 1000: 1000, // template_task - 模板任务附件 + 1001: 1001, // task_fill - 任务填写附件 }; /** * 文件上传类型对应的 path 枚举 + * 1 - 1000 港务局使用 + * 1000 - 2000 安全岛使用 */ export const UPLOAD_FILE_PATH_ENUM = { 10: "labor_contract_image", @@ -285,4 +289,7 @@ export const UPLOAD_FILE_PATH_ENUM = { 709: "emergency_knowledge_library_generation_process", 800: "lot_alarm_handling_image", 801: "lot_alarm_handling_video", + + 1000: "template_task", + 1001: "task_fill", }; diff --git a/src/hooks/useGetFile/index.js b/src/hooks/useGetFile/index.js index ab15dc8..5f1164d 100644 --- a/src/hooks/useGetFile/index.js +++ b/src/hooks/useGetFile/index.js @@ -1,7 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; -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 { UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/index.d.ts"; import { addingPrefixToFile, getBaseGateway } from "../../utils"; /** @@ -35,7 +34,7 @@ function useGetFile(returnType = "object") { } // 检查eqType是否在UPLOAD_FILE_TYPE_ENUM中 - const isValidEqType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(eqType) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(eqType); + const isValidEqType = Object.values(UPLOAD_FILE_TYPE_ENUM).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 5e14fd3..fa84d13 100644 --- a/src/hooks/useUploadFile/index.js +++ b/src/hooks/useUploadFile/index.js @@ -1,7 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; -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 { UPLOAD_FILE_PATH_ENUM, UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/index.d.ts"; import { getBaseGateway } from "../../utils"; /** @@ -47,14 +46,14 @@ function useUploadFile(returnType = "object") { } // 检查type是否在UPLOAD_FILE_TYPE_ENUM中 - const isValidType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(params.type) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(params.type); + const isValidType = Object.values(UPLOAD_FILE_TYPE_ENUM).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_GWJ[params.type] || UPLOAD_FILE_PATH_ENUM_AQD[params.type]; + const path = UPLOAD_FILE_PATH_ENUM[params.type]; if (!path) { console.error(`【uploadFile】未找到 type ${params.type} 对应的 path `); return;