cabloy 5.1.40 → 5.1.42

package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/src/bean/ssrSite.admin.ts

@@ -5,7 +5,7 @@ import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
 
 declare module 'vona-module-a-ssr' {
   export interface ISsrSitePublicPathRecord {
-    '': never;
+    admin: never;
   }
 }
 
@@ -20,7 +20,7 @@ export interface ISsrSiteOptionsAdmin extends IDecoratorSsrSiteOptions<
 > {}
 
 @SsrSite<ISsrSiteOptionsAdmin>({
-  publicPath: '',
+  publicPath: 'admin',
   bundlePath: 'ssr-cabloyBasicAdmin-5.0.0',
 })
 export class SsrSiteAdmin extends BeanSsrSiteBase<ISsrSiteOptionsAdmin> {}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "vona-module-basic-siteweb",
+  "version": "5.0.0",
+  "description": "",
+  "keywords": [
+    "Vona Module"
+  ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src",
+    "zovaRest"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :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,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "basic-siteweb",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
+  }
+}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/index.ts

@@ -0,0 +1,87 @@
+// eslint-disable
+/** ssrSite: begin */
+export * from '../bean/ssrSite.web.ts';
+import type { ISsrSiteOptionsWeb } from '../bean/ssrSite.web.ts';
+import 'vona-module-a-ssr';
+declare module 'vona-module-a-ssr' {
+  
+    export interface ISsrSiteRecord {
+      'basic-siteweb:web': ISsrSiteOptionsWeb;
+    }
+
+  
+}
+declare module 'vona-module-basic-siteweb' {
+  
+        export interface SsrSiteWeb {
+          /** @internal */
+          get scope(): ScopeModuleBasicSiteweb;
+        }
+
+          export interface SsrSiteWeb {
+            get $beanFullName(): 'basic-siteweb.ssrSite.web';
+            get $onionName(): 'basic-siteweb:web';
+            get $onionOptions(): ISsrSiteOptionsWeb;
+          } 
+}
+/** ssrSite: end */
+/** ssrMenu: begin */
+export * from '../bean/ssrMenu.home.ts';
+import type { ISsrMenuOptionsHome } from '../bean/ssrMenu.home.ts';
+import 'vona-module-a-ssr';
+declare module 'vona-module-a-ssr' {
+  
+    export interface ISsrMenuRecord {
+      'basic-siteweb:home': ISsrMenuOptionsHome;
+    }
+
+  
+}
+declare module 'vona-module-basic-siteweb' {
+  
+        export interface SsrMenuHome {
+          /** @internal */
+          get scope(): ScopeModuleBasicSiteweb;
+        }
+
+          export interface SsrMenuHome {
+            get $beanFullName(): 'basic-siteweb.ssrMenu.home';
+            get $onionName(): 'basic-siteweb:home';
+            get $onionOptions(): ISsrMenuOptionsHome;
+          } 
+}
+/** ssrMenu: end */
+/** locale: begin */
+import { locales } from './locales.ts';
+/** locale: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleBasicSiteweb extends BeanScopeBase {}
+
+export interface ScopeModuleBasicSiteweb {
+  util: BeanScopeUtil;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'basic-siteweb': ScopeModuleBasicSiteweb;
+  }
+
+  export interface IBeanScopeContainer {
+    basicSiteweb: ScopeModuleBasicSiteweb;
+  }
+  
+  
+
+  export interface IBeanScopeLocale {
+    'basic-siteweb': (typeof locales)[TypeLocaleBase];
+  }
+
+  
+}
+/** scope: end */

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/locales.ts

@@ -0,0 +1,18 @@
+import type { TypeLocaleBase } from 'vona';
+
+import { $makeLocaleMagic } from 'vona';
+
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
+  return $makeLocaleMagic(`basic-siteweb::${key}`, ...args);
+}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'basic-siteweb';
+export { ScopeModuleBasicSiteweb as ScopeModule } from './index.ts';

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrMenu.home.ts

@@ -0,0 +1,26 @@
+import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
+import type { ISsrSiteOptionsWeb } from 'vona-module-basic-siteweb';
+
+import { BeanBase } from 'vona';
+import { $order } from 'vona-module-a-openapiutils';
+import { SsrMenu } from 'vona-module-a-ssr';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface ISsrMenuOptionsHome extends IDecoratorSsrMenuOptions<ISsrSiteOptionsWeb> {}
+
+@SsrMenu<ISsrMenuOptionsHome>({
+  item: {
+    title: $locale('Home'),
+    order: $order(1, 'core'),
+    icon: '::home',
+    link: '/home/indexweb/home/:locale?',
+    meta: {
+      params: {
+        locale: true,
+      },
+    },
+  },
+  site: ['basic-siteweb:web'],
+})
+export class SsrMenuHome extends BeanBase {}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrSite.web.ts

@@ -0,0 +1,26 @@
+import type { IDecoratorSsrSiteOptions } from 'vona-module-a-ssr';
+import type { IIconRecord, IPagePathRecord } from 'zova-rest-cabloy-basic-web';
+
+import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
+
+declare module 'vona-module-a-ssr' {
+  export interface ISsrSitePublicPathRecord {
+    '': never;
+  }
+}
+
+export interface ISsrSiteOptionsWebPages extends IPagePathRecord {}
+
+export interface ISsrSiteOptionsWebPagesData {}
+
+export interface ISsrSiteOptionsWeb extends IDecoratorSsrSiteOptions<
+  ISsrSiteOptionsWebPages,
+  ISsrSiteOptionsWebPagesData,
+  IIconRecord
+> {}
+
+@SsrSite<ISsrSiteOptionsWeb>({
+  publicPath: '',
+  bundlePath: 'ssr-cabloyBasicWeb-5.0.0',
+})
+export class SsrSiteWeb extends BeanSsrSiteBase<ISsrSiteOptionsWeb> {}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/en-us.ts

@@ -0,0 +1,3 @@
+export default {
+  Home: 'Home',
+};

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/zh-cn.ts

@@ -0,0 +1,3 @@
+export default {
+  Home: '首页',
+};

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/index.ts

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

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/tsconfig.build.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "rootDir": "src",
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "dist"
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
+}

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json", "test"]
+}

package/vona/src/suite/cabloy-basic/package.json

@@ -8,6 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-basic-siteadmin": "workspace:^",
+    "vona-module-basic-siteweb": "^5.0.0",
     "vona-suite-a-cabloy": "^5.1.25"
   },
   "title": "cabloy-basic"

package/vona/src/suite/cabloy-basic/tsconfig.json

@@ -4,6 +4,9 @@
   "references": [
     {
       "path": "modules/basic-siteadmin/tsconfig.build.json"
+    },
+    {
+      "path": "modules/basic-siteweb/tsconfig.build.json"
     }
   ],
   "exclude": ["modules"]

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrMenu.ts

@@ -1,8 +1,6 @@
 import type { ILocaleRecord, OmitNever } from 'vona';
 import type { IMenuItem } from 'vona-module-a-menu';
 import type { IOnionOptionsEnable, ServiceOnion } from 'vona-module-a-onion';
-import type { IResourceRecord } from 'vona-module-a-openapi';
-import type { TypeRequestMethod } from 'vona-module-a-web';
 
 import type { ISsrMenuGroupRecord } from './ssrMenuGroup.ts';
 import type { IDecoratorSsrSiteOptions, ISsrSiteRecord } from './ssrSite.ts';
@@ -41,14 +39,3 @@ declare module 'vona' {
     ssrMenu: never;
   }
 }
-
-declare module 'vona-module-a-menu' {
-  export interface IMenuItemMetaParams {
-    resource?: keyof IResourceRecord;
-  }
-
-  export interface IMenuItemMetaQuery {
-    api?: string;
-    apiMethod?: TypeRequestMethod;
-  }
-}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.25",
+  "version": "5.1.26",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-vona/modules/a-menu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-menu",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-menu/src/types/menu.ts

@@ -1,12 +1,22 @@
 import type { ILocaleMagic } from 'vona';
+import type { IResourceRecord } from 'vona-module-a-openapi';
+import type { TypeRequestMethod } from 'vona-module-a-web';
 
 export interface IMenus<Pages extends {} = any, Icons extends {} = any> {
   menus?: IMenuItem<Pages, Icons>[];
   groups?: IMenuGroup<Icons>[];
 }
 
-export interface IMenuItemMetaParams {}
-export interface IMenuItemMetaQuery {}
+export interface IMenuItemMetaParams {
+  resource?: keyof IResourceRecord;
+  locale?: true | string;
+}
+
+export interface IMenuItemMetaQuery {
+  api?: string;
+  apiMethod?: TypeRequestMethod;
+}
+
 export interface IMenuItemMeta {
   params?: IMenuItemMetaParams;
   query?: IMenuItemMetaQuery;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/env/.env

@@ -22,7 +22,7 @@ PROJECT_DISABLED_MODULES =
 PROJECT_DISABLED_SUITES =
 
 LAYOUT_COMPONENT_EMPTY = home-layoutempty:layoutEmpty
-LAYOUT_COMPONENT_DEFAULT = home-layouttabs:layoutTabs
+LAYOUT_COMPONENT_DEFAULT = home-layoutadmin:layoutAdmin
 LAYOUT_SIDEBAR_LEFTOPENPC = true
 
 STYLE_DEFAULT_THEME = home-theme:default

package/zova/env/.env.cabloyBasicWeb

@@ -1,4 +1,4 @@
-LAYOUT_COMPONENT_DEFAULT = basic-layoutweb:layoutWeb
+LAYOUT_COMPONENT_DEFAULT = home-layoutweb:layoutWeb
 LAYOUT_SIDEBAR_LEFTOPENPC = false
 
 STYLE_DEFAULT_THEME = home-theme:orange

package/zova/package.original.json

@@ -41,7 +41,12 @@
     "build:rest:cabloyBasicAdmin": "npm run prerun && npm run zova :bin:buildRest -- --flavor cabloyBasicAdmin",
     "preview:ssr:cabloyBasicAdmin": "concurrently \"node ./dist-mock/index.js\" \"node ./dist/ssr-cabloyBasicAdmin/index.js\"",
     "dev:spa:cabloyBasicAdmin": "npm run prerun && quasar dev --mode spa --flavor cabloyBasicAdmin",
-    "build:ssr:cabloyBasicBatch": "npm run build:ssr:cabloyBasicAdmin && npm run build:rest:cabloyBasicAdmin"
+    "dev:ssr:cabloyBasicWeb": "npm run prerun && quasar dev --mode ssr --flavor cabloyBasicWeb",
+    "build:ssr:cabloyBasicWeb": "npm run prerun && quasar build --mode ssr --flavor cabloyBasicWeb",
+    "build:rest:cabloyBasicWeb": "npm run prerun && zova :bin:buildRest --flavor cabloyBasicWeb",
+    "preview:ssr:cabloyBasicWeb": "concurrently \"node ./dist-mock/index.js\" \"node ./dist/ssr-cabloyBasicWeb/index.js\"",
+    "dev:spa:cabloyBasicWeb": "npm run prerun && quasar dev --mode spa --flavor cabloyBasicWeb",
+    "build:ssr:cabloyBasicBatch": "npm run build:ssr:cabloyBasicAdmin && npm run build:ssr:cabloyBasicWeb && npm run build:rest:cabloyBasicAdmin && npm run build:rest:cabloyBasicWeb"
   },
   "dependencies": {
     "@tailwindcss/postcss": "^4.2.2",

package/zova/pnpm-lock.yaml

@@ -268,15 +268,21 @@ importers:
       zova-module-home-icon:
         specifier: workspace:^
         version: link:src/suite/a-home/modules/home-icon
-      zova-module-home-index:
+      zova-module-home-indexadmin:
         specifier: workspace:^
-        version: link:src/suite/a-home/modules/home-index
+        version: link:src/suite/a-home/modules/home-indexadmin
+      zova-module-home-indexweb:
+        specifier: workspace:^
+        version: link:src/suite/a-home/modules/home-indexweb
+      zova-module-home-layoutadmin:
+        specifier: workspace:^
+        version: link:src/suite/a-home/modules/home-layoutadmin
       zova-module-home-layoutempty:
         specifier: workspace:^
         version: link:src/suite/a-home/modules/home-layoutempty
-      zova-module-home-layouttabs:
+      zova-module-home-layoutweb:
         specifier: workspace:^
-        version: link:src/suite/a-home/modules/home-layouttabs
+        version: link:src/suite/a-home/modules/home-layoutweb
       zova-module-home-login:
         specifier: workspace:^
         version: link:src/suite/a-home/modules/home-login
@@ -378,7 +384,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.0
       zova-cli-set-front:
-        specifier: ^1.2.70
+        specifier: ^1.2.71
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -1413,15 +1419,21 @@ importers:
       zova-module-home-icon:
         specifier: ^5.0.5
         version: link:modules/home-icon
-      zova-module-home-index:
+      zova-module-home-indexadmin:
         specifier: ^5.0.5
-        version: link:modules/home-index
+        version: link:modules/home-indexadmin
+      zova-module-home-indexweb:
+        specifier: ^5.0.0
+        version: link:modules/home-indexweb
+      zova-module-home-layoutadmin:
+        specifier: ^5.0.6
+        version: link:modules/home-layoutadmin
       zova-module-home-layoutempty:
         specifier: ^5.0.6
         version: link:modules/home-layoutempty
-      zova-module-home-layouttabs:
-        specifier: ^5.0.6
-        version: link:modules/home-layouttabs
+      zova-module-home-layoutweb:
+        specifier: ^5.0.0
+        version: link:modules/home-layoutweb
       zova-module-home-login:
         specifier: ^5.0.8
         version: link:modules/home-login
@@ -1459,7 +1471,25 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite/a-home/modules/home-index:
+  src/suite/a-home/modules/home-indexadmin:
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
+  src/suite/a-home/modules/home-indexweb:
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
+  src/suite/a-home/modules/home-layoutadmin:
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1477,7 +1507,7 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
-  src/suite/a-home/modules/home-layouttabs:
+  src/suite/a-home/modules/home-layoutweb:
     devDependencies:
       clean-package:
         specifier: ^2.2.0

package/zova/src/front/config/config/config.cabloyBasicAdmin.ts

@@ -0,0 +1,14 @@
+import type { ZovaConfigOptional, ZovaSys } from 'zova';
+
+export default function (_sys: ZovaSys) {
+  const config: ZovaConfigOptional = {};
+
+  // routes
+  config.routes = {
+    path: {
+      '/home/indexadmin/dashboard': { alias: '/' },
+    },
+  };
+
+  return config;
+}

package/zova/src/front/config/config/config.cabloyBasicWeb.ts

@@ -0,0 +1,17 @@
+import type { ZovaConfigOptional, ZovaSys } from 'zova';
+
+export default function (_sys: ZovaSys) {
+  const config: ZovaConfigOptional = {};
+
+  // routes
+  config.routes = {
+    path: {
+      '/home/indexadmin/dashboard': undefined,
+    },
+    name: {
+      'home-indexweb:home': { alias: '/:locale(zh-cn)?' },
+    },
+  };
+
+  return config;
+}

package/zova/src/front/config/config/config.ts

@@ -11,7 +11,7 @@ export default function (sys: ZovaSys) {
   // routes
   config.routes = {
     path: {
-      '/home/index': { alias: '/' },
+      '/home/indexadmin/dashboard': { alias: '/' },
       '/home/login': { alias: '/login' },
       '/demo/todo/todo': { alias: '/todo' },
     },
@@ -54,8 +54,8 @@ export default function (sys: ZovaSys) {
     default: env.APP_LOCALE_DEFAULT as keyof ILocaleRecord,
     storeKey: 'locale',
     items: {
-      'en-us': 'English',
-      'zh-cn': 'Chinese',
+      'en-us': 'LanguageEnglish',
+      'zh-cn': 'LanguageChinese',
     },
   };
 

package/zova/src/suite/a-demo/modules/demo-basic/package.json

@@ -48,18 +48,5 @@
       "exports.\\..import"
     ]
   },
-  "title": "demo-basic",
-  "zovaModule": {
-    "onionsConfig": {
-      "aop": {
-        "home": {
-          "match": "home-index.controller.pageHome"
-        },
-        "home3": {
-          "dependencies": "demo-basic:home",
-          "match": "regexp:///home-index\\.controller\\.pageHome/"
-        }
-      }
-    }
-  }
+  "title": "demo-basic"
 }

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

@@ -293,56 +293,6 @@ declare module 'zova' {
   }
 }
 /** render: end */
-/** aop: begin */
-export * from '../bean/aop.home.jsx';
-export * from '../bean/aop.home3.jsx';
-
-import { IDecoratorAopOptions } from 'zova-module-a-bean';
-declare module 'zova-module-a-bean' {
-  
-    export interface IAopRecord {
-      'demo-basic:home': IDecoratorAopOptions;
-'demo-basic:home3': IDecoratorAopOptions;
-    }
-
-  
-}
-declare module 'zova-module-demo-basic' {
-  
-        export interface AopHome {
-          /** @internal */
-          get scope(): ScopeModuleDemoBasic;
-        }
-
-        export interface AopHome {
-          get $beanFullName(): 'demo-basic.aop.home';
-          get $onionName(): 'demo-basic:home';
-          get $onionOptions(): IDecoratorAopOptions;
-        }
-
-        export interface AopHome3 {
-          /** @internal */
-          get scope(): ScopeModuleDemoBasic;
-        }
-
-        export interface AopHome3 {
-          get $beanFullName(): 'demo-basic.aop.home3';
-          get $onionName(): 'demo-basic:home3';
-          get $onionOptions(): IDecoratorAopOptions;
-        } 
-}
-/** aop: end */
-/** aop: begin */
-import { AopHome } from '../bean/aop.home.jsx';
-import { AopHome3 } from '../bean/aop.home3.jsx';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordLocal {
-    'demo-basic.aop.home': AopHome;
-'demo-basic.aop.home3': AopHome3;
-  }
-}
-/** aop: end */
 /** behavior: begin */
 export * from '../bean/behavior.formFieldLayout.jsx';
 import { IBehaviorOptionsFormFieldLayout } from '../bean/behavior.formFieldLayout.jsx';