zy-react-library 1.0.175 → 1.0.177

package/components/Cascader/Dictionary/index.js

@@ -18,8 +18,10 @@ function DictionaryCascader(props) {
   const [treeData, setTreeData] = useState([]);
 
   const getData = async () => {
-    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey))
-      throw new Error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey)) {
+      console.error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+      return;
+    }
 
     setTreeData([]);
     const { data } = await request("/config/dict-trees/list/by/dictValues", "get", { appKey, dictValue });

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -32,6 +32,22 @@ export interface itemsFieldConfig {
  */
 export type FormValues = Record<string, any>;
 
+/**
+ * Form.List 操作项
+ */
+export interface FormListOperations {
+  /** 当前表单项的数据字段信息 */
+  field: FormListFieldData;
+  /** 当前项在列表中的索引位置 */
+  index: number;
+  /** 新增方法 */
+  add: (defaultValue?: FormValues, insertIndex?: number) => void;
+  /** 删除方法 */
+  remove: (index: number | number[]) => void;
+  /** 移动方法 */
+  move: (from: number, to: number) => void;
+}
+
 /**
  * Form.List 独有的属性
  */
@@ -45,7 +61,7 @@ export interface FormListUniqueProps {
   /** 删除按钮的文本，默认 '删除' */
   removeButtonText?: string;
   /** 表单配置项 */
-  options: (field: FormListFieldData, index: number) => FormOption[];
+  options: (operations: FormListOperations) => FormOption[];
   /** 点击新增按钮时的默认值 */
   addDefaultValue?: FormValues;
   /** 点击新增按钮时插入的索引位置 */

package/components/FormBuilder/FormItemsRenderer.js

@@ -223,9 +223,9 @@ const FormItemsRenderer = ({
   };
 
   // 获取 listOptions
-  const getListOptions = (listOptions, field, fieldIndex) => {
+  const getListOptions = (listOptions, field, fieldIndex, add, remove, move) => {
     return typeof listOptions === "function"
-      ? listOptions(field, fieldIndex)
+      ? listOptions(field, fieldIndex, add, remove, move)
       : (listOptions ?? []);
   };
 
@@ -453,10 +453,10 @@ const FormItemsRenderer = ({
     return (
       <Col key={getKey(option) || index} span={col.span} style={style}>
         <Form.List name={option.name} {...componentProps}>
-          {(fields, { add, remove }) => (
+          {(fields, { add, remove, move }) => (
             <>
               {fields.map((field, fieldIndex) => {
-                const listOptions = getListOptions(option.formListUniqueProps.options, field, fieldIndex);
+                const listOptions = getListOptions(option.formListUniqueProps.options, field, fieldIndex, add, remove, move);
                 return (
                   <Row gutter={gutter} key={field.key}>
                     {listOptions.map((listOption, listIndex) => {

package/components/HiddenInfo/gwj/index.js

@@ -64,17 +64,21 @@ function HiddenInfo(props) {
 
     if (info.hiddenRectifyUserCO && info.hiddenRectifyUserCO.length > 0) {
       for (let i = 0; i < info.hiddenRectifyUserCO.length; i++) {
-        const afterRectificationImageFiles = await getFile({
-          eqType: UPLOAD_FILE_TYPE_ENUM["4"],
-          eqForeignKey: info.hiddenRectifyUserCO[i].hiddenUserId,
-        });
-        setAfterRectificationImageFiles(prevState => [...prevState, afterRectificationImageFiles]);
-        if (info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0) {
-          const rectificationPlanImageFiles = await getFile({
-            eqType: UPLOAD_FILE_TYPE_ENUM["8"],
-            eqForeignKey: info.hiddenRectifyUserCO[i].hiddenSchemeCO.hiddenSchemeId,
+        if (info.hiddenRectifyUserCO[i].hiddenUserId) {
+          const afterRectificationImageFiles = await getFile({
+            eqType: UPLOAD_FILE_TYPE_ENUM["4"],
+            eqForeignKey: info.hiddenRectifyUserCO[i].hiddenUserId,
           });
-          setRectificationPlanImageFiles(prevState => [...prevState, rectificationPlanImageFiles]);
+          setAfterRectificationImageFiles(prevState => [...prevState, afterRectificationImageFiles]);
+        }
+        if (info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0) {
+          if (info.hiddenRectifyUserCO[i].hiddenSchemeCO.hiddenSchemeId) {
+            const rectificationPlanImageFiles = await getFile({
+              eqType: UPLOAD_FILE_TYPE_ENUM["8"],
+              eqForeignKey: info.hiddenRectifyUserCO[i].hiddenSchemeCO.hiddenSchemeId,
+            });
+            setRectificationPlanImageFiles(prevState => [...prevState, rectificationPlanImageFiles]);
+          }
         }
       }
     }
@@ -126,7 +130,7 @@ function HiddenInfo(props) {
               { label: "隐患级别", children: info.hiddenLevelName },
               { label: "隐患状态", children: getLabelName({ list: HIDDEN_STATE_ENUM, status: info.state }) },
               { label: "隐患描述", children: info.hiddenDesc },
-              { label: "隐患部位", children: info.hiddenPartName },
+              ...(info.hiddenPartName ? [{ label: "隐患部位", children: info.hiddenPartName }] : []),
               ...(
                 (info.source === 2 || info.source === 3) && (info.hiddenCheckListCO && Object.keys(info.hiddenCheckListCO).length > 0)
                   ? [
@@ -139,11 +143,11 @@ function HiddenInfo(props) {
                     ]
                   : []
               ),
-              {
+              ...(info.longitude ? [{
                 label: "隐患上报位置（经纬度）",
                 children: [info.longitude && `经度:${info.longitude}`, info.latitude && `纬度:${info.latitude}`].filter(Boolean).join(" "),
-              },
-              { label: "隐患位置描述", children: info.positionDesc },
+              }] : []),
+              ...(info.positionDesc ? [{ label: "隐患位置描述", children: info.positionDesc }] : []),
               { label: "隐患发现人", children: info.creatorName },
               { label: "隐患发现时间", children: dayjs(info.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") },
               {
@@ -213,18 +217,18 @@ function HiddenInfo(props) {
                       column={1}
                       styles={{ label: { width: 200 } }}
                       items={[
-                        { label: "隐患级别", children: item.hiddenLevelName },
-                        { label: "隐患确认人", children: item.userName },
-                        { label: "隐患确认时间", children: item.rectificationTime },
-                        { label: "整改负责人部门", children: item.rectifyDeptName },
-                        { label: "整改负责人", children: item.rectifyUserName },
-                        { label: "整改完成期限", children: item.rectificationDeadline },
-                        { label: "验收部门", children: item.checkDeptName },
-                        { label: "验收人", children: item.checkUserName },
+                        ...(item.hiddenLevelName ? [{ label: "隐患级别", children: item.hiddenLevelName }] : []),
+                        ...(item.userName ? [{ label: "隐患确认人", children: item.userName }] : []),
+                        ...(item.rectificationTime ? [{ label: "隐患确认时间", children: item.rectificationTime }] : []),
+                        ...(item.rectifyDeptName ? [{ label: "整改负责人部门", children: item.rectifyDeptName }] : []),
+                        ...(item.rectifyUserName ? [{ label: "整改负责人", children: item.rectifyUserName }] : []),
+                        ...(item.rectificationDeadline ? [{ label: "整改完成期限", children: item.rectificationDeadline }] : []),
+                        ...(item.checkDeptName ? [{ label: "验收部门", children: item.checkDeptName }] : []),
+                        ...(item.checkUserName ? [{ label: "验收人", children: item.checkUserName }] : []),
                         ...(item.repulseCause
                           ? [
-                              { label: "打回意见", children: item.repulseCause },
-                              { label: "打回时间", children: item.rectificationTime },
+                              ...(item.repulseCause ? [{ label: "打回意见", children: item.repulseCause }] : []),
+                              ...(item.rectificationTime ? [{ label: "打回时间", children: item.rectificationTime }] : []),
                             ]
                           : []),
                       ]}
@@ -246,13 +250,13 @@ function HiddenInfo(props) {
                       column={1}
                       styles={{ label: { width: 200 } }}
                       items={[
-                        { label: "申请延期日期", children: item.createTime },
-                        { label: "延期日期", children: item.delayTime },
-                        { label: "审核人", children: item.updateName },
+                        ...(item.createTime ? [{ label: "申请延期日期", children: item.createTime }] : []),
+                        ...(item.delayTime ? [{ label: "延期日期", children: item.delayTime }] : []),
+                        ...(item.updateName ? [{ label: "审核人", children: item.updateName }] : []),
                         ...(item.state === 3
                           ? [
-                              { label: "处置方案", children: item.disposalPlan },
-                              {
+                              ...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
+                              ...(item.disposalFile ? [{
                                 label: "处置方案附件",
                                 children: (
                                   getFileSuffix(item.disposalFile) === "pdf"
@@ -265,12 +269,12 @@ function HiddenInfo(props) {
                                             size="small"
                                             onClick={() => downloadFile(item.disposalFile)}
                                           >
-                                            预览
+                                            下载
                                           </Button>
                                         </Space>
                                       )
                                 ),
-                              },
+                              }] : []),
                             ]
                           : []),
                         {
@@ -313,15 +317,15 @@ function HiddenInfo(props) {
                       items={[
                         ...((item.state === 3 || item.state === 4)
                           ? [
-                              { label: "审核人", children: item.updateName },
-                              { label: "审核时间", children: item.updateTime },
+                              ...(item.updateName ? [{ label: "审核人", children: item.updateName }] : []),
+                              ...(item.updateTime ? [{ label: "审核时间", children: item.updateTime }] : []),
                             ]
                           : []),
                         { label: "无法整改原因", children: item.examine },
                         ...(item.state === 3
                           ? [
-                              { label: "处置方案", children: item.disposalPlan },
-                              {
+                              ...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
+                              ...(item.disposalFile ? [{
                                 label: "处置方案附件",
                                 children: (
                                   getFileSuffix(item.disposalFile) === "pdf"
@@ -334,12 +338,12 @@ function HiddenInfo(props) {
                                             size="small"
                                             onClick={() => downloadFile(item.disposalFile)}
                                           >
-                                            预览
+                                            下载
                                           </Button>
                                         </Space>
                                       )
                                 ),
-                              },
+                              }] : []),
                               {
                                 label: "是否更换整改负责人",
                                 children: item.rectifyUserCO && Object.keys(item.rectifyUserCO).length > 0 ? "是" : "否",
@@ -382,14 +386,21 @@ function HiddenInfo(props) {
                       column={1}
                       styles={{ label: { width: 200 } }}
                       items={[
-                        { label: "整改部门", children: item.deptName },
-                        { label: "整改人", children: item.userName },
-                        { label: "整改时间", children: item.rectificationTime },
-                        { label: "整改描述", children: item.descr },
+                        ...(item.deptName ? [{ label: "整改部门", children: item.deptName }] : []),
+                        ...(item.userName ? [{ label: "整改人", children: item.userName }] : []),
+                        ...(item.rectificationTime ? [{ label: "整改时间", children: item.rectificationTime }] : []),
+                        ...(item.descr ? [{ label: "整改描述", children: item.descr }] : []),
                         ...(item.investmentFunds ? [{ label: "投入资金", children: `${item.investmentFunds}元` }] : []),
                         ...(info.tempSafeMeasure ? [{ label: "临时安全措施", children: info.tempSafeMeasure }] : []),
                         { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles[index]} /> },
-                        { label: "整改方案", children: item.isRectificationScheme === 0 ? "无" : "有" },
+                        {
+                          label: "整改方案", children: (
+                            <>
+                              {item.isRectificationScheme === 0 && <span>无</span>}
+                              {item.isRectificationScheme === 1 && <span>有</span>}
+                            </>
+                          )
+                        },
                         ...((item.isRectificationScheme === 1 && item.hiddenSchemeCO && Object.keys(item.hiddenSchemeCO).length > 0)
                           ? [
                               { label: "治理标准", children: item.hiddenSchemeCO.governStanDards },
@@ -429,7 +440,7 @@ function HiddenInfo(props) {
                                   { label: "验收人", children: item.userName },
                                   { label: "验收时间", children: item.rectificationTime },
                                   ...(item.repulseCause ? [{ label: "验收打回意见", children: item.repulseCause }] : []),
-                                  { label: "是否合格", children: "合格" },
+                                  { label: "是否合格", children: item.rectificationTime ? "合格" : "" },
                                   ...(item.descr ? [{ label: "验收描述", children: item.descr }] : []),
                                   ...((acceptImageFiles[index] && acceptImageFiles[index].length > 0) ? [{ label: "验收图片", children: <PreviewImg files={acceptImageFiles[index]} /> }] : []),
                                 ]}

package/components/LeftTree/Dictionary/index.js

@@ -18,8 +18,10 @@ function DictionaryLeftTree(props) {
   const [treeData, setTreeData] = useState([]);
 
   const getData = async () => {
-    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey))
-      throw new Error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey)) {
+      console.error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+      return;
+    }
 
     setTreeData([]);
     const { data } = await request("/config/dict-trees/list/by/dictValues", "get", { appKey, dictValue });

package/components/Pdf/index.js

@@ -1,8 +1,12 @@
-import { message, Modal, Spin } from "antd";
-import { useState } from "react";
+import { useFullscreen } from "ahooks";
+import { Button, message, Modal, Spin } from "antd";
+import { useRef, useState } from "react";
 import { Document, Page, pdfjs } from "react-pdf";
 import useDownloadFile from "../../hooks/useDownloadFile";
-import { getFileUrl } from "../../utils/index";
+import { getFileUrl } from "../../utils";
+import "react-pdf/dist/Page/AnnotationLayer.css";
+import "react-pdf/dist/Page/TextLayer.css";
+import "./index.less";
 
 /**
  * PDF查看组件
@@ -22,6 +26,11 @@ function Pdf(props) {
   const [pdfWidth, setPdfWidth] = useState(600);
   const [loading, setLoading] = useState(true);
 
+  const fullscreenRef = useRef(null);
+
+  const [isFullscreen, { enterFullscreen, exitFullscreen }] = useFullscreen(fullscreenRef);
+  const { downloadFile } = useDownloadFile();
+
   pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`;
 
   const onDocumentLoadSuccess = ({ numPages }) => {
@@ -44,18 +53,18 @@ function Pdf(props) {
   const renderPdfContent = () => (
     <>
       {loading && (
-        <div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "80vh" }}>
+        <div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "72vh" }}>
           <Spin size="large" />
         </div>
       )}
-      <div style={{ height: "88vh", overflowY: "auto", padding: "24px", ...style }}>
+      <div style={{ height: isFullscreen ? "calc(100vh - 40px - 24px - 8px - 32px - 12px)" : "72vh", overflowY: "auto", padding: "24px", ...style }}>
         <Document
           file={!file.includes(fileUrl) ? fileUrl + file : file}
           onLoadSuccess={onDocumentLoadSuccess}
           onLoadError={onDocumentLoadError}
         >
           {
-            Array.from({ length: numPages }).map((el, index) => (
+            Array.from({ length: numPages }).map((_, index) => (
               <Page key={`page_${index + 1}`} pageNumber={index + 1} onLoadSuccess={onPageLoadSuccess} />
             ))
           }
@@ -69,36 +78,52 @@ function Pdf(props) {
     return renderPdfContent();
   }
 
-  const { loading: downloadFileLoading, downloadFile } = useDownloadFile();
-
   const onDownloadFile = () => {
-    Modal.confirm({
-      title: "提示",
-      content: "确定要下载此文件吗？",
-      onOk: () => {
-        downloadFile({
-          url: fileUrl,
-          name,
-        });
-      },
+    isFullscreen && exitFullscreen();
+    downloadFile({
+      url: file,
+      name,
     });
   };
 
   // 默认弹窗模式
   return (
-    <Modal
-      open={visible}
-      maskClosable={false}
-      width={pdfWidth + 100}
-      title="PDF预览"
-      onCancel={onCancel}
-      cancelText="关闭"
-      okText="下载"
-      onOk={onDownloadFile}
-      loading={downloadFileLoading}
-    >
-      {renderPdfContent()}
-    </Modal>
+    <div ref={fullscreenRef}>
+      <Modal
+        style={{ top: isFullscreen ? 0 : 100, maxWidth: isFullscreen ? "100vw" : "calc(100vw - 32px)", paddingBottom: isFullscreen ? 0 : 24 }}
+        open={visible}
+        maskClosable={false}
+        width={isFullscreen ? "100vw" : pdfWidth + 100}
+        title="PDF预览"
+        onCancel={() => {
+          isFullscreen && exitFullscreen();
+          onCancel();
+        }}
+        getContainer={false}
+        footer={[
+          <Button
+            key="cancel"
+            onClick={() => {
+              isFullscreen && exitFullscreen();
+              onCancel();
+            }}
+          >
+            关闭
+          </Button>,
+          !loading && <Button
+            key="fullScreen"
+            onClick={() => {
+              isFullscreen ? exitFullscreen() : enterFullscreen();
+            }}
+          >
+            {isFullscreen ? "退出全屏" : "全屏"}
+          </Button>,
+          <Button key="download" type="primary" onClick={onDownloadFile}>下载</Button>,
+        ]}
+      >
+        {renderPdfContent()}
+      </Modal>
+    </div>
   );
 }
 

package/components/Pdf/index.less

@@ -0,0 +1,3 @@
+.react-pdf__Page__canvas{
+  margin: 0 auto;
+}

package/components/Select/Dictionary/index.js

@@ -18,8 +18,10 @@ function DictionarySelect(props) {
   const [data, setData] = useState([]);
 
   const getData = async () => {
-    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey))
-      throw new Error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey)) {
+      console.error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+      return;
+    }
 
     setData([]);
     const { data } = await request("/config/dict-trees/list/by/dictValues", "get", { appKey, dictValue });

package/components/SelectTree/Dictionary/index.js

@@ -18,8 +18,10 @@ function DictionarySelectTree(props) {
   const [treeData, setTreeData] = useState([]);
 
   const getData = async () => {
-    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey))
-      throw new Error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+    if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey)) {
+      console.error("传入的 appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+      return;
+    }
 
     setTreeData([]);
     const { data } = await request("/config/dict-trees/list/by/dictValues", "get", { appKey, dictValue });

package/hooks/useDeleteFile/index.js

@@ -12,8 +12,10 @@ function useDeleteFile(returnType = "object") {
 
   // 删除文件
   const deleteFile = (options) => {
-    if (!options)
-      throw new Error("请传入 options");
+    if (!options) {
+      console.error("请传入 options");
+      return;
+    }
 
     // 增加请求数量并设置loading状态
     requestCount++;
@@ -24,10 +26,14 @@ function useDeleteFile(returnType = "object") {
     return new Promise((resolve, reject) => {
       const { files = [], single = true } = options;
 
-      if (!files)
-        throw new Error("请传入 files");
-      if (!Array.isArray(files))
-        throw new Error("请传入有效的 files");
+      if (!files) {
+        console.error("请传入 files");
+        return;
+      }
+      if (!Array.isArray(files)) {
+        console.error("请传入有效的 files");
+        return;
+      }
 
       // 如果没有文件则直接返回
       if (files.length === 0) {

package/hooks/useDictionary/index.js

@@ -13,8 +13,10 @@ function useDictionary(returnType = "object") {
 
   // 获取数据字典
   const getDictionary = (options) => {
-    if (!options)
-      throw new Error("请传入 options");
+    if (!options) {
+      console.error("请传入 options");
+      return;
+    }
 
     // 增加请求数量并设置loading状态
     requestCount++;
@@ -25,10 +27,14 @@ function useDictionary(returnType = "object") {
     return new Promise((resolve, reject) => {
       const { appKey = DICTIONARY_APP_KEY_ENUM.DEFAULT, dictValue } = options;
 
-      if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey))
-        throw new Error("传入的 options.appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
-      if (!dictValue)
-        throw new Error("请传入 options.dictValue");
+      if (!Object.values(DICTIONARY_APP_KEY_ENUM).includes(appKey)) {
+        console.error("传入的 options.appKey 不在 DICTIONARY_APP_KEY_ENUM 中");
+        return;
+      }
+      if (!dictValue) {
+        console.error("请传入 options.dictValue");
+        return;
+      }
 
       // 发送请求
       request(

package/hooks/useDownloadBlob/index.js

@@ -38,7 +38,8 @@ export default function useDownloadBlob(returnType = "object") {
       })
         .then((response) => {
           if (!response.ok) {
-            throw new Error("Network response was not ok");
+            console.error("网络响应异常");
+            return;
           }
           return response.blob();
         })

package/hooks/useDownloadFile/index.js

@@ -20,8 +20,10 @@ export default function useDownloadFile(returnType = "object") {
     }
 
     const { url, name: fileName } = options;
-    if (!url)
-      throw new Error("请传入 url");
+    if (!url) {
+      console.error("请传入 url");
+      return;
+    }
 
     Modal.confirm({
       title: "提示",

package/hooks/useGetFile/index.js

@@ -14,8 +14,10 @@ function useGetFile(returnType = "object") {
 
   // 获取文件
   const getFile = (options) => {
-    if (!options)
-      throw new Error("请传入 options");
+    if (!options) {
+      console.error("请传入 options");
+      return;
+    }
 
     // 增加请求数量并设置loading状态
     requestCount++;
@@ -26,15 +28,21 @@ function useGetFile(returnType = "object") {
     return new Promise((resolve, reject) => {
       const { eqType, eqForeignKey } = options;
 
-      if (!eqType)
-        throw new Error("请传入 options.eqType");
+      if (!eqType) {
+        console.error("请传入 options.eqType");
+        return;
+      }
 
       // 检查eqType是否在UPLOAD_FILE_TYPE_ENUM中
-      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(eqType))
-        throw new Error("传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中");
+      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(eqType)) {
+        console.error("传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中");
+        return;
+      }
 
-      if (eqForeignKey === undefined || eqForeignKey === null)
-        throw new Error("请传入 options.eqForeignKey");
+      if (eqForeignKey === undefined || eqForeignKey === null) {
+        console.error("请传入 options.eqForeignKey");
+        return;
+      }
 
       // 发送请求
       request(

package/hooks/useTable/index.js

@@ -44,8 +44,10 @@ function getService(service, getExtraParams = {}, transform, usePermission) {
  * 自定义 useTable，继承 ahooks 的 useAntdTable，根据需求进行扩展
  */
 function useTable(service, options) {
-  if (!service)
-    throw new Error("请传入 service");
+  if (!service) {
+    console.error("请传入 service")
+    return;
+  }
 
   // 获取额外参数和转换函数
   const { params: extraParams, transform, ...restOptions } = options || {};

package/hooks/useUploadFile/index.js

@@ -13,8 +13,10 @@ function useUploadFile(returnType = "object") {
 
   // 上传文件
   const uploadFile = (options) => {
-    if (!options)
-      throw new Error("请传入 options");
+    if (!options) {
+      console.error("请传入 options");
+      return;
+    }
 
     // 增加请求数量并设置loading状态
     requestCount++;
@@ -25,28 +27,42 @@ function useUploadFile(returnType = "object") {
     return new Promise((resolve, reject) => {
       const { files = [], single = true, params } = options;
 
-      if (!files)
-        throw new Error("请传入 files");
-      if (!Array.isArray(files))
-        throw new Error("请传入有效的 files");
-      if (!params)
-        throw new Error("请传入 options.params");
-      if (!params.type)
-        throw new Error("请传入 options.params.type");
+      if (!files) {
+        console.error("请传入 files");
+        return;
+      }
+      if (!Array.isArray(files)) {
+        console.error("请传入有效的 files");
+        return;
+      }
+      if (!params) {
+        console.error("请传入 options.params");
+        return;
+      }
+      if (!params.type) {
+        console.error("请传入 options.params.type");
+        return;
+      }
 
       // 检查type是否在UPLOAD_FILE_TYPE_ENUM中
-      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(params.type))
-        throw new Error("传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中");
+      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(params.type)) {
+        console.error("传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中");
+        return;
+      }
 
       // 根据type获取对应的path
       const path = UPLOAD_FILE_PATH_ENUM[params.type];
-      if (!path)
-        throw new Error(`未找到 type ${params.type} 对应的 path `);
+      if (!path) {
+        console.error(`未找到 type ${params.type} 对应的 path `);
+        return;
+      }
 
       // 当single为false时，foreignKey是必需的
       if (!single) {
-        if (!params.hasOwnProperty("foreignKey"))
-          throw new Error("请传入 options.params.foreignKey");
+        if (!params.hasOwnProperty("foreignKey")) {
+          console.error("请传入 options.params.foreignKey");
+          return;
+        }
         // 如果 foreignKey 是 undefined，设置默认值为空字符串
         if (params.foreignKey === undefined || params.foreignKey === null)
           params.foreignKey = "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.175",
+  "version": "1.0.177",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",