@acorex/platform 20.0.1 → 20.0.2

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

@@ -5,10 +5,10 @@ import * as i2 from '@acorex/cdk/common';
 import { AXDataSource, AXCommonModule } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
 import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPLockService, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
-import * as i2$2 from '@acorex/platform/workflow';
-import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i1$4 from '@acorex/platform/core';
 import { AXPExpressionEvaluatorService, AXPPlatformScope, extractValue, setSmart } from '@acorex/platform/core';
+import * as i2$2 from '@acorex/platform/workflow';
+import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i7 from '@acorex/platform/layout/builder';
 import { AXPPageStatus, AXPWidgetRegistryService, AXPValueWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXPWidgetsCatalog, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/builder';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
@@ -244,6 +244,7 @@ class AXPEntityDetailListViewModel {
         });
         this.evaluateExpressions = async (actionData) => {
             const parentData = this.parent.data;
+            console.log({ actionData, parentData });
             const scope = {
                 context: {
                     eval: (path) => {
@@ -284,18 +285,19 @@ class AXPEntityDetailListViewModel {
         // }
         this.applyFilterAndSort();
     }
-    applyFilterAndSort() {
+    async applyFilterAndSort() {
         this.dataSource.clearFilter();
         //
         //this.dataSource.sort(...this.detailEntity.().map(s => ({ dir: s.dir, field: s.name } as AXDataSourceSortOption)));
         //
-        const parentFilters = this.detailEntityConfig.conditions?.map((c) => {
+        const parentFilters = (await Promise.all(this.detailEntityConfig.conditions?.map(async (c) => {
             return {
                 field: c.name,
                 operator: c.operator,
-                value: this.parent.data?.id,
+                // value: this.parent.data?.id,
+                value: await this.evaluateExpressions(c.value),
             };
-        }) ?? [];
+        }) ?? [])) ?? [];
         const parentFilterWrapper = {
             field: null,
             logic: 'and',