cabloy 5.1.247 → 5.1.249

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/style.ts

@@ -0,0 +1,42 @@
+import { BeanStyleBase } from 'zova';
+import { Style } from 'zova-module-a-bean';
+
+@Style()
+export class StyleLayoutWeb extends BeanStyleBase {
+  cHeaderActions: string;
+
+  protected async __init__() {
+    this.cHeaderActions = this.$style({
+      $nest: {
+        '& .header-actions-panel > ul > li > details > ul': {
+          maxHeight: 'calc(100dvh - 5rem)',
+          overflowY: 'auto',
+        },
+        '@media (width < 64rem)': {
+          $nest: {
+            '& .header-actions-panel': {
+              width: '16rem',
+              maxWidth: 'calc(100vw - 1rem)',
+              maxHeight: 'calc(100dvh - 5rem)',
+              overflowY: 'auto',
+            },
+            '& .header-actions-panel > ul > li > details > ul': {
+              width: 'auto',
+              maxWidth: '100%',
+              whiteSpace: 'normal',
+              overflowWrap: 'anywhere',
+            },
+          },
+        },
+        '@media (min-width: 64rem)': {
+          $nest: {
+            '& .header-actions-panel > ul > li > details > ul': {
+              right: 0,
+              maxWidth: 'calc(100vw - 1rem)',
+            },
+          },
+        },
+      },
+    });
+  }
+}

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

@@ -1,5 +1,9 @@
 export default {
   'Home': 'Home',
+  'MoreActions': 'More actions',
+  'Language': 'Language',
+  'ColorMode': 'Color mode',
+  'Account': 'Account',
   'Logout': 'Logout',
   'Login': 'Login',
   'NotLoggedIn': 'Not logged in',

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

@@ -1,5 +1,9 @@
 export default {
   'Home': '首页',
+  'MoreActions': '更多操作',
+  'Language': '语言',
+  'ColorMode': '明暗模式',
+  'Account': '账户',
   'Logout': '退出登录',
   'Login': '登录',
   'NotLoggedIn': '未登录',

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/rowOperations/controller.tsx

@@ -37,6 +37,7 @@ export class ControllerRowOperations extends BeanControllerBase {
     };
     this._id = this.$composable(useId);
     this._cPopover = this.$style({
+      display: 'none',
       position: 'fixed',
       inset: 'auto',
       margin: 0,
@@ -207,7 +208,7 @@ export class ControllerRowOperations extends BeanControllerBase {
             aria-label={label}
             aria-controls={this._id}
             aria-expanded={this._open}
-            {...{ popovertarget: this._id }}
+            {...{ 'popovertarget': this._id, 'data-hydrate-ignore-popovertarget': '' }}
           >
             <ZIcon name="::more-horiz" width={24} aria-hidden="true" />
           </ZButton>

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/table/controller.tsx

@@ -19,8 +19,8 @@ export class ControllerTable extends BeanControllerBase {
   static $propsDefault = { compactBreakpoint: 768 };
 
   innerTable?: ControllerTableInner<any>;
-  containerWidth: number = 0;
-  popoverSupported: boolean = false;
+  containerWidth: number | undefined;
+  popoverSupported: boolean | undefined;
   private _container?: HTMLElement;
   private _observer?: ResizeObserver;
   private _mounted: boolean = false;
@@ -39,12 +39,9 @@ export class ControllerTable extends BeanControllerBase {
 
   public get compact() {
     const breakpoint = this.$props.compactBreakpoint;
-    return (
-      this.popoverSupported &&
-      breakpoint !== false &&
-      this.containerWidth > 0 &&
-      this.containerWidth < (breakpoint ?? 768)
-    );
+    if (breakpoint === false || this.popoverSupported === false) return false;
+    if (this.containerWidth === undefined) return this.$ssr.state.compactHint === true;
+    return this.containerWidth > 0 && this.containerWidth < (breakpoint ?? 768);
   }
 
   public get columnSizing() {
@@ -57,8 +54,7 @@ export class ControllerTable extends BeanControllerBase {
     return sizing;
   }
 
-  public isOperationsColumn(key: string) {
-    const table = this.innerTable;
+  public isOperationsColumn(key: string, table = this.innerTable) {
     if (!table) return false;
     const scope = table.getColumnScope(key);
     const { render } = table.getColumnComponentPropsTop(key, scope, {});

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/table/render.tsx

@@ -45,12 +45,15 @@ export class RenderTable<TData extends {} = {}> extends BeanRenderBase {
     );
   }
 
-  private _getColumnStyle(column: any): CSSProperties {
+  private _getColumnStyle(column: any, $$table: ControllerTable<TData>): CSSProperties {
     const rest = (column.columnDef.meta as any)?.rest;
     const fixed = column.getIsPinned();
-    const width = column.getSize();
+    const compactOperations = this.compact && this.isOperationsColumn(column.id, $$table);
+    const width = compactOperations ? 80 : column.getSize();
     return {
-      ...(typeof rest?.width === 'number' || typeof this.columnSizing[column.id] === 'number'
+      ...(compactOperations ||
+      typeof rest?.width === 'number' ||
+      typeof this.columnSizing[column.id] === 'number'
         ? { width: `${width}px`, minWidth: `${width}px` }
         : {}),
       textAlign: rest?.align,
@@ -89,7 +92,7 @@ export class RenderTable<TData extends {} = {}> extends BeanRenderBase {
                     onChange={table.getToggleAllPageRowsSelectedHandler()}
                   />
                 )
-              ) : this.compact && this.isOperationsColumn(column.id) ? (
+              ) : this.compact && this.isOperationsColumn(column.id, $$table) ? (
                 <span class="sr-only">
                   <FlexRender render={headerDefinition} props={header.getContext()}></FlexRender>
                 </span>
@@ -109,7 +112,7 @@ export class RenderTable<TData extends {} = {}> extends BeanRenderBase {
                 <th
                   key={header.id}
                   class={fixed ? 'bg-base-100' : undefined}
-                  style={this._getColumnStyle(column)}
+                  style={this._getColumnStyle(column, $$table)}
                   aria-sort={sortAria}
                 >
                   {canSort ? (
@@ -141,7 +144,7 @@ export class RenderTable<TData extends {} = {}> extends BeanRenderBase {
                     <td
                       key={cell.id}
                       class={column.getIsPinned() ? 'bg-base-100' : undefined}
-                      style={this._getColumnStyle(column)}
+                      style={this._getColumnStyle(column, $$table)}
                     >
                       {selection ? (
                         <input

package/zova/src/suite-vendor/a-zova/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.42",
+  "version": "5.1.43",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssr.ts

@@ -7,6 +7,7 @@ import type { Functionable, IControllerLoadEvent, ILocaleRecord, ZovaContext } f
 
 import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
 import { defu } from 'defu';
+import { Platform } from 'quasar';
 import { normalizeClass, normalizeStyle, ref, useSSRContext } from 'vue';
 import { BeanSimple } from 'zova';
 
@@ -24,7 +25,11 @@ import type {
 
 import { CtxSSRMetaStore } from './ssrMetaStore.ts';
 import { getCanonicalLocaleRoutePath } from './ssrNavigation.ts';
-import { resolveSsrProfile, resolveSsrProfileOptions } from './ssrProfile.ts';
+import {
+  resolveSsrProfile,
+  resolveSsrProfileOptions,
+  resolveSsrResponseCacheExpires,
+} from './ssrProfile.ts';
 
 const SymbolIsRuntimeSsrPreHydration = Symbol('SymbolIsRuntimeSsrPreHydration');
 const SymbolSSRContext = Symbol('SymbolSSRContext');
@@ -210,6 +215,17 @@ export class CtxSSR extends BeanSimple {
     );
     this.state.ssrProfile = ssrProfile;
     this.state.ssrProfileOptions = ssrProfileOptions;
+    if (process.env.SERVER) {
+      const expires = resolveSsrResponseCacheExpires(
+        ssrProfileOptions.responseCache,
+        this.sys.env.META_MODE,
+      );
+      if (ssrProfile === 'public' && expires !== false && expires !== 0) {
+        delete this.state.compactHint;
+      } else {
+        this.state.compactHint = !!Platform.parseSSR(this.context).is.mobile;
+      }
+    }
   }
 
   /** @internal */

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssrProfile.ts

@@ -1,5 +1,7 @@
 import type { ZovaConfigSsrProfile } from 'zova';
 
+import ms from 'ms';
+
 import type {
   ISsrProfileOptions,
   ISsrResponseCachePolicy,
@@ -18,6 +20,19 @@ export function resolveSsrProfile(
   return ssrProfile;
 }
 
+export function resolveSsrResponseCacheExpires(
+  responseCache: ISsrProfileOptions['responseCache'],
+  metaMode: string | undefined,
+): number | false {
+  if (responseCache === false) return false;
+  const responseCacheExpires = responseCache.expires ?? 0;
+  const expires =
+    typeof responseCacheExpires === 'string'
+      ? ms(responseCacheExpires) / 1000
+      : responseCacheExpires;
+  return metaMode === 'development' ? 0 : expires;
+}
+
 export function resolveSsrProfileOptions(
   ssrProfile: TypeSsrProfile,
   profiles: Readonly<Record<TypeSsrProfile, ZovaConfigSsrProfile>>,

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/types/ssr.ts

@@ -59,6 +59,7 @@ export type ISsrProfileOptions = Readonly<
 >;
 
 export interface SSRContextState {
+  compactHint?: boolean;
   envClient?: ZovaConfigEnv;
   pagePathFull?: string;
   pagePath?: string;

package/zova/src/suite-vendor/a-zova/modules/a-ssr/test/lib/ssrProfile.test.ts

@@ -5,7 +5,11 @@ import test from 'node:test';
 
 import type { ISsrRouteProfileOptions } from '../../src/types/ssr.ts';
 
-import { resolveSsrProfile, resolveSsrProfileOptions } from '../../src/lib/ssrProfile.ts';
+import {
+  resolveSsrProfile,
+  resolveSsrProfileOptions,
+  resolveSsrResponseCacheExpires,
+} from '../../src/lib/ssrProfile.ts';
 
 const profiles = {
   public: {
@@ -77,6 +81,24 @@ test('SSR route options override locale-aware cache defaults', () => {
   assert.equal(disabled.responseCache, false);
 });
 
+test('SSR response cache expiry preserves disabled, no-store, and public max-age branches', () => {
+  assert.equal(resolveSsrResponseCacheExpires(false, 'production'), false);
+  assert.equal(resolveSsrResponseCacheExpires(false, 'development'), false);
+  assert.equal(resolveSsrResponseCacheExpires({}, 'production'), 0);
+  assert.equal(resolveSsrResponseCacheExpires({ expires: 0 }, 'production'), 0);
+  assert.equal(resolveSsrResponseCacheExpires({ expires: '0s' }, 'production'), 0);
+  assert.equal(resolveSsrResponseCacheExpires({ expires: 600 }, 'production'), 600);
+  assert.equal(resolveSsrResponseCacheExpires({ expires: '10m' }, 'test'), 600);
+  assert.equal(resolveSsrResponseCacheExpires({ expires: '10m' }, 'development'), 0);
+
+  const override = resolveSsrProfileOptions('public', profiles, {
+    responseCache: { expires: '5m' },
+  });
+  assert.equal(resolveSsrResponseCacheExpires(override.responseCache, 'production'), 300);
+  const noLocale = resolveSsrProfileOptions('public', profiles);
+  assert.equal(resolveSsrResponseCacheExpires(noLocale.responseCache, 'production'), 0);
+});
+
 test('SSR profile options are fresh immutable snapshots', () => {
   const routeOptions: ISsrRouteProfileOptions = {
     responseCache: { expires: '5m' },

package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssrserver",
-  "version": "5.1.27",
+  "version": "5.1.28",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/src/service/ssrHandler.ts

@@ -2,13 +2,16 @@ import type { ISsrProfileOptions } from 'zova-module-a-ssr';
 
 import { catchError } from '@cabloy/utils';
 import fse from 'fs-extra';
-import ms from 'ms';
 import path, { basename } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { BeanBase, cast, Use } from 'zova';
 import { Service } from 'zova-module-a-bean';
 import { SysRouter } from 'zova-module-a-router';
-import { resolveSsrProfile, resolveSsrProfileOptions } from 'zova-module-a-ssr';
+import {
+  resolveSsrProfile,
+  resolveSsrProfileOptions,
+  resolveSsrResponseCacheExpires,
+} from 'zova-module-a-ssr';
 
 import { ISsrHandlerRenderOptionsInner, TypeEventResolvePathResult } from '../types/ssr.ts';
 
@@ -286,15 +289,12 @@ export class ServiceSsrHandler extends BeanBase {
     ssrProfileOptions: Readonly<ISsrProfileOptions>,
   ) {
     const { res } = options;
-    const responseCache = ssrProfileOptions.responseCache;
-    if (responseCache === false) return;
-    // expires
-    const responseCacheExpires = responseCache.expires ?? 0;
-    const expires =
-      typeof responseCacheExpires === 'string'
-        ? ms(responseCacheExpires) / 1000
-        : responseCacheExpires;
-    if (expires === 0 || this.sys.env.META_MODE === 'development') {
+    const expires = resolveSsrResponseCacheExpires(
+      ssrProfileOptions.responseCache,
+      this.sys.env.META_MODE,
+    );
+    if (expires === false) return;
+    if (expires === 0) {
       res.setHeader('cache-control', 'no-cache, no-store, must-revalidate');
     } else {
       res.setHeader('cache-control', `public, max-age=${expires}`);

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.177",
+  "version": "5.1.178",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -25,9 +25,9 @@
     "zova-module-a-router": "^5.1.43",
     "zova-module-a-routerstack": "^5.1.30",
     "zova-module-a-routertabs": "^5.1.36",
-    "zova-module-a-ssr": "^5.1.42",
+    "zova-module-a-ssr": "^5.1.43",
     "zova-module-a-ssrhmr": "^5.1.24",
-    "zova-module-a-ssrserver": "^5.1.27",
+    "zova-module-a-ssrserver": "^5.1.28",
     "zova-module-a-style": "^5.1.36",
     "zova-module-a-table": "^5.1.46",
     "zova-module-a-zod": "^5.1.39",

package/vona/.textlintrc.json

@@ -1,19 +0,0 @@
-{
-  "plugins": {},
-  "filters": {},
-  "rules": {
-    "ja-no-mixed-period": {
-      "periodMark": "。",
-      "forceAppendPeriod": true,
-      "allowPeriodMarks": ["?", "!", ":", "？", "！", "："]
-    },
-    "en-no-mixed-period": {
-      "periodMark": ".",
-      "forceAppendPeriod": true,
-      "allowPeriodMarks": ["?", "!", ":", "？", "！", "：", "。"]
-    },
-    "ja-space-between-half-and-full-width": {
-      "space": "always"
-    }
-  }
-}