@hzab/utils 1.0.14 → 1.0.16

package/changelog.md

@@ -1,3 +1,11 @@
+# @hzab/utils@1.0.16
+
+feat: 图片链接添加 query
+
+# @hzab/utils@1.0.15
+
+feat: 二维码，创建路径，区分前缀
+
 # @hzab/utils@1.0.14
 
 feat: 添加压缩图片函数

package/package.json

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

package/src/img-utils.ts

@@ -454,3 +454,5 @@ export function smartImageCompress(blob, maxSize) {
 
 
 
+
+

package/src/scan-qr.ts

@@ -64,7 +64,7 @@ const setCodeInfo = async (
   try {
     const id = nanoidUrl();
     const file = objToBlob(value) as File;
-    const ossUploader = new OssUploads();
+    const ossUploader = new OssUploads({signatureParams: {withoutPrefix: true}});
     const uploadResult = await ossUploader.upload(file, {
       fileName: id,
       params: {

package/src/upload/OssUploadUtil.ts

@@ -1,214 +1,218 @@
-import dayjs from "dayjs";
-import { Axios, AxiosResponse, AxiosRequestConfig } from "axios";
-
-import { axios } from "@hzab/data-model";
-import { formatDirStr } from "./uploadUtils";
-import { getGlobalServeConfig } from "../globalConfig";
-const isPublicMap = {
-  0: "&",
-  1: "?",
-};
-/**
- * getSignature 配置
- */
-export interface IGetSignatureOpt {
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** axios 实例 */
-  axios?: Axios;
-  /** axios 配置参数 */
-  axiosConf?: AxiosRequestConfig;
-  /** 获取配置的接口自定义入参 */
-  params?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-}
-
-/**
- * OssUpload props 参数
- */
-export interface IOssUploadProps {
-  /** axios 实例 */
-  axios?: Axios;
-  /** axios 配置参数 */
-  axiosConf?: AxiosRequestConfig;
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** 获取配置的接口自定义入参 */
-  signatureParams?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-}
-
-export interface IUploadOpt {
-  fileName?: string;
-  /** axios 实例 */
-  axios?: Axios;
-  /** axios 配置参数 */
-  axiosConf?: AxiosRequestConfig;
-  /** 获取配置的接口地址 */
-  serverUrl?: string;
-  /** 获取配置的接口自定义入参 */
-  params?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-  /**
-   * 获取配置接口请求入参
-   */
-  signatureParams?: {
-    /** 公开还是私有 */
-    isPublic?: number;
-  };
-  /** 文件上传的接口自定义入参 */
-  ossParams?: {};
-  /** 是否使用 hash 文件名 */
-  useHashName?: boolean;
-  /**缩略图参数 */
-  thumbnailParams?: string;
-}
-
-export interface ResponseData extends AxiosResponse {
-  fileUrl: string;
-  thumbnailUrl?: string;
-}
-
-export function getSignature(opt: IGetSignatureOpt = {}) {
-  const { serverUrl = getGlobalServeConfig()?.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: Axios;
-  /** axios 配置参数 */
-  axiosConf: AxiosRequestConfig;
-  /** 获取配置的接口地址 */
-  serverUrl: string;
-  /** 获取配置的接口自定义入参 */
-  signatureParams?: {
-    /** 文件路径 */
-    dir?: string;
-    /** 是否是公开库 */
-    isPublic?: number;
-  };
-
-  constructor(props: IOssUploadProps = {}) {
-    this.axios = props.axios || axios;
-    this.axiosConf = props.axiosConf || {};
-    this.serverUrl = props.serverUrl || getGlobalServeConfig()?.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: ResponseData) => {
-          if (getGlobalServeConfig()?.showThumbnail) {
-            res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${
-              opt?.thumbnailParams ? isPublicMap[opt?.signatureParams?.isPublic] + 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, AxiosResponse, AxiosRequestConfig } from "axios";
+
+import { axios } from "@hzab/data-model";
+import { formatDirStr } from "./uploadUtils";
+import { getGlobalServeConfig } from "../globalConfig";
+const isPublicMap = {
+  0: "&",
+  1: "?",
+};
+/**
+ * getSignature 配置
+ */
+export interface IGetSignatureOpt {
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** axios 实例 */
+  axios?: Axios;
+  /** axios 配置参数 */
+  axiosConf?: AxiosRequestConfig;
+  /** 获取配置的接口自定义入参 */
+  params?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+}
+
+/**
+ * OssUpload props 参数
+ */
+export interface IOssUploadProps {
+  /** axios 实例 */
+  axios?: Axios;
+  /** axios 配置参数 */
+  axiosConf?: AxiosRequestConfig;
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** 获取配置的接口自定义入参 */
+  signatureParams?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+    /** 是否无前缀 */
+    withoutPrefix?: boolean;
+  };
+}
+
+export interface IUploadOpt {
+  fileName?: string;
+  /** axios 实例 */
+  axios?: Axios;
+  /** axios 配置参数 */
+  axiosConf?: AxiosRequestConfig;
+  /** 获取配置的接口地址 */
+  serverUrl?: string;
+  /** 获取配置的接口自定义入参 */
+  params?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+  };
+  /**
+   * 获取配置接口请求入参
+   */
+  signatureParams?: {
+    /** 公开还是私有 */
+    isPublic?: number;
+  };
+  /** 文件上传的接口自定义入参 */
+  ossParams?: {};
+  /** 是否使用 hash 文件名 */
+  useHashName?: boolean;
+  /**缩略图参数 */
+  thumbnailParams?: string;
+}
+
+export interface ResponseData extends AxiosResponse {
+  fileUrl: string;
+  thumbnailUrl?: string;
+}
+
+export function getSignature(opt: IGetSignatureOpt = {}) {
+  const { serverUrl = getGlobalServeConfig()?.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: Axios;
+  /** axios 配置参数 */
+  axiosConf: AxiosRequestConfig;
+  /** 获取配置的接口地址 */
+  serverUrl: string;
+  /** 获取配置的接口自定义入参 */
+  signatureParams?: {
+    /** 文件路径 */
+    dir?: string;
+    /** 是否是公开库 */
+    isPublic?: number;
+    /** 是否无前缀 */
+    withoutPrefix?: boolean;
+  };
+
+  constructor(props: IOssUploadProps = {}) {
+    this.axios = props.axios || axios;
+    this.axiosConf = props.axiosConf || {};
+    this.serverUrl = props.serverUrl || getGlobalServeConfig()?.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: ResponseData) => {
+          if (getGlobalServeConfig()?.showThumbnail) {
+            res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${
+              opt?.thumbnailParams ? isPublicMap[opt?.signatureParams?.isPublic] + 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/url.ts

@@ -119,5 +119,16 @@ export function searchToObj(url) {
   return res;
 }
 
+/**
+ * 添加 url 中的 query 的参数
+ * @param url
+ * @param params
+ * @returns
+ */
+export function addQuery(url, params) {
+  const newObj = { ...searchToObj(url), ...params }
+  return replaceSearch(url, objToSearch(newObj, !!params))
+}
+