cabloy 5.1.147 → 5.1.149

package/zova/src/suite/a-training/modules/training-student/src/bean/tableCell.actionSummary.tsx

@@ -9,6 +9,7 @@ import type { ModelStudent } from 'zova-module-training-student';
 
 import { BeanBase } from 'zova';
 import { TableCell } from 'zova-module-a-table';
+import { ZMarkdownHtml } from 'zova-module-basic-markdown';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableActionRowRecord {
@@ -40,13 +41,23 @@ export class TableCellActionSummary extends BeanBase implements ITableCellRender
           )) as ModelStudent;
           const querySummary = modelStudent.summary(id);
           const { data: summary } = await querySummary.refetch();
-          const message = [
-            `${this.scope.locale.Id()}: ${summary?.id ?? '-'}`,
-            `${this.scope.locale.Name()}: ${summary?.name ?? '-'}`,
-            `${this.scope.locale.Level()}: ${summary?.level ?? '-'}`,
-            `${this.scope.locale.Description()}: ${summary?.description ?? '-'}`,
-          ].join('\n');
-          await $host.$performCommand('basic-commands:alert', { text: message }, renderContext);
+          $host.$appModal.dialog(
+            {
+              title: this.scope.locale.Summary(),
+              slotDefault: () => (
+                <div class="student-summary-description">
+                  <ZMarkdownHtml html={summary?.descriptionHtml} />
+                </div>
+              ),
+            },
+            {
+              maxWidth: 720,
+              maxHeight: 'calc(100vh - 2rem)',
+              closeOnBackdrop: true,
+              closeOnEscape: true,
+              showCloseButton: true,
+            },
+          );
         }}
       >
         {this.scope.locale.Summary()}

package/zova/src/suite-vendor/a-zova/modules/a-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-form",
-  "version": "5.1.48",
+  "version": "5.1.49",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-form/src/lib/formLayout.ts

@@ -193,17 +193,25 @@ function resolveField(
   diagnostics: IFormLayoutDiagnostic[],
   fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
 ): IResolvedFormLayoutField | undefined {
-  if (!propertyNames.has(node.name)) {
+  const name = resolveFieldName(node.name, propertyNames);
+  if (!name) {
     diagnostics.push({ type: 'unknownField', value: node.name });
     return;
   }
-  if (fieldNames.has(node.name)) {
+  if (fieldNames.has(name)) {
     diagnostics.push({ type: 'duplicateField', value: node.name });
     return;
   }
-  fieldNames.add(node.name);
-  fieldTabPaths[node.name] = tabPath;
-  return node;
+  fieldNames.add(name);
+  fieldTabPaths[name] = tabPath;
+  return name === node.name ? node : { ...node, name };
+}
+
+function resolveFieldName(name: string, propertyNames: Set<string>) {
+  if (propertyNames.has(name)) return name;
+  const fieldSourcePrefix = `${name}.`;
+  const fieldSources = [...propertyNames].filter(item => item.startsWith(fieldSourcePrefix));
+  return fieldSources.length === 1 ? fieldSources[0] : undefined;
 }
 
 function resolveId(node: { type: string; id?: string }, indexPath: number[]) {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.152",
+  "version": "5.1.153",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "zova-module-a-boundary": "^5.1.22",
     "zova-module-a-command": "^5.1.34",
     "zova-module-a-fetch": "^5.1.25",
-    "zova-module-a-form": "^5.1.48",
+    "zova-module-a-form": "^5.1.49",
     "zova-module-a-icon": "^5.1.27",
     "zova-module-a-interceptor": "^5.1.31",
     "zova-module-a-logger": "^5.1.28",