cabloy 5.1.134 → 5.1.136

package/vona/pnpm-workspace.yaml

@@ -53,4 +53,4 @@ allowBuilds:
   vue-demi: true
 
 patchedDependencies:
-  zova-core@5.1.82: patches/zova-core@5.1.82.patch
+  zova-core@5.1.84: patches/zova-core@5.1.84.patch

package/vona/src/suite/a-commerce/modules/commerce-catalog/package.json

@@ -30,7 +30,6 @@
     "prepack": "clean-package",
     "postpack": "clean-package restore"
   },
-  "dependencies": {},
   "devDependencies": {
     "clean-package": "^2.2.0",
     "rimraf": "^6.1.3"
@@ -46,6 +45,7 @@
   "title": "commerce-catalog",
   "vonaModule": {
     "dependencies": {
+      "a-markdown": "5.0.0",
       "a-vona": "5.0.0",
       "commerce-trade": "5.0.0"
     },

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts

@@ -1,13 +1,15 @@
 // eslint-disable
-import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,IModelRelationBelongsTo,IModelRelationHasMany } from 'vona-module-a-orm';
+import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,IModelRelationHasOne,IModelRelationBelongsTo,IModelRelationHasMany } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields,TypeControllerOptionsActions } from 'vona-module-a-openapi';
 import type { TableIdentity } from 'table-identity';
 /** entity: begin */
 export * from '../entity/category.tsx';
 export * from '../entity/product.tsx';
+export * from '../entity/productContent.tsx';
 export * from '../entity/sku.tsx';
 import type { IEntityOptionsCategory } from '../entity/category.tsx';
 import type { IEntityOptionsProduct } from '../entity/product.tsx';
+import type { IEntityOptionsProductContent } from '../entity/productContent.tsx';
 import type { IEntityOptionsSku } from '../entity/sku.tsx';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
@@ -15,6 +17,7 @@ declare module 'vona-module-a-orm' {
     export interface IEntityRecord {
       'commerce-catalog:category': IEntityOptionsCategory;
 'commerce-catalog:product': IEntityOptionsProduct;
+'commerce-catalog:productContent': IEntityOptionsProductContent;
 'commerce-catalog:sku': IEntityOptionsSku;
     }
 
@@ -27,24 +30,29 @@ declare module 'vona-module-commerce-catalog' {
 /** entity: begin */
 import type { EntityCategory } from '../entity/category.tsx';
 import type { EntityProduct } from '../entity/product.tsx';
+import type { EntityProductContent } from '../entity/productContent.tsx';
 import type { EntitySku } from '../entity/sku.tsx';
 export interface IModuleEntity {
   'category': EntityCategoryMeta;
 'product': EntityProductMeta;
+'productContent': EntityProductContentMeta;
 'sku': EntitySkuMeta;
 }
 /** entity: end */
 /** entity: begin */
 export type EntityCategoryTableName = 'commerceCatalogCategory';
 export type EntityProductTableName = 'commerceCatalogProduct';
+export type EntityProductContentTableName = 'commerceCatalogProductContent';
 export type EntitySkuTableName = 'commerceCatalogSku';
 export type EntityCategoryMeta=TypeEntityMeta<EntityCategory,EntityCategoryTableName>;
 export type EntityProductMeta=TypeEntityMeta<EntityProduct,EntityProductTableName>;
+export type EntityProductContentMeta=TypeEntityMeta<EntityProductContent,EntityProductContentTableName>;
 export type EntitySkuMeta=TypeEntityMeta<EntitySku,EntitySkuTableName>;
 declare module 'vona-module-a-orm' {
   export interface ITableRecord {
     'commerceCatalogCategory': EntityCategoryMeta;
 'commerceCatalogProduct': EntityProductMeta;
+'commerceCatalogProductContent': EntityProductContentMeta;
 'commerceCatalogSku': EntitySkuMeta;
   }
 }
@@ -58,6 +66,10 @@ declare module 'vona-module-commerce-catalog' {
       fields?: TypeEntityOptionsFields<EntityProduct, IEntityOptionsProduct[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IEntityOptionsProductContent {
+      fields?: TypeEntityOptionsFields<EntityProductContent, IEntityOptionsProductContent[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IEntityOptionsSku {
       fields?: TypeEntityOptionsFields<EntitySku, IEntityOptionsSku[TypeSymbolKeyFieldsMore]>;
     }
@@ -66,9 +78,11 @@ declare module 'vona-module-commerce-catalog' {
 /** model: begin */
 export * from '../model/category.ts';
 export * from '../model/product.ts';
+export * from '../model/productContent.ts';
 export * from '../model/sku.ts';
 import type { IModelOptionsCategory } from '../model/category.ts';
 import type { IModelOptionsProduct } from '../model/product.ts';
+import type { IModelOptionsProductContent } from '../model/productContent.ts';
 import type { IModelOptionsSku } from '../model/sku.ts';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
@@ -76,6 +90,7 @@ declare module 'vona-module-a-orm' {
     export interface IModelRecord {
       'commerce-catalog:category': IModelOptionsCategory;
 'commerce-catalog:product': IModelOptionsProduct;
+'commerce-catalog:productContent': IModelOptionsProductContent;
 'commerce-catalog:sku': IModelOptionsSku;
     }
 
@@ -105,6 +120,17 @@ declare module 'vona-module-commerce-catalog' {
             get $onionOptions(): IModelOptionsProduct;
           }
 
+        export interface ModelProductContent {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface ModelProductContent {
+            get $beanFullName(): 'commerce-catalog.model.productContent';
+            get $onionName(): 'commerce-catalog:productContent';
+            get $onionOptions(): IModelOptionsProductContent;
+          }
+
         export interface ModelSku {
           /** @internal */
           get scope(): ScopeModuleCommerceCatalog;
@@ -120,10 +146,12 @@ declare module 'vona-module-commerce-catalog' {
 /** model: begin */
 import type { ModelCategory } from '../model/category.ts';
 import type { ModelProduct } from '../model/product.ts';
+import type { ModelProductContent } from '../model/productContent.ts';
 import type { ModelSku } from '../model/sku.ts';
 export interface IModuleModel {
   'category': ModelCategory;
 'product': ModelProduct;
+'productContent': ModelProductContent;
 'sku': ModelSku;
 }
 /** model: end */
@@ -134,6 +162,7 @@ declare module 'vona' {
   export interface IBeanRecordGeneral {
     'commerce-catalog.model.category': ModelCategory;
 'commerce-catalog.model.product': ModelProduct;
+'commerce-catalog.model.productContent': ModelProductContent;
 'commerce-catalog.model.sku': ModelSku;
   }
 }
@@ -150,10 +179,17 @@ declare module 'vona-module-commerce-catalog' {
 export interface IModelOptionsProduct {
         relations: {
           category: IModelRelationBelongsTo<'commerce-catalog:product', 'commerce-catalog:category', false, 'id'|'name'|'published'>;
+productContent: IModelRelationHasOne<'commerce-catalog:productContent', 'productId', false, 'id'|'productId'|'descriptionMarkdown'|'descriptionHtml'>;
+productContentForm: IModelRelationHasOne<'commerce-catalog:productContent', 'productId', false, 'id'|'productId'|'descriptionMarkdown'>;
 skus: IModelRelationHasMany<'commerce-catalog:sku', 'productId', false, '*', undefined, undefined, undefined>;
 skuAvailables: IModelRelationHasMany<'commerce-catalog:sku', 'productId', false, 'id'|'code'|'productId'|'priceCents', ['commerce-trade:stockBalance'], undefined, undefined>;
         };
       }
+export interface IModelOptionsProductContent {
+        relations: {
+          product: IModelRelationBelongsTo<'commerce-catalog:productContent', 'commerce-catalog:product', false, '*'>;
+        };
+      }
 export interface IModelOptionsSku {
         relations: {
           product: IModelRelationBelongsTo<'commerce-catalog:sku', 'commerce-catalog:product', false, '*'>;
@@ -237,6 +273,43 @@ export interface ModelProduct {
 updateById<T extends IModelUpdateOptions<EntityProduct,ModelProduct>>(id: TableIdentity, data: TypeModelMutateRelationData<EntityProduct,ModelProduct, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProduct,ModelProduct, T>>;
 deleteById<T extends IModelDeleteOptions<EntityProduct,ModelProduct>>(id: TableIdentity, options?: T): Promise<void>;
     }
+export interface ModelProductContent {
+      [SymbolKeyEntity]: EntityProductContent;
+      [SymbolKeyEntityMeta]: EntityProductContentMeta;
+      [SymbolKeyModelOptions]: IModelOptionsProductContent;
+      get<T extends IModelGetOptions<EntityProductContent,ModelProductContent>>(where: TypeModelWhere<EntityProductContent>, options?: T): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
+      getForUpdate<T extends IModelGetOptions<EntityProductContent,ModelProductContent>>(where: TypeModelWhere<EntityProductContent>, options?: T): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
+      getByIdForUpdate<T extends IModelGetOptions<EntityProductContent,ModelProductContent>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T> | undefined>;
+      mget<T extends IModelGetOptions<EntityProductContent,ModelProductContent>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T>[]>;
+      selectAndCount<T extends IModelSelectParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityProductContent, ModelProductContent, T>>;
+      select<T extends IModelSelectParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T>[]>;
+      insert<T extends IModelInsertOptions<EntityProductContent,ModelProductContent>>(data?: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T, true>>;
+      insertBulk<T extends IModelInsertOptions<EntityProductContent,ModelProductContent>>(items: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T, true>[]>;
+      update<T extends IModelUpdateOptions<EntityProductContent,ModelProductContent>>(data: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>>;
+      updateBulk<T extends IModelUpdateOptions<EntityProductContent,ModelProductContent>>(items: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>[]>;
+      delete<T extends IModelDeleteOptions<EntityProductContent,ModelProductContent>>(where?: TypeModelWhere<EntityProductContent>, options?: T): Promise<void>;
+      deleteBulk<T extends IModelDeleteOptions<EntityProductContent,ModelProductContent>>(ids: TableIdentity[], options?: T): Promise<void>;
+      mutate<T extends IModelMutateOptions<EntityProductContent,ModelProductContent>>(data?: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>>;
+      mutateBulk<T extends IModelMutateOptions<EntityProductContent,ModelProductContent>>(items: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>[]>;
+      count<T extends IModelSelectCountParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      aggregate<T extends IModelSelectAggrParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
+      group<T extends IModelSelectGroupParams<EntityProductContent,ModelProductContent,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityProductContent, T>[]>;
+      getById<T extends IModelGetOptions<EntityProductContent,ModelProductContent>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityProductContent, ModelProductContent, T> | undefined>;
+updateById<T extends IModelUpdateOptions<EntityProductContent,ModelProductContent>>(id: TableIdentity, data: TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProductContent,ModelProductContent, T>>;
+deleteById<T extends IModelDeleteOptions<EntityProductContent,ModelProductContent>>(id: TableIdentity, options?: T): Promise<void>;
+    }
 export interface ModelSku {
       [SymbolKeyEntity]: EntitySku;
       [SymbolKeyEntityMeta]: EntitySkuMeta;
@@ -279,6 +352,7 @@ declare module 'vona-module-a-orm' {
   export interface IModelClassRecord {
     'commerce-catalog:category': ModelCategory;
 'commerce-catalog:product': ModelProduct;
+'commerce-catalog:productContent': ModelProductContent;
 'commerce-catalog:sku': ModelSku;
   }
 }
@@ -402,8 +476,11 @@ export * from '../dto/categorySelectRes.tsx';
 export * from '../dto/categorySelectResItem.tsx';
 export * from '../dto/categoryUpdate.tsx';
 export * from '../dto/categoryView.tsx';
+export * from '../dto/productContentUpdate.tsx';
+export * from '../dto/productContentView.tsx';
 export * from '../dto/productCreate.tsx';
 export * from '../dto/productPublic.tsx';
+export * from '../dto/productPublicDetail.tsx';
 export * from '../dto/productPublicSelectReq.tsx';
 export * from '../dto/productPublicSelectRes.tsx';
 export * from '../dto/productPublicSku.tsx';
@@ -425,8 +502,11 @@ import type { IDtoOptionsCategorySelectRes } from '../dto/categorySelectRes.tsx'
 import type { IDtoOptionsCategorySelectResItem } from '../dto/categorySelectResItem.tsx';
 import type { IDtoOptionsCategoryUpdate } from '../dto/categoryUpdate.tsx';
 import type { IDtoOptionsCategoryView } from '../dto/categoryView.tsx';
+import type { IDtoOptionsProductContentUpdate } from '../dto/productContentUpdate.tsx';
+import type { IDtoOptionsProductContentView } from '../dto/productContentView.tsx';
 import type { IDtoOptionsProductCreate } from '../dto/productCreate.tsx';
 import type { IDtoOptionsProductPublic } from '../dto/productPublic.tsx';
+import type { IDtoOptionsProductPublicDetail } from '../dto/productPublicDetail.tsx';
 import type { IDtoOptionsProductPublicSelectReq } from '../dto/productPublicSelectReq.tsx';
 import type { IDtoOptionsProductPublicSelectRes } from '../dto/productPublicSelectRes.tsx';
 import type { IDtoOptionsProductPublicSku } from '../dto/productPublicSku.tsx';
@@ -452,8 +532,11 @@ declare module 'vona-module-a-web' {
 'commerce-catalog:categorySelectResItem': IDtoOptionsCategorySelectResItem;
 'commerce-catalog:categoryUpdate': IDtoOptionsCategoryUpdate;
 'commerce-catalog:categoryView': IDtoOptionsCategoryView;
+'commerce-catalog:productContentUpdate': IDtoOptionsProductContentUpdate;
+'commerce-catalog:productContentView': IDtoOptionsProductContentView;
 'commerce-catalog:productCreate': IDtoOptionsProductCreate;
 'commerce-catalog:productPublic': IDtoOptionsProductPublic;
+'commerce-catalog:productPublicDetail': IDtoOptionsProductPublicDetail;
 'commerce-catalog:productPublicSelectReq': IDtoOptionsProductPublicSelectReq;
 'commerce-catalog:productPublicSelectRes': IDtoOptionsProductPublicSelectRes;
 'commerce-catalog:productPublicSku': IDtoOptionsProductPublicSku;
@@ -484,8 +567,11 @@ import type { DtoCategorySelectRes } from '../dto/categorySelectRes.tsx';
 import type { DtoCategorySelectResItem } from '../dto/categorySelectResItem.tsx';
 import type { DtoCategoryUpdate } from '../dto/categoryUpdate.tsx';
 import type { DtoCategoryView } from '../dto/categoryView.tsx';
+import type { DtoProductContentUpdate } from '../dto/productContentUpdate.tsx';
+import type { DtoProductContentView } from '../dto/productContentView.tsx';
 import type { DtoProductCreate } from '../dto/productCreate.tsx';
 import type { DtoProductPublic } from '../dto/productPublic.tsx';
+import type { DtoProductPublicDetail } from '../dto/productPublicDetail.tsx';
 import type { DtoProductPublicSelectReq } from '../dto/productPublicSelectReq.tsx';
 import type { DtoProductPublicSelectRes } from '../dto/productPublicSelectRes.tsx';
 import type { DtoProductPublicSku } from '../dto/productPublicSku.tsx';
@@ -527,6 +613,14 @@ declare module 'vona-module-commerce-catalog' {
       fields?: TypeEntityOptionsFields<DtoCategoryView, IDtoOptionsCategoryView[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsProductContentUpdate {
+      fields?: TypeEntityOptionsFields<DtoProductContentUpdate, IDtoOptionsProductContentUpdate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsProductContentView {
+      fields?: TypeEntityOptionsFields<DtoProductContentView, IDtoOptionsProductContentView[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsProductCreate {
       fields?: TypeEntityOptionsFields<DtoProductCreate, IDtoOptionsProductCreate[TypeSymbolKeyFieldsMore]>;
     }
@@ -535,6 +629,10 @@ declare module 'vona-module-commerce-catalog' {
       fields?: TypeEntityOptionsFields<DtoProductPublic, IDtoOptionsProductPublic[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsProductPublicDetail {
+      fields?: TypeEntityOptionsFields<DtoProductPublicDetail, IDtoOptionsProductPublicDetail[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsProductPublicSelectReq {
       fields?: TypeEntityOptionsFields<DtoProductPublicSelectReq, IDtoOptionsProductPublicSelectReq[TypeSymbolKeyFieldsMore]>;
     }

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/bean/meta.index.ts

@@ -8,6 +8,7 @@ import { $tableColumns } from 'vona-module-a-ormutils';
   indexes: {
     ...$tableColumns('commerceCatalogSku', ['code', 'productId', 'lifecycle']),
     ...$tableColumns('commerceCatalogProduct', ['title', 'categoryId']),
+    ...$tableColumns('commerceCatalogProductContent', ['productId']),
     ...$tableColumns('commerceCatalogCategory', ['name', 'parentId']),
   },
 })

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/bean/meta.version.ts

@@ -35,6 +35,25 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
         table.index([entityProduct.categoryId], `idx_${entityProduct.$table}_categoryId`);
       });
 
+      const entityProductContent = this.scope.entity.productContent;
+      await this.bean.model.createTable(entityProductContent.$table, table => {
+        table.comment(entityProductContent.$comment.$table);
+        table.basicFields();
+        table
+          .text(entityProductContent.descriptionMarkdown)
+          .comment(entityProductContent.$comment.descriptionMarkdown);
+        table
+          .text(entityProductContent.descriptionHtml)
+          .comment(entityProductContent.$comment.descriptionHtml);
+        table
+          .tableIdentity(entityProductContent.productId)
+          .comment(entityProductContent.$comment.productId);
+        table.index(
+          [entityProductContent.productId],
+          `idx_${entityProductContent.$table}_productId`,
+        );
+      });
+
       const entitySku = this.scope.entity.sku;
       await this.bean.model.createTable(entitySku.$table, table => {
         table.comment(entitySku.$comment.$table);

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

@@ -2,11 +2,14 @@ export default {
   Available: 'Available',
   Category: 'Category',
   Description: 'Description',
+  DescriptionHtml: 'Product description (HTML)',
+  DescriptionMarkdown: 'Product description (Markdown)',
   Name: 'Name',
   Operations: 'Operations',
   ParentCategory: 'Parent category',
   PriceCents: 'Price (cents)',
   Product: 'Product',
+  ProductContent: 'Product content',
   ProductTitle: 'Product title',
   Published: 'Published',
   Unpublished: 'Unpublished',

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

@@ -2,11 +2,14 @@ export default {
   Available: '可用库存',
   Category: '分类',
   Description: '描述',
+  DescriptionHtml: '商品描述（HTML）',
+  DescriptionMarkdown: '商品描述（Markdown）',
   Name: '名称',
   Operations: '操作',
   ParentCategory: '父分类',
   PriceCents: '价格（分）',
   Product: '商品',
+  ProductContent: '商品详情',
   ProductTitle: '商品标题',
   Published: '已发布',
   Unpublished: '未发布',

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/controller/product.ts

@@ -11,7 +11,7 @@ import { z } from 'zod';
 import type { ModelProduct } from '../model/product.ts';
 
 import { DtoProductCreate } from '../dto/productCreate.tsx';
-import { DtoProductPublic } from '../dto/productPublic.tsx';
+import { DtoProductPublicDetail } from '../dto/productPublicDetail.tsx';
 import { DtoProductPublicSelectReq } from '../dto/productPublicSelectReq.tsx';
 import { DtoProductPublicSelectRes } from '../dto/productPublicSelectRes.tsx';
 import { DtoProductSelectReq } from '../dto/productSelectReq.tsx';
@@ -50,11 +50,11 @@ export class ControllerProduct extends BeanBase {
   }
 
   @Web.get('public/:id')
-  @Api.body(v.optional(), v.object(DtoProductPublic))
+  @Api.body(v.optional(), v.object(DtoProductPublicDetail))
   @Passport.public()
   async viewPublic(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
-  ): Promise<DtoProductPublic | undefined> {
+  ): Promise<DtoProductPublicDetail | undefined> {
     return await this.scope.service.product.viewPublic(id);
   }
 

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productContentUpdate.tsx

@@ -0,0 +1,14 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IDtoOptionsProductContentUpdate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsProductContentUpdate>()
+export class DtoProductContentUpdate {
+  @Api.field(v.title($locale('DescriptionMarkdown')), v.optional())
+  descriptionMarkdown?: string;
+}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productContentView.tsx

@@ -0,0 +1,19 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IDtoOptionsProductContentView extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsProductContentView>({
+  fields: {
+    descriptionMarkdown: $makeMetadata(ZovaRender.field('basic-markdown:formFieldMarkdown')),
+  },
+})
+export class DtoProductContentView {
+  @Api.field(v.title($locale('DescriptionMarkdown')), v.optional())
+  descriptionMarkdown?: string;
+}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productCreate.tsx

@@ -1,18 +1,61 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeMetadata } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
+import { $locale } from '../.metadata/locales.ts';
 import { ModelProduct } from '../model/product.ts';
 
-export interface IDtoOptionsProductCreate extends IDecoratorDtoOptions {}
+export interface IDtoOptionsProductCreate extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductCreate>({
+  fields: {
+    productContentForm: $makeMetadata(
+      ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
+      ZovaRender.field('basic-markdown:formFieldMarkdown'),
+    ),
+  },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('Product'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'title' },
+                          { type: 'field', name: 'categoryId' },
+                          { type: 'field', name: 'published' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('ProductContent'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'productContentForm' }],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionSubmit', {
@@ -25,4 +68,6 @@ export interface IDtoOptionsProductCreate extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoProductCreate extends $Dto.create(() => ModelProduct) {}
+export class DtoProductCreate extends $Dto.create(() => ModelProduct, {
+  include: { productContentForm: true },
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productPublicDetail.tsx

@@ -0,0 +1,15 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+import { $locale } from '../.metadata/locales.ts';
+import { DtoProductPublic } from './productPublic.tsx';
+
+export interface IDtoOptionsProductPublicDetail extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsProductPublicDetail>()
+export class DtoProductPublicDetail extends DtoProductPublic {
+  @Api.field(v.title($locale('DescriptionHtml')), v.optional())
+  descriptionHtml?: string;
+}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productUpdate.tsx

@@ -1,18 +1,61 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeMetadata } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
+import { $locale } from '../.metadata/locales.ts';
 import { ModelProduct } from '../model/product.ts';
 
-export interface IDtoOptionsProductUpdate extends IDecoratorDtoOptions {}
+export interface IDtoOptionsProductUpdate extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductUpdate>({
+  fields: {
+    productContentForm: $makeMetadata(
+      ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
+      ZovaRender.field('basic-markdown:formFieldMarkdown'),
+    ),
+  },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('Product'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'title' },
+                          { type: 'field', name: 'categoryId' },
+                          { type: 'field', name: 'published' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('ProductContent'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'productContentForm' }],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionSubmit', {
@@ -25,4 +68,6 @@ export interface IDtoOptionsProductUpdate extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoProductUpdate extends $Dto.update(() => ModelProduct) {}
+export class DtoProductUpdate extends $Dto.update(() => ModelProduct, {
+  include: { productContentForm: true },
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productView.tsx

@@ -1,18 +1,64 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeMetadata } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
+import { $locale } from '../.metadata/locales.ts';
 import { ModelProduct } from '../model/product.ts';
 
-export interface IDtoOptionsProductView extends IDecoratorDtoOptions {}
+export interface IDtoOptionsProductView extends IDecoratorDtoOptions<'productContentForm'> {}
 
 @Dto<IDtoOptionsProductView>({
+  fields: {
+    productContentForm: $makeMetadata(
+      ZovaRender.fieldSource('productContentForm.descriptionMarkdown'),
+      ZovaRender.field('basic-markdown:formFieldMarkdown'),
+    ),
+  },
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('Product'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'id' },
+                          { type: 'field', name: 'title' },
+                          { type: 'field', name: 'categoryId' },
+                          { type: 'field', name: 'published' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                          { type: 'field', name: 'createdAt' },
+                          { type: 'field', name: 'updatedAt' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('ProductContent'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'productContentForm' }],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
@@ -23,5 +69,8 @@ export interface IDtoOptionsProductView extends IDecoratorDtoOptions {}
   ],
 })
 export class DtoProductView extends $Dto.get(() => ModelProduct, {
-  include: { category: true },
+  include: {
+    category: true,
+    productContentForm: true,
+  },
 }) {}