cabloy 5.1.149 → 5.1.151

package/zova/src/suite/a-commerce/modules/commerce-trade/src/apiSchema/commerceTradeStockBalance.ts

@@ -0,0 +1,17 @@
+import type { IApiSchemaOptions } from 'zova-module-a-api';
+
+import { BeanBase } from 'zova';
+import { ApiSchema } from 'zova-module-a-api';
+
+import { ApiApiCommerceTradeStockBalanceadjustStockPath } from '../api/commerceTradeStockBalance.js';
+
+@ApiSchema()
+export class ApiSchemaCommerceTradeStockBalance extends BeanBase {
+  adjustStock(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiCommerceTradeStockBalanceadjustStockPath,
+      'post',
+      options,
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/bean/tableCell.actionAdjustStock.tsx

@@ -0,0 +1,35 @@
+import type { IResourceTableActionRowOptionsBase } from 'zova-module-a-openapi';
+import type {
+  IJsxRenderContextTableCell,
+  ITableCellRender,
+  NextTableCellRender,
+} from 'zova-module-a-table';
+
+import { BeanBase } from 'zova';
+import { TableCell } from 'zova-module-a-table';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceTableActionRowRecord {
+    'commerce-trade:actionAdjustStock'?: ITableCellOptionsActionAdjustStock;
+  }
+}
+
+export interface ITableCellOptionsActionAdjustStock extends IResourceTableActionRowOptionsBase {}
+
+@TableCell<ITableCellOptionsActionAdjustStock>({
+  class: 'btn btn-outline btn-secondary join-item',
+})
+export class TableCellActionAdjustStock extends BeanBase implements ITableCellRender {
+  render(
+    options: ITableCellOptionsActionAdjustStock,
+    renderContext: IJsxRenderContextTableCell,
+    _next: NextTableCellRender,
+  ) {
+    return renderContext.$jsx.render(
+      'commerce-trade:tableCellActionAdjustStock',
+      options,
+      renderContext.$celScope,
+      renderContext,
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/component/tableCellActionAdjustStock/controller.tsx

@@ -0,0 +1,138 @@
+import type { SchemaObject } from 'openapi3-ts/oas31';
+import type { TableIdentity } from 'table-identity';
+import type { TypeFormOnSubmitData } from 'zova-module-a-form';
+import type { IJsxRenderContextTableCell } from 'zova-module-a-table';
+
+import { BeanControllerBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+import { ZForm } from 'zova-module-a-form';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
+
+import type { ApiApiCommerceTradeStockBalanceadjustStockRequestBody } from '../../api/commerceTradeStockBalance.js';
+import type { ITableCellOptionsActionAdjustStock } from '../../bean/tableCell.actionAdjustStock.js';
+import type { ModelStockBalance } from '../../model/stockBalance.js';
+
+export interface ControllerTableCellActionAdjustStockProps extends ITableCellOptionsActionAdjustStock {}
+
+type StockAdjustmentDraft = Omit<
+  ApiApiCommerceTradeStockBalanceadjustStockRequestBody,
+  'correlationId' | 'skuId'
+>;
+
+const emptyDraft = (): StockAdjustmentDraft => ({ delta: 0, reason: '' });
+
+@Controller()
+export class ControllerTableCellActionAdjustStock extends BeanControllerBase {
+  static $propsDefault = {};
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextTableCell;
+
+  @Use({ beanFullName: 'commerce-trade.model.stockBalance' })
+  $$modelStockBalance: ModelStockBalance;
+
+  draft: StockAdjustmentDraft = emptyDraft();
+  schema?: SchemaObject;
+
+  get apiSchemasStockAdjust() {
+    return this.scope.apiSchema.commerceTradeStockBalance.adjustStock();
+  }
+
+  private get _sku() {
+    return this.$$renderContext.cellContext.row.original as {
+      available: number;
+      code: string;
+      id: TableIdentity;
+    };
+  }
+
+  private get _mutation() {
+    return this.$$modelStockBalance.adjustStock(this._sku.id);
+  }
+
+  private async _ensureSchema() {
+    if (this.schema) return;
+    await $QueryEnsureLoaded(() => this.apiSchemasStockAdjust.sdk);
+    this.schema = this.$computed(() => this.apiSchemasStockAdjust.requestBody);
+  }
+
+  private async _submit(data: TypeFormOnSubmitData<StockAdjustmentDraft>, close: () => void) {
+    const mutation = this._mutation;
+    if (mutation.isPending) return;
+    const delta = Number(data.value.delta);
+    const reason = data.value.reason.trim();
+    if (!Number.isInteger(delta) || delta === 0 || !reason) return;
+    await mutation.mutateAsync({
+      skuId: this._sku.id,
+      delta,
+      reason,
+      correlationId: crypto.randomUUID(),
+    });
+    close();
+  }
+
+  private async _openDialog() {
+    await this._ensureSchema();
+    this.draft = emptyDraft();
+    const dialog = this.$appModal.dialog(
+      {
+        title: this.scope.locale.AdjustStock(),
+        slotDefault: () => {
+          return (
+            <div class="space-y-4">
+              <dl class="grid grid-cols-2 gap-x-4 gap-y-2 text-sm">
+                <dt class="text-base-content/70">{this.scope.locale.SkuId()}</dt>
+                <dd>{this._sku.code}</dd>
+                <dt class="text-base-content/70">{this.scope.locale.Available()}</dt>
+                <dd>{this._sku.available}</dd>
+              </dl>
+              <ZForm
+                data={this.draft}
+                schema={this.schema}
+                onSubmitData={data => this._submit(data, () => dialog.close())}
+                onShowError={async ({ error }) => {
+                  await this.$performCommand('basic-commands:alert', {
+                    type: 'error',
+                    text: error.message,
+                  });
+                }}
+                slotFooter={$$form => (
+                  <div class="flex justify-end gap-2">
+                    {this._mutation.isPending && (
+                      <span class="loading loading-spinner text-primary"></span>
+                    )}
+                    <button class="btn btn-ghost" type="button" onClick={() => dialog.close()}>
+                      {this.scope.locale.Cancel()}
+                    </button>
+                    <button
+                      class="btn btn-secondary"
+                      disabled={$$form.formState.isSubmitting || this._mutation.isPending}
+                      type="submit"
+                    >
+                      {this.scope.locale.AdjustStock()}
+                    </button>
+                  </div>
+                )}
+              ></ZForm>
+            </div>
+          );
+        },
+      },
+      {
+        closeOnBackdrop: false,
+        closeOnEscape: false,
+        maxWidth: 480,
+        showCloseButton: true,
+      },
+    );
+  }
+
+  protected render() {
+    const props = this.$props as ControllerTableCellActionAdjustStockProps;
+    return (
+      <button class={props.class} type="button" onClick={() => this._openDialog()}>
+        {this.scope.locale.AdjustStock()}
+      </button>
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/en-us.ts

@@ -97,4 +97,7 @@ export default {
   CompleteMockRefund: 'Complete mock refund',
   MockRefundCompletionFailed: 'Unable to complete the mock refund. Try again.',
   MockRefundCompleted: 'The mock refund was completed. The order is being settled.',
+  AdjustStock: 'Adjust stock',
+  SkuId: 'SKU',
+  Available: 'Available',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/zh-cn.ts

@@ -88,4 +88,7 @@ export default {
   CompleteMockRefund: '完成模拟退款',
   MockRefundCompletionFailed: '无法完成模拟退款，请重试。',
   MockRefundCompleted: '模拟退款已完成，订单正在结算。',
+  AdjustStock: '调整库存',
+  SkuId: 'SKU',
+  Available: '可用库存',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/stockBalance.ts

@@ -0,0 +1,36 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+import type { ModelResource } from 'zova-module-rest-resource';
+
+import { Use, usePrepareArg } from 'zova';
+import { BeanModelBase, Model } from 'zova-module-a-model';
+
+import type {
+  ApiApiCommerceTradeStockBalanceadjustStockRequestBody,
+  ApiApiCommerceTradeStockBalanceadjustStockResponseBody,
+} from '../api/commerceTradeStockBalance.js';
+
+export interface IModelOptionsStockBalance extends IDecoratorModelOptions {}
+
+const SkuResource = 'commerce-catalog:sku';
+
+@Model<IModelOptionsStockBalance>()
+export class ModelStockBalance extends BeanModelBase {
+  @Use({ beanFullName: 'rest-resource.model.resource' })
+  protected get $$modelResource(): ModelResource {
+    return usePrepareArg(SkuResource, true);
+  }
+
+  adjustStock(id: TableIdentity) {
+    return this.$$modelResource.mutationItem<
+      ApiApiCommerceTradeStockBalanceadjustStockResponseBody,
+      ApiApiCommerceTradeStockBalanceadjustStockRequestBody
+    >({
+      id,
+      action: 'adjustStock',
+      mutationFn: async payload => {
+        return await this.scope.api.commerceTradeStockBalance.adjustStock(payload);
+      },
+    });
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx

@@ -159,9 +159,8 @@ export class ControllerPagePayment extends BeanControllerPageBase {
       for (const [attempt, delay] of SettlementPollDelaysMilliseconds.entries()) {
         if (delay > 0) await new Promise(resolve => setTimeout(resolve, delay));
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
-        let session;
         try {
-          session = await this.queryPaymentSession?.refetch();
+          await this.queryPaymentSession?.refetch({ bypassPersister: true });
         } catch (error) {
           if (isNotFoundError(error)) {
             this.paymentSessionUnavailable = true;
@@ -171,9 +170,10 @@ export class ControllerPagePayment extends BeanControllerPageBase {
           throw error;
         }
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
-        const sessionState = session?.data?.state;
+        const session = this.queryPaymentSession?.data;
+        const sessionState = session?.state;
         this.pendingSessionState = sessionState;
-        this.pendingNextAction = session?.data?.nextAction;
+        this.pendingNextAction = session?.nextAction;
         const isSessionTerminal = ['succeeded', 'failed', 'cancelled', 'expired'].includes(
           sessionState ?? '',
         );

package/zova/src/suite/a-training/modules/training-student/src/api/openapi/schemas.ts

@@ -302,10 +302,10 @@ export type ApiSchemaCommerceTradeEntityStockBalance =
   components['schemas']['commerce-trade.entity.stockBalance'];
 export type ApiSchemaCommerceTradeEntityStockBalancePartial =
   Partial<ApiSchemaCommerceTradeEntityStockBalance>;
-export type ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477 =
-  components['schemas']['commerce-trade.dto.stockAdjust_0aab216abd3467dd07f61c69172266c2441af477'];
-export type ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477Partial =
-  Partial<ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477>;
+export type ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e =
+  components['schemas']['commerce-trade.dto.stockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e'];
+export type ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750ePartial =
+  Partial<ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e>;
 export type ApiSchemaCommerceTradeDtoStockBalanceSelectRes =
   components['schemas']['commerce-trade.dto.stockBalanceSelectRes'];
 export type ApiSchemaCommerceTradeDtoStockBalanceSelectResPartial =
@@ -463,10 +463,10 @@ export type ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1
   components['schemas']['a-image.dto.imageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6'];
 export type ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6Partial =
   Partial<ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6>;
-export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3 =
-  components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3'];
-export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3Partial =
-  Partial<ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3>;
+export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac =
+  components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac'];
+export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48acPartial =
+  Partial<ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac>;
 export type ApiSchemaTrainingStudentDtoStudentUpdate =
   components['schemas']['training-student.dto.studentUpdate'];
 export type ApiSchemaTrainingStudentDtoStudentUpdatePartial =

package/zova/src/suite/a-training/modules/training-student/src/api/openapi/types.ts

@@ -3374,7 +3374,7 @@ export interface components {
       available: number;
     };
     /** @description Adjust Stock */
-    'commerce-trade.dto.stockAdjust_0aab216abd3467dd07f61c69172266c2441af477': {
+    'commerce-trade.dto.stockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e': {
       /** @description SKU ID */
       skuId: number | string;
       /** @description Delta */
@@ -3815,6 +3815,8 @@ export interface components {
         /** @description Product title */
         title: string;
       };
+      /** @description Available */
+      available: number;
       /** @description Operations */
       _operationsRow?: unknown;
     };
@@ -4287,7 +4289,7 @@ export interface components {
               | undefined;
           }[]
         | undefined;
-      studentContentForm?: {
+      content?: {
         /** @description Description Markdown */
         descriptionMarkdown?: string | undefined;
       };
@@ -4410,7 +4412,7 @@ export interface components {
           signed?: boolean;
         }
       | undefined;
-    'training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3':
+    'training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac':
       | {
           /**
            * Format: date-time
@@ -4517,10 +4519,7 @@ export interface components {
               | components['schemas']['training-record.dto.detailRecordSubjectResItem'][]
               | undefined;
           }[];
-          studentContentForm?: {
-            /** @description ID */
-            id: number | string;
-            studentId: number | string;
+          content?: {
             /** @description Description Markdown */
             descriptionMarkdown?: string | undefined;
           };
@@ -4528,6 +4527,7 @@ export interface components {
           _trainingRecords?:
             | components['schemas']['training-student.dto.detailRecordResItem'][]
             | undefined;
+          _descriptionMarkdown?: string | undefined;
         }
       | undefined;
     'training-student.dto.studentUpdate': {
@@ -4618,7 +4618,7 @@ export interface components {
               | undefined;
           }[]
         | undefined;
-      studentContentForm?: {
+      content?: {
         /**
          * @description Deleted
          * @default false
@@ -4644,7 +4644,7 @@ export interface components {
           /** @description Training Stage */
           level: 1 | 2 | 3;
           /** @description Description */
-          description?: string | undefined;
+          descriptionMarkdown?: string | undefined;
           /** @description Description HTML */
           descriptionHtml?: string | undefined;
           /** @description Level Title */
@@ -7226,7 +7226,7 @@ export interface operations {
     };
     requestBody: {
       content: {
-        'application/json': components['schemas']['commerce-trade.dto.stockAdjust_0aab216abd3467dd07f61c69172266c2441af477'];
+        'application/json': components['schemas']['commerce-trade.dto.stockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e'];
       };
     };
     responses: {
@@ -8127,7 +8127,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data?: components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_1d66fd9b41b42bee7a7709e4c1b00556fdb4dae3'];
+            data?: components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac'];
           };
         };
       };

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

@@ -40,13 +40,13 @@ export class TableCellActionSummary extends BeanBase implements ITableCellRender
             true,
           )) as ModelStudent;
           const querySummary = modelStudent.summary(id);
-          const { data: summary } = await querySummary.refetch();
+          await querySummary.refetch({ bypassPersister: true });
           $host.$appModal.dialog(
             {
               title: this.scope.locale.Summary(),
               slotDefault: () => (
                 <div class="student-summary-description">
-                  <ZMarkdownHtml html={summary?.descriptionHtml} />
+                  <ZMarkdownHtml html={querySummary.data?.descriptionHtml ?? ''} />
                 </div>
               ),
             },

package/zova/src/suite/cabloy-basic/modules/basic-app/src/bean/behavior.appModal.tsx

@@ -290,6 +290,8 @@ export class BehaviorAppModal extends BeanBehaviorBase<
           }}
         ></div>
         <div
+          role="dialog"
+          aria-modal="true"
           class="card bg-base-100 shadow-2xl relative w-full max-h-[calc(100vh-2rem)]"
           style={style}
         >

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-rest-resource",
-  "version": "5.1.46",
+  "version": "5.1.47",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/src/model/resource.ts

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { DataMutation, IDecoratorModelOptions } from 'zova-module-a-model';
+import type { DataMutation, IDecoratorModelOptions, QueryMetaPersister } from 'zova-module-a-model';
 import type {
   IFormMeta,
   IFormProvider,
@@ -27,6 +27,7 @@ interface IModelResourceQueryItemOptions<TData> {
   meta?: {
     disableSuspenseOnInit?: boolean;
     disableErrorEffect?: boolean;
+    persister?: QueryMetaPersister | boolean;
   };
 }
 

package/zova/src/suite-vendor/a-cabloy/modules/rest-resource/test/model/resource.types.ts

@@ -17,6 +17,17 @@ void requiredBody.delete(id).mutateAsync({ reason: 'duplicate' });
 void optionalBody.delete(id).mutateAsync();
 void optionalBody.delete(id).mutateAsync({ reason: 'duplicate' });
 
+const queryItem = standard.queryItem({
+  id,
+  action: 'summary',
+  queryFn: async () => ({ id: 1 }),
+});
+void queryItem.refetch({
+  bypassPersister: true,
+  cancelRefetch: false,
+  throwOnError: true,
+});
+
 // @ts-expect-error required DELETE bodies cannot be omitted
 void requiredBody.delete(id).mutateAsync();
 

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-cabloy",
-  "version": "5.1.47",
+  "version": "5.1.48",
   "gitHead": "4dece229b6d3f4735930e833afcb4b95ec51bf86",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "zova-module-a-rbac": "^5.0.1",
-    "zova-module-rest-resource": "^5.1.46"
+    "zova-module-rest-resource": "^5.1.47"
   },
   "title": "a-cabloy"
 }

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

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

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

@@ -24,12 +24,21 @@ export function resolveFormLayout(
   layout: IFormLayout,
   properties: ISchemaObjectExtensionField[] | undefined,
 ): IResolvedFormLayout {
+  const visibleProperties = properties?.filter(item => item.rest?.visible !== false) ?? [];
   const propertyNames = new Set(
-    properties
-      ?.filter(item => item.rest?.visible !== false)
-      .map(item => item.key)
-      .filter(Boolean) as string[],
+    visibleProperties.map(item => item.key).filter(Boolean) as string[],
   );
+  const propertyAliases = new Map<string, Set<string>>();
+  for (const property of visibleProperties) {
+    if (!property.key) continue;
+    const schemaKeys = [property.schemaKey, ...(property.schemaKeys ?? [])];
+    for (const schemaKey of schemaKeys) {
+      if (!schemaKey || schemaKey === property.key) continue;
+      const aliases = propertyAliases.get(schemaKey) ?? new Set<string>();
+      aliases.add(property.key);
+      propertyAliases.set(schemaKey, aliases);
+    }
+  }
   const fieldNames = new Set<string>();
   const nodeIds = new Set<string>();
   const diagnostics: IFormLayoutDiagnostic[] = [];
@@ -41,6 +50,7 @@ export function resolveFormLayout(
         [index],
         [],
         propertyNames,
+        propertyAliases,
         fieldNames,
         nodeIds,
         diagnostics,
@@ -62,13 +72,22 @@ function resolveNode(
   indexPath: number[],
   tabPath: IResolvedFormLayout['fieldTabPaths'][string],
   propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
   fieldNames: Set<string>,
   nodeIds: Set<string>,
   diagnostics: IFormLayoutDiagnostic[],
   fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
 ): IResolvedFormLayoutNode | undefined {
   if (node.type === 'field') {
-    return resolveField(node, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths);
+    return resolveField(
+      node,
+      tabPath,
+      propertyNames,
+      propertyAliases,
+      fieldNames,
+      diagnostics,
+      fieldTabPaths,
+    );
   }
   if (node.type === 'block') {
     return node;
@@ -78,6 +97,7 @@ function resolveNode(
       node,
       indexPath,
       propertyNames,
+      propertyAliases,
       fieldNames,
       nodeIds,
       diagnostics,
@@ -89,7 +109,15 @@ function resolveNode(
   if (node.type === 'section') {
     const children = node.children
       .map(item =>
-        resolveLeaf(item, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths),
+        resolveLeaf(
+          item,
+          tabPath,
+          propertyNames,
+          propertyAliases,
+          fieldNames,
+          diagnostics,
+          fieldTabPaths,
+        ),
       )
       .filter(Boolean) as IResolvedFormLayoutLeaf[];
     return children.length ? { ...node, id, children } : undefined;
@@ -101,6 +129,7 @@ function resolveNode(
         [...indexPath, index],
         tabPath,
         propertyNames,
+        propertyAliases,
         fieldNames,
         nodeIds,
         diagnostics,
@@ -117,18 +146,28 @@ function resolveLeaf(
   node: IFormLayoutLeaf,
   tabPath: IResolvedFormLayout['fieldTabPaths'][string],
   propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
   fieldNames: Set<string>,
   diagnostics: IFormLayoutDiagnostic[],
   fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
 ): IResolvedFormLayoutLeaf | undefined {
   if (node.type === 'block') return node;
-  return resolveField(node, tabPath, propertyNames, fieldNames, diagnostics, fieldTabPaths);
+  return resolveField(
+    node,
+    tabPath,
+    propertyNames,
+    propertyAliases,
+    fieldNames,
+    diagnostics,
+    fieldTabPaths,
+  );
 }
 
 function resolveTabs(
   node: IFormLayoutTabs,
   indexPath: number[],
   propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
   fieldNames: Set<string>,
   nodeIds: Set<string>,
   diagnostics: IFormLayoutDiagnostic[],
@@ -143,6 +182,7 @@ function resolveTabs(
         [...indexPath, index],
         id,
         propertyNames,
+        propertyAliases,
         fieldNames,
         nodeIds,
         diagnostics,
@@ -158,6 +198,7 @@ function resolveTab(
   indexPath: number[],
   tabsId: string,
   propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
   fieldNames: Set<string>,
   nodeIds: Set<string>,
   diagnostics: IFormLayoutDiagnostic[],
@@ -173,6 +214,7 @@ function resolveTab(
         [...indexPath, index],
         tabPath,
         propertyNames,
+        propertyAliases,
         fieldNames,
         nodeIds,
         diagnostics,
@@ -189,11 +231,12 @@ function resolveField(
   node: IFormLayoutField,
   tabPath: IResolvedFormLayout['fieldTabPaths'][string],
   propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
   fieldNames: Set<string>,
   diagnostics: IFormLayoutDiagnostic[],
   fieldTabPaths: IResolvedFormLayout['fieldTabPaths'],
 ): IResolvedFormLayoutField | undefined {
-  const name = resolveFieldName(node.name, propertyNames);
+  const name = resolveFieldName(node.name, propertyNames, propertyAliases);
   if (!name) {
     diagnostics.push({ type: 'unknownField', value: node.name });
     return;
@@ -207,8 +250,14 @@ function resolveField(
   return name === node.name ? node : { ...node, name };
 }
 
-function resolveFieldName(name: string, propertyNames: Set<string>) {
+function resolveFieldName(
+  name: string,
+  propertyNames: Set<string>,
+  propertyAliases: Map<string, Set<string>>,
+) {
   if (propertyNames.has(name)) return name;
+  const aliases = propertyAliases.get(name);
+  if (aliases?.size === 1) return aliases.values().next().value;
   const fieldSourcePrefix = `${name}.`;
   const fieldSources = [...propertyNames].filter(item => item.startsWith(fieldSourcePrefix));
   return fieldSources.length === 1 ? fieldSources[0] : undefined;