cabloy 5.1.62 → 5.1.64

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

@@ -1,5 +1,5 @@
 // eslint-disable
-import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore } from 'vona-module-a-orm';
+import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,IModelRelationHasMany } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields,TypeControllerOptionsActions } from 'vona-module-a-openapi';
 import type { TableIdentity } from 'table-identity';
 /** entity: begin */
@@ -84,7 +84,11 @@ declare module 'vona' {
 import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-training-student' {
-  
+  export interface IModelOptionsStudent {
+        relations: {
+          trainingRecords: IModelRelationHasMany<'training-record:record', 'studentId', false, 'id'|'name'|'score'|'description', undefined, undefined, undefined>;
+        };
+      }
   export interface ModelStudent {
       [SymbolKeyEntity]: EntityStudent;
       [SymbolKeyEntityMeta]: EntityStudentMeta;
@@ -202,6 +206,10 @@ declare module 'vona-module-training-student' {
 }
 /** meta: end */
 /** dto: begin */
+export * from '../dto/detailRecordBase.tsx';
+export * from '../dto/detailRecordMutate.tsx';
+export * from '../dto/detailRecordResItem.tsx';
+export * from '../dto/detailRecordView.tsx';
 export * from '../dto/studentCreate.tsx';
 export * from '../dto/studentSelectReq.tsx';
 export * from '../dto/studentSelectRes.tsx';
@@ -209,6 +217,10 @@ export * from '../dto/studentSelectResItem.tsx';
 export * from '../dto/studentSummary.tsx';
 export * from '../dto/studentUpdate.tsx';
 export * from '../dto/studentView.tsx';
+import type { IDtoOptionsDetailRecordBase } from '../dto/detailRecordBase.tsx';
+import type { IDtoOptionsDetailRecordMutate } from '../dto/detailRecordMutate.tsx';
+import type { IDtoOptionsDetailRecordResItem } from '../dto/detailRecordResItem.tsx';
+import type { IDtoOptionsDetailRecordView } from '../dto/detailRecordView.tsx';
 import type { IDtoOptionsStudentCreate } from '../dto/studentCreate.tsx';
 import type { IDtoOptionsStudentSelectReq } from '../dto/studentSelectReq.tsx';
 import type { IDtoOptionsStudentSelectRes } from '../dto/studentSelectRes.tsx';
@@ -220,7 +232,11 @@ import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
   
     export interface IDtoRecord {
-      'training-student:studentCreate': IDtoOptionsStudentCreate;
+      'training-student:detailRecordBase': IDtoOptionsDetailRecordBase;
+'training-student:detailRecordMutate': IDtoOptionsDetailRecordMutate;
+'training-student:detailRecordResItem': IDtoOptionsDetailRecordResItem;
+'training-student:detailRecordView': IDtoOptionsDetailRecordView;
+'training-student:studentCreate': IDtoOptionsStudentCreate;
 'training-student:studentSelectReq': IDtoOptionsStudentSelectReq;
 'training-student:studentSelectRes': IDtoOptionsStudentSelectRes;
 'training-student:studentSelectResItem': IDtoOptionsStudentSelectResItem;
@@ -236,6 +252,10 @@ declare module 'vona-module-training-student' {
 }
 /** dto: end */
 /** dto: begin */
+import type { DtoDetailRecordBase } from '../dto/detailRecordBase.tsx';
+import type { DtoDetailRecordMutate } from '../dto/detailRecordMutate.tsx';
+import type { DtoDetailRecordResItem } from '../dto/detailRecordResItem.tsx';
+import type { DtoDetailRecordView } from '../dto/detailRecordView.tsx';
 import type { DtoStudentCreate } from '../dto/studentCreate.tsx';
 import type { DtoStudentSelectReq } from '../dto/studentSelectReq.tsx';
 import type { DtoStudentSelectRes } from '../dto/studentSelectRes.tsx';
@@ -245,6 +265,22 @@ import type { DtoStudentUpdate } from '../dto/studentUpdate.tsx';
 import type { DtoStudentView } from '../dto/studentView.tsx';
 declare module 'vona-module-training-student' {
   
+    export interface IDtoOptionsDetailRecordBase {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordBase, IDtoOptionsDetailRecordBase[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordMutate {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordMutate, IDtoOptionsDetailRecordMutate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordResItem {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordResItem, IDtoOptionsDetailRecordResItem[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsDetailRecordView {
+      fields?: TypeEntityOptionsFields<DtoDetailRecordView, IDtoOptionsDetailRecordView[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsStudentCreate {
       fields?: TypeEntityOptionsFields<DtoStudentCreate, IDtoOptionsStudentCreate[TypeSymbolKeyFieldsMore]>;
     }

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

@@ -12,4 +12,5 @@ export default {
   LevelTitle: 'Level Title',
   DescriptionLength: 'Description Length',
   ForceDelete: 'Force Delete',
+  TrainingRecords: 'Training Records',
 };

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

@@ -12,4 +12,5 @@ export default {
   LevelTitle: '阶段名称',
   DescriptionLength: '描述长度',
   ForceDelete: '强制删除',
+  TrainingRecords: '培训记录',
 };

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

@@ -0,0 +1,12 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ModelRecord } from 'vona-module-training-record';
+
+export interface IDtoOptionsDetailRecordBase extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordBase>()
+export class DtoDetailRecordBase extends $Dto.get(() => ModelRecord, {
+  columns: ['id', 'name', 'score', 'description'],
+}) {}

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

@@ -0,0 +1,31 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ModelRecord } from 'vona-module-training-record';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { DtoDetailRecordBase } from './detailRecordBase.tsx';
+
+export interface IDtoOptionsDetailRecordMutate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordMutate>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [
+            ZovaRender.formActionRow('basic-form:actionSubmit', {
+              permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
+            }),
+            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
+export class DtoDetailRecordMutate extends $Dto.mutate(() => ModelRecord, {
+  dtoClass: DtoDetailRecordBase,
+}) {}

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

@@ -0,0 +1,41 @@
+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 { ModelRecord } from 'vona-module-training-record';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { DtoDetailRecordBase } from './detailRecordBase.tsx';
+
+export interface IDtoOptionsDetailRecordResItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordResItem>({
+  blocks: [
+    ZovaRender.block('basic-details:blockDetails', {
+      blocks: [
+        ZovaRender.block('basic-details:blockDetailsToolbarBulk', {
+          actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
+        }),
+        // ZovaRender.block('basic-page:blockTable'),
+        // ZovaRender.block('basic-page:blockPager'),
+      ],
+    }),
+  ],
+})
+export class DtoDetailRecordResItem extends $Dto.get(() => ModelRecord, {
+  dtoClass: DtoDetailRecordBase,
+}) {
+  @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/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordView.tsx

@@ -0,0 +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 { ModelRecord } from 'vona-module-training-record';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { DtoDetailRecordBase } from './detailRecordBase.tsx';
+
+export interface IDtoOptionsDetailRecordView extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsDetailRecordView>({
+  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 DtoDetailRecordView extends $Dto.get(() => ModelRecord, {
+  dtoClass: DtoDetailRecordBase,
+}) {}

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

@@ -1,10 +1,14 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $makeSchema, 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 { ModelStudent } from '../model/student.ts';
+import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
+import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 
 export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions {}
 
@@ -24,5 +28,16 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions {}
       ],
     }),
   ],
+  fields: {
+    trainingRecords: $makeSchema(
+      v.title($locale('TrainingRecords')),
+      ZovaRender.order(5),
+      ZovaRender.field('basic-details:formFieldDetails'),
+      v.optional(),
+      v.array(DtoDetailRecordResItem),
+    ),
+  },
 })
-export class DtoStudentCreate extends $Dto.create(() => ModelStudent) {}
+export class DtoStudentCreate extends $Dto.create(() => ModelStudent, {
+  include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
+}) {}

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

@@ -5,6 +5,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { ModelStudent } from '../model/student.ts';
+import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
 
 export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
 
@@ -25,4 +26,6 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoStudentUpdate extends $Dto.update(() => ModelStudent) {}
+export class DtoStudentUpdate extends $Dto.update(() => ModelStudent, {
+  include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
+}) {}

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

@@ -5,6 +5,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { ModelStudent } from '../model/student.ts';
+import { DtoDetailRecordView } from './detailRecordView.tsx';
 
 export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
 
@@ -22,4 +23,6 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoStudentView extends $Dto.get(() => ModelStudent) {}
+export class DtoStudentView extends $Dto.get(() => ModelStudent, {
+  include: { trainingRecords: { dtoClass: DtoDetailRecordView } },
+}) {}

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

@@ -1,10 +1,17 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
 
-import { BeanModelBase, Model } from 'vona-module-a-orm';
+import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
 
 import { EntityStudent } from '../entity/student.tsx';
 
 export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStudent> {}
 
-@Model<IModelOptionsStudent>({ entity: EntityStudent })
+@Model<IModelOptionsStudent>({
+  entity: EntityStudent,
+  relations: {
+    trainingRecords: $relation.hasMany('training-record:record', 'studentId', {
+      columns: ['id', 'name', 'score', 'description'],
+    }),
+  },
+})
 export class ModelStudent extends BeanModelBase<EntityStudent> {}

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

@@ -23,7 +23,7 @@ export class ServiceStudent extends BeanBase {
   }
 
   async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
-    return await this.scope.model.student.getById(id);
+    return await this.scope.model.student.getById(id, { include: { trainingRecords: true } });
   }
 
   async update(id: TableIdentity, student: DtoStudentUpdate) {

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

@@ -6,6 +6,7 @@
   "files": [],
   "type": "module",
   "dependencies": {
+    "vona-module-training-record": "^5.0.0",
     "vona-module-training-student": "^5.0.0"
   },
   "title": "a-training"

package/vona/src/suite/a-training/tsconfig.json

@@ -4,6 +4,9 @@
   "references": [
     {
       "path": "modules/training-student/tsconfig.build.json"
+    },
+    {
+      "path": "modules/training-record/tsconfig.build.json"
     }
   ],
   "exclude": ["modules"]

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dto.ts

@@ -3,6 +3,7 @@ import { DtoCreate } from './dtoCreate.ts';
 import { DtoGet } from './dtoGet.ts';
 import { DtoGroup } from './dtoGroup.ts';
 import { DtoListAndCount } from './dtoListAndCount.ts';
+import { DtoMutate } from './dtoMutate.ts';
 import { DtoQuery } from './dtoQuery.ts';
 import { DtoQueryPage } from './dtoQueryPage.ts';
 import { DtoSelectAndCount } from './dtoSelectAndCount.ts';
@@ -11,6 +12,7 @@ import { DtoUpdate } from './dtoUpdate.ts';
 export const $Dto = {
   create: DtoCreate,
   update: DtoUpdate,
+  mutate: DtoMutate,
   get: DtoGet,
   aggregate: DtoAggregate,
   group: DtoGroup,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoGet.ts

@@ -12,12 +12,12 @@ import {
 } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoGetParams, TypeDtoGetResult } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
 import type { IModelRelationIncludeWrapper } from '../../types/model.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../../types/onion/model.ts';
 import type { IRelationItem } from '../../types/relationsDef.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 
 import {
   getClassEntityFromClassModel,
@@ -53,7 +53,7 @@ function _DtoGet_raw<
   // model
   const modelClass = prepareClassModel(modelLike);
   // entity
-  let entityClass = getClassEntityFromClassModel(modelClass);
+  let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
   const columns = prepareColumns(params?.columns);
   // always create a new class, no matter if columns empty
@@ -164,7 +164,7 @@ function _DtoGet_relation_handle_schemaLazy(
       );
     }
     // dynamic
-    const entityClass = getClassEntityFromClassModel(modelTarget);
+    const entityClass = optionsReal.dtoClass ?? getClassEntityFromClassModel(modelTarget);
     const beanFullName = appResource.getBeanFullName(entityClass);
     const _hashkey = _DtoGet_relation_handle_schemaLazy_hashkey(optionsReal, mutateTypeTopLevel);
     const dynamicName = `${beanFullName}_${_hashkey}`;

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoMutate.ts

@@ -3,7 +3,6 @@ import type { Constructable } from 'vona';
 import { mutate } from 'mutate-on-copy';
 import { $Class } from 'vona';
 
-import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type {
   IDtoMutateParams,
   TypeDtoMutateResult,
@@ -13,6 +12,7 @@ import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 import type { TypeModelOfModelLike, TypeSymbolKeyEntity } from '../../types/relations.ts';
 import type { IRelationItem } from '../../types/relationsDef.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 
 import {
   getClassEntityFromClassModel,
@@ -52,7 +52,7 @@ export function _DtoMutate_raw<
   // model
   const modelClass = prepareClassModel(modelLike);
   // entity
-  let entityClass = getClassEntityFromClassModel(modelClass);
+  let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
   let columns = prepareColumns(params?.columns);
   if (columns) {

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/dto/dtoGet.ts

@@ -1,3 +1,5 @@
+import type { Constructable } from 'vona';
+
 import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumns } from '../modelWhere.ts';
@@ -19,6 +21,7 @@ export interface IBuildDtoGetParams<TRecord, Model extends BeanModelMeta>
 
 export interface IBuildDtoGetParamsBasic<TRecord> {
   columns?: TypeModelColumns<TRecord>;
+  dtoClass?: Constructable<unknown>;
 }
 
 export type TypeDtoGetResult<

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/dto/dtoMutate.ts

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { OmitNever, TypeOmitStringUnion } from 'vona';
+import type { Constructable, OmitNever, TypeOmitStringUnion } from 'vona';
 
 import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
@@ -38,6 +38,7 @@ export interface IBuildDtoMutateParams<TRecord, Model extends BeanModelMeta>
 
 export interface IBuildDtoMutateParamsBasic<TRecord> {
   columns?: TypeModelColumnsStrict<TRecord>;
+  dtoClass?: Constructable<unknown>;
 }
 
 export type TypeDtoMutateResult<

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelGeneral.ts

@@ -1,3 +1,5 @@
+import type { Constructable } from 'vona';
+
 import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
@@ -54,6 +56,7 @@ export interface IBuildModelSelectGeneralParamsBasic<
       ? TColumn | Array<TColumn>
       : TColumn
     : TypeModelColumnsPatch<TRecord, TColumn>;
+  dtoClass?: Constructable<unknown>;
   aggrs?: Aggrs;
   groups?: Groups;
   having?: TypeModelWhere<TRecord, TypeModelSelectGroupParamsColumns<TRecord, Groups, Aggrs>>;

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.80",
+  "version": "1.2.81",
   "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.78"
+    "zova-cli-set-front": "^1.2.79"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateBlockPage/controller.tsx_

@@ -1,6 +1,10 @@
-import type { IResourceBlockOptionsBase, IJsxRenderContextPage } from 'zova-module-a-openapi';
+import type { IComponentOptions } from 'zova';
+import type {
+  IResourceBlockOptionsBase,
+  IJsxRenderContextPage,
+} from 'zova-module-a-openapi';
 
-import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
 declare module 'zova-module-a-openapi' {

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateBlockPageEntry/controller.tsx_

@@ -1,6 +1,10 @@
-import type { IResourceBlockOptionsBase, IJsxRenderContextPageEntry } from 'zova-module-a-openapi';
+import type { IComponentOptions } from 'zova';
+import type {
+  IResourceBlockOptionsBase,
+  IJsxRenderContextPageEntry,
+} from 'zova-module-a-openapi';
 
-import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
 declare module 'zova-module-a-openapi' {

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateFormActionRow/controller.tsx_

@@ -1,6 +1,10 @@
-import type { IJsxRenderContextPageEntry, IResourceFormActionRowOptionsBase } from 'zova-module-a-openapi';
+import type { IComponentOptions } from 'zova';
+import type {
+  IJsxRenderContextPageEntry,
+  IResourceFormActionRowOptionsBase,
+} from 'zova-module-a-openapi';
 
-import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
 declare module 'zova-module-a-openapi' {

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateFormField/controller.tsx_

@@ -1,9 +1,10 @@
 import type { IComponentOptions } from 'zova';
+import type { IFormFieldComponentOptions } from 'zova-module-a-form';
 import type { IResourceFormFieldOptionsBase } from 'zova-module-a-openapi';
 
 import { BeanControllerBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { ZFormField, type IFormFieldComponentOptions } from 'zova-module-a-form';
+import { ZFormField } from 'zova-module-a-form';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {

package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateTableActionBulk/controller.tsx_

@@ -1,6 +1,10 @@
-import type { IJsxRenderContextPage, IResourceTableActionBulkOptionsBase } from 'zova-module-a-openapi';
+import type { IComponentOptions } from 'zova';
+import type {
+  IJsxRenderContextPage,
+  IResourceTableActionBulkOptionsBase,
+} from 'zova-module-a-openapi';
 
-import { BeanControllerBase, type IComponentOptions, Use } from 'zova';
+import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
 declare module 'zova-module-a-openapi' {

package/zova/packages-cli/cli-set-front/cli/templates/rest/component.ts

@@ -6,15 +6,18 @@ import type {
   IResourceTableActionRowRecord,
   IResourceFormActionRowRecord,
   IResourceTableActionBulkRecord,
+  IResourceDetailsActionBulkRecord,
   IResourceBlockRecord,
   TypeFormSchemaScene,
   IResourceRenderTableActionRowOptionsAction,
   IResourceRenderFormActionRowOptionsAction,
   IResourceRenderTableActionBulkOptionsAction,
+  IResourceRenderDetailsActionBulkOptionsAction,
   IResourceRenderBlockOptionsBlock,
   IResourceTableActionRowOptionsBase,
   IResourceFormActionRowOptionsBase,
   IResourceTableActionBulkOptionsBase,
+  IResourceDetailsActionBulkOptionsBase,
 } from 'zova-module-a-openapi';
 
 import { _generalSchemaRest, _toLowerCaseFirstChar } from './inner.ts';
@@ -120,6 +123,25 @@ export function schemaRenderTableActionBulkJsx(
   return { render: renderComponentJsx, options };
 }
 
+export function schemaRenderDetailsActionBulk<K extends keyof IResourceDetailsActionBulkRecord>(
+  render: K,
+  options?: IResourceDetailsActionBulkRecord[K],
+): IResourceRenderDetailsActionBulkOptionsAction {
+  const pos = render.toString().indexOf(':action');
+  const name =
+    pos > -1
+      ? _toLowerCaseFirstChar(render.toString().substring(pos + ':action'.length))
+      : undefined;
+  return { $$typeof: 'zova-jsx:actionBulk', name, render, options };
+}
+
+export function schemaRenderDetailsActionBulkJsx(
+  renderComponentJsx: TypeRenderComponentJsx,
+  options?: Pick<IResourceDetailsActionBulkOptionsBase, 'permission'>,
+) {
+  return { render: renderComponentJsx, options };
+}
+
 export function schemaRenderBlock<K extends keyof IResourceBlockRecord>(
   render: K,
   options?: IResourceBlockRecord[K],

package/zova/packages-cli/cli-set-front/cli/templates/rest/render.ts

@@ -3,6 +3,8 @@ import {
   schemaRenderBlockJsx,
   schemaRenderCell,
   schemaRenderCellJsx,
+  schemaRenderDetailsActionBulk,
+  schemaRenderDetailsActionBulkJsx,
   schemaRenderField,
   schemaRenderFieldJsx,
   schemaRenderFormActionRow,
@@ -40,6 +42,8 @@ export const ZovaRender = {
   formActionRowJsx: schemaRenderFormActionRowJsx,
   tableActionBulk: schemaRenderTableActionBulk,
   tableActionBulkJsx: schemaRenderTableActionBulkJsx,
+  detailsActionBulk: schemaRenderDetailsActionBulk,
+  detailsActionBulkJsx: schemaRenderDetailsActionBulkJsx,
   block: schemaRenderBlock,
   blockJsx: schemaRenderBlockJsx,
 };

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

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

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

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