@acorex/platform 20.4.1 → 20.4.2

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

@@ -3578,9 +3578,10 @@ class AXPMainEntityContentBuilder {
             ? this.createExpressionEvaluator(rootContext, dependencies.expressionEvaluator)
             : null;
         // Prepare merge-details structures (sections and properties per section)
-        if (entity?.relatedEntities && evaluateExpressions) {
+        let evaluatedRelatedEntities = { ...(entity?.relatedEntities ?? []) };
+        if (evaluatedRelatedEntities && evaluateExpressions) {
             // Only evaluate the 'hidden' property for each related entity
-            entity.relatedEntities = await Promise.all(entity.relatedEntities.map(async (re) => {
+            evaluatedRelatedEntities = await Promise.all((entity.relatedEntities ?? []).map(async (re) => {
                 let hidden = re.hidden;
                 if (hidden && typeof hidden === 'string') {
                     try {
@@ -3594,7 +3595,7 @@ class AXPMainEntityContentBuilder {
                 return { ...re, hidden };
             }));
         }
-        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        const mergeDetailEntities = evaluatedRelatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
         const mainPropsByGroup = (entity?.properties ?? []).reduce((acc, p) => {
             if (!acc[p.groupId])
                 acc[p.groupId] = [];
@@ -3832,8 +3833,8 @@ class AXPMainEntityContentBuilder {
             return prop?.__layout ?? singleInterface?.properties?.find((p) => p.name === name)?.layout;
         };
         // Get related entities for tabs
-        const tabDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'tab-detail');
-        const tabListEntities = entity?.relatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
+        const tabDetailEntities = evaluatedRelatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'tab-detail');
+        const tabListEntities = evaluatedRelatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
         // Build related tabs if dependencies are provided
         const tabDetailTabs = await this.buildTabDetails(tabDetailEntities ?? [], dependencies);
         const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
@@ -5487,11 +5488,11 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
                     expose: [
                         {
                             source: this.textField(),
-                            target: `${this.path}EditorObj.title`,
+                            target: this.multiple() ? `${this.path}EditorObj.{title}` : `${this.path}EditorObj.title`,
                         },
                         {
                             source: this.valueField(),
-                            target: `${this.path}EditorObj.id`,
+                            target: this.multiple() ? `${this.path}EditorObj.{id}` : `${this.path}EditorObj.id`,
                         },
                     ],
                     look: 'select',
@@ -5504,16 +5505,21 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
             this.lookupNode.set(node);
         }, ...(ngDevMode ? [{ debugName: "#efUpdateLookupNode" }] : []));
         this.#efUpdateValue = effect(() => {
+            debugger;
             const newValueObj = this.contextService.getValue(`${this.path}EditorObj`);
             const prevValue = untracked(() => this.getValue()?.value);
-            if (isEqual(prevValue, newValueObj?.[this.valueField()])) {
+            const newValue = this.multiple()
+                ? newValueObj?.map((v) => v[this.valueField()])
+                : newValueObj?.[this.valueField()];
+            const valueIsChanged = !isEqual(prevValue, newValue);
+            if (!valueIsChanged) {
                 return;
             }
             const value = this.multiple()
-                ? newValueObj?.[this.valueField()].map((v) => v[this.valueField()])
+                ? newValueObj.map((v) => v[this.valueField()])
                 : newValueObj?.[this.valueField()];
             const displayText = this.multiple()
-                ? newValueObj?.[this.textField()].map((v) => v[this.textField()]).join(',')
+                ? newValueObj.map((v) => v[this.textField()]).join(',')
                 : newValueObj?.[this.textField()];
             this.setValue({
                 value: value,