cabloy 5.1.106 → 5.1.108

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/boilerplate/test/{{resourceName}}.test.ts_

@@ -15,7 +15,24 @@ describe('<%=argv.resourceName%>.test.ts', () => {
         name: '__TomNew__',
         description: 'This is a test',
       };
-      // login
+      // role-less authenticated users cannot access generated admin actions
+      await app.bean.passport.signinMock();
+      try {
+        app.bean.passport.current!.roles = [];
+        const actions = ['create', 'select', 'view', 'update', 'delete'];
+        const permissions = await Promise.all(
+          actions.map(action =>
+            app.bean.permission.retrievePermissionAction(
+              '<%=argv.moduleInfo.relativeName%>:<%=argv.resourceName%>',
+              action,
+            ),
+          ),
+        );
+        assert.deepEqual(permissions, actions.map(() => false));
+      } finally {
+        await app.bean.passport.signout();
+      }
+      // login as system admin
       await app.bean.passport.signinMock();
       // create
       const <%=argv.resourceName%>Id = await app.bean.executor.performAction('post', '<%=argv.moduleActionPathRaw%>', { body: data });
@@ -24,15 +41,17 @@ describe('<%=argv.resourceName%>.test.ts', () => {
       const selectRes: Dto<%=argv.resourceNameCapitalize%>SelectRes = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>');
       assert.equal(selectRes.list.findIndex(item => item.name === data.name) > -1, true);
       // update
-      await app.bean.executor.performAction('patch', '<%=argv.moduleActionPathRaw%>/:id', {
+      const updateRes = await app.bean.executor.performAction('patch', '<%=argv.moduleActionPathRaw%>/:id', {
         params: { id: <%=argv.resourceName%>Id },
         body: dataUpdate,
       });
+      assert.equal(updateRes, null);
       // findOne
       let <%=argv.resourceName%>: Entity<%=argv.resourceNameCapitalize%> = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>/:id', { params: { id: <%=argv.resourceName%>Id } });
       assert.equal(<%=argv.resourceName%>.name, dataUpdate.name);
       // delete
-      await app.bean.executor.performAction('delete', '<%=argv.moduleActionPathRaw%>/:id', { params: { id: <%=argv.resourceName%>.id } });
+      const deleteRes = await app.bean.executor.performAction('delete', '<%=argv.moduleActionPathRaw%>/:id', { params: { id: <%=argv.resourceName%>.id } });
+      assert.equal(deleteRes, null);
       // findOne
       <%=argv.resourceName%> = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>/:id', { params: { id: <%=argv.resourceName%>.id } });
       assert.equal(<%=argv.resourceName%>, undefined);

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.127",
+  "version": "1.1.128",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

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

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

package/vona/src/backend/config/config/config.ts

@@ -49,7 +49,7 @@ export default async function (app: VonaApplication) {
 
   // server
   const publicDir = env.SERVER_PUBLICDIR || getPublicPathPhysicalRoot(app);
-  const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '1');
+  const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '2');
   const workers = Number.parseInt(env.SERVER_WORKERS!);
   config.server = {
     keys: (env.SERVER_KEYS || '').split(','),

package/vona/src/suite/a-home/modules/home-user/src/.metadata/index.ts

@@ -144,7 +144,7 @@ import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'von
 declare module 'vona-module-home-user' {
   export interface IModelOptionsUser {
         relations: {
-          roles: IModelRelationBelongsToMany<ModelRoleUser, ModelRole, false, undefined,undefined,undefined,undefined>;
+          roles: IModelRelationBelongsToMany<'home-user:roleUser', 'home-user:role', false, undefined,undefined,undefined,undefined>;
         };
       }
   export interface ModelRole {
@@ -511,8 +511,8 @@ export interface IApiPathPostRecord{
         '/home/user/passport/logout': undefined;
 '/home/user/passport/register': undefined;
 '/home/user/passport/login': undefined;
-'/home/user/passport/createPassportJwtFromOauthCode': undefined;
 '/home/user/passport/refreshAuthToken': undefined;
+'/home/user/passport/createPassportJwtFromOauthCode': undefined;
 '/home/user/passport/createTempAuthToken': undefined;
     }
 

package/vona/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -18,6 +18,8 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.comment(entityRole.$comment.$table);
         table.basicFields();
         table.string(entityRole.name, 255).comment(entityRole.$comment.name);
+        table.string(entityRole.title, 255).comment(entityRole.$comment.title);
+        table.json(entityRole.locales).comment(entityRole.$comment.locales);
         table.json(entityRole.siteIds).comment(entityRole.$comment.siteIds);
       });
       // homeUser
@@ -49,14 +51,14 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
   async init(options: IMetaVersionInitOptions) {
     if (options.version === 1) {
       // roles
-      await this.scope.model.role.insert({
-        name: 'registeredUser',
-        siteIds: ['web'],
-      });
-      await this.scope.model.role.insert({
-        name: 'systemAdmin',
-        siteIds: ['web', 'admin'],
-      });
+      for (const [name, role] of Object.entries(this.scope.config.builtinRoles)) {
+        await this.scope.model.role.insert({
+          name,
+          title: role.title,
+          locales: role.locales ?? {},
+          siteIds: role.siteIds,
+        });
+      }
       // user: admin
       if (!this.scope.config.disableUserAdmin) {
         await this.bean.auth.authenticate('auth-simple:simple', {

package/vona/src/suite/a-home/modules/home-user/src/config/config.ts

@@ -1,5 +1,10 @@
 import type { VonaApplication } from 'vona';
 
+import { builtinRoles } from './roles.ts';
+
+export { builtinRoles } from './roles.ts';
+export type { IRoleConfig } from './roles.ts';
+
 export function config(_app: VonaApplication) {
   return {
     passwordDefault: {
@@ -7,5 +12,6 @@ export function config(_app: VonaApplication) {
     },
     disableBootstrapSystemAdmin: false,
     disableUserAdmin: false,
+    builtinRoles,
   };
 }

package/vona/src/suite/a-home/modules/home-user/src/config/locale/en-us.ts

@@ -4,6 +4,8 @@ export default {
   PasswordResetEmailExpired: 'This password reset link has expired',
   Role: 'Role',
   RoleName: 'Role Name',
+  RoleTitle: 'Role Title',
+  RoleLocales: 'Role Locales',
   User: 'User',
   UserName: 'User Name',
   UserAvatar: 'Avatar',

package/vona/src/suite/a-home/modules/home-user/src/config/locale/zh-cn.ts

@@ -4,6 +4,8 @@ export default {
   PasswordResetEmailExpired: '重置密码链接已经过期',
   Role: '角色',
   RoleName: '角色名',
+  RoleTitle: '角色标题',
+  RoleLocales: '角色本地化文本',
   User: '用户',
   UserName: '用户名',
   UserAvatar: '头像',

package/vona/src/suite/a-home/modules/home-user/src/config/roles.ts

@@ -0,0 +1,24 @@
+import type { ILocaleRecord } from 'vona';
+
+export interface IRoleConfig {
+  title: string;
+  locales?: Partial<Record<keyof ILocaleRecord, string>>;
+  siteIds: string[];
+}
+
+export const builtinRoles: Record<string, IRoleConfig> = {
+  registeredUser: {
+    title: 'Registered User',
+    locales: {
+      'zh-cn': '注册用户',
+    },
+    siteIds: ['web'],
+  },
+  systemAdmin: {
+    title: 'System Administrator',
+    locales: {
+      'zh-cn': '系统管理员',
+    },
+    siteIds: ['web', 'admin'],
+  },
+};

package/vona/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -1,3 +1,4 @@
+import type { ILocaleRecord } from 'vona';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import type { IRole } from 'vona-module-a-user';
 
@@ -14,6 +15,12 @@ export class EntityRole extends EntityBase implements IRole {
   @Api.field(v.title($locale('RoleName')))
   name: string;
 
+  @Api.field(v.title($locale('RoleTitle')))
+  title: string;
+
+  @Api.field(v.title($locale('RoleLocales')), v.optional(), z.record(z.string(), z.string()))
+  locales?: Partial<Record<keyof ILocaleRecord, string>>;
+
   @Api.field(v.array(z.string()))
   siteIds: string[];
 }

package/vona/src/suite/a-home/modules/home-user/test/role.test.ts

@@ -0,0 +1,45 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+describe('role.test.ts', () => {
+  it('action:roleSeedAndPassport', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const scope = app.scope('home-user');
+      const roleRegisteredUser = await scope.model.role.getByName('registeredUser');
+      assert.equal(roleRegisteredUser?.title, 'Registered User');
+      assert.deepEqual(roleRegisteredUser?.locales, { 'zh-cn': '注册用户' });
+      assert.deepEqual(roleRegisteredUser?.siteIds, ['web']);
+
+      const roleSystemAdmin = await scope.model.role.getByName('systemAdmin');
+      assert.equal(roleSystemAdmin?.title, 'System Administrator');
+      assert.deepEqual(roleSystemAdmin?.locales, { 'zh-cn': '系统管理员' });
+      assert.deepEqual(roleSystemAdmin?.siteIds, ['web', 'admin']);
+
+      await app.bean.passport.signinMock();
+      const passport = await app.bean.executor.performAction('get', '/home/user/passport/current');
+      assert.deepEqual(
+        passport.roles.map(role => ({
+          name: role.name,
+          title: role.title,
+          locales: role.locales,
+          siteIds: role.siteIds,
+        })),
+        [
+          {
+            name: 'registeredUser',
+            title: 'Registered User',
+            locales: { 'zh-cn': '注册用户' },
+            siteIds: ['web'],
+          },
+          {
+            name: 'systemAdmin',
+            title: 'System Administrator',
+            locales: { 'zh-cn': '系统管理员' },
+            siteIds: ['web', 'admin'],
+          },
+        ],
+      );
+    });
+  });
+});

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

@@ -5,7 +5,9 @@ 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 { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
+import { z } from 'zod';
 
 import type { ModelRecord } from '../model/record.ts';
 
@@ -22,6 +24,7 @@ export interface IControllerOptionsRecord extends IDecoratorControllerOptions {}
 export class ControllerRecord extends BeanBase {
   @Web.post()
   @Api.body(v.tableIdentity())
+  @Passport.systemAdmin()
   async create(@Arg.body() record: DtoRecordCreate): Promise<TableIdentity> {
     return (await this.scope.service.record.create(record)).id;
   }
@@ -29,6 +32,7 @@ export class ControllerRecord extends BeanBase {
   @Web.get()
   @Api.body(DtoRecordSelectRes)
   @Core.serializer()
+  @Passport.systemAdmin()
   async select(
     @Arg.filter(DtoRecordSelectReq) params: IQueryParams<ModelRecord>,
   ): Promise<DtoRecordSelectRes> {
@@ -38,6 +42,7 @@ export class ControllerRecord extends BeanBase {
   @Web.get(':id')
   @Api.body(v.optional(), v.object(DtoRecordView))
   @Core.serializer()
+  @Passport.systemAdmin()
   async view(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoRecordView | undefined> {
@@ -45,15 +50,19 @@ export class ControllerRecord extends BeanBase {
   }
 
   @Web.patch(':id')
+  @Api.body(z.null())
+  @Passport.systemAdmin()
   async update(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
     @Arg.body() record: DtoRecordUpdate,
-  ) {
-    return await this.scope.service.record.update(id, record);
+  ): Promise<void> {
+    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);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.record.delete(id);
   }
 }

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

@@ -160,10 +160,11 @@ describe('record.test.ts', () => {
             },
           ],
         } as any as DtoRecordUpdate;
-        await app.bean.executor.performAction('patch', '/training/record/:id', {
+        const updateRes = await app.bean.executor.performAction('patch', '/training/record/:id', {
           params: { id: recordId },
           body: dataUpdate,
         });
+        assert.equal(updateRes, null);
 
         record = await app.bean.executor.performAction('get', '/training/record/:id', {
           params: { id: recordId },
@@ -200,9 +201,10 @@ describe('record.test.ts', () => {
         assert.equal(studentRecord?.dossierFiles?.length, 2);
         assert.equal(studentRecord?.trainingRecordSubjects?.length, 2);
 
-        await app.bean.executor.performAction('delete', '/training/record/:id', {
+        const deleteRes = await app.bean.executor.performAction('delete', '/training/record/:id', {
           params: { id: recordId },
         });
+        assert.equal(deleteRes, null);
 
         record = await app.bean.executor.performAction('get', '/training/record/:id', {
           params: { id: recordId },
@@ -243,4 +245,25 @@ describe('record.test.ts', () => {
       }
     });
   });
+
+  it('action:record:systemAdmin', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      try {
+        app.bean.passport.current!.roles = [];
+        const actions = ['create', 'select', 'view', 'update', 'delete'];
+        const permissions = await Promise.all(
+          actions.map(action =>
+            app.bean.permission.retrievePermissionAction('training-record:record', action),
+          ),
+        );
+        assert.deepEqual(
+          permissions,
+          actions.map(() => false),
+        );
+      } finally {
+        await app.bean.passport.signout();
+      }
+    });
+  });
 });

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

@@ -5,7 +5,9 @@ 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 { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
+import { z } from 'zod';
 
 import type { ModelStudent } from '../model/student.ts';
 
@@ -23,6 +25,7 @@ export interface IControllerOptionsStudent extends IDecoratorControllerOptions {
 export class ControllerStudent extends BeanBase {
   @Web.post()
   @Api.body(v.tableIdentity())
+  @Passport.systemAdmin()
   async create(@Arg.body() student: DtoStudentCreate): Promise<TableIdentity> {
     return (await this.scope.service.student.create(student)).id;
   }
@@ -30,6 +33,7 @@ export class ControllerStudent extends BeanBase {
   @Web.get()
   @Api.body(DtoStudentSelectRes)
   @Core.serializer()
+  @Passport.systemAdmin()
   async select(
     @Arg.filter(DtoStudentSelectReq) params: IQueryParams<ModelStudent>,
   ): Promise<DtoStudentSelectRes> {
@@ -39,6 +43,7 @@ export class ControllerStudent extends BeanBase {
   @Web.get(':id')
   @Api.body(v.optional(), v.object(DtoStudentView))
   @Core.serializer()
+  @Passport.systemAdmin()
   async view(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoStudentView | undefined> {
@@ -46,16 +51,19 @@ export class ControllerStudent extends BeanBase {
   }
 
   @Web.patch(':id')
+  @Api.body(z.null())
+  @Passport.systemAdmin()
   async update(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
     @Arg.body() student: DtoStudentUpdate,
-  ) {
-    return await this.scope.service.student.update(id, student);
+  ): Promise<void> {
+    await this.scope.service.student.update(id, student);
   }
 
   @Web.get('summary/:id')
   @Api.body(v.optional(), v.object(DtoStudentSummary))
   @Core.serializer()
+  @Passport.systemAdmin()
   async summary(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoStudentSummary | undefined> {
@@ -63,12 +71,16 @@ export class ControllerStudent extends BeanBase {
   }
 
   @Web.delete(':id')
-  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.student.delete(id);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.student.delete(id);
   }
 
   @Web.delete('deleteForce/:id')
-  async deleteForce(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
-    return await this.scope.service.student.deleteForce(id);
+  @Api.body(z.null())
+  @Passport.systemAdmin()
+  async deleteForce(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.student.deleteForce(id);
   }
 }

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

@@ -123,10 +123,11 @@ describe('student.test.ts', () => {
           },
         ],
       } as any as DtoStudentUpdate;
-      await app.bean.executor.performAction('patch', '/training/student/:id', {
+      const updateRes = await app.bean.executor.performAction('patch', '/training/student/:id', {
         params: { id: studentId },
         body: dataUpdate,
       });
+      assert.equal(updateRes, null);
       // findOne after nested update
       student = await app.bean.executor.performAction('get', '/training/student/:id', {
         params: { id: studentId },
@@ -168,9 +169,10 @@ describe('student.test.ts', () => {
       assert.equal(typeof summary.levelTitle, 'string');
       assert.equal(typeof summary.summaryText, 'string');
       // delete
-      await app.bean.executor.performAction('delete', '/training/student/:id', {
+      const deleteRes = await app.bean.executor.performAction('delete', '/training/student/:id', {
         params: { id: student.id },
       });
+      assert.equal(deleteRes, null);
       // findOne
       student = await app.bean.executor.performAction('get', '/training/student/:id', {
         params: { id: student.id },
@@ -180,9 +182,14 @@ describe('student.test.ts', () => {
       const studentIdForce = await app.bean.executor.performAction('post', '/training/student', {
         body: data,
       });
-      await app.bean.executor.performAction('delete', '/training/student/deleteForce/:id', {
-        params: { id: studentIdForce },
-      });
+      const deleteForceRes = await app.bean.executor.performAction(
+        'delete',
+        '/training/student/deleteForce/:id',
+        {
+          params: { id: studentIdForce },
+        },
+      );
+      assert.equal(deleteForceRes, null);
       const studentForce: EntityStudent | undefined = await app.bean
         .scope('training-student')
         .model.student.getById(studentIdForce, {
@@ -194,6 +201,27 @@ describe('student.test.ts', () => {
     });
   });
 
+  it('action:student:systemAdmin', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      await app.bean.passport.signinMock();
+      try {
+        app.bean.passport.current!.roles = [];
+        const actions = ['create', 'select', 'view', 'update', 'summary', 'delete', 'deleteForce'];
+        const permissions = await Promise.all(
+          actions.map(action =>
+            app.bean.permission.retrievePermissionAction('training-student:student', action),
+          ),
+        );
+        assert.deepEqual(
+          permissions,
+          actions.map(() => false),
+        );
+      } finally {
+        await app.bean.passport.signout();
+      }
+    });
+  });
+
   it('action:student:level invalid', async () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/cli/ssrMenuAdmin/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -14,6 +14,7 @@ export interface ISsrMenuOptions<%=argv.beanNameCapitalize%> extends IDecoratorS
     icon: undefined,
     link: undefined,
     group: '<%=argv.ssrSiteGroupName%>',
+    roles: ['systemAdmin'],
   },
   site: ['<%=argv.ssrSiteOnionName%>'],
 })

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.25",
+  "version": "5.1.26",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssrHandler.ts

@@ -33,7 +33,7 @@ export class ServiceSsrHandler extends BeanBase {
     return await ssrHandler.resolvePath(filename);
   }
 
-  public async render(options: ISsrHandlerRenderOptionsInner) {
+  public async render(options: ISsrHandlerRenderOptionsInner): Promise<true | string | undefined> {
     const ssrHandler = await this.ensureReady();
     return await ssrHandler.render(options);
   }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.40",
+  "version": "5.1.41",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

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

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

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -1,4 +1,5 @@
 import type { TableIdentity } from 'table-identity';
+import type { ILocaleRecord } from 'vona';
 
 export interface IRoleNameRecord {
   registeredUser: never;
@@ -10,6 +11,8 @@ export interface IRoleIdRecord {}
 export interface IRole {
   id: TableIdentity;
   name: string;
+  title: string;
+  locales?: Partial<Record<keyof ILocaleRecord, string>>;
   siteIds: string[];
 }
 

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.97",
+  "version": "1.2.98",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.95"
+    "zova-cli-set-front": "^1.2.96"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.95",
+  "version": "1.2.96",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.generate.ts

@@ -606,6 +606,10 @@ function _patchOpenapiTSOptions(options?: OpenAPITSOptions) {
           const res = transformCustom(schemaObject, options);
           if (res !== undefined) return res;
         }
+        // // null
+        // if (schemaObject.type === 'null') {
+        //   return NULL;
+        // }
         // multipart
         if (schemaObject.format === 'binary') {
           if (

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

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