cabloy 5.1.134 → 5.1.136

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/en-us.ts

@@ -1,5 +1,6 @@
 export default {
   CommerceCatalogue: 'Commerce catalogue',
+  ProductContent: 'Product content',
   CheckoutPriceStockNotice: 'Current prices and stock are confirmed at checkout.',
   PriceFrom: 'From %s',
   AddToCart: 'Add to cart',

package/zova/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/zh-cn.ts

@@ -1,5 +1,6 @@
 export default {
   CommerceCatalogue: '商品目录',
+  ProductContent: '商品详情',
   CheckoutPriceStockNotice: '当前价格和库存以结算时确认为准。',
   PriceFrom: '%s 起',
   AddToCart: '加入购物车',

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

@@ -5,6 +5,7 @@ import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
+import { ZMarkdownHtml } from 'zova-module-basic-markdown';
 import { ZPage } from 'zova-module-home-base';
 
 import { ModelCatalogue } from '../../model/catalogue.js';
@@ -45,9 +46,7 @@ export class ControllerPageProduct extends BeanControllerPageBase {
   }
 
   private _getCartPagePath(): string {
-    return this.$router.getAliasPath('commerce-trade:cart', {
-      params: { locale: true },
-    })!;
+    return this.$router.getPagePath('/commerce/trade/cart');
   }
 
   private _renderCartBadge() {
@@ -69,6 +68,12 @@ export class ControllerPageProduct extends BeanControllerPageBase {
                 {query.data.description && (
                   <p class="text-base-content/70">{query.data.description}</p>
                 )}
+                {query.data.descriptionHtml && (
+                  <ZMarkdownHtml
+                    class="product-description mt-6 max-w-none text-base-content"
+                    html={query.data.descriptionHtml}
+                  />
+                )}
                 <div class="mt-4 flex justify-end">
                   <RouterLink class="btn btn-outline btn-sm gap-2" to={this._getCartPagePath()}>
                     {this.scope.locale.Cart()}

package/zova/src/suite/a-commerce/modules/commerce-member/src/.metadata/index.ts

@@ -160,20 +160,19 @@ import { TypePagePathSchema } from 'zova-module-a-router';
 import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
-  '/commerce/member/address/:locale?': TypePagePathSchema<NSControllerPageAddress.ParamsInput,NSControllerPageAddress.QueryInput>;
+  '/commerce/member/address': TypePagePathSchema<NSControllerPageAddress.ParamsInput,NSControllerPageAddress.QueryInput>;
 }
 export interface IPageNameRecord {
-  'commerce-member:address': TypePagePathSchema<NSControllerPageAddress.ParamsInput,NSControllerPageAddress.QueryInput>;
+  
 }
 }
 export const pagePathSchemas = {
-
-};
-export const pageNameSchemas = {
-'commerce-member:address': {
-          params: NSControllerPageAddress.paramsSchema,
+'/commerce/member/address': {
           query: NSControllerPageAddress.querySchema,
         },
+};
+export const pageNameSchemas = {
+
 };
 declare module 'zova-module-commerce-member' {
   export interface ControllerPageAddress {

package/zova/src/suite/a-commerce/modules/commerce-member/src/page/address/controller.tsx

@@ -13,9 +13,7 @@ import type {
 
 import { ModelAddressMine } from '../../model/addressMine.js';
 
-export const ControllerPageAddressSchemaParams = z.object({
-  locale: z.string().optional(),
-});
+export const ControllerPageAddressSchemaParams = z.object({});
 export const ControllerPageAddressSchemaQuery = z.object({});
 
 type AddressDraft = ApiApiCommerceMemberAddresscreateMineRequestBody;

package/zova/src/suite/a-commerce/modules/commerce-member/src/routes.ts

@@ -4,9 +4,8 @@ import { ZPageAddress } from './.metadata/page/address.js';
 
 export const routes: IModuleRoute[] = [
   {
-    name: 'address',
-    path: 'address/:locale?',
+    path: 'address',
     component: ZPageAddress,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
 ];

package/zova/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts

@@ -292,40 +292,33 @@ import { TypePagePathSchema } from 'zova-module-a-router';
 import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
-  '/commerce/trade/cart/:locale?': TypePagePathSchema<NSControllerPageCart.ParamsInput,NSControllerPageCart.QueryInput>;
-'/commerce/trade/checkout/:locale?': TypePagePathSchema<NSControllerPageCheckout.ParamsInput,NSControllerPageCheckout.QueryInput>;
-'/commerce/trade/order/:id/:locale?': TypePagePathSchema<NSControllerPageOrder.ParamsInput,NSControllerPageOrder.QueryInput>;
-'/commerce/trade/orders/:locale?': TypePagePathSchema<NSControllerPageOrders.ParamsInput,NSControllerPageOrders.QueryInput>;
-'/commerce/trade/payment/:paymentSessionId/:orderId/:locale?': TypePagePathSchema<NSControllerPagePayment.ParamsInput,NSControllerPagePayment.QueryInput>;
+  '/commerce/trade/cart': TypePagePathSchema<NSControllerPageCart.ParamsInput,NSControllerPageCart.QueryInput>;
+'/commerce/trade/checkout': TypePagePathSchema<NSControllerPageCheckout.ParamsInput,NSControllerPageCheckout.QueryInput>;
+'/commerce/trade/order/:id': TypePagePathSchema<NSControllerPageOrder.ParamsInput,NSControllerPageOrder.QueryInput>;
+'/commerce/trade/orders': TypePagePathSchema<NSControllerPageOrders.ParamsInput,NSControllerPageOrders.QueryInput>;
+'/commerce/trade/payment/:paymentSessionId/:orderId': TypePagePathSchema<NSControllerPagePayment.ParamsInput,NSControllerPagePayment.QueryInput>;
 }
 export interface IPageNameRecord {
-  'commerce-trade:cart': TypePagePathSchema<NSControllerPageCart.ParamsInput,NSControllerPageCart.QueryInput>;
-'commerce-trade:checkout': TypePagePathSchema<NSControllerPageCheckout.ParamsInput,NSControllerPageCheckout.QueryInput>;
-'commerce-trade:order': TypePagePathSchema<NSControllerPageOrder.ParamsInput,NSControllerPageOrder.QueryInput>;
-'commerce-trade:orders': TypePagePathSchema<NSControllerPageOrders.ParamsInput,NSControllerPageOrders.QueryInput>;
+  'commerce-trade:order': TypePagePathSchema<NSControllerPageOrder.ParamsInput,NSControllerPageOrder.QueryInput>;
 'commerce-trade:payment': TypePagePathSchema<NSControllerPagePayment.ParamsInput,NSControllerPagePayment.QueryInput>;
 }
 }
 export const pagePathSchemas = {
-
-};
-export const pageNameSchemas = {
-'commerce-trade:cart': {
-          params: NSControllerPageCart.paramsSchema,
+'/commerce/trade/cart': {
           query: NSControllerPageCart.querySchema,
         },
-'commerce-trade:checkout': {
-          params: NSControllerPageCheckout.paramsSchema,
+'/commerce/trade/checkout': {
           query: NSControllerPageCheckout.querySchema,
         },
+'/commerce/trade/orders': {
+          query: NSControllerPageOrders.querySchema,
+        },
+};
+export const pageNameSchemas = {
 'commerce-trade:order': {
           params: NSControllerPageOrder.paramsSchema,
           query: NSControllerPageOrder.querySchema,
         },
-'commerce-trade:orders': {
-          params: NSControllerPageOrders.paramsSchema,
-          query: NSControllerPageOrders.querySchema,
-        },
 'commerce-trade:payment': {
           params: NSControllerPagePayment.paramsSchema,
           query: NSControllerPagePayment.querySchema,

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/cart/controller.tsx

@@ -7,9 +7,7 @@ import { ZPage } from 'zova-module-home-base';
 
 import { ModelCart } from '../../model/cart.js';
 
-export const ControllerPageCartSchemaParams = z.object({
-  locale: z.string().optional(),
-});
+export const ControllerPageCartSchemaParams = z.object({});
 export const ControllerPageCartSchemaQuery = z.object({});
 
 @Controller()
@@ -40,15 +38,11 @@ export class ControllerPageCart extends BeanControllerPageBase {
   }
 
   private _getAddressPagePath(): string {
-    return this.$router.getAliasPath('commerce-member:address', {
-      params: { locale: true },
-    })!;
+    return this.$router.getPagePath('/commerce/member/address');
   }
 
   private _getCheckoutPagePath(): string {
-    return this.$router.getAliasPath('commerce-trade:checkout', {
-      params: { locale: true },
-    })!;
+    return this.$router.getPagePath('/commerce/trade/checkout');
   }
 
   protected render() {

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/checkout/controller.tsx

@@ -8,9 +8,7 @@ import { ZPage } from 'zova-module-home-base';
 
 import { ModelCart } from '../../model/cart.js';
 
-export const ControllerPageCheckoutSchemaParams = z.object({
-  locale: z.string().optional(),
-});
+export const ControllerPageCheckoutSchemaParams = z.object({});
 export const ControllerPageCheckoutSchemaQuery = z.object({});
 
 @Controller()
@@ -59,14 +57,14 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
         correlationId: `${Date.now()}-${Math.random().toString(36).slice(2, 12)}`,
         providerCandidateKey: this.providerCandidateKey,
       });
-      this.$router.push({
-        name: 'commerce-trade:payment',
-        params: {
-          paymentSessionId: String(result.paymentSessionId),
-          orderId: String(result.orderId),
-          locale: this.$params.locale,
-        },
-      });
+      this.$router.push(
+        this.$router.getPagePath('/commerce/trade/payment/:paymentSessionId/:orderId', {
+          params: {
+            paymentSessionId: String(result.paymentSessionId),
+            orderId: String(result.orderId),
+          },
+        }),
+      );
     } finally {
       this.submitting = false;
     }

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/order/controller.tsx

@@ -8,7 +8,6 @@ import { ModelOrderMine } from '../../model/orderMine.js';
 
 export const ControllerPageOrderSchemaParams = z.object({
   id: z.string(),
-  locale: z.string().optional(),
 });
 export const ControllerPageOrderSchemaQuery = z.object({});
 

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/orders/controller.tsx

@@ -6,9 +6,7 @@ import { ZPage } from 'zova-module-home-base';
 
 import { ModelOrderMine } from '../../model/orderMine.js';
 
-export const ControllerPageOrdersSchemaParams = z.object({
-  locale: z.string().optional(),
-});
+export const ControllerPageOrdersSchemaParams = z.object({});
 export const ControllerPageOrdersSchemaQuery = z.object({});
 
 @Controller()
@@ -28,7 +26,11 @@ export class ControllerPageOrders extends BeanControllerPageBase {
   }
 
   viewOrder(id: string) {
-    this.$router.push({ name: 'commerce-trade:order', params: { id } });
+    this.$router.push(
+      this.$router.getPagePath('/commerce/trade/order/:id', {
+        params: { id },
+      }),
+    );
   }
 
   protected render() {

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx

@@ -13,7 +13,6 @@ import { ModelOrderMine } from '../../model/orderMine.js';
 export const ControllerPagePaymentSchemaParams = z.object({
   paymentSessionId: z.string(),
   orderId: z.string(),
-  locale: z.string().optional(),
 });
 export const ControllerPagePaymentSchemaQuery = z.object({
   providerResult: z.enum(['return', 'cancel']).optional(),
@@ -23,6 +22,10 @@ type TypeMockPaymentOutcome = 'succeeded' | 'failed' | 'cancelled';
 
 const SettlementPollDelaysMilliseconds = [0, 1_000, 2_000, 4_000, 5_000, 5_000, 5_000, 5_000];
 
+function isNotFoundError(error: unknown) {
+  return (error as { status?: unknown } | undefined)?.status === 404;
+}
+
 @Controller()
 export class ControllerPagePayment extends BeanControllerPageBase {
   @Use({ beanFullName: 'a-pay.model.paymentSession' })
@@ -34,8 +37,6 @@ export class ControllerPagePayment extends BeanControllerPageBase {
   @Use()
   $$modelOrderMine: ModelOrderMine;
 
-  paymentSessionId?: string;
-  orderId?: string;
   submitting = false;
   waitingForOrder = false;
   pendingConfirmation = false;
@@ -43,11 +44,15 @@ export class ControllerPagePayment extends BeanControllerPageBase {
   pendingOrderState?: string;
   pendingNextAction?: TypePaymentNextAction;
   cancelReturnReconciled = false;
+  paymentSessionUnavailable = false;
   message?: string;
+  private _settlementPollVersion = 0;
+
+  protected __dispose__() {
+    this._settlementPollVersion += 1;
+  }
 
   protected async __init__() {
-    this.paymentSessionId = this.$computed(() => this.$params.paymentSessionId);
-    this.orderId = this.$computed(() => this.$params.orderId);
     if (process.env.SERVER) {
       await $QueryEnsureLoaded(() => this.queryPaymentSession);
     }
@@ -65,12 +70,20 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     }
   }
 
+  get paymentSessionId() {
+    return this.$params.paymentSessionId;
+  }
+
+  get orderId() {
+    return this.$params.orderId;
+  }
+
   get queryPaymentSession() {
-    return this.$$modelPaymentSession.view(this.paymentSessionId!);
+    return this.$$modelPaymentSession.view(this.paymentSessionId);
   }
 
   get queryOrder() {
-    return this.$$modelOrderMine.viewMine(this.orderId!);
+    return this.$$modelOrderMine.viewMine(this.orderId);
   }
 
   async reconcile({ waitForSettlement = true }: { waitForSettlement?: boolean } = {}) {
@@ -81,6 +94,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     this.pendingSessionState = undefined;
     this.pendingOrderState = undefined;
     this.pendingNextAction = undefined;
+    this.paymentSessionUnavailable = false;
     this.message = undefined;
     try {
       await this.$$modelPaymentSession.reconcile(this.paymentSessionId).mutateAsync();
@@ -112,10 +126,11 @@ export class ControllerPagePayment extends BeanControllerPageBase {
   }
 
   async openOrder() {
-    await this.$router.push({
-      name: 'commerce-trade:order',
-      params: { id: this.orderId, locale: this.$params.locale },
-    });
+    await this.$router.push(
+      this.$router.getPagePath('/commerce/trade/order/:id', {
+        params: { id: this.orderId! },
+      }),
+    );
   }
 
   async refreshOrderStatus() {
@@ -138,13 +153,26 @@ export class ControllerPagePayment extends BeanControllerPageBase {
   }
 
   private async _waitForSettlement(outcome?: TypeMockPaymentOutcome) {
+    const pollVersion = ++this._settlementPollVersion;
     this.waitingForOrder = true;
     const terminalSessionState = outcome;
     const terminalOrderState = outcome === 'succeeded' ? 'paid' : outcome ? 'cancelled' : undefined;
     try {
       for (const [attempt, delay] of SettlementPollDelaysMilliseconds.entries()) {
         if (delay > 0) await new Promise(resolve => setTimeout(resolve, delay));
-        const session = await this.queryPaymentSession?.refetch();
+        if (!this._isCurrentSettlementPoll(pollVersion)) return;
+        let session;
+        try {
+          session = await this.queryPaymentSession?.refetch();
+        } catch (error) {
+          if (isNotFoundError(error)) {
+            this.paymentSessionUnavailable = true;
+            this.message = 'Payment session is unavailable. You can open your order.';
+            return;
+          }
+          throw error;
+        }
+        if (!this._isCurrentSettlementPoll(pollVersion)) return;
         const sessionState = session?.data?.state;
         this.pendingSessionState = sessionState;
         this.pendingNextAction = session?.data?.nextAction;
@@ -156,6 +184,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
         const order = await this.scope.api.commerceTradeOrder.viewMine({
           params: { id: this.orderId! },
         });
+        if (!this._isCurrentSettlementPoll(pollVersion)) return;
         this.pendingSessionState = sessionState;
         this.pendingOrderState = order?.state;
         const settled =
@@ -164,23 +193,30 @@ export class ControllerPagePayment extends BeanControllerPageBase {
             : ['paid', 'cancelled', 'expired'].includes(order?.state ?? '');
         if (settled) {
           await this.queryOrder?.refetch();
-          await this.$router.push({
-            name: 'commerce-trade:order',
-            params: { id: this.orderId, locale: this.$params.locale },
-          });
+          if (!this._isCurrentSettlementPoll(pollVersion)) return;
+          await this.$router.push(
+            this.$router.getPagePath('/commerce/trade/order/:id', {
+              params: { id: this.orderId! },
+            }),
+          );
           return;
         }
         if (attempt === SettlementPollDelaysMilliseconds.length - 1) break;
       }
+      if (!this._isCurrentSettlementPoll(pollVersion)) return;
       this.pendingConfirmation = true;
       this.pendingSessionState = this.queryPaymentSession?.data?.state ?? this.pendingSessionState;
       this.pendingOrderState = this.queryOrder?.data?.state ?? this.pendingOrderState;
       this.message = this._pendingMessage();
     } finally {
-      this.waitingForOrder = false;
+      if (this._isCurrentSettlementPoll(pollVersion)) this.waitingForOrder = false;
     }
   }
 
+  private _isCurrentSettlementPoll(pollVersion: number) {
+    return this._settlementPollVersion === pollVersion;
+  }
+
   private _pendingMessage() {
     if (this.pendingSessionState === 'requires_action') {
       return this.$query.providerResult === 'cancel'
@@ -200,6 +236,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     const session = this.queryPaymentSession?.data;
     const isMockSession = session?.providerName === 'pay-mock:mock';
     const isCreated = session?.state === 'created';
+    const isStarting = session?.state === 'starting';
     const isActionable = session?.state === 'requires_action';
     const isActionableCancelReturn =
       this.$query.providerResult === 'cancel' && this.cancelReturnReconciled && isActionable;
@@ -228,6 +265,30 @@ export class ControllerPagePayment extends BeanControllerPageBase {
               Start payment
             </button>
           )}
+          {(isStarting || this.paymentSessionUnavailable) && (
+            <section class="mt-6 rounded border border-base-300 p-4" aria-live="polite">
+              <p class="text-base-content/70">
+                {this.paymentSessionUnavailable
+                  ? 'Payment session is unavailable. You can open your order.'
+                  : 'Payment preparation is being verified safely in the background.'}
+              </p>
+              <div class="mt-3 flex flex-wrap gap-3">
+                {!this.paymentSessionUnavailable && (
+                  <button
+                    class="btn btn-primary"
+                    type="button"
+                    disabled={this.submitting || this.waitingForOrder}
+                    onClick={() => this.reconcile()}
+                  >
+                    Check payment status
+                  </button>
+                )}
+                <button class="btn btn-outline" type="button" onClick={() => this.openOrder()}>
+                  Open order
+                </button>
+              </div>
+            </section>
+          )}
           {isActionableCancelReturn && (
             <section class="mt-6 rounded border border-base-300 p-4" aria-live="polite">
               <p class="text-base-content/70">

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

@@ -8,33 +8,30 @@ import { ZPagePayment } from './.metadata/page/payment.js';
 
 export const routes: IModuleRoute[] = [
   {
-    name: 'cart',
-    path: 'cart/:locale?',
+    path: 'cart',
     component: ZPageCart,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
   {
-    name: 'checkout',
-    path: 'checkout/:locale?',
+    path: 'checkout',
     component: ZPageCheckout,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
   {
+    path: 'payment/:paymentSessionId/:orderId',
     name: 'payment',
-    path: 'payment/:paymentSessionId/:orderId/:locale?',
     component: ZPagePayment,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
   {
-    name: 'orders',
-    path: 'orders/:locale?',
+    path: 'orders',
     component: ZPageOrders,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
   {
+    path: 'order/:id',
     name: 'order',
-    path: 'order/:id/:locale?',
     component: ZPageOrder,
-    meta: { locale: true, requiresAuth: true, ssrProfile: 'session' },
+    meta: { requiresAuth: true, ssrProfile: 'session' },
   },
 ];

package/zova/src/suite/a-home/modules/home-api/mock/passport.fake.ts

@@ -239,7 +239,7 @@ const __sdkSchemaPassportLogin = {
               type: 'string',
               title: '角色标题',
             },
-            locales: {
+            titleLocales: {
               type: 'object',
               additionalProperties: {
                 type: 'string',
@@ -415,14 +415,14 @@ export default defineFakeRoute([
                 id: 1,
                 name: 'registeredUser',
                 title: 'Registered User',
-                locales: { 'zh-cn': '注册用户' },
+                titleLocales: { 'zh-cn': '注册用户' },
                 siteIds: ['web'],
               },
               {
                 id: 2,
                 name: 'systemAdmin',
                 title: 'System Administrator',
-                locales: { 'zh-cn': '系统管理员' },
+                titleLocales: { 'zh-cn': '系统管理员' },
                 siteIds: ['web', 'admin'],
               },
             ],

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

@@ -4,6 +4,7 @@ export * from '../api/captcha.js';
 export * from '../api/home.js';
 export * from '../api/homeBaseMenu.js';
 export * from '../api/homeBasePermission.js';
+export * from '../api/homeBaseSiteCatalog.js';
 export * from '../api/homeUserPassport.js';
 export * from '../api/testSsrToolOne.js';
 
@@ -58,6 +59,17 @@ declare module 'zova-module-home-api' {
           
         }
 
+        export interface ApiHomeBaseSiteCatalog {
+          /** @internal */
+          get scope(): ScopeModuleHomeApi;
+        }
+
+        export interface ApiHomeBaseSiteCatalog {
+          get $beanFullName(): 'home-api.api.homeBaseSiteCatalog';
+          get $onionName(): 'home-api:homeBaseSiteCatalog';
+          
+        }
+
         export interface ApiHomeUserPassport {
           /** @internal */
           get scope(): ScopeModuleHomeApi;
@@ -86,6 +98,7 @@ import { ApiCaptcha } from '../api/captcha.js';
 import { ApiHome } from '../api/home.js';
 import { ApiHomeBaseMenu } from '../api/homeBaseMenu.js';
 import { ApiHomeBasePermission } from '../api/homeBasePermission.js';
+import { ApiHomeBaseSiteCatalog } from '../api/homeBaseSiteCatalog.js';
 import { ApiHomeUserPassport } from '../api/homeUserPassport.js';
 import { ApiTestSsrToolOne } from '../api/testSsrToolOne.js';
 export interface IModuleApi {
@@ -93,6 +106,7 @@ export interface IModuleApi {
 'home': ApiHome;
 'homeBaseMenu': ApiHomeBaseMenu;
 'homeBasePermission': ApiHomeBasePermission;
+'homeBaseSiteCatalog': ApiHomeBaseSiteCatalog;
 'homeUserPassport': ApiHomeUserPassport;
 'testSsrToolOne': ApiTestSsrToolOne;
 }
@@ -106,6 +120,7 @@ declare module 'zova' {
 'home-api.api.home': ApiHome;
 'home-api.api.homeBaseMenu': ApiHomeBaseMenu;
 'home-api.api.homeBasePermission': ApiHomeBasePermission;
+'home-api.api.homeBaseSiteCatalog': ApiHomeBaseSiteCatalog;
 'home-api.api.homeUserPassport': ApiHomeUserPassport;
 'home-api.api.testSsrToolOne': ApiTestSsrToolOne;
   }
@@ -119,6 +134,7 @@ export * from '../apiSchema/captcha.js';
 export * from '../apiSchema/home.js';
 export * from '../apiSchema/homeBaseMenu.js';
 export * from '../apiSchema/homeBasePermission.js';
+export * from '../apiSchema/homeBaseSiteCatalog.js';
 export * from '../apiSchema/homeUserPassport.js';
 export * from '../apiSchema/testSsrToolOne.js';
 
@@ -173,6 +189,17 @@ declare module 'zova-module-home-api' {
           
         }
 
+        export interface ApiSchemaHomeBaseSiteCatalog {
+          /** @internal */
+          get scope(): ScopeModuleHomeApi;
+        }
+
+        export interface ApiSchemaHomeBaseSiteCatalog {
+          get $beanFullName(): 'home-api.apiSchema.homeBaseSiteCatalog';
+          get $onionName(): 'home-api:homeBaseSiteCatalog';
+          
+        }
+
         export interface ApiSchemaHomeUserPassport {
           /** @internal */
           get scope(): ScopeModuleHomeApi;
@@ -201,6 +228,7 @@ import { ApiSchemaCaptcha } from '../apiSchema/captcha.js';
 import { ApiSchemaHome } from '../apiSchema/home.js';
 import { ApiSchemaHomeBaseMenu } from '../apiSchema/homeBaseMenu.js';
 import { ApiSchemaHomeBasePermission } from '../apiSchema/homeBasePermission.js';
+import { ApiSchemaHomeBaseSiteCatalog } from '../apiSchema/homeBaseSiteCatalog.js';
 import { ApiSchemaHomeUserPassport } from '../apiSchema/homeUserPassport.js';
 import { ApiSchemaTestSsrToolOne } from '../apiSchema/testSsrToolOne.js';
 export interface IModuleApiSchema {
@@ -208,6 +236,7 @@ export interface IModuleApiSchema {
 'home': ApiSchemaHome;
 'homeBaseMenu': ApiSchemaHomeBaseMenu;
 'homeBasePermission': ApiSchemaHomeBasePermission;
+'homeBaseSiteCatalog': ApiSchemaHomeBaseSiteCatalog;
 'homeUserPassport': ApiSchemaHomeUserPassport;
 'testSsrToolOne': ApiSchemaTestSsrToolOne;
 }
@@ -221,6 +250,7 @@ declare module 'zova' {
 'home-api.apiSchema.home': ApiSchemaHome;
 'home-api.apiSchema.homeBaseMenu': ApiSchemaHomeBaseMenu;
 'home-api.apiSchema.homeBasePermission': ApiSchemaHomeBasePermission;
+'home-api.apiSchema.homeBaseSiteCatalog': ApiSchemaHomeBaseSiteCatalog;
 'home-api.apiSchema.homeUserPassport': ApiSchemaHomeUserPassport;
 'home-api.apiSchema.testSsrToolOne': ApiSchemaTestSsrToolOne;
   }
@@ -286,5 +316,5 @@ declare module 'zova' {
 
   
 }
-  
+
 /** scope: end */

package/zova/src/suite/a-home/modules/home-api/src/api/homeBaseSiteCatalog.ts

@@ -0,0 +1,24 @@
+import type { IApiActionOptions } from 'zova-module-a-api';
+
+import { Api, BeanApiBase } from 'zova-module-a-api';
+
+import type { paths } from './openapi/index.js';
+
+import { OpenApiBaseURL } from './openapi/index.js';
+
+/** HomeBaseSiteCatalog_select */
+export const ApiApiHomeBaseSiteCatalogselectPath = '/api/home/base/siteCatalog';
+export type ApiApiHomeBaseSiteCatalogselectPath = '/api/home/base/siteCatalog';
+export type ApiApiHomeBaseSiteCatalogselectMethod = 'get';
+export type ApiApiHomeBaseSiteCatalogselectResponseBody =
+  paths[ApiApiHomeBaseSiteCatalogselectPath][ApiApiHomeBaseSiteCatalogselectMethod]['responses']['200']['content']['application/json']['data'];
+
+@Api()
+export class ApiHomeBaseSiteCatalog extends BeanApiBase {
+  select(options?: IApiActionOptions) {
+    return this.$fetch.get<any, ApiApiHomeBaseSiteCatalogselectResponseBody>(
+      ApiApiHomeBaseSiteCatalogselectPath,
+      this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
+    );
+  }
+}