cabloy 5.1.72 → 5.1.73

package/vona/pnpm-workspace.yaml

@@ -49,3 +49,6 @@ allowBuilds:
   esbuild: true
   msgpackr-extract: true
   vue-demi: true
+
+patchedDependencies:
+  zova-core@5.1.61: patches/zova-core@5.1.61.patch

package/vona/src/suite/a-training/modules/training-record/src/dto/recordCreate.tsx

@@ -6,7 +6,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
-import { onEffectForTrainingRecordSubjects } from '../entity/record.tsx';
+import { onEffectForTrainingRecordSubjects } from '../lib/onEffectForTrainingRecordSubjects.tsx';
 import { ModelRecord } from '../model/record.ts';
 import { DtoDetailRecordSubjectMutate } from './detailRecordSubjectMutate.tsx';
 import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';

package/vona/src/suite/a-training/modules/training-record/src/dto/recordUpdate.tsx

@@ -6,7 +6,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
-import { onEffectForTrainingRecordSubjects } from '../entity/record.tsx';
+import { onEffectForTrainingRecordSubjects } from '../lib/onEffectForTrainingRecordSubjects.tsx';
 import { ModelRecord } from '../model/record.ts';
 import { DtoDetailRecordSubjectMutate } from './detailRecordSubjectMutate.tsx';
 import { DtoDetailRecordSubjectResItem } from './detailRecordSubjectResItem.tsx';

package/vona/src/suite/a-training/modules/training-record/src/entity/record.tsx

@@ -1,66 +1,16 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 
-import { cel } from '@cabloy/utils';
-import React from 'react';
 import { $makeMetadata, $resourceName, Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import z from 'zod';
-import { ZovaCommand, ZovaEvent, ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
+import { onEffectForAverageScore } from '../lib/onEffectForAverageScore.tsx';
 
 export interface IEntityOptionsRecord extends IDecoratorEntityOptions {}
 
-export const onEffectForTrainingRecordSubjects = (
-  <ZovaEvent>
-    <ZovaCommand
-      name="basic-commands:setValue"
-      options={{
-        name: 'subjectCount',
-        value: cel(
-          'int(getValue("trainingRecordSubjects",[]).filter(item, get(item, "deleted")!=true).size())',
-        ),
-      }}
-    ></ZovaCommand>
-    <ZovaCommand
-      name="basic-commands:setValue"
-      options={{
-        name: 'totalScore',
-        value: cel(
-          'sum(getValue("trainingRecordSubjects",[]).filter(item, get(item, "deleted")!=true).map(item, int(get(item, "score")==null ? 0 : get(item, "score"))))',
-        ),
-      }}
-    ></ZovaCommand>
-  </ZovaEvent>
-);
-
-const onEffectForAverageScore = (
-  <ZovaEvent>
-    <ZovaCommand
-      name="basic-commandssync:expr"
-      res="subjectCount"
-      options={{
-        expression: cel('int(getValue("subjectCount",0))'),
-      }}
-    ></ZovaCommand>
-    <ZovaCommand
-      name="basic-commandssync:expr"
-      res="totalScore"
-      options={{
-        expression: cel('int(getValue("totalScore",0))'),
-      }}
-    ></ZovaCommand>
-    <ZovaCommand
-      name="basic-commands:setValue"
-      options={{
-        name: 'averageScore',
-        value: cel('subjectCount==0 ? "" : toFixed(double(totalScore) / double(subjectCount), 2)'),
-      }}
-    ></ZovaCommand>
-  </ZovaEvent>
-);
-
 @Entity<IEntityOptionsRecord>('trainingRecord', {
   openapi: { title: $locale('TrainingRecord') },
   fields: {

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

@@ -1,2 +1,3 @@
+export * from './lib/index.ts';
 export * from './.metadata/locales.ts';
 export * from './.metadata/index.ts';

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

@@ -0,0 +1,2 @@
+export * from './onEffectForAverageScore.tsx';
+export * from './onEffectForTrainingRecordSubjects.tsx';

package/vona/src/suite/a-training/modules/training-record/src/lib/onEffectForAverageScore.tsx

@@ -0,0 +1,29 @@
+import { cel } from '@cabloy/utils';
+import React from 'react';
+import { ZovaCommand, ZovaEvent } from 'zova-rest-cabloy-basic-admin';
+
+export const onEffectForAverageScore = (
+  <ZovaEvent>
+    <ZovaCommand
+      name="basic-commandssync:expr"
+      res="subjectCount"
+      options={{
+        expression: cel('int(getValue("subjectCount",0))'),
+      }}
+    ></ZovaCommand>
+    <ZovaCommand
+      name="basic-commandssync:expr"
+      res="totalScore"
+      options={{
+        expression: cel('int(getValue("totalScore",0))'),
+      }}
+    ></ZovaCommand>
+    <ZovaCommand
+      name="basic-commands:setValue"
+      options={{
+        name: 'averageScore',
+        value: cel('subjectCount==0 ? "" : toFixed(double(totalScore) / double(subjectCount), 2)'),
+      }}
+    ></ZovaCommand>
+  </ZovaEvent>
+);

package/vona/src/suite/a-training/modules/training-record/src/lib/onEffectForTrainingRecordSubjects.tsx

@@ -0,0 +1,26 @@
+import { cel } from '@cabloy/utils';
+import React from 'react';
+import { ZovaCommand, ZovaEvent } from 'zova-rest-cabloy-basic-admin';
+
+export const onEffectForTrainingRecordSubjects = (
+  <ZovaEvent>
+    <ZovaCommand
+      name="basic-commands:setValue"
+      options={{
+        name: 'subjectCount',
+        value: cel(
+          'int(getValue("trainingRecordSubjects",[]).filter(item, get(item, "deleted")!=true).size())',
+        ),
+      }}
+    ></ZovaCommand>
+    <ZovaCommand
+      name="basic-commands:setValue"
+      options={{
+        name: 'totalScore',
+        value: cel(
+          'sum(getValue("trainingRecordSubjects",[]).filter(item, get(item, "deleted")!=true).map(item, int(get(item, "score", 0))))',
+        ),
+      }}
+    ></ZovaCommand>
+  </ZovaEvent>
+);

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

@@ -3,7 +3,7 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $makeMetadata, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
-import { ModelRecord } from 'vona-module-training-record';
+import { ModelRecord, onEffectForTrainingRecordSubjects } from 'vona-module-training-record';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
@@ -17,6 +17,7 @@ export interface IDtoOptionsDetailRecordBase extends IDecoratorDtoOptions {}
       v.title($locale('TrainingRecordSubjects')),
       ZovaRender.order(8),
       ZovaRender.field('basic-details:formFieldDetails'),
+      ZovaRender.onEffect(onEffectForTrainingRecordSubjects),
       v.optional(),
     ),
   },

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.tabs.tsx

@@ -122,8 +122,8 @@ export class RenderTabs extends BeanRenderBase {
   public getTabItemIcon(tabItem: IRouteViewRouteItem): keyof IIconRecord | '' {
     const { pageMeta } = tabItem;
     if (pageMeta?.pageDirty) return '::asterisk';
-    if (pageMeta?.formMeta?.formScene === 'create') return '::draft-add';
-    if (pageMeta?.formMeta?.formScene === 'edit') return '::draft-edit';
+    if (pageMeta?.formMeta?.formScene === 'create') return '::add';
+    if (pageMeta?.formMeta?.formScene === 'edit') return '::edit';
     return '';
   }