cabloy 5.1.40 → 5.1.42

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

@@ -0,0 +1,39 @@
+import { classes } from 'typestyle';
+import { BeanRenderBase, Use } from 'zova';
+import { Render } from 'zova-module-a-bean';
+
+import { RenderContent } from './render.content.jsx';
+import { RenderHeader } from './render.header.jsx';
+import { RenderLocale } from './render.locale.jsx';
+import { RenderTabs } from './render.tabs.jsx';
+import { RenderTheme } from './render.theme.jsx';
+
+@Render()
+export class RenderLayoutWeb extends BeanRenderBase {
+  @Use()
+  $$renderTheme: RenderTheme;
+
+  @Use()
+  $$renderLocale: RenderLocale;
+
+  @Use()
+  $$renderTabs: RenderTabs;
+
+  @Use()
+  $$renderContent: RenderContent;
+
+  @Use()
+  $$renderHeader: RenderHeader;
+
+  public render() {
+    return (
+      <div class={classes('drawer', this.leftDrawerOpen ? 'drawer-open' : false)}>
+        <input id="my-drawer-2" type="checkbox" class="drawer-toggle" />
+        <div class="drawer-content">
+          {this.$$renderHeader.render()}
+          {this.$$renderContent.render()}
+        </div>
+      </div>
+    );
+  }
+}

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

@@ -0,0 +1,20 @@
+import type { ZovaSys } from 'zova';
+
+export const config = (_sys: ZovaSys) => {
+  return {
+    layout: {
+      sidebar: {
+        width: 360,
+      },
+      navbar: {
+        height: 64,
+      },
+    },
+    tabs: {
+      scene: 'web',
+      max: 6,
+      maxItems: 6,
+      cache: false,
+    },
+  };
+};

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

@@ -0,0 +1,10 @@
+export default {
+  Home: 'Home',
+  Logout: 'Logout',
+  ThemeLight: 'Light',
+  ThemeDark: 'Dark',
+  ThemeAuto: 'Auto',
+  ThemeDefault: 'Default',
+  ThemeOrange: 'Orange',
+  ThemeBlue: 'Blue',
+};

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

@@ -0,0 +1,10 @@
+export default {
+  Home: '首页',
+  Logout: '退出登录',
+  ThemeLight: '亮色',
+  ThemeDark: '暗色',
+  ThemeAuto: '自动',
+  ThemeDefault: '默认',
+  ThemeOrange: '橘色',
+  ThemeBlue: '蓝色',
+};

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

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

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

@@ -0,0 +1,27 @@
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+
+import { UseScope } from 'zova';
+import { BeanModelBase, Model } from 'zova-module-a-model';
+import { ScopeModuleASsr } from 'zova-module-a-ssr';
+
+export interface IModelOptionsLayout extends IDecoratorModelOptions {}
+
+@Model<IModelOptionsLayout>()
+export class ModelLayout extends BeanModelBase {
+  leftDrawerOpenPC: boolean;
+
+  @UseScope()
+  $$scopeSsr: ScopeModuleASsr;
+
+  protected async __init__() {
+    this.leftDrawerOpenPC =
+      process.env.SSR && !this.$$scopeSsr.config.optimization.bodyReadyObserver
+        ? this.sys.config.layout.sidebar.leftOpenPC
+        : this.$useStateLocal({
+            queryKey: ['sidebarLeftOpenPC'],
+            meta: {
+              defaultData: this.sys.config.layout.sidebar.leftOpenPC,
+            },
+          });
+  }
+}

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

@@ -0,0 +1,115 @@
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+import type {
+  ApiSchemaAMenuDtoMenuGroup,
+  ApiSchemaAMenuDtoMenuItem,
+  ApiSchemaAMenuDtoMenus,
+} from 'zova-module-home-api';
+
+import { TypeEventOff } from 'zova';
+import { BeanModelBase, Model } from 'zova-module-a-model';
+
+export type TypeMenuGroup = ApiSchemaAMenuDtoMenuGroup & { folder: true; children: TypeMenuItem[] };
+export type TypeMenuItem = (ApiSchemaAMenuDtoMenuItem & { folder: false }) | TypeMenuGroup;
+export type TypeMenuTree = TypeMenuItem[];
+
+export interface IModelOptionsMenu extends IDecoratorModelOptions {}
+
+@Model<IModelOptionsMenu>()
+export class ModelMenu extends BeanModelBase {
+  menuTree?: TypeMenuTree;
+  private _eventSsrHmrReload: TypeEventOff;
+
+  protected async __init__() {
+    this.menuTree = this.$computed(() => {
+      const queryMenus = this.retrieveMenus();
+      if (!queryMenus.data) return;
+      return this._prepareMenuTree(queryMenus.data);
+    });
+    // event
+    if (process.env.CLIENT && this.sys.config.ssr.hmr) {
+      this._eventSsrHmrReload = this.sys.meta.event.on('a-ssrhmr:reload', async (_data, next) => {
+        await this.$refetchQueries({ queryKey: ['retrieveMenus'] });
+        return next();
+      });
+    }
+    // locale
+    this.$watch(
+      () => {
+        return this.app.meta.locale.current;
+      },
+      async () => {
+        await this.$refetchQueries({ queryKey: ['retrieveMenus'] });
+      },
+    );
+  }
+
+  protected __dispose__() {
+    if (this._eventSsrHmrReload) {
+      this._eventSsrHmrReload();
+    }
+  }
+
+  retrieveMenus() {
+    return this.$useStateData({
+      queryKey: ['retrieveMenus'],
+      queryFn: async () => {
+        const data = await this.$api.homeBaseMenu.retrieveMenus({
+          params: { publicPath: this.sys.env.APP_PUBLIC_PATH },
+        });
+        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);
+              return { ...item, link };
+            }
+            return item;
+          })
+          ?.filter(item => {
+            return !item.external || this.$router.checkPathValid(item.link);
+          });
+        return { ...data, menus };
+      },
+    });
+  }
+
+  findMenuItem(search: { name?: string; link?: string }): ApiSchemaAMenuDtoMenuItem | undefined {
+    const menus = this.retrieveMenus().data;
+    if (!menus || !menus.menus) return;
+    return menus.menus.find(
+      item => (item.name && search.name && item.name === search.name) || item.link === search.link,
+    );
+  }
+
+  private _prepareMenuTree(menus: ApiSchemaAMenuDtoMenus, groupName?: string): TypeMenuTree {
+    let children: TypeMenuItem[] = [];
+    if (menus.menus) {
+      children = children.concat(
+        menus.menus
+          ?.filter(
+            item =>
+              item.group === groupName ||
+              (Array.isArray(item.group) && item.group.includes(groupName!)),
+          )
+          .map(item => {
+            return { ...item, folder: false };
+          }),
+      );
+    }
+    if (menus.groups) {
+      const groups = menus.groups
+        .filter(
+          item =>
+            item.group === groupName ||
+            (Array.isArray(item.group) && item.group.includes(groupName!)),
+        )
+        .map(menuGroup => {
+          return Object.assign({}, menuGroup, {
+            folder: true,
+            children: this._prepareMenuTree(menus, menuGroup.name),
+          });
+        });
+      children = children.concat(groups);
+    }
+    return children.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+}

package/zova/src/suite/a-home/modules/home-layoutweb/tsconfig.build.json

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

package/zova/src/suite/a-home/modules/home-layoutweb/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {},
+  "include": ["src", "src/.metadata/**/*"]
+}

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

@@ -113,7 +113,7 @@ export class ModelPassport extends BeanModelBase {
         this._setPassportJwt();
         // page: login
         await this.app.$gotoLogin();
-        // clear: should after goto login page, avoid home-layouttabs use some cache data
+        // clear: should after goto login page, avoid home-layoutadmin use some cache data
         this.$clear(); // not await
       },
     });

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

@@ -9,9 +9,11 @@
     "zova-module-home-api": "^5.0.5",
     "zova-module-home-base": "^5.0.7",
     "zova-module-home-icon": "^5.0.5",
-    "zova-module-home-index": "^5.0.5",
+    "zova-module-home-indexadmin": "^5.0.5",
+    "zova-module-home-indexweb": "^5.0.0",
+    "zova-module-home-layoutadmin": "^5.0.6",
     "zova-module-home-layoutempty": "^5.0.6",
-    "zova-module-home-layouttabs": "^5.0.6",
+    "zova-module-home-layoutweb": "^5.0.0",
     "zova-module-home-login": "^5.0.8",
     "zova-module-home-passport": "^5.0.6",
     "zova-module-home-theme": "^5.0.5"

package/zova/src/suite/a-demo/modules/demo-basic/src/bean/aop.home.tsx

@@ -1,23 +0,0 @@
-import type { ControllerPageHome } from 'zova-module-home-index';
-
-import { BeanAopBase, polyfillDispose } from 'zova';
-import { Aop, AopActionDispose, AopActionInit, AopActionRender } from 'zova-module-a-bean';
-
-@Aop({ match: 'home-index.controller.pageHome' })
-export class AopHome extends BeanAopBase {
-  protected __init__: AopActionInit<ControllerPageHome> = async (_args, next, receiver) => {
-    await next();
-    receiver.message += '!';
-    polyfillDispose(receiver);
-  };
-
-  protected __dispose__: AopActionDispose<ControllerPageHome> = (_args, next, receiver) => {
-    receiver.message = receiver.message.substring(0, receiver.message.length - 1);
-    next();
-  };
-
-  protected render: AopActionRender<ControllerPageHome> = (_args, next, _receiver) => {
-    const result = next();
-    return <div class="aop-home">{result}</div>;
-  };
-}

package/zova/src/suite/a-demo/modules/demo-basic/src/bean/aop.home3.tsx

@@ -1,14 +0,0 @@
-import { BeanAopBase } from 'zova';
-import { Aop, AopActionRender } from 'zova-module-a-bean';
-import { ControllerPageHome } from 'zova-module-home-index';
-
-@Aop({
-  match: /home-index\.controller\.pageHome/,
-  dependencies: 'demo-basic:home',
-})
-export class AopHome3 extends BeanAopBase {
-  protected render: AopActionRender<ControllerPageHome> = (_args, next, _receiver) => {
-    const result = next();
-    return <div class="aop-home-3">{result}</div>;
-  };
-}

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

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

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

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

package/zova/src/suite/a-home/modules/home-layouttabs/src/.metadata/component/layoutTabs.ts

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

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

@@ -1,249 +0,0 @@
-// eslint-disable
-/** model: begin */
-export * from '../model/layout.js';
-export * from '../model/menu.js';
-import { IModelOptionsLayout } from '../model/layout.js';
-import { IModelOptionsMenu } from '../model/menu.js';
-import 'zova-module-a-model';
-declare module 'zova-module-a-model' {
-  
-    export interface IModelRecord {
-      'home-layouttabs:layout': IModelOptionsLayout;
-'home-layouttabs:menu': IModelOptionsMenu;
-    }
-
-  
-}
-declare module 'zova-module-home-layouttabs' {
-  
-        export interface ModelLayout {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface ModelLayout {
-          get $beanFullName(): 'home-layouttabs.model.layout';
-          get $onionName(): 'home-layouttabs:layout';
-          get $onionOptions(): IModelOptionsLayout;
-        }
-
-        export interface ModelMenu {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface ModelMenu {
-          get $beanFullName(): 'home-layouttabs.model.menu';
-          get $onionName(): 'home-layouttabs:menu';
-          get $onionOptions(): IModelOptionsMenu;
-        } 
-}
-/** model: end */
-/** model: begin */
-import { ModelLayout } from '../model/layout.js';
-import { ModelMenu } from '../model/menu.js';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordGeneral {
-    'home-layouttabs.model.layout': ModelLayout;
-'home-layouttabs.model.menu': ModelMenu;
-  }
-}
-/** model: end */
-/** controller: begin */
-export * from '../component/layoutTabs/controller.jsx';
-
-import 'zova';
-declare module 'zova' {
-  
-  
-}
-declare module 'zova-module-home-layouttabs' {
-  
-        export interface ControllerLayoutTabs {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        } 
-}
-/** controller: end */
-/** controller: begin */
-import { ControllerLayoutTabs } from '../component/layoutTabs/controller.jsx';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordLocal {
-    'home-layouttabs.controller.layoutTabs': ControllerLayoutTabs;
-  }
-}
-/** controller: end */
-
-/** components: begin */
-export * from './component/layoutTabs.js';
-import { ZLayoutTabs } from './component/layoutTabs.js';
-export const components = {
-  'layoutTabs': ZLayoutTabs,
-};
-import 'zova';
-declare module 'zova' {
-export interface IComponentRecord {
-  'home-layouttabs:layoutTabs': ControllerLayoutTabs;
-}
-export interface IZovaComponentRecord {
-  'home-layouttabs:layoutTabs': typeof ZLayoutTabs;
-}
-}
-/** components: end */
-/** render: begin */
-export * from '../component/layoutTabs/render.content.jsx';
-export * from '../component/layoutTabs/render.header.jsx';
-export * from '../component/layoutTabs/render.locale.jsx';
-export * from '../component/layoutTabs/render.menu.jsx';
-export * from '../component/layoutTabs/render.sidebar.jsx';
-export * from '../component/layoutTabs/render.tabs.jsx';
-export * from '../component/layoutTabs/render.theme.jsx';
-export * from '../component/layoutTabs/render.jsx';
-export * from '../component/layoutTabs/render.user.jsx';
-
-import 'zova';
-declare module 'zova' {
-  
-  
-}
-declare module 'zova-module-home-layouttabs' {
-  
-        export interface RenderContent {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderHeader {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderLocale {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderMenu {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderSidebar {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderTabs {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderTheme {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderLayoutTabs {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        }
-
-        export interface RenderUser {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        } 
-}
-/** render: end */
-/** render: begin */
-import { RenderContent } from '../component/layoutTabs/render.content.jsx';
-import { RenderHeader } from '../component/layoutTabs/render.header.jsx';
-import { RenderLocale } from '../component/layoutTabs/render.locale.jsx';
-import { RenderMenu } from '../component/layoutTabs/render.menu.jsx';
-import { RenderSidebar } from '../component/layoutTabs/render.sidebar.jsx';
-import { RenderTabs } from '../component/layoutTabs/render.tabs.jsx';
-import { RenderTheme } from '../component/layoutTabs/render.theme.jsx';
-import { RenderLayoutTabs } from '../component/layoutTabs/render.jsx';
-import { RenderUser } from '../component/layoutTabs/render.user.jsx';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordLocal {
-    'home-layouttabs.render.content': RenderContent;
-'home-layouttabs.render.header': RenderHeader;
-'home-layouttabs.render.locale': RenderLocale;
-'home-layouttabs.render.menu': RenderMenu;
-'home-layouttabs.render.sidebar': RenderSidebar;
-'home-layouttabs.render.tabs': RenderTabs;
-'home-layouttabs.render.theme': RenderTheme;
-'home-layouttabs.render.layoutTabs': RenderLayoutTabs;
-'home-layouttabs.render.user': RenderUser;
-  }
-}
-/** render: end */
-/** style: begin */
-export * from '../component/layoutTabs/style.js';
-
-import 'zova';
-declare module 'zova' {
-  
-  
-}
-declare module 'zova-module-home-layouttabs' {
-  
-        export interface StyleLayoutTabs {
-          /** @internal */
-          get scope(): ScopeModuleHomeLayouttabs;
-        } 
-}
-/** style: end */
-/** style: begin */
-import { StyleLayoutTabs } from '../component/layoutTabs/style.js';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecordLocal {
-    'home-layouttabs.style.layoutTabs': StyleLayoutTabs;
-  }
-}
-/** style: end */
-/** config: begin */
-export * from '../config/config.js';
-import { config } from '../config/config.js';
-/** config: end */
-/** locale: begin */
-import { locales } from './locales.js';
-/** locale: end */
-/** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil, TypeModuleConfig, TypeModuleLocales, TypeLocaleBase } from 'zova';
-import { Scope } from 'zova-module-a-bean';
-
-@Scope()
-export class ScopeModuleHomeLayouttabs extends BeanScopeBase {}
-
-export interface ScopeModuleHomeLayouttabs {
-  util: BeanScopeUtil;
-config: TypeModuleConfig<typeof config>;
-locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
-}
-
-import 'zova';
-declare module 'zova' {
-  export interface IBeanScopeRecord {
-    'home-layouttabs': ScopeModuleHomeLayouttabs;
-  }
-  
-  export interface IBeanScopeConfig {
-    'home-layouttabs': ReturnType<typeof config>;
-  }
-
-  export interface IBeanScopeLocale {
-    'home-layouttabs': (typeof locales)[TypeLocaleBase];
-  }
-
-  
-}
-
-export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-layouttabs::${K}` {
-  return `home-layouttabs::${key}`;
-}  
-/** scope: end */

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

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