@arcblock/ux 3.4.3 → 3.4.5

package/lib/Util/index.d.ts

@@ -123,3 +123,4 @@ export declare const compareVersions: (version1: string, version2: string) => bo
  */
 export declare const isSupportFollow: () => boolean;
 export declare const formatAxiosError: (err: AxiosError) => string;
+export declare const mergeIgnoreEmpty: (...objects: Array<Record<string, any>>) => any;

package/lib/Util/index.js

@@ -1,60 +1,61 @@
-import { lazy as T } from "react";
+import { lazy as V } from "react";
 import l from "lodash/padStart";
 import { colors as w, getDIDMotifInfo as j } from "@arcblock/did-motif";
-import { mergeAllThemeOptions as Ke } from "@blocklet/theme";
+import { mergeAllThemeOptions as qe } from "@blocklet/theme";
 import I from "lodash/isNil";
 import E from "lodash/omitBy";
-import v from "p-retry";
+import v from "lodash/mergeWith";
+import O from "p-retry";
 import m from "js-cookie";
-import O from "color-convert";
+import U from "color-convert";
 import a from "dayjs";
 import "dayjs/locale/zh-cn";
-import U from "dayjs/plugin/utc";
-import A from "dayjs/plugin/timezone";
-import F from "dayjs/plugin/relativeTime";
-import R from "dayjs/plugin/updateLocale";
+import A from "dayjs/plugin/utc";
+import F from "dayjs/plugin/timezone";
+import R from "dayjs/plugin/relativeTime";
+import W from "dayjs/plugin/updateLocale";
 import P from "dayjs/plugin/localizedFormat";
-import W from "semver";
-import { DID_PREFIX as L, BLOCKLET_SERVICE_PATH_PREFIX as C } from "./constant.js";
+import L from "semver";
+import { DID_PREFIX as C, BLOCKLET_SERVICE_PATH_PREFIX as M } from "./constant.js";
 import b from "../package.json.js";
-import { getFederatedEnabled as M } from "./federated.js";
+import { getFederatedEnabled as _ } from "./federated.js";
 let u = null;
-const _ = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/, N = /* @__PURE__ */ new Set(["co", "com", "net", "org", "gov", "edu", "ac"]), z = /* @__PURE__ */ new Set(["uk", "au", "cn", "nz", "za", "in", "br", "mx", "fr", "it", "ca"]);
-function B(e) {
+const N = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/, z = /* @__PURE__ */ new Set(["co", "com", "net", "org", "gov", "edu", "ac"]), B = /* @__PURE__ */ new Set(["uk", "au", "cn", "nz", "za", "in", "br", "mx", "fr", "it", "ca"]);
+function X(e) {
   if (!e)
     return !1;
   const t = e.split(".");
   if (t.length < 2) return !1;
-  const o = t[t.length - 2], r = t[t.length - 1];
-  return N.has(o) && z.has(r);
+  const r = t[t.length - 2], o = t[t.length - 1];
+  return z.has(r) && B.has(o);
 }
-function ye() {
+function be() {
   const { host: e } = window.location;
-  if (!e || _.test(e))
+  if (!e || N.test(e))
     return "";
-  const o = e.split(":")[0].split(".");
-  if (o.length === 1)
+  const r = e.split(":")[0].split(".");
+  if (r.length === 1)
     return "";
-  if (o.length > 2) {
-    const r = o.slice(-2).join(".");
-    if (B(r))
-      return `.${o.slice(-3).join(".")}`;
+  if (r.length > 2) {
+    const o = r.slice(-2).join(".");
+    if (X(o))
+      return `.${r.slice(-3).join(".")}`;
   }
-  return `.${o.slice(-2).join(".")}`;
+  return `.${r.slice(-2).join(".")}`;
 }
-function Ie(e) {
-  return e.replace(/^\?/, "").split("&").map((t) => t.split("=")).filter(([t]) => !!t).reduce((t, o) => {
-    const r = o[0], i = decodeURIComponent(o[1]) || !0;
-    return t[r] = i, t;
+function Se(e) {
+  return e.replace(/^\?/, "").split("&").map((t) => t.split("=")).filter(([t]) => !!t).reduce((t, r) => {
+    const o = r[0], i = decodeURIComponent(r[1]) || !0;
+    return t[o] = i, t;
   }, {});
 }
-function be(e = {}) {
+function De(e = {}) {
   return new URLSearchParams(e).toString();
 }
-function Se(e = 1) {
+function $e(e = 1) {
   let t = e;
   typeof t == "number" && (t = { expireInDays: t }), t.path === void 0 && (t.path = "/"), t.expireInDays || (t.expireInDays = 1);
-  const o = {
+  const r = {
     expires: t.expireInDays,
     path: t.path,
     domain: t.domain || "",
@@ -62,49 +63,49 @@ function Se(e = 1) {
     // 允许自定义设置为 false，默认是 true
     secure: t.secure !== !1
   };
-  return (typeof window > "u" || t.domain || t.returnDomain === !1) && t.returnDomain === !1 && delete o.domain, o;
+  return (typeof window > "u" || t.domain || t.returnDomain === !1) && t.returnDomain === !1 && delete r.domain, r;
 }
-const De = (e) => e.color ? e.color : e.dark ? e.theme.palette.common.white : e.theme.palette.text.primary, $e = (e) => e.background ? e.background : e.dark ? e.theme.palette.common.black : e.theme.palette.common.white;
-function ke(e, t, o = []) {
-  const r = Object.assign({}, e), i = t.defaultProps || {};
+const ke = (e) => e.color ? e.color : e.dark ? e.theme.palette.common.white : e.theme.palette.text.primary, xe = (e) => e.background ? e.background : e.dark ? e.theme.palette.common.black : e.theme.palette.common.white;
+function Te(e, t, r = []) {
+  const o = Object.assign({}, e), i = t.defaultProps || {};
   return Object.keys(i).forEach((n) => {
-    typeof r[n] == "string" && r[n].indexOf("::prop::") === 0 && (r[n] = i[n]);
-  }), Array.isArray(o) && o.forEach((n) => {
-    if (typeof r[n] == "string")
+    typeof o[n] == "string" && o[n].indexOf("::prop::") === 0 && (o[n] = i[n]);
+  }), Array.isArray(r) && r.forEach((n) => {
+    if (typeof o[n] == "string")
       try {
-        r[n] = JSON.parse(r[n]);
+        o[n] = JSON.parse(o[n]);
       } catch {
       }
-  }), Object.keys(r).forEach((n) => {
-    typeof r[n] == "string" && r[n].indexOf("::prop::") === 0 && (r[n] = "");
-  }), r;
+  }), Object.keys(o).forEach((n) => {
+    typeof o[n] == "string" && o[n].indexOf("::prop::") === 0 && (o[n] = "");
+  }), o;
 }
 function Ve(e = 2017) {
   const t = (/* @__PURE__ */ new Date()).getFullYear();
   return `${t}` == `${e}` ? `© ArcBlock ${t}` : `© ArcBlock ${e} - ${t}`;
 }
-const xe = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", Te = (e) => {
+const je = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", Ee = (e) => {
   let t = 0;
-  for (let r = 0; r < e.length; r++)
-    t = e.charCodeAt(r) + ((t << 5) - t);
-  let o = "#";
-  for (let r = 0; r < 3; r++) {
-    const i = t >> r * 8 & 255;
-    o += `00${i.toString(16)}`.substr(-2);
+  for (let o = 0; o < e.length; o++)
+    t = e.charCodeAt(o) + ((t << 5) - t);
+  let r = "#";
+  for (let o = 0; o < 3; o++) {
+    const i = t >> o * 8 & 255;
+    r += `00${i.toString(16)}`.substr(-2);
   }
-  return o;
-}, je = (e) => {
-  const t = Math.round(e / 1e3), o = Math.floor(t / 3600), r = Math.floor((t - o * 3600) / 60), i = t % 60;
-  return `${l(o, 2, "0")}:${l(r, 2, "0")}:${l(i, 2, "0")}`;
+  return r;
+}, ve = (e) => {
+  const t = Math.round(e / 1e3), r = Math.floor(t / 3600), o = Math.floor((t - r * 3600) / 60), i = t % 60;
+  return `${l(r, 2, "0")}:${l(o, 2, "0")}:${l(i, 2, "0")}`;
 };
-function X(e) {
+function J(e) {
   u = e;
 }
-function Ee() {
+function Oe() {
   return u;
 }
-const S = (e) => (t, { locale: o, tz: r, isUtc: i } = {}) => {
-  if (u === null && (a.extend(P), a.extend(U), a.extend(A), a.extend(R), a.extend(F), a.updateLocale("zh-cn", {
+const S = (e) => (t, { locale: r, tz: o, isUtc: i } = {}) => {
+  if (u === null && (a.extend(P), a.extend(A), a.extend(F), a.extend(W), a.extend(R), a.updateLocale("zh-cn", {
     // copy with https://github.com/iamkun/dayjs/blob/dev/src/locale/zh-cn.js
     relativeTime: {
       future: "%s后",
@@ -121,41 +122,41 @@ const S = (e) => (t, { locale: o, tz: r, isUtc: i } = {}) => {
       y: "1 年",
       yy: "%d 年"
     }
-  }), X(a)), I(t) || t === "")
+  }), J(a)), I(t) || t === "")
     return "-";
   let n = u(t);
-  return r && (n = n.tz(r)), i && (n = n.utc()), typeof o < "u" && (n = n.locale(o)), n.format(e);
+  return o && (n = n.tz(o)), i && (n = n.utc()), typeof r < "u" && (n = n.locale(r)), n.format(e);
 };
-function ve(e, { locale: t = "en", tz: o } = {}) {
-  return S("ll")(e, { locale: t, tz: o });
+function Ue(e, { locale: t = "en", tz: r } = {}) {
+  return S("ll")(e, { locale: t, tz: r });
 }
-function Oe(e, {
+function Ae(e, {
   locale: t = "en",
-  tz: o,
-  isUtc: r = !1,
+  tz: r,
+  isUtc: o = !1,
   format: i = "lll"
 } = {}) {
-  return S(i)(e, { locale: t, tz: o, isUtc: r });
+  return S(i)(e, { locale: t, tz: r, isUtc: o });
 }
-function J() {
+function K() {
   const e = window?.ABT_DEV || window.ABT;
   return e && typeof e.open == "function" ? e : null;
 }
-function Ue({
+function Fe({
   webWalletUrl: e,
   action: t = "login",
-  locale: o = "en",
-  url: r,
+  locale: r = "en",
+  url: o,
   windowFeatures: i,
   appInfo: n,
   memberAppInfo: f
 }) {
-  const h = J();
+  const h = K();
   if (h)
     return h.open({
       action: t,
-      locale: o,
-      url: encodeURIComponent(r),
+      locale: r,
+      url: encodeURIComponent(o),
       appInfo: {
         ...n
       },
@@ -173,41 +174,41 @@ function Ue({
     // iphone 8plus size
     width: 414,
     height: 736
-  }, $ = `${e}?action=${t}&locale=${o}&url=${encodeURIComponent(r)}`, c = Object.assign({}, D, i), k = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
+  }, $ = `${e}?action=${t}&locale=${r}&url=${encodeURIComponent(o)}`, c = Object.assign({}, D, i), k = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
   if (!("left" in c)) {
-    const s = k(window.top || window), x = window.screenLeft || window.screenX;
-    c.left = s + x - c.width;
+    const s = k(window.top || window), T = window.screenLeft || window.screenX;
+    c.left = s + T - c.width;
   }
   if (!("top" in c)) {
     const s = window.screenTop || window.screenY;
     c.top = s;
   }
-  const V = Object.keys(c).map((s) => `${s}=${c[s]}`).join(",");
-  return window.open($, "targetWindow", V), { type: "web" };
+  const x = Object.keys(c).map((s) => `${s}=${c[s]}`).join(",");
+  return window.open($, "targetWindow", x), { type: "web" };
 }
-const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) => {
-  const t = e.replace(L, "");
+const Re = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", Q = (e) => {
+  const t = e.replace(C, "");
   return !!/^(0x)?[0-9a-f]{40}$/i.test(t);
-}, Q = (e, t) => {
+}, Y = (e, t) => {
   if (!t)
     return e;
   try {
-    const o = new URL(e, window.location.origin);
-    return Object.keys(t).forEach((r) => {
-      o.searchParams.set(r, String(t[r]));
-    }), o.origin === window.location.origin ? o.pathname + o.search : o.href;
+    const r = new URL(e, window.location.origin);
+    return Object.keys(t).forEach((o) => {
+      r.searchParams.set(o, String(t[o]));
+    }), r.origin === window.location.origin ? r.pathname + r.search : r.href;
   } catch {
     return e;
   }
-}, Fe = (e, t = 48) => e && (e.indexOf(C) >= 0 ? Q(e, {
+}, We = (e, t = 48) => e && (e.indexOf(M) >= 0 ? Y(e, {
   imageFilter: "resize",
   w: t,
   h: t
-}) : e), Re = (e = 0) => new Promise((t) => {
+}) : e), Pe = (e = 0) => new Promise((t) => {
   setTimeout(() => {
     t();
   }, e);
-}), Pe = (e) => /^https?:\/\//.test(e), p = "vid", g = "__visitor_id", Y = () => m.get(p) || localStorage.getItem(g), y = (e) => {
+}), Le = (e) => /^https?:\/\//.test(e), p = "vid", g = "__visitor_id", q = () => m.get(p) || localStorage.getItem(g), y = (e) => {
   e === null ? m.remove(p, {
     sameSite: "None",
     secure: !0
@@ -216,10 +217,10 @@ const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) =
     secure: !0,
     expires: 365
   });
-}, We = () => {
+}, Ce = () => {
   let e = localStorage.getItem(g);
-  if (e && (localStorage.removeItem(g), y(e)), !Y()) {
-    if (!M())
+  if (e && (localStorage.removeItem(g), y(e)), !q()) {
+    if (!_())
       try {
         if (window.crypto && typeof window.crypto.randomUUID == "function")
           e = window.crypto.randomUUID();
@@ -228,15 +229,15 @@ const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) =
           if (window.crypto && typeof window.crypto.getRandomValues == "function")
             window.crypto.getRandomValues(t);
           else
-            for (let r = 0; r < 16; r++)
-              t[r] = Math.floor(Math.random() * 256);
-          const o = Array.from(t).map((r) => r.toString(16).padStart(2, "0"));
+            for (let o = 0; o < 16; o++)
+              t[o] = Math.floor(Math.random() * 256);
+          const r = Array.from(t).map((o) => o.toString(16).padStart(2, "0"));
           e = [
-            o.slice(0, 4).join(""),
-            o.slice(4, 6).join(""),
-            o.slice(6, 8).join(""),
-            o.slice(8, 10).join(""),
-            o.slice(10, 16).join("")
+            r.slice(0, 4).join(""),
+            r.slice(4, 6).join(""),
+            r.slice(6, 8).join(""),
+            r.slice(8, 10).join(""),
+            r.slice(10, 16).join("")
           ].join("-");
         }
       } catch {
@@ -244,11 +245,11 @@ const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) =
       }
     e && y(e);
   }
-}, Le = (e) => {
-  if (K(e)) {
+}, Me = (e) => {
+  if (Q(e)) {
     const t = Uint8Array.from(
-      e.slice(2).match(/.{1,2}/g).map((o) => parseInt(o, 16))
-    ).slice(0, 8).reduce((o, r) => o + r, 0) % w.length;
+      e.slice(2).match(/.{1,2}/g).map((r) => parseInt(r, 16))
+    ).slice(0, 8).reduce((r, o) => r + o, 0) % w.length;
     return w[t];
   }
   try {
@@ -256,14 +257,14 @@ const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) =
   } catch {
     return null;
   }
-}, Ce = (e, t, o = {}) => {
-  const { fallbackLocale: r = "en", defaultValue: i = "unknown" } = o;
+}, _e = (e, t, r = {}) => {
+  const { fallbackLocale: o = "en", defaultValue: i = "unknown" } = r;
   if (typeof e == "string")
     return e;
   let n;
-  return t && (n = e[t]), (!n || typeof n != "string") && (n = e[r]), (!n || typeof n != "string") && (n = i), n;
-}, Me = (e) => T(
-  () => v(
+  return t && (n = e[t]), (!n || typeof n != "string") && (n = e[o]), (!n || typeof n != "string") && (n = i), n;
+}, Ne = (e) => V(
+  () => O(
     async () => {
       try {
         return await e();
@@ -274,76 +275,77 @@ const Ae = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", K = (e) =
     // 只需要重试两次，加上原本的一次，总共三次
     { retries: 2 }
   )
-), _e = (e) => E(e, I);
-function Ne(e, t = 1) {
-  const [o, r, i] = O.hex.rgb(e);
-  return `rgba(${o}, ${r}, ${i}, ${t})`;
+), ze = (e) => E(e, I);
+function Be(e, t = 1) {
+  const [r, o, i] = U.hex.rgb(e);
+  return `rgba(${r}, ${o}, ${i}, ${t})`;
 }
-const q = () => window.blocklet?.serverVersion || window.env?.serverVersion || "", G = () => b.version, H = () => (b.dependencies?.["@blocklet/js-sdk"]).replace(/^[\^~>=<]+/, ""), d = (e, t) => {
-  const o = (n) => {
+const G = () => window.blocklet?.serverVersion || window.env?.serverVersion || "", H = () => b.version, Z = () => (b.dependencies?.["@blocklet/js-sdk"]).replace(/^[\^~>=<]+/, ""), d = (e, t) => {
+  const r = (n) => {
     const f = n.match(/^(\d+\.\d+\.\d+(?:-[^-]+?-\d{8}))/);
     return f ? f[1] : n;
   };
   if (!e || !t)
     return !1;
-  const r = o(e), i = o(t);
-  if (r === i && e !== t)
+  const o = r(e), i = r(t);
+  if (o === i && e !== t)
     return !1;
   try {
-    return W.gte(r, i);
+    return L.gte(o, i);
   } catch {
     return !1;
   }
-}, ze = () => {
+}, Xe = () => {
   if (process.env.NODE_ENV === "development")
     return !0;
-  const e = q(), t = G(), o = H();
-  if (!e || !t || !o)
+  const e = G(), t = H(), r = Z();
+  if (!e || !t || !r)
     return !1;
-  const r = d(t, "3.1.29"), i = d(e, "1.16.49-beta-20250822-070545-6d3344cc"), n = d(o, "1.16.49-beta-20250822-070545-6d3344cc");
-  return r && i && n;
-}, Be = (e) => {
+  const o = d(t, "3.1.29"), i = d(e, "1.16.49-beta-20250822-070545-6d3344cc"), n = d(r, "1.16.49-beta-20250822-070545-6d3344cc");
+  return o && i && n;
+}, Je = (e) => {
   const { response: t } = e;
   return t ? `Request failed: ${t.status} ${t.statusText}: ${JSON.stringify(t.data)}` : e.message || "Unknown error occurred";
-};
+}, Ke = (...e) => v({}, ...e, (t, r) => r === "" || r === null || r === void 0 ? t : r);
 export {
-  Q as appendParams,
-  _e as cleanedObj,
+  Y as appendParams,
+  ze as cleanedObj,
   d as compareVersions,
-  Ke as deepmergeAll,
-  J as detectWalletExtension,
-  We as ensureVisitorId,
-  Be as formatAxiosError,
-  ve as formatToDate,
-  Oe as formatToDatetime,
-  je as formatUptime,
-  $e as getBackground,
-  De as getColor,
-  Se as getCookieOptions,
+  qe as deepmergeAll,
+  K as detectWalletExtension,
+  Ce as ensureVisitorId,
+  Je as formatAxiosError,
+  Ue as formatToDate,
+  Ae as formatToDatetime,
+  ve as formatUptime,
+  xe as getBackground,
+  ke as getColor,
+  $e as getCookieOptions,
   Ve as getCopyright,
-  Le as getDIDColor,
-  Ee as getDateTool,
-  Ae as getFontSize,
-  H as getJsSdkVersion,
-  q as getServerVersion,
-  xe as getTimezone,
-  Ce as getTranslation,
-  Fe as getUserAvatar,
-  G as getUxPackageVersion,
-  Y as getVisitorId,
-  Ne as hexToRgba,
-  K as isEthereumDid,
-  ze as isSupportFollow,
-  B as isTwoSegmentTLD,
-  Pe as isUrl,
-  Me as lazyRetry,
-  ke as mergeProps,
-  Ue as openWebWallet,
-  Ie as parseQuery,
-  ye as resolveRootDomain,
-  X as setDateTool,
+  Me as getDIDColor,
+  Oe as getDateTool,
+  Re as getFontSize,
+  Z as getJsSdkVersion,
+  G as getServerVersion,
+  je as getTimezone,
+  _e as getTranslation,
+  We as getUserAvatar,
+  H as getUxPackageVersion,
+  q as getVisitorId,
+  Be as hexToRgba,
+  Q as isEthereumDid,
+  Xe as isSupportFollow,
+  X as isTwoSegmentTLD,
+  Le as isUrl,
+  Ne as lazyRetry,
+  Ke as mergeIgnoreEmpty,
+  Te as mergeProps,
+  Fe as openWebWallet,
+  Se as parseQuery,
+  be as resolveRootDomain,
+  J as setDateTool,
   y as setVisitorId,
-  Re as sleep,
-  Te as str2color,
-  be as stringifyQuery
+  Pe as sleep,
+  Ee as str2color,
+  De as stringifyQuery
 };

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const e = "3.4.3", s = { "@blocklet/js-sdk": "^1.17.7" }, n = {
+const e = "3.4.5", s = { "@blocklet/js-sdk": "^1.17.7" }, n = {
   version: e,
   dependencies: s
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -68,16 +68,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "ae0c70bbba7ce01ffcb01f12ecab135345cd08b3",
+  "gitHead": "a944f14b25e2fd8cd0e7e32b3c3ce276961e6b64",
   "dependencies": {
-    "@arcblock/bridge": "3.4.3",
+    "@arcblock/bridge": "3.4.5",
     "@arcblock/did": "^1.28.2",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.4.3",
-    "@arcblock/nft-display": "3.4.3",
-    "@arcblock/react-hooks": "3.4.3",
+    "@arcblock/icons": "3.4.5",
+    "@arcblock/nft-display": "3.4.5",
+    "@arcblock/react-hooks": "3.4.5",
     "@blocklet/js-sdk": "^1.17.7",
-    "@blocklet/theme": "3.4.3",
+    "@blocklet/theme": "3.4.5",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/Util/index.ts

@@ -5,6 +5,7 @@ import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
 import { mergeAllThemeOptions } from '@blocklet/theme';
 import isNil from 'lodash/isNil';
 import omitBy from 'lodash/omitBy';
+import mergeWith from 'lodash/mergeWith';
 import pRetry from 'p-retry';
 import Cookies from 'js-cookie';
 import colorConvert from 'color-convert';
@@ -748,3 +749,12 @@ export const formatAxiosError = (err: AxiosError) => {
 
   return err.message || 'Unknown error occurred';
 };
+
+export const mergeIgnoreEmpty = (...objects: Array<Record<string, any>>) => {
+  return mergeWith({}, ...objects, (objValue: any, srcValue: any) => {
+    if (srcValue === '' || srcValue === null || srcValue === undefined) {
+      return objValue; // 保留前面的值
+    }
+    return srcValue; // 使用后面的值
+  });
+};