@hzab/utils 1.0.4 → 1.0.6

package/README.md

@@ -98,17 +98,34 @@ export async function handleOssUpload(files, opt) {
 
 - 生成文档：npm run docs
 - 本地运行：npm run dev
-- 打包编译：npm run build
 
 ## 发布
 
-- 注意：示例代码生效，但发布之后未生效。确认是否执行了编译！！！
+- npm 源和云效源都需要发布
 
-- 编译组件：npm run build
 - 命令：npm publish --access public
 - 发布目录：
   - src
 
+### 迭代发布命令-版本自增
+
+- beta: 需要手动修改 package.json 中的 version，添加 -betaX 版本号。使用 npm publish --beta 发布
+- 0.0.x: npm run publish-patch
+- 0.x.0: npm run publish-minor
+- x.0.0: npm run publish-major
+
+### nrm
+
+- 安装
+  npm install -g nrm
+- 增加源
+  nrm add aliyun https://packages.aliyun.com/62046985b3ead41b374a17f7/npm/npm-registry/
+- 切换源
+  nrm use aliyun
+  nrm use npm
+- 登录（账号密码在 https://packages.aliyun.com/npm/npm-registry/guide 查看）
+  npm login --registry=https://packages.aliyun.com/62046985b3ead41b374a17f7/npm/npm-registry/
+
 ## 配置
 
 ### 配置文件

package/changelog.md

@@ -1,3 +1,11 @@
+# @hzab/utils@1.0.6
+
+feat: formily global components
+
+# @hzab/utils@1.0.5
+
+fix: upload 文件名简化
+
 # @hzab/utils@1.0.3
 
 feat:公有环境添加缩略图地址

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/utils",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "utils",
   "main": "src",
   "scripts": {

package/src/file/fileName.ts

@@ -75,3 +75,24 @@ export const mergeFileName = function (fileName, str = "") {
 export const getUFileName = function (fileName) {
   return mergeFileName(getFileName(fileName) || "up", "-" + `~kid-${nanoidNumALetters()}~`);
 };
+
+/**
+ * 获取文件名的后缀
+ * @param fileName
+ * @returns
+ */
+export const getFileNameExt = function (fileName) {
+  const regex = /^(.*)\.([^.]+)$/;
+  const result = fileName.match(regex);
+  if (result) {
+    const [, mainPart, ext] = result;
+    return {
+      mainPart,
+      ext,
+    };
+  }
+  return {
+    mainPart: fileName,
+    ext: "",
+  };
+};

package/src/file/fileType.ts

@@ -38,8 +38,6 @@ export function getFileType(file) {
       type = "audio/3gpp";
     } else if (checkUrlSuffix(file, ["pdf"])) {
       type = "application/pdf";
-    } else if (checkUrlSuffix(file, ["pdf"])) {
-      type = "application/pdf";
     } else if (checkUrlSuffix(file, ["xlsx", "xls", "csv", "xlsm", "xlsb"])) {
       type = "application/vnd.ms-excel";
     } else if (checkUrlSuffix(file, ["doc", "docx"])) {
@@ -150,3 +148,74 @@ export function getFileTypeStr(file) {
   }
   return fileType || type;
 }
+
+/**
+ * 根据文件的 MIME 类型 (file.type) 获取对应的文件后缀名
+ * @param {string} mimeType - 文件的 MIME 类型（如 'image/jpeg'、'application/pdf'）
+ * @returns {string} 返回文件后缀名（带点，如 '.jpg'），未知类型返回 '.unknown'
+ */
+export const getFileTypeExt = function (mimeType) {
+  // 常见 MIME 类型到文件后缀的映射表（可根据需求扩展）
+  const mimeToExtMap = {
+    // 图片类型
+    "image/jpeg": "jpg",
+    "image/jpg": "jpg",
+    "image/png": "png",
+    "image/gif": "gif",
+    "image/webp": "webp",
+    "image/svg+xml": "svg",
+    "image/bmp": "bmp",
+    "image/tiff": "tiff",
+
+    // 文档类型
+    "application/pdf": "pdf",
+    "application/msword": "doc",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+    "application/vnd.ms-excel": "xls",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+    "application/vnd.ms-powerpoint": "ppt",
+    "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
+    "text/plain": "txt",
+    "text/html": "html",
+    "application/json": "json",
+
+    // 音频/视频类型
+    "audio/mpeg": "mp3",
+    "audio/wav": "wav",
+    "video/mp4": "mp4",
+    "video/avi": "avi",
+    "video/mpeg": "mpeg",
+
+    // 压缩包类型
+    "application/zip": "zip",
+    "application/x-rar-compressed": "rar",
+    "application/x-7z-compressed": "7z",
+  };
+
+  // 处理空值、非字符串的情况
+  if (!mimeType || typeof mimeType !== "string") {
+    // return "unknown";
+    return "";
+  }
+
+  // 去除首尾空格，统一转小写（避免大小写不一致问题）
+  const normalizedMimeType = mimeType.trim().toLowerCase();
+
+  // 优先匹配完整 MIME 类型
+  if (mimeToExtMap[normalizedMimeType]) {
+    return mimeToExtMap[normalizedMimeType];
+  }
+
+  // 兼容部分不标准的 MIME 类型（如只取主类型）
+  const mainType = normalizedMimeType.split("/")[0];
+  switch (mainType) {
+    case "image":
+      return "img";
+    case "audio":
+      return "audio";
+    case "video":
+      return "video";
+    default:
+      return mainType?.match(/[^\/]*\/([^\/]+)$/)?.[1];
+  }
+};

package/src/formily/global-components.ts

@@ -0,0 +1,48 @@
+/**
+ * formily 全局组件
+ * 项目初始化时进行 formily 组件的挂载，解决 form render 组件日益庞大的问题。
+ */
+window.formilyGlobalComponents = {};
+
+/**
+ * 获取全局 formily 组件对象
+ * @returns {Object} formilyGlobalComponents
+ */
+export const getFormilyGlobalComponents = function () {
+  return window.formilyGlobalComponents || {};
+};
+
+/**
+ * 批量设置全局 formily 组件
+ * @param {Object} components
+ * @returns {Object} formilyGlobalComponents
+ */
+export const setFormilyGlobalComponents = function (components) {
+  Object.assign(window.formilyGlobalComponents, components);
+  return window.formilyGlobalComponents;
+};
+
+/**
+ * 单个设置全局 formily 组件
+ * @returns {Object} formilyGlobalComponents
+ */
+/**
+ * 单个设置全局 formily 组件
+ * @param {string} key
+ * @param {ReactComponent} component
+ * @returns {Object} formilyGlobalComponents
+ */
+export const setFormilyGlobalComponent = function (key, component) {
+  window.formilyGlobalComponents[key] = component;
+  return window.formilyGlobalComponents;
+};
+
+/**
+ * 单个删除全局 formily 组件
+ * @param {string} key
+ * @returns {Object} formilyGlobalComponents
+ */
+export const rmFormilyGlobalComponents = function (key) {
+  delete window.formilyGlobalComponents[key];
+  return window.formilyGlobalComponents;
+};

package/src/upload/OssUploadUtil.ts

@@ -1,195 +1,204 @@
-import dayjs from "dayjs";
-
-import { axios } from "@hzab/data-model";
-import { formatDirStr } from "./uploadUtils";
-
-/**
- * getSignature 配置
- */
-export interface IGetSignatureOpt {
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** axios 实例 */
-  axios?: typeof axios;
-  /** axios 配置参数 */
-  axiosConf?: Object;
-  /** 获取配置的接口自定义入参 */
-  params?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-}
-
-/**
- * OssUpload props 参数
- */
-export interface IOssUploadProps {
-  /** axios 实例 */
-  axios?: typeof axios;
-  /** axios 配置参数 */
-  axiosConf?: Object;
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** 获取配置的接口自定义入参 */
-  signatureParams?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-}
-
-export interface IUploadOpt {
-  fileName?: string;
-  /** axios 实例 */
-  axios?: typeof axios;
-  /** axios 配置参数 */
-  axiosConf?: Object;
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** 获取配置的接口自定义入参 */
-  params?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-  /** 文件上传的接口自定义入参 */
-  ossParams?: {};
-  /** 是否使用 hash 文件名 */
-  useHashName?: boolean;
-  /**缩略图参数 */
-  thumbnailParams?: string
-}
-
-export function getSignature(opt: IGetSignatureOpt = {}) {
-  const { serverUrl = "/api/v1/user/oss/getWebOssConfig" } = opt;
-  // 减 10 秒，避免发起请求时 刚好过期的情况
-  if (
-    window._$ossSignatureRes &&
-    serverUrl === window._$ossSignatureRes.serverUrl &&
-    dayjs().valueOf() - window._$ossSignatureRes.__saveTime < window._$ossSignatureRes.expireTimeMilles - 10000
-  ) {
-    return Promise.resolve(window._$ossSignatureRes);
-  }
-  const { axios: _ax = axios, params = {}, axiosConf } = opt;
-  // 处理 dir 格式，必须为非 / 开头， /  结尾。如： test/
-  params.dir = formatDirStr(params.dir);
-
-  return _ax
-    .get(serverUrl, {
-      ...axiosConf,
-      params: {
-        isPublic: 1,
-        ...params,
-      },
-    })
-    .then((res) => {
-      window._$ossSignatureRes = res?.data?.data ?? res?.data ?? res;
-      if (window._$ossSignatureRes) {
-        window._$ossSignatureRes.__saveTime = dayjs().valueOf();
-        window._$ossSignatureRes.serverUrl = serverUrl;
-      }
-      return window._$ossSignatureRes;
-    });
-}
-
-/**
- * oss 上传工具类
- */
-class OssUploadUtil {
-  /** axios 实例 */
-  axios: typeof axios;
-  /** axios 配置参数 */
-  axiosConf: Object;
-  /** 获取配置的接口地址 */
-  serverUrl: string;
-  /** 获取配置的接口自定义入参 */
-  signatureParams?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-
-  constructor(props: IOssUploadProps = {}) {
-    this.axios = props.axios || axios;
-    this.axiosConf = props.axiosConf || {};
-    this.serverUrl = props.serverUrl || "/api/v1/user/oss/getWebOssConfig";
-    this.signatureParams = props.signatureParams || {};
-  }
-
-  getSignature(serverUrl = this.serverUrl, opt) {
-    return this._getSignature(serverUrl, opt);
-  }
-
-  upload(file, opt: IUploadOpt = {}): Promise<{ fileUrl: string }> {
-    return this._upload(file, { ...opt });
-  }
-
-  _getSignature(serverUrl = this.serverUrl, opt) {
-    return getSignature({
-      ...opt,
-      serverUrl,
-      axios: opt?.axios || this.axios,
-      axiosConf: { ...this.axiosConf, ...opt?.axiosConf },
-    });
-  }
-
-  _upload(file, opt: IUploadOpt = {}): Promise<{ fileUrl: string }> {
-    return new Promise(async (resolve, reject) => {
-      const ossParams = await this._getSignature(opt.serverUrl || this.serverUrl, {
-        ...opt,
-        params: { ...this.signatureParams, ...opt.params },
-      });
-
-      const { ossParams: propOssParams, fileName } = opt || {};
-      const formData = new FormData();
-      // key 表示上传到 Bucket 内的 Object 的完整路径，例如 exampledir/exampleobject.txtObject，完整路径中不能包含 Bucket 名称。
-      // filename 表示待上传的本地文件名称。
-      const filename = fileName || file.name;
-      const key = `${ossParams?.dir}${filename}`;
-      formData.set("key", key);
-      formData.set("OSSAccessKeyId", ossParams.accessid);
-      formData.set("policy", ossParams.policy);
-      formData.set("Signature", ossParams.signature);
-      if (ossParams.callback) {
-        formData.set("callback", ossParams.callback);
-      }
-      // @ts-ignore
-      formData.set("success_action_status", 200);
-      formData.set("file", file);
-
-      if (propOssParams) {
-        for (const key in propOssParams) {
-          if (Object.hasOwnProperty.call(propOssParams, key)) {
-            formData.set(key, propOssParams[key]);
-          }
-        }
-      }
-
-      const _axios = opt?.axios || this.axios;
-
-      return _axios
-        .post(ossParams.host, formData, { ...this.axiosConf, ...opt?.axiosConf })
-        .then((res) => {
-          if (opt?.signatureParams?.isPublic === 1) {
-            res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${opt?.thumbnailParams ? '?' + opt?.thumbnailParams : ""}`
-          }
-          resolve(res);
-          return res;
-        })
-        .catch((err) => {
-          console.error("oss upload err", err);
-          reject(err);
-          return Promise.reject(err);
-        });
-    });
-  }
-}
-
-export { axios };
-
-export default OssUploadUtil;
+import dayjs from "dayjs";
+
+import { axios } from "@hzab/data-model";
+import { formatDirStr } from "./uploadUtils";
+
+/**
+ * getSignature 配置
+ */
+export interface IGetSignatureOpt {
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** axios 实例 */
+  axios?: typeof axios;
+  /** axios 配置参数 */
+  axiosConf?: Object;
+  /** 获取配置的接口自定义入参 */
+  params?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+}
+
+/**
+ * OssUpload props 参数
+ */
+export interface IOssUploadProps {
+  /** axios 实例 */
+  axios?: typeof axios;
+  /** axios 配置参数 */
+  axiosConf?: Object;
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** 获取配置的接口自定义入参 */
+  signatureParams?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+}
+
+export interface IUploadOpt {
+  fileName?: string;
+  /** axios 实例 */
+  axios?: typeof axios;
+  /** axios 配置参数 */
+  axiosConf?: Object;
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** 获取配置的接口自定义入参 */
+  params?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+  /**
+   * 获取配置接口请求入参
+   */
+  signatureParams?: {
+    /** 公开还是私有 */
+    isPublic?: number;
+  };
+  /** 文件上传的接口自定义入参 */
+  ossParams?: {};
+  /** 是否使用 hash 文件名 */
+  useHashName?: boolean;
+  /**缩略图参数 */
+  thumbnailParams?: string;
+}
+
+export function getSignature(opt: IGetSignatureOpt = {}) {
+  const { serverUrl = "/api/v1/user/oss/getWebOssConfig" } = opt;
+  // 减 10 秒，避免发起请求时 刚好过期的情况
+  if (
+    window._$ossSignatureRes &&
+    serverUrl === window._$ossSignatureRes.serverUrl &&
+    dayjs().valueOf() - window._$ossSignatureRes.__saveTime < window._$ossSignatureRes.expireTimeMilles - 10000
+  ) {
+    return Promise.resolve(window._$ossSignatureRes);
+  }
+  const { axios: _ax = axios, params = {}, axiosConf } = opt;
+  // 处理 dir 格式，必须为非 / 开头， /  结尾。如： test/
+  params.dir = formatDirStr(params.dir);
+
+  return _ax
+    .get(serverUrl, {
+      ...axiosConf,
+      params: {
+        isPublic: 1,
+        ...params,
+      },
+    })
+    .then((res) => {
+      window._$ossSignatureRes = res?.data?.data ?? res?.data ?? res;
+      if (window._$ossSignatureRes) {
+        window._$ossSignatureRes.__saveTime = dayjs().valueOf();
+        window._$ossSignatureRes.serverUrl = serverUrl;
+      }
+      return window._$ossSignatureRes;
+    });
+}
+
+/**
+ * oss 上传工具类
+ */
+class OssUploadUtil {
+  /** axios 实例 */
+  axios: typeof axios;
+  /** axios 配置参数 */
+  axiosConf: Object;
+  /** 获取配置的接口地址 */
+  serverUrl: string;
+  /** 获取配置的接口自定义入参 */
+  signatureParams?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+
+  constructor(props: IOssUploadProps = {}) {
+    this.axios = props.axios || axios;
+    this.axiosConf = props.axiosConf || {};
+    this.serverUrl = props.serverUrl || "/api/v1/user/oss/getWebOssConfig";
+    this.signatureParams = props.signatureParams || {};
+  }
+
+  getSignature(serverUrl = this.serverUrl, opt) {
+    return this._getSignature(serverUrl, opt);
+  }
+
+  upload(file, opt: IUploadOpt = {}): Promise<{ fileUrl: string }> {
+    return this._upload(file, { ...opt });
+  }
+
+  _getSignature(serverUrl = this.serverUrl, opt) {
+    return getSignature({
+      ...opt,
+      serverUrl,
+      axios: opt?.axios || this.axios,
+      axiosConf: { ...this.axiosConf, ...opt?.axiosConf },
+    });
+  }
+
+  _upload(file, opt: IUploadOpt = {}): Promise<{ fileUrl: string }> {
+    return new Promise(async (resolve, reject) => {
+      const ossParams = await this._getSignature(opt.serverUrl || this.serverUrl, {
+        ...opt,
+        params: { ...this.signatureParams, ...opt.params },
+      });
+
+      const { ossParams: propOssParams, fileName } = opt || {};
+      const formData = new FormData();
+      // key 表示上传到 Bucket 内的 Object 的完整路径，例如 exampledir/exampleobject.txtObject，完整路径中不能包含 Bucket 名称。
+      // filename 表示待上传的本地文件名称。
+      const filename = fileName || file.name;
+      const key = `${ossParams?.dir}${filename}`;
+      formData.set("key", key);
+      formData.set("OSSAccessKeyId", ossParams.accessid);
+      formData.set("policy", ossParams.policy);
+      formData.set("Signature", ossParams.signature);
+      if (ossParams.callback) {
+        formData.set("callback", ossParams.callback);
+      }
+      // @ts-ignore
+      formData.set("success_action_status", 200);
+      formData.set("file", file);
+
+      if (propOssParams) {
+        for (const key in propOssParams) {
+          if (Object.hasOwnProperty.call(propOssParams, key)) {
+            formData.set(key, propOssParams[key]);
+          }
+        }
+      }
+
+      const _axios = opt?.axios || this.axios;
+
+      return _axios
+        .post(ossParams.host, formData, { ...this.axiosConf, ...opt?.axiosConf })
+        .then((res) => {
+          if (opt?.signatureParams?.isPublic === 1) {
+            res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${
+              opt?.thumbnailParams ? "?" + opt?.thumbnailParams : ""
+            }`;
+          }
+          resolve(res);
+          return res;
+        })
+        .catch((err) => {
+          console.error("oss upload err", err);
+          reject(err);
+          return Promise.reject(err);
+        });
+    });
+  }
+}
+
+export { axios };
+
+export default OssUploadUtil;

package/src/upload/uploadUtils.ts

@@ -3,7 +3,8 @@ import dayjs from "dayjs";
 import { getArr } from "../array";
 import { isBase64Str } from "../base64Str";
 
-import { mergeFileName, getFileName } from "../file/fileName";
+import { mergeFileName, getFileName, getFileNameExt } from "../file/fileName";
+import { getFileTypeExt } from "../file/fileType";
 import { nanoidNumALetters } from "../nanoid";
 
 /**
@@ -54,30 +55,6 @@ export function getPreviewUrl(uri, previewConfig) {
   return uri;
 }
 
-
-export const getFileNameExt = function (fileName,) {
-  const regex = /^(.*)\.([^.]+)$/;
-  const result = fileName.match(regex);
-  if (result) {
-    const [, mainPart, ext] = result;
-    return {
-      mainPart,
-      ext
-    }
-  }
-  return {
-    mainPart: fileName,
-    ext: ""
-  }
-};
-
-export const getFileTypeExt = function (type,) {
-  if (type.indexOf("/") >= 0) {
-    return type?.match(/[^\/]*\/([^\/]+)$/)?.[1]
-  };
-  return type;
-};
-
 /**
  * 根据 file 对象获取文件名称，文件名称包含：初始名称、类型
  * 数据存储格式 ~k[key]-[data]~ 如： ~ktime-1743649562530~
@@ -85,31 +62,27 @@ export const getFileTypeExt = function (type,) {
  * @param file
  */
 export const getFileNameByFileObj = (file, opt: any) => {
-
   const {
     useHashName = true,
-    params: { fileName = "" } = {}  // 给 params 加默认空对象
+    params: { fileName = "" } = {}, // 给 params 加默认空对象
   } = opt || {};
 
-  const { mainPart,
-    ext } = getFileNameExt(file.name || "");
+  const _fullFileName = file.name || fileName || "";
+  const { mainPart, ext } = getFileNameExt(_fullFileName);
 
-  const type = ext || getFileTypeExt(file.type || file.contentType);
+  console.log("getFileTypeExt(file.type)", file.type, getFileTypeExt(file.type));
 
-  const _fileName = fileName || mainPart || getFileName(file.url) || "oss";
+  const _fileName = mainPart || _fullFileName || getFileName(file.url) || "file";
+  const _ext = ext || getFileTypeExt(file.type);
 
   if (_fileName.indexOf("~kid-") >= 0) {
     return _fileName;
   }
 
-  const objStr = setFileNameObj({
-    t: file.createTime || dayjs().valueOf(),
-    ext: file.ext || (file.type || file.contentType)?.replace("/", "_"),
-  });
-  const hashStr = useHashName ? `${nanoidNumALetters()}-` : "";
-  const nm = mergeFileName(_fileName + "." + type, `~kid-${hashStr}${objStr}`);
+  const hashStr = useHashName ? nanoidNumALetters() : "";
+  const nm = mergeFileName(_fileName + "." + _ext, `~kid-${hashStr}-${file.createTime || dayjs().valueOf()}-${ext}`);
 
-  return nm
+  return nm;
 };
 
 /**