cabloy 5.1.48 → 5.1.50

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 5.1.50
+
+### Features
+
+- Update tab-related behavior and rendering.
+
+### Bug Fixes
+
+- Reset tabs when the layout refreshes.
+- Improve active tab route matching.
+- Handle alias routes correctly for active tabs.
+- Improve navigation for localized home routes.
+
+### Improvements
+
+- Refine tab rendering logic.
+
+## 5.1.49
+
+### Features
+
+- Add typed locale parameters for the home page.
+- Support route parameters in router navigation.
+
+### Bug Fixes
+
+- Resolve localized menu page paths.
+
+### Improvements
+
+- Update `render.tabs.tsx`.
+
 ## 5.1.48
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.48",
+  "version": "5.1.50",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/zova/env/.env.cabloyBasicWeb

@@ -1,3 +1,5 @@
+ROUTER_PAGE_HOME = /:locale
+
 LAYOUT_COMPONENT_DEFAULT = home-layoutweb:layoutWeb
 LAYOUT_SIDEBAR_LEFTOPENPC = false
 

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.91",
+  "version": "5.1.93",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.48",
-    "zova-suite-a-zova": "^5.1.90"
+    "zova-suite-a-zova": "^5.1.92"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -131,7 +131,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.53
+        specifier: ^1.1.54
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -667,7 +667,7 @@ importers:
         specifier: ^3.5.32
         version: 3.5.34(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -808,10 +808,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.89
+        specifier: ^5.1.90
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -939,7 +939,7 @@ importers:
         specifier: ^5.1.18
         version: link:modules/a-app
       zova-module-a-bean:
-        specifier: ^5.1.24
+        specifier: ^5.1.25
         version: link:modules/a-bean
       zova-module-a-behavior:
         specifier: ^5.1.19
@@ -1005,7 +1005,7 @@ importers:
         specifier: ^5.1.23
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.59
+        specifier: ^5.1.60
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1344,7 +1344,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.53
+        specifier: ^1.1.54
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':

package/zova/src/suite/a-demo/modules/demo-basic/src/page/toolTwo/controller.tsx

@@ -1,4 +1,3 @@
-import { RouterLink } from '@cabloy/vue-router';
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
@@ -27,7 +26,6 @@ export class ControllerPageToolTwo extends BeanControllerPageBase {
         <div>{`id: ${pageData?.id}`}</div>
         <div>{`name: ${pageData?.name}`}</div>
         <div>{`married: ${pageData?.married}`}</div>
-        <RouterLink to={this.sys.env.ROUTER_PAGE_HOME}>Go Home</RouterLink>
       </div>
     );
   }

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

@@ -1,5 +1,6 @@
 export default {
   Home: 'Home',
+  GoHome: 'Go Home',
   LanguageEnglish: 'English',
   LanguageChinese: 'Chinese',
 };

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

@@ -1,5 +1,6 @@
 export default {
   Home: '主页',
+  GoHome: '返回首页',
   LanguageEnglish: '英语',
   LanguageChinese: '简体中文',
 };

package/zova/src/suite/a-home/modules/home-base/src/page/errorNotFound/controller.tsx

@@ -1,4 +1,3 @@
-import { RouterLink } from '@cabloy/vue-router';
 import { classes } from 'typestyle';
 import { BeanControllerPageBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
@@ -26,7 +25,14 @@ export class ControllerPageErrorNotFound extends BeanControllerPageBase {
         <div>
           <div class={this.cTitle}>404</div>
           <div class={this.cDescription}>Oops. Nothing here...</div>
-          <RouterLink to={this.sys.env.ROUTER_PAGE_HOME}>Go Home</RouterLink>
+          <button
+            class="btn btn-primary"
+            onClick={() => {
+              this.app.$gotoHome();
+            }}
+          >
+            {this.scope.locale.GoHome()}
+          </button>
         </div>
       </div>
     );

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

@@ -26,12 +26,13 @@ declare module 'zova' {
 /** controller: end */
 /** pages: begin */
 export * from './page/home.js';
+import { NSControllerPageHome } from './page/home.js';
 export * from '../routes.js';
 import { TypePagePathSchema } from 'zova-module-a-router';
 import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
-  '/home/indexweb/home/:locale?': TypePagePathSchema<undefined,undefined>;
+  '/home/indexweb/home/:locale?': TypePagePathSchema<NSControllerPageHome.ParamsInput,undefined>;
 }
 export interface IPageNameRecord {
   'home-indexweb:home': undefined;
@@ -41,10 +42,15 @@ export const pagePathSchemas = {
 
 };
 export const pageNameSchemas = {
-
+'home-indexweb:home': {
+          params: NSControllerPageHome.paramsSchema,
+          
+        },
 };
 declare module 'zova-module-home-indexweb' {
-  
+  export interface ControllerPageHome {
+        $params: NSControllerPageHome.ParamsOutput;
+      }
 }
 /** pages: end */
 

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

@@ -1,5 +1,12 @@
+import { z } from 'zod';
 import { createZovaComponentPage } from 'zova';
 
 import { ControllerPageHome } from '../../page/home/controller.jsx';
+import { ControllerPageHomeSchemaParams } from '../../page/home/controller.jsx';
+export namespace NSControllerPageHome {
+  export const paramsSchema = ControllerPageHomeSchemaParams;
+  export type ParamsInput = z.input<typeof ControllerPageHomeSchemaParams>;
+  export type ParamsOutput = z.output<typeof ControllerPageHomeSchemaParams>;
+}
 
 export const ZPageHome = createZovaComponentPage(ControllerPageHome, undefined, undefined);

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

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { BeanControllerPageBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+export const ControllerPageHomeSchemaParams = z.object({
+  locale: z.string().optional(),
+});
+
 @Controller()
 export class ControllerPageHome extends BeanControllerPageBase {
   public message: string;

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

@@ -49,8 +49,12 @@ export class ModelMenu extends BeanModelBase {
         });
         const menus = data.menus
           ?.map(item => {
-            if (item.link && !this.$router.isRouterName(item.link) && item.meta?.params) {
-              const link = this.sys.util.apiActionPathTranslate(item.link, item.meta?.params);
+            if (item.external || !item.link) return item;
+            if (this.$router.isRouterName(item.link)) {
+              const link = this.$router.resolveName(item.link as never, item.meta as never);
+              return { ...item, link };
+            } else if (item.meta?.params || item.meta?.query) {
+              const link = this.$router.getPagePath(item.link as never, item.meta as never);
               return { ...item, link };
             }
             return item;

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

@@ -92,7 +92,7 @@ export class ControllerLayoutWeb extends BeanControllerBase {
         return this.$$modelMenu.retrieveMenus().data;
       },
       () => {
-        this.$$modelTabs.updateAllTabInfos(this._getInitialTabs());
+        this.$$modelTabs.resetAllTabInfos();
       },
     );
   }

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

@@ -22,13 +22,10 @@ export class RenderLocale extends BeanRenderBase {
                     <a
                       onClick={event => {
                         if (metaLocale) {
-                          const fullPath = this.$router.resolveName(currentRoute.name as any, {
-                            params: Object.assign({}, currentRoute.params, {
-                              locale: key === this.sys.config.locale.default ? '' : key,
-                            }),
+                          this.app.$gotoPage(currentRoute.matched[0].path, {
+                            params: { ...currentRoute.params, locale: key },
                             query: currentRoute.query,
                           });
-                          this.$router.push(fullPath);
                         } else {
                           this.$$serviceLocale.setLocale(key as any);
                         }

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

@@ -16,7 +16,6 @@ export class RenderTabs extends BeanRenderBase {
   public renderTabs(): VNode | undefined {
     const $$modelTabs = this.$$modelTabs;
     if (!$$modelTabs) return;
-
     const domTabs = $$modelTabs.tabs.map(tab => {
       return this._renderMenuItem(tab.info as TypeMenuItem, true, tab.tabKey);
     });
@@ -144,18 +143,7 @@ export class RenderTabs extends BeanRenderBase {
 
   private _isMenuLeafCurrent(item: TypeMenuLeaf): boolean {
     if (item.external || !item.link) return false;
-    const currentRoute = this.$currentRoute;
-    if (!currentRoute) return false;
-    const fullPath = this.$router.isRouterName(item.link)
-      ? this.$router.resolveName(
-          item.link as never,
-          {
-            params: item.meta?.params,
-            query: item.meta?.query,
-          } as never,
-        )
-      : this.$router.resolvePath(item.link as never, item.meta?.query as never);
-    return currentRoute.fullPath === fullPath;
+    return this.$router.checkActiveOfFullPath(item.link);
   }
 
   private _getMenuItemKey(item: TypeMenuItem): string {

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

@@ -49,8 +49,12 @@ export class ModelMenu extends BeanModelBase {
         });
         const menus = data.menus
           ?.map(item => {
-            if (item.link && !this.$router.isRouterName(item.link) && item.meta?.params) {
-              const link = this.sys.util.apiActionPathTranslate(item.link, item.meta?.params);
+            if (item.external || !item.link) return item;
+            if (this.$router.isRouterName(item.link)) {
+              const link = this.$router.resolveName(item.link as never, item.meta as never);
+              return { ...item, link };
+            } else if (item.meta?.params || item.meta?.query) {
+              const link = this.$router.getPagePath(item.link as never, item.meta as never);
               return { ...item, link };
             }
             return item;

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

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

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

@@ -1,6 +1,7 @@
 import type {
   RouteLocationMatched,
   RouteLocationNormalizedLoaded,
+  RouteLocationNormalizedLoadedGeneric,
   RouteLocationResolvedGeneric,
   Router,
   RouterOptions,
@@ -18,7 +19,7 @@ import {
 import { BeanBase, cast, deepExtend } from 'zova';
 import { Sys } from 'zova-module-a-bean';
 
-import { getRealRouteName, getRouteMatched, isRouterName } from '../lib/utils.js';
+import { getCurrentRoute, getRealRouteName, getRouteMatched, isRouterName } from '../lib/utils.js';
 import {
   IModuleRoute,
   IModuleRouteComponent,
@@ -96,10 +97,15 @@ export class SysRouter extends BeanBase {
     options?: IPagePathRecord[K],
     absolute?: boolean,
   ) {
-    const pagePath = combineParamsAndQuery(path, {
-      params: options?.params,
-      query: options?.query,
-    });
+    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 pagePath = combineParamsAndQuery(path, { params, query });
     return absolute ? this.sys.util.getAbsoluteUrlFromPagePath(pagePath) : pagePath;
   }
 
@@ -138,6 +144,28 @@ export class SysRouter extends BeanBase {
     return this.sys.meta.module.exists(moduleName);
   }
 
+  public checkActiveOfFullPath(
+    fullPath: string,
+    currentRoute?: RouteLocationNormalizedLoadedGeneric,
+  ): boolean {
+    if (!currentRoute) {
+      currentRoute = getCurrentRoute(this.ctx)?.value;
+    }
+    if (!currentRoute) return false;
+    if (currentRoute.fullPath === fullPath) return true;
+    if (!currentRoute.matched || currentRoute.matched.length === 0) return false;
+    return currentRoute.matched.some(routeAlias => {
+      const fullPathAlias = this.getPagePath(
+        routeAlias.path as never,
+        {
+          params: currentRoute.params,
+          query: currentRoute.query,
+        } as never,
+      );
+      return fullPathAlias === fullPath;
+    });
+  }
+
   public async ensureRoute(pagePath: string) {
     // try to resolve, support alias route
     let route = this._vueRouterSys.resolve(pagePath);
@@ -208,13 +236,6 @@ export class SysRouter extends BeanBase {
     });
   }
 
-  resolvePath<K extends keyof IPagePathRecord>(path: K, query?: IPagePathRecord[K]): string {
-    return this._resolveNameOrPath(query, query => {
-      const route = this.router.resolve({ path, query });
-      return route.fullPath;
-    });
-  }
-
   private _resolveNameOrPath(query, fn) {
     const query1 = {};
     const query2: any = [];

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

@@ -2,7 +2,6 @@ import type { IModule } from '@cabloy/module-info';
 import type { IMonkeyModuleSys, IMonkeySysApplicationInitialize, ZovaApplication } from 'zova';
 import type { ErrorSSR } from 'zova-module-a-ssr';
 
-import { combineQueries } from '@cabloy/utils';
 import { BeanSimple, cast, isHttpUrl } from 'zova';
 
 import type { SysRouter } from './bean/sys.router.js';
@@ -58,12 +57,18 @@ export class MonkeySys
       if (options?.returnTo) {
         const returnTo =
           typeof options?.returnTo === 'string' ? options?.returnTo : app.$getCurrentPagePath();
-        if (returnTo !== app.sys.env.ROUTER_PAGE_HOME) {
+        if (returnTo !== app.$getPagePathHome()) {
           query[app.sys.env.ROUTER_KEY_RETURNTO] = returnTo;
         }
       }
-      // combineQueries
-      pagePath = combineQueries(pagePath, query);
+      // combineParamsAndQuery
+      pagePath = app.meta.$router.getPagePath(
+        pagePath as never,
+        {
+          params: options?.params,
+          query,
+        } as never,
+      );
       // redirect
       if (process.env.SERVER || options?.forceRedirect) {
         return app.$redirect(pagePath);
@@ -75,8 +80,9 @@ export class MonkeySys
         return app.meta.$router[options?.replace ? 'replace' : 'push'](pagePath);
       }
     };
-    app.$gotoHome = () => {
-      return app.$gotoPage(app.sys.env.ROUTER_PAGE_HOME);
+    app.$gotoHome = (options?: IGotoPageOptions) => {
+      const pagePath = app.$getPagePathHome(options);
+      return app.$gotoPage(pagePath, { ...options, params: undefined });
     };
     app.$gotoLogin = (returnTo?: string, cause?: string) => {
       if (!returnTo && cast(app.meta.$router.currentRoute)?.path === app.sys.env.ROUTER_PAGE_LOGIN)
@@ -97,7 +103,7 @@ export class MonkeySys
       const pagePath =
         returnTo ||
         cast(app.meta.$router.currentRoute)?.query?.[app.sys.env.ROUTER_KEY_RETURNTO] ||
-        app.sys.env.ROUTER_PAGE_HOME;
+        app.$getPagePathHome();
       return pagePath;
     };
     app.$getCurrentPagePath = (): string | undefined => {
@@ -109,5 +115,16 @@ export class MonkeySys
       }
       return cast(app.meta.$router.currentRoute)?.fullPath;
     };
+    app.$getPagePathHome = (options?: IGotoPageOptions): string => {
+      let params = options?.params;
+      if (params?.locale === undefined) {
+        params = Object.assign({}, params, { locale: true });
+      }
+      // not handle options?.query
+      return app.meta.$router.getPagePath(
+        app.sys.env.ROUTER_PAGE_HOME as never,
+        { params } as never,
+      );
+    };
   }
 }

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

@@ -50,11 +50,12 @@ declare module 'zova' {
   export interface ZovaApplication {
     $redirect(pagePath: string, status?: 301 | 302): never;
     $gotoPage(pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult;
-    $gotoHome(): TypeGotoPageResult;
+    $gotoHome(options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoLogin(returnTo?: string, cause?: string): TypeGotoPageResult;
     $gotoReturnTo(returnTo?: string): TypeGotoPageResult;
     $getReturnTo(returnTo?: string): string;
     $getCurrentPagePath(): string | undefined;
+    $getPagePathHome(options?: IGotoPageOptions): string;
   }
 
   export interface AppMeta {

package/zova/src/suite-vendor/a-zova/modules/a-router/src/types/utils.ts

@@ -1,7 +1,8 @@
+import { IParamsAndQuery } from '@cabloy/utils';
+
 export const SymbolRouterHistory = Symbol('SymbolRouterHistory');
 
-export interface IGotoPageOptions {
-  query?: object;
+export interface IGotoPageOptions extends IParamsAndQuery {
   returnTo?: string | boolean;
   forceRedirect?: boolean;
   replace?: boolean;

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-routertabs",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "routertabs",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-routertabs/src/model/tabs.ts

@@ -183,6 +183,10 @@ export class ModelTabs extends BeanModelBase {
     return true;
   }
 
+  resetAllTabInfos() {
+    this.tabs = this._getInitialTabs() as RouteTab[];
+  }
+
   updateAllTabInfos(tabInitials?: RouteTabInitial[]) {
     for (const tab of this.tabs) {
       const tabInitial = tabInitials?.find(item => item.tabKey === tab.tabKey);

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.90",
+  "version": "5.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "zova-module-a-meta": "^5.1.15",
     "zova-module-a-model": "^5.1.23",
     "zova-module-a-openapi": "^5.1.30",
-    "zova-module-a-router": "^5.1.21",
+    "zova-module-a-router": "^5.1.23",
     "zova-module-a-routerstack": "^5.1.20",
-    "zova-module-a-routertabs": "^5.1.24",
+    "zova-module-a-routertabs": "^5.1.25",
     "zova-module-a-ssr": "^5.1.18",
     "zova-module-a-ssrhmr": "^5.1.16",
     "zova-module-a-ssrserver": "^5.1.15",