cabloy 5.1.112 → 5.1.113

package/zova/pnpm-lock.yaml

@@ -77,7 +77,7 @@ importers:
         version: 10.5.2(postcss@8.5.15)
       axios:
         specifier: ^1.18.1
-        version: 1.18.1
+        version: 1.18.1(supports-color@10.2.2)
       compression:
         specifier: ^1.8.1
         version: 1.8.1
@@ -425,7 +425,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.96
+        specifier: ^1.2.97
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -846,7 +846,7 @@ importers:
         specifier: ^5.1.78
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.137
+        specifier: ^5.1.138
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -944,7 +944,7 @@ importers:
   src/suite-vendor/a-cabloy:
     dependencies:
       zova-module-rest-resource:
-        specifier: ^5.1.41
+        specifier: ^5.1.42
         version: link:modules/rest-resource
 
   src/suite-vendor/a-cabloy/modules/rest-resource:
@@ -965,7 +965,7 @@ importers:
         specifier: ^5.1.25
         version: link:modules/a-app
       zova-module-a-bean:
-        specifier: ^5.1.31
+        specifier: ^5.1.32
         version: link:modules/a-bean
       zova-module-a-behavior:
         specifier: ^5.1.25
@@ -980,7 +980,7 @@ importers:
         specifier: ^5.1.33
         version: link:modules/a-command
       zova-module-a-fetch:
-        specifier: ^5.1.23
+        specifier: ^5.1.24
         version: link:modules/a-fetch
       zova-module-a-form:
         specifier: ^5.1.45
@@ -1001,10 +1001,10 @@ importers:
         specifier: ^5.1.33
         version: link:modules/a-model
       zova-module-a-openapi:
-        specifier: ^5.1.45
+        specifier: ^5.1.46
         version: link:modules/a-openapi
       zova-module-a-router:
-        specifier: ^5.1.30
+        specifier: ^5.1.31
         version: link:modules/a-router
       zova-module-a-routerstack:
         specifier: ^5.1.26
@@ -1105,7 +1105,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.18.1
-        version: 1.18.1
+        version: 1.18.1(supports-color@10.2.2)
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -10420,7 +10420,7 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.2:
+  agent-base@6.0.2(supports-color@10.2.2):
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -10532,11 +10532,11 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.18.1:
+  axios@1.18.1(supports-color@10.2.2):
     dependencies:
       follow-redirects: 1.16.0
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 5.0.1(supports-color@10.2.2)
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -11958,9 +11958,9 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  https-proxy-agent@5.0.1:
+  https-proxy-agent@5.0.1(supports-color@10.2.2):
     dependencies:
-      agent-base: 6.0.2
+      agent-base: 6.0.2(supports-color@10.2.2)
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/page/product/controller.tsx

@@ -37,7 +37,6 @@ export class ControllerPageProduct extends BeanControllerPageBase {
   }
 
   get queryCurrentCart() {
-    if (process.env.SERVER) return;
     return this.$$modelCart.current();
   }
 

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts

@@ -12,6 +12,7 @@ export interface IModelOptionsCart extends IDecoratorModelOptions {}
 @Model<IModelOptionsCart>()
 export class ModelCart extends BeanModelBase {
   current() {
+    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
     return this.$useStateData({
       queryKey: ['current'],
       queryFn: async () => {

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/controller.tsx

@@ -31,17 +31,21 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;
+  private viewportWidth: number = 0;
+  private _windowResizeHandler?: () => void;
 
   protected async __init__() {
+    // viewport
+    if (process.env.CLIENT) {
+      this._windowResizeHandler = () => {
+        this.viewportWidth = document.documentElement.clientWidth;
+      };
+      this._windowResizeHandler();
+      window.addEventListener('resize', this._windowResizeHandler);
+    }
     // belowBreakpoint
     this.belowBreakpoint = this.$computed(() => {
-      let width;
-      if (process.env.SERVER) {
-        width = 0;
-      } else {
-        width = document.documentElement.clientWidth;
-      }
-      return width <= this.sys.config.layout.sidebar.breakpoint;
+      return this.viewportWidth <= this.sys.config.layout.sidebar.breakpoint;
     });
     // leftDrawerOpen
     this.leftDrawerOpen = this.$customRef(() => {
@@ -72,6 +76,12 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
     await this._initTabs();
   }
 
+  protected __dispose__() {
+    if (this._windowResizeHandler) {
+      window.removeEventListener('resize', this._windowResizeHandler);
+    }
+  }
+
   private async _initTabs() {
     const configTabs = this.scope.config.tabs;
     const tabsOptions: ModelTabsOptions = {

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.header.tsx

@@ -35,7 +35,7 @@ export class RenderHeader extends BeanRenderBase {
             </button>
           </div>
           <div class="text-xl px-4">{this.sys.env.APP_TITLE}</div>
-          <div class="mx-2 flex-2 px-2">{this.$$r.$$renderTabs.renderTabItems()}</div>
+          <div class="mx-2 min-w-0 flex-2 px-2">{this.$$r.$$renderTabs.renderTabItems()}</div>
           <div class="hidden flex-none lg:block">
             <ul class="menu menu-horizontal">
               {this.$$r.$$renderLocale.render()}

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

@@ -34,17 +34,21 @@ export class ControllerLayoutWeb extends BeanControllerBase {
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;
+  private viewportWidth: number = 0;
+  private _windowResizeHandler?: () => void;
 
   protected async __init__() {
+    // viewport
+    if (process.env.CLIENT) {
+      this._windowResizeHandler = () => {
+        this.viewportWidth = document.documentElement.clientWidth;
+      };
+      this._windowResizeHandler();
+      window.addEventListener('resize', this._windowResizeHandler);
+    }
     // belowBreakpoint
     this.belowBreakpoint = this.$computed(() => {
-      let width;
-      if (process.env.SERVER) {
-        width = 0;
-      } else {
-        width = document.documentElement.clientWidth;
-      }
-      return width <= this.sys.config.layout.sidebar.breakpoint;
+      return this.viewportWidth <= this.sys.config.layout.sidebar.breakpoint;
     });
     // leftDrawerOpen
     this.leftDrawerOpen = this.$customRef(() => {
@@ -70,6 +74,12 @@ export class ControllerLayoutWeb extends BeanControllerBase {
     await this._initTabs();
   }
 
+  protected __dispose__() {
+    if (this._windowResizeHandler) {
+      window.removeEventListener('resize', this._windowResizeHandler);
+    }
+  }
+
   private async _initTabs() {
     const configTabs = this.scope.config.tabs;
     const tabsOptions: ModelTabsOptions = {