@arcblock/ux 3.1.45 → 3.1.47

package/lib/Util/index.js

@@ -25,8 +25,8 @@ function B(e) {
     return !1;
   const t = e.split(".");
   if (t.length < 2) return !1;
-  const o = t[t.length - 2], n = t[t.length - 1];
-  return z.has(o) && N.has(n);
+  const o = t[t.length - 2], r = t[t.length - 1];
+  return z.has(o) && N.has(r);
 }
 function ye() {
   const { host: e } = window.location;
@@ -36,16 +36,16 @@ function ye() {
   if (o.length === 1)
     return "";
   if (o.length > 2) {
-    const n = o.slice(-2).join(".");
-    if (B(n))
+    const r = o.slice(-2).join(".");
+    if (B(r))
       return `.${o.slice(-3).join(".")}`;
   }
   return `.${o.slice(-2).join(".")}`;
 }
 function Ie(e) {
   return e.replace(/^\?/, "").split("&").map((t) => t.split("=")).filter(([t]) => !!t).reduce((t, o) => {
-    const n = o[0], i = decodeURIComponent(o[1]) || !0;
-    return t[n] = i, t;
+    const r = o[0], i = decodeURIComponent(o[1]) || !0;
+    return t[r] = i, t;
   }, {});
 }
 function be(e = {}) {
@@ -64,20 +64,20 @@ function De(e = 1) {
   };
   return (typeof window > "u" || t.domain || t.returnDomain === !1) && t.returnDomain === !1 && delete o.domain, o;
 }
-const Se = (e) => e.color ? e.color : e.dark ? e.theme.palette.common.white : e.theme.palette.text.primary, ke = (e) => e.background ? e.background : e.dark ? e.theme.palette.common.black : e.theme.palette.common.white;
-function Ve(e, t, o = []) {
-  const n = Object.assign({}, e), i = t.defaultProps || {};
-  return Object.keys(i).forEach((r) => {
-    typeof n[r] == "string" && n[r].indexOf("::prop::") === 0 && (n[r] = i[r]);
-  }), Array.isArray(o) && o.forEach((r) => {
-    if (typeof n[r] == "string")
+const Se = (e) => e.color ? e.color : e.dark ? e.theme.palette.common.white : e.theme.palette.text.primary, Ve = (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 || {};
+  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")
       try {
-        n[r] = JSON.parse(n[r]);
+        r[n] = JSON.parse(r[n]);
       } catch {
       }
-  }), Object.keys(n).forEach((r) => {
-    typeof n[r] == "string" && n[r].indexOf("::prop::") === 0 && (n[r] = "");
-  }), n;
+  }), Object.keys(r).forEach((n) => {
+    typeof r[n] == "string" && r[n].indexOf("::prop::") === 0 && (r[n] = "");
+  }), r;
 }
 function $e(e = 2017) {
   const t = (/* @__PURE__ */ new Date()).getFullYear();
@@ -85,17 +85,17 @@ function $e(e = 2017) {
 }
 const Te = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", je = (e) => {
   let t = 0;
-  for (let n = 0; n < e.length; n++)
-    t = e.charCodeAt(n) + ((t << 5) - t);
+  for (let r = 0; r < e.length; r++)
+    t = e.charCodeAt(r) + ((t << 5) - t);
   let o = "#";
-  for (let n = 0; n < 3; n++) {
-    const i = t >> n * 8 & 255;
+  for (let r = 0; r < 3; r++) {
+    const i = t >> r * 8 & 255;
     o += `00${i.toString(16)}`.substr(-2);
   }
   return o;
 }, xe = (e) => {
-  const t = Math.round(e / 1e3), o = Math.floor(t / 3600), n = Math.floor((t - o * 3600) / 60), i = t % 60;
-  return `${l(o, 2, "0")}:${l(n, 2, "0")}:${l(i, 2, "0")}`;
+  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")}`;
 };
 function X(e) {
   u = e;
@@ -103,7 +103,7 @@ function X(e) {
 function Ee() {
   return u;
 }
-const D = (e) => (t, { locale: o, tz: n, isUtc: i } = {}) => {
+const D = (e) => (t, { locale: o, tz: r, isUtc: i } = {}) => {
   if (u === null && (a.extend(R), a.extend(U), a.extend(F), a.extend(P), a.extend(A), a.updateLocale("zh-cn", {
     // copy with https://github.com/iamkun/dayjs/blob/dev/src/locale/zh-cn.js
     relativeTime: {
@@ -123,8 +123,8 @@ const D = (e) => (t, { locale: o, tz: n, isUtc: i } = {}) => {
     }
   }), X(a)), I(t) || t === "")
     return "-";
-  let r = u(t);
-  return n && (r = r.tz(n)), i && (r = r.utc()), typeof o < "u" && (r = r.locale(o)), r.format(e);
+  let n = u(t);
+  return r && (n = n.tz(r)), i && (n = n.utc()), typeof o < "u" && (n = n.locale(o)), n.format(e);
 };
 function ve(e, { locale: t = "en", tz: o } = {}) {
   return D("ll")(e, { locale: t, tz: o });
@@ -132,10 +132,10 @@ function ve(e, { locale: t = "en", tz: o } = {}) {
 function Oe(e, {
   locale: t = "en",
   tz: o,
-  isUtc: n = !1,
+  isUtc: r = !1,
   format: i = "lll"
 } = {}) {
-  return D(i)(e, { locale: t, tz: o, isUtc: n });
+  return D(i)(e, { locale: t, tz: o, isUtc: r });
 }
 function K() {
   const e = window?.ABT_DEV || window.ABT;
@@ -145,9 +145,9 @@ function Ue({
   webWalletUrl: e,
   action: t = "login",
   locale: o = "en",
-  url: n,
+  url: r,
   windowFeatures: i,
-  appInfo: r,
+  appInfo: n,
   memberAppInfo: f
 }) {
   const h = K();
@@ -155,9 +155,9 @@ function Ue({
     return h.open({
       action: t,
       locale: o,
-      url: encodeURIComponent(n),
+      url: encodeURIComponent(r),
       appInfo: {
-        ...r
+        ...n
       },
       memberAppInfo: {
         ...f
@@ -173,9 +173,9 @@ function Ue({
     // iphone 8plus size
     width: 414,
     height: 736
-  }, k = `${e}?action=${t}&locale=${o}&url=${encodeURIComponent(n)}`, c = Object.assign({}, S, i), V = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
+  }, V = `${e}?action=${t}&locale=${o}&url=${encodeURIComponent(r)}`, c = Object.assign({}, S, i), k = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
   if (!("left" in c)) {
-    const s = V(window.top || window), T = window.screenLeft || window.screenX;
+    const s = k(window.top || window), T = window.screenLeft || window.screenX;
     c.left = s + T - c.width;
   }
   if (!("top" in c)) {
@@ -183,7 +183,7 @@ function Ue({
     c.top = s;
   }
   const $ = Object.keys(c).map((s) => `${s}=${c[s]}`).join(",");
-  return window.open(k, "targetWindow", $), { type: "web" };
+  return window.open(V, "targetWindow", $), { type: "web" };
 }
 const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) => {
   const t = e.replace(L, "");
@@ -193,8 +193,8 @@ const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) =
     return e;
   try {
     const o = new URL(e, window.location.origin);
-    return Object.keys(t).forEach((n) => {
-      o.searchParams.set(n, String(t[n]));
+    return Object.keys(t).forEach((r) => {
+      o.searchParams.set(r, String(t[r]));
     }), o.origin === window.location.origin ? o.pathname + o.search : o.href;
   } catch {
     return e;
@@ -228,9 +228,9 @@ const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) =
           if (window.crypto && typeof window.crypto.getRandomValues == "function")
             window.crypto.getRandomValues(t);
           else
-            for (let n = 0; n < 16; n++)
-              t[n] = Math.floor(Math.random() * 256);
-          const o = Array.from(t).map((n) => n.toString(16).padStart(2, "0"));
+            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"));
           e = [
             o.slice(0, 4).join(""),
             o.slice(4, 6).join(""),
@@ -248,7 +248,7 @@ const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) =
   if (J(e)) {
     const t = Uint8Array.from(
       e.slice(2).match(/.{1,2}/g).map((o) => parseInt(o, 16))
-    ).slice(0, 8).reduce((o, n) => o + n, 0) % w.length;
+    ).slice(0, 8).reduce((o, r) => o + r, 0) % w.length;
     return w[t];
   }
   try {
@@ -257,11 +257,11 @@ const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) =
     return null;
   }
 }, Ce = (e, t, o = {}) => {
-  const { fallbackLocale: n = "en", defaultValue: i = "unknown" } = o;
+  const { fallbackLocale: r = "en", defaultValue: i = "unknown" } = o;
   if (typeof e == "string")
     return e;
-  let r;
-  return t && (r = e[t]), (!r || typeof r != "string") && (r = e[n]), (!r || typeof r != "string") && (r = i), r;
+  let n;
+  return t && (n = e[t]), (!n || typeof n != "string") && (n = e[r]), (!n || typeof n != "string") && (n = i), n;
 }, Me = (e) => j(
   () => v(
     async () => {
@@ -276,23 +276,32 @@ const Fe = (e) => e && Number(e) >= 12 ? `${Number(e)}px` : "inherit", J = (e) =
   )
 ), _e = (e) => E(e, I);
 function ze(e, t = 1) {
-  const [o, n, i] = O.hex.rgb(e);
-  return `rgba(${o}, ${n}, ${i}, ${t})`;
+  const [o, r, i] = O.hex.rgb(e);
+  return `rgba(${o}, ${r}, ${i}, ${t})`;
 }
-const G = () => window.blocklet?.serverVersion || "", H = () => b.version, Z = () => (b.dependencies?.["@blocklet/js-sdk"]).replace(/^[\^~>=<]+/, ""), d = (e, t) => {
-  const o = (r) => {
-    const f = r.match(/^(\d+\.\d+\.\d+(?:-[^-]+?-\d{8}))/);
-    return f ? f[1] : r;
-  }, n = o(e), i = o(t);
-  return n === i && e !== t ? !1 : W.gte(n, i);
+const G = () => window.blocklet?.serverVersion || window.env?.serverVersion || "", H = () => b.version, Z = () => (b.dependencies?.["@blocklet/js-sdk"]).replace(/^[\^~>=<]+/, ""), d = (e, t) => {
+  const o = (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)
+    return !1;
+  try {
+    return W.gte(r, i);
+  } catch {
+    return !1;
+  }
 }, Ne = () => {
   if (process.env.NODE_ENV === "development")
     return !0;
   const e = G(), t = H(), o = Z();
   if (!e || !t || !o)
     return !1;
-  const n = d(t, "3.1.29"), i = d(e, "1.16.49-beta-20250822-070545-6d3344cc"), r = d(o, "1.16.49-beta-20250822-070545-6d3344cc");
-  return n && i && r;
+  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;
 };
 export {
   Q as appendParams,
@@ -304,7 +313,7 @@ export {
   ve as formatToDate,
   Oe as formatToDatetime,
   xe as formatUptime,
-  ke as getBackground,
+  Ve as getBackground,
   Se as getColor,
   De as getCookieOptions,
   $e as getCopyright,
@@ -324,7 +333,7 @@ export {
   B as isTwoSegmentTLD,
   Re as isUrl,
   Me as lazyRetry,
-  Ve as mergeProps,
+  ke as mergeProps,
   Ue as openWebWallet,
   Ie as parseQuery,
   ye as resolveRootDomain,

package/lib/package.json.js

@@ -1,9 +1,9 @@
-const e = "3.1.45", s = { "@blocklet/js-sdk": "^1.16.49-beta-20250823-082650-626c1473" }, t = {
+const e = "3.1.47", s = { "@blocklet/js-sdk": "1.16.52" }, n = {
   version: e,
   dependencies: s
 };
 export {
-  t as default,
+  n as default,
   s as dependencies,
   e as version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.45",
+  "version": "3.1.47",
   "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": "6706a870c69720bc0beae69a2c380247d4d0efaa",
+  "gitHead": "8081935df0b3a38eba2c52f758be63318aa8c3ef",
   "dependencies": {
-    "@arcblock/bridge": "3.1.45",
-    "@arcblock/did": "^1.21.3",
+    "@arcblock/bridge": "3.1.47",
+    "@arcblock/did": "^1.25.6",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.45",
-    "@arcblock/nft-display": "3.1.45",
-    "@arcblock/react-hooks": "3.1.45",
-    "@blocklet/js-sdk": "^1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/theme": "3.1.45",
+    "@arcblock/icons": "3.1.47",
+    "@arcblock/nft-display": "3.1.47",
+    "@arcblock/react-hooks": "3.1.47",
+    "@blocklet/js-sdk": "1.16.52",
+    "@blocklet/theme": "3.1.47",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",
@@ -85,7 +85,7 @@
     "@iconify-icons/mdi": "^1.2.48",
     "@iconify-icons/tabler": "^1.2.95",
     "@iconify/react": "^5.2.1",
-    "@ocap/mcrypto": "^1.21.3",
+    "@ocap/mcrypto": "^1.25.6",
     "@solana/qr-code-styling": "^1.6.0",
     "@types/dompurify": "^3.2.0",
     "@types/mui-datatables": "^4.3.12",

package/src/Util/index.ts

@@ -663,7 +663,7 @@ export function hexToRgba(hex: string, alpha = 1) {
 
 // 获取 server 的版本号
 export const getServerVersion = () => {
-  return window.blocklet?.serverVersion || '';
+  return window.blocklet?.serverVersion || window.env?.serverVersion || '';
 };
 
 // 获取 UX 包版本号
@@ -692,6 +692,10 @@ export const compareVersions = (version1: string, version2: string): boolean =>
     const match = version.match(/^(\d+\.\d+\.\d+(?:-[^-]+?-\d{8}))/);
     return match ? match[1] : version;
   };
+  // 如果版本号为空，返回 false
+  if (!version1 || !version2) {
+    return false;
+  }
 
   const dateVersion1 = getDateVersion(version1);
   const dateVersion2 = getDateVersion(version2);
@@ -701,8 +705,12 @@ export const compareVersions = (version1: string, version2: string): boolean =>
     return false;
   }
 
-  // 其他情况正常比较
-  return semver.gte(dateVersion1, dateVersion2);
+  try {
+    // 其他情况正常比较
+    return semver.gte(dateVersion1, dateVersion2);
+  } catch {
+    return false;
+  }
 };
 
 /**