cabloy 5.1.65 → 5.1.67

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (340) hide show
  1. package/.claude/skills/cabloy-resource-field-update/SKILL.md +6 -0
  2. package/CHANGELOG.md +55 -0
  3. package/cabloy-docs/.vitepress/config.mjs +1 -1
  4. package/cabloy-docs/backend/crud-workflow.md +33 -0
  5. package/cabloy-docs/backend/master-detail-workflow.md +149 -0
  6. package/cabloy-docs/frontend/bean-scene-authoring.md +1 -1
  7. package/cabloy-docs/frontend/cli.md +12 -1
  8. package/cabloy-docs/frontend/command-scene-authoring.md +12 -1
  9. package/cabloy-docs/frontend/component-guide.md +10 -0
  10. package/cabloy-docs/frontend/permission-formscene-action-visibility-guide.md +69 -7
  11. package/cabloy-docs/frontend/table-cell-cookbook.md +10 -0
  12. package/cabloy-docs/fullstack/backend-metadata-to-frontend-table-actions.md +83 -2
  13. package/cabloy-docs/reference/bean-scene-boilerplates.md +9 -4
  14. package/package.json +1 -1
  15. package/vona/packages-cli/cabloy-cli/package.json +1 -1
  16. package/vona/packages-cli/cabloy-cli/src/lib/local.helper.ts +38 -0
  17. package/vona/packages-cli/cli/package.json +1 -1
  18. package/vona/packages-cli/cli-set-api/cli/templates/create/module/boilerplate/_package.json +1 -1
  19. package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoBaseName%>.tsx_ +18 -0
  20. package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoMutateName%>.tsx_ +17 -0
  21. package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoResItemName%>.tsx_ +60 -0
  22. package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoViewName%>.tsx_ +17 -0
  23. package/vona/packages-cli/cli-set-api/package.json +2 -2
  24. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.bean.ts +2 -6
  25. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.module.ts +3 -6
  26. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.suite.ts +1 -1
  27. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.create.test.ts +2 -6
  28. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.asset.ts +2 -6
  29. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.config.ts +2 -6
  30. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.constant.ts +2 -6
  31. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.error.ts +2 -6
  32. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.lib.ts +2 -6
  33. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.locale.ts +2 -6
  34. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.main.ts +2 -6
  35. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.monkey.ts +2 -6
  36. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.static.ts +2 -6
  37. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.init.types.ts +2 -6
  38. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crud.ts +2 -6
  39. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudBasic.ts +2 -6
  40. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudStart.ts +2 -6
  41. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.masterDetail.ts +699 -0
  42. package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.metadata.ts +1 -2
  43. package/vona/packages-cli/cli-set-api/src/lib/beans.ts +2 -0
  44. package/vona/packages-cli/cli-set-api/src/lib/command/tools.masterDetail.ts +78 -0
  45. package/vona/packages-cli/cli-set-api/src/lib/commands.ts +2 -0
  46. package/vona/packages-vona/vona/package.json +1 -1
  47. package/vona/packages-vona/vona-core/package.json +1 -1
  48. package/vona/packages-vona/vona-core/src/lib/mappedClass/type.ts +1 -0
  49. package/vona/packages-vona/vona-core/src/lib/mappedClass/utils.ts +36 -14
  50. package/vona/packages-vona/vona-mock/package.json +1 -1
  51. package/vona/pnpm-lock.yaml +35 -11
  52. package/vona/src/suite/a-demo/modules/demo-basic/package.json +1 -1
  53. package/vona/src/suite/a-home/modules/home-base/package.json +1 -1
  54. package/vona/src/suite/a-home/modules/home-index/package.json +1 -1
  55. package/vona/src/suite/a-home/modules/home-user/package.json +1 -1
  56. package/vona/src/suite/a-training/modules/training-record/package.json +1 -1
  57. package/vona/src/suite/a-training/modules/training-record/src/.metadata/index.ts +232 -3
  58. package/vona/src/suite/a-training/modules/training-record/src/bean/ssrMenu.record.ts +29 -0
  59. package/vona/src/suite/a-training/modules/training-record/src/config/locale/en-us.ts +9 -1
  60. package/vona/src/suite/a-training/modules/training-record/src/config/locale/zh-cn.ts +9 -1
  61. package/vona/src/suite/a-training/modules/training-record/src/controller/record.ts +59 -0
  62. package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectBase.tsx +18 -0
  63. package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectMutate.tsx +17 -0
  64. package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectResItem.tsx +60 -0
  65. package/vona/src/suite/a-training/modules/training-record/src/dto/detailRecordSubjectView.tsx +17 -0
  66. package/vona/src/suite/a-training/modules/training-record/src/dto/recordCreate.tsx +45 -0
  67. package/vona/src/suite/a-training/modules/training-record/src/dto/recordSelectReq.tsx +38 -0
  68. package/vona/src/suite/a-training/modules/training-record/src/dto/recordSelectRes.tsx +11 -0
  69. package/vona/src/suite/a-training/modules/training-record/src/dto/recordSelectResItem.tsx +39 -0
  70. package/vona/src/suite/a-training/modules/training-record/src/dto/recordUpdate.tsx +45 -0
  71. package/vona/src/suite/a-training/modules/training-record/src/dto/recordView.tsx +42 -0
  72. package/vona/src/suite/a-training/modules/training-record/src/entity/record.tsx +23 -6
  73. package/vona/src/suite/a-training/modules/training-record/src/model/record.ts +15 -2
  74. package/vona/src/suite/a-training/modules/training-record/src/service/record.ts +50 -0
  75. package/vona/src/suite/a-training/modules/training-record/test/record.test.ts +138 -0
  76. package/vona/src/suite/a-training/modules/training-recordsubject/package.json +53 -0
  77. package/vona/src/suite/a-training/modules/training-recordsubject/src/.metadata/index.ts +198 -0
  78. package/vona/src/suite/a-training/modules/training-recordsubject/src/.metadata/locales.ts +18 -0
  79. package/vona/src/suite/a-training/modules/training-recordsubject/src/.metadata/this.ts +2 -0
  80. package/vona/src/suite/a-training/modules/training-recordsubject/src/bean/meta.index.ts +12 -0
  81. package/vona/src/suite/a-training/modules/training-recordsubject/src/bean/meta.version.ts +21 -0
  82. package/vona/src/suite/a-training/modules/training-recordsubject/src/config/locale/en-us.ts +9 -0
  83. package/vona/src/suite/a-training/modules/training-recordsubject/src/config/locale/zh-cn.ts +9 -0
  84. package/vona/src/suite/a-training/modules/training-recordsubject/src/entity/subject.tsx +42 -0
  85. package/vona/src/suite/a-training/modules/training-recordsubject/src/index.ts +2 -0
  86. package/vona/src/suite/a-training/modules/training-recordsubject/src/model/subject.ts +10 -0
  87. package/vona/src/suite/a-training/modules/training-recordsubject/tsconfig.build.json +11 -0
  88. package/vona/src/suite/a-training/modules/training-recordsubject/tsconfig.json +7 -0
  89. package/vona/src/suite/a-training/modules/training-student/package.json +1 -1
  90. package/vona/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts +8 -1
  91. package/vona/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts +8 -1
  92. package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordBase.tsx +17 -2
  93. package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordMutate.tsx +12 -17
  94. package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordResItem.tsx +26 -5
  95. package/vona/src/suite/a-training/modules/training-student/src/dto/detailRecordView.tsx +12 -14
  96. package/vona/src/suite/a-training/modules/training-student/src/dto/studentCreate.tsx +6 -4
  97. package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectReq.tsx +3 -6
  98. package/vona/src/suite/a-training/modules/training-student/src/dto/studentSummary.tsx +1 -1
  99. package/vona/src/suite/a-training/modules/training-student/src/dto/studentUpdate.tsx +14 -1
  100. package/vona/src/suite/a-training/modules/training-student/src/dto/studentView.tsx +14 -1
  101. package/vona/src/suite/a-training/modules/training-student/src/entity/student.tsx +2 -4
  102. package/vona/src/suite/a-training/modules/training-student/src/service/student.ts +22 -5
  103. package/vona/src/suite/a-training/modules/training-student/test/student.test.ts +69 -15
  104. package/vona/src/suite/a-training/package.json +1 -0
  105. package/vona/src/suite/a-training/tsconfig.json +3 -0
  106. package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/package.json +1 -1
  107. package/vona/src/suite/cabloy-basic/modules/basic-siteweb/package.json +1 -1
  108. package/vona/src/suite-vendor/a-auth/modules/a-auth/package.json +2 -2
  109. package/vona/src/suite-vendor/a-auth/modules/auth-oauth/package.json +2 -2
  110. package/vona/src/suite-vendor/a-auth/modules/auth-simple/package.json +2 -2
  111. package/vona/src/suite-vendor/a-auth/package.json +2 -2
  112. package/vona/src/suite-vendor/a-cabloy/modules/a-cabloy/package.json +2 -2
  113. package/vona/src/suite-vendor/a-cabloy/modules/a-datasharding/package.json +2 -2
  114. package/vona/src/suite-vendor/a-cabloy/modules/a-datasource/package.json +2 -2
  115. package/vona/src/suite-vendor/a-cabloy/modules/a-socket/package.json +2 -2
  116. package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json +2 -2
  117. package/vona/src/suite-vendor/a-cabloy/modules/a-ssrhmr/package.json +2 -2
  118. package/vona/src/suite-vendor/a-cabloy/modules/a-status/package.json +2 -2
  119. package/vona/src/suite-vendor/a-cabloy/package.json +1 -1
  120. package/vona/src/suite-vendor/a-captcha/modules/a-captcha/package.json +2 -2
  121. package/vona/src/suite-vendor/a-captcha/modules/captcha-simple/package.json +2 -2
  122. package/vona/src/suite-vendor/a-captcha/package.json +1 -1
  123. package/vona/src/suite-vendor/a-paypal/modules/a-paypal/package.json +2 -2
  124. package/vona/src/suite-vendor/a-paypal/package.json +1 -1
  125. package/vona/src/suite-vendor/a-vona/modules/a-aspect/package.json +2 -2
  126. package/vona/src/suite-vendor/a-vona/modules/a-aspectutils/package.json +2 -2
  127. package/vona/src/suite-vendor/a-vona/modules/a-bean/package.json +2 -2
  128. package/vona/src/suite-vendor/a-vona/modules/a-beanmutate/package.json +2 -2
  129. package/vona/src/suite-vendor/a-vona/modules/a-body/package.json +2 -2
  130. package/vona/src/suite-vendor/a-vona/modules/a-broadcast/package.json +2 -2
  131. package/vona/src/suite-vendor/a-vona/modules/a-cache/package.json +2 -2
  132. package/vona/src/suite-vendor/a-vona/modules/a-caching/package.json +2 -2
  133. package/vona/src/suite-vendor/a-vona/modules/a-core/package.json +2 -2
  134. package/vona/src/suite-vendor/a-vona/modules/a-election/package.json +2 -2
  135. package/vona/src/suite-vendor/a-vona/modules/a-error/package.json +2 -2
  136. package/vona/src/suite-vendor/a-vona/modules/a-event/package.json +2 -2
  137. package/vona/src/suite-vendor/a-vona/modules/a-executor/package.json +2 -2
  138. package/vona/src/suite-vendor/a-vona/modules/a-hmr/package.json +2 -2
  139. package/vona/src/suite-vendor/a-vona/modules/a-hmrbase/package.json +2 -2
  140. package/vona/src/suite-vendor/a-vona/modules/a-index/package.json +2 -2
  141. package/vona/src/suite-vendor/a-vona/modules/a-instance/package.json +2 -2
  142. package/vona/src/suite-vendor/a-vona/modules/a-jwt/package.json +2 -2
  143. package/vona/src/suite-vendor/a-vona/modules/a-locale/package.json +2 -2
  144. package/vona/src/suite-vendor/a-vona/modules/a-logger/package.json +2 -2
  145. package/vona/src/suite-vendor/a-vona/modules/a-mail/package.json +2 -2
  146. package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/package.json +2 -2
  147. package/vona/src/suite-vendor/a-vona/modules/a-menu/package.json +2 -2
  148. package/vona/src/suite-vendor/a-vona/modules/a-meta/package.json +2 -2
  149. package/vona/src/suite-vendor/a-vona/modules/a-onion/package.json +2 -2
  150. package/vona/src/suite-vendor/a-vona/modules/a-openapi/package.json +2 -2
  151. package/vona/src/suite-vendor/a-vona/modules/a-openapischema/package.json +2 -2
  152. package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/package.json +2 -2
  153. package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/src/lib/const/decorator.ts +3 -1
  154. package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/src/lib/schema/makeSchemaLikes.ts +21 -17
  155. package/vona/src/suite-vendor/a-vona/modules/a-openapiutils/src/lib/utils.ts +44 -2
  156. package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json +2 -2
  157. package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoGet.ts +6 -2
  158. package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoMutate.ts +13 -4
  159. package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/utils.ts +1 -1
  160. package/vona/src/suite-vendor/a-vona/modules/a-orm/src/service/relations_.ts +37 -16
  161. package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/package.json +2 -2
  162. package/vona/src/suite-vendor/a-vona/modules/a-ormutils/package.json +2 -2
  163. package/vona/src/suite-vendor/a-vona/modules/a-permission/package.json +2 -2
  164. package/vona/src/suite-vendor/a-vona/modules/a-play/package.json +2 -2
  165. package/vona/src/suite-vendor/a-vona/modules/a-printtip/package.json +2 -2
  166. package/vona/src/suite-vendor/a-vona/modules/a-queue/package.json +2 -2
  167. package/vona/src/suite-vendor/a-vona/modules/a-redis/package.json +2 -2
  168. package/vona/src/suite-vendor/a-vona/modules/a-redlock/package.json +2 -2
  169. package/vona/src/suite-vendor/a-vona/modules/a-runtime/package.json +2 -2
  170. package/vona/src/suite-vendor/a-vona/modules/a-schedule/package.json +2 -2
  171. package/vona/src/suite-vendor/a-vona/modules/a-security/package.json +2 -2
  172. package/vona/src/suite-vendor/a-vona/modules/a-serialization/package.json +2 -2
  173. package/vona/src/suite-vendor/a-vona/modules/a-startup/package.json +2 -2
  174. package/vona/src/suite-vendor/a-vona/modules/a-static/package.json +2 -2
  175. package/vona/src/suite-vendor/a-vona/modules/a-summer/package.json +2 -2
  176. package/vona/src/suite-vendor/a-vona/modules/a-swagger/package.json +2 -2
  177. package/vona/src/suite-vendor/a-vona/modules/a-upload/package.json +2 -2
  178. package/vona/src/suite-vendor/a-vona/modules/a-user/package.json +2 -2
  179. package/vona/src/suite-vendor/a-vona/modules/a-validation/package.json +2 -2
  180. package/vona/src/suite-vendor/a-vona/modules/a-version/package.json +2 -2
  181. package/vona/src/suite-vendor/a-vona/modules/a-vona/package.json +2 -2
  182. package/vona/src/suite-vendor/a-vona/modules/a-web/package.json +2 -2
  183. package/vona/src/suite-vendor/a-vona/modules/a-web/src/lib/decorator/bean.ts +26 -5
  184. package/vona/src/suite-vendor/a-vona/modules/a-worker/package.json +2 -2
  185. package/vona/src/suite-vendor/a-vona/modules/a-zod/package.json +2 -2
  186. package/vona/src/suite-vendor/a-vona/package.json +1 -1
  187. package/zova/packages-cli/cli/package.json +3 -3
  188. package/zova/packages-cli/cli-set-front/cli/templates/create/component/boilerplateDetailsActionBulk/controller.tsx_ +31 -0
  189. package/zova/packages-cli/cli-set-front/cli/templates/create/module/boilerplate/_package.json +1 -1
  190. package/zova/packages-cli/cli-set-front/cli/templates/rest/component.ts +21 -0
  191. package/zova/packages-cli/cli-set-front/cli/templates/rest/render.ts +4 -0
  192. package/zova/packages-cli/cli-set-front/package.json +3 -3
  193. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.create.bean.ts +2 -6
  194. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.create.mock.ts +2 -6
  195. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.create.module.ts +3 -6
  196. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.create.suite.ts +1 -1
  197. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.asset.ts +2 -6
  198. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.config.ts +2 -6
  199. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.constant.ts +2 -6
  200. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.error.ts +2 -6
  201. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.icon.ts +2 -6
  202. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.lib.ts +2 -6
  203. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.locale.ts +2 -6
  204. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.main.ts +2 -6
  205. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.mainSys.ts +2 -6
  206. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.monkey.ts +2 -6
  207. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.monkeySys.ts +2 -6
  208. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.init.types.ts +2 -6
  209. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.config.ts +1 -4
  210. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.generate.ts +2 -2
  211. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.anotherRender.ts +2 -6
  212. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.anotherStyle.ts +2 -6
  213. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.componentEmits.ts +2 -6
  214. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.componentGeneric.ts +2 -6
  215. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.componentModel.ts +2 -6
  216. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.componentProps.ts +2 -6
  217. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.componentSlots.ts +2 -6
  218. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.firstRender.ts +2 -6
  219. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.firstStyle.ts +2 -6
  220. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.pageParams.ts +2 -6
  221. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.pageQuery.ts +2 -6
  222. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.renameComponent.ts +2 -6
  223. package/zova/packages-cli/cli-set-front/src/lib/bean/cli.tools.metadata.ts +1 -2
  224. package/zova/packages-cli/cli-set-front/src/lib/common/cliCreateComponent.ts +2 -6
  225. package/zova/packages-cli/cli-set-front/src/lib/common/cliCreatePage.ts +2 -6
  226. package/zova/packages-zova/zova/package.json +2 -2
  227. package/zova/pnpm-lock.yaml +695 -791
  228. package/zova/src/suite/a-demo/modules/demo-basic/package.json +1 -1
  229. package/zova/src/suite/a-demo/modules/demo-todo/package.json +1 -1
  230. package/zova/src/suite/a-devui/modules/devui-adapter/package.json +1 -1
  231. package/zova/src/suite/a-home/modules/home-api/package.json +1 -1
  232. package/zova/src/suite/a-home/modules/home-base/package.json +1 -1
  233. package/zova/src/suite/a-home/modules/home-icon/package.json +1 -1
  234. package/zova/src/suite/a-home/modules/home-indexadmin/package.json +1 -1
  235. package/zova/src/suite/a-home/modules/home-indexweb/package.json +1 -1
  236. package/zova/src/suite/a-home/modules/home-layoutadmin/package.json +1 -1
  237. package/zova/src/suite/a-home/modules/home-layoutempty/package.json +1 -1
  238. package/zova/src/suite/a-home/modules/home-layoutweb/package.json +1 -1
  239. package/zova/src/suite/a-home/modules/home-login/package.json +1 -1
  240. package/zova/src/suite/a-home/modules/home-passport/package.json +1 -1
  241. package/zova/src/suite/a-home/modules/home-theme/package.json +1 -1
  242. package/zova/src/suite/a-training/modules/training-student/package.json +3 -2
  243. package/zova/src/suite/cabloy-basic/modules/basic-adapter/package.json +1 -1
  244. package/zova/src/suite/cabloy-basic/modules/basic-app/package.json +1 -1
  245. package/zova/src/suite/cabloy-basic/modules/basic-app/src/bean/behavior.appModal.tsx +131 -13
  246. package/zova/src/suite/cabloy-basic/modules/basic-app/src/config/config.ts +15 -0
  247. package/zova/src/suite/cabloy-basic/modules/basic-app/src/service/appModal.ts +23 -5
  248. package/zova/src/suite/cabloy-basic/modules/basic-app/src/types/appModal.ts +30 -4
  249. package/zova/src/suite/cabloy-basic/modules/basic-captcha/package.json +1 -1
  250. package/zova/src/suite/cabloy-basic/modules/basic-commands/package.json +1 -1
  251. package/zova/src/suite/cabloy-basic/modules/basic-commandssync/package.json +1 -1
  252. package/zova/src/suite/cabloy-basic/modules/basic-currency/package.json +1 -1
  253. package/zova/src/suite/cabloy-basic/modules/basic-date/package.json +1 -1
  254. package/zova/src/suite/cabloy-basic/modules/basic-details/package.json +7 -2
  255. package/zova/src/suite/cabloy-basic/modules/basic-details/src/.metadata/component/blockForm.ts +31 -0
  256. package/zova/src/suite/cabloy-basic/modules/basic-details/src/.metadata/index.ts +149 -2
  257. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/command.delete.tsx +47 -0
  258. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/tableCell.actionDelete.tsx +52 -0
  259. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/tableCell.actionOperationsRow.tsx +44 -6
  260. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/tableCell.actionUpdate.tsx +73 -0
  261. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/tableCell.actionView.tsx +64 -0
  262. package/zova/src/suite/cabloy-basic/modules/basic-details/src/bean/tableCell.lineNumber.tsx +30 -0
  263. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/actionCreate/controller.tsx +29 -5
  264. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/blockDetails/controller.tsx +28 -12
  265. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/blockForm/controller.tsx +53 -0
  266. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/blockTable/controller.tsx +7 -2
  267. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/blockToolbarBulk/controller.tsx +3 -1
  268. package/zova/src/suite/cabloy-basic/modules/basic-details/src/component/formFieldDetails/controller.tsx +24 -12
  269. package/zova/src/suite/cabloy-basic/modules/basic-details/src/config/locale/en-us.ts +4 -0
  270. package/zova/src/suite/cabloy-basic/modules/basic-details/src/config/locale/zh-cn.ts +4 -0
  271. package/zova/src/suite/cabloy-basic/modules/basic-details/src/index.ts +1 -0
  272. package/zova/src/suite/cabloy-basic/modules/basic-details/src/lib/index.ts +1 -0
  273. package/zova/src/suite/cabloy-basic/modules/basic-details/src/lib/utils.ts +12 -0
  274. package/zova/src/suite/cabloy-basic/modules/basic-details/src/service/detail.tsx +172 -0
  275. package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/detail.ts +18 -0
  276. package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/details.ts +11 -0
  277. package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/dialogForm.ts +22 -0
  278. package/zova/src/suite/cabloy-basic/modules/basic-details/src/types/index.ts +2 -0
  279. package/zova/src/suite/cabloy-basic/modules/basic-form/package.json +1 -1
  280. package/zova/src/suite/cabloy-basic/modules/basic-input/package.json +1 -1
  281. package/zova/src/suite/cabloy-basic/modules/basic-page/package.json +1 -1
  282. package/zova/src/suite/cabloy-basic/modules/basic-pageentry/package.json +1 -1
  283. package/zova/src/suite/cabloy-basic/modules/basic-resource/package.json +52 -0
  284. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/.metadata/component/formFieldResourcePicker.ts +31 -0
  285. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/.metadata/index.ts +103 -0
  286. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/.metadata/this.ts +2 -0
  287. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/bean/tableCell.resourcePicker.tsx +46 -0
  288. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/component/formFieldResourcePicker/controller.tsx +157 -0
  289. package/zova/src/suite/cabloy-basic/modules/basic-resource/src/index.ts +1 -0
  290. package/zova/src/suite/cabloy-basic/modules/basic-resource/tsconfig.build.json +13 -0
  291. package/zova/src/suite/cabloy-basic/modules/basic-resource/tsconfig.json +5 -0
  292. package/zova/src/suite/cabloy-basic/modules/basic-select/package.json +1 -1
  293. package/zova/src/suite/cabloy-basic/modules/basic-table/package.json +1 -1
  294. package/zova/src/suite/cabloy-basic/modules/basic-text/package.json +1 -1
  295. package/zova/src/suite/cabloy-basic/package.json +1 -0
  296. package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json +2 -2
  297. package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/page/entry/controller.tsx +1 -2
  298. package/zova/src/suite-vendor/a-cabloy/package.json +2 -2
  299. package/zova/src/suite-vendor/a-zova/modules/a-api/package.json +2 -2
  300. package/zova/src/suite-vendor/a-zova/modules/a-app/package.json +2 -2
  301. package/zova/src/suite-vendor/a-zova/modules/a-bean/package.json +2 -2
  302. package/zova/src/suite-vendor/a-zova/modules/a-behavior/package.json +2 -2
  303. package/zova/src/suite-vendor/a-zova/modules/a-behaviors/package.json +2 -2
  304. package/zova/src/suite-vendor/a-zova/modules/a-boundary/package.json +2 -2
  305. package/zova/src/suite-vendor/a-zova/modules/a-command/cli/command/boilerplate/{{sceneName}}.{{beanName}}.tsx_ +6 -1
  306. package/zova/src/suite-vendor/a-zova/modules/a-command/cli/commandBulk/boilerplate/{{sceneName}}.{{beanName}}.tsx_ +6 -1
  307. package/zova/src/suite-vendor/a-zova/modules/a-command/cli/commandDetailsRow/boilerplate/{{sceneName}}.{{beanName}}.tsx_ +20 -0
  308. package/zova/src/suite-vendor/a-zova/modules/a-command/cli/commandRow/boilerplate/{{sceneName}}.{{beanName}}.tsx_ +6 -1
  309. package/zova/src/suite-vendor/a-zova/modules/a-command/package.json +4 -3
  310. package/zova/src/suite-vendor/a-zova/modules/a-command/src/types/command.ts +2 -0
  311. package/zova/src/suite-vendor/a-zova/modules/a-fetch/package.json +2 -2
  312. package/zova/src/suite-vendor/a-zova/modules/a-form/package.json +2 -2
  313. package/zova/src/suite-vendor/a-zova/modules/a-form/src/component/form/controller.tsx +1 -0
  314. package/zova/src/suite-vendor/a-zova/modules/a-icon/package.json +2 -2
  315. package/zova/src/suite-vendor/a-zova/modules/a-interceptor/package.json +2 -2
  316. package/zova/src/suite-vendor/a-zova/modules/a-logger/package.json +2 -2
  317. package/zova/src/suite-vendor/a-zova/modules/a-meta/package.json +2 -2
  318. package/zova/src/suite-vendor/a-zova/modules/a-model/package.json +2 -2
  319. package/zova/src/suite-vendor/a-zova/modules/a-model/src/bean/bean.model/bean.model.useQuery.ts +2 -1
  320. package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json +3 -3
  321. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/lib/schema.ts +20 -4
  322. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/model/sdk.ts +4 -0
  323. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/action.ts +2 -1
  324. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/detail.ts +10 -0
  325. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/details.ts +4 -1
  326. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/detail/index.ts +1 -0
  327. package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/rest.ts +2 -0
  328. package/zova/src/suite-vendor/a-zova/modules/a-router/package.json +2 -2
  329. package/zova/src/suite-vendor/a-zova/modules/a-routerstack/package.json +2 -2
  330. package/zova/src/suite-vendor/a-zova/modules/a-routertabs/package.json +2 -2
  331. package/zova/src/suite-vendor/a-zova/modules/a-ssr/package.json +2 -2
  332. package/zova/src/suite-vendor/a-zova/modules/a-ssrhmr/package.json +2 -2
  333. package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/package.json +2 -2
  334. package/zova/src/suite-vendor/a-zova/modules/a-style/package.json +2 -2
  335. package/zova/src/suite-vendor/a-zova/modules/a-table/cli/detailsActionRow/boilerplate/{{sceneName}}.{{beanName}}.tsx_ +24 -0
  336. package/zova/src/suite-vendor/a-zova/modules/a-table/package.json +4 -3
  337. package/zova/src/suite-vendor/a-zova/modules/a-table/src/component/table/controller.tsx +5 -3
  338. package/zova/src/suite-vendor/a-zova/modules/a-zod/package.json +2 -2
  339. package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json +3 -3
  340. package/zova/src/suite-vendor/a-zova/package.json +26 -26
@@ -1,8 +1,13 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
+ import { Api, v } from 'vona-module-a-openapiutils';
3
4
  import { $Dto } from 'vona-module-a-orm';
4
5
  import { Dto } from 'vona-module-a-web';
5
- import { ModelRecord } from 'vona-module-training-record';
6
+ import {
7
+ DtoDetailRecordSubjectMutate,
8
+ DtoDetailRecordSubjectResItem,
9
+ ModelRecord,
10
+ } from 'vona-module-training-record';
6
11
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
12
 
8
13
  import { DtoDetailRecordBase } from './detailRecordBase.tsx';
@@ -10,22 +15,12 @@ import { DtoDetailRecordBase } from './detailRecordBase.tsx';
10
15
  export interface IDtoOptionsDetailRecordMutate extends IDecoratorDtoOptions {}
11
16
 
12
17
  @Dto<IDtoOptionsDetailRecordMutate>({
13
- blocks: [
14
- ZovaRender.block('basic-pageentry:blockPageEntry', {
15
- blocks: [
16
- ZovaRender.block('basic-pageentry:blockForm'),
17
- ZovaRender.block('basic-pageentry:blockToolbarRow', {
18
- actions: [
19
- ZovaRender.formActionRow('basic-form:actionSubmit', {
20
- permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
21
- }),
22
- ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
23
- ],
24
- }),
25
- ],
26
- }),
27
- ],
18
+ blocks: [ZovaRender.block('basic-details:blockForm')],
28
19
  })
29
20
  export class DtoDetailRecordMutate extends $Dto.mutate(() => ModelRecord, {
30
21
  dtoClass: DtoDetailRecordBase,
31
- }) {}
22
+ include: { trainingRecordSubjects: { dtoClass: DtoDetailRecordSubjectMutate } },
23
+ }) {
24
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
25
+ _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];
26
+ }
@@ -1,6 +1,6 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
- import { Api, v } from 'vona-module-a-openapiutils';
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
4
  import { $Dto } from 'vona-module-a-orm';
5
5
  import { Dto } from 'vona-module-a-web';
6
6
  import { ModelRecord } from 'vona-module-training-record';
@@ -16,23 +16,44 @@ export interface IDtoOptionsDetailRecordResItem extends IDecoratorDtoOptions {}
16
16
  ZovaRender.block('basic-details:blockDetails', {
17
17
  blocks: [
18
18
  ZovaRender.block('basic-details:blockToolbarBulk', {
19
- actions: [ZovaRender.detailsActionBulk('basic-details:actionCreate')],
19
+ actions: [
20
+ ZovaRender.detailsActionBulk('basic-details:actionCreate', {
21
+ dialogOptions: { title: $locale('AddTrainingRecord') },
22
+ permission: { formScene: ['create', 'edit'] },
23
+ }),
24
+ ],
20
25
  }),
21
26
  ZovaRender.block('basic-details:blockTable'),
22
27
  ],
23
28
  }),
24
29
  ],
30
+ fields: {
31
+ name: $makeMetadata(
32
+ ZovaRender.cell('basic-details:actionView', {
33
+ dialogOptions: { title: $locale('ViewTrainingRecord') },
34
+ }),
35
+ ),
36
+ },
25
37
  })
26
38
  export class DtoDetailRecordResItem extends $Dto.get(() => ModelRecord, {
27
39
  dtoClass: DtoDetailRecordBase,
40
+ include: { trainingRecordSubjects: false },
28
41
  }) {
42
+ @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('basic-details:lineNumber'))
43
+ _lineNumber?: number;
44
+
29
45
  @Api.field(
30
46
  v.title($locale('Operations')),
31
47
  ZovaRender.order(1, 'max'),
32
- ZovaRender.cell('basic-table:actionOperationsRow', {
48
+ ZovaRender.cell('basic-details:actionOperationsRow', {
33
49
  actions: [
34
- ZovaRender.tableActionRow('basic-table:actionUpdate'),
35
- ZovaRender.tableActionRow('basic-table:actionDelete'),
50
+ ZovaRender.detailsActionRow('basic-details:actionUpdate', {
51
+ dialogOptions: { title: $locale('EditTrainingRecord') },
52
+ permission: { formScene: ['create', 'edit'] },
53
+ }),
54
+ ZovaRender.detailsActionRow('basic-details:actionDelete', {
55
+ permission: { formScene: ['create', 'edit'] },
56
+ }),
36
57
  ],
37
58
  }),
38
59
  )
@@ -1,8 +1,13 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
+ import { Api, v } from 'vona-module-a-openapiutils';
3
4
  import { $Dto } from 'vona-module-a-orm';
4
5
  import { Dto } from 'vona-module-a-web';
5
- import { ModelRecord } from 'vona-module-training-record';
6
+ import {
7
+ DtoDetailRecordSubjectResItem,
8
+ DtoDetailRecordSubjectView,
9
+ ModelRecord,
10
+ } from 'vona-module-training-record';
6
11
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
12
 
8
13
  import { DtoDetailRecordBase } from './detailRecordBase.tsx';
@@ -10,19 +15,12 @@ import { DtoDetailRecordBase } from './detailRecordBase.tsx';
10
15
  export interface IDtoOptionsDetailRecordView extends IDecoratorDtoOptions {}
11
16
 
12
17
  @Dto<IDtoOptionsDetailRecordView>({
13
- blocks: [
14
- ZovaRender.block('basic-pageentry:blockPageEntry', {
15
- blocks: [
16
- ZovaRender.block('basic-pageentry:blockForm'),
17
- ZovaRender.block('basic-pageentry:blockToolbarRow', {
18
- actions: [
19
- ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
20
- ],
21
- }),
22
- ],
23
- }),
24
- ],
18
+ blocks: [ZovaRender.block('basic-details:blockForm')],
25
19
  })
26
20
  export class DtoDetailRecordView extends $Dto.get(() => ModelRecord, {
27
21
  dtoClass: DtoDetailRecordBase,
28
- }) {}
22
+ include: { trainingRecordSubjects: { dtoClass: DtoDetailRecordSubjectView } },
23
+ }) {
24
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
25
+ _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];
26
+ }
@@ -1,6 +1,6 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
- import { $makeSchema, v } from 'vona-module-a-openapiutils';
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
4
  import { $Dto } from 'vona-module-a-orm';
5
5
  import { Dto } from 'vona-module-a-web';
6
6
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
@@ -29,15 +29,17 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions {}
29
29
  }),
30
30
  ],
31
31
  fields: {
32
- trainingRecords: $makeSchema(
32
+ trainingRecords: $makeMetadata(
33
33
  v.title($locale('TrainingRecords')),
34
34
  ZovaRender.order(5),
35
35
  ZovaRender.field('basic-details:formFieldDetails'),
36
36
  v.optional(),
37
- v.array(DtoDetailRecordResItem),
38
37
  ),
39
38
  },
40
39
  })
41
40
  export class DtoStudentCreate extends $Dto.create(() => ModelStudent, {
42
41
  include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
43
- }) {}
42
+ }) {
43
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
44
+ _trainingRecords?: DtoDetailRecordResItem[];
45
+ }
@@ -7,7 +7,7 @@ import z from 'zod';
7
7
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
8
8
 
9
9
  import { $locale } from '../.metadata/locales.ts';
10
- import { EntityStudent, studentLevelItems, studentLevelSchema } from '../entity/student.tsx';
10
+ import { EntityStudent, studentLevelItems } from '../entity/student.tsx';
11
11
 
12
12
  export interface IDtoOptionsStudentSelectReq extends IDecoratorDtoOptions {}
13
13
 
@@ -17,17 +17,14 @@ export interface IDtoOptionsStudentSelectReq extends IDecoratorDtoOptions {}
17
17
  name: $makeSchema(v.optional(), z.string()),
18
18
  level: $makeSchema(
19
19
  v.title($locale('Level')),
20
- v.optional(),
21
20
  ZovaRender.field('basic-select:formFieldSelect', {
22
21
  items: studentLevelItems,
23
22
  // Keep placeholder undefined so the filter select gets a real empty option
24
23
  // instead of a disabled placeholder, allowing users to clear the filter.
25
24
  placeholder: undefined,
26
25
  }),
27
- z.preprocess(value => {
28
- if (typeof value === 'string') return Number.parseInt(value);
29
- return value;
30
- }, studentLevelSchema),
26
+ v.optional(),
27
+ z.number(),
31
28
  ),
32
29
  createdAt: $makeSchema(
33
30
  ZovaRender.field('basic-date:formFieldDateRange'),
@@ -26,7 +26,7 @@ export class DtoStudentSummary {
26
26
  mobile: string;
27
27
 
28
28
  @Api.field(v.title($locale('Level')))
29
- level: 1 | 2 | 3;
29
+ level: number;
30
30
 
31
31
  @Api.field(v.title($locale('LevelTitle')))
32
32
  levelTitle: string;
@@ -1,11 +1,14 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
3
4
  import { $Dto } from 'vona-module-a-orm';
4
5
  import { Dto } from 'vona-module-a-web';
5
6
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
6
7
 
8
+ import { $locale } from '../.metadata/locales.ts';
7
9
  import { ModelStudent } from '../model/student.ts';
8
10
  import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
11
+ import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
9
12
 
10
13
  export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
11
14
 
@@ -25,7 +28,17 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions {}
25
28
  ],
26
29
  }),
27
30
  ],
31
+ fields: {
32
+ trainingRecords: $makeMetadata(
33
+ v.title($locale('TrainingRecords')),
34
+ ZovaRender.order(5),
35
+ ZovaRender.field('basic-details:formFieldDetails'),
36
+ ),
37
+ },
28
38
  })
29
39
  export class DtoStudentUpdate extends $Dto.update(() => ModelStudent, {
30
40
  include: { trainingRecords: { dtoClass: DtoDetailRecordMutate } },
31
- }) {}
41
+ }) {
42
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
43
+ _trainingRecords?: DtoDetailRecordResItem[];
44
+ }
@@ -1,10 +1,13 @@
1
1
  import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
2
 
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
3
4
  import { $Dto } from 'vona-module-a-orm';
4
5
  import { Dto } from 'vona-module-a-web';
5
6
  import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
6
7
 
8
+ import { $locale } from '../.metadata/locales.ts';
7
9
  import { ModelStudent } from '../model/student.ts';
10
+ import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
8
11
  import { DtoDetailRecordView } from './detailRecordView.tsx';
9
12
 
10
13
  export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
@@ -22,7 +25,17 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions {}
22
25
  ],
23
26
  }),
24
27
  ],
28
+ fields: {
29
+ trainingRecords: $makeMetadata(
30
+ v.title($locale('TrainingRecords')),
31
+ ZovaRender.order(5),
32
+ ZovaRender.field('basic-details:formFieldDetails'),
33
+ ),
34
+ },
25
35
  })
26
36
  export class DtoStudentView extends $Dto.get(() => ModelStudent, {
27
37
  include: { trainingRecords: { dtoClass: DtoDetailRecordView } },
28
- }) {}
38
+ }) {
39
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordResItem))
40
+ _trainingRecords?: DtoDetailRecordResItem[];
41
+ }
@@ -7,8 +7,6 @@ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
7
 
8
8
  import { $locale } from '../.metadata/locales.ts';
9
9
 
10
- export const studentLevelSchema = z.union([z.literal(1), z.literal(2), z.literal(3)]);
11
-
12
10
  export const studentLevelItems = [
13
11
  { value: 1, title: $locale('LevelBeginner') },
14
12
  { value: 2, title: $locale('LevelIntermediate') },
@@ -78,7 +76,7 @@ export class EntityStudent extends EntityBase {
78
76
  }),
79
77
  // Tutorial 4 custom table cell renderer example used by the current implementation.
80
78
  ZovaRender.cell('training-student:level', { items: studentLevelItems }),
81
- studentLevelSchema,
79
+ z.union([z.literal(1), z.literal(2), z.literal(3)]),
82
80
  )
83
- level: 1 | 2 | 3;
81
+ level: number;
84
82
  }
@@ -12,10 +12,18 @@ import type { DtoStudentView } from '../dto/studentView.tsx';
12
12
  import type { EntityStudent } from '../entity/student.tsx';
13
13
  import type { ModelStudent } from '../model/student.ts';
14
14
 
15
+ function getStudentRecordSubjectsInclude(): {
16
+ trainingRecords: { include: { trainingRecordSubjects: true } };
17
+ } {
18
+ return { trainingRecords: { include: { trainingRecordSubjects: true } } };
19
+ }
20
+
15
21
  @Service()
16
22
  export class ServiceStudent extends BeanBase {
17
23
  async create(student: DtoStudentCreate): Promise<EntityStudent> {
18
- return await this.scope.model.student.insert(student);
24
+ return await this.scope.model.student.insert(student, {
25
+ include: getStudentRecordSubjectsInclude(),
26
+ });
19
27
  }
20
28
 
21
29
  async select(params?: IQueryParams<ModelStudent>): Promise<DtoStudentSelectRes> {
@@ -23,11 +31,15 @@ export class ServiceStudent extends BeanBase {
23
31
  }
24
32
 
25
33
  async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
26
- return await this.scope.model.student.getById(id, { include: { trainingRecords: true } });
34
+ return await this.scope.model.student.getById(id, {
35
+ include: getStudentRecordSubjectsInclude(),
36
+ });
27
37
  }
28
38
 
29
39
  async update(id: TableIdentity, student: DtoStudentUpdate) {
30
- return await this.scope.model.student.updateById(id, student);
40
+ return await this.scope.model.student.updateById(id, student, {
41
+ include: getStudentRecordSubjectsInclude(),
42
+ });
31
43
  }
32
44
 
33
45
  async summary(id: TableIdentity): Promise<DtoStudentSummary | undefined> {
@@ -48,10 +60,15 @@ export class ServiceStudent extends BeanBase {
48
60
  }
49
61
 
50
62
  async delete(id: TableIdentity) {
51
- return await this.scope.model.student.deleteById(id);
63
+ return await this.scope.model.student.deleteById(id, {
64
+ include: getStudentRecordSubjectsInclude(),
65
+ });
52
66
  }
53
67
 
54
68
  async deleteForce(id: TableIdentity) {
55
- return await this.scope.model.student.deleteById(id, { disableDeleted: true });
69
+ return await this.scope.model.student.deleteById(id, {
70
+ disableDeleted: true,
71
+ include: getStudentRecordSubjectsInclude(),
72
+ });
56
73
  }
57
74
  }
@@ -18,18 +18,26 @@ describe('student.test.ts', () => {
18
18
  const maskedMobile = '138****5678';
19
19
  const mobileUpdate = '13987654321';
20
20
  const maskedMobileUpdate = '139****4321';
21
- const data: DtoStudentCreate = {
21
+ const data = {
22
22
  name: '__Tom__',
23
23
  description: 'This is a test',
24
24
  mobile,
25
25
  level: 1,
26
- };
27
- const dataUpdate: DtoStudentUpdate = {
28
- name: '__TomNew__',
29
- description: 'This is a test',
30
- mobile: mobileUpdate,
31
- level: 2,
32
- };
26
+ trainingRecords: [
27
+ {
28
+ name: '__Record__',
29
+ score: 88,
30
+ description: 'This is a record',
31
+ trainingRecordSubjects: [
32
+ {
33
+ name: '__Math__',
34
+ score: 95,
35
+ description: 'Math subject',
36
+ },
37
+ ],
38
+ },
39
+ ],
40
+ } as any as DtoStudentCreate;
33
41
  // login
34
42
  await app.bean.passport.signinMock();
35
43
  // create
@@ -64,20 +72,66 @@ describe('student.test.ts', () => {
64
72
  selectResByLevel.list.every(item => item.level === data.level),
65
73
  true,
66
74
  );
75
+ // findOne and nested create check
76
+ let student: any = await app.bean.executor.performAction('get', '/training/student/:id', {
77
+ params: { id: studentId },
78
+ });
79
+ const record = student.trainingRecords?.[0];
80
+ const recordSubject = record?.trainingRecordSubjects?.[0];
81
+ assert.equal(student.trainingRecords?.length, 1);
82
+ assert.equal(record?.name, '__Record__');
83
+ assert.equal(record?.trainingRecordSubjects?.length, 1);
84
+ assert.equal(recordSubject?.name, '__Math__');
85
+ assert.equal(recordSubject?.score, 95);
67
86
  // update
87
+ const dataUpdate = {
88
+ name: '__TomNew__',
89
+ description: 'This is a test',
90
+ mobile: mobileUpdate,
91
+ level: 2,
92
+ trainingRecords: [
93
+ {
94
+ id: record.id,
95
+ name: '__RecordNew__',
96
+ score: 89,
97
+ description: 'This is an updated record',
98
+ trainingRecordSubjects: [
99
+ {
100
+ id: recordSubject.id,
101
+ name: '__MathNew__',
102
+ score: 96,
103
+ description: 'Updated math subject',
104
+ },
105
+ {
106
+ name: '__English__',
107
+ score: 87,
108
+ description: 'English subject',
109
+ },
110
+ ],
111
+ },
112
+ ],
113
+ } as any as DtoStudentUpdate;
68
114
  await app.bean.executor.performAction('patch', '/training/student/:id', {
69
115
  params: { id: studentId },
70
116
  body: dataUpdate,
71
117
  });
72
- // findOne
73
- let student: EntityStudent = await app.bean.executor.performAction(
74
- 'get',
75
- '/training/student/:id',
76
- { params: { id: studentId } },
77
- );
118
+ // findOne after nested update
119
+ student = await app.bean.executor.performAction('get', '/training/student/:id', {
120
+ params: { id: studentId },
121
+ });
122
+ const updatedRecord = student.trainingRecords?.[0];
123
+ const [updatedMathSubject, updatedEnglishSubject] =
124
+ updatedRecord?.trainingRecordSubjects ?? [];
78
125
  assert.equal(student.name, dataUpdate.name);
79
126
  assert.equal(student.level, dataUpdate.level);
80
127
  assert.equal(student.mobile, maskedMobileUpdate);
128
+ assert.equal(student.trainingRecords?.length, 1);
129
+ assert.equal(updatedRecord?.name, '__RecordNew__');
130
+ assert.equal(updatedRecord?.trainingRecordSubjects?.length, 2);
131
+ assert.equal(updatedMathSubject?.name, '__MathNew__');
132
+ assert.equal(updatedMathSubject?.score, 96);
133
+ assert.equal(updatedEnglishSubject?.name, '__English__');
134
+ assert.equal(updatedEnglishSubject?.score, 87);
81
135
  const studentRaw = await app.bean.scope('training-student').model.student.getById(studentId, {
82
136
  disableDeleted: true,
83
137
  });
@@ -110,7 +164,7 @@ describe('student.test.ts', () => {
110
164
  await app.bean.executor.performAction('delete', '/training/student/deleteForce/:id', {
111
165
  params: { id: studentIdForce },
112
166
  });
113
- const studentForce = await app.bean
167
+ const studentForce: EntityStudent | undefined = await app.bean
114
168
  .scope('training-student')
115
169
  .model.student.getById(studentIdForce, {
116
170
  disableDeleted: true,
@@ -7,6 +7,7 @@
7
7
  "type": "module",
8
8
  "dependencies": {
9
9
  "vona-module-training-record": "^5.0.0",
10
+ "vona-module-training-recordsubject": "^5.0.0",
10
11
  "vona-module-training-student": "^5.0.0"
11
12
  },
12
13
  "title": "a-training"
@@ -7,6 +7,9 @@
7
7
  },
8
8
  {
9
9
  "path": "modules/training-record/tsconfig.build.json"
10
+ },
11
+ {
12
+ "path": "modules/training-recordsubject/tsconfig.build.json"
10
13
  }
11
14
  ],
12
15
  "exclude": ["modules"]
@@ -30,7 +30,7 @@
30
30
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
31
31
  "prepublishOnly": "npm run tsc:publish",
32
32
  "prepack": "clean-package",
33
- "postpack": "clean-package restore && npm run clean"
33
+ "postpack": "clean-package restore"
34
34
  },
35
35
  "devDependencies": {
36
36
  "clean-package": "^2.2.0",
@@ -29,7 +29,7 @@
29
29
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
30
30
  "prepublishOnly": "npm run tsc:publish",
31
31
  "prepack": "clean-package",
32
- "postpack": "clean-package restore && npm run clean"
32
+ "postpack": "clean-package restore"
33
33
  },
34
34
  "dependencies": {},
35
35
  "devDependencies": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-a-auth",
3
- "version": "5.1.15",
3
+ "version": "5.1.18",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -30,7 +30,7 @@
30
30
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
31
31
  "prepublishOnly": "npm run tsc:publish",
32
32
  "prepack": "clean-package",
33
- "postpack": "clean-package restore && npm run clean"
33
+ "postpack": "clean-package restore"
34
34
  },
35
35
  "dependencies": {
36
36
  "passport-oauth2": "^1.8.0"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-auth-oauth",
3
- "version": "5.0.6",
3
+ "version": "5.0.9",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "Vona Module"
@@ -28,7 +28,7 @@
28
28
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
29
29
  "prepublishOnly": "npm run tsc:publish",
30
30
  "prepack": "clean-package",
31
- "postpack": "clean-package restore && npm run clean"
31
+ "postpack": "clean-package restore"
32
32
  },
33
33
  "dependencies": {
34
34
  "passport-github": "^1.1.0"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-auth-simple",
3
- "version": "5.1.10",
3
+ "version": "5.1.13",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -29,7 +29,7 @@
29
29
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
30
30
  "prepublishOnly": "npm run tsc:publish",
31
31
  "prepack": "clean-package",
32
- "postpack": "clean-package restore && npm run clean"
32
+ "postpack": "clean-package restore"
33
33
  },
34
34
  "dependencies": {
35
35
  "password-hash-salt": "workspace:^"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-suite-a-auth",
3
- "version": "5.1.17",
3
+ "version": "5.1.20",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "author": "",
@@ -8,7 +8,7 @@
8
8
  "type": "module",
9
9
  "dependencies": {
10
10
  "vona-module-a-auth": "workspace:^",
11
- "vona-module-auth-oauth": "^5.0.6",
11
+ "vona-module-auth-oauth": "^5.0.9",
12
12
  "vona-module-auth-simple": "workspace:^"
13
13
  },
14
14
  "title": "a-auth"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-a-cabloy",
3
- "version": "5.1.9",
3
+ "version": "5.1.12",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -29,7 +29,7 @@
29
29
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
30
30
  "prepublishOnly": "npm run tsc:publish",
31
31
  "prepack": "clean-package",
32
- "postpack": "clean-package restore && npm run clean"
32
+ "postpack": "clean-package restore"
33
33
  },
34
34
  "devDependencies": {
35
35
  "clean-package": "^2.2.0",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-a-datasharding",
3
- "version": "5.1.9",
3
+ "version": "5.1.12",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -29,7 +29,7 @@
29
29
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
30
30
  "prepublishOnly": "npm run tsc:publish",
31
31
  "prepack": "clean-package",
32
- "postpack": "clean-package restore && npm run clean"
32
+ "postpack": "clean-package restore"
33
33
  },
34
34
  "devDependencies": {
35
35
  "clean-package": "^2.2.0",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-a-datasource",
3
- "version": "5.1.8",
3
+ "version": "5.1.11",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -29,7 +29,7 @@
29
29
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
30
30
  "prepublishOnly": "npm run tsc:publish",
31
31
  "prepack": "clean-package",
32
- "postpack": "clean-package restore && npm run clean"
32
+ "postpack": "clean-package restore"
33
33
  },
34
34
  "devDependencies": {
35
35
  "clean-package": "^2.2.0",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vona-module-a-socket",
3
- "version": "5.1.11",
3
+ "version": "5.1.14",
4
4
  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
5
5
  "description": "",
6
6
  "keywords": [
@@ -30,7 +30,7 @@
30
30
  "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
31
31
  "prepublishOnly": "npm run tsc:publish",
32
32
  "prepack": "clean-package",
33
- "postpack": "clean-package restore && npm run clean"
33
+ "postpack": "clean-package restore"
34
34
  },
35
35
  "dependencies": {
36
36
  "@cabloy/socket": "workspace:^",