zova-ui-empty 5.0.137 → 5.0.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-ui-empty",
-  "version": "5.0.137",
+  "version": "5.0.138",
   "description": "A vue3 empty framework with ioc",
   "publishConfig": {
     "access": "public"
@@ -35,7 +35,8 @@
     "vue": "^3.4.29",
     "vue-router": "^4.3.3",
     "zod": "^3.23.8",
-    "zova": "^5.0.100",
+    "zova": "^5.0.101",
+    "zova-module-a-data": "^5.0.3",
     "zova-module-a-pinia": "^5.0.18",
     "zova-module-a-router": "^5.0.38",
     "zova-module-a-style": "^5.0.12"
@@ -51,5 +52,5 @@
     "zova-vite": "^1.0.105"
   },
   "license": "MIT",
-  "gitHead": "90bb78df182aa8db862d6b44e86d23aa33b195fa"
+  "gitHead": "32a2f957769f38b297d22235e188478b92b9301e"
 }

package/src/boot/main.ts

@@ -1,15 +1,13 @@
 import { createApp } from 'vue';
-import createRouter from './router.js';
-import App from './app.vue';
+import App from './app/index.vue';
 import { zova } from './zova.js';
 
 import '../css/settings.scss';
 
-async function start({ app, router }) {
-  await zova({ app, router });
-  app.use(router);
+async function start({ app }) {
+  await zova({ app });
   app.mount('#app');
 }
 
 const app = createApp(App);
-start({ app, router: createRouter() });
+start({ app });

package/src/boot/zova.ts

@@ -6,9 +6,7 @@ import { modulesMeta } from '../../.zova/modules-meta.js';
 import { AppMonkey } from '../front/config/monkey.js';
 import { locales } from '../front/config/locales.js';
 import config from '../../.zova/config.js';
-import { Router } from 'vue-router';
 
-export async function zova({ app, router }: { app: App; router: Router }) {
-  app.provide('a-router:appRouter', router);
+export async function zova({ app }: { app: App }) {
   await PluginZova.install(app, { modulesMeta, AppMonkey, locales, config });
 }

package/src/front/config/monkey.ts

@@ -13,8 +13,8 @@ export class AppMonkey extends BeanSimple implements IMonkeyApp, IMonkeySystem,
   async moduleLoading(_module: IModule) {}
   async moduleLoaded(_module: IModule) {}
   async configLoaded(_module: IModule, _config) {}
-  async appInitialize() {}
-  async appInitialized() {}
+  async appInitialize(_bean: BeanContainerLike) {}
+  async appInitialized(_bean: BeanContainerLike) {}
   async beanInit(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
   async beanInited(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
   beanDispose(_bean: BeanContainerLike, _beanInstance: BeanBase) {}

package/src/suite/a-home/modules/home-api/src/bean/bean.api.ts

@@ -0,0 +1,61 @@
+import { Bean, BeanBase } from 'zova';
+import axios, { AxiosInstance } from 'axios';
+import { markRaw } from 'vue';
+
+const SymbolApi = Symbol('SymbolApi');
+
+export type BeanApiLike = BeanApi & AxiosInstance;
+
+// const __ApiMethods = ['delete', 'get', 'head', 'options', 'post', 'put', 'patch'];
+
+@Bean({ scene: 'bean', name: 'api', containerScope: 'ctx' })
+export class BeanApi extends BeanBase {
+  private [SymbolApi]: AxiosInstance;
+
+  protected async __init__() {
+    const baseURL = `${this.app.config.api.baseURL || ''}${this.app.config.api.prefix || ''}/`;
+    this[SymbolApi] = markRaw(axios.create({ baseURL }));
+    this._addInterceptors(this[SymbolApi]);
+  }
+
+  protected __get__(prop) {
+    return this[SymbolApi] && this[SymbolApi][prop];
+  }
+
+  private _addInterceptors(api: AxiosInstance) {
+    // request
+    api.interceptors.request.use(
+      config => {
+        if (this.app.config.base.jwt) {
+          config.headers.Authorization = 'Bearer ';
+        }
+        return config;
+      },
+      error => {
+        return Promise.reject(error);
+      },
+    );
+    // response
+    api.interceptors.response.use(
+      response => {
+        const contentType = response.headers['content-type'];
+        if (!contentType || contentType.indexOf('application/json') === -1) return response;
+        if (response.data.code !== 0) {
+          const error = new Error();
+          error.code = response.data.code;
+          error.message = response.data.message;
+          return Promise.reject(error);
+        }
+        // return data
+        return response.data.data;
+      },
+      error => {
+        if (error.response) {
+          error.code = (error.response.data && error.response.data.code) || error.response.status;
+          error.message = (error.response.data && error.response.data.message) || error.response.statusText;
+        }
+        return Promise.reject(error);
+      },
+    );
+  }
+}

package/src/suite/a-home/modules/home-api/src/monkey.ts

@@ -1,13 +1,13 @@
 import { BeanBase, BeanContainerLike, BeanSimple, IMonkeySystem } from 'zova';
 import axios from 'axios';
-import { StoreApiLike } from './bean/store.api.js';
+import { BeanApiLike } from './bean/bean.api.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem {
-  async appInitialize() {
+  async appInitialize(bean: BeanContainerLike) {
     this.app.meta.$axios = axios;
-    this.app.meta.$api = (await this.app.bean._getBean('home-api.store.api', false)) as StoreApiLike;
+    this.app.meta.$api = (await bean._getBean('home-api.bean.api', false)) as BeanApiLike;
   }
-  async appInitialized() {}
+  async appInitialized(_bean: BeanContainerLike) {}
   async beanInit(bean: BeanContainerLike, beanInstance: BeanBase) {
     const self = this;
     bean.defineProperty(beanInstance, '$api', {

package/src/suite/a-home/modules/home-api/src/resource/beans.ts

@@ -1,8 +1,8 @@
-export * from '../bean/store.api.js';
-import { StoreApi } from '../bean/store.api.js';
+export * from '../bean/bean.api.js';
+import { BeanApi } from '../bean/bean.api.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecord {
-    'home-api.store.api': StoreApi;
+    'home-api.bean.api': BeanApi;
   }
 }

package/src/suite/a-home/modules/home-api/src/types.ts

@@ -1,13 +1,13 @@
 import { AxiosInstance } from 'axios';
-import { StoreApiLike } from './bean/store.api.js';
+import { BeanApiLike } from './bean/bean.api.js';
 
 import 'zova';
 declare module 'zova' {
   export interface AppMeta {
     $axios: AxiosInstance;
-    $api: StoreApiLike;
+    $api: BeanApiLike;
   }
   export interface BeanBase {
-    $api: StoreApiLike;
+    $api: BeanApiLike;
   }
 }

package/src/suite/a-home/modules/home-layout/mock/menu.fake.ts

@@ -29,7 +29,7 @@ const __MenuData = [
 
 export default defineFakeRoute([
   {
-    url: '/home/mock/getMenu',
+    url: '/home/layout/menu/select',
     method: 'get',
     response: () => {
       return {

package/src/suite/a-home/modules/home-layout/src/api/interface/index.ts

@@ -1 +1 @@
-export {};
+export * from './menu.js';

package/src/suite/a-home/modules/home-layout/src/api/interface/menu.ts

@@ -0,0 +1,9 @@
+export interface ServiceMenuEntity {
+  title: string;
+  caption?: string;
+  icon?: string;
+  href?: string;
+  to?: string;
+  folder?: boolean;
+  separator?: boolean;
+}

package/src/suite/a-home/modules/home-layout/src/api/service/index.ts

@@ -1 +1,5 @@
-export const services = {};
+import menu from './menu.js';
+
+export const services = {
+  menu,
+};

package/src/suite/a-home/modules/home-layout/src/api/service/menu.ts

@@ -0,0 +1,8 @@
+import { ZovaApplication } from 'zova';
+import { ServiceMenuEntity } from '../interface/menu.js';
+
+export default (app: ZovaApplication) => {
+  return {
+    select: () => app.meta.$api.get<any, ServiceMenuEntity[]>('/home/layout/menu/select'),
+  };
+};

package/src/suite/a-home/modules/home-layout/src/bean/data.menu.ts

@@ -0,0 +1,19 @@
+import { Data } from 'zova';
+import { BeanDataBase } from 'zova-module-a-data';
+import { ScopeModule } from '../resource/this.js';
+
+@Data()
+export class DataMenu extends BeanDataBase<ScopeModule> {
+  select() {
+    return this.$useQuery({
+      queryKey: ['select'],
+      queryFn: async () => {
+        const data = await this.scope.service.menu.select();
+        return data.filter(item => {
+          if (!item.to) return true;
+          return this.$router.checkPathValid(item.to);
+        });
+      },
+    });
+  }
+}

package/src/suite/a-home/modules/home-layout/src/component/layoutDefault/controller.ts

@@ -1,5 +1,7 @@
-import { BeanControllerBase, Local } from 'zova';
-import * as ControllerEssentialLink from '../../component/essentialLink/controller.js';
+import { BeanControllerBase, Local, Use } from 'zova';
+import { DataMenu } from '../../bean/data.menu.js';
+import { DataQuery } from 'zova-module-a-data';
+import { ServiceMenuEntity } from '../../api/index.js';
 
 export interface Props {}
 
@@ -7,25 +9,18 @@ export type Emits = {};
 
 export interface Slots {}
 
-export type TypeMenuItem = ControllerEssentialLink.Props & { folder?: boolean; separator?: boolean };
-
 @Local()
 export class ControllerLayoutDefault extends BeanControllerBase<unknown, Props, Emits, Slots> {
   static $propsDefault = {};
 
+  @Use()
+  $$dataMenu: DataMenu;
+
+  queryMenus: DataQuery<ServiceMenuEntity[]>;
   leftDrawerOpen: boolean = false;
-  menu: TypeMenuItem[];
 
   protected async __init__() {
-    await this.loadMenu();
-  }
-
-  async loadMenu() {
-    const res = await this.$api.get('/home/mock/getMenu');
-    this.menu = res.data.data.filter(item => {
-      if (!item.to) return true;
-      return this.$router.checkPathValid(item.to);
-    });
+    this.queryMenus = this.$$dataMenu.select();
   }
 
   toggleLeftDrawer() {

package/src/suite/a-home/modules/home-layout/src/component/layoutDefault/render.tsx

@@ -1,13 +1,14 @@
 import { BeanRenderBase, Local } from 'zova';
-import type { ControllerLayoutDefault, TypeMenuItem } from './controller.js';
+import type { ControllerLayoutDefault } from './controller.js';
 import { JSX } from 'vue/jsx-runtime';
 import EssentialLink from '../essentialLink/index.vue';
+import { ServiceMenuEntity } from '../../api/index.js';
 
 export interface RenderLayoutDefault extends ControllerLayoutDefault {}
 
 @Local()
 export class RenderLayoutDefault extends BeanRenderBase {
-  _renderMenuItem(item: TypeMenuItem) {
+  _renderMenuItem(item: ServiceMenuEntity) {
     if (item.separator) {
       return <div class="menu-separator"> - - - </div>;
     }
@@ -26,8 +27,9 @@ export class RenderLayoutDefault extends BeanRenderBase {
     );
   }
   _renderMenu() {
+    if (this.queryMenus.isLoading || !this.queryMenus.data) return;
     const domItems: JSX.Element[] = [];
-    for (const item of this.menu) {
+    for (const item of this.queryMenus.data) {
       domItems.push(this._renderMenuItem(item));
     }
     return <div class="menu-list">{domItems}</div>;

package/src/suite/a-home/modules/home-layout/src/resource/beans.ts

@@ -1,4 +1,8 @@
+export * from '../bean/data.menu.js';
+import { DataMenu } from '../bean/data.menu.js';
 import 'zova';
 declare module 'zova' {
-  export interface IBeanRecord {}
+  export interface IBeanRecord {
+    'home-layout.data.menu': DataMenu;
+  }
 }

package/src/suite/a-home/modules/home-router/src/local/router.ts

@@ -1,10 +1,10 @@
 import { Local } from 'zova';
 import { ScopeModule } from '../resource/this.js';
-import { StoreRouterLike, BeanRouterBase } from 'zova-module-a-router';
+import { BeanRouterLike, BeanRouterBase } from 'zova-module-a-router';
 
 @Local()
 export class Router extends BeanRouterBase<ScopeModule> {
-  protected onRouterGuards(router: StoreRouterLike) {
+  protected onRouterGuards(router: BeanRouterLike) {
     router.beforeEach(async _to => {
       //console.log(to);
     });

package/src/suite/a-home/modules/home-router/src/monkey.ts

@@ -4,11 +4,11 @@ import { Router } from './local/router.js';
 export class Monkey extends BeanSimple implements IMonkeySystem {
   router: Router;
 
-  async appInitialize() {
+  async appInitialize(bean: BeanContainerLike) {
     // router
-    this.router = await this.bean._newBean(Router, false);
+    this.router = await bean._newBean(Router, false);
   }
-  async appInitialized() {}
+  async appInitialized(_bean: BeanContainerLike) {}
 
   async beanInit(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
   async beanInited(_bean: BeanContainerLike, _beanInstance: BeanBase) {}

package/src/suite/a-home/modules/home-api/src/bean/store.api.ts

@@ -1,22 +0,0 @@
-import { BeanBase, Store } from 'zova';
-import axios, { AxiosInstance } from 'axios';
-import { markRaw } from 'vue';
-
-const SymbolApi = Symbol('SymbolApi');
-
-export type StoreApiLike = StoreApi & AxiosInstance;
-
-// const __ApiMethods = ['delete', 'get', 'head', 'options', 'post', 'put', 'patch'];
-
-@Store()
-export class StoreApi extends BeanBase {
-  private [SymbolApi]: AxiosInstance;
-
-  protected async __init__() {
-    const baseURL = `${this.app.config.api.baseURL || ''}${this.app.config.api.prefix || ''}/`;
-    this[SymbolApi] = markRaw(axios.create({ baseURL }));
-  }
-  protected __get__(prop) {
-    return this[SymbolApi] && this[SymbolApi][prop];
-  }
-}