cabloy 5.1.239 → 5.1.241

package/zova/src/suite/a-commerce/modules/commerce-siteadmin/src/page/dashboard/controller.tsx

@@ -19,12 +19,18 @@ export class ControllerPageDashboard extends BeanControllerPageBase {
 
   protected render() {
     const query = this.queryOperatorContext;
+    const operator = query.data!;
+    const user = this.$passport.user;
+    const displayName =
+      user && String(user.id) === String(operator.userId)
+        ? this.$passport.displayName
+        : operator.displayName || operator.userName;
     return (
       <div class="p-6">
         <h1 class="text-2xl font-semibold">{this.scope.locale.CommerceAdministration()}</h1>
         <dl class="mt-4 grid max-w-xl grid-cols-[auto_1fr] gap-x-4 gap-y-2">
           <dt>{this.scope.locale.Operator()}</dt>
-          <dd>{query.data!.userName}</dd>
+          <dd>{displayName}</dd>
           <dt>{this.scope.locale.Instance()}</dt>
           <dd>{query.data!.instanceName || 'default'}</dd>
         </dl>

package/zova/src/suite/a-home/modules/home-api/src/api/openapi/types.ts

@@ -2596,6 +2596,7 @@ export interface components {
       | undefined;
     'home-user.dto.accountCurrent': {
       name: string;
+      displayName?: string | undefined;
       avatar?: string | undefined;
       locale?: unknown;
       tz?: string | undefined;
@@ -2605,7 +2606,7 @@ export interface components {
     };
     'home-user.dto.accountProfileUpdate': {
       /** @description Display name */
-      name: string;
+      displayName?: string | undefined;
       /**
        * Avatar
        * @description Absolute HTTPS avatar URL or API delivery URL
@@ -2673,6 +2674,7 @@ export interface components {
     'home-user.dto.passportUser': {
       id: number | string;
       name: string;
+      displayName?: string | undefined;
       avatar?: string | undefined;
       email?: string | undefined;
       mobile?: string | undefined;
@@ -2783,6 +2785,7 @@ export interface components {
       instanceName: string;
       userId: string;
       userName: string;
+      displayName?: string | undefined;
     };
     'commerce-promotion.dto.couponMineItem': {
       id: number | string;
@@ -3215,7 +3218,9 @@ export interface components {
       shippedAt: Date;
     };
     'commerce-trade.dto.orderShip': {
+      /** @description Carrier */
       carrier: string;
+      /** @description Tracking number */
       trackingNumber: string;
     };
     'commerce-trade.dto.orderSelectRes': {

package/zova/src/suite/a-home/modules/home-base/src/config/locale/en-us.ts

@@ -5,6 +5,7 @@ export default {
   LanguageEnglish: 'English',
   LanguageChinese: 'Chinese',
   LanguageJapanese: 'Japanese',
+  LanguageTraditionalChinese: 'Traditional Chinese',
   VonaIntegratedSsr: 'Vona integrated SSR',
   ZovaStandaloneSsr: 'Zova standalone SSR',
   SsrSite: 'SSR Site',

package/zova/src/suite/a-home/modules/home-base/src/config/locale/zh-cn.ts

@@ -5,6 +5,7 @@ export default {
   LanguageEnglish: '英语',
   LanguageChinese: '简体中文',
   LanguageJapanese: '日语',
+  LanguageTraditionalChinese: '繁体中文',
   VonaIntegratedSsr: 'Vona 集成式 SSR',
   ZovaStandaloneSsr: 'Zova 独立式 SSR',
   SsrSite: 'SSR 站点',

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.user.tsx

@@ -18,7 +18,7 @@ export class RenderUser extends BeanRenderBase {
                 this.$scopeBase.config.avatar.empty
               }
             />
-            {this.$passport.user?.name}
+            {this.$passport.displayName}
           </summary>
           <ul class="bg-base-100 rounded-t-none p-2 w-32">
             <li>

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.user.tsx

@@ -21,7 +21,9 @@ export class RenderUser extends BeanRenderBase {
                   ) || this.$scopeBase.config.avatar.empty
                 }
               />
-              {this.$passport.user?.name || this.scope.locale.NotLoggedIn()}
+              {this.$passport.isAuthenticated
+                ? this.$passport.displayName
+                : this.scope.locale.NotLoggedIn()}
             </summary>
             <ul class="bg-base-100 rounded-t-none p-2 w-40">
               {this.$passport.isAuthenticated ? (

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -187,6 +187,10 @@ export class ModelPassport extends BeanModelBase {
     return this.passport?.user;
   }
 
+  get displayName(): string | undefined {
+    return this.user?.displayName || this.user?.name;
+  }
+
   get roles() {
     return this.passport?.roles;
   }

package/zova/src/suite/a-home/modules/home-user/src/config/locale/en-us.ts

@@ -2,6 +2,7 @@ export default {
   AccountSettings: 'Account Settings',
   AccountProfile: 'Profile',
   AccountSecurity: 'Account Security',
+  AccountUserName: 'User name',
   AccountDisplayName: 'Display name',
   AccountLocale: 'Locale',
   AccountTimezone: 'Time zone',

package/zova/src/suite/a-home/modules/home-user/src/config/locale/zh-cn.ts

@@ -2,6 +2,7 @@ export default {
   AccountSettings: '账户设置',
   AccountProfile: '个人资料',
   AccountSecurity: '账户安全',
+  AccountUserName: '用户名',
   AccountDisplayName: '显示名称',
   AccountLocale: '语言区域',
   AccountTimezone: '时区',

package/zova/src/suite/a-home/modules/home-user/src/model/account.ts

@@ -21,8 +21,9 @@ export interface IModelOptionsAccount extends IDecoratorModelOptions {}
 
 export type AccountProfileUpdateCommand = Omit<
   ApiApiHomeUserAccountupdateProfileRequestBody,
-  'avatar' | 'locale' | 'tz'
+  'displayName' | 'avatar' | 'locale' | 'tz'
 > & {
+  displayName?: string | null;
   avatar?: string | null;
   locale?: string | null;
   tz?: string | null;

package/zova/src/suite/a-home/modules/home-user/src/page/account/controller.tsx

@@ -81,7 +81,11 @@ export class ControllerPageAccount extends BeanControllerPageBase {
   }
 
   async submitProfile(data: TypeFormOnSubmitData<ProfileDraft>) {
-    const current = await this.$$modelAccount.updateProfile().mutateAsync(data.value);
+    const displayName = data.value.displayName;
+    const current = await this.$$modelAccount.updateProfile().mutateAsync({
+      ...data.value,
+      displayName: displayName === undefined ? undefined : displayName?.trim() || null,
+    });
     this._resetProfileDraft(current);
     this.profileMessage = this.scope.locale.AccountProfileSaved();
   }
@@ -119,7 +123,7 @@ export class ControllerPageAccount extends BeanControllerPageBase {
   private _resetProfileDraft(current = this.queryCurrent?.data) {
     if (!current) return;
     this.profileDraft = {
-      name: current.name,
+      displayName: current.displayName ?? '',
       avatar: current.avatar ?? undefined,
       locale: typeof current.locale === 'string' ? current.locale : undefined,
       tz: current.tz ?? undefined,
@@ -254,8 +258,18 @@ export class ControllerPageAccount extends BeanControllerPageBase {
             );
           }}
         />
+        <label class="form-control gap-2">
+          <span class="label-text">{this.scope.locale.AccountUserName()}</span>
+          <input
+            class="input"
+            type="text"
+            readonly
+            autocomplete="username"
+            value={this.queryCurrent?.data?.name}
+          />
+        </label>
         <ZFormFieldPreset
-          name="name"
+          name="displayName"
           render="basic-input:formFieldInput"
           options={{ type: 'text' }}
         />