zy-react-library 1.1.0 → 1.1.2

package/hooks/useIsExistenceDuplicateSelection/index.js

@@ -1,20 +1,27 @@
-import { message as antdMessage } from "antd";
-import { uniqBy } from "lodash-es";
-
+import { message } from 'antd';
+import { uniqBy } from 'lodash-es';
+
 /**
  * 检查数组中是否存在重复项
- */
-export default function useIsExistenceDuplicateSelection() {
-  const isExistenceDuplicateSelection = (options) => {
-    const { data, key, message = "存在重复项，请勿重复选择" } = options;
-    return new Promise((resolve) => {
-      if (uniqBy(data, key).length !== data.length) {
-        antdMessage.error(message);
-      }
-      else {
-        resolve();
-      }
-    });
-  };
-  return { isExistenceDuplicateSelection };
-}
+ */
+function useIsExistenceDuplicateSelection() {
+  const isExistenceDuplicateSelection = options => {
+    const {
+      data,
+      key,
+      message: message$1 = "存在重复项，请勿重复选择"
+    } = options;
+    return new Promise(resolve => {
+      if (uniqBy(data, key).length !== data.length) {
+        message.error(message$1);
+      } else {
+        resolve();
+      }
+    });
+  };
+  return {
+    isExistenceDuplicateSelection
+  };
+}
+
+export { useIsExistenceDuplicateSelection as default };

package/hooks/useTable/index.js

@@ -1,5 +1,5 @@
-import { useAntdTable } from "ahooks";
-import useUrlQueryCriteria from "../useUrlQueryCriteria";
+import { useAntdTable } from 'ahooks';
+import useUrlQueryCriteria from '../useUrlQueryCriteria/index.js';
 
 /**
  * 获取数据
@@ -8,26 +8,29 @@ function getService(service, getExtraParams = {}, transform, usePermission) {
   // 获取额外的参数
   const extraParams = (typeof getExtraParams === "function" ? getExtraParams() : getExtraParams) || {};
   // 获取数据
-  return async ({ current, pageSize }, formData = {}) => {
+  return async ({
+    current,
+    pageSize
+  }, formData = {}) => {
     // 如果提供了 transform 函数，则在请求之前调用它
     let transformedFormData = formData;
     if (typeof transform === "function") {
       const transformResult = transform(formData);
       // 如果 transform 函数有返回值，则将其与原始表单数据合并，transform 的优先级更高
       if (transformResult && typeof transformResult === "object") {
-        transformedFormData = { ...formData, ...transformResult };
+        transformedFormData = {
+          ...formData,
+          ...transformResult
+        };
       }
     }
-
     const params = {
       pageIndex: current,
       pageSize,
       ...transformedFormData,
-      ...extraParams,
-    }
-
-    if (usePermission)
-      params.menuPath = window.location.pathname;
+      ...extraParams
+    };
+    if (usePermission) params.menuPath = window.location.pathname;
 
     // 发起请求
     const res = await service(params);
@@ -35,7 +38,7 @@ function getService(service, getExtraParams = {}, transform, usePermission) {
     return {
       list: res.data || [],
       total: res.totalCount || 0,
-      ...res,
+      ...res
     };
   };
 }
@@ -45,12 +48,16 @@ function getService(service, getExtraParams = {}, transform, usePermission) {
  */
 function useTable(service, options) {
   if (!service) {
-    console.error("请传入 service")
+    console.error("请传入 service");
     return;
   }
 
   // 获取额外参数和转换函数
-  const { params: extraParams, transform, ...restOptions } = options || {};
+  const {
+    params: extraParams,
+    transform,
+    ...restOptions
+  } = options || {};
 
   // 获取配置项
   const {
@@ -60,11 +67,16 @@ function useTable(service, options) {
     defaultType = "advance",
     defaultCurrent = 1,
     defaultPageSize = 20,
-    defaultPagination = { current: defaultCurrent, pageSize: defaultPageSize },
+    defaultPagination = {
+      current: defaultCurrent,
+      pageSize: defaultPageSize
+    },
     ...restRestOptions
   } = restOptions;
-
-  const { setUrlCriteriaQuery, getUrlCriteriaQuery } = useUrlQueryCriteria();
+  const {
+    setUrlCriteriaQuery,
+    getUrlCriteriaQuery
+  } = useUrlQueryCriteria();
 
   // 获取存储的查询条件
   const storageQueryCriteriaSearchForm = useStorageQueryCriteria ? getUrlCriteriaQuery("searchFormKeys", "searchFormValues") : {};
@@ -76,25 +88,20 @@ function useTable(service, options) {
   const actualPagination = usePagination ? Object.keys(storageQueryCriteriaPagination).length > 0 ? storageQueryCriteriaPagination : defaultPagination : {};
 
   // 调用 ahooks 的 useAntdTable
-  const res = useAntdTable(
-    getService(service, extraParams, transform, usePermission),
-    {
-      ...restRestOptions,
-      defaultParams: [actualPagination, actualSearchForm],
-      defaultType,
-      onSuccess: (data, params) => {
-        // 执行成功回调，为了保留 ahooks 的 onSuccess 回调
-        restOptions.onSuccess && restOptions.onSuccess(data, params);
-        // 存储查询条件和分页到 URL
-        useStorageQueryCriteria && setUrlCriteriaQuery(
-          params[1] ?? {},
-          usePagination
-            ? { current: res.tableProps.pagination.current, pageSize: res.tableProps.pagination.pageSize }
-            : {},
-        );
-      },
-    },
-  );
+  const res = useAntdTable(getService(service, extraParams, transform, usePermission), {
+    ...restRestOptions,
+    defaultParams: [actualPagination, actualSearchForm],
+    defaultType,
+    onSuccess: (data, params) => {
+      // 执行成功回调，为了保留 ahooks 的 onSuccess 回调
+      restOptions.onSuccess && restOptions.onSuccess(data, params);
+      // 存储查询条件和分页到 URL
+      useStorageQueryCriteria && setUrlCriteriaQuery(params[1] ?? {}, usePagination ? {
+        current: res.tableProps.pagination.current,
+        pageSize: res.tableProps.pagination.pageSize
+      } : {});
+    }
+  });
 
   // 执行回调函数
   restOptions.callback && restOptions.callback(res?.data?.list || [], res?.data || {});
@@ -104,10 +111,14 @@ function useTable(service, options) {
     ...res,
     tableProps: {
       ...res.tableProps,
-      pagination: usePagination ? { ...res.tableProps.pagination, showQuickJumper: true, showSizeChanger: true } : false,
+      pagination: usePagination ? {
+        ...res.tableProps.pagination,
+        showQuickJumper: true,
+        showSizeChanger: true
+      } : false
     },
-    getData: res.search.submit,
+    getData: res.search.submit
   };
 }
 
-export default useTable;
+export { useTable as default };

package/hooks/useUploadFile/index.js

@@ -1,149 +1,144 @@
-import { request } from "@cqsjjb/jjb-common-lib/http";
-import { useState } from "react";
-import { UPLOAD_FILE_PATH_ENUM, UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj";
-
+import { request } from '@cqsjjb/jjb-common-lib/http';
+import { useState } from 'react';
+import { UPLOAD_FILE_TYPE_ENUM, UPLOAD_FILE_PATH_ENUM } from '../../enum/uploadFile/gwj/index.js';
+
 /**
  * 上传文件
- */
-function useUploadFile(returnType = "object") {
-  // loading状态
-  const [loading, setLoading] = useState(false);
-  // 用于跟踪进行中的请求数量（不暴露给外部）
-  let requestCount = 0;
-
-  // 上传文件
-  const uploadFile = (options) => {
-    if (!options) {
-      console.error("请传入 options");
-      return;
-    }
-
-    // 增加请求数量并设置loading状态
-    requestCount++;
-    if (requestCount > 0) {
-      setLoading(true);
-    }
-
-    return new Promise((resolve, reject) => {
-      const { files = [], single = true, params } = options;
-
-      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)) {
-        console.error("传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中");
-        return;
-      }
-
-      // 根据type获取对应的path
-      const path = UPLOAD_FILE_PATH_ENUM[params.type];
-      if (!path) {
-        console.error(`未找到 type ${params.type} 对应的 path `);
-        return;
-      }
-
-      // 当single为false时，foreignKey是必需的
-      if (!single) {
-        if (!params.hasOwnProperty("foreignKey")) {
-          console.error("请传入 options.params.foreignKey");
-          return;
-        }
-        // 如果 foreignKey 是 undefined，设置默认值为空字符串
-        if (params.foreignKey === undefined || params.foreignKey === null)
-          params.foreignKey = "";
-      }
-
-      // 如果没有文件则直接返回
-      if (files.length === 0) {
-        requestCount--;
-        if (requestCount <= 0) {
-          setLoading(false);
-        }
-        resolve(
-          single
-            ? { filePath: "" }
-            : { id: params.foreignKey },
-        );
-        return;
-      }
-
-      const formData = new FormData();
-
-      // 将文件添加到formData中
-      files.forEach((f) => {
-        f.originFileObj && formData.append("files", f.originFileObj);
-      });
-
-      // 将额外携带的参数添加到formData中
-      Object.keys(params).forEach((key) => {
-        formData.append(key, params[key]);
-      });
-
-      // 添加path参数
-      formData.append("path", path);
-
-      // 获取待上传的文件
-      const filesLength = formData.getAll("files").length;
-
-      // 如果没有文件则返回老文件
-      if (filesLength === 0) {
-        requestCount--;
-        if (requestCount <= 0) {
-          setLoading(false);
-        }
-        resolve(
-          single
-            ? { filePath: files[0].filePath }
-            : { id: params.foreignKey },
-        );
-        return;
-      }
-
-      // 发送请求
-      request(
-        single ? "/basicInfo/imgFiles/save" : "/basicInfo/imgFiles/batchSave",
-        "post",
-        formData,
-        { "Content-Type": "multipart/form-data" },
-      )
-        .then((res) => {
-          resolve(
-            single
-              ? { filePath: res.data.filePath }
-              : { id: res.data.foreignKey },
-          );
-        })
-        .catch((err) => {
-          reject(err);
-        })
-        .finally(() => {
-          // 减少请求数量并在没有进行中的请求时设置loading为false
-          requestCount--;
-          if (requestCount <= 0) {
-            setLoading(false);
-          }
-        });
-    });
-  };
-
-  if (returnType === "array")
-    return [loading, uploadFile];
-  return { loading, uploadFile };
-}
-
-export default useUploadFile;
+ */
+function useUploadFile(returnType = "object") {
+  // loading状态
+  const [loading, setLoading] = useState(false);
+  // 用于跟踪进行中的请求数量（不暴露给外部）
+  let requestCount = 0;
+
+  // 上传文件
+  const uploadFile = options => {
+    if (!options) {
+      console.error("请传入 options");
+      return;
+    }
+
+    // 增加请求数量并设置loading状态
+    requestCount++;
+    if (requestCount > 0) {
+      setLoading(true);
+    }
+    return new Promise((resolve, reject) => {
+      const {
+        files = [],
+        single = true,
+        params
+      } = options;
+      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)) {
+        console.error("传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中");
+        return;
+      }
+
+      // 根据type获取对应的path
+      const path = UPLOAD_FILE_PATH_ENUM[params.type];
+      if (!path) {
+        console.error(`未找到 type ${params.type} 对应的 path `);
+        return;
+      }
+
+      // 当single为false时，foreignKey是必需的
+      if (!single) {
+        if (!params.hasOwnProperty("foreignKey")) {
+          console.error("请传入 options.params.foreignKey");
+          return;
+        }
+        // 如果 foreignKey 是 undefined，设置默认值为空字符串
+        if (params.foreignKey === undefined || params.foreignKey === null) params.foreignKey = "";
+      }
+
+      // 如果没有文件则直接返回
+      if (files.length === 0) {
+        requestCount--;
+        if (requestCount <= 0) {
+          setLoading(false);
+        }
+        resolve(single ? {
+          filePath: ""
+        } : {
+          id: params.foreignKey
+        });
+        return;
+      }
+      const formData = new FormData();
+
+      // 将文件添加到formData中
+      files.forEach(f => {
+        f.originFileObj && formData.append("files", f.originFileObj);
+      });
+
+      // 将额外携带的参数添加到formData中
+      Object.keys(params).forEach(key => {
+        formData.append(key, params[key]);
+      });
+
+      // 添加path参数
+      formData.append("path", path);
+
+      // 获取待上传的文件
+      const filesLength = formData.getAll("files").length;
+
+      // 如果没有文件则返回老文件
+      if (filesLength === 0) {
+        requestCount--;
+        if (requestCount <= 0) {
+          setLoading(false);
+        }
+        resolve(single ? {
+          filePath: files[0].filePath
+        } : {
+          id: params.foreignKey
+        });
+        return;
+      }
+
+      // 发送请求
+      request(single ? "/basicInfo/imgFiles/save" : "/basicInfo/imgFiles/batchSave", "post", formData, {
+        "Content-Type": "multipart/form-data"
+      }).then(res => {
+        resolve(single ? {
+          filePath: res.data.filePath
+        } : {
+          id: res.data.foreignKey
+        });
+      }).catch(err => {
+        reject(err);
+      }).finally(() => {
+        // 减少请求数量并在没有进行中的请求时设置loading为false
+        requestCount--;
+        if (requestCount <= 0) {
+          setLoading(false);
+        }
+      });
+    });
+  };
+  if (returnType === "array") return [loading, uploadFile];
+  return {
+    loading,
+    uploadFile
+  };
+}
+
+export { useUploadFile as default };

package/hooks/useUrlQueryCriteria/index.js

@@ -1,22 +1,24 @@
-import useUrlState from "@ahooksjs/use-url-state";
+import useUrlState from '@ahooksjs/use-url-state';
 
 /**
  * 处理搜索条件缓存到 URL
  */
-export default function useUrlQueryCriteria() {
+function useUrlQueryCriteria() {
   const [state, setState] = useUrlState({
     searchFormKeys: "",
     searchFormValues: "",
     paginationKeys: "",
-    paginationValues: "",
-  }, { navigateMode: "replace" });
+    paginationValues: ""
+  }, {
+    navigateMode: "replace"
+  });
 
   /**
    * 将搜索表单项和分页参数缓存到 URL 中
    */
   function setUrlCriteriaQuery(searchForm, pagination) {
     // 将对象转换为键值对字符串格式
-    const getJoinString = (data) => {
+    const getJoinString = data => {
       const keys = [];
       const values = [];
       Object.entries(data).forEach(([key, value]) => {
@@ -25,13 +27,15 @@ export default function useUrlQueryCriteria() {
           if (Array.isArray(value)) {
             // 数组值使用方括号包裹，并用竖线分隔
             values.push(`[${value.join("|")}]`);
-          }
-          else {
+          } else {
             values.push(value);
           }
         }
       });
-      return { keys: keys.join(","), values: values.join(",") };
+      return {
+        keys: keys.join(","),
+        values: values.join(",")
+      };
     };
 
     // 获取搜索表单和分页数据的键值对字符串
@@ -43,7 +47,7 @@ export default function useUrlQueryCriteria() {
       searchFormKeys: searchFormData.keys || undefined,
       searchFormValues: searchFormData.values || undefined,
       paginationKeys: paginationData.keys || undefined,
-      paginationValues: paginationData.values || undefined,
+      paginationValues: paginationData.values || undefined
     });
   }
 
@@ -63,8 +67,7 @@ export default function useUrlQueryCriteria() {
         if (values[index].startsWith("[") && values[index].endsWith("]")) {
           const arrayContent = values[index].substring(1, values[index].length - 1);
           resultMap[key] = arrayContent ? arrayContent.split("|") : [];
-        }
-        else {
+        } else {
           // 处理普通值
           resultMap[key] = values[index];
         }
@@ -72,6 +75,10 @@ export default function useUrlQueryCriteria() {
     });
     return resultMap;
   }
-
-  return { setUrlCriteriaQuery, getUrlCriteriaQuery };
+  return {
+    setUrlCriteriaQuery,
+    getUrlCriteriaQuery
+  };
 }
+
+export { useUrlQueryCriteria as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.1.0",
+  "version": "1.1.2",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
@@ -20,6 +20,9 @@
     "node": ">=18.0.0"
   },
   "scripts": {
+    "build": "rollup -c",
+    "build:watch": "rollup -c -w",
+    "prepublishOnly": "npm run build",
     "postinstall": "echo 'Thanks for using our component library!'"
   },
   "dependencies": {
@@ -37,5 +40,15 @@
     "react": "^18.3.1",
     "react-pdf": "^10.2.0",
     "react-signature-canvas": "^1.1.0-alpha.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "glob": "^13.0.0",
+    "rollup": "^4.54.0"
   }
 }