cabloy 5.1.147 → 5.1.149

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

@@ -0,0 +1,36 @@
+import type { TableIdentity } from 'table-identity';
+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 { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IEntityOptionsStudentContent extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsStudentContent>('trainingStudentContent', {
+  openapi: { title: $locale('StudentContent') },
+  fields: {
+    id: $makeMetadata(ZovaRender.visible(false)),
+    iid: $makeMetadata(ZovaRender.visible(false)),
+    deleted: $makeMetadata(ZovaRender.visible(false)),
+    createdAt: $makeMetadata(ZovaRender.visible(false)),
+    updatedAt: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
+export class EntityStudentContent extends EntityBase {
+  @Api.field(v.tableIdentity(), ZovaRender.visible(false))
+  studentId: TableIdentity;
+
+  @Api.field(
+    v.title($locale('DescriptionMarkdown')),
+    v.optional(),
+    ZovaRender.order(1),
+    ZovaRender.field('basic-markdown:formFieldMarkdown'),
+  )
+  descriptionMarkdown?: string;
+
+  @Api.field(v.title($locale('DescriptionHtml')), v.optional(), ZovaRender.visible(false))
+  descriptionHtml?: string;
+}

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

@@ -22,6 +22,12 @@ export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStude
         'description',
       ],
     }),
+    studentContent: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'studentId', 'descriptionMarkdown', 'descriptionHtml'],
+    }),
+    studentContentForm: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'studentId', 'descriptionMarkdown'],
+    }),
   },
 })
 export class ModelStudent extends BeanModelBase<EntityStudent> {}

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

@@ -0,0 +1,22 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityStudentContent } from '../entity/studentContent.tsx';
+
+export interface IModelOptionsStudentContent extends IDecoratorModelOptions<EntityStudentContent> {}
+
+@Model<IModelOptionsStudentContent>({
+  entity: EntityStudentContent,
+  relations: {
+    student: $relation.belongsTo(
+      'training-student:studentContent',
+      'training-student:student',
+      'studentId',
+    ),
+  },
+  cache: {
+    modelsClear: 'training-student:student',
+  },
+})
+export class ModelStudentContent extends BeanModelBase<EntityStudentContent> {}

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

@@ -18,12 +18,27 @@ function getStudentRecordSubjectsInclude(): {
   return { trainingRecords: { include: { trainingRecordSubjects: true } } };
 }
 
+function getStudentContentFormInclude() {
+  return { studentContentForm: true };
+}
+
+function getStudentContentInclude() {
+  return { studentContent: true };
+}
+
 @Service()
 export class ServiceStudent extends BeanBase {
   async create(student: DtoStudentCreate): Promise<EntityStudent> {
-    return await this.scope.model.student.insert(student, {
+    const { studentContentForm, ...studentFields } = student as DtoStudentCreate & {
+      studentContentForm?: { descriptionMarkdown?: string };
+    };
+    const created = await this.scope.model.student.insert(studentFields, {
       include: getStudentRecordSubjectsInclude(),
     });
+    if (studentContentForm !== undefined) {
+      await this._updateStudentContent(created.id, studentContentForm.descriptionMarkdown);
+    }
+    return created;
   }
 
   async select(params?: IQueryParams<ModelStudent>): Promise<DtoStudentSelectRes> {
@@ -32,20 +47,34 @@ export class ServiceStudent extends BeanBase {
 
   async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
     return await this.scope.model.student.getById(id, {
-      include: getStudentRecordSubjectsInclude(),
+      include: {
+        ...getStudentRecordSubjectsInclude(),
+        ...getStudentContentFormInclude(),
+      },
     });
   }
 
   async update(id: TableIdentity, student: DtoStudentUpdate) {
-    return await this.scope.model.student.updateById(id, student, {
+    const { studentContentForm, ...studentFields } = student as DtoStudentUpdate & {
+      studentContentForm?: { descriptionMarkdown?: string };
+    };
+    const updateResult = await this.scope.model.student.updateById(id, studentFields, {
       include: getStudentRecordSubjectsInclude(),
     });
+    if (studentContentForm !== undefined) {
+      await this._updateStudentContent(id, studentContentForm.descriptionMarkdown);
+    }
+    return updateResult;
   }
 
   async summary(id: TableIdentity): Promise<DtoStudentSummary | undefined> {
-    const student = await this.scope.model.student.getById(id);
+    const student = await this.scope.model.student.getById(id, {
+      include: getStudentContentInclude(),
+    });
     if (!student) return undefined;
-    const descriptionLength = student.description?.length ?? 0;
+    const description = student.studentContent?.descriptionMarkdown;
+    const descriptionHtml = student.studentContent?.descriptionHtml;
+    const descriptionLength = description?.length ?? 0;
     const levelTitle = String(student.level);
     return {
       id: student.id,
@@ -53,22 +82,50 @@ export class ServiceStudent extends BeanBase {
       mobile: student.mobile,
       level: student.level,
       levelTitle,
-      description: student.description,
+      description,
+      descriptionHtml,
       descriptionLength,
       summaryText: `${student.name} is in level ${student.level}. Description length: ${descriptionLength}.`,
     };
   }
 
   async delete(id: TableIdentity) {
+    await this.scope.model.studentContent.delete({ studentId: id });
     return await this.scope.model.student.deleteById(id, {
       include: getStudentRecordSubjectsInclude(),
     });
   }
 
   async deleteForce(id: TableIdentity) {
+    await this.scope.model.studentContent.delete({ studentId: id }, { disableDeleted: true });
     return await this.scope.model.student.deleteById(id, {
       disableDeleted: true,
       include: getStudentRecordSubjectsInclude(),
     });
   }
+
+  private async _updateStudentContent(
+    studentId: TableIdentity,
+    descriptionMarkdown?: string,
+  ): Promise<void> {
+    const markdown = descriptionMarkdown?.trim();
+    const studentContent = await this.scope.model.studentContent.get({ studentId });
+    if (!markdown) {
+      if (studentContent) await this.scope.model.studentContent.deleteById(studentContent.id);
+      return;
+    }
+    const descriptionHtml = this.bean.markdown.renderHtml(markdown);
+    if (studentContent) {
+      await this.scope.model.studentContent.updateById(studentContent.id, {
+        descriptionMarkdown: markdown,
+        descriptionHtml,
+      });
+    } else {
+      await this.scope.model.studentContent.insert({
+        studentId,
+        descriptionMarkdown: markdown,
+        descriptionHtml,
+      });
+    }
+  }
 }

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

@@ -25,17 +25,36 @@ describe('student.test.ts', () => {
         const formLayout =
           blocks?.[0]?.options?.blocks?.[0]?.options?.blocks?.[0]?.options?.formLayout;
         const tabs = formLayout?.children[0];
-        const profileSection = tabs?.children[0]?.children[0]?.children[0];
+        const groups = tabs?.children[0]?.children;
+        const profileSection = groups?.[0]?.children[0];
+        const studentContentSection = groups?.[1]?.children[0];
         const trainingRecordsSection = tabs?.children[1]?.children[1];
         assert.equal(tabs?.type, 'tabs');
         assert.equal(tabs?.id, undefined);
         assert.equal(tabs?.children[1]?.type, 'tab');
         assert.equal(tabs?.children[1]?.id, undefined);
+        assert.equal(groups?.length, 2);
+        assert.deepEqual(
+          groups?.map(item => item.type),
+          ['group', 'group'],
+        );
         assert.deepEqual(profileSection?.columns, { default: 1, md: 2 });
         assert.deepEqual(
           profileSection?.children.map(item => item.name),
           ['name', 'mobile', 'imageId'],
         );
+        assert.deepEqual(
+          studentContentSection?.children.map(item => item.name),
+          ['studentContentForm'],
+        );
+        assert.equal(
+          component.properties.studentContentForm.rest.fieldSource,
+          'studentContentForm.descriptionMarkdown',
+        );
+        assert.equal(
+          component.properties.studentContentForm.rest.form.render,
+          'basic-markdown:formFieldMarkdown',
+        );
         assert.equal(tabs?.children[1]?.children[0]?.name, 'level');
         assert.deepEqual(
           trainingRecordsSection?.children.map(item => item.name),
@@ -93,6 +112,7 @@ describe('student.test.ts', () => {
           'mobile',
           'level',
           'description',
+          'descriptionHtml',
           'levelTitle',
           'descriptionLength',
           'summaryText',
@@ -118,9 +138,13 @@ describe('student.test.ts', () => {
       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 description =
+        `# Student profile\n\n${'This is a long Markdown description. '.repeat(10)}`.trim();
+      const descriptionUpdate =
+        `## Updated profile\n\n${'This is updated Markdown content. '.repeat(10)}`.trim();
       const data = {
         name: '__Tom__',
-        description: 'This is a test',
+        studentContentForm: { descriptionMarkdown: description },
         mobile,
         level: 1,
         trainingRecords: [
@@ -157,6 +181,7 @@ describe('student.test.ts', () => {
       assert.equal(!!studentItem, true);
       assert.equal(studentItem!.level, data.level);
       assert.equal(studentItem!.mobile, maskedMobile);
+      assert.equal((studentItem as any).description, undefined);
       // findMany: level filter
       const selectResByLevel: DtoStudentSelectRes = await app.bean.executor.performAction(
         'get',
@@ -182,6 +207,7 @@ describe('student.test.ts', () => {
       const record = student.trainingRecords?.[0];
       const recordSubject = record?.trainingRecordSubjects?.[0];
       assert.equal(student.trainingRecords?.length, 1);
+      assert.equal(student.studentContentForm?.descriptionMarkdown, description);
       assert.equal(record?.name, '__Record__');
       assert.equal(record?.subjectCount, 1);
       assert.equal(record?.totalScore, 88);
@@ -193,7 +219,7 @@ describe('student.test.ts', () => {
       // update
       const dataUpdate = {
         name: '__TomNew__',
-        description: 'This is a test',
+        studentContentForm: { descriptionMarkdown: descriptionUpdate },
         mobile: mobileUpdate,
         level: 2,
         trainingRecords: [
@@ -236,6 +262,7 @@ describe('student.test.ts', () => {
       assert.equal(student.name, dataUpdate.name);
       assert.equal(student.level, dataUpdate.level);
       assert.equal(student.mobile, maskedMobileUpdate);
+      assert.equal(student.studentContentForm?.descriptionMarkdown, descriptionUpdate);
       assert.equal(student.trainingRecords?.length, 1);
       assert.equal(updatedRecord?.name, '__RecordNew__');
       assert.equal(updatedRecord?.subjectCount, 2);
@@ -254,6 +281,15 @@ describe('student.test.ts', () => {
         disableDeleted: true,
       });
       assert.equal(studentRaw!.mobile, mobileUpdate);
+      assert.equal((studentRaw as any).description, undefined);
+      const studentContent = await app
+        .scope('training-student')
+        .model.studentContent.get({ studentId });
+      assert.equal(studentContent?.descriptionMarkdown, descriptionUpdate);
+      assert.equal(
+        studentContent?.descriptionHtml,
+        app.bean.markdown.renderHtml(descriptionUpdate),
+      );
       // summary
       const summary: DtoStudentSummary = await app.bean.executor.performAction(
         'get',
@@ -263,7 +299,9 @@ describe('student.test.ts', () => {
       assert.equal(summary.name, dataUpdate.name);
       assert.equal(summary.mobile, maskedMobileUpdate);
       assert.equal(summary.level, dataUpdate.level);
-      assert.equal(summary.descriptionLength, dataUpdate.description?.length);
+      assert.equal(summary.description, descriptionUpdate);
+      assert.equal(summary.descriptionHtml, app.bean.markdown.renderHtml(descriptionUpdate));
+      assert.equal(summary.descriptionLength, descriptionUpdate.length);
       assert.equal(typeof summary.levelTitle, 'string');
       assert.equal(typeof summary.summaryText, 'string');
       // delete
@@ -294,11 +332,83 @@ describe('student.test.ts', () => {
           disableDeleted: true,
         });
       assert.equal(studentForce, undefined);
+      assert.equal(
+        await app
+          .scope('training-student')
+          .model.studentContent.get({ studentId: studentIdForce }, { disableDeleted: true }),
+        undefined,
+      );
       // logout
       await app.bean.passport.signout();
     });
   });
 
+  it('action:student:contentPersistence', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      let studentId: string | undefined;
+      try {
+        studentId = await app.bean.executor.performAction('post', '/training/student', {
+          body: {
+            name: '__ContentStudent__',
+            mobile: '13812345678',
+            level: 1,
+          },
+        });
+        assert.equal(
+          await app.scope('training-student').model.studentContent.get({ studentId }),
+          undefined,
+        );
+
+        await app.bean.executor.performAction('patch', '/training/student/:id', {
+          params: { id: studentId },
+          body: {
+            name: '__ContentStudent__',
+            mobile: '13812345678',
+            level: 1,
+            studentContentForm: {
+              descriptionMarkdown: '  ## Created later  ',
+              descriptionHtml: '<p>Forged HTML</p>',
+            },
+          },
+        });
+        const studentContent = await app
+          .scope('training-student')
+          .model.studentContent.get({ studentId });
+        assert.equal(studentContent?.descriptionMarkdown, '## Created later');
+        assert.equal(
+          studentContent?.descriptionHtml,
+          app.bean.markdown.renderHtml('## Created later'),
+        );
+        assert.notEqual(studentContent?.descriptionHtml, '<p>Forged HTML</p>');
+
+        await app.bean.executor.performAction('patch', '/training/student/:id', {
+          params: { id: studentId },
+          body: {
+            name: '__ContentStudent__',
+            mobile: '13812345678',
+            level: 1,
+            studentContentForm: { descriptionMarkdown: ' \n\t ' },
+          },
+        });
+        assert.equal(
+          await app.scope('training-student').model.studentContent.get({ studentId }),
+          undefined,
+        );
+      } finally {
+        if (studentId) {
+          await app
+            .scope('training-student')
+            .model.studentContent.delete({ studentId }, { disableDeleted: true });
+          await app
+            .scope('training-student')
+            .model.student.deleteById(studentId, { disableDeleted: true });
+        }
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
   it('action:student:systemAdmin', async () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();
@@ -327,7 +437,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            studentContentForm: { descriptionMarkdown: 'This is a test' },
             mobile: '13812345678',
             level: 4,
           },
@@ -344,7 +454,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            studentContentForm: { descriptionMarkdown: 'This is a test' },
             level: 1,
           },
         });
@@ -360,7 +470,7 @@ describe('student.test.ts', () => {
         await app.bean.executor.performAction('post', '/training/student', {
           body: {
             name: '__Tom__',
-            description: 'This is a test',
+            studentContentForm: { descriptionMarkdown: 'This is a test' },
             mobile: '1381234567',
             level: 1,
           },

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.153",
+  "version": "5.1.154",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.88",
-    "zova-suite-a-zova": "^5.1.152"
+    "zova-suite-a-zova": "^5.1.153"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -77,7 +77,7 @@ importers:
         version: 10.5.2(postcss@8.5.26)
       axios:
         specifier: ^1.18.1
-        version: 1.18.1
+        version: 1.18.1(supports-color@10.2.2)
       compression:
         specifier: ^1.8.1
         version: 1.8.1
@@ -363,7 +363,7 @@ importers:
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.29(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
       '@cabloy/lint':
         specifier: ^5.1.32
         version: 5.1.32(@typescript-eslint/eslint-plugin@8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@5.9.3))(eslint@10.6.0(jiti@2.7.0))(typescript@5.9.3))(@typescript-eslint/rule-tester@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@5.9.3))(@typescript-eslint/typescript-estree@8.62.1(typescript@5.9.3))(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@5.9.3))(eslint@10.6.0(jiti@2.7.0))(oxfmt@0.62.0)(oxlint@1.77.0)(supports-color@10.2.2)(typescript@5.9.3)(vue-eslint-parser@10.4.1(eslint@10.6.0(jiti@2.7.0)))
@@ -438,7 +438,7 @@ importers:
     dependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.29(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
       '@cabloy/process-helper':
         specifier: ^3.1.8
         version: 3.1.8
@@ -449,7 +449,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.101
+        specifier: ^1.2.102
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -472,7 +472,7 @@ importers:
         version: 7.29.7(@babel/core@7.29.7)
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.29(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
       '@cabloy/extend':
         specifier: ^3.2.8
         version: 3.2.8
@@ -1198,7 +1198,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.18.1
-        version: 1.18.1
+        version: 1.18.1(supports-color@10.2.2)
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1471,7 +1471,7 @@ importers:
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.29(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
       '@types/luxon':
         specifier: ^3.7.1
         version: 3.7.2
@@ -1804,6 +1804,10 @@ importers:
         version: link:modules/training-student
 
   src/suite/a-training/modules/training-student:
+    dependencies:
+      zova-module-basic-markdown:
+        specifier: ^5.0.0
+        version: link:../../../cabloy-basic/modules/basic-markdown
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -8798,7 +8802,7 @@ snapshots:
 
   '@bufbuild/protobuf@2.12.1': {}
 
-  '@cabloy/cli@3.1.29(vue@3.5.38(typescript@5.9.3))':
+  '@cabloy/cli@3.1.29(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))':
     dependencies:
       '@babel/parser': 7.29.7
       '@cabloy/module-glob': 5.3.18
@@ -8807,7 +8811,7 @@ snapshots:
       '@cabloy/utils': 2.1.27
       '@cabloy/word-utils': link:packages-utils/word-utils
       '@npmcli/config': 10.11.0
-      '@zhennann/common-bin': 4.0.1
+      '@zhennann/common-bin': 4.0.1(supports-color@10.2.2)
       '@zhennann/ejs': 3.0.1
       boxen: 4.2.0
       chalk: 3.0.0
@@ -11041,7 +11045,7 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@zhennann/common-bin@4.0.1':
+  '@zhennann/common-bin@4.0.1(supports-color@10.2.2)':
     dependencies:
       chalk: 4.1.2
       change-case: 4.1.2
@@ -11075,7 +11079,7 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.2:
+  agent-base@6.0.2(supports-color@10.2.2):
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -11187,11 +11191,11 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.18.1:
+  axios@1.18.1(supports-color@10.2.2):
     dependencies:
       follow-redirects: 1.16.0
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 5.0.1(supports-color@10.2.2)
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -12604,9 +12608,9 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  https-proxy-agent@5.0.1:
+  https-proxy-agent@5.0.1(supports-color@10.2.2):
     dependencies:
-      agent-base: 6.0.2
+      agent-base: 6.0.2(supports-color@10.2.2)
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color

package/zova/src/suite/a-training/modules/training-student/package.json

@@ -33,7 +33,9 @@
     "prepack": "clean-package",
     "postpack": "clean-package restore"
   },
-  "dependencies": {},
+  "dependencies": {
+    "zova-module-basic-markdown": "^5.0.0"
+  },
   "devDependencies": {
     "clean-package": "^2.2.0",
     "rimraf": "^6.1.3"