@hzab/utils 1.0.9 → 1.0.10-beta

package/changelog.md

@@ -1,3 +1,7 @@
+# @hzab/utils@1.0.10
+
+feat:缩略图全局配置
+
 # @hzab/utils@1.0.9
 
 fix:获取文件后缀名

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/utils",
-  "version": "1.0.9",
+  "version": "1.0.10-beta",
   "description": "utils",
   "main": "src",
   "scripts": {

package/src/globalConfig.ts

@@ -0,0 +1,15 @@
+window.utilsGlobalServeConfig = {}
+/** 获取全局配置（url、是否显示缩略图地址） */
+export function getGlobalServeConfig() {
+  return window.utilsGlobalServeConfig || {}
+}
+/** 设置全局配置（url、是否显示缩略图地址）*/
+export function setGlobalServeConfigs(data) {
+  Object.assign(window.utilsGlobalServeConfig || {}, data);
+  return window.utilsGlobalServeConfig || {}
+}
+/** 设置全局单个配置（url、是否显示缩略图地址）*/
+export function setGlobalServeConfig(key, data) {
+  window.utilsGlobalServeConfig[key] = data
+  return window.utilsGlobalServeConfig || {}
+}

package/src/upload/OssUploadUtil.ts

@@ -2,6 +2,7 @@ import dayjs from "dayjs";
 
 import { axios } from "@hzab/data-model";
 import { formatDirStr } from "./uploadUtils";
+import { getGlobalServeConfig } from "../globalConfig"
 const isPublicMap = {
   0: "&",
   1: "?"
@@ -75,7 +76,7 @@ export interface IUploadOpt {
 }
 
 export function getSignature(opt: IGetSignatureOpt = {}) {
-  const { serverUrl = "/api/v1/common/oss/getWebOssConfig" } = opt;
+  const { serverUrl = getGlobalServeConfig()?.serverUrl || "/api/v1/user/oss/getWebOssConfig" } = opt;
   // 减 10 秒，避免发起请求时 刚好过期的情况
   if (
     window._$ossSignatureRes &&
@@ -127,7 +128,7 @@ class OssUploadUtil {
   constructor(props: IOssUploadProps = {}) {
     this.axios = props.axios || axios;
     this.axiosConf = props.axiosConf || {};
-    this.serverUrl = props.serverUrl || "/api/v1/common/oss/getWebOssConfig";
+    this.serverUrl = props.serverUrl || getGlobalServeConfig()?.serverUrl || "/api/v1/user/oss/getWebOssConfig";
     this.signatureParams = props.signatureParams || {};
   }
 
@@ -185,7 +186,9 @@ class OssUploadUtil {
       return _axios
         .post(ossParams.host, formData, { ...this.axiosConf, ...opt?.axiosConf })
         .then((res) => {
-          res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${opt?.thumbnailParams ? isPublicMap[opt?.signatureParams?.isPublic] + opt?.thumbnailParams : ""}`;
+          if (getGlobalServeConfig()?.showThumbnail) {
+            res.data.data.thumbnailUrl = `${res?.data?.data?.fileUrl}${opt?.thumbnailParams ? isPublicMap[opt?.signatureParams?.isPublic] + opt?.thumbnailParams : ""}`;
+          }
           resolve(res);
           return res;
         })

package/src/url.ts

@@ -1,120 +1,123 @@
-/**
- * 替换 search 字符串
- * @param url
- * @param search
- * @returns
- */
-export function replaceSearch(url, search) {
-  if (!url || typeof url !== "string") {
-    console.warn("Warn handleUrlQuery: 请传入正确的 url 字符串");
-    return url;
-  }
-  let _url = fixUrlQuery(url);
-
-  const hashIdx = _url.indexOf("#");
-  const queryIdx = _url.indexOf("?");
-  let hash = "";
-  let resUrl = _url;
-  if (queryIdx >= 0) {
-    resUrl = _url.slice(0, queryIdx);
-  }
-  if (hashIdx >= 0) {
-    hash = _url.slice(hashIdx);
-  }
-
-  resUrl += search?.indexOf("?") >= 0 ? "" : "?";
-  resUrl += search;
-  resUrl += hash;
-
-  return resUrl;
-}
-
-/**
- * 把对象转为 query 参数
- * @param query
- */
-export function objToSearch(query, hasQuery) {
-  if (!query || typeof query !== "object") {
-    console.warn("Warn objToSearch: 请传入正确的对象");
-    return;
-  }
-  let search = hasQuery ? "?" : "";
-  Object.keys(query).forEach((key) => {
-    if (search && search != "?") {
-      search += "&";
-    }
-    search += key;
-    search += "=";
-    search += query[key];
-  });
-  return search;
-}
-
-/**
- * 修复 query，解决 query 在 hash 后面的情况
- * @param url
- * @returns
- * 源数据：/#/login?a=1&b=2
- * 结果：/?a=1&b=2#/login
- */
-export function fixUrlQuery(url) {
-  if (!url || typeof url !== "string") {
-    console.warn("Warn handleUrlQuery: 请传入正确的 url 字符串");
-    return url;
-  }
-  const hashIdx = url.indexOf("#");
-  const queryIdx = url.indexOf("?");
-
-  // 双 query 情况
-  if (queryIdx < hashIdx) {
-    let hash = url.slice(hashIdx);
-    const hashQueryIdx = hash.indexOf("?");
-    if (hashQueryIdx >= 0) {
-      const _url = url.slice(0, queryIdx);
-      const urlQuery = url.slice(queryIdx, hashIdx)?.replace(/\/$/, "");
-      const hashQuery = hash.slice(hashQueryIdx)?.replace("?", "")?.replace(/\/$/, "");
-      hash = hash.slice(0, hashQueryIdx);
-      return `${_url}${urlQuery}&${hashQuery}${hash}`;
-    }
-    return url;
-  }
-
-  // query 在 hash # 之后
-  if (queryIdx >= 0 && hashIdx >= 0 && queryIdx > hashIdx) {
-    const hash = url.slice(hashIdx, queryIdx);
-    const search = url.slice(queryIdx);
-    return `${url.slice(0, hashIdx)}${search}${hash}`;
-  }
-  return url;
-}
-
-/**
- * 获取 url 中的 query 值的对象
- * @param query
- */
-export function searchToObj(url) {
-  if (!url || typeof url !== "string") {
-    console.warn("Warn getSearchParams: 请传入正确的 url 字符串.");
-    return;
-  }
-  let _url = fixUrlQuery(url)
-    // 解决 query 在 /# 之前导致 query 参数多了 / 的问题
-    .replace("/#", "#");
-  const queryIdx = _url.indexOf("?");
-  const hashIdx = _url.indexOf("#");
-  if (queryIdx < 0) {
-    return;
-  }
-  // 去除 hash 相关数据及 query 的 "?"
-  if (hashIdx >= 0 && queryIdx >= 0) {
-    _url = _url.slice(queryIdx + 1, hashIdx);
-  } else if (queryIdx >= 0) {
-    _url = _url.slice(queryIdx + 1);
-  }
-  const res = {};
-  _url.split("&")?.forEach((it) => {
-    const arr = it.split("=");
-    res[arr[0]] = arr[1];
-  });
-  return res;
-}
+/**
+ * 替换 search 字符串
+ * @param url
+ * @param search
+ * @returns
+ */
+export function replaceSearch(url, search) {
+  if (!url || typeof url !== "string") {
+    console.warn("Warn handleUrlQuery: 请传入正确的 url 字符串");
+    return url;
+  }
+  let _url = fixUrlQuery(url);
+
+  const hashIdx = _url.indexOf("#");
+  const queryIdx = _url.indexOf("?");
+  let hash = "";
+  let resUrl = _url;
+  if (queryIdx >= 0) {
+    resUrl = _url.slice(0, queryIdx);
+  }
+  if (hashIdx >= 0) {
+    hash = _url.slice(hashIdx);
+  }
+
+  resUrl += search?.indexOf("?") >= 0 ? "" : "?";
+  resUrl += search;
+  resUrl += hash;
+
+  return resUrl;
+}
+
+/**
+ * 把对象转为 query 参数
+ * @param query
+ */
+export function objToSearch(query, hasQuery) {
+  if (!query || typeof query !== "object") {
+    console.warn("Warn objToSearch: 请传入正确的对象");
+    return;
+  }
+  let search = hasQuery ? "?" : "";
+  Object.keys(query).forEach((key) => {
+    if (search && search != "?") {
+      search += "&";
+    }
+    search += key;
+    search += "=";
+    search += query[key];
+  });
+  return search;
+}
+
+/**
+ * 修复 query，解决 query 在 hash 后面的情况
+ * @param url
+ * @returns
+ * 源数据：/#/login?a=1&b=2
+ * 结果：/?a=1&b=2#/login
+ */
+export function fixUrlQuery(url) {
+  if (!url || typeof url !== "string") {
+    console.warn("Warn handleUrlQuery: 请传入正确的 url 字符串");
+    return url;
+  }
+  const hashIdx = url.indexOf("#");
+  const queryIdx = url.indexOf("?");
+
+  // 双 query 情况
+  if (queryIdx < hashIdx) {
+    let hash = url.slice(hashIdx);
+    const hashQueryIdx = hash.indexOf("?");
+    if (hashQueryIdx >= 0) {
+      const _url = url.slice(0, queryIdx);
+      const urlQuery = url.slice(queryIdx, hashIdx)?.replace(/\/$/, "");
+      const hashQuery = hash.slice(hashQueryIdx)?.replace("?", "")?.replace(/\/$/, "");
+      hash = hash.slice(0, hashQueryIdx);
+      return `${_url}${urlQuery}&${hashQuery}${hash}`;
+    }
+    return url;
+  }
+
+  // query 在 hash # 之后
+  if (queryIdx >= 0 && hashIdx >= 0 && queryIdx > hashIdx) {
+    const hash = url.slice(hashIdx, queryIdx);
+    const search = url.slice(queryIdx);
+    return `${url.slice(0, hashIdx)}${search}${hash}`;
+  }
+  return url;
+}
+
+/**
+ * 获取 url 中的 query 值的对象
+ * @param query
+ */
+export function searchToObj(url) {
+  if (!url || typeof url !== "string") {
+    console.warn("Warn getSearchParams: 请传入正确的 url 字符串.");
+    return;
+  }
+  let _url = fixUrlQuery(url)
+    // 解决 query 在 /# 之前导致 query 参数多了 / 的问题
+    .replace("/#", "#");
+  const queryIdx = _url.indexOf("?");
+  const hashIdx = _url.indexOf("#");
+  if (queryIdx < 0) {
+    return;
+  }
+  // 去除 hash 相关数据及 query 的 "?"
+  if (hashIdx >= 0 && queryIdx >= 0) {
+    _url = _url.slice(queryIdx + 1, hashIdx);
+  } else if (queryIdx >= 0) {
+    _url = _url.slice(queryIdx + 1);
+  }
+  const res = {};
+  _url.split("&")?.forEach((it) => {
+    const arr = it.split("=");
+    res[arr[0]] = arr[1];
+  });
+  return res;
+}
+
+
+