cabloy 5.1.67 → 5.1.68

package/vona/pnpm-workspace.yaml

@@ -40,7 +40,7 @@ overrides:
   '@vue/runtime-dom': '3.5.36'
   '@vue/server-renderer': '3.5.36'
   '@vue/shared': '3.5.36'
-  zod: 'npm:@cabloy/zod@4.3.6'
+  zod: 'npm:@cabloy/zod@4.3.8'
 
 allowBuilds:
   '@swc/core': true

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

@@ -13,7 +13,10 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
         table.basicFields();
         table.tableIdentity(entityRecord.studentId).comment(entityRecord.$comment.studentId);
         table.string(entityRecord.name, 50).comment(entityRecord.$comment.name);
-        table.integer(entityRecord.score).comment(entityRecord.$comment.score);
+        table.integer(entityRecord.subjectCount).comment(entityRecord.$comment.subjectCount);
+        table.integer(entityRecord.totalScore).comment(entityRecord.$comment.totalScore);
+        table.decimal(entityRecord.averageScore, 8, 2).comment(entityRecord.$comment.averageScore);
+        table.dateTime(entityRecord.trainingTime).comment(entityRecord.$comment.trainingTime);
         table.string(entityRecord.description, 255).comment(entityRecord.$comment.description);
       });
     }

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

@@ -1,10 +1,13 @@
 export default {
+  AverageScore: 'Average Score',
   Description: 'Description',
-  Name: 'Name',
   Operations: 'Operations',
-  Score: 'Score',
   Student: 'Student',
+  SubjectCount: 'Subject Count',
+  TotalScore: 'Total Score',
   TrainingRecord: 'Student Training Record',
+  TrainingRecordName: 'Training Record Name',
+  TrainingTime: 'Training Time',
   AddTrainingRecord: 'Add Student Training Record',
   EditTrainingRecord: 'Edit Student Training Record',
   ViewTrainingRecord: 'View Student Training Record',

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

@@ -1,10 +1,13 @@
 export default {
+  AverageScore: '平均分',
   Description: '描述',
-  Name: '名称',
   Operations: '操作',
-  Score: '成绩',
   Student: '学生',
+  SubjectCount: '科目数量',
+  TotalScore: '总得分',
   TrainingRecord: '学生培训记录',
+  TrainingRecordName: '培训记录名称',
+  TrainingTime: '培训时间',
   AddTrainingRecord: '添加学生培训记录',
   EditTrainingRecord: '编辑学生培训记录',
   ViewTrainingRecord: '查看学生培训记录',

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

@@ -31,7 +31,7 @@ export interface IDtoOptionsRecordCreate extends IDecoratorDtoOptions {}
   fields: {
     trainingRecordSubjects: $makeMetadata(
       v.title($locale('TrainingRecordSubjects')),
-      ZovaRender.order(5),
+      ZovaRender.order(8),
       ZovaRender.field('basic-details:formFieldDetails'),
       v.optional(),
     ),

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

@@ -1,6 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { $makeSchema, v } from 'vona-module-a-openapiutils';
+import { $makeSchema, $resourceName, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
@@ -17,9 +17,9 @@ export interface IDtoOptionsRecordSelectReq extends IDecoratorDtoOptions {}
     name: $makeSchema(v.optional(), z.string()),
     studentId: $makeSchema(
       v.title($locale('Student')),
-      // ZovaRender.field('basic-resource:formFieldResourcePicker', {
-      //   resource: $resourceName('training-student:student'),
-      // }),
+      ZovaRender.field('basic-resource:formFieldResourcePicker', {
+        resource: $resourceName('training-student:student'),
+      }),
       v.optional(),
       z.number(),
     ),

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

@@ -31,7 +31,7 @@ export interface IDtoOptionsRecordUpdate extends IDecoratorDtoOptions {}
   fields: {
     trainingRecordSubjects: $makeMetadata(
       v.title($locale('TrainingRecordSubjects')),
-      ZovaRender.order(5),
+      ZovaRender.order(8),
       ZovaRender.field('basic-details:formFieldDetails'),
       v.optional(),
     ),

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

@@ -28,7 +28,7 @@ export interface IDtoOptionsRecordView extends IDecoratorDtoOptions {}
   fields: {
     trainingRecordSubjects: $makeMetadata(
       v.title($locale('TrainingRecordSubjects')),
-      ZovaRender.order(5),
+      ZovaRender.order(8),
       ZovaRender.field('basic-details:formFieldDetails'),
       v.optional(),
     ),

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

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 
-import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, $resourceName, Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
@@ -29,7 +29,7 @@ export interface IEntityOptionsRecord extends IDecoratorEntityOptions {}
 })
 export class EntityRecord extends EntityBase {
   @Api.field(
-    v.title($locale('Name')),
+    v.title($locale('TrainingRecordName')),
     v.required(),
     v.min(2),
     ZovaRender.order(1),
@@ -41,19 +41,34 @@ export class EntityRecord extends EntityBase {
     v.title($locale('Student')),
     v.required(),
     ZovaRender.order(2),
-    // ZovaRender.field('basic-resource:formFieldResourcePicker', {
-    //   resource: $resourceName('training-student:student'),
-    // }),
-    // ZovaRender.cell('basic-resource:resourcePicker', {
-    //   resource: $resourceName('training-student:student'),
-    // }),
+    ZovaRender.field('basic-resource:formFieldResourcePicker', {
+      resource: $resourceName('training-student:student'),
+    }),
+    ZovaRender.cell('basic-resource:resourcePicker', {
+      resource: $resourceName('training-student:student'),
+    }),
     v.tableIdentity(),
   )
   studentId: TableIdentity;
 
-  @Api.field(v.title($locale('Score')), v.optional(), ZovaRender.order(3))
-  score?: number;
+  @Api.field(v.title($locale('SubjectCount')), v.optional(), ZovaRender.order(3))
+  subjectCount?: number;
 
-  @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(4))
+  @Api.field(v.title($locale('TotalScore')), v.optional(), ZovaRender.order(4))
+  totalScore?: number;
+
+  @Api.field(v.title($locale('AverageScore')), v.optional(), ZovaRender.order(5))
+  averageScore?: number;
+
+  @Api.field(
+    v.title($locale('TrainingTime')),
+    v.optional(),
+    ZovaRender.order(6),
+    ZovaRender.field('basic-date:formFieldDate'),
+    ZovaRender.cell('basic-date:date'),
+  )
+  trainingTime?: Date;
+
+  @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(7))
   description?: string;
 }

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

@@ -19,10 +19,15 @@ describe('record.test.ts', () => {
         level: 1,
         trainingRecords: [],
       };
+      const trainingTime = new Date('2026-01-15T09:30:00.000Z');
+      const trainingTimeUpdate = new Date('2026-02-20T14:45:00.000Z');
       const recordData = {
         studentId: 0 as any,
         name: '__Record__',
-        score: 88,
+        subjectCount: 1,
+        totalScore: 88,
+        averageScore: 88,
+        trainingTime,
         description: 'This is a record',
         trainingRecordSubjects: [
           {
@@ -57,6 +62,10 @@ describe('record.test.ts', () => {
       const recordSubject = record.trainingRecordSubjects?.[0];
       assert.equal(record.name, recordData.name);
       assert.equal(String(record.studentId), String(studentId));
+      assert.equal(record.subjectCount, recordData.subjectCount);
+      assert.equal(record.totalScore, recordData.totalScore);
+      assert.equal(record.averageScore, recordData.averageScore);
+      assert.equal(new Date(record.trainingTime).toISOString(), trainingTime.toISOString());
       assert.equal(record.trainingRecordSubjects?.length, 1);
       assert.equal(recordSubject?.name, '__Math__');
       assert.equal(recordSubject?.score, 95);
@@ -73,7 +82,10 @@ describe('record.test.ts', () => {
       const dataUpdate = {
         studentId,
         name: '__RecordNew__',
-        score: 89,
+        subjectCount: 2,
+        totalScore: 183,
+        averageScore: 91.5,
+        trainingTime: trainingTimeUpdate,
         description: 'This is an updated record',
         trainingRecordSubjects: [
           {
@@ -99,7 +111,10 @@ describe('record.test.ts', () => {
       });
       const [updatedMathSubject, updatedEnglishSubject] = record.trainingRecordSubjects ?? [];
       assert.equal(record.name, dataUpdate.name);
-      assert.equal(record.score, dataUpdate.score);
+      assert.equal(record.subjectCount, dataUpdate.subjectCount);
+      assert.equal(record.totalScore, dataUpdate.totalScore);
+      assert.equal(record.averageScore, dataUpdate.averageScore);
+      assert.equal(new Date(record.trainingTime).toISOString(), trainingTimeUpdate.toISOString());
       assert.equal(record.trainingRecordSubjects?.length, 2);
       assert.equal(updatedMathSubject?.name, '__MathNew__');
       assert.equal(updatedMathSubject?.score, 96);
@@ -132,6 +147,15 @@ describe('record.test.ts', () => {
       );
       assert.equal(studentRecord, undefined);
 
+      await app.bean.executor.performAction('delete', '/training/student/:id', {
+        params: { id: studentId },
+      });
+
+      student = await app.bean.executor.performAction('get', '/training/student/:id', {
+        params: { id: studentId },
+      });
+      assert.equal(student, undefined);
+
       await app.bean.passport.signout();
     });
   });

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

@@ -1,9 +1,9 @@
 export default {
   Description: 'Description',
-  Name: 'Name',
   Operations: 'Operations',
-  Score: 'Score',
   Subject: 'Subject',
+  SubjectName: 'Subject Name',
+  SubjectScore: 'Subject Score',
   TrainingRecord: 'Student Training Record',
   TrainingRecordSubject: 'Student Training Record Detail',
 };

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

@@ -1,9 +1,9 @@
 export default {
   Description: '描述',
-  Name: '名称',
   Operations: '操作',
-  Score: '科目得分',
   Subject: '科目',
+  SubjectName: '科目名称',
+  SubjectScore: '科目得分',
   TrainingRecord: '学生培训记录',
   TrainingRecordSubject: '学生培训记录明细',
 };

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

@@ -31,11 +31,11 @@ export class EntitySubject extends EntityBase {
   @Api.field(v.required(), ZovaRender.visible(false))
   recordId: TableIdentity;
 
-  @Api.field(v.title($locale('Name')), v.required(), v.min(2), ZovaRender.order(1))
+  @Api.field(v.title($locale('SubjectName')), v.required(), v.min(2), ZovaRender.order(1))
   name: string;
 
-  @Api.field(v.title($locale('Score')), v.optional(), ZovaRender.order(2))
-  score?: number;
+  @Api.field(v.title($locale('SubjectScore')), v.required(), ZovaRender.order(2))
+  score: number;
 
   @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(3))
   description?: string;

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

@@ -86,7 +86,7 @@ import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'von
 declare module 'vona-module-training-student' {
   export interface IModelOptionsStudent {
         relations: {
-          trainingRecords: IModelRelationHasMany<'training-record:record', 'studentId', false, 'id'|'name'|'score'|'description', undefined, undefined, undefined>;
+          trainingRecords: IModelRelationHasMany<'training-record:record', 'studentId', false, 'id'|'name'|'subjectCount'|'totalScore'|'averageScore'|'trainingTime'|'description', undefined, undefined, undefined>;
         };
       }
   export interface ModelStudent {

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

@@ -5,9 +5,9 @@ export default {
   LevelBeginner: 'Foundation Track',
   LevelIntermediate: 'Progress Track',
   Mobile: 'Mobile',
-  Name: 'Name',
   Operations: 'Operations',
   Student: 'Student',
+  StudentName: 'Student Name',
   Summary: 'Summary',
   LevelTitle: 'Level Title',
   DescriptionLength: 'Description Length',

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

@@ -5,9 +5,9 @@ export default {
   LevelBeginner: '基础班',
   LevelIntermediate: '提升班',
   Mobile: '手机号',
-  Name: '名称',
   Operations: '操作',
   Student: '学生',
+  StudentName: '学生姓名',
   Summary: '摘要',
   LevelTitle: '阶段名称',
   DescriptionLength: '描述长度',

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

@@ -15,13 +15,22 @@ export interface IDtoOptionsDetailRecordBase extends IDecoratorDtoOptions {}
     id: $makeMetadata(ZovaRender.visible(false)),
     trainingRecordSubjects: $makeMetadata(
       v.title($locale('TrainingRecordSubjects')),
-      ZovaRender.order(4),
+      ZovaRender.order(8),
       ZovaRender.field('basic-details:formFieldDetails'),
       v.optional(),
     ),
   },
 })
 export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
-  columns: ['id', 'deleted', 'name', 'score', 'description'],
+  columns: [
+    'id',
+    'deleted',
+    'name',
+    'subjectCount',
+    'totalScore',
+    'averageScore',
+    'trainingTime',
+    'description',
+  ],
   include: { trainingRecordSubjects: true },
 }) {}

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

@@ -13,7 +13,7 @@ export class DtoStudentSummary {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(v.title($locale('Name')))
+  @Api.field(v.title($locale('StudentName')))
   name: string;
 
   @Api.field(

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

@@ -35,7 +35,7 @@ export interface IEntityOptionsStudent extends IDecoratorEntityOptions {}
 })
 export class EntityStudent extends EntityBase {
   @Api.field(
-    v.title($locale('Name')),
+    v.title($locale('StudentName')),
     v.required(),
     v.min(2),
     ZovaRender.order(1),

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

@@ -10,7 +10,15 @@ export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStude
   entity: EntityStudent,
   relations: {
     trainingRecords: $relation.hasMany('training-record:record', 'studentId', {
-      columns: ['id', 'name', 'score', 'description'],
+      columns: [
+        'id',
+        'name',
+        'subjectCount',
+        'totalScore',
+        'averageScore',
+        'trainingTime',
+        'description',
+      ],
     }),
   },
 })

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

@@ -18,6 +18,8 @@ describe('student.test.ts', () => {
       const maskedMobile = '138****5678';
       const mobileUpdate = '13987654321';
       const maskedMobileUpdate = '139****4321';
+      const trainingTime = new Date('2026-03-10T08:00:00.000Z');
+      const trainingTimeUpdate = new Date('2026-04-18T13:20:00.000Z');
       const data = {
         name: '__Tom__',
         description: 'This is a test',
@@ -26,7 +28,10 @@ describe('student.test.ts', () => {
         trainingRecords: [
           {
             name: '__Record__',
-            score: 88,
+            subjectCount: 1,
+            totalScore: 88,
+            averageScore: 88,
+            trainingTime,
             description: 'This is a record',
             trainingRecordSubjects: [
               {
@@ -80,6 +85,10 @@ describe('student.test.ts', () => {
       const recordSubject = record?.trainingRecordSubjects?.[0];
       assert.equal(student.trainingRecords?.length, 1);
       assert.equal(record?.name, '__Record__');
+      assert.equal(record?.subjectCount, 1);
+      assert.equal(record?.totalScore, 88);
+      assert.equal(record?.averageScore, 88);
+      assert.equal(new Date(record?.trainingTime).toISOString(), trainingTime.toISOString());
       assert.equal(record?.trainingRecordSubjects?.length, 1);
       assert.equal(recordSubject?.name, '__Math__');
       assert.equal(recordSubject?.score, 95);
@@ -93,7 +102,10 @@ describe('student.test.ts', () => {
           {
             id: record.id,
             name: '__RecordNew__',
-            score: 89,
+            subjectCount: 2,
+            totalScore: 183,
+            averageScore: 91.5,
+            trainingTime: trainingTimeUpdate,
             description: 'This is an updated record',
             trainingRecordSubjects: [
               {
@@ -127,6 +139,13 @@ describe('student.test.ts', () => {
       assert.equal(student.mobile, maskedMobileUpdate);
       assert.equal(student.trainingRecords?.length, 1);
       assert.equal(updatedRecord?.name, '__RecordNew__');
+      assert.equal(updatedRecord?.subjectCount, 2);
+      assert.equal(updatedRecord?.totalScore, 183);
+      assert.equal(updatedRecord?.averageScore, 91.5);
+      assert.equal(
+        new Date(updatedRecord?.trainingTime).toISOString(),
+        trainingTimeUpdate.toISOString(),
+      );
       assert.equal(updatedRecord?.trainingRecordSubjects?.length, 2);
       assert.equal(updatedMathSubject?.name, '__MathNew__');
       assert.equal(updatedMathSubject?.score, 96);

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapi",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.49",
+  "version": "5.1.50",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.57"
+    "zova-core": "^5.1.58"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.113",
+  "version": "5.1.114",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.57",
-    "zova-suite-a-zova": "^5.1.112"
+    "zova-core": "^5.1.58",
+    "zova-suite-a-zova": "^5.1.113"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.57",
+  "version": "5.1.58",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -62,7 +62,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "@cabloy/zod-errors-custom": "^2.1.9",
     "@cabloy/zod-openapi": "^1.1.9",
-    "@cabloy/zod-query": "^2.1.11",
+    "@cabloy/zod-query": "^2.1.12",
     "@types/js-cookie": "^3.0.6",
     "@vue/shared": "^3.5.32",
     "deep-equal": "^2.2.3",