cabloy 5.1.40 → 5.1.42

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

@@ -1,5 +1,6 @@
 // eslint-disable
 /** service: begin */
+export * from '../service/locale.js';
 export * from '../service/routerGuards.js';
 export * from '../service/ssr.js';
 export * from '../service/ssrLayout.js';
@@ -8,7 +9,8 @@ import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
   
     export interface IServiceRecord {
-      'home-base:routerGuards': never;
+      'home-base:locale': never;
+'home-base:routerGuards': never;
 'home-base:ssr': never;
 'home-base:ssrLayout': never;
     }
@@ -17,6 +19,17 @@ declare module 'zova-module-a-bean' {
 }
 declare module 'zova-module-home-base' {
   
+        export interface ServiceLocale {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
+        export interface ServiceLocale {
+          get $beanFullName(): 'home-base.service.locale';
+          get $onionName(): 'home-base:locale';
+          
+        }
+
         export interface ServiceRouterGuards {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -52,13 +65,15 @@ declare module 'zova-module-home-base' {
 }
 /** service: end */
 /** service: begin */
+import { ServiceLocale } from '../service/locale.js';
 import { ServiceRouterGuards } from '../service/routerGuards.js';
 import { ServiceSsr } from '../service/ssr.js';
 import { ServiceSsrLayout } from '../service/ssrLayout.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
-    'home-base.service.routerGuards': ServiceRouterGuards;
+    'home-base.service.locale': ServiceLocale;
+'home-base.service.routerGuards': ServiceRouterGuards;
 'home-base.service.ssr': ServiceSsr;
 'home-base.service.ssrLayout': ServiceSsrLayout;
   }

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

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

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

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

package/zova/src/suite/a-home/modules/home-base/src/lib/utils.ts

@@ -2,7 +2,7 @@ import type { BeanBase, BeanContainer } from 'zova';
 
 import { __ThisModule__ } from '../.metadata/this.js';
 
-export function definePropertyScopeBase(bean: BeanContainer, beanInstance: BeanBase) {
+export function definePropertyScopeBase(bean: BeanContainer, beanInstance: BeanBase): void {
   // $scopeBase
   bean.defineProperty(beanInstance, '$scopeBase', {
     enumerable: false,
@@ -12,3 +12,15 @@ export function definePropertyScopeBase(bean: BeanContainer, beanInstance: BeanB
     },
   });
 }
+
+export function closeNearestDetails(
+  event: { currentTarget?: EventTarget | null } | Event | undefined,
+): void {
+  const currentTarget = event && 'currentTarget' in event ? event.currentTarget : null;
+  if (!(currentTarget instanceof Element)) return;
+
+  const details = currentTarget.closest('details') as HTMLDetailsElement | null;
+  if (!details) return;
+
+  details.open = false;
+}

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

@@ -0,0 +1,11 @@
+import { BeanBase, ILocaleRecord } from 'zova';
+import { Service } from 'zova-module-a-bean';
+
+@Service()
+export class ServiceLocale extends BeanBase {
+  protected async __init__() {}
+
+  public setLocale(locale: keyof ILocaleRecord) {
+    this.app.meta.locale.current = locale;
+  }
+}

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

@@ -1,11 +1,17 @@
 import type { BeanRouter } from 'zova-module-a-router';
 
 import { catchError } from '@cabloy/utils';
+import { cast, Use } from 'zova';
 import { Service } from 'zova-module-a-bean';
 import { BeanRouterGuardsBase } from 'zova-module-a-router';
 
+import { ServiceLocale } from './locale.js';
+
 @Service()
 export class ServiceRouterGuards extends BeanRouterGuardsBase {
+  @Use()
+  $$serviceLocale: ServiceLocale;
+
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
       if (
@@ -30,5 +36,12 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
         }
       }
     });
+    router.beforeResolve(async to => {
+      const locale = to.meta?.locale;
+      if (locale) {
+        const localeCurrent = cast(to.params)?.locale ?? this.sys.config.locale.default;
+        this.$$serviceLocale.setLocale(localeCurrent);
+      }
+    });
   }
 }

package/zova/src/suite/a-home/modules/{home-index → home-indexadmin}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "zova-module-home-index",
+  "name": "zova-module-home-indexadmin",
   "version": "5.0.5",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "keywords": [

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

@@ -0,0 +1,75 @@
+// eslint-disable
+/** controller: begin */
+export * from '../page/dashboard/controller.jsx';
+
+import 'zova';
+declare module 'zova' {
+  
+  
+}
+declare module 'zova-module-home-indexadmin' {
+  
+        export interface ControllerPageDashboard {
+          /** @internal */
+          get scope(): ScopeModuleHomeIndexadmin;
+        } 
+}
+/** controller: end */
+/** controller: begin */
+import { ControllerPageDashboard } from '../page/dashboard/controller.jsx';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecordLocal {
+    'home-indexadmin.controller.pageDashboard': ControllerPageDashboard;
+  }
+}
+/** controller: end */
+/** pages: begin */
+export * from './page/dashboard.js';
+export * from '../routes.js';
+import { TypePagePathSchema } from 'zova-module-a-router';
+import 'zova';
+declare module 'zova-module-a-router' {
+export interface IPagePathRecord {
+  '/home/indexadmin/dashboard': TypePagePathSchema<undefined,undefined>;
+}
+export interface IPageNameRecord {
+  
+}
+}
+export const pagePathSchemas = {
+
+};
+export const pageNameSchemas = {
+
+};
+declare module 'zova-module-home-indexadmin' {
+  
+}
+/** pages: end */
+
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'zova';
+import { Scope } from 'zova-module-a-bean';
+
+@Scope()
+export class ScopeModuleHomeIndexadmin extends BeanScopeBase {}
+
+export interface ScopeModuleHomeIndexadmin {
+  util: BeanScopeUtil;
+}
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanScopeRecord {
+    'home-indexadmin': ScopeModuleHomeIndexadmin;
+  }
+  
+  
+
+  
+
+  
+}
+  
+/** scope: end */

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

@@ -0,0 +1,9 @@
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageDashboard } from '../../page/dashboard/controller.jsx';
+
+export const ZPageDashboard = createZovaComponentPage(
+  ControllerPageDashboard,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-home/modules/home-indexadmin/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'home-indexadmin';
+export { ScopeModuleHomeIndexadmin as ScopeModule } from './index.js';

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

@@ -0,0 +1,23 @@
+import { BeanControllerPageBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+@Controller()
+export class ControllerPageDashboard extends BeanControllerPageBase {
+  public message: string;
+
+  protected async __init__() {
+    this.message = 'Hello Zova';
+  }
+
+  protected render() {
+    return (
+      <div style="text-align: center;">
+        <div>
+          <div style="font-size: 36px;">{this.message}</div>
+          <div style="font-size: 24px;opacity:.4;">Less is more, while more is less</div>
+          <div>Dashboard</div>
+        </div>
+      </div>
+    );
+  }
+}

package/zova/src/suite/a-home/modules/home-indexadmin/src/routes.ts

@@ -0,0 +1,8 @@
+import type { IModuleRoute } from 'zova-module-a-router';
+
+import { ZPageDashboard } from './.metadata/page/dashboard.js';
+
+export const routes: IModuleRoute[] = [
+  //
+  { path: 'dashboard', component: ZPageDashboard },
+];

package/zova/src/suite/a-home/modules/home-indexweb/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "zova-module-home-indexweb",
+  "version": "5.0.0",
+  "description": "",
+  "keywords": [
+    "Zova Module"
+  ],
+  "author": "",
+  "files": [
+    "mock",
+    "dist",
+    "src",
+    "icons",
+    "assets"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": "./*"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && zova :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore && npm run clean"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "replace": {
+      "exports.\\..types": "./dist/index.d.ts"
+    },
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "home-indexweb"
+}

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

@@ -7,11 +7,11 @@ declare module 'zova' {
   
   
 }
-declare module 'zova-module-home-index' {
+declare module 'zova-module-home-indexweb' {
   
         export interface ControllerPageHome {
           /** @internal */
-          get scope(): ScopeModuleHomeIndex;
+          get scope(): ScopeModuleHomeIndexweb;
         } 
 }
 /** controller: end */
@@ -20,7 +20,7 @@ import { ControllerPageHome } from '../page/home/controller.jsx';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordLocal {
-    'home-index.controller.pageHome': ControllerPageHome;
+    'home-indexweb.controller.pageHome': ControllerPageHome;
   }
 }
 /** controller: end */
@@ -31,10 +31,10 @@ import { TypePagePathSchema } from 'zova-module-a-router';
 import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
-  '/home/index': TypePagePathSchema<undefined,undefined>;
+  '/home/indexweb/home/:locale?': TypePagePathSchema<undefined,undefined>;
 }
 export interface IPageNameRecord {
-  
+  'home-indexweb:home': undefined;
 }
 }
 export const pagePathSchemas = {
@@ -43,7 +43,7 @@ export const pagePathSchemas = {
 export const pageNameSchemas = {
 
 };
-declare module 'zova-module-home-index' {
+declare module 'zova-module-home-indexweb' {
   
 }
 /** pages: end */
@@ -53,16 +53,16 @@ import { BeanScopeBase, type BeanScopeUtil } from 'zova';
 import { Scope } from 'zova-module-a-bean';
 
 @Scope()
-export class ScopeModuleHomeIndex extends BeanScopeBase {}
+export class ScopeModuleHomeIndexweb extends BeanScopeBase {}
 
-export interface ScopeModuleHomeIndex {
+export interface ScopeModuleHomeIndexweb {
   util: BeanScopeUtil;
 }
 
 import 'zova';
 declare module 'zova' {
   export interface IBeanScopeRecord {
-    'home-index': ScopeModuleHomeIndex;
+    'home-indexweb': ScopeModuleHomeIndexweb;
   }
   
   

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

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'home-indexweb';
+export { ScopeModuleHomeIndexweb as ScopeModule } from './index.js';

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

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

package/zova/src/suite/a-home/modules/{home-index → home-indexweb}/src/page/home/controller.tsx

@@ -10,11 +10,13 @@ export class ControllerPageHome extends BeanControllerPageBase {
   }
 
   protected render() {
+    const localeCurrent = this.app.meta.locale.current;
     return (
       <div style="text-align: center;">
         <div>
           <div style="font-size: 36px;">{this.message}</div>
           <div style="font-size: 24px;opacity:.4;">Less is more, while more is less</div>
+          <div>{`Web: ${localeCurrent}`}</div>
         </div>
       </div>
     );

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

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

package/zova/src/suite/a-home/modules/{home-layouttabs → home-layoutadmin}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "zova-module-home-layouttabs",
+  "name": "zova-module-home-layoutadmin",
   "version": "5.0.6",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "layout",
@@ -48,5 +48,5 @@
       "exports.\\..import"
     ]
   },
-  "title": "home-layouttabs"
+  "title": "home-layoutadmin"
 }

package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/component/layoutAdmin.ts

@@ -0,0 +1,44 @@
+import type { TypeControllerInnerProps } from 'zova';
+
+import { defineComponent } from 'vue';
+import { prepareComponentOptions, useController } from 'zova';
+
+import type { ControllerLayoutAdminProps } from '../../component/layoutAdmin/controller.jsx';
+
+import { ControllerLayoutAdmin } from '../../component/layoutAdmin/controller.jsx';
+import { RenderLayoutAdmin } from '../../component/layoutAdmin/render.jsx';
+import { StyleLayoutAdmin } from '../../component/layoutAdmin/style.js';
+export type ZLayoutAdminProps = {
+  controllerRef?: (ref: ControllerLayoutAdmin) => void;
+} & ControllerLayoutAdminProps;
+
+type ControllerInnerProps = TypeControllerInnerProps<
+  ControllerLayoutAdminProps,
+  keyof typeof ControllerLayoutAdmin.$propsDefault
+>;
+declare module 'zova-module-home-layoutadmin' {
+  export interface ControllerLayoutAdmin {
+    $props: ControllerInnerProps;
+  }
+}
+declare module 'zova-module-home-layoutadmin' {
+  export interface StyleLayoutAdmin extends ControllerLayoutAdmin {}
+  export interface RenderLayoutAdmin extends StyleLayoutAdmin {}
+  export interface RenderContent extends StyleLayoutAdmin {}
+  export interface RenderHeader extends StyleLayoutAdmin {}
+  export interface RenderLocale extends StyleLayoutAdmin {}
+  export interface RenderMenu extends StyleLayoutAdmin {}
+  export interface RenderSidebar extends StyleLayoutAdmin {}
+  export interface RenderTabs extends StyleLayoutAdmin {}
+  export interface RenderTheme extends StyleLayoutAdmin {}
+  export interface RenderUser extends StyleLayoutAdmin {}
+}
+export const ZLayoutAdmin = defineComponent((_props: ZLayoutAdminProps) => {
+  useController(ControllerLayoutAdmin, RenderLayoutAdmin, StyleLayoutAdmin);
+  return () => {};
+}, prepareComponentOptions());
+declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    'home-layoutadmin:layoutAdmin': ControllerLayoutAdminProps;
+  }
+}