vona-cli-set-api 1.1.49 → 1.1.56

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.emailConfirmCallback.ts

@@ -1,5 +1,8 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
-import type { TypeEventEmailConfirmCallbackData, TypeEventEmailConfirmCallbackResult } from 'vona-module-a-mailconfirm';
+import type {
+  TypeEventEmailConfirmCallbackData,
+  TypeEventEmailConfirmCallbackResult,
+} from 'vona-module-a-mailconfirm';
 
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
@@ -8,8 +11,14 @@ type TypeEventData = TypeEventEmailConfirmCallbackData;
 type TypeEventResult = TypeEventEmailConfirmCallbackResult;
 
 @EventListener({ match: 'a-mailconfirm:emailConfirmCallback' })
-export class EventListenerEmailConfirmCallback extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
-  async execute(data: TypeEventData, _next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
+export class EventListenerEmailConfirmCallback
+  extends BeanBase
+  implements IEventExecute<TypeEventData, TypeEventResult>
+{
+  async execute(
+    data: TypeEventData,
+    _next: NextEvent<TypeEventData, TypeEventResult>,
+  ): Promise<TypeEventResult> {
     // check cache
     if (!data) {
       return this.scope.locale.ConfirmationEmailExpired();

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.passwordResetCallback.ts

@@ -1,5 +1,8 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
-import type { TypeEventPasswordResetCallbackData, TypeEventPasswordResetCallbackResult } from 'vona-module-a-mailconfirm';
+import type {
+  TypeEventPasswordResetCallbackData,
+  TypeEventPasswordResetCallbackResult,
+} from 'vona-module-a-mailconfirm';
 
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
@@ -8,8 +11,14 @@ type TypeEventData = TypeEventPasswordResetCallbackData;
 type TypeEventResult = TypeEventPasswordResetCallbackResult;
 
 @EventListener({ match: 'a-mailconfirm:passwordResetCallback' })
-export class EventListenerPasswordResetCallback extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
-  async execute(data: TypeEventData, _next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
+export class EventListenerPasswordResetCallback
+  extends BeanBase
+  implements IEventExecute<TypeEventData, TypeEventResult>
+{
+  async execute(
+    data: TypeEventData,
+    _next: NextEvent<TypeEventData, TypeEventResult>,
+  ): Promise<TypeEventResult> {
     // check cache
     if (!data) {
       return this.scope.locale.PasswordResetEmailExpired();

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.register.ts

@@ -8,8 +8,14 @@ type TypeEventData = TypeEventRegisterData;
 type TypeEventResult = TypeEventRegisterResult;
 
 @EventListener({ match: 'a-user:register' })
-export class EventListenerRegister extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
-  async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
+export class EventListenerRegister
+  extends BeanBase
+  implements IEventExecute<TypeEventData, TypeEventResult>
+{
+  async execute(
+    data: TypeEventData,
+    next: NextEvent<TypeEventData, TypeEventResult>,
+  ): Promise<TypeEventResult> {
     // next: registered
     const user = (await next()) as IUser;
     // mail: activate

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -1,4 +1,9 @@
-import type { IMetaVersionInit, IMetaVersionInitOptions, IMetaVersionUpdate, IMetaVersionUpdateOptions } from 'vona-module-a-version';
+import type {
+  IMetaVersionInit,
+  IMetaVersionInitOptions,
+  IMetaVersionUpdate,
+  IMetaVersionUpdateOptions,
+} from 'vona-module-a-version';
 
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
@@ -23,7 +28,10 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.string(entityUser.avatar, 255).comment(entityUser.$comment.avatar);
         table.string(entityUser.email, 255).comment(entityUser.$comment.email);
         table.string(entityUser.mobile, 255).comment(entityUser.$comment.mobile);
-        table.boolean(entityUser.activated).defaultTo(entityUser.$default.activated).comment(entityUser.$comment.activated);
+        table
+          .boolean(entityUser.activated)
+          .defaultTo(entityUser.$default.activated)
+          .comment(entityUser.$comment.activated);
         table.string(entityUser.locale, 255).comment(entityUser.$comment.locale);
         table.string(entityUser.tz, 255).comment(entityUser.$comment.tz);
       });

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.emailUnique.ts

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -8,8 +12,15 @@ export type TypeZodRefineEmailUniqueData = string;
 export interface IZodRefineOptionsEmailUnique extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsEmailUnique>()
-export class ZodRefineEmailUnique extends BeanBase implements IZodRefineExecute<TypeZodRefineEmailUniqueData> {
-  async execute(value: TypeZodRefineEmailUniqueData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsEmailUnique) {
+export class ZodRefineEmailUnique
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefineEmailUniqueData>
+{
+  async execute(
+    value: TypeZodRefineEmailUniqueData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsEmailUnique,
+  ) {
     const user = await this.scope.model.user.getByEmailEqI(value);
     if (user) {
       refinementCtx.addIssue({

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.passwordConfirm.ts

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -11,8 +15,15 @@ export interface TypeZodRefinePasswordConfirmData {
 export interface IZodRefineOptionsPasswordConfirm extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsPasswordConfirm>()
-export class ZodRefinePasswordConfirm extends BeanBase implements IZodRefineExecute<TypeZodRefinePasswordConfirmData> {
-  async execute(value: TypeZodRefinePasswordConfirmData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsPasswordConfirm) {
+export class ZodRefinePasswordConfirm
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefinePasswordConfirmData>
+{
+  async execute(
+    value: TypeZodRefinePasswordConfirmData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsPasswordConfirm,
+  ) {
     if (value.password !== value.passwordConfirm) {
       refinementCtx.addIssue({
         code: 'custom',

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.usernameUnique.ts

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -8,8 +12,15 @@ export type TypeZodRefineUsernameUniqueData = string;
 export interface IZodRefineOptionsUsernameUnique extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsUsernameUnique>()
-export class ZodRefineUsernameUnique extends BeanBase implements IZodRefineExecute<TypeZodRefineUsernameUniqueData> {
-  async execute(value: TypeZodRefineUsernameUniqueData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsUsernameUnique) {
+export class ZodRefineUsernameUnique
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefineUsernameUniqueData>
+{
+  async execute(
+    value: TypeZodRefineUsernameUniqueData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsUsernameUnique,
+  ) {
     const user = await this.bean.user.findOneByName(value);
     if (user) {
       refinementCtx.addIssue({

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -57,7 +57,9 @@ export class ControllerPassport extends BeanBase {
   async loginOauth<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ) {
     // only support oauth, so not return jwt to client
@@ -72,7 +74,9 @@ export class ControllerPassport extends BeanBase {
   async associate<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ): Promise<DtoPassportJwt> {
     const jwt = await this.bean.auth.authenticate(`${module}:${providerName}` as T, {
@@ -87,7 +91,9 @@ export class ControllerPassport extends BeanBase {
   async migrate<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ): Promise<DtoPassportJwt> {
     const jwt = await this.bean.auth.authenticate(`${module}:${providerName}` as T, {

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/dto/login.ts

@@ -3,6 +3,7 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { DtoCaptchaVerify } from 'vona-module-a-captcha';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 export interface IDtoOptionsLogin extends IDecoratorDtoOptions {}
 
@@ -14,6 +15,10 @@ export class DtoLogin {
   @Api.field(v.required(), v.min(6))
   password: string;
 
-  @Api.field(v.required(), v.rest({ iconPrefix: ':editor:code-block' }), v.component('captcha'))
+  @Api.field(
+    v.required(),
+    ZovaRender.layout({ iconPrefix: ':editor:code-block' }),
+    ZovaRender.field('basic-captcha:formFieldCaptcha'),
+  )
   captcha: DtoCaptchaVerify;
 }

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/modules/home-user/src/dto/register.ts

@@ -3,17 +3,18 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { DtoCaptchaVerify } from 'vona-module-a-captcha';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 export interface IDtoOptionsRegister extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsRegister>({
-  pipes: v.refine('home-user:passwordConfirm'),
+  pipes: v.zodRefine('home-user:passwordConfirm'),
 })
 export class DtoRegister {
-  @Api.field(v.refine('home-user:usernameUnique'), v.min(3), v.trim())
+  @Api.field(v.zodRefine('home-user:usernameUnique'), v.min(3), v.trim())
   username: string;
 
-  @Api.field(v.refine('home-user:emailUnique'), v.email(), v.trim())
+  @Api.field(v.zodRefine('home-user:emailUnique'), v.email(), v.trim())
   email: string;
 
   @Api.field(v.min(6), v.max(20))
@@ -22,6 +23,6 @@ export class DtoRegister {
   @Api.field(v.min(6), v.max(20))
   passwordConfirm: string;
 
-  @Api.field(v.component('captcha'))
+  @Api.field(ZovaRender.field('basic-captcha:formFieldCaptcha'))
   captcha: DtoCaptchaVerify;
 }

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/a-home/package.json

@@ -1,6 +1,7 @@
 {
   "name": "vona-suite-a-home",
-  "version": "5.1.4",
+  "version": "5.1.6",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "zhennann",
   "files": [],
@@ -13,6 +14,5 @@
     "vona-module-home-index": "workspace:^",
     "vona-module-home-user": "workspace:^"
   },
-  "title": "a-home",
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d"
+  "title": "a-home"
 }

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/cabloy-start/modules/start-siteadmin/src/.metadata/locales.ts

@@ -1,5 +1,7 @@
 import type { TypeLocaleBase } from 'vona';
+
 import { $makeLocaleMagic } from 'vona';
+
 import locale_en_us from '../config/locale/en-us.ts';
 import locale_zh_cn from '../config/locale/zh-cn.ts';
 
@@ -8,6 +10,9 @@ export const locales = {
   'zh-cn': locale_zh_cn,
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): any {
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
   return $makeLocaleMagic(`start-siteadmin::${key}`, ...args);
 }

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/cabloy-start/modules/start-siteadmin/src/bean/ssrSite.admin.ts

@@ -13,7 +13,10 @@ export interface ISsrSiteOptionsAdminPages extends IPagePathRecord {}
 
 export interface ISsrSiteOptionsAdminPagesData {}
 
-export interface ISsrSiteOptionsAdmin extends IDecoratorSsrSiteOptions<ISsrSiteOptionsAdminPages, ISsrSiteOptionsAdminPagesData> {}
+export interface ISsrSiteOptionsAdmin extends IDecoratorSsrSiteOptions<
+  ISsrSiteOptionsAdminPages,
+  ISsrSiteOptionsAdminPagesData
+> {}
 
 @SsrSite<ISsrSiteOptionsAdmin>({
   publicPath: 'admin',

package/cli/templates/create/project/cabloy-start/boilerplate/src/suite/cabloy-start/modules/start-siteweb/src/bean/ssrSite.web.ts

@@ -13,7 +13,10 @@ export interface ISsrSiteOptionsWebPages extends IPagePathRecord {}
 
 export interface ISsrSiteOptionsWebPagesData {}
 
-export interface ISsrSiteOptionsWeb extends IDecoratorSsrSiteOptions<ISsrSiteOptionsWebPages, ISsrSiteOptionsWebPagesData> {}
+export interface ISsrSiteOptionsWeb extends IDecoratorSsrSiteOptions<
+  ISsrSiteOptionsWebPages,
+  ISsrSiteOptionsWebPagesData
+> {}
 
 @SsrSite<ISsrSiteOptionsWeb>({
   publicPath: '',

package/cli/templates/tools/crudBasic/boilerplate/src/controller/{{resourceName}}.ts_

@@ -1,13 +1,16 @@
 import type { TableIdentity } from 'table-identity';
 import type { IQueryParams } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
-import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+
 import { BeanBase } from 'vona';
 import { Api, Resource, v } from 'vona-module-a-openapiutils';
 import { Arg, Controller, Web } from 'vona-module-a-web';
+
+import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+
 import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
-import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.tsx';
-import { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>SelectReq } from '../dto/<%=argv.resourceName%>SelectReq.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 
@@ -23,8 +26,8 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
   }
 
   @Web.get()
-  @Api.body(Dto<%=argv.resourceNameCapitalize%>QueryRes)
-  async select(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>Query) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+  @Api.body(Dto<%=argv.resourceNameCapitalize%>SelectRes)
+  async select(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>SelectRes> {
     return await this.scope.service.<%=argv.resourceName%>.select(params);
   }
 

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}Create.tsx_

@@ -1,9 +1,28 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
 import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Create extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Create>()
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Create>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [
+            ZovaRender.formActionRow('basic-form:actionSubmit', {
+              permission: { action: 'update', formScene: ['create', 'edit'] },
+            }),
+            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
 export class Dto<%=argv.resourceNameCapitalize%>Create extends $Dto.create(() => Model<%=argv.resourceNameCapitalize%>) {}

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{{resourceName}}Query.tsx_ → {{resourceName}}SelectReq.tsx_}

@@ -1,19 +1,21 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
+
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 
-export interface IDtoOptions<%=argv.resourceNameCapitalize%>Query extends IDecoratorDtoOptions {}
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Query>({
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq>({
   openapi: { filter: { table: '<%=argv.moduleResourceName%>' } },
   fields: {
     createdAt: z.string().optional(),
   },
 })
-export class Dto<%=argv.resourceNameCapitalize%>Query extends $Dto.queryPage(Entity<%=argv.resourceNameCapitalize%>, ['name', 'createdAt']) {
+export class Dto<%=argv.resourceNameCapitalize%>SelectReq extends $Dto.queryPage(Entity<%=argv.resourceNameCapitalize%>, ['name', 'createdAt']) {
   @Api.field(v.optional())
   name?: string;
 }

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}SelectRes.tsx_

@@ -0,0 +1,11 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+
+import { Dto<%=argv.resourceNameCapitalize%>SelectResItem } from './<%=argv.resourceName%>SelectResItem.tsx';
+
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>SelectRes extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>SelectRes>()
+export class Dto<%=argv.resourceNameCapitalize%>SelectRes extends $Dto.listAndCount(Dto<%=argv.resourceNameCapitalize%>SelectResItem) {}

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}SelectResItem.tsx_

@@ -0,0 +1,36 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>SelectResItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>SelectResItem>({
+  blocks: [
+    ZovaRender.block('basic-page:blockPage', {
+      blocks: [
+        ZovaRender.block('basic-page:blockFilter'),
+        ZovaRender.block('basic-page:blockToolbarBulk', {
+          actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
+        }),
+        ZovaRender.block('basic-page:blockTable'),
+        ZovaRender.block('basic-page:blockPager'),
+      ],
+    }),
+  ],
+})
+export class Dto<%=argv.resourceNameCapitalize%>SelectResItem extends $Dto.get(() => Model<%=argv.resourceNameCapitalize%>) {
+  @Api.field(
+    v.title($locale('Operations')),
+    ZovaRender.order(1, 'max'),
+    ZovaRender.cell('basic-table:actionOperationsRow', {
+      actions: [ZovaRender.tableActionRow('basic-table:actionUpdate'), ZovaRender.tableActionRow('basic-table:actionDelete')],
+    }),
+  )
+  _operationsRow?: unknown;
+}

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}Update.tsx_

@@ -1,9 +1,28 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
 import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>Update extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Update>()
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Update>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [
+            ZovaRender.formActionRow('basic-form:actionSubmit', {
+              permission: { action: 'update', formScene: ['create', 'edit'] },
+            }),
+            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
 export class Dto<%=argv.resourceNameCapitalize%>Update extends $Dto.update(() => Model<%=argv.resourceNameCapitalize%>) {}

package/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}View.tsx_

@@ -1,9 +1,23 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
 import { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>View extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>View>()
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>View>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } })],
+        }),
+      ],
+    }),
+  ],
+})
 export class Dto<%=argv.resourceNameCapitalize%>View extends $Dto.get(() => Model<%=argv.resourceNameCapitalize%>) {}

package/cli/templates/tools/crudBasic/boilerplate/src/entity/{{resourceName}}.tsx_

@@ -1,25 +1,49 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapiutils';
+
+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 IEntityOptions<%=argv.resourceNameCapitalize%> extends IDecoratorEntityOptions {}
 
-@Entity<IEntityOptions<%=argv.resourceNameCapitalize%>>('<%=argv.moduleResourceName%>', { openapi: { title: $locale('<%=argv.resourceNameCapitalize%>') } })
+@Entity<IEntityOptions<%=argv.resourceNameCapitalize%>>('<%=argv.moduleResourceName%>', {
+  openapi: { title: $locale('<%=argv.resourceNameCapitalize%>') },
+  fields: {
+    id: $makeMetadata(ZovaRender.order(1, 'core')),
+    createdAt: $makeMetadata(
+      ZovaRender.order(-2, 'max'),
+      ZovaRender.field('basic-date:formFieldDate'),
+      ZovaRender.cell('basic-date:date'),
+      ZovaRender.field('basic-date:formFieldDateRange', undefined, 'filter'),
+      v.filterTransform('a-web:dateRange'),
+    ),
+    updatedAt: $makeMetadata(
+      ZovaRender.order(-1, 'max'),
+      ZovaRender.field('basic-date:formFieldDate'),
+      ZovaRender.cell('basic-date:date'),
+      ZovaRender.field('basic-date:formFieldDateRange', undefined, 'filter'),
+      v.filterTransform('a-web:dateRange'),
+    ),
+    deleted: $makeMetadata(ZovaRender.visible(false)),
+    iid: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
 export class Entity<%=argv.resourceNameCapitalize%> extends EntityBase {
   @Api.field(
     v.title($locale('Name')),
-    v.order(1),
-    v.render('actionView', 'table'),
     v.required(),
     v.min(2),
+    ZovaRender.order(1),
+    ZovaRender.cell('basic-table:actionView'),
   )
   name: string;
 
   @Api.field(
     v.title($locale('Description')),
-    v.order(2),
     v.optional(),
+    ZovaRender.order(2),
   )
   description?: string;
 }

package/cli/templates/tools/crudBasic/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,13 +1,15 @@
 import type { TableIdentity } from 'table-identity';
 import type { IQueryParams } from 'vona-module-a-orm';
+
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-bean';
+
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
-import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
-import { BeanBase } from 'vona';
-import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
@@ -15,7 +17,7 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.insert(<%=argv.resourceName%>);
   }
 
-  async select(params?: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+  async select(params?: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>SelectRes> {
     return await this.scope.model.<%=argv.resourceName%>.selectAndCount(params);
   }
 

package/cli/templates/tools/crudBasic/boilerplate/test/{{resourceName}}.test.ts_

@@ -1,4 +1,4 @@
-import type { Dto<%=argv.resourceNameCapitalize%>Create, Dto<%=argv.resourceNameCapitalize%>QueryRes, Dto<%=argv.resourceNameCapitalize%>Update, Entity<%=argv.resourceNameCapitalize%> } from 'vona-module-<%=argv.moduleInfo.relativeName%>';
+import type { Dto<%=argv.resourceNameCapitalize%>Create, Dto<%=argv.resourceNameCapitalize%>SelectRes, Dto<%=argv.resourceNameCapitalize%>Update, Entity<%=argv.resourceNameCapitalize%> } from 'vona-module-<%=argv.moduleInfo.relativeName%>';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
@@ -21,8 +21,8 @@ describe('<%=argv.resourceName%>.test.ts', () => {
       const <%=argv.resourceName%>Id = await app.bean.executor.performAction('post', '<%=argv.moduleActionPathRaw%>', { body: data });
       assert.equal(!!<%=argv.resourceName%>Id, true);
       // findMany
-      const queryRes: Dto<%=argv.resourceNameCapitalize%>QueryRes = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>');
-      assert.equal(queryRes.list.findIndex(item => item.name === data.name) > -1, true);
+      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', {
         params: { id: <%=argv.resourceName%>Id },