@acorex/platform 21.0.0-next.34 → 21.0.0-next.39

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -1,13 +1,13 @@
 import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
-import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
+import { AXTranslationService, AXTranslationModule, resolveMultiLanguageString } from '@acorex/core/translation';
 import * as i4$4 from '@acorex/platform/common';
 import { AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCleanNestedFilters, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule, makeEnvironmentProviders } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
-import { AXPDeviceService, AXPBroadcastEventService, AXPResolveMultiLanguageStringPipe, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, resolveMultiLanguageString, AXPMultiLanguageStringResolverService, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition, AXPSystemActionType } from '@acorex/platform/core';
+import { AXPDeviceService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition, AXPSystemActionType } from '@acorex/platform/core';
 import { merge, get, castArray, cloneDeep, set, orderBy, omit, isNil, isEmpty, isEqual } from 'lodash-es';
 import { AXPSessionService, AXPAuthGuard, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
@@ -282,7 +282,7 @@ function createModifierContext(entity) {
                     },
                 },
                 modify: {
-                    get: () => entity.interfaces?.master?.create,
+                    get: () => entity.interfaces?.master?.update,
                     update: (updater) => {
                         entity.interfaces ??= {};
                         entity.interfaces.master ??= {};
@@ -851,6 +851,9 @@ class InterfaceSelector {
             recordId = data['id'] || data['_id'];
         }
         const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'update', recordId, this.formBuilderService);
+        if (Object.keys(initialData).length > 0) {
+            filter.context(initialData);
+        }
         return filter;
     }
     single(data) {
@@ -936,21 +939,16 @@ class PropertyFilter {
     }
     async show() {
         const dialog = await this.buildDialog();
-        // Context: load record by id for update/single and merge with provided context (context overrides)
+        // Context: always load by key when we have a record id (authoritative full row), then merge any
+        // caller/list row context. Skipping fetch when initialContext was non-empty left dialogs without
+        // fields not present on the passed row (e.g. Entity:View single() with partial list payload).
         let baseContext = {};
-        // Only fetch by key if we don't already have initial data
-        const hasInitialData = this.initialContext && Object.keys(this.initialContext).length > 0;
-        if ((this.kind === 'update' || this.kind === 'single') && !hasInitialData) {
+        if ((this.kind === 'update' || this.kind === 'single') && this.recordId) {
             const id = this.recordId;
-            if (!id) {
-                throw new Error(`Record id is required for ${this.kind}().`);
-            }
-            // Use the public method if service is available, otherwise fallback to direct entity access
             if (this.formBuilderService) {
                 baseContext = await this.formBuilderService.getRecordById(this.fullName, id);
             }
             else {
-                // Fallback to original implementation if service is not available
                 const { moduleName, entityName } = parseEntityFullName(this.fullName);
                 const entity = await this.entityRegistry.resolve(moduleName, entityName);
                 try {
@@ -964,7 +962,7 @@ class PropertyFilter {
                 }
             }
         }
-        const effectiveContext = merge({}, baseContext, this.initialContext);
+        const effectiveContext = merge({}, this.initialContext, baseContext);
         dialog.setContext(effectiveContext);
         return await dialog.show();
     }
@@ -1185,6 +1183,10 @@ class PropertyFilter {
                         }
                         const sectionLayout = section.layout ?? undefined;
                         grid.item(sectionLayout, (fs) => {
+                            const sectionVisible = section.layout?.visible;
+                            if (sectionVisible !== undefined && sectionVisible !== null) {
+                                fs.visible(sectionVisible);
+                            }
                             fs.setLook('fieldset');
                             fs.setTitle((getGroupTitleFromList(allGroups, groupId) || groupId));
                             fs.setCols(12);
@@ -2445,19 +2447,11 @@ class AXPEntityDetailPopoverComponent {
         return prop.name;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{\n          (entityDetails()?.entityData?.[textField()] ?? item()?.[textField()]) | axpResolveMultiLanguageString\n        }}\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:actions.open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:actions.open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [
-                        CommonModule,
-                        AXButtonModule,
-                        AXPopoverModule,
-                        AXPWidgetCoreModule,
-                        AXTranslationModule,
-                        AXLoadingModule,
-                        AXPResolveMultiLanguageStringPipe,
-                    ], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{\n          (entityDetails()?.entityData?.[textField()] ?? item()?.[textField()]) | axpResolveMultiLanguageString\n        }}\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:actions.open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n" }]
+            args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXButtonModule, AXPopoverModule, AXPWidgetCoreModule, AXTranslationModule, AXLoadingModule], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:actions.open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n" }]
         }], propDecorators: { entity: [{ type: i0.Input, args: [{ isSignal: true, alias: "entity", required: true }] }], entityId: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityId", required: true }] }], textField: [{ type: i0.Input, args: [{ isSignal: true, alias: "textField", required: false }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: false }] }], item: [{ type: i0.Input, args: [{ isSignal: true, alias: "item", required: false }] }], breadcrumb: [{ type: i0.Input, args: [{ isSignal: true, alias: "breadcrumb", required: false }] }], detailPopover: [{ type: i0.ViewChild, args: ['detailPopover', { isSignal: true }] }] } });
 
 class AXPEntityDetailPopoverService {
@@ -2658,6 +2652,23 @@ class AXMEntityCrudServiceImpl {
     async custom(request) { }
 }
 
+/**
+ * Best-effort plain string for thrown {@link Error} messages from command results (no i18n lookup).
+ */
+function commandMessageTextForError(value) {
+    if (value == null) {
+        return '';
+    }
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (typeof value === 'object' && !Array.isArray(value)) {
+        const values = Object.values(value);
+        const first = values.find((v) => typeof v === 'string' && v.length > 0);
+        return first ?? '';
+    }
+    return String(value);
+}
 //#region ----   EntityDataAccessor   ----
 /**
  * Data accessor for entity operations.
@@ -2754,7 +2765,7 @@ class EntityDataAccessor {
         else if (typeof execute === 'string') {
             const result = await this.commandService.execute(execute, data);
             if (!result?.success) {
-                throw new Error(result?.message?.text || 'Failed to create entity');
+                throw new Error(commandMessageTextForError(result?.message?.text) || 'Failed to create entity');
             }
             return result.data?.id || result.data;
         }
@@ -2780,7 +2791,7 @@ class EntityDataAccessor {
         else if (typeof execute === 'string') {
             const result = await this.commandService.execute(execute, updateData);
             if (!result?.success) {
-                throw new Error(result?.message?.text || 'Failed to update entity');
+                throw new Error(commandMessageTextForError(result?.message?.text) || 'Failed to update entity');
             }
             return result.data;
         }
@@ -2804,7 +2815,7 @@ class EntityDataAccessor {
         else if (typeof execute === 'string') {
             const result = await this.commandService.execute(execute, id);
             if (!result?.success) {
-                throw new Error(result?.message?.text || 'Failed to delete entity');
+                throw new Error(commandMessageTextForError(result?.message?.text) || 'Failed to delete entity');
             }
             return;
         }
@@ -3698,6 +3709,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }] });
 
+//#region ---- Imports ----
+//#endregion
+//#region ---- Master interface property sort order ----
+/**
+ * Sort key for entries in `interfaces.master.{create|update|single}.properties`.
+ * Uses `layout.order` when set and finite; otherwise the property index in that list.
+ */
+function getMasterInterfacePropertySortKey(interfaceRow, indexInMasterInterfaceList) {
+    const layout = interfaceRow?.layout;
+    if (!layout) {
+        return indexInMasterInterfaceList;
+    }
+    const o = layout.order;
+    if (o !== undefined && o !== null) {
+        const n = Number(o);
+        if (Number.isFinite(n)) {
+            return n;
+        }
+    }
+    return indexInMasterInterfaceList;
+}
+//#endregion
+
 class AXPEntityCreateViewSectionViewModel {
     constructor(entity, section) {
         this.entity = entity;
@@ -3711,18 +3745,30 @@ class AXPEntityCreateViewSectionViewModel {
             return this.group.description;
         }, ...(ngDevMode ? [{ debugName: "description" }] : /* istanbul ignore next */ []));
         this.layout = computed(() => {
-            const source = cloneDeep(this.section.layout ?? {});
+            const source = cloneDeep(this.section.layout ?? {
+                positions: {
+                    lg: {
+                        colSpan: 12,
+                    },
+                },
+            });
             set(source, 'positions.default.colSpan', 12);
             return source;
         }, ...(ngDevMode ? [{ debugName: "layout" }] : /* istanbul ignore next */ []));
         this.elements = computed(() => {
             const { interfaces, properties } = this.entity;
             const createProps = interfaces?.master?.create?.properties ?? [];
-            const createPropNames = new Set(createProps.map(({ name }) => name));
-            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && createPropNames.has(name));
-            return filteredProperties.map((property) => {
-                const createProp = createProps.find(({ name }) => name === property.name);
-                return new AXPEntityCreateViewElementViewModel(this.entity, this, property, createProp);
+            const propsByName = new Map(properties.map((p) => [p.name, p]));
+            const ordered = createProps
+                .map((cp, index) => ({ cp, index }))
+                .filter(({ cp }) => {
+                const p = propsByName.get(cp.name);
+                return p !== undefined && p.groupId === this.group.id;
+            })
+                .sort((a, b) => getMasterInterfacePropertySortKey(a.cp, a.index) - getMasterInterfacePropertySortKey(b.cp, b.index));
+            return ordered.map(({ cp }) => {
+                const property = propsByName.get(cp.name);
+                return new AXPEntityCreateViewElementViewModel(this.entity, this, property, cp);
             });
         }, ...(ngDevMode ? [{ debugName: "elements" }] : /* istanbul ignore next */ []));
     }
@@ -3788,7 +3834,6 @@ class AXPEntityMasterCreateViewModel {
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
             const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && createProps.includes(name));
             const sections = interfaces?.master?.create?.sections?.filter(({ id }) => visibleProperties.some(({ groupId }) => groupId === id)) ?? [];
-            console.log({ sections, visibleProperties });
             return sections.map((section) => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
         }, ...(ngDevMode ? [{ debugName: "sections" }] : /* istanbul ignore next */ []));
         if (!initialData)
@@ -3877,6 +3922,48 @@ class AXPEntityMasterListViewQueryViewModel {
     }
 }
 class AXPEntityMasterListViewModel {
+    createExpressionScope(data) {
+        return {
+            context: {
+                eval: (path) => get(data, path),
+            },
+            list: {
+                view: () => this.view().name,
+                views: () => this.views().map((v) => ({ name: v.name, title: v.title })),
+            },
+        };
+    }
+    async resolveCommandNameExpression(commandName, data) {
+        if (!commandName || !commandName.includes('{{')) {
+            return commandName;
+        }
+        const scope = this.createExpressionScope(data);
+        const result = await this.expressionEvaluator.evaluate({ value: commandName }, scope);
+        const resolved = result?.value;
+        return typeof resolved === 'string' && resolved.trim() !== '' ? resolved : commandName;
+    }
+    async resolveTitleExpression(title, data) {
+        if (!title || !title.includes('{{')) {
+            return title;
+        }
+        const scope = this.createExpressionScope(data);
+        const result = await this.expressionEvaluator.evaluate({ value: title }, scope);
+        const resolved = result?.value;
+        return typeof resolved === 'string' && resolved.trim() !== '' ? resolved : title;
+    }
+    async resolveTriggerName(triggerName, data) {
+        if (!triggerName) {
+            return triggerName;
+        }
+        const ampIndex = triggerName.indexOf('&');
+        if (ampIndex < 0) {
+            return await this.resolveCommandNameExpression(triggerName, data);
+        }
+        const commandPart = triggerName.slice(0, ampIndex);
+        const suffix = triggerName.slice(ampIndex); // includes '&'
+        const resolvedCommand = await this.resolveCommandNameExpression(commandPart, data);
+        return `${resolvedCommand}${suffix}`;
+    }
     async setView(viewName = null) {
         const entitySetting = await this.settings.get(this.settingEntityKey);
         const selectedViewName = entitySetting?.list?.currentView;
@@ -4065,13 +4152,7 @@ class AXPEntityMasterListViewModel {
         };
         this.sortedFields = signal([], ...(ngDevMode ? [{ debugName: "sortedFields" }] : /* istanbul ignore next */ []));
         this.evaluateExpressions = async (options, data) => {
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        return get(data, path);
-                    },
-                },
-            };
+            const scope = this.createExpressionScope(data);
             return await this.expressionEvaluator.evaluate(options, scope);
         };
         this.workflow.events$
@@ -4243,7 +4324,7 @@ class AXPEntityMasterListViewModel {
         this.selectedCategory.set(category);
     }
     async getPrimaryActions() {
-        const scope = {};
+        const scope = this.createExpressionScope(null);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.priority == 'primary' &&
             ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
@@ -4253,12 +4334,14 @@ class AXPEntityMasterListViewModel {
             if (isHidden)
                 return null;
             const disabled = await this.expressionEvaluator.evaluate(a.disabled, scope);
-            return { ...a, disabled };
+            const name = await this.resolveTriggerName(a.name, null);
+            const title = await this.resolveTitleExpression(a.title, null);
+            return { ...a, disabled, name, title };
         }));
-        return actions;
+        return actions.filter(Boolean);
     }
     async getSecondaryActions() {
-        const scope = {};
+        const scope = this.createExpressionScope(null);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.priority == 'secondary' &&
             ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
@@ -4268,16 +4351,14 @@ class AXPEntityMasterListViewModel {
             if (isHidden)
                 return null;
             const disabled = await this.expressionEvaluator.evaluate(a.disabled, scope);
-            return { ...a, disabled };
+            const name = await this.resolveTriggerName(a.name, null);
+            const title = await this.resolveTitleExpression(a.title, null);
+            return { ...a, disabled, name, title };
         }));
-        return actions;
+        return actions.filter(Boolean);
     }
     async secondaryRowActions(rowData) {
-        const scope = {
-            context: {
-                eval: (path) => get(rowData, path),
-            },
-        };
+        const scope = this.createExpressionScope(rowData);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.scope === AXPEntityCommandScope.Individual && a.priority === 'secondary')
             .map(async (a) => {
@@ -4285,7 +4366,9 @@ class AXPEntityMasterListViewModel {
             if (isHidden)
                 return null;
             const disabled = await this.expressionEvaluator.evaluate(a.disabled, scope);
-            return { ...a, disabled };
+            const name = await this.resolveTriggerName(a.name, rowData);
+            const title = await this.resolveTitleExpression(a.title, rowData);
+            return { ...a, disabled, name, title };
         }));
         return actions.filter(Boolean);
     }
@@ -4536,7 +4619,8 @@ class AXPEntityMasterListViewModel {
                     : c.scope == AXPEntityCommandScope.Individual) ||
                     c.scope == AXPEntityCommandScope.TypeLevel));
         });
-        const command = commandName.split('&')[0];
+        const resolvedTriggerName = await this.resolveTriggerName(commandName, data);
+        const command = resolvedTriggerName.split('&')[0];
         const options = await this.evaluateExpressions(action?.options, data);
         const baseData = action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data;
         const commandData = this.mergeDefaultCategoryForCreate(command, baseData);
@@ -4878,10 +4962,16 @@ class AXPEntityUpdateViewSectionViewModel {
         this.elements = computed(() => {
             const { interfaces, properties } = this.entity;
             const updateProps = interfaces?.master?.update?.properties ?? [];
-            const updatePropNames = new Set(updateProps.map(({ name }) => name));
-            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && schema.visible !== false && updatePropNames.has(name));
-            return filteredProperties.map((property) => {
-                const updateProp = updateProps.find(({ name }) => name === property.name);
+            const propsByName = new Map(properties.map((p) => [p.name, p]));
+            const ordered = updateProps
+                .map((up, index) => ({ up, index }))
+                .filter(({ up }) => {
+                const p = propsByName.get(up.name);
+                return p !== undefined && p.groupId === this.group.id && p.schema.visible !== false;
+            })
+                .sort((a, b) => getMasterInterfacePropertySortKey(a.up, a.index) - getMasterInterfacePropertySortKey(b.up, b.index));
+            return ordered.map(({ up }) => {
+                const property = propsByName.get(up.name);
                 return new AXPEntityMasterUpdateElementViewModel(this.entity, property);
             });
         }, ...(ngDevMode ? [{ debugName: "elements" }] : /* istanbul ignore next */ []));
@@ -5133,17 +5223,31 @@ class AXPEntityMasterSingleViewGroupViewModel {
         }, ...(ngDevMode ? [{ debugName: "layout" }] : /* istanbul ignore next */ []));
         this.props = computed(() => {
             const { properties, interfaces } = this.entity;
-            const groupProperties = properties
-                .filter(({ groupId, schema }) => groupId === this.group.id && schema.visible !== false)
-                .map(({ name }) => name);
-            const viewProperties = interfaces?.master?.single?.properties?.filter(({ name }) => groupProperties.includes(name)) ?? [];
-            return viewProperties.map((prop) => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
+            const groupPropertyNames = new Set(properties.filter(({ groupId, schema }) => groupId === this.group.id && schema.visible !== false).map((p) => p.name));
+            const singleProps = interfaces?.master?.single?.properties ?? [];
+            const ordered = singleProps
+                .map((vp, index) => ({ vp, index }))
+                .filter(({ vp }) => groupPropertyNames.has(vp.name))
+                .sort((a, b) => getMasterInterfacePropertySortKey(a.vp, a.index) - getMasterInterfacePropertySortKey(b.vp, b.index));
+            return ordered.map(({ vp }) => new AXPEntityMasterSingleElementViewModel(this.entity, this, vp));
         }, ...(ngDevMode ? [{ debugName: "props" }] : /* istanbul ignore next */ []));
         this.editableProps = computed(() => {
             const { properties, interfaces } = this.entity;
-            const editablePropertyNames = interfaces?.master?.update?.properties?.map(({ name }) => name) ?? [];
-            const filteredProperties = properties.filter(({ groupId, schema, name }) => groupId === this.group.id && schema.visible !== false && editablePropertyNames.includes(name));
-            return filteredProperties.map((prop) => new AXPEntityMasterSingleElementViewModel(this.entity, this, prop));
+            const singleViews = interfaces?.master?.single?.properties ?? [];
+            const updateViews = interfaces?.master?.update?.properties ?? [];
+            const propsByName = new Map(properties.map((p) => [p.name, p]));
+            const ordered = updateViews
+                .map((up, index) => ({ up, index }))
+                .filter(({ up }) => {
+                const p = propsByName.get(up.name);
+                return p !== undefined && p.groupId === this.group.id && p.schema.visible !== false;
+            })
+                .sort((a, b) => getMasterInterfacePropertySortKey(a.up, a.index) - getMasterInterfacePropertySortKey(b.up, b.index));
+            return ordered.map(({ up }) => {
+                const viewProp = singleViews.find((s) => s.name === up.name) ??
+                    { name: up.name, layout: up.layout };
+                return new AXPEntityMasterSingleElementViewModel(this.entity, this, viewProp);
+            });
         }, ...(ngDevMode ? [{ debugName: "editableProps" }] : /* istanbul ignore next */ []));
         this.editable = computed(() => {
             return this.editableProps().length > 0;
@@ -5829,7 +5933,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         /** i18n key for the synthetic "all items" root row; resolved in the template with the translate pipe. */
         this.categoryTreeRootTitleI18nKey = AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY;
         this.translationService = inject(AXTranslationService);
-        this.mlsResolver = inject(AXPMultiLanguageStringResolverService);
         this.highlightService = inject(AXHighlightService);
         this.changeDetectorRef = inject(ChangeDetectorRef);
         //#endregion
@@ -7385,7 +7488,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                             const nodeData = pathNode['data'];
                             const pathTitle = nodeData
                                 ? this.getNodeTitle(nodeData)
-                                : this.mlsResolver.resolve(pathNode['title']);
+                                : this.translationService.resolve(pathNode['title']);
                             if (pathTitle) {
                                 titlePath.push(pathTitle);
                             }
@@ -7468,7 +7571,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         }
         const textField = this.treeConfig.textField || 'title';
         const raw = nodeData[textField];
-        return this.mlsResolver.resolve(raw);
+        return this.translationService.resolve(raw);
     }
     async getSelectedItems() {
         // selectedNodeIds now only contains LEAF nodes (already filtered)
@@ -7544,7 +7647,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             } @else if (searchValue().trim() && !isSearching()) {
               <div class="ax-text-xs ax-text-muted ax-flex ax-items-center ax-gap-1">
                 @if (searchResultCount() > 0) {
-                  <span>{{ resultsFoundText() }}</span>
+                  <span>{{ resultsFoundText() | translate | async }}</span>
                 }
               </div>
             }
@@ -7598,7 +7701,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                       @if (node.id === 'all') {
                         {{ categoryTreeRootTitleI18nKey | translate | async }}
                       } @else {
-                        {{ rawLabel | axpResolveMultiLanguageString }}
+                        {{ rawLabel | translate | async }}
                       }
                     </span>
                   </div>
@@ -7651,7 +7754,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         ></ax-button>
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4$1.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i5$1.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay"], outputs: ["datasourceChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "variant"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4$1.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i5$1.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay"], outputs: ["datasourceChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "variant"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryTreeSelectorComponent, decorators: [{
             type: Component,
@@ -7681,7 +7784,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             } @else if (searchValue().trim() && !isSearching()) {
               <div class="ax-text-xs ax-text-muted ax-flex ax-items-center ax-gap-1">
                 @if (searchResultCount() > 0) {
-                  <span>{{ resultsFoundText() }}</span>
+                  <span>{{ resultsFoundText() | translate | async }}</span>
                 }
               </div>
             }
@@ -7735,7 +7838,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                       @if (node.id === 'all') {
                         {{ categoryTreeRootTitleI18nKey | translate | async }}
                       } @else {
-                        {{ rawLabel | axpResolveMultiLanguageString }}
+                        {{ rawLabel | translate | async }}
                       }
                     </span>
                   </div>
@@ -7801,7 +7904,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         AXTreeViewComponent,
                         AXTranslationModule,
                         AXPStateMessageComponent,
-                        AXPResolveMultiLanguageStringPipe,
                         FormsModule,
                     ],
                 }]
@@ -7941,16 +8043,14 @@ class AXPEntityCategoryBatchResolverService {
                 items = result?.items ?? [];
                 allItems = items;
             }
-            const pathMap = parentKey
-                ? this.buildPathMap(allItems, valueField, textField, parentKey)
-                : null;
+            const pathMap = parentKey ? this.buildPathMap(allItems, valueField, textField, parentKey) : null;
             const result = new Map();
             for (const item of items) {
                 const id = String(get(item, valueField));
                 const rawTitle = get(item, textField);
                 const titleText = this.resolveCategoryLabel(rawTitle);
                 const path = pathMap
-                    ? pathMap.get(id) ?? (rawTitle != null && rawTitle !== '' ? [titleText] : [])
+                    ? (pathMap.get(id) ?? (rawTitle != null && rawTitle !== '' ? [titleText] : []))
                     : rawTitle != null && rawTitle !== ''
                         ? [titleText]
                         : [];
@@ -7983,10 +8083,7 @@ class AXPEntityCategoryBatchResolverService {
                 return [];
             const parentId = get(item, parentKey);
             const title = this.resolveCategoryLabel(get(item, textField));
-            if (parentId == null ||
-                parentId === '' ||
-                parentId === 'all' ||
-                String(parentId) === id) {
+            if (parentId == null || parentId === '' || parentId === 'all' || String(parentId) === id) {
                 const path = title ? [title] : [];
                 pathMap.set(id, path);
                 visited.add(id);
@@ -8427,7 +8524,7 @@ var entityCategoryWidgetColumn_component = /*#__PURE__*/Object.freeze({
 class AXPTruncatedBreadcrumbComponent {
     //#endregion
     constructor() {
-        this.mlsResolver = inject(AXPMultiLanguageStringResolverService);
+        this.mlsResolver = inject(AXTranslationService);
         /** Plain string or locale map per segment; truncation uses resolved text (see {@link resolvedSectionTexts}). */
         this.sections = input([], ...(ngDevMode ? [{ debugName: "sections" }] : /* istanbul ignore next */ []));
         this.characterLimit = input(20, ...(ngDevMode ? [{ debugName: "characterLimit" }] : /* istanbul ignore next */ []));
@@ -8450,7 +8547,7 @@ class AXPTruncatedBreadcrumbComponent {
             if (this.sectionLimit() === 'auto') {
                 const sections = this.resolvedSectionTexts();
                 // Return the maximum length of any section to prevent truncation
-                return sections.length > 0 ? Math.max(...sections.map(s => s.length)) : Number.MAX_SAFE_INTEGER;
+                return sections.length > 0 ? Math.max(...sections.map((s) => s.length)) : Number.MAX_SAFE_INTEGER;
             }
             // If only characterLimit is auto, calculate based on container width
             const width = this.containerWidth();
@@ -8554,7 +8651,7 @@ class AXPTruncatedBreadcrumbComponent {
       } @else {
         @if (isExpanded() && canToggle()) {
           @for (section of sections(); track $index; let isLast = $last) {
-            <span class="ax-text-sm">{{ section | axpResolveMultiLanguageString }}</span>
+            <span class="ax-text-sm">{{ section | translate | async }}</span>
             @if (!isLast) {
               <ax-icon [class]="separatorIcon()" class="rtl:ax-rotate-180 ax-text-muted ax-text-xs"></ax-icon>
             }
@@ -8594,7 +8691,7 @@ class AXPTruncatedBreadcrumbComponent {
         }
       }
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTruncatedBreadcrumbComponent, decorators: [{
             type: Component,
@@ -8610,7 +8707,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
       } @else {
         @if (isExpanded() && canToggle()) {
           @for (section of sections(); track $index; let isLast = $last) {
-            <span class="ax-text-sm">{{ section | axpResolveMultiLanguageString }}</span>
+            <span class="ax-text-sm">{{ section | translate | async }}</span>
             @if (!isLast) {
               <ax-icon [class]="separatorIcon()" class="rtl:ax-rotate-180 ax-text-muted ax-text-xs"></ax-icon>
             }
@@ -8652,7 +8749,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     </div>
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [AXDecoratorModule, AXPResolveMultiLanguageStringPipe],
+                    imports: [AXDecoratorModule, AXTranslationModule, AsyncPipe],
                 }]
         }], ctorParameters: () => [], propDecorators: { sections: [{ type: i0.Input, args: [{ isSignal: true, alias: "sections", required: false }] }], characterLimit: [{ type: i0.Input, args: [{ isSignal: true, alias: "characterLimit", required: false }] }], sectionLimit: [{ type: i0.Input, args: [{ isSignal: true, alias: "sectionLimit", required: false }] }], separatorIcon: [{ type: i0.Input, args: [{ isSignal: true, alias: "separatorIcon", required: false }] }], ellipsisIcon: [{ type: i0.Input, args: [{ isSignal: true, alias: "ellipsisIcon", required: false }] }], eyeIcon: [{ type: i0.Input, args: [{ isSignal: true, alias: "eyeIcon", required: false }] }], container: [{ type: i0.ViewChild, args: ['container', { isSignal: true }] }] } });
 
@@ -9112,7 +9209,11 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
         }
         // Return item with path array, or just the item title if no path
         const rawLeafTitle = get(item, textField);
-        const pathArray = path.length > 0 ? path : rawLeafTitle != null && rawLeafTitle !== '' ? [rawLeafTitle] : [];
+        const pathArray = path.length > 0
+            ? path
+            : rawLeafTitle != null && rawLeafTitle !== ''
+                ? [rawLeafTitle]
+                : [];
         return { ...item, path: pathArray };
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
@@ -9233,7 +9334,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         AXFormModule,
                         AXTagBoxModule,
                         AXTranslationModule,
-                        AXPTruncatedBreadcrumbComponent
+                        AXPTruncatedBreadcrumbComponent,
                     ],
                 }]
         }], propDecorators: { tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
@@ -9326,21 +9427,18 @@ class AXPEntityCategoryWidgetViewComponent extends AXPValueWidgetComponent {
     } @else {
       @if (displayItems().length > 1) {
         @for (item of displayItems(); track item.id) {
-          <ax-badge
-            class="ax-p-0.5 {{ badgeClass() }}"
-            [text]="item.titleRaw | axpResolveMultiLanguageString"
-          ></ax-badge>
+          <ax-badge class="ax-p-0.5 {{ badgeClass() }}" [text]="(item.titleRaw | translate | async) || ''"></ax-badge>
         }
       } @else if (displayItems().length == 1) {
         <ax-badge
           class="ax-p-0.5 {{ badgeClass() }}"
-          [text]="displayItems()[0].titleRaw | axpResolveMultiLanguageString"
+          [text]="(displayItems()[0].titleRaw | translate | async) || ''"
         ></ax-badge>
       } @else {
         <span class="ax-text-muted">---</span>
       }
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryWidgetViewComponent, decorators: [{
             type: Component,
@@ -9352,15 +9450,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     } @else {
       @if (displayItems().length > 1) {
         @for (item of displayItems(); track item.id) {
-          <ax-badge
-            class="ax-p-0.5 {{ badgeClass() }}"
-            [text]="item.titleRaw | axpResolveMultiLanguageString"
-          ></ax-badge>
+          <ax-badge class="ax-p-0.5 {{ badgeClass() }}" [text]="(item.titleRaw | translate | async) || ''"></ax-badge>
         }
       } @else if (displayItems().length == 1) {
         <ax-badge
           class="ax-p-0.5 {{ badgeClass() }}"
-          [text]="displayItems()[0].titleRaw | axpResolveMultiLanguageString"
+          [text]="(displayItems()[0].titleRaw | translate | async) || ''"
         ></ax-badge>
       } @else {
         <span class="ax-text-muted">---</span>
@@ -9368,7 +9463,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [AXLoadingModule, AXBadgeModule, AXPResolveMultiLanguageStringPipe],
+                    imports: [AXLoadingModule, AXBadgeModule, AXTranslationModule, AsyncPipe],
                 }]
         }] });
 
@@ -10501,7 +10596,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
               [class.ax-sm]="deviceService.isSmall()"
               [iconOnly]="deviceService.isSmall()"
               [disabled]="action.disabled"
-              [text]="action.title"
+              [text]="(action.title | translate | async)!"
               [look]="'solid'"
               [color]="action.color"
               (onClick)="handleActionClick(action)"
@@ -10515,7 +10610,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     @for (sub of action?.items; track $index) {
                       @if (sub.visible != false) {
                         <ax-button-item
-                          [text]="sub.title"
+                          [text]="(sub.title | translate | async)!"
                           [color]="sub.color"
                           [disabled]="sub.disabled"
                           (onClick)="handleActionClick(sub)"
@@ -10551,7 +10646,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 @for (item of secondaryActions(); track $index) {
                   @if (item.visible != false) {
                     <ax-button-item
-                      [text]="item.title"
+                      [text]="(item.title | translate | async)!"
                       [color]="item.color"
                       [disabled]="item.disabled"
                       (onClick)="handleSecondaryActionClick(item)"
@@ -10618,7 +10713,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [class.ax-sm]="deviceService.isSmall()"
               [iconOnly]="deviceService.isSmall()"
               [disabled]="action.disabled"
-              [text]="action.title"
+              [text]="(action.title | translate | async)!"
               [look]="'solid'"
               [color]="action.color"
               (onClick)="handleActionClick(action)"
@@ -10632,7 +10727,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     @for (sub of action?.items; track $index) {
                       @if (sub.visible != false) {
                         <ax-button-item
-                          [text]="sub.title"
+                          [text]="(sub.title | translate | async)!"
                           [color]="sub.color"
                           [disabled]="sub.disabled"
                           (onClick)="handleActionClick(sub)"
@@ -10668,7 +10763,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 @for (item of secondaryActions(); track $index) {
                   @if (item.visible != false) {
                     <ax-button-item
-                      [text]="item.title"
+                      [text]="(item.title | translate | async)!"
                       [color]="item.color"
                       [disabled]="item.disabled"
                       (onClick)="handleSecondaryActionClick(item)"
@@ -10784,7 +10879,10 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
             return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
         }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : /* istanbul ignore next */ []));
         this.displayField = computed(() => {
-            return this.textField() ?? this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title';
+            return (this.textField() ??
+                this.entityDef()?.formats.lookup ??
+                this.entityDef()?.properties.find((c) => c.name != 'id')?.name ??
+                'title');
         }, ...(ngDevMode ? [{ debugName: "displayField" }] : /* istanbul ignore next */ []));
         this.loading = signal(false, ...(ngDevMode ? [{ debugName: "loading" }] : /* istanbul ignore next */ []));
         this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : /* istanbul ignore next */ []));
@@ -10827,9 +10925,6 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
             text: item,
         };
     }
-    /**
-     * Raw label for {@link AXPResolveMultiLanguageStringPipe} (handles {@link AXPMultiLanguageString} and plain strings).
-     */
     getDisplayRaw(item) {
         if (!item) {
             return '';
@@ -10861,50 +10956,48 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetViewComponent, isStandalone: true, selector: "axp-lookup-widget-view", host: { properties: { "class": "this.__class" } }, usesInheritance: true, ngImport: i0, template: `
-    @if(loading())
-    {
+    @if (loading()) {
       <ax-loading></ax-loading>
-    }
-    @else{
-        @if(displayItems().length > 1) {
-          @for (item of displayItems(); track $index) {
-            <ax-badge class="ax-p-0.5 {{badgeClass()}}"  [text]="item.text | axpResolveMultiLanguageString" ></ax-badge>
-          }
-        }
-        @else if(displayItems().length == 1) {
-          <ax-badge class="ax-p-0.5 {{badgeClass()}}"  [text]="displayItems()[0].text | axpResolveMultiLanguageString" ></ax-badge>
-        }
-        @else {
-          <span class="ax-text-muted">---</span>
+    } @else {
+      @if (displayItems().length > 1) {
+        @for (item of displayItems(); track $index) {
+          <ax-badge class="ax-p-0.5 {{ badgeClass() }}" [text]="(item.text | translate | async) || ''"></ax-badge>
         }
+      } @else if (displayItems().length == 1) {
+        <ax-badge
+          class="ax-p-0.5 {{ badgeClass() }}"
+          [text]="(displayItems()[0].text | translate | async) || ''"
+        ></ax-badge>
+      } @else {
+        <span class="ax-text-muted">---</span>
+      }
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetViewComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-lookup-widget-view',
                     template: `
-    @if(loading())
-    {
+    @if (loading()) {
       <ax-loading></ax-loading>
-    }
-    @else{
-        @if(displayItems().length > 1) {
-          @for (item of displayItems(); track $index) {
-            <ax-badge class="ax-p-0.5 {{badgeClass()}}"  [text]="item.text | axpResolveMultiLanguageString" ></ax-badge>
-          }
-        }
-        @else if(displayItems().length == 1) {
-          <ax-badge class="ax-p-0.5 {{badgeClass()}}"  [text]="displayItems()[0].text | axpResolveMultiLanguageString" ></ax-badge>
-        }
-        @else {
-          <span class="ax-text-muted">---</span>
+    } @else {
+      @if (displayItems().length > 1) {
+        @for (item of displayItems(); track $index) {
+          <ax-badge class="ax-p-0.5 {{ badgeClass() }}" [text]="(item.text | translate | async) || ''"></ax-badge>
         }
+      } @else if (displayItems().length == 1) {
+        <ax-badge
+          class="ax-p-0.5 {{ badgeClass() }}"
+          [text]="(displayItems()[0].text | translate | async) || ''"
+        ></ax-badge>
+      } @else {
+        <span class="ax-text-muted">---</span>
+      }
     }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [AXLoadingModule, AXBadgeModule, AXPResolveMultiLanguageStringPipe]
+                    imports: [AXLoadingModule, AXBadgeModule, AXTranslationModule, AsyncPipe],
                 }]
         }], propDecorators: { __class: [{
                 type: HostBinding,
@@ -11351,7 +11444,7 @@ class LookupWidgetLookBase {
 class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
     constructor() {
         super(...arguments);
-        this.mlsResolver = inject(AXPMultiLanguageStringResolverService);
+        this.mlsResolver = inject(AXTranslationService);
         //#region ----   Inputs   ----
         this.entityDef = input.required(...(ngDevMode ? [{ debugName: "entityDef" }] : /* istanbul ignore next */ []));
         this.customFilter = input.required(...(ngDevMode ? [{ debugName: "customFilter" }] : /* istanbul ignore next */ []));
@@ -11361,6 +11454,7 @@ class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
         this.disabled = input.required(...(ngDevMode ? [{ debugName: "disabled" }] : /* istanbul ignore next */ []));
         this.multiple = input.required(...(ngDevMode ? [{ debugName: "multiple" }] : /* istanbul ignore next */ []));
         this.validationRules = input.required(...(ngDevMode ? [{ debugName: "validationRules" }] : /* istanbul ignore next */ []));
+        this.placeholder = input(...(ngDevMode ? [undefined, { debugName: "placeholder" }] : /* istanbul ignore next */ []));
         this.hasClearButton = input(false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : /* istanbul ignore next */ []));
         this.allowCreate = input('none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
         //#endregion
@@ -11378,6 +11472,7 @@ class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
         this.disabledValue = computed(() => this.disabled()(), ...(ngDevMode ? [{ debugName: "disabledValue" }] : /* istanbul ignore next */ []));
         this.multipleValue = computed(() => this.multiple()(), ...(ngDevMode ? [{ debugName: "multipleValue" }] : /* istanbul ignore next */ []));
         this.validationRulesValue = computed(() => this.validationRules()(), ...(ngDevMode ? [{ debugName: "validationRulesValue" }] : /* istanbul ignore next */ []));
+        this.placeholderValue = computed(() => this.placeholder()?.() ?? '', ...(ngDevMode ? [{ debugName: "placeholderValue" }] : /* istanbul ignore next */ []));
         /**
          * Get default sort order from entity's first list view
          */
@@ -11507,18 +11602,18 @@ class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
         this.dataSource()?.refresh();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetSelectComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetSelectComponent, isStandalone: true, selector: "axp-lookup-widget-select", inputs: { entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetSelectComponent, isStandalone: true, selector: "axp-lookup-widget-select", inputs: { entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
             {
                 provide: LookupWidgetLookBase,
                 useExisting: AXPLookupWidgetSelectComponent,
-            }
+            },
         ], viewQueries: [{ propertyName: "selectBox", first: true, predicate: ["selectBox"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
     @if (dataSource()) {
       <div class="ax-flex ax-items-center ax-gap-1 ax-w-full">
         <ax-select-box
           #selectBox
           class="ax-flex-1 ax-min-w-0"
-          [placeholder]="('@general:widgets.lookup.placeholder' | translate | async)!"
+          [placeholder]="placeholderValue() || (('@general:widgets.lookup.placeholder' | translate | async) ?? '')"
           [dataSource]="dataSource()!"
           [ngModel]="selectedItemsValue()"
           [textField]="displayFieldValue()"
@@ -11528,11 +11623,9 @@ class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
           (onValueChanged)="handleValueChanged($event)"
         >
           @if (hasClearButton()) {
-            <ax-clear-button ></ax-clear-button>
+            <ax-clear-button></ax-clear-button>
           }
-          <ax-search-box
-            [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!"
-          >
+          <ax-search-box [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!">
             <ax-clear-button></ax-clear-button>
           </ax-search-box>
           @for (validation of validationRulesValue(); track $index) {
@@ -11543,7 +11636,6 @@ class AXPLookupWidgetSelectComponent extends LookupWidgetLookBase {
             ></ax-validation-rule>
           }
         </ax-select-box>
-       
       </div>
     }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$2.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i2$2.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "itemHeight", "maxVisibleItems", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
@@ -11558,7 +11650,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
         <ax-select-box
           #selectBox
           class="ax-flex-1 ax-min-w-0"
-          [placeholder]="('@general:widgets.lookup.placeholder' | translate | async)!"
+          [placeholder]="placeholderValue() || (('@general:widgets.lookup.placeholder' | translate | async) ?? '')"
           [dataSource]="dataSource()!"
           [ngModel]="selectedItemsValue()"
           [textField]="displayFieldValue()"
@@ -11568,11 +11660,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
           (onValueChanged)="handleValueChanged($event)"
         >
           @if (hasClearButton()) {
-            <ax-clear-button ></ax-clear-button>
+            <ax-clear-button></ax-clear-button>
           }
-          <ax-search-box
-            [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!"
-          >
+          <ax-search-box [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!">
             <ax-clear-button></ax-clear-button>
           </ax-search-box>
           @for (validation of validationRulesValue(); track $index) {
@@ -11583,7 +11673,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             ></ax-validation-rule>
           }
         </ax-select-box>
-       
       </div>
     }
   `,
@@ -11603,10 +11692,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         {
                             provide: LookupWidgetLookBase,
                             useExisting: AXPLookupWidgetSelectComponent,
-                        }
+                        },
                     ],
                 }]
-        }], propDecorators: { entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], selectBox: [{ type: i0.ViewChild, args: ['selectBox', { isSignal: true }] }] } });
+        }], propDecorators: { entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], selectBox: [{ type: i0.ViewChild, args: ['selectBox', { isSignal: true }] }] } });
 
 class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
     constructor() {
@@ -11625,6 +11714,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.multiple = input.required(...(ngDevMode ? [{ debugName: "multiple" }] : /* istanbul ignore next */ []));
         this.isLoading = input.required(...(ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []));
         this.validationRules = input.required(...(ngDevMode ? [{ debugName: "validationRules" }] : /* istanbul ignore next */ []));
+        this.placeholder = input(...(ngDevMode ? [undefined, { debugName: "placeholder" }] : /* istanbul ignore next */ []));
         this.hasClearButton = input(false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : /* istanbul ignore next */ []));
         this.allowCreate = input('none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
         // Entity and configuration data (for showSelector and searchByValue)
@@ -11675,6 +11765,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.multipleValue = computed(() => this.multiple()(), ...(ngDevMode ? [{ debugName: "multipleValue" }] : /* istanbul ignore next */ []));
         this.isLoadingValue = computed(() => this.isLoading()(), ...(ngDevMode ? [{ debugName: "isLoadingValue" }] : /* istanbul ignore next */ []));
         this.validationRulesValue = computed(() => this.validationRules()(), ...(ngDevMode ? [{ debugName: "validationRulesValue" }] : /* istanbul ignore next */ []));
+        this.placeholderValue = computed(() => this.placeholder()?.() ?? '', ...(ngDevMode ? [{ debugName: "placeholderValue" }] : /* istanbul ignore next */ []));
     }
     #focusEffect;
     focus() {
@@ -11855,7 +11946,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.clear();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetTagboxComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
             {
                 provide: LookupWidgetLookBase,
                 useExisting: AXPLookupWidgetTagboxComponent,
@@ -11868,7 +11959,11 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
       [textField]="displayFieldValue()"
       [valueField]="valueFieldValue()"
       (onValueChanged)="handleValueChanged($event)"
-      [placeholder]="selectedItemsValue().length ? '' : ('@general:widgets.lookup.placeholder' | translate | async)!"
+      [placeholder]="
+        selectedItemsValue().length
+          ? ''
+          : (placeholderValue() || (('@general:widgets.lookup.placeholder' | translate | async) ?? ''))
+      "
       [addOnEnter]="false"
       [addOnComma]="false"
       [disabled]="disabledValue()"
@@ -11904,13 +11999,13 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
     </ax-tag-box>
     <ng-template #tagTemplate let-item let-index="index">
       <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
-        <span>{{ getDisplayRaw(item) | axpResolveMultiLanguageString }}</span>
+        <span>{{ getDisplayRaw(item) | translate | async }}</span>
         <button type="button" (click)="tagBoxComponent.removeItem(index)">
           <ax-icon class="ax-icon ax-icon-close"></ax-icon>
         </button>
       </div>
     </ng-template>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$2.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6$1.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues", "tagTemplate"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress", "onTagClick", "onTagDblClick", "onTagContextMenu"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }, { kind: "pipe", type: AXPResolveMultiLanguageStringPipe, name: "axpResolveMultiLanguageString" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$2.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6$1.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues", "tagTemplate"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress", "onTagClick", "onTagDblClick", "onTagContextMenu"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetTagboxComponent, decorators: [{
             type: Component,
@@ -11924,7 +12019,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
       [textField]="displayFieldValue()"
       [valueField]="valueFieldValue()"
       (onValueChanged)="handleValueChanged($event)"
-      [placeholder]="selectedItemsValue().length ? '' : ('@general:widgets.lookup.placeholder' | translate | async)!"
+      [placeholder]="
+        selectedItemsValue().length
+          ? ''
+          : (placeholderValue() || (('@general:widgets.lookup.placeholder' | translate | async) ?? ''))
+      "
       [addOnEnter]="false"
       [addOnComma]="false"
       [disabled]="disabledValue()"
@@ -11960,7 +12059,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     </ax-tag-box>
     <ng-template #tagTemplate let-item let-index="index">
       <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
-        <span>{{ getDisplayRaw(item) | axpResolveMultiLanguageString }}</span>
+        <span>{{ getDisplayRaw(item) | translate | async }}</span>
         <button type="button" (click)="tagBoxComponent.removeItem(index)">
           <ax-icon class="ax-icon ax-icon-close"></ax-icon>
         </button>
@@ -11978,7 +12077,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         AXFormModule,
                         AXTagBoxModule,
                         AXTranslationModule,
-                        AXPResolveMultiLanguageStringPipe,
                     ],
                     providers: [
                         {
@@ -11987,7 +12085,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         },
                     ],
                 }]
-        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
+        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
 
 class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
@@ -11997,7 +12095,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.entityService = inject(AXPEntityService);
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
-        this.mlsResolver = inject(AXPMultiLanguageStringResolverService);
+        this.mlsResolver = inject(AXTranslationService);
         //#endregion
         //#region ----   View Children   ----
         this.componentLook = viewChild(LookupWidgetLookBase, ...(ngDevMode ? [{ debugName: "componentLook" }] : /* istanbul ignore next */ []));
@@ -12010,6 +12108,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.textField = computed(() => this.options()['textField'] ?? '', ...(ngDevMode ? [{ debugName: "textField" }] : /* istanbul ignore next */ []));
         this.hasClearButton = computed(() => (!this.filterMode() && this.options()['hasClearButton']) ?? false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : /* istanbul ignore next */ []));
         this.customFilter = computed(() => this.options()['filter'], ...(ngDevMode ? [{ debugName: "customFilter" }] : /* istanbul ignore next */ []));
+        this.placeholder = computed(() => this.options()['placeholder'] ?? '', ...(ngDevMode ? [{ debugName: "placeholder" }] : /* istanbul ignore next */ []));
         this.filterMode = computed(() => this.options()['filterMode'], ...(ngDevMode ? [{ debugName: "filterMode" }] : /* istanbul ignore next */ []));
         this.multiple = computed(() => (this.options()['multiple'] ?? false), ...(ngDevMode ? [{ debugName: "multiple" }] : /* istanbul ignore next */ []));
         this.look = computed(() => this.options()['look'] ?? 'lookup', ...(ngDevMode ? [{ debugName: "look" }] : /* istanbul ignore next */ []));
@@ -12288,6 +12387,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [valueField]="valueField"
               [disabled]="disabled"
               [multiple]="multiple"
+              [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
               [allowCreate]="allowCreate()"
@@ -12303,6 +12403,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [displayFormat]="displayFormat"
               [disabled]="disabled"
               [multiple]="multiple"
+              [placeholder]="placeholder"
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
@@ -12331,7 +12432,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
       </div>
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "hasClearButton", "allowCreate"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "hasClearButton", "allowCreate", "entityDef", "customFilter", "columns", "parentFilters", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "placeholder", "hasClearButton", "allowCreate"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "placeholder", "hasClearButton", "allowCreate", "entityDef", "customFilter", "columns", "parentFilters", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
@@ -12351,6 +12452,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [valueField]="valueField"
               [disabled]="disabled"
               [multiple]="multiple"
+              [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
               [allowCreate]="allowCreate()"
@@ -12366,6 +12468,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [displayFormat]="displayFormat"
               [disabled]="disabled"
               [multiple]="multiple"
+              [placeholder]="placeholder"
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
@@ -12417,7 +12520,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         super(...arguments);
         //#region ----   Dependencies   ----
         this.entityDetailPopoverService = inject(AXPEntityDetailPopoverService);
-        this.mlResolver = inject(AXPMultiLanguageStringResolverService);
+        this.mlResolver = inject(AXTranslationService);
         this.formatService = inject(AXFormatService);
         //#endregion
         //#region ----   View Children   ----
@@ -12446,7 +12549,9 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         //#region ----   Computed Properties   ----
         this.displayItems = computed(() => isNil(this.rawValue)
             ? []
-            : castArray(this.rawValue).map((item) => this.extractItem(item)).filter((c) => c != null), ...(ngDevMode ? [{ debugName: "displayItems" }] : /* istanbul ignore next */ []));
+            : castArray(this.rawValue)
+                .map((item) => this.extractItem(item))
+                .filter((c) => c != null), ...(ngDevMode ? [{ debugName: "displayItems" }] : /* istanbul ignore next */ []));
         this.allItems = computed(() => this.displayItems(), ...(ngDevMode ? [{ debugName: "allItems" }] : /* istanbul ignore next */ []));
         this.visibleItems = computed(() => {
             const items = this.allItems();
@@ -12482,7 +12587,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             id: id,
             textField: this.textField,
             valueField: this.valueField,
-            item
+            item,
         });
     }
     handleItemClick(index) {
@@ -15307,8 +15412,8 @@ class AXPLayoutAdapterBuilder {
         return this;
     }
     /**
-     * Sets the evaluated root title (e.g. "Robert Wilson") used when displaying the adapter title on mobile.
-     * Without this, the raw template expression would be shown when showPages is true.
+     * Sets the evaluated root title (e.g. display name) used when displaying the adapter title on mobile.
+     * Accepts a plain string, `@` i18n key, or locale map. Without this, the raw template expression would be shown when showPages is true.
      */
     setRootTitle(rootTitle) {
         this.rootTitle = rootTitle;
@@ -15746,7 +15851,7 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
         const actions = this.buildActions(entityDef, helpers.singleInterface);
         return {
             id: entityDef?.name ?? '',
-            title: `${context.rootTitle}`,
+            title: context.rootTitle ?? '',
             label: relatedEntity.title ?? '@general:terms.common.overview',
             icon: relatedEntity.icon || entityDef.icon,
             isReadonly: isPageReadonly,
@@ -15988,7 +16093,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
         }) ?? []);
         return {
             id: entityDef?.name ?? '',
-            title: `${context.rootTitle}`,
+            title: context.rootTitle ?? '',
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
             actions: this.mergeActions(entityDef, actions)
@@ -16755,12 +16860,29 @@ class AXPMainEntityContentBuilder {
                     },
                     children: await Promise.all((await Promise.all(combinedSections.map(async (s) => {
                         const properties = await getVisiblePropertyByGroupId(s.id);
-                        const visibleProperties = properties.filter((p) => {
+                        const inView = properties.filter((p) => {
                             const isFromRelated = p.__dataPath != null;
                             const visibleInMain = visiblePropertyNames.has(p.name);
                             const visibleInRelated = isFromRelated ? !!p.__layout : false;
                             return visibleInMain || visibleInRelated;
                         });
+                        const visibilityEvaluated = await Promise.all(inView.map(async (p) => {
+                            let visible = p.schema?.visible;
+                            if (typeof visible === 'string' && evaluateExpressions) {
+                                try {
+                                    const result = await evaluateExpressions({ visible });
+                                    visible = result.visible;
+                                }
+                                catch {
+                                    visible = true;
+                                }
+                            }
+                            const resolved = visible !== false;
+                            return { property: p, resolvedVisible: resolved };
+                        }));
+                        const visibleProperties = visibilityEvaluated
+                            .filter((x) => x.resolvedVisible)
+                            .map((x) => x.property);
                         return { section: s, hasProperties: visibleProperties.length > 0, visibleProperties };
                     })))
                         .filter((item) => item.hasProperties)
@@ -16803,6 +16925,14 @@ class AXPMainEntityContentBuilder {
                                                 : editablePropertyNames.has(p.name);
                                             // Check if property has its own disabled option
                                             const hasOwnDisabled = p.schema.interface?.options?.disabled !== undefined;
+                                            let formFieldVisible;
+                                            const sv = p.schema?.visible;
+                                            if (typeof sv === 'string') {
+                                                formFieldVisible = true;
+                                            }
+                                            else if (sv === false) {
+                                                formFieldVisible = false;
+                                            }
                                             return {
                                                 type: 'form-field',
                                                 options: {
@@ -16814,7 +16944,7 @@ class AXPMainEntityContentBuilder {
                                                     rowSpan: layout?.positions?.lg?.rowSpan,
                                                     rowStart: layout?.positions?.lg?.rowStart,
                                                     rowEnd: layout?.positions?.lg?.rowEnd,
-                                                    visible: p.schema.visible,
+                                                    ...(formFieldVisible !== undefined ? { visible: formFieldVisible } : {}),
                                                 },
                                                 children: [
                                                     {
@@ -17159,8 +17289,18 @@ class AXPLayoutAdapterFactory {
     }
     async getRootTitle(entity, rootContext, dependencies) {
         const titleTemplate = entity.interfaces?.master?.single?.title;
-        if (!titleTemplate || typeof titleTemplate !== 'string') {
-            return entity?.formats?.individual ?? '';
+        const fallback = entity?.formats?.individual ?? '';
+        if (titleTemplate == null || titleTemplate === '') {
+            return fallback;
+        }
+        if (typeof titleTemplate === 'object' && !Array.isArray(titleTemplate)) {
+            return titleTemplate;
+        }
+        if (typeof titleTemplate !== 'string') {
+            return fallback;
+        }
+        if (!dependencies?.expressionEvaluator) {
+            return titleTemplate;
         }
         const scope = {
             ...rootContext,
@@ -17169,7 +17309,7 @@ class AXPLayoutAdapterFactory {
             },
         };
         const title = await dependencies.expressionEvaluator.evaluate(titleTemplate, scope);
-        return typeof title === 'string' ? title : (entity?.formats?.individual ?? '');
+        return title;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }, { token: i4$4.AXPFilterOperatorMiddlewareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutAdapterFactory, providedIn: 'root' }); }
@@ -17193,7 +17333,8 @@ const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver =
         workflowService,
         commandService,
     };
-    return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+    const adapter = await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+    return adapter;
 };
 
 class AXPEntityPreloadFilterGuard {
@@ -17455,8 +17596,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
         }], ctorParameters: () => [] });
 
 /**
- * Default order for common sections
+ * Default shipped rules: narrow identifier + wider title on `md` / `lg`.
  */
+const DEFAULT_PAIR_SPAN_RULES = [
+    {
+        first: 'code',
+        second: 'title',
+        firstSpan: 4,
+        secondSpan: 8,
+        breakpoints: ['md', 'lg'],
+    },
+    {
+        first: 'name',
+        second: 'title',
+        firstSpan: 4,
+        secondSpan: 8,
+        breakpoints: ['md', 'lg'],
+    },
+];
 const DEFAULT_SECTION_ORDER = {
     'basic-info': -100,
     classification: 20,
@@ -17465,32 +17622,23 @@ const DEFAULT_SECTION_ORDER = {
     metadata: 120,
     settings: 200,
 };
-/**
- * Default order for common properties
- * Format: 'sectionId.propertyName' for section-specific or 'propertyName' for any section
- */
 const DEFAULT_PROPERTY_ORDER = {
-    // Basic Info section
     'basic-info.code': -10,
     'basic-info.title': -9,
     'basic-info.name': -8,
     'basic-info.description': -7,
     'basic-info.note': -6,
     'basic-info.notes': -5,
-    // Classification section
     'classification.categoryIds': 1,
     'classification.tags': 2,
     'classification.type': 3,
-    // Appearance section
     'appearance.icon': 1,
     'appearance.color': 2,
     'appearance.avatar': 3,
-    // Settings section
     'settings.isDefault': 90,
     'settings.isPrimary': 91,
     'settings.isDisabled': 95,
     'settings.isArchived': 96,
-    // Generic fallbacks (apply to any section if not specified above)
     code: 1,
     title: 2,
     name: 3,
@@ -17505,23 +17653,111 @@ const DEFAULT_PROPERTY_ORDER = {
     isDisabled: 95,
     isArchived: 96,
 };
-/**
- * Get the property order for a given section and property name
- */
+const DEFAULT_PAIR_BREAKPOINTS = ['md', 'lg'];
+function applyPairSpanRules(layout, rules, getGroupId) {
+    if (!layout.properties?.length || rules.length === 0) {
+        return;
+    }
+    const namesByGroup = new Map();
+    for (const prop of layout.properties) {
+        if (!prop.name)
+            continue;
+        const gid = getGroupId(prop.name);
+        if (!gid)
+            continue;
+        if (!namesByGroup.has(gid)) {
+            namesByGroup.set(gid, new Set());
+        }
+        namesByGroup.get(gid).add(prop.name);
+    }
+    const findPropView = (name) => layout.properties.find((p) => p.name === name);
+    const spanIfUnset = (pv, breakpoint, span) => {
+        if (!pv.layout)
+            pv.layout = {};
+        let positions = pv.layout['positions'] ?? undefined;
+        if (!positions) {
+            positions = {};
+            pv.layout['positions'] = positions;
+        }
+        const cell = positions[breakpoint] ?? {};
+        positions[breakpoint] = cell;
+        if (cell.colSpan === undefined)
+            cell.colSpan = span;
+    };
+    for (const namesInGroup of namesByGroup.values()) {
+        for (const rule of rules) {
+            if (!namesInGroup.has(rule.first) || !namesInGroup.has(rule.second))
+                continue;
+            if (rule.first === 'name' && rule.second === 'title' && namesInGroup.has('code')) {
+                continue;
+            }
+            const a = findPropView(rule.first);
+            const b = findPropView(rule.second);
+            if (!a || !b)
+                continue;
+            const breakpoints = rule.breakpoints?.length ? rule.breakpoints : DEFAULT_PAIR_BREAKPOINTS;
+            for (const bp of breakpoints)
+                spanIfUnset(a, bp, rule.firstSpan);
+            for (const bp of breakpoints)
+                spanIfUnset(b, bp, rule.secondSpan);
+            break;
+        }
+    }
+}
 const getPropertyOrder = (sectionId, propertyName, orderConfig) => {
-    // Try section-specific order first
     if (sectionId) {
         const sectionSpecific = orderConfig[`${sectionId}.${propertyName}`];
-        if (sectionSpecific !== undefined) {
+        if (sectionSpecific !== undefined)
             return sectionSpecific;
-        }
     }
-    // Fall back to generic property order
     return orderConfig[propertyName];
 };
 /**
- * Factory to create a layout ordering middleware
+ * True when the entity already defined sort order for this property view.
+ * Middleware default order applies only when this is false (entity layout takes priority).
  */
+function hasExplicitLayoutOrder(prop) {
+    const layout = prop.layout;
+    if (!layout || typeof layout !== 'object') {
+        return false;
+    }
+    if (layout['order'] !== undefined && layout['order'] !== null) {
+        return true;
+    }
+    const positions = layout['positions'];
+    if (!positions || typeof positions !== 'object') {
+        return false;
+    }
+    for (const key of Object.keys(positions)) {
+        const cell = positions[key];
+        if (cell && typeof cell === 'object' && cell['order'] !== undefined && cell['order'] !== null) {
+            return true;
+        }
+    }
+    return false;
+}
+function resolveViewPropertySortOrder(prop) {
+    const toNum = (v) => {
+        if (v === undefined || v === null)
+            return null;
+        const n = Number(v);
+        return Number.isFinite(n) ? n : null;
+    };
+    const layout = prop.layout;
+    if (!layout)
+        return 999;
+    const primary = toNum(layout['order']);
+    if (primary !== null)
+        return primary;
+    const positions = layout['positions'];
+    const lg = toNum(positions?.['lg']?.order);
+    if (lg !== null)
+        return lg;
+    const md = toNum(positions?.['md']?.order);
+    if (md !== null)
+        return md;
+    return 999;
+}
 const layoutOrderingMiddlewareFactory = (config) => {
     return (context) => {
         const configService = inject(AXPLayoutOrderingConfigService);
@@ -17529,64 +17765,51 @@ const layoutOrderingMiddlewareFactory = (config) => {
             return;
         }
         const { sections: sectionOrder, properties: propertyOrder } = config;
-        //#region ----   Order Sections   ----
+        const pairRules = config.pairSpanRules === false
+            ? []
+            : config.pairSpanRules?.length
+                ? config.pairSpanRules
+                : [...DEFAULT_PAIR_SPAN_RULES];
         const orderSections = (layout) => {
-            if (!layout || !layout.sections) {
+            if (!layout?.sections)
                 return;
-            }
             layout.sections.forEach((section) => {
                 const defaultOrder = sectionOrder[section.id];
-                if (defaultOrder !== undefined) {
-                    // Always apply the default order if configured (force override)
+                if (defaultOrder !== undefined && section.order === undefined) {
                     section.order = defaultOrder;
                 }
-                else {
-                    //   console.log(`[Layout Ordering Middleware] No default order for section "${section.id}"`);
-                }
             });
-            // Sort sections by order
             layout.sections.sort((a, b) => {
                 const orderA = a.order ?? 999;
                 const orderB = b.order ?? 999;
                 return orderA - orderB;
             });
         };
-        //#endregion
-        //#region ----   Order Properties Within Sections   ----
         const orderProperties = (layout) => {
-            if (!layout || !layout.properties) {
+            if (!layout?.properties)
                 return;
-            }
             layout.properties.forEach((prop) => {
                 const groupId = context.properties.find(prop.name).get()?.groupId;
                 const defaultOrder = getPropertyOrder(groupId, prop.name, propertyOrder);
-                if (defaultOrder !== undefined) {
-                    // Ensure layout.positions exists
-                    if (!prop.layout) {
+                if (defaultOrder !== undefined && !hasExplicitLayoutOrder(prop)) {
+                    if (!prop.layout)
                         prop.layout = {};
-                    }
-                    if (!prop.layout.positions) {
+                    if (prop.layout.order === undefined)
+                        prop.layout.order = defaultOrder;
+                    if (!prop.layout.positions)
                         prop.layout.positions = {};
-                    }
-                    if (!prop.layout.positions.lg) {
+                    if (!prop.layout.positions.lg)
                         prop.layout.positions.lg = {};
-                    }
-                    // Set order if not already defined
                     if (prop.layout.positions.lg.order === undefined) {
                         prop.layout.positions.lg.order = defaultOrder;
                     }
                 }
             });
-            // Sort properties by order
-            layout.properties.sort((a, b) => {
-                const orderA = a.layout?.positions?.lg?.order ?? 999;
-                const orderB = b.layout?.positions?.lg?.order ?? 999;
-                return orderA - orderB;
-            });
+            layout.properties.sort((a, b) => resolveViewPropertySortOrder(a) - resolveViewPropertySortOrder(b));
+            if (pairRules.length > 0) {
+                applyPairSpanRules(layout, pairRules, (propertyName) => context.properties.find(propertyName).get()?.groupId);
+            }
         };
-        //#endregion
-        //#region ----   Apply to All Layouts   ----
-        // Apply to create layout
         context.interfaces.master.create.update((create) => {
             if (create) {
                 orderSections(create);
@@ -17594,7 +17817,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
             }
             return create ?? { sections: [], properties: [] };
         });
-        // Apply to modify layout
         context.interfaces.master.modify.update((modify) => {
             if (modify) {
                 orderSections(modify);
@@ -17602,7 +17824,6 @@ const layoutOrderingMiddlewareFactory = (config) => {
             }
             return modify ?? { sections: [], properties: [] };
         });
-        // Apply to single layout
         context.interfaces.master.single.update((single) => {
             if (single) {
                 orderSections(single);
@@ -17610,27 +17831,20 @@ const layoutOrderingMiddlewareFactory = (config) => {
             }
             return single ?? { title: context.entity.title, sections: [], properties: [] };
         });
-        //#endregion
     };
 };
-//#endregion
-//#region ----   Provider Registration   ----
-/**
- * Helper to create a provider for the layout ordering middleware
- * By default it applies to all entities using the '*' pattern
- */
-const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') => {
-    return {
-        entityName,
-        modifier: layoutOrderingMiddlewareFactory({
-            sections: { ...DEFAULT_SECTION_ORDER, ...config.sections },
-            properties: { ...DEFAULT_PROPERTY_ORDER, ...config.properties },
-        }),
-    };
-};
-/**
- * Default provider registered with the default configuration
- */
+const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') => ({
+    entityName,
+    modifier: layoutOrderingMiddlewareFactory({
+        sections: { ...DEFAULT_SECTION_ORDER, ...config.sections },
+        properties: { ...DEFAULT_PROPERTY_ORDER, ...config.properties },
+        pairSpanRules: config.pairSpanRules === false
+            ? false
+            : config.pairSpanRules !== undefined
+                ? config.pairSpanRules
+                : undefined,
+    }),
+});
 const layoutOrderingMiddlewareProvider = createLayoutOrderingMiddlewareProvider();
 //#endregion
 
@@ -18281,8 +18495,7 @@ class AXPShowFileUploaderPopupAction extends AXPWorkflowAction {
         const fileEditable = context.getVariable('options.fileEditable');
         const enableTitleDescription = context.getVariable('options.enableTitleDescription');
         const showEditDialogAfterSelect = context.getVariable('options.showEditDialogAfterSelect');
-        //check is correct file
-        const correctFiles = files.filter((item) => item != undefined);
+        const correctFiles = (files ?? []).filter((item) => item != null && typeof item === 'object' && typeof item.name === 'string');
         // *********** show file list ***********
         const res = await this.fileUploaderWidgetService.showFileList({
             files: correctFiles,
@@ -19171,5 +19384,5 @@ function detectEntityChanges(oldObj, newObj) {
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_COLUMN_ORDER, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, cloneLayoutArrays, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, provideEntity, resolveEntityPluginDetailPageOrder, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_COLUMN_ORDER, DEFAULT_PAIR_SPAN_RULES, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, cloneLayoutArrays, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, getMasterInterfacePropertySortKey, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, provideEntity, resolveEntityPluginDetailPageOrder, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map