cabloy 5.1.65 → 5.1.66

package/vona/packages-cli/cli-set-api/src/lib/beans.ts

@@ -26,6 +26,7 @@ import { CliToolsCrud } from './bean/cli.tools.crud.ts';
 import { CliToolsCrudBasic } from './bean/cli.tools.crudBasic.ts';
 import { CliToolsCrudStart } from './bean/cli.tools.crudStart.ts';
 import { CliToolsDeps } from './bean/cli.tools.deps.ts';
+import { CliToolsMasterDetail } from './bean/cli.tools.masterDetail.ts';
 import { CliToolsMetadata } from './bean/cli.tools.metadata.ts';
 
 export const beans = {
@@ -58,4 +59,5 @@ export const beans = {
   'tools.crudBasic': CliToolsCrudBasic,
   'tools.crudStart': CliToolsCrudStart,
   'tools.crud': CliToolsCrud,
+  'tools.masterDetail': CliToolsMasterDetail,
 };

package/vona/packages-cli/cli-set-api/src/lib/command/tools.masterDetail.ts

@@ -0,0 +1,78 @@
+export default {
+  bean: 'tools.masterDetail',
+  info: {
+    version: '5.0.0',
+    title: 'Cli: Tools: Master Detail',
+    usage:
+      'npm run vona :tools:masterDetail resourceName -- [--module=] [--detailModule=] [--detailResourceName=] [--relationName=] [--fk=] [--detailMode=aggregate|standalone]',
+  },
+  options: {
+    module: {
+      description: 'master module relative name, such as training-student',
+      type: 'string',
+    },
+    detailModule: {
+      description: 'detail module relative name, such as training-record',
+      type: 'string',
+    },
+    detailResourceName: {
+      description: 'detail resource name',
+      type: 'string',
+    },
+    relationName: {
+      description: 'master relation name',
+      type: 'string',
+    },
+    fk: {
+      description: 'detail foreign key field name',
+      type: 'string',
+    },
+    detailMode: {
+      description: 'detail mode: aggregate or standalone',
+      type: 'string',
+    },
+  },
+  groups: {
+    default: {
+      questions: {
+        resourceName: {
+          type: 'input',
+          message: 'master resourceName',
+          initial: {
+            expression: 'arg0',
+          },
+          required: true,
+        },
+        module: {
+          type: 'input',
+          message: 'master module relative name (for example training-student)',
+          required: true,
+        },
+        detailModule: {
+          type: 'input',
+          message: 'detail module relative name (for example training-record)',
+          required: true,
+        },
+        detailResourceName: {
+          type: 'input',
+          message: 'detail resourceName',
+          required: true,
+        },
+        relationName: {
+          type: 'input',
+          message: 'master relation name',
+        },
+        fk: {
+          type: 'input',
+          message: 'detail foreign key field name',
+        },
+        detailMode: {
+          type: 'input',
+          message: 'detail mode (aggregate|standalone)',
+          initial: 'aggregate',
+          required: true,
+        },
+      },
+    },
+  },
+};

package/vona/packages-cli/cli-set-api/src/lib/commands.ts

@@ -26,6 +26,7 @@ import toolsCrud from './command/tools.crud.ts';
 import toolsCrudBasic from './command/tools.crudBasic.ts';
 import toolsCrudStart from './command/tools.crudStart.ts';
 import toolsDeps from './command/tools.deps.ts';
+import toolsMasterDetail from './command/tools.masterDetail.ts';
 import toolsMetadata from './command/tools.metadata.ts';
 
 export const commands = {
@@ -68,5 +69,6 @@ export const commands = {
     crudBasic: toolsCrudBasic,
     crudStart: toolsCrudStart,
     crud: toolsCrud,
+    masterDetail: toolsMasterDetail,
   },
 };

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.49",
+  "version": "5.1.53",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/packages-vona/vona-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-core",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona",
   "keywords": [

package/vona/packages-vona/vona-core/src/lib/mappedClass/type.ts

@@ -5,5 +5,6 @@ export const SymbolMappedClassMetadataKeys = Symbol('SymbolMappedClassMetakeys')
 export type MappedClassMetadataKeys = Record<MetadataKey, IMappedClassMetadataOptions | undefined>;
 
 export interface IMappedClassMetadataOptions {
+  replace?: boolean;
   partialClass?: Function;
 }

package/vona/packages-vona/vona-core/src/lib/mappedClass/utils.ts

@@ -81,22 +81,44 @@ export function copyMetadataOfClasses(target: object, sources: object[], transfo
   setMappedClassMetadataKeys(target, metadataKeys);
   //
   for (const metadataKey of Object.getOwnPropertySymbols(metadataKeys)) {
-    const metadataKeyOptions = metadataKeys[metadataKey];
-    const rulesNew = {};
-    for (const source of sources) {
-      const rules = appMetadata.getMetadata(metadataKey, source);
-      if (!rules) continue;
-      if (!transform) {
-        Object.assign(rulesNew, rules);
-      } else {
-        for (const key in rules) {
-          const ruleNew = transform(rules, key, metadataKeyOptions);
-          if (ruleNew !== undefined) {
-            rulesNew[key] = ruleNew;
-          }
+    const metadataKeyOptions: IMappedClassMetadataOptions = metadataKeys[metadataKey];
+    if (metadataKeyOptions.replace) {
+      _copyMetadataOfClassesReplace(metadataKey, target, sources);
+    } else {
+      _copyMetadataOfClassesMap(metadataKey, metadataKeyOptions, target, sources, transform);
+    }
+  }
+}
+
+function _copyMetadataOfClassesReplace(metadataKey: symbol, target: object, sources: object[]) {
+  let valueNew;
+  for (const source of sources) {
+    valueNew = appMetadata.getMetadata(metadataKey, source);
+  }
+  appMetadata.defineMetadata(metadataKey, valueNew, target);
+}
+
+function _copyMetadataOfClassesMap(
+  metadataKey: symbol,
+  metadataKeyOptions: IMappedClassMetadataOptions,
+  target: object,
+  sources: object[],
+  transform?: Function,
+) {
+  const rulesNew = {};
+  for (const source of sources) {
+    const rules = appMetadata.getMetadata(metadataKey, source);
+    if (!rules) continue;
+    if (!transform) {
+      Object.assign(rulesNew, rules);
+    } else {
+      for (const key in rules) {
+        const ruleNew = transform(rules, key, metadataKeyOptions);
+        if (ruleNew !== undefined) {
+          rulesNew[key] = ruleNew;
         }
       }
     }
-    appMetadata.defineMetadata(metadataKey, rulesNew, target);
   }
+  appMetadata.defineMetadata(metadataKey, rulesNew, target);
 }

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.23",
+  "version": "6.1.24",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [

package/vona/pnpm-lock.yaml

@@ -7421,6 +7421,9 @@ packages:
   zova-module-a-openapi@5.1.35:
     resolution: {integrity: sha512-DT7KUxOpLAWfCvXkBvE4VPfTv+2zlMEGQuFg5QI00GNaSCEs7fmB4nNWDf6cZRr4OBTXOzYAmfgDoM4q19/V9g==}
 
+  zova-module-a-openapi@5.1.36:
+    resolution: {integrity: sha512-Sm5U1Im3kIumriz6w9xtab9QK2p8atAINIQIiP9Bcu46M2OA7gWDWR/jfdty2/G+nDBOn54+3yxHEWQZ9raCiQ==}
+
   zova-module-a-router@5.1.26:
     resolution: {integrity: sha512-TMNPX62+haeqNk0KejrH6ID5HLdi6CngRC7B1XsnjqKR8E0eQJL1YxxrPkaf4AQQKc9c9BHjRdL6EEZFqintiQ==}
 
@@ -7466,14 +7469,14 @@ packages:
   zova-suite-a-zova@5.1.102:
     resolution: {integrity: sha512-R5HB45pBHN9lZhWRmCuWH0DSMcDb6iBsgCQojxSZNsD8ttSCvWyu2FwNAmCQFguwEuPyZw8ZZndwr/8HAU3IxQ==}
 
-  zova-suite-a-zova@5.1.104:
-    resolution: {integrity: sha512-PO30MMsQOznp6yq04yn3m2Lse4DxFl6MLyVWEhhrDcqTlyl67L/kNV2cEBmyW8MWoEX0SbEbHYmVZKOTie7lmg==}
+  zova-suite-a-zova@5.1.105:
+    resolution: {integrity: sha512-34A9uB8A0rPBW6akpYl2nCSzck7jEi+D9PQJwDVx5Ms01sLhzdQk9QIf3Ux3uxoa4nmAnyDEtxKgvPSoUdpgPQ==}
 
   zova@5.1.103:
     resolution: {integrity: sha512-AR+Pk9hozKvB6/R/fZ4WPtKX4I0TJxmHx8Ao8dpLovlXhacYi50dUHOTxUQDavwspkWjMDinNqjQWo2MpAVc9g==}
 
-  zova@5.1.105:
-    resolution: {integrity: sha512-rE5TH1AhEr9fp6uhMCSuW83UhMjHGHqDq9iXm3nmzU95HbwBVO/uInCSklypeQ0ahvaJnl8MXKg6viinvix3lg==}
+  zova@5.1.106:
+    resolution: {integrity: sha512-zRNxKjKZi9yxBpWixQmz/OVdmh4KzZwpGSD1r6fk6q0jrU4JmfJ7VETNlN4PsSPZ3/Bu3Z9MwlmI/nCbNV9cFg==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -13045,6 +13048,12 @@ snapshots:
       openapi3-ts: 4.6.0
       typestyle: 2.4.0
 
+  zova-module-a-openapi@5.1.36:
+    dependencies:
+      '@cabloy/json-schema-to-zod': 2.6.4
+      openapi3-ts: 4.6.0
+      typestyle: 2.4.0
+
   zova-module-a-router@5.1.26: {}
 
   zova-module-a-routerstack@5.1.23: {}
@@ -13117,7 +13126,7 @@ snapshots:
       table-identity: link:packages-utils/table-identity
       vue: 3.5.38(typescript@5.9.3)
       zod: '@cabloy/zod@4.3.6'
-      zova: 5.1.105(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3))
+      zova: 5.1.106(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3))
       zova-jsx: 1.1.63(typescript@5.9.3)
       zova-module-a-api: 5.1.18
       zova-module-a-bean: 5.1.28
@@ -13127,7 +13136,7 @@ snapshots:
       zova-module-a-icon: 5.1.23
       zova-module-a-interceptor: 5.1.26
       zova-module-a-model: 5.1.27(vue@3.5.38(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.35
+      zova-module-a-openapi: 5.1.36
       zova-module-a-router: 5.1.26
       zova-module-a-routertabs: 5.1.29
       zova-module-a-ssr: 5.1.23
@@ -13187,7 +13196,7 @@ snapshots:
       zova-module-a-logger: 5.1.23
       zova-module-a-meta: 5.1.18
       zova-module-a-model: 5.1.27(vue@3.5.38(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.34
+      zova-module-a-openapi: 5.1.35
       zova-module-a-router: 5.1.26
       zova-module-a-routerstack: 5.1.23
       zova-module-a-routertabs: 5.1.29
@@ -13205,7 +13214,7 @@ snapshots:
       - typescript
       - vue
 
-  zova-suite-a-zova@5.1.104(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.105(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.18
       zova-module-a-app: 5.1.21
@@ -13221,7 +13230,7 @@ snapshots:
       zova-module-a-logger: 5.1.23
       zova-module-a-meta: 5.1.18
       zova-module-a-model: 5.1.27(vue@3.5.38(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.35
+      zova-module-a-openapi: 5.1.36
       zova-module-a-router: 5.1.26
       zova-module-a-routerstack: 5.1.23
       zova-module-a-routertabs: 5.1.29
@@ -13250,10 +13259,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.105(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3)):
+  zova@5.1.106(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.57(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.104(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3))
+      zova-suite-a-zova: 5.1.105(typescript@5.9.3)(vue@3.5.38(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts

@@ -13,4 +13,7 @@ export default {
   DescriptionLength: 'Description Length',
   ForceDelete: 'Force Delete',
   TrainingRecords: 'Training Records',
+  AddTrainingRecord: 'Add Training Record',
+  EditTrainingRecord: 'Edit Training Record',
+  ViewTrainingRecord: 'View Training Record',
 };

package/vona/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts

@@ -13,4 +13,7 @@ export default {
   DescriptionLength: '描述长度',
   ForceDelete: '强制删除',
   TrainingRecords: '培训记录',
+  AddTrainingRecord: '添加培训记录',
+  EditTrainingRecord: '编辑培训记录',
+  ViewTrainingRecord: '查看培训记录',
 };

package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordBase.tsx

@@ -1,12 +1,18 @@
 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 { ModelRecord } from 'vona-module-training-record';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 export interface IDtoOptionsDetailRecordBase extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptionsDetailRecordBase>()
+@Dto<IDtoOptionsDetailRecordBase>({
+  fields: {
+    id: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
 export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
-  columns: ['id', 'name', 'score', 'description'],
+  columns: ['id', 'deleted', 'name', 'score', 'description'],
 }) {}

package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordMutate.tsx

@@ -10,21 +10,7 @@ import { DtoDetailRecordBase } from './detailRecordBase.tsx';
 export interface IDtoOptionsDetailRecordMutate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsDetailRecordMutate>({
-  blocks: [
-    ZovaRender.block('basic-pageentry:blockPageEntry', {
-      blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
-        ZovaRender.block('basic-pageentry:blockToolbarRow', {
-          actions: [
-            ZovaRender.formActionRow('basic-form:actionSubmit', {
-              permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
-            }),
-            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
-          ],
-        }),
-      ],
-    }),
-  ],
+  blocks: [ZovaRender.block('basic-details:blockForm')],
 })
 export class DtoDetailRecordMutate extends $Dto.mutate(() => ModelRecord, {
   dtoClass: DtoDetailRecordBase,

package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordResItem.tsx

@@ -1,6 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ModelRecord } from 'vona-module-training-record';
@@ -16,23 +16,43 @@ export interface IDtoOptionsDetailRecordResItem extends IDecoratorDtoOptions {}
     ZovaRender.block('basic-details:blockDetails', {
       blocks: [
         ZovaRender.block('basic-details:blockToolbarBulk', {
-          actions: [ZovaRender.detailsActionBulk('basic-details:actionCreate')],
+          actions: [
+            ZovaRender.detailsActionBulk('basic-details:actionCreate', {
+              dialogOptions: { title: $locale('AddTrainingRecord') },
+              permission: { formScene: ['create', 'edit'] },
+            }),
+          ],
         }),
         ZovaRender.block('basic-details:blockTable'),
       ],
     }),
   ],
+  fields: {
+    name: $makeMetadata(
+      ZovaRender.cell('basic-details:actionView', {
+        dialogOptions: { title: $locale('ViewTrainingRecord') },
+      }),
+    ),
+  },
 })
 export class DtoDetailRecordResItem extends $Dto.get(() => ModelRecord, {
   dtoClass: DtoDetailRecordBase,
 }) {
+  @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('basic-details:lineNumber'))
+  _lineNumber?: number;
+
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
-    ZovaRender.cell('basic-table:actionOperationsRow', {
+    ZovaRender.cell('basic-details:actionOperationsRow', {
       actions: [
-        ZovaRender.tableActionRow('basic-table:actionUpdate'),
-        ZovaRender.tableActionRow('basic-table:actionDelete'),
+        ZovaRender.detailsActionRow('basic-details:actionUpdate', {
+          dialogOptions: { title: $locale('EditTrainingRecord') },
+          permission: { formScene: ['create', 'edit'] },
+        }),
+        ZovaRender.detailsActionRow('basic-details:actionDelete', {
+          permission: { formScene: ['create', 'edit'] },
+        }),
       ],
     }),
   )

package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordView.tsx

@@ -10,18 +10,7 @@ import { DtoDetailRecordBase } from './detailRecordBase.tsx';
 export interface IDtoOptionsDetailRecordView extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsDetailRecordView>({
-  blocks: [
-    ZovaRender.block('basic-pageentry:blockPageEntry', {
-      blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
-        ZovaRender.block('basic-pageentry:blockToolbarRow', {
-          actions: [
-            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
-          ],
-        }),
-      ],
-    }),
-  ],
+  blocks: [ZovaRender.block('basic-details:blockForm')],
 })
 export class DtoDetailRecordView extends $Dto.get(() => ModelRecord, {
   dtoClass: DtoDetailRecordBase,

package/vona/src/suite/a-training/modules/training-student/src/dto/studentCreate.tsx

@@ -1,6 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { $makeSchema, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, Api, v } 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';
@@ -29,15 +29,17 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions {}
     }),
   ],
   fields: {
-    trainingRecords: $makeSchema(
+    trainingRecords: $makeMetadata(
       v.title($locale('TrainingRecords')),
       ZovaRender.order(5),
       ZovaRender.field('basic-details:formFieldDetails'),
       v.optional(),
-      v.array(DtoDetailRecordResItem),
     ),
   },
 })
 export class DtoStudentCreate extends $Dto.create(() => ModelStudent, {
   include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
-}) {}
+}) {
+  @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
+  _trainingRecords?: DtoDetailRecordResItem[];
+}

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectReq.tsx

@@ -7,7 +7,7 @@ import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
-import { EntityStudent, studentLevelItems, studentLevelSchema } from '../entity/student.tsx';
+import { EntityStudent, studentLevelItems } from '../entity/student.tsx';
 
 export interface IDtoOptionsStudentSelectReq extends IDecoratorDtoOptions {}
 
@@ -17,17 +17,14 @@ export interface IDtoOptionsStudentSelectReq extends IDecoratorDtoOptions {}
     name: $makeSchema(v.optional(), z.string()),
     level: $makeSchema(
       v.title($locale('Level')),
-      v.optional(),
       ZovaRender.field('basic-select:formFieldSelect', {
         items: studentLevelItems,
         // Keep placeholder undefined so the filter select gets a real empty option
         // instead of a disabled placeholder, allowing users to clear the filter.
         placeholder: undefined,
       }),
-      z.preprocess(value => {
-        if (typeof value === 'string') return Number.parseInt(value);
-        return value;
-      }, studentLevelSchema),
+      v.optional(),
+      z.number(),
     ),
     createdAt: $makeSchema(
       ZovaRender.field('basic-date:formFieldDateRange'),

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSummary.tsx

@@ -26,7 +26,7 @@ export class DtoStudentSummary {
   mobile: string;
 
   @Api.field(v.title($locale('Level')))
-  level: 1 | 2 | 3;
+  level: number;
 
   @Api.field(v.title($locale('LevelTitle')))
   levelTitle: string;

package/vona/src/suite/a-training/modules/training-student/src/dto/studentUpdate.tsx

@@ -1,11 +1,14 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeMetadata, Api, v } 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 { ModelStudent } from '../model/student.ts';
 import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
+import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 
 export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
 
@@ -25,7 +28,17 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
       ],
     }),
   ],
+  fields: {
+    trainingRecords: $makeMetadata(
+      v.title($locale('TrainingRecords')),
+      ZovaRender.order(5),
+      ZovaRender.field('basic-details:formFieldDetails'),
+    ),
+  },
 })
 export class DtoStudentUpdate extends $Dto.update(() => ModelStudent, {
   include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
-}) {}
+}) {
+  @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
+  _trainingRecords?: DtoDetailRecordResItem[];
+}

package/vona/src/suite/a-training/modules/training-student/src/dto/studentView.tsx

@@ -1,10 +1,13 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeMetadata, Api, v } 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 { ModelStudent } from '../model/student.ts';
+import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 import { DtoDetailRecordView } from './detailRecordView.tsx';
 
 export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
@@ -22,7 +25,17 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
       ],
     }),
   ],
+  fields: {
+    trainingRecords: $makeMetadata(
+      v.title($locale('TrainingRecords')),
+      ZovaRender.order(5),
+      ZovaRender.field('basic-details:formFieldDetails'),
+    ),
+  },
 })
 export class DtoStudentView extends $Dto.get(() => ModelStudent, {
   include: { trainingRecords: { dtoClass: DtoDetailRecordView } },
-}) {}
+}) {
+  @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
+  _trainingRecords?: DtoDetailRecordResItem[];
+}

package/vona/src/suite/a-training/modules/training-student/src/entity/student.tsx

@@ -2,13 +2,10 @@ import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 
 import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
 
-export const studentLevelSchema = z.union([z.literal(1), z.literal(2), z.literal(3)]);
-
 export const studentLevelItems = [
   { value: 1, title: $locale('LevelBeginner') },
   { value: 2, title: $locale('LevelIntermediate') },
@@ -78,7 +75,6 @@ export class EntityStudent extends EntityBase {
     }),
     // Tutorial 4 custom table cell renderer example used by the current implementation.
     ZovaRender.cell('training-student:level', { items: studentLevelItems }),
-    studentLevelSchema,
   )
-  level: 1 | 2 | 3;
+  level: number;
 }

package/vona/src/suite/a-training/modules/training-student/src/service/student.ts

@@ -15,7 +15,7 @@ import type { ModelStudent } from '../model/student.ts';
 @Service()
 export class ServiceStudent extends BeanBase {
   async create(student: DtoStudentCreate): Promise<EntityStudent> {
-    return await this.scope.model.student.insert(student);
+    return await this.scope.model.student.insert(student, { include: { trainingRecords: true } });
   }
 
   async select(params?: IQueryParams<ModelStudent>): Promise<DtoStudentSelectRes> {
@@ -27,7 +27,9 @@ export class ServiceStudent extends BeanBase {
   }
 
   async update(id: TableIdentity, student: DtoStudentUpdate) {
-    return await this.scope.model.student.updateById(id, student);
+    return await this.scope.model.student.updateById(id, student, {
+      include: { trainingRecords: true },
+    });
   }
 
   async summary(id: TableIdentity): Promise<DtoStudentSummary | undefined> {
@@ -48,10 +50,13 @@ export class ServiceStudent extends BeanBase {
   }
 
   async delete(id: TableIdentity) {
-    return await this.scope.model.student.deleteById(id);
+    return await this.scope.model.student.deleteById(id, { include: { trainingRecords: true } });
   }
 
   async deleteForce(id: TableIdentity) {
-    return await this.scope.model.student.deleteById(id, { disableDeleted: true });
+    return await this.scope.model.student.deleteById(id, {
+      disableDeleted: true,
+      include: { trainingRecords: true },
+    });
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.27",
+  "version": "5.1.31",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapiutils",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [