cabloy 5.1.66 → 5.1.67

package/.claude/skills/cabloy-resource-field-update/SKILL.md

@@ -156,6 +156,12 @@ For enum-like numeric or string values, prefer an explicit constrained schema su
 
 - `z.union([z.literal(1), z.literal(2), z.literal(3)])`
 
+Ordering rule:
+
+- when that explicit zod schema is passed into `@Api.field(...)`, put it as the **last argument**
+- keep helper metadata such as `v.xxx(...)` and `ZovaRender.xxx(...)` before the zod schema
+- otherwise helpers written after the zod schema may stop taking effect
+
 Then check whether DTOs are already inferred through patterns such as:
 
 - `$Dto.create(...)`

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 5.1.67
+
+### Features
+
+- Add nested training record subjects.
+- Update application features and workflows.
+
+### Bug Fixes
+
+- Clarify `Api.field` Zod schema ordering.
+
 ## 5.1.66
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.116",
+  "version": "1.1.119",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/cli/templates/create/module/boilerplate/_package.json

@@ -25,7 +25,7 @@
     "tsc:publish": "npm run clean && node <%=argv.suite?'../../../../../':'../../../'%>packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "clean-package": {
     "indent": 2,

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.114",
+  "version": "1.1.117",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [
@@ -36,7 +36,7 @@
     "tsc:publish": "npm run clean && node ../cli/src/bin/vona.ts :bin:buildGeneral && tsc -p tsconfig.build.json && tsc -p tsconfig.cli.json && tsc -p tsconfig.isolate.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.29.0",

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

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

package/vona/pnpm-lock.yaml

@@ -349,6 +349,9 @@ importers:
       vona-module-training-record:
         specifier: workspace:^
         version: link:src/suite/a-training/modules/training-record
+      vona-module-training-recordsubject:
+        specifier: workspace:^
+        version: link:src/suite/a-training/modules/training-recordsubject
       vona-module-training-student:
         specifier: workspace:^
         version: link:src/suite/a-training/modules/training-student
@@ -2389,6 +2392,9 @@ importers:
       vona-module-training-record:
         specifier: ^5.0.0
         version: link:modules/training-record
+      vona-module-training-recordsubject:
+        specifier: ^5.0.0
+        version: link:modules/training-recordsubject
       vona-module-training-student:
         specifier: ^5.0.0
         version: link:modules/training-student
@@ -2402,6 +2408,15 @@ importers:
         specifier: ^6.1.3
         version: 6.1.3
 
+  src/suite/a-training/modules/training-recordsubject:
+    devDependencies:
+      clean-package:
+        specifier: ^2.2.0
+        version: 2.2.0
+      rimraf:
+        specifier: ^6.1.3
+        version: 6.1.3
+
   src/suite/a-training/modules/training-student:
     devDependencies:
       clean-package:

package/vona/src/suite/a-demo/modules/demo-basic/package.json

@@ -28,7 +28,7 @@
     "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {},
   "devDependencies": {

package/vona/src/suite/a-home/modules/home-base/package.json

@@ -29,7 +29,7 @@
     "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/vona/src/suite/a-home/modules/home-index/package.json

@@ -29,7 +29,7 @@
     "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/vona/src/suite/a-home/modules/home-user/package.json

@@ -29,7 +29,7 @@
     "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/vona/src/suite/a-training/modules/training-record/package.json

@@ -28,7 +28,7 @@
     "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore && npm run clean"
+    "postpack": "clean-package restore"
   },
   "dependencies": {},
   "devDependencies": {

package/vona/src/suite/a-training/modules/training-record/src/.metadata/index.ts

@@ -1,6 +1,6 @@
 // eslint-disable
-import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore } from 'vona-module-a-orm';
-import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
+import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,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/record.tsx';
@@ -84,7 +84,12 @@ declare module 'vona' {
 import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-training-record' {
-  
+  export interface IModelOptionsRecord {
+        relations: {
+          student: IModelRelationBelongsTo<'training-record:record', 'training-student:student', false, 'id'|'name'>;
+trainingRecordSubjects: IModelRelationHasMany<'training-recordsubject:subject', 'recordId', false, 'id'|'name'|'score'|'description', undefined, undefined, undefined>;
+        };
+      }
   export interface ModelRecord {
       [SymbolKeyEntity]: EntityRecord;
       [SymbolKeyEntityMeta]: EntityRecordMeta;
@@ -121,6 +126,47 @@ declare module 'vona-module-a-orm' {
   }
 }
 /** model: end */
+/** service: begin */
+export * from '../service/record.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+  
+    export interface IServiceRecord {
+      'training-record:record': never;
+    }
+
+  
+}
+declare module 'vona-module-training-record' {
+  
+        export interface ServiceRecord {
+          /** @internal */
+          get scope(): ScopeModuleTrainingRecord;
+        }
+
+          export interface ServiceRecord {
+            get $beanFullName(): 'training-record.service.record';
+            get $onionName(): 'training-record:record';
+            
+          } 
+}
+/** service: end */
+/** service: begin */
+import type { ServiceRecord } from '../service/record.ts';
+export interface IModuleService {
+  'record': ServiceRecord;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'training-record.service.record': ServiceRecord;
+  }
+}
+/** service: end */
 /** meta: begin */
 export * from '../bean/meta.index.ts';
 export * from '../bean/meta.version.ts';
@@ -160,6 +206,188 @@ declare module 'vona-module-training-record' {
           } 
 }
 /** meta: end */
+/** dto: begin */
+export * from '../dto/detailRecordSubjectBase.tsx';
+export * from '../dto/detailRecordSubjectMutate.tsx';
+export * from '../dto/detailRecordSubjectResItem.tsx';
+export * from '../dto/detailRecordSubjectView.tsx';
+export * from '../dto/recordCreate.tsx';
+export * from '../dto/recordSelectReq.tsx';
+export * from '../dto/recordSelectRes.tsx';
+export * from '../dto/recordSelectResItem.tsx';
+export * from '../dto/recordUpdate.tsx';
+export * from '../dto/recordView.tsx';
+import type { IDtoOptionsDetailRecordSubjectBase } from '../dto/detailRecordSubjectBase.tsx';
+import type { IDtoOptionsDetailRecordSubjectMutate } from '../dto/detailRecordSubjectMutate.tsx';
+import type { IDtoOptionsDetailRecordSubjectResItem } from '../dto/detailRecordSubjectResItem.tsx';
+import type { IDtoOptionsDetailRecordSubjectView } from '../dto/detailRecordSubjectView.tsx';
+import type { IDtoOptionsRecordCreate } from '../dto/recordCreate.tsx';
+import type { IDtoOptionsRecordSelectReq } from '../dto/recordSelectReq.tsx';
+import type { IDtoOptionsRecordSelectRes } from '../dto/recordSelectRes.tsx';
+import type { IDtoOptionsRecordSelectResItem } from '../dto/recordSelectResItem.tsx';
+import type { IDtoOptionsRecordUpdate } from '../dto/recordUpdate.tsx';
+import type { IDtoOptionsRecordView } from '../dto/recordView.tsx';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+  
+    export interface IDtoRecord {
+      'training-record:detailRecordSubjectBase': IDtoOptionsDetailRecordSubjectBase;
+'training-record:detailRecordSubjectMutate': IDtoOptionsDetailRecordSubjectMutate;
+'training-record:detailRecordSubjectResItem': IDtoOptionsDetailRecordSubjectResItem;
+'training-record:detailRecordSubjectView': IDtoOptionsDetailRecordSubjectView;
+'training-record:recordCreate': IDtoOptionsRecordCreate;
+'training-record:recordSelectReq': IDtoOptionsRecordSelectReq;
+'training-record:recordSelectRes': IDtoOptionsRecordSelectRes;
+'training-record:recordSelectResItem': IDtoOptionsRecordSelectResItem;
+'training-record:recordUpdate': IDtoOptionsRecordUpdate;
+'training-record:recordView': IDtoOptionsRecordView;
+    }
+
+  
+}
+declare module 'vona-module-training-record' {
+   
+}
+/** dto: end */
+/** dto: begin */
+import type { DtoDetailRecordSubjectBase } from '../dto/detailRecordSubjectBase.tsx';
+import type { DtoDetailRecordSubjectMutate } from '../dto/detailRecordSubjectMutate.tsx';
+import type { DtoDetailRecordSubjectResItem } from '../dto/detailRecordSubjectResItem.tsx';
+import type { DtoDetailRecordSubjectView } from '../dto/detailRecordSubjectView.tsx';
+import type { DtoRecordCreate } from '../dto/recordCreate.tsx';
+import type { DtoRecordSelectReq } from '../dto/recordSelectReq.tsx';
+import type { DtoRecordSelectRes } from '../dto/recordSelectRes.tsx';
+import type { DtoRecordSelectResItem } from '../dto/recordSelectResItem.tsx';
+import type { DtoRecordUpdate } from '../dto/recordUpdate.tsx';
+import type { DtoRecordView } from '../dto/recordView.tsx';
+declare module 'vona-module-training-record' {
+  
+    export interface IDtoOptionsDetailRecordSubjectBase {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordSubjectBase, IDtoOptionsDetailRecordSubjectBase[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordSubjectMutate {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordSubjectMutate, IDtoOptionsDetailRecordSubjectMutate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordSubjectResItem {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordSubjectResItem, IDtoOptionsDetailRecordSubjectResItem[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordSubjectView {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordSubjectView, IDtoOptionsDetailRecordSubjectView[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordCreate {
+      fields?: TypeEntityOptionsFields<DtoRecordCreate, IDtoOptionsRecordCreate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordSelectReq {
+      fields?: TypeEntityOptionsFields<DtoRecordSelectReq, IDtoOptionsRecordSelectReq[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordSelectRes {
+      fields?: TypeEntityOptionsFields<DtoRecordSelectRes, IDtoOptionsRecordSelectRes[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordSelectResItem {
+      fields?: TypeEntityOptionsFields<DtoRecordSelectResItem, IDtoOptionsRecordSelectResItem[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordUpdate {
+      fields?: TypeEntityOptionsFields<DtoRecordUpdate, IDtoOptionsRecordUpdate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRecordView {
+      fields?: TypeEntityOptionsFields<DtoRecordView, IDtoOptionsRecordView[TypeSymbolKeyFieldsMore]>;
+    }
+}
+/** dto: end */
+/** controller: begin */
+export * from '../controller/record.ts';
+import type { IControllerOptionsRecord } from '../controller/record.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+  
+    export interface IControllerRecord {
+      'training-record:record': IControllerOptionsRecord;
+    }
+
+  
+}
+declare module 'vona-module-training-record' {
+  
+        export interface ControllerRecord {
+          /** @internal */
+          get scope(): ScopeModuleTrainingRecord;
+        }
+
+          export interface ControllerRecord {
+            get $beanFullName(): 'training-record.controller.record';
+            get $onionName(): 'training-record:record';
+            get $onionOptions(): IControllerOptionsRecord;
+          } 
+}
+/** controller: end */
+/** controller: begin */
+// @ts-ignore ignore
+import type { ControllerRecord } from '../controller/record.ts';
+declare module 'vona-module-training-record' {
+  
+    export interface IControllerOptionsRecord {
+      actions?: TypeControllerOptionsActions<ControllerRecord>;
+    }
+}
+declare module 'vona-module-a-web' {
+  export interface IApiPathPostRecord{
+        '/training/record': undefined;
+    }
+export interface IApiPathGetRecord{
+        '/training/record': undefined;
+'/training/record/:id': undefined;
+    }
+export interface IApiPathPatchRecord{
+        '/training/record/:id': undefined;
+    }
+export interface IApiPathDeleteRecord{
+        '/training/record/:id': undefined;
+    }
+
+}
+import 'vona-module-a-openapi';
+  declare module 'vona-module-a-openapi' {
+    export interface IResourceRecord {
+      'training-record:record': never;
+    }
+  }
+  
+/** controller: end */
+/** ssrMenu: begin */
+export * from '../bean/ssrMenu.record.ts';
+import type { ISsrMenuOptionsRecord } from '../bean/ssrMenu.record.ts';
+import 'vona-module-a-ssr';
+declare module 'vona-module-a-ssr' {
+  
+    export interface ISsrMenuRecord {
+      'training-record:record': ISsrMenuOptionsRecord;
+    }
+
+  
+}
+declare module 'vona-module-training-record' {
+  
+        export interface SsrMenuRecord {
+          /** @internal */
+          get scope(): ScopeModuleTrainingRecord;
+        }
+
+          export interface SsrMenuRecord {
+            get $beanFullName(): 'training-record.ssrMenu.record';
+            get $onionName(): 'training-record:record';
+            get $onionOptions(): ISsrMenuOptionsRecord;
+          } 
+}
+/** ssrMenu: end */
 /** locale: begin */
 import { locales } from './locales.ts';
 /** locale: end */
@@ -175,6 +403,7 @@ export interface ScopeModuleTrainingRecord {
 locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
 entity: IModuleEntity;
 model: IModuleModel;
+service: IModuleService;
 }
 
 import 'vona';

package/vona/src/suite/a-training/modules/training-record/src/bean/ssrMenu.record.ts

@@ -0,0 +1,29 @@
+import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
+import type { ISsrSiteOptionsAdmin } from 'vona-module-basic-siteadmin';
+
+import { BeanBase } from 'vona';
+import { $order } from 'vona-module-a-openapiutils';
+import { SsrMenu } from 'vona-module-a-ssr';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface ISsrMenuOptionsRecord extends IDecoratorSsrMenuOptions<ISsrSiteOptionsAdmin> {}
+
+@SsrMenu<ISsrMenuOptionsRecord>({
+  items: {
+    record: {
+      title: $locale('TrainingRecord'),
+      order: $order(2),
+      icon: undefined,
+      link: 'presetResource',
+      meta: {
+        params: {
+          resource: 'training-record:record',
+        },
+      },
+      group: 'basic-siteadmin:management',
+    },
+  },
+  site: ['basic-siteadmin:admin'],
+})
+export class SsrMenuRecord extends BeanBase {}

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

@@ -2,6 +2,14 @@ export default {
   Description: 'Description',
   Name: 'Name',
   Operations: 'Operations',
-  TrainingRecord: 'Training Record',
   Score: 'Score',
+  Student: 'Student',
+  TrainingRecord: 'Student Training Record',
+  AddTrainingRecord: 'Add Student Training Record',
+  EditTrainingRecord: 'Edit Student Training Record',
+  ViewTrainingRecord: 'View Student Training Record',
+  TrainingRecordSubjects: 'Student Training Record Details',
+  AddTrainingRecordSubject: 'Add Student Training Record Detail',
+  EditTrainingRecordSubject: 'Edit Student Training Record Detail',
+  ViewTrainingRecordSubject: 'View Student Training Record Detail',
 };

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

@@ -2,6 +2,14 @@ export default {
   Description: '描述',
   Name: '名称',
   Operations: '操作',
-  TrainingRecord: '培训记录',
   Score: '成绩',
+  Student: '学生',
+  TrainingRecord: '学生培训记录',
+  AddTrainingRecord: '添加学生培训记录',
+  EditTrainingRecord: '编辑学生培训记录',
+  ViewTrainingRecord: '查看学生培训记录',
+  TrainingRecordSubjects: '学生培训记录明细',
+  AddTrainingRecordSubject: '添加学生培训记录明细',
+  EditTrainingRecordSubject: '编辑学生培训记录明细',
+  ViewTrainingRecordSubject: '查看学生培训记录明细',
 };

package/vona/src/suite/a-training/modules/training-record/src/controller/record.ts

@@ -0,0 +1,59 @@
+import type { TableIdentity } from 'table-identity';
+import type { IQueryParams } from 'vona-module-a-orm';
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
+import { BeanBase } from 'vona';
+import { Core } from 'vona-module-a-core';
+import { Api, Resource, v } from 'vona-module-a-openapiutils';
+import { Arg, Controller, Web } from 'vona-module-a-web';
+
+import type { ModelRecord } from '../model/record.ts';
+
+import { DtoRecordCreate } from '../dto/recordCreate.tsx';
+import { DtoRecordSelectReq } from '../dto/recordSelectReq.tsx';
+import { DtoRecordSelectRes } from '../dto/recordSelectRes.tsx';
+import { DtoRecordUpdate } from '../dto/recordUpdate.tsx';
+import { DtoRecordView } from '../dto/recordView.tsx';
+
+export interface IControllerOptionsRecord extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsRecord>('record')
+@Resource()
+export class ControllerRecord extends BeanBase {
+  @Web.post()
+  @Api.body(v.tableIdentity())
+  async create(@Arg.body() record: DtoRecordCreate): Promise<TableIdentity> {
+    return (await this.scope.service.record.create(record)).id;
+  }
+
+  @Web.get()
+  @Api.body(DtoRecordSelectRes)
+  @Core.serializer()
+  async select(
+    @Arg.filter(DtoRecordSelectReq) params: IQueryParams<ModelRecord>,
+  ): Promise<DtoRecordSelectRes> {
+    return await this.scope.service.record.select(params);
+  }
+
+  @Web.get(':id')
+  @Api.body(v.optional(), v.object(DtoRecordView))
+  @Core.serializer()
+  async view(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+  ): Promise<DtoRecordView | undefined> {
+    return await this.scope.service.record.view(id);
+  }
+
+  @Web.patch(':id')
+  async update(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+    @Arg.body() record: DtoRecordUpdate,
+  ) {
+    return await this.scope.service.record.update(id, record);
+  }
+
+  @Web.delete(':id')
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
+    return await this.scope.service.record.delete(id);
+  }
+}

package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectBase.tsx

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

package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectMutate.tsx

@@ -0,0 +1,17 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ModelSubject } from 'vona-module-training-recordsubject';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { DtoDetailRecordSubjectBase } from './detailRecordSubjectBase.tsx';
+
+export interface IDtoOptionsDetailRecordSubjectMutate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordSubjectMutate>({
+  blocks: [ZovaRender.block('basic-details:blockForm')],
+})
+export class DtoDetailRecordSubjectMutate extends $Dto.mutate(() => ModelSubject, {
+  dtoClass: DtoDetailRecordSubjectBase,
+}) {}

package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectResItem.tsx

@@ -0,0 +1,60 @@
+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 { ModelSubject } from 'vona-module-training-recordsubject';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { DtoDetailRecordSubjectBase } from './detailRecordSubjectBase.tsx';
+
+export interface IDtoOptionsDetailRecordSubjectResItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordSubjectResItem>({
+  blocks: [
+    ZovaRender.block('basic-details:blockDetails', {
+      blocks: [
+        ZovaRender.block('basic-details:blockToolbarBulk', {
+          actions: [
+            ZovaRender.detailsActionBulk('basic-details:actionCreate', {
+              dialogOptions: { title: $locale('AddTrainingRecordSubject') },
+              permission: { formScene: ['create', 'edit'] },
+            }),
+          ],
+        }),
+        ZovaRender.block('basic-details:blockTable'),
+      ],
+    }),
+  ],
+  fields: {
+    name: $makeMetadata(
+      ZovaRender.cell('basic-details:actionView', {
+        dialogOptions: { title: $locale('ViewTrainingRecordSubject') },
+      }),
+    ),
+  },
+})
+export class DtoDetailRecordSubjectResItem extends $Dto.get(() => ModelSubject, {
+  dtoClass: DtoDetailRecordSubjectBase,
+}) {
+  @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-details:actionOperationsRow', {
+      actions: [
+        ZovaRender.detailsActionRow('basic-details:actionUpdate', {
+          dialogOptions: { title: $locale('EditTrainingRecordSubject') },
+          permission: { formScene: ['create', 'edit'] },
+        }),
+        ZovaRender.detailsActionRow('basic-details:actionDelete', {
+          permission: { formScene: ['create', 'edit'] },
+        }),
+      ],
+    }),
+  )
+  _operationsRow?: unknown;
+}