@blocklet/ui-react 2.12.35 → 2.12.37

package/lib/@types/index.d.ts

@@ -60,7 +60,7 @@ export declare enum StatusEnum {
 }
 export type UserPhoneProps = {
     country: string;
-    phoneNumber: string;
+    phoneNumber?: string;
 };
 export type UserMetadata = {
     bio?: string;

package/lib/UserCenter/components/user-info/address.js

@@ -49,7 +49,6 @@ export default function AddressEditor({
         children: /* @__PURE__ */ jsx(
           CountrySelect,
           {
-            valueField: "name",
             value: address.country || defaultCountry,
             onChange: (v) => handleChange("country", v),
             displayEmpty: true,

package/lib/UserCenter/components/user-info/metadata.js

@@ -8,7 +8,11 @@ import Backdrop from "@mui/material/Backdrop";
 import styled from "@emotion/styled";
 import { joinURL } from "ufo";
 import Button from "@arcblock/ux/lib/Button";
-import PhoneInput, { validatePhoneNumber } from "@arcblock/ux/lib/PhoneInput";
+import PhoneInput, {
+  validatePhoneNumber,
+  getDialCodeByCountry,
+  getCountryNameByCountry
+} from "@arcblock/ux/lib/PhoneInput";
 import cloneDeep from "lodash/cloneDeep";
 import omit from "lodash/omit";
 import { mergeSx } from "@arcblock/ux/lib/Util/style";
@@ -119,7 +123,7 @@ export default function UserMetadataComponent({
     if (user?.address?.country) {
       return user.address.country;
     }
-    return locale === "zh" ? "China" : "United States";
+    return locale === "zh" ? "cn" : "us";
   }, [user?.address?.country, locale]);
   const phoneValue = useCreation(() => {
     const phone = metadata.phone ?? user?.phone ?? {
@@ -135,7 +139,7 @@ export default function UserMetadataComponent({
     if (typeof phone === "object") {
       return {
         country: phone.country,
-        phone: phone.phoneNumber
+        phone: phone.phoneNumber || ""
       };
     }
     return {
@@ -228,6 +232,16 @@ export default function UserMetadataComponent({
       if (k === "timezone") {
         metadata[k] = value || currentTimezone;
       }
+      if (k === "phone" && value && typeof value === "object") {
+        const phoneInput = value;
+        const dialCode = getDialCodeByCountry(phoneInput.country);
+        const phoneWithoutCode = phoneInput.phoneNumber?.replace(new RegExp(`^\\+${dialCode}`), "") || "";
+        const hasActualPhoneNumber = phoneWithoutCode?.trim().length > 0;
+        metadata[k] = {
+          country: phoneInput.country,
+          ...hasActualPhoneNumber ? { phoneNumber: phoneInput.phoneNumber } : {}
+        };
+      }
     });
     if (address.postalCode && !isPostalCode(address.postalCode, "any")) {
       addressValidateMsg.postalCode = t("profile.address.invalidPostalCode");
@@ -311,7 +325,8 @@ export default function UserMetadataComponent({
                 ] }, k);
               }) }) : null,
               renderValue: () => {
-                const fullLocation = [address.country, address.province, address.city || metadata.location || ""].filter(Boolean).join(" ");
+                const countryName = address?.country ? getCountryNameByCountry(address?.country) : "";
+                const fullLocation = [countryName, address.province, address.city || metadata.location || ""].filter(Boolean).join(" ");
                 return /* @__PURE__ */ jsx(Typography, { component: "span", children: fullLocation });
               },
               icon: /* @__PURE__ */ jsx(LocationIcon, { ...iconSize })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.12.35",
+  "version": "2.12.37",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@abtnode/constant": "^1.16.40",
-    "@arcblock/bridge": "^2.12.35",
-    "@arcblock/react-hooks": "^2.12.35",
+    "@arcblock/bridge": "^2.12.37",
+    "@arcblock/react-hooks": "^2.12.37",
     "@arcblock/ws": "^1.19.15",
     "@blocklet/did-space-react": "^1.0.35",
     "@iconify-icons/logos": "^1.2.36",
@@ -87,5 +87,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "5b432b3eeb52dbc43376e9482841e7478a61dd2d"
+  "gitHead": "aa13701db7bd60b6b929a039b5701ca69208545b"
 }

package/src/@types/index.ts

@@ -69,7 +69,7 @@ export enum StatusEnum {
 
 export type UserPhoneProps = {
   country: string;
-  phoneNumber: string;
+  phoneNumber?: string;
 };
 
 export type UserMetadata = {

package/src/UserCenter/components/user-info/address.tsx

@@ -65,8 +65,7 @@ export default function AddressEditor({
         editable
         errorMsg={errors.country}
         label={t('profile.address.country')}>
-        <CountrySelect<'name'>
-          valueField="name"
+        <CountrySelect
           value={address.country || defaultCountry}
           onChange={(v) => handleChange('country', v)}
           displayEmpty

package/src/UserCenter/components/user-info/metadata.tsx

@@ -9,7 +9,12 @@ import Backdrop, { BackdropProps } from '@mui/material/Backdrop';
 import styled from '@emotion/styled';
 import { joinURL } from 'ufo';
 import Button from '@arcblock/ux/lib/Button';
-import PhoneInput, { PhoneValue, validatePhoneNumber } from '@arcblock/ux/lib/PhoneInput';
+import PhoneInput, {
+  PhoneValue,
+  validatePhoneNumber,
+  getDialCodeByCountry,
+  getCountryNameByCountry,
+} from '@arcblock/ux/lib/PhoneInput';
 import cloneDeep from 'lodash/cloneDeep';
 import omit from 'lodash/omit';
 import { mergeSx } from '@arcblock/ux/lib/Util/style';
@@ -152,7 +157,7 @@ export default function UserMetadataComponent({
       return user.address.country;
     }
 
-    return locale === 'zh' ? 'China' : 'United States';
+    return locale === 'zh' ? 'cn' : 'us';
   }, [user?.address?.country, locale]);
 
   const phoneValue = useCreation((): PhoneValue => {
@@ -171,7 +176,7 @@ export default function UserMetadataComponent({
     if (typeof phone === 'object') {
       return {
         country: phone.country,
-        phone: (phone as UserPhoneProps).phoneNumber,
+        phone: (phone as UserPhoneProps).phoneNumber || '',
       };
     }
 
@@ -279,6 +284,19 @@ export default function UserMetadataComponent({
       if (k === 'timezone') {
         metadata[k] = (value as string) || currentTimezone;
       }
+      if (k === 'phone' && value && typeof value === 'object') {
+        const phoneInput = value as UserPhoneProps;
+        const dialCode = getDialCodeByCountry(phoneInput.country);
+        // 去除电话号码中的区号部分
+        const phoneWithoutCode = phoneInput.phoneNumber?.replace(new RegExp(`^\\+${dialCode}`), '') || '';
+
+        const hasActualPhoneNumber = phoneWithoutCode?.trim().length > 0;
+
+        metadata[k] = {
+          country: phoneInput.country,
+          ...(hasActualPhoneNumber ? { phoneNumber: phoneInput.phoneNumber } : {}),
+        };
+      }
     });
 
     // 单独处理邮政编码验证，避免嵌套三元表达式
@@ -375,7 +393,8 @@ export default function UserMetadataComponent({
               ) : null
             }
             renderValue={() => {
-              const fullLocation = [address.country, address.province, address.city || metadata.location || '']
+              const countryName = address?.country ? getCountryNameByCountry(address?.country) : '';
+              const fullLocation = [countryName, address.province, address.city || metadata.location || '']
                 .filter(Boolean)
                 .join(' ');
               return <Typography component="span">{fullLocation}</Typography>;