cabloy 5.1.111 → 5.1.113

package/zova/src/suite/a-commerce/modules/commerce-trade/src/apiSchema/commerceTradeCart.ts

@@ -0,0 +1,35 @@
+import type { IApiSchemaOptions } from 'zova-module-a-api';
+
+import { BeanBase } from 'zova';
+import { ApiSchema } from 'zova-module-a-api';
+
+import {
+  ApiApiCommerceTradeCartcurrentPath,
+  ApiApiCommerceTradeCartaddItemPath,
+  ApiApiCommerceTradeCartclearPath,
+  ApiApiCommerceTradeCartdeleteItemPath,
+  ApiApiCommerceTradeCartupdateItemPath,
+} from '../api/commerceTradeCart.js';
+
+@ApiSchema()
+export class ApiSchemaCommerceTradeCart extends BeanBase {
+  current(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiCommerceTradeCartcurrentPath, 'get', options);
+  }
+
+  addItem(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiCommerceTradeCartaddItemPath, 'post', options);
+  }
+
+  clear(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiCommerceTradeCartclearPath, 'delete', options);
+  }
+
+  deleteItem(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiCommerceTradeCartdeleteItemPath, 'delete', options);
+  }
+
+  updateItem(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiCommerceTradeCartupdateItemPath, 'patch', options);
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/en-us.ts

@@ -0,0 +1,8 @@
+export default {
+  Addresses: 'Addresses',
+  Cart: 'Cart',
+  CartEmpty: 'Your cart is empty.',
+  Quantity: 'Quantity',
+  ClearCart: 'Clear cart',
+  RemoveCartItem: 'Remove',
+};

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/zh-cn.ts

@@ -0,0 +1,8 @@
+export default {
+  Addresses: '地址',
+  Cart: '购物车',
+  CartEmpty: '购物车为空。',
+  Quantity: '数量',
+  ClearCart: '清空购物车',
+  RemoveCartItem: '移除',
+};

package/zova/src/suite/a-commerce/modules/commerce-trade/src/index.ts

@@ -1 +1,2 @@
+export * from './.metadata/locales.js';
 export * from './.metadata/index.js';

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts

@@ -0,0 +1,78 @@
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+
+import { BeanModelBase, Model } from 'zova-module-a-model';
+
+import type {
+  ApiApiCommerceTradeCartaddItemRequestBody,
+  ApiApiCommerceTradeCartupdateItemRequestBody,
+} from '../api/commerceTradeCart.js';
+
+export interface IModelOptionsCart extends IDecoratorModelOptions {}
+
+@Model<IModelOptionsCart>()
+export class ModelCart extends BeanModelBase {
+  current() {
+    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    return this.$useStateData({
+      queryKey: ['current'],
+      queryFn: async () => {
+        return await this.scope.api.commerceTradeCart.current();
+      },
+      meta: { disableSuspenseOnInit: true },
+    });
+  }
+
+  addItem() {
+    return this.$useMutationData({
+      mutationKey: ['addItem'],
+      mutationFn: async (body: ApiApiCommerceTradeCartaddItemRequestBody) => {
+        return await this.scope.api.commerceTradeCart.addItem(body);
+      },
+      onSuccess: async () => {
+        await this.$invalidateQueries({ queryKey: ['current'] });
+      },
+    });
+  }
+
+  updateItem() {
+    return this.$useMutationData({
+      mutationKey: ['updateItem'],
+      mutationFn: async ({
+        id,
+        body,
+      }: {
+        id: string;
+        body: ApiApiCommerceTradeCartupdateItemRequestBody;
+      }) => {
+        return await this.scope.api.commerceTradeCart.updateItem(body, { params: { id } });
+      },
+      onSuccess: async () => {
+        await this.$invalidateQueries({ queryKey: ['current'] });
+      },
+    });
+  }
+
+  deleteItem() {
+    return this.$useMutationData({
+      mutationKey: ['deleteItem'],
+      mutationFn: async (id: string) => {
+        return await this.scope.api.commerceTradeCart.deleteItem({ params: { id } });
+      },
+      onSuccess: async () => {
+        await this.$invalidateQueries({ queryKey: ['current'] });
+      },
+    });
+  }
+
+  clear() {
+    return this.$useMutationData({
+      mutationKey: ['clear'],
+      mutationFn: async () => {
+        return await this.scope.api.commerceTradeCart.clear();
+      },
+      onSuccess: async () => {
+        await this.$invalidateQueries({ queryKey: ['current'] });
+      },
+    });
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/cart/controller.tsx

@@ -0,0 +1,108 @@
+import { RouterLink } from '@cabloy/vue-router';
+import { z } from 'zod';
+import { BeanControllerPageBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+import { ZPage } from 'zova-module-home-base';
+
+import { ModelCart } from '../../model/cart.js';
+
+export const ControllerPageCartSchemaParams = z.object({
+  locale: z.string().optional(),
+});
+export const ControllerPageCartSchemaQuery = z.object({});
+
+@Controller()
+export class ControllerPageCart extends BeanControllerPageBase {
+  @Use()
+  $$modelCart: ModelCart;
+
+  get queryCurrent() {
+    if (process.env.SERVER) return;
+    return this.$$modelCart.current();
+  }
+
+  async updateQuantity(id: string, event: Event) {
+    const quantity = Number((event.target as HTMLInputElement).value);
+    if (!Number.isInteger(quantity) || quantity <= 0) return;
+    await this.$$modelCart.updateItem().mutateAsync({ id, body: { quantity } });
+  }
+
+  async deleteItem(id: string) {
+    await this.$$modelCart.deleteItem().mutateAsync(id);
+  }
+
+  async clear() {
+    await this.$$modelCart.clear().mutateAsync();
+  }
+
+  private _getAddressPagePath(): string {
+    return this.$router.getAliasPath('commerce-member:address', {
+      params: { locale: true },
+    })!;
+  }
+
+  protected render() {
+    const query = this.queryCurrent;
+    const items = query?.data?.items ?? [];
+    return (
+      <ZPage>
+        <section class="mx-auto max-w-4xl p-6">
+          <div class="flex items-center justify-between gap-4">
+            <h1 class="text-3xl font-semibold">{this.scope.locale.Cart()}</h1>
+            <div class="flex gap-2">
+              <RouterLink class="btn btn-outline btn-sm" to={this._getAddressPagePath()}>
+                {this.scope.locale.Addresses()}
+              </RouterLink>
+              {items.length > 0 && (
+                <button class="btn btn-outline btn-sm" onClick={() => this.clear()}>
+                  {this.scope.locale.ClearCart()}
+                </button>
+              )}
+            </div>
+          </div>
+          {items.length === 0 && (
+            <p class="mt-6 text-base-content/70">{this.scope.locale.CartEmpty()}</p>
+          )}
+          {items.length > 0 && (
+            <div class="mt-6 space-y-3">
+              {items.map(item => (
+                <article class="card bg-base-100 border border-base-300 shadow-sm">
+                  <div class="card-body gap-3 sm:flex-row sm:items-center sm:justify-between">
+                    <div>
+                      <h2 class="card-title">{item.productTitle}</h2>
+                      <p class="text-sm text-base-content/60">{item.skuCode}</p>
+                      <p class="mt-1 font-semibold">${(item.priceCents / 100).toFixed(2)}</p>
+                    </div>
+                    <div class="flex items-center gap-3">
+                      <label class="flex items-center gap-2">
+                        <span class="text-sm">{this.scope.locale.Quantity()}</span>
+                        <input
+                          class="input input-bordered input-sm w-20"
+                          type="number"
+                          min="1"
+                          value={item.quantity}
+                          onChange={(event: Event) => this.updateQuantity(String(item.id), event)}
+                        />
+                      </label>
+                      <button
+                        class="btn btn-error btn-outline btn-sm"
+                        onClick={() => this.deleteItem(String(item.id))}
+                      >
+                        {this.scope.locale.RemoveCartItem()}
+                      </button>
+                    </div>
+                  </div>
+                </article>
+              ))}
+            </div>
+          )}
+          {query?.error && (
+            <div role="alert" class="alert alert-error mt-6">
+              <span>{query?.error.message}</span>
+            </div>
+          )}
+        </section>
+      </ZPage>
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/routes.ts

@@ -0,0 +1,12 @@
+import { IModuleRoute } from 'zova-module-a-router';
+
+import { ZPageCart } from './.metadata/page/cart.js';
+
+export const routes: IModuleRoute[] = [
+  {
+    name: 'cart',
+    path: 'cart/:locale?',
+    component: ZPageCart,
+    meta: { locale: true, requiresAuth: true },
+  },
+];

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/index.ts

@@ -196,10 +196,10 @@ export interface IPagePathRecord {
 '/demo/basic/toolTwo/:id?': TypePagePathSchema<NSControllerPageToolTwo.ParamsInput,NSControllerPageToolTwo.QueryInput>;
 }
 export interface IPageNameRecord {
-  'demo-basic:routeParams': undefined;
-'demo-basic:toolMinimal': undefined;
-'demo-basic:toolOne': undefined;
-'demo-basic:toolTwo': undefined;
+  'demo-basic:routeParams': TypePagePathSchema<NSControllerPageRouteParams.ParamsInput,NSControllerPageRouteParams.QueryInput>;
+'demo-basic:toolMinimal': TypePagePathSchema<undefined,undefined>;
+'demo-basic:toolOne': TypePagePathSchema<NSControllerPageToolOne.ParamsInput,NSControllerPageToolOne.QueryInput>;
+'demo-basic:toolTwo': TypePagePathSchema<NSControllerPageToolTwo.ParamsInput,NSControllerPageToolTwo.QueryInput>;
 }
 }
 export const pagePathSchemas = {
@@ -425,5 +425,5 @@ declare module 'zova' {
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `demo-basic::${K}` {
   return `demo-basic::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/a-demo/modules/demo-todo/src/.metadata/index.ts

@@ -120,7 +120,7 @@ export interface IPagePathRecord {
 '/demo/todo/todo': TypePagePathSchema<undefined,undefined>;
 }
 export interface IPageNameRecord {
-  'demo-todo:item': undefined;
+  'demo-todo:item': TypePagePathSchema<NSControllerPageItem.ParamsInput,NSControllerPageItem.QueryInput>;
 }
 }
 export const pagePathSchemas = {
@@ -164,5 +164,5 @@ declare module 'zova' {
 
   
 }
-  
+
 /** scope: end */

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -26,23 +26,31 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
         }
       }
       if (!this.$passport.isAuthenticated) {
-        try {
-          this.app.$gotoLogin(to.fullPath);
-        } catch (err: any) {
-          this.$errorHandler(err);
+        const pagePath = this.app.$getPagePathLogin(to.fullPath);
+        if (process.env.SERVER) {
+          try {
+            this.app.$redirect(pagePath);
+          } catch (err: any) {
+            this.$errorHandler(err);
+          }
+          return false;
         }
-        return false;
+        return pagePath;
       }
       const siteId = this.sys.env.SITE_ID;
       const siteAdmitted =
         !!siteId && !!this.$passport.roles?.some(role => role.siteIds.includes(siteId));
       if (!siteAdmitted) {
-        try {
-          this.app.$gotoAccessDenied();
-        } catch (err: any) {
-          this.$errorHandler(err);
+        const pagePath = this.app.$getPagePathAccessDenied();
+        if (process.env.SERVER) {
+          try {
+            this.app.$redirect(pagePath);
+          } catch (err: any) {
+            this.$errorHandler(err);
+          }
+          return false;
         }
-        return false;
+        return { path: pagePath, replace: true };
       }
     });
     router.beforeResolve(async to => {

package/zova/src/suite/a-home/modules/home-indexweb/src/.metadata/index.ts

@@ -35,7 +35,7 @@ export interface IPagePathRecord {
   '/home/indexweb/home/:locale?': TypePagePathSchema<NSControllerPageHome.ParamsInput,undefined>;
 }
 export interface IPageNameRecord {
-  'home-indexweb:home': undefined;
+  'home-indexweb:home': TypePagePathSchema<NSControllerPageHome.ParamsInput,undefined>;
 }
 }
 export const pagePathSchemas = {
@@ -77,5 +77,5 @@ declare module 'zova' {
 
   
 }
-  
+
 /** scope: end */

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

@@ -31,17 +31,21 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;
+  private viewportWidth: number = 0;
+  private _windowResizeHandler?: () => void;
 
   protected async __init__() {
+    // viewport
+    if (process.env.CLIENT) {
+      this._windowResizeHandler = () => {
+        this.viewportWidth = document.documentElement.clientWidth;
+      };
+      this._windowResizeHandler();
+      window.addEventListener('resize', this._windowResizeHandler);
+    }
     // belowBreakpoint
     this.belowBreakpoint = this.$computed(() => {
-      let width;
-      if (process.env.SERVER) {
-        width = 0;
-      } else {
-        width = document.documentElement.clientWidth;
-      }
-      return width <= this.sys.config.layout.sidebar.breakpoint;
+      return this.viewportWidth <= this.sys.config.layout.sidebar.breakpoint;
     });
     // leftDrawerOpen
     this.leftDrawerOpen = this.$customRef(() => {
@@ -72,6 +76,12 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
     await this._initTabs();
   }
 
+  protected __dispose__() {
+    if (this._windowResizeHandler) {
+      window.removeEventListener('resize', this._windowResizeHandler);
+    }
+  }
+
   private async _initTabs() {
     const configTabs = this.scope.config.tabs;
     const tabsOptions: ModelTabsOptions = {

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

@@ -35,7 +35,7 @@ export class RenderHeader extends BeanRenderBase {
             </button>
           </div>
           <div class="text-xl px-4">{this.sys.env.APP_TITLE}</div>
-          <div class="mx-2 flex-2 px-2">{this.$$r.$$renderTabs.renderTabItems()}</div>
+          <div class="mx-2 min-w-0 flex-2 px-2">{this.$$r.$$renderTabs.renderTabItems()}</div>
           <div class="hidden flex-none lg:block">
             <ul class="menu menu-horizontal">
               {this.$$r.$$renderLocale.render()}

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

@@ -34,17 +34,21 @@ export class ControllerLayoutWeb extends BeanControllerBase {
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;
+  private viewportWidth: number = 0;
+  private _windowResizeHandler?: () => void;
 
   protected async __init__() {
+    // viewport
+    if (process.env.CLIENT) {
+      this._windowResizeHandler = () => {
+        this.viewportWidth = document.documentElement.clientWidth;
+      };
+      this._windowResizeHandler();
+      window.addEventListener('resize', this._windowResizeHandler);
+    }
     // belowBreakpoint
     this.belowBreakpoint = this.$computed(() => {
-      let width;
-      if (process.env.SERVER) {
-        width = 0;
-      } else {
-        width = document.documentElement.clientWidth;
-      }
-      return width <= this.sys.config.layout.sidebar.breakpoint;
+      return this.viewportWidth <= this.sys.config.layout.sidebar.breakpoint;
     });
     // leftDrawerOpen
     this.leftDrawerOpen = this.$customRef(() => {
@@ -70,6 +74,12 @@ export class ControllerLayoutWeb extends BeanControllerBase {
     await this._initTabs();
   }
 
+  protected __dispose__() {
+    if (this._windowResizeHandler) {
+      window.removeEventListener('resize', this._windowResizeHandler);
+    }
+  }
+
   private async _initTabs() {
     const configTabs = this.scope.config.tabs;
     const tabsOptions: ModelTabsOptions = {

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.41",
+  "version": "5.1.42",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/.metadata/index.ts

@@ -87,9 +87,9 @@ export interface IPagePathRecord {
 '/rest/resource/:resource': TypePagePathSchema<NSControllerPageResource.ParamsInput,undefined>;
 }
 export interface IPageNameRecord {
-  'rest-resource:entry': undefined;
-'rest-resource:entryCreate': undefined;
-'rest-resource:resource': undefined;
+  'rest-resource:entry': TypePagePathSchema<NSControllerPageEntry.ParamsInput,undefined>;
+'rest-resource:entryCreate': TypePagePathSchema<NSControllerPageEntryCreate.ParamsInput,undefined>;
+'rest-resource:resource': TypePagePathSchema<NSControllerPageResource.ParamsInput,undefined>;
 }
 }
 export const pagePathSchemas = {
@@ -145,5 +145,5 @@ declare module 'zova' {
 
   
 }
-  
+
 /** scope: end */

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/model/resource.ts

@@ -62,6 +62,7 @@ export class ModelResource<
     await super.__init__(resource);
     this.resource = resource;
     this.permissions = this.$computed(() => {
+      if (this.sys.config.ssr.cookieDisabledOnServer) return;
       const permissions = this.$sdk.getPermissions(this.resource);
       return permissions.data;
     });

package/zova/src/suite-vendor/a-cabloy/package.json

@@ -1,13 +1,13 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.42",
+  "version": "5.1.43",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
   "files": [],
   "type": "module",
   "dependencies": {
-    "zova-module-rest-resource": "^5.1.41"
+    "zova-module-rest-resource": "^5.1.42"
   },
   "title": "a-cabloy"
 }

package/zova/src/suite-vendor/a-zova/modules/a-bean/cli/controller/metadata/generateMetaPage.ts

@@ -70,7 +70,9 @@ export async function generateMetaPage(
       // contentPathRecords.push(_combineContentPathRecord(routePathFull, `\`${apiPath3}\``, hasSchemaQuery, className));
       // contentPathRecords.push(_combineContentPathRecord(routePathFull, hasSchemaParams, hasSchemaQuery, className));
       //
-      contentNameRecords.push(`'${routeNameFull}': undefined;`);
+      contentNameRecords.push(
+        _combineContentPathRecord(routeNameFull, hasSchemaParams, hasSchemaQuery, namespace),
+      );
     }
     // schema
     if (!routeName) {

package/zova/src/suite-vendor/a-zova/modules/a-bean/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-fetch",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [
@@ -35,7 +35,7 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "axios": "^1.16.1"
+    "axios": "^1.18.1"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.45",
+  "version": "5.1.46",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/model/sdk.ts

@@ -65,7 +65,9 @@ export class ModelSdk extends BeanModelBase {
         const bootstrap = await this.$$sysSdk.loadBootstrap(this.$fetch, resource);
         if (!bootstrap) throw new Error('load bootstrap error');
         if (process.env.SERVER) {
-          await $QueryEnsureLoaded(() => this.getPermissions(resource));
+          if (!this.sys.config.ssr.cookieDisabledOnServer) {
+            await $QueryEnsureLoaded(() => this.getPermissions(resource));
+          }
         } else {
           await this.$refetchQueries({ queryKey: ['permissions', resource] });
         }

package/zova/src/suite-vendor/a-zova/modules/a-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.30",
+  "version": "5.1.31",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-router/src/bean/sys.router.ts

@@ -98,13 +98,7 @@ export class SysRouter extends BeanBase {
     absolute?: boolean,
   ) {
     const query = options?.query;
-    let params = options?.params;
-    const paramsLocale = cast(params)?.locale;
-    if (paramsLocale !== undefined) {
-      const localeCurrent = paramsLocale === true ? this.app.meta.locale.current : paramsLocale;
-      const locale = localeCurrent === this.sys.config.locale.default ? undefined : localeCurrent;
-      params = Object.assign({}, params, { locale });
-    }
+    const params = this._normalizePageParams(options?.params);
     const pagePath = combineParamsAndQuery(path, { params, query });
     return absolute ? this.sys.util.getAbsoluteUrlFromPagePath(pagePath) : pagePath;
   }
@@ -236,6 +230,38 @@ export class SysRouter extends BeanBase {
     });
   }
 
+  getAliasPath<K extends keyof IPageNameRecord>(
+    name: K,
+    options?: IPageNameRecord[K],
+    absolute?: boolean,
+  ): string | undefined {
+    const alias = this.sys.config.routes.name[name]?.alias;
+    if (!alias) return;
+    const params = this._normalizePageParams(cast(options)?.params);
+    const query = cast(options)?.query;
+    const aliasName = `$alias:${name}` as never;
+    const routeAlias = this._resolveNameOrPath(query, query => {
+      const route = this.router.resolve({
+        name: this.router.hasRoute(aliasName) ? aliasName : name,
+        params,
+        query,
+      });
+      return route.fullPath;
+    });
+    const pagePath = routeAlias.startsWith('/__alias__')
+      ? routeAlias.substring('/__alias__'.length) || '/'
+      : routeAlias;
+    return absolute ? this.sys.util.getAbsoluteUrlFromPagePath(pagePath) : pagePath;
+  }
+
+  private _normalizePageParams(params) {
+    const paramsLocale = cast(params)?.locale;
+    if (paramsLocale === undefined) return params;
+    const localeCurrent = paramsLocale === true ? this.app.meta.locale.current : paramsLocale;
+    const locale = localeCurrent === this.sys.config.locale.default ? undefined : localeCurrent;
+    return Object.assign({}, params, { locale });
+  }
+
   private _resolveNameOrPath(query, fn) {
     const query1 = {};
     const query2: any = [];
@@ -320,10 +346,11 @@ export class SysRouter extends BeanBase {
     }
     // name alias
     if (name && configRoute?.alias) {
+      const alias = Array.isArray(configRoute.alias) ? configRoute.alias[0] : configRoute.alias;
       // add extra route
       this.router.addRoute({
         name: `$alias:${name}`,
-        path: `/__alias__${configRoute?.alias}`,
+        path: `/__alias__${alias}`,
         redirect: '',
       });
     }