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
@@ -0,0 +1,29 @@
1
+ import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
2
+ import type { ISsrSiteOptionsAdmin } from 'vona-module-basic-siteadmin';
3
+
4
+ import { BeanBase } from 'vona';
5
+ import { $order } from 'vona-module-a-openapiutils';
6
+ import { SsrMenu } from 'vona-module-a-ssr';
7
+
8
+ import { $locale } from '../.metadata/locales.ts';
9
+
10
+ export interface ISsrMenuOptionsRecord extends IDecoratorSsrMenuOptions<ISsrSiteOptionsAdmin> {}
11
+
12
+ @SsrMenu<ISsrMenuOptionsRecord>({
13
+ items: {
14
+ record: {
15
+ title: $locale('TrainingRecord'),
16
+ order: $order(2),
17
+ icon: undefined,
18
+ link: 'presetResource',
19
+ meta: {
20
+ params: {
21
+ resource: 'training-record:record',
22
+ },
23
+ },
24
+ group: 'basic-siteadmin:management',
25
+ },
26
+ },
27
+ site: ['basic-siteadmin:admin'],
28
+ })
29
+ export class SsrMenuRecord extends BeanBase {}
@@ -2,6 +2,14 @@ export default {
2
2
  Description: 'Description',
3
3
  Name: 'Name',
4
4
  Operations: 'Operations',
5
- TrainingRecord: 'Training Record',
6
5
  Score: 'Score',
6
+ Student: 'Student',
7
+ TrainingRecord: 'Student Training Record',
8
+ AddTrainingRecord: 'Add Student Training Record',
9
+ EditTrainingRecord: 'Edit Student Training Record',
10
+ ViewTrainingRecord: 'View Student Training Record',
11
+ TrainingRecordSubjects: 'Student Training Record Details',
12
+ AddTrainingRecordSubject: 'Add Student Training Record Detail',
13
+ EditTrainingRecordSubject: 'Edit Student Training Record Detail',
14
+ ViewTrainingRecordSubject: 'View Student Training Record Detail',
7
15
  };
@@ -2,6 +2,14 @@ export default {
2
2
  Description: '描述',
3
3
  Name: '名称',
4
4
  Operations: '操作',
5
- TrainingRecord: '培训记录',
6
5
  Score: '成绩',
6
+ Student: '学生',
7
+ TrainingRecord: '学生培训记录',
8
+ AddTrainingRecord: '添加学生培训记录',
9
+ EditTrainingRecord: '编辑学生培训记录',
10
+ ViewTrainingRecord: '查看学生培训记录',
11
+ TrainingRecordSubjects: '学生培训记录明细',
12
+ AddTrainingRecordSubject: '添加学生培训记录明细',
13
+ EditTrainingRecordSubject: '编辑学生培训记录明细',
14
+ ViewTrainingRecordSubject: '查看学生培训记录明细',
7
15
  };
@@ -0,0 +1,59 @@
1
+ import type { TableIdentity } from 'table-identity';
2
+ import type { IQueryParams } from 'vona-module-a-orm';
3
+ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
4
+
5
+ import { BeanBase } from 'vona';
6
+ import { Core } from 'vona-module-a-core';
7
+ import { Api, Resource, v } from 'vona-module-a-openapiutils';
8
+ import { Arg, Controller, Web } from 'vona-module-a-web';
9
+
10
+ import type { ModelRecord } from '../model/record.ts';
11
+
12
+ import { DtoRecordCreate } from '../dto/recordCreate.tsx';
13
+ import { DtoRecordSelectReq } from '../dto/recordSelectReq.tsx';
14
+ import { DtoRecordSelectRes } from '../dto/recordSelectRes.tsx';
15
+ import { DtoRecordUpdate } from '../dto/recordUpdate.tsx';
16
+ import { DtoRecordView } from '../dto/recordView.tsx';
17
+
18
+ export interface IControllerOptionsRecord extends IDecoratorControllerOptions {}
19
+
20
+ @Controller<IControllerOptionsRecord>('record')
21
+ @Resource()
22
+ export class ControllerRecord extends BeanBase {
23
+ @Web.post()
24
+ @Api.body(v.tableIdentity())
25
+ async create(@Arg.body() record: DtoRecordCreate): Promise<TableIdentity> {
26
+ return (await this.scope.service.record.create(record)).id;
27
+ }
28
+
29
+ @Web.get()
30
+ @Api.body(DtoRecordSelectRes)
31
+ @Core.serializer()
32
+ async select(
33
+ @Arg.filter(DtoRecordSelectReq) params: IQueryParams<ModelRecord>,
34
+ ): Promise<DtoRecordSelectRes> {
35
+ return await this.scope.service.record.select(params);
36
+ }
37
+
38
+ @Web.get(':id')
39
+ @Api.body(v.optional(), v.object(DtoRecordView))
40
+ @Core.serializer()
41
+ async view(
42
+ @Arg.param('id', v.tableIdentity()) id: TableIdentity,
43
+ ): Promise<DtoRecordView | undefined> {
44
+ return await this.scope.service.record.view(id);
45
+ }
46
+
47
+ @Web.patch(':id')
48
+ async update(
49
+ @Arg.param('id', v.tableIdentity()) id: TableIdentity,
50
+ @Arg.body() record: DtoRecordUpdate,
51
+ ) {
52
+ return await this.scope.service.record.update(id, record);
53
+ }
54
+
55
+ @Web.delete(':id')
56
+ async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity) {
57
+ return await this.scope.service.record.delete(id);
58
+ }
59
+ }
@@ -0,0 +1,18 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeMetadata } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ModelSubject } from 'vona-module-training-recordsubject';
7
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
8
+
9
+ export interface IDtoOptionsDetailRecordSubjectBase extends IDecoratorDtoOptions {}
10
+
11
+ @Dto<IDtoOptionsDetailRecordSubjectBase>({
12
+ fields: {
13
+ id: $makeMetadata(ZovaRender.visible(false)),
14
+ },
15
+ })
16
+ export class DtoDetailRecordSubjectBase extends $Dto.get(() => ModelSubject, {
17
+ columns: ['id', 'deleted', 'name', 'score', 'description'],
18
+ }) {}
@@ -0,0 +1,17 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $Dto } from 'vona-module-a-orm';
4
+ import { Dto } from 'vona-module-a-web';
5
+ import { ModelSubject } from 'vona-module-training-recordsubject';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { DtoDetailRecordSubjectBase } from './detailRecordSubjectBase.tsx';
9
+
10
+ export interface IDtoOptionsDetailRecordSubjectMutate extends IDecoratorDtoOptions {}
11
+
12
+ @Dto<IDtoOptionsDetailRecordSubjectMutate>({
13
+ blocks: [ZovaRender.block('basic-details:blockForm')],
14
+ })
15
+ export class DtoDetailRecordSubjectMutate extends $Dto.mutate(() => ModelSubject, {
16
+ dtoClass: DtoDetailRecordSubjectBase,
17
+ }) {}
@@ -0,0 +1,60 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ModelSubject } from 'vona-module-training-recordsubject';
7
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
8
+
9
+ import { $locale } from '../.metadata/locales.ts';
10
+ import { DtoDetailRecordSubjectBase } from './detailRecordSubjectBase.tsx';
11
+
12
+ export interface IDtoOptionsDetailRecordSubjectResItem extends IDecoratorDtoOptions {}
13
+
14
+ @Dto<IDtoOptionsDetailRecordSubjectResItem>({
15
+ blocks: [
16
+ ZovaRender.block('basic-details:blockDetails', {
17
+ blocks: [
18
+ ZovaRender.block('basic-details:blockToolbarBulk', {
19
+ actions: [
20
+ ZovaRender.detailsActionBulk('basic-details:actionCreate', {
21
+ dialogOptions: { title: $locale('AddTrainingRecordSubject') },
22
+ permission: { formScene: ['create', 'edit'] },
23
+ }),
24
+ ],
25
+ }),
26
+ ZovaRender.block('basic-details:blockTable'),
27
+ ],
28
+ }),
29
+ ],
30
+ fields: {
31
+ name: $makeMetadata(
32
+ ZovaRender.cell('basic-details:actionView', {
33
+ dialogOptions: { title: $locale('ViewTrainingRecordSubject') },
34
+ }),
35
+ ),
36
+ },
37
+ })
38
+ export class DtoDetailRecordSubjectResItem extends $Dto.get(() => ModelSubject, {
39
+ dtoClass: DtoDetailRecordSubjectBase,
40
+ }) {
41
+ @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('basic-details:lineNumber'))
42
+ _lineNumber?: number;
43
+
44
+ @Api.field(
45
+ v.title($locale('Operations')),
46
+ ZovaRender.order(1, 'max'),
47
+ ZovaRender.cell('basic-details:actionOperationsRow', {
48
+ actions: [
49
+ ZovaRender.detailsActionRow('basic-details:actionUpdate', {
50
+ dialogOptions: { title: $locale('EditTrainingRecordSubject') },
51
+ permission: { formScene: ['create', 'edit'] },
52
+ }),
53
+ ZovaRender.detailsActionRow('basic-details:actionDelete', {
54
+ permission: { formScene: ['create', 'edit'] },
55
+ }),
56
+ ],
57
+ }),
58
+ )
59
+ _operationsRow?: unknown;
60
+ }
@@ -0,0 +1,17 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $Dto } from 'vona-module-a-orm';
4
+ import { Dto } from 'vona-module-a-web';
5
+ import { ModelSubject } from 'vona-module-training-recordsubject';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { DtoDetailRecordSubjectBase } from './detailRecordSubjectBase.tsx';
9
+
10
+ export interface IDtoOptionsDetailRecordSubjectView extends IDecoratorDtoOptions {}
11
+
12
+ @Dto<IDtoOptionsDetailRecordSubjectView>({
13
+ blocks: [ZovaRender.block('basic-details:blockForm')],
14
+ })
15
+ export class DtoDetailRecordSubjectView extends $Dto.get(() => ModelSubject, {
16
+ dtoClass: DtoDetailRecordSubjectBase,
17
+ }) {}
@@ -0,0 +1,45 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { $locale } from '../.metadata/locales.ts';
9
+ import { ModelRecord } from '../model/record.ts';
10
+ import { DtoDetailRecordSubjectMutate } from './detailRecordSubjectMutate.tsx';
11
+ import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';
12
+
13
+ export interface IDtoOptionsRecordCreate extends IDecoratorDtoOptions {}
14
+
15
+ @Dto<IDtoOptionsRecordCreate>({
16
+ blocks: [
17
+ ZovaRender.block('basic-pageentry:blockPageEntry', {
18
+ blocks: [
19
+ ZovaRender.block('basic-pageentry:blockForm'),
20
+ ZovaRender.block('basic-pageentry:blockToolbarRow', {
21
+ actions: [
22
+ ZovaRender.formActionRow('basic-form:actionSubmit', {
23
+ permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
24
+ }),
25
+ ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
26
+ ],
27
+ }),
28
+ ],
29
+ }),
30
+ ],
31
+ fields: {
32
+ trainingRecordSubjects: $makeMetadata(
33
+ v.title($locale('TrainingRecordSubjects')),
34
+ ZovaRender.order(5),
35
+ ZovaRender.field('basic-details:formFieldDetails'),
36
+ v.optional(),
37
+ ),
38
+ },
39
+ })
40
+ export class DtoRecordCreate extends $Dto.create(() => ModelRecord, {
41
+ include: { trainingRecordSubjects: { dtoClass: DtoDetailRecordSubjectMutate } },
42
+ }) {
43
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
44
+ _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];
45
+ }
@@ -0,0 +1,38 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeSchema, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import z from 'zod';
7
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
8
+
9
+ import { $locale } from '../.metadata/locales.ts';
10
+ import { EntityRecord } from '../entity/record.tsx';
11
+
12
+ export interface IDtoOptionsRecordSelectReq extends IDecoratorDtoOptions {}
13
+
14
+ @Dto<IDtoOptionsRecordSelectReq>({
15
+ openapi: { filter: { table: 'trainingRecord' } },
16
+ fields: {
17
+ name: $makeSchema(v.optional(), z.string()),
18
+ studentId: $makeSchema(
19
+ v.title($locale('Student')),
20
+ // ZovaRender.field('basic-resource:formFieldResourcePicker', {
21
+ // resource: $resourceName('training-student:student'),
22
+ // }),
23
+ v.optional(),
24
+ z.number(),
25
+ ),
26
+ createdAt: $makeSchema(
27
+ ZovaRender.field('basic-date:formFieldDateRange'),
28
+ v.filterTransform('a-web:dateRange'),
29
+ v.optional(),
30
+ z.string(),
31
+ ),
32
+ },
33
+ })
34
+ export class DtoRecordSelectReq extends $Dto.queryPage(EntityRecord, [
35
+ 'name',
36
+ 'studentId',
37
+ 'createdAt',
38
+ ]) {}
@@ -0,0 +1,11 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $Dto } from 'vona-module-a-orm';
4
+ import { Dto } from 'vona-module-a-web';
5
+
6
+ import { DtoRecordSelectResItem } from './recordSelectResItem.tsx';
7
+
8
+ export interface IDtoOptionsRecordSelectRes extends IDecoratorDtoOptions {}
9
+
10
+ @Dto<IDtoOptionsRecordSelectRes>()
11
+ export class DtoRecordSelectRes extends $Dto.listAndCount(DtoRecordSelectResItem) {}
@@ -0,0 +1,39 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { Api, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { $locale } from '../.metadata/locales.ts';
9
+ import { ModelRecord } from '../model/record.ts';
10
+
11
+ export interface IDtoOptionsRecordSelectResItem extends IDecoratorDtoOptions {}
12
+
13
+ @Dto<IDtoOptionsRecordSelectResItem>({
14
+ blocks: [
15
+ ZovaRender.block('basic-page:blockPage', {
16
+ blocks: [
17
+ ZovaRender.block('basic-page:blockFilter'),
18
+ ZovaRender.block('basic-page:blockToolbarBulk', {
19
+ actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
20
+ }),
21
+ ZovaRender.block('basic-page:blockTable'),
22
+ ZovaRender.block('basic-page:blockPager'),
23
+ ],
24
+ }),
25
+ ],
26
+ })
27
+ export class DtoRecordSelectResItem extends $Dto.get(() => ModelRecord) {
28
+ @Api.field(
29
+ v.title($locale('Operations')),
30
+ ZovaRender.order(1, 'max'),
31
+ ZovaRender.cell('basic-table:actionOperationsRow', {
32
+ actions: [
33
+ ZovaRender.tableActionRow('basic-table:actionUpdate'),
34
+ ZovaRender.tableActionRow('basic-table:actionDelete'),
35
+ ],
36
+ }),
37
+ )
38
+ _operationsRow?: unknown;
39
+ }
@@ -0,0 +1,45 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { $locale } from '../.metadata/locales.ts';
9
+ import { ModelRecord } from '../model/record.ts';
10
+ import { DtoDetailRecordSubjectMutate } from './detailRecordSubjectMutate.tsx';
11
+ import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';
12
+
13
+ export interface IDtoOptionsRecordUpdate extends IDecoratorDtoOptions {}
14
+
15
+ @Dto<IDtoOptionsRecordUpdate>({
16
+ blocks: [
17
+ ZovaRender.block('basic-pageentry:blockPageEntry', {
18
+ blocks: [
19
+ ZovaRender.block('basic-pageentry:blockForm'),
20
+ ZovaRender.block('basic-pageentry:blockToolbarRow', {
21
+ actions: [
22
+ ZovaRender.formActionRow('basic-form:actionSubmit', {
23
+ permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
24
+ }),
25
+ ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
26
+ ],
27
+ }),
28
+ ],
29
+ }),
30
+ ],
31
+ fields: {
32
+ trainingRecordSubjects: $makeMetadata(
33
+ v.title($locale('TrainingRecordSubjects')),
34
+ ZovaRender.order(5),
35
+ ZovaRender.field('basic-details:formFieldDetails'),
36
+ v.optional(),
37
+ ),
38
+ },
39
+ })
40
+ export class DtoRecordUpdate extends $Dto.update(() => ModelRecord, {
41
+ include: { trainingRecordSubjects: { dtoClass: DtoDetailRecordSubjectMutate } },
42
+ }) {
43
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
44
+ _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];
45
+ }
@@ -0,0 +1,42 @@
1
+ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
2
+
3
+ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
4
+ import { $Dto } from 'vona-module-a-orm';
5
+ import { Dto } from 'vona-module-a-web';
6
+ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
7
+
8
+ import { $locale } from '../.metadata/locales.ts';
9
+ import { ModelRecord } from '../model/record.ts';
10
+ import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';
11
+ import { DtoDetailRecordSubjectView } from './detailRecordSubjectView.tsx';
12
+
13
+ export interface IDtoOptionsRecordView extends IDecoratorDtoOptions {}
14
+
15
+ @Dto<IDtoOptionsRecordView>({
16
+ blocks: [
17
+ ZovaRender.block('basic-pageentry:blockPageEntry', {
18
+ blocks: [
19
+ ZovaRender.block('basic-pageentry:blockForm'),
20
+ ZovaRender.block('basic-pageentry:blockToolbarRow', {
21
+ actions: [
22
+ ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
23
+ ],
24
+ }),
25
+ ],
26
+ }),
27
+ ],
28
+ fields: {
29
+ trainingRecordSubjects: $makeMetadata(
30
+ v.title($locale('TrainingRecordSubjects')),
31
+ ZovaRender.order(5),
32
+ ZovaRender.field('basic-details:formFieldDetails'),
33
+ v.optional(),
34
+ ),
35
+ },
36
+ })
37
+ export class DtoRecordView extends $Dto.get(() => ModelRecord, {
38
+ include: { trainingRecordSubjects: { dtoClass: DtoDetailRecordSubjectView } },
39
+ }) {
40
+ @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoDetailRecordSubjectResItem))
41
+ _trainingRecordSubjects?: DtoDetailRecordSubjectResItem[];
42
+ }
@@ -28,15 +28,32 @@ export interface IEntityOptionsRecord extends IDecoratorEntityOptions {}
28
28
  },
29
29
  })
30
30
  export class EntityRecord extends EntityBase {
31
- @Api.field(v.required(), ZovaRender.visible(false))
32
- studentId: TableIdentity;
33
-
34
- @Api.field(v.title($locale('Name')), v.required(), v.min(2), ZovaRender.order(1))
31
+ @Api.field(
32
+ v.title($locale('Name')),
33
+ v.required(),
34
+ v.min(2),
35
+ ZovaRender.order(1),
36
+ ZovaRender.cell('basic-table:actionView'),
37
+ )
35
38
  name: string;
36
39
 
37
- @Api.field(v.title($locale('Score')), v.optional(), ZovaRender.order(2))
40
+ @Api.field(
41
+ v.title($locale('Student')),
42
+ v.required(),
43
+ ZovaRender.order(2),
44
+ // ZovaRender.field('basic-resource:formFieldResourcePicker', {
45
+ // resource: $resourceName('training-student:student'),
46
+ // }),
47
+ // ZovaRender.cell('basic-resource:resourcePicker', {
48
+ // resource: $resourceName('training-student:student'),
49
+ // }),
50
+ v.tableIdentity(),
51
+ )
52
+ studentId: TableIdentity;
53
+
54
+ @Api.field(v.title($locale('Score')), v.optional(), ZovaRender.order(3))
38
55
  score?: number;
39
56
 
40
- @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(3))
57
+ @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(4))
41
58
  description?: string;
42
59
  }
@@ -1,10 +1,23 @@
1
1
  import type { IDecoratorModelOptions } from 'vona-module-a-orm';
2
2
 
3
- import { BeanModelBase, Model } from 'vona-module-a-orm';
3
+ import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
4
4
 
5
5
  import { EntityRecord } from '../entity/record.tsx';
6
6
 
7
7
  export interface IModelOptionsRecord extends IDecoratorModelOptions<EntityRecord> {}
8
8
 
9
- @Model<IModelOptionsRecord>({ entity: EntityRecord })
9
+ @Model<IModelOptionsRecord>({
10
+ entity: EntityRecord,
11
+ relations: {
12
+ student: $relation.belongsTo(
13
+ 'training-record:record',
14
+ 'training-student:student',
15
+ 'studentId',
16
+ { columns: ['id', 'name'] },
17
+ ),
18
+ trainingRecordSubjects: $relation.hasMany('training-recordsubject:subject', 'recordId', {
19
+ columns: ['id', 'name', 'score', 'description'],
20
+ }),
21
+ },
22
+ })
10
23
  export class ModelRecord extends BeanModelBase<EntityRecord> {}
@@ -0,0 +1,50 @@
1
+ import type { TableIdentity } from 'table-identity';
2
+ import type { IQueryParams } from 'vona-module-a-orm';
3
+
4
+ import { BeanBase } from 'vona';
5
+ import { Service } from 'vona-module-a-bean';
6
+
7
+ import type { DtoRecordCreate } from '../dto/recordCreate.tsx';
8
+ import type { DtoRecordSelectRes } from '../dto/recordSelectRes.tsx';
9
+ import type { DtoRecordUpdate } from '../dto/recordUpdate.tsx';
10
+ import type { DtoRecordView } from '../dto/recordView.tsx';
11
+ import type { EntityRecord } from '../entity/record.tsx';
12
+ import type { ModelRecord } from '../model/record.ts';
13
+
14
+ function getRecordSubjectsInclude(): { trainingRecordSubjects: true; student: true } {
15
+ return { trainingRecordSubjects: true, student: true };
16
+ }
17
+
18
+ @Service()
19
+ export class ServiceRecord extends BeanBase {
20
+ async create(record: DtoRecordCreate): Promise<EntityRecord> {
21
+ return await this.scope.model.record.insert(record, {
22
+ include: getRecordSubjectsInclude(),
23
+ });
24
+ }
25
+
26
+ async select(params?: IQueryParams<ModelRecord>): Promise<DtoRecordSelectRes> {
27
+ return await this.scope.model.record.selectAndCount({
28
+ ...params,
29
+ include: { student: true },
30
+ });
31
+ }
32
+
33
+ async view(id: TableIdentity): Promise<DtoRecordView | undefined> {
34
+ return await this.scope.model.record.getById(id, {
35
+ include: getRecordSubjectsInclude(),
36
+ });
37
+ }
38
+
39
+ async update(id: TableIdentity, record: DtoRecordUpdate) {
40
+ return await this.scope.model.record.updateById(id, record, {
41
+ include: getRecordSubjectsInclude(),
42
+ });
43
+ }
44
+
45
+ async delete(id: TableIdentity) {
46
+ return await this.scope.model.record.deleteById(id, {
47
+ include: getRecordSubjectsInclude(),
48
+ });
49
+ }
50
+ }