@hzab/utils 1.0.17 → 1.0.19

package/changelog.md

@@ -1,3 +1,11 @@
+# @hzab/utils@1.0.19
+
+fix: 修复图片后缀名-判断优化
+
+# @hzab/utils@1.0.18
+
+fix: 修复图片后缀名
+
 # @hzab/utils@1.0.17
 
 fix: scan-qr 引用路径修复

package/package.json

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

package/src/upload/uploadUtils.ts

@@ -1,164 +1,162 @@
-import dayjs from "dayjs";
-
-import { getArr } from "../array";
-import { isBase64Str } from "../base64Str";
-
-import { mergeFileName, getFileName, getFileNameExt } from "../file/fileName";
-import { getFileTypeExt } from "../file/fileType";
-import { nanoidNumALetters } from "../nanoid";
-
-/**
- * 格式化 dir 字符串，必须为非 / 开头， /  结尾。如： test/
- * @param {*} dir
- * @returns
- */
-export const formatDirStr = function (dir) {
-  return dir?.replace(/^\/(.*)\/*$/, "$1").replace(/(.?=*)\/*$/, "$1/");
-};
-
-/**
- * 合并 dir 字符串
- * @param {*} dir
- */
-export const mergeDirStr = function (dir1, dir2) {
-  return `${formatDirStr(dir1 || "")}${formatDirStr(dir2 || "")}`;
-};
-
-/**
- * 限制文件数量
- * @param fileList
- * @param maxCount
- * @returns
- */
-export function handleMaxCount(fileList, maxCount) {
-  let list = getArr(fileList);
-  if (maxCount > 0 && list.length > maxCount) {
-    list = list.slice(0, maxCount);
-  }
-  return list;
-}
-
-/**
- * 获取预览 url
- * @param {*} uri
- * @param {*} previewConfig
- * @returns
- */
-export function getPreviewUrl(uri, previewConfig) {
-  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(uri);
-  const query = previewConfig?.query ? "?" + previewConfig?.query : "";
-
-  if (isUriPattern) return `${uri}${query}`?.trim();
-
-  if (previewConfig) return `${previewConfig?.url}/${uri}${query}`?.trim();
-
-  return uri;
-}
-
-/**
- * 根据 file 对象获取文件名称，文件名称包含：初始名称、类型
- * 数据存储格式 ~k[key]-[data]~ 如： ~ktime-1743649562530~
- * key、data 中的 ~ 转为 _
- * @param file
- */
-export const getFileNameByFileObj = (file, opt: any) => {
-  const {
-    useHashName = true,
-    params: { fileName = "" } = {}, // 给 params 加默认空对象
-  } = opt || {};
-
-  const _fullFileName = file.name || fileName || "";
-  const { mainPart, ext } = getFileNameExt(_fullFileName);
-
-  console.log("getFileTypeExt(file.type)", file.type, getFileTypeExt(file.type));
-
-  const _fileName = mainPart || _fullFileName || getFileName(file.url) || "file";
-  const _ext = ext || getFileTypeExt(file.type);
-
-  if (_fileName.indexOf("~kid-") >= 0) {
-    return _fileName;
-  }
-
-  const hashStr = useHashName ? nanoidNumALetters() : "";
-  const nm = mergeFileName(_fileName + "." + _ext, `~kid-${hashStr}-${file.createTime || dayjs().valueOf()}-${ext}`);
-
-  return nm;
-};
-
-/**
- * 解析
- * @param url
- * @returns
- */
-export const getFileNameObj = function (url): any {
-  const list = url.match(/~k([^-~]+)-([^~]*)~/g);
-  const res = {};
-  list?.forEach((it) => {
-    const arr = it?.match(/~k([^-~]+)-([^~]*)~/);
-    if (arr?.length >= 3) {
-      res[arr[1]] = arr[2];
-    }
-  });
-  return res;
-};
-
-/**
- * 解析
- * @param url
- * @returns
- */
-export function setFileNameObj(obj) {
-  return Object.keys(obj)
-    .map((key) => {
-      return `~k${key?.replace(/~/g, "_")}-${obj[key]?.toString()?.replace(/~/g, "_")}~`;
-    })
-    .join("");
-}
-
-/**
- * 通过 key 获取对应的值
- * @param url
- * @param key
- * @returns
- */
-export const getValByKey = function (url, key) {
-  const reg = new RegExp(`~k${key?.replace(/~/g, "_")}-\([^~]*\)~`);
-  return url.match(reg)?.[1];
-};
-
-/**
- * 预览 url 添加前缀
- * @param {*} uri
- * @param {*} conf
- * @returns
- */
-export function mergePreviewConfig(uri, conf) {
-  let _uri = uri;
-  let basePath = "";
-  if (typeof _uri === "object") {
-    basePath = _uri.basePath;
-    _uri = _uri.previewUrl || _uri.url;
-  }
-  if (typeof _uri !== "string") {
-    return _uri;
-  }
-  _uri = _uri?.trim();
-  // base64 直接返回
-  if (isBase64Str(_uri)) {
-    return _uri;
-  }
-  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(_uri);
-  const query = conf?.query?.trim() ? "?" + conf?.query?.trim() : "";
-
-  if (isUriPattern) {
-    // 源地址为 http 地址，直接拼接 query 参数
-    return `${_uri}${query}`;
-  }
-
-  if (conf) {
-    // 拼接前缀
-    return `${conf?.url?.trim()?.replace(/\/$/, "")}/${_uri?.trim()?.replace(/^\//, "")}${query}`?.trim();
-  }
-
-  return _uri;
-}
+import dayjs from "dayjs";
+
+import { getArr } from "../array";
+import { isBase64Str } from "../base64Str";
+
+import { mergeFileName, getFileName, getFileNameExt } from "../file/fileName";
+import { getFileTypeExt } from "../file/fileType";
+import { nanoidNumALetters } from "../nanoid";
+
+/**
+ * 格式化 dir 字符串，必须为非 / 开头， /  结尾。如： test/
+ * @param {*} dir
+ * @returns
+ */
+export const formatDirStr = function (dir) {
+  return dir?.replace(/^\/(.*)\/*$/, "$1").replace(/(.?=*)\/*$/, "$1/");
+};
+
+/**
+ * 合并 dir 字符串
+ * @param {*} dir
+ */
+export const mergeDirStr = function (dir1, dir2) {
+  return `${formatDirStr(dir1 || "")}${formatDirStr(dir2 || "")}`;
+};
+
+/**
+ * 限制文件数量
+ * @param fileList
+ * @param maxCount
+ * @returns
+ */
+export function handleMaxCount(fileList, maxCount) {
+  let list = getArr(fileList);
+  if (maxCount > 0 && list.length > maxCount) {
+    list = list.slice(0, maxCount);
+  }
+  return list;
+}
+
+/**
+ * 获取预览 url
+ * @param {*} uri
+ * @param {*} previewConfig
+ * @returns
+ */
+export function getPreviewUrl(uri, previewConfig) {
+  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(uri);
+  const query = previewConfig?.query ? "?" + previewConfig?.query : "";
+
+  if (isUriPattern) return `${uri}${query}`?.trim();
+
+  if (previewConfig) return `${previewConfig?.url}/${uri}${query}`?.trim();
+
+  return uri;
+}
+
+/**
+ * 根据 file 对象获取文件名称，文件名称包含：初始名称、类型
+ * 数据存储格式 ~k[key]-[data]~ 如： ~ktime-1743649562530~
+ * key、data 中的 ~ 转为 _
+ * @param file
+ */
+export const getFileNameByFileObj = (file, opt: any) => {
+  const {
+    useHashName = true,
+    params: { fileName = "" } = {}, // 给 params 加默认空对象
+  } = opt || {};
+
+  const _fullFileName = file.name || fileName || "";
+  const { mainPart, ext } = getFileNameExt(_fullFileName);
+
+  console.log("getFileTypeExt(file.type)", file.type, getFileTypeExt(file.type));
+
+  const _fileName = mainPart || _fullFileName || getFileName(file.url) || "file";
+  const _ext = ext || getFileTypeExt(file.type);
+
+
+
+  const hashStr = useHashName ? nanoidNumALetters() : "";
+  const nm = mergeFileName(_fileName + "." + _ext, (_fileName.indexOf("~kid-") ? "" : `~kid-${hashStr}-${file.createTime || dayjs().valueOf()}-${ext}`));
+
+  return nm;
+};
+
+/**
+ * 解析
+ * @param url
+ * @returns
+ */
+export const getFileNameObj = function (url): any {
+  const list = url.match(/~k([^-~]+)-([^~]*)~/g);
+  const res = {};
+  list?.forEach((it) => {
+    const arr = it?.match(/~k([^-~]+)-([^~]*)~/);
+    if (arr?.length >= 3) {
+      res[arr[1]] = arr[2];
+    }
+  });
+  return res;
+};
+
+/**
+ * 解析
+ * @param url
+ * @returns
+ */
+export function setFileNameObj(obj) {
+  return Object.keys(obj)
+    .map((key) => {
+      return `~k${key?.replace(/~/g, "_")}-${obj[key]?.toString()?.replace(/~/g, "_")}~`;
+    })
+    .join("");
+}
+
+/**
+ * 通过 key 获取对应的值
+ * @param url
+ * @param key
+ * @returns
+ */
+export const getValByKey = function (url, key) {
+  const reg = new RegExp(`~k${key?.replace(/~/g, "_")}-\([^~]*\)~`);
+  return url.match(reg)?.[1];
+};
+
+/**
+ * 预览 url 添加前缀
+ * @param {*} uri
+ * @param {*} conf
+ * @returns
+ */
+export function mergePreviewConfig(uri, conf) {
+  let _uri = uri;
+  let basePath = "";
+  if (typeof _uri === "object") {
+    basePath = _uri.basePath;
+    _uri = _uri.previewUrl || _uri.url;
+  }
+  if (typeof _uri !== "string") {
+    return _uri;
+  }
+  _uri = _uri?.trim();
+  // base64 直接返回
+  if (isBase64Str(_uri)) {
+    return _uri;
+  }
+  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(_uri);
+  const query = conf?.query?.trim() ? "?" + conf?.query?.trim() : "";
+
+  if (isUriPattern) {
+    // 源地址为 http 地址，直接拼接 query 参数
+    return `${_uri}${query}`;
+  }
+
+  if (conf) {
+    // 拼接前缀
+    return `${conf?.url?.trim()?.replace(/\/$/, "")}/${_uri?.trim()?.replace(/^\//, "")}${query}`?.trim();
+  }
+
+  return _uri;
+}