@acorex/modules 20.0.9 → 20.0.11

package/fesm2022/acorex-modules-report-management.mjs

@@ -144,10 +144,11 @@ const AXM_DATASET_FILTER_WIDGET = [
         type: 'block-layout',
         mode: 'view',
         children: [
+            // Enable/Disable Checkbox
             {
                 type: 'grid-item-layout',
                 mode: 'view',
-                options: { colSpan: 2 },
+                options: { colSpan: 1 },
                 children: [
                     {
                         type: 'checkbox-editor',
@@ -162,38 +163,185 @@ const AXM_DATASET_FILTER_WIDGET = [
                     },
                 ],
             },
+            // Data Source Selector
             {
                 type: 'grid-item-layout',
                 mode: 'view',
                 options: { colSpan: 3 },
                 children: [
                     {
-                        type: 'text-editor',
-                        mode: 'view',
+                        type: 'select-editor',
+                        mode: 'edit',
+                        path: 'dataSource',
+                        options: {
+                            placeholder: 'Select Data Source',
+                            valueField: 'name',
+                            textField: 'title',
+                            dataSource: '{{ context.eval("$root.dataSources") || [] }}',
+                            readonly: '{{ !context.eval(">enabled") }}',
+                        },
+                        triggers: [
+                            {
+                                event: "{{ events.context('dataSource') }}",
+                                action: `{{ 
+                  var ds = context.eval('dataSource'); 
+                  var columns = (ds && ds.columns) || []; 
+                  context.set('availableFields', columns);
+                  context.set('columnName', null);
+                  context.set('filter', null);
+                }}`,
+                            },
+                        ],
+                    },
+                ],
+            },
+            // Field/Column Selector
+            {
+                type: 'grid-item-layout',
+                mode: 'view',
+                options: { colSpan: 3 },
+                children: [
+                    {
+                        type: 'select-editor',
+                        mode: 'edit',
                         path: 'columnName',
+                        options: {
+                            placeholder: 'Select Field',
+                            valueField: 'name',
+                            textField: 'title',
+                            dataSource: '{{ context.eval("availableFields") || [] }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("dataSource") }}',
+                        },
+                        triggers: [
+                            {
+                                event: "{{ events.context('columnName') }}",
+                                action: `{{ 
+                  var columnName = context.eval('columnName');
+                  var availableFields = context.eval('availableFields') || [];
+                  var column = availableFields.find(function(c) { return c.name === columnName; }) || {};
+                  var fieldType = column.type || 'string';
+                  
+                  // Determine widget type based on field type
+                  var widgetType = (function() {
+                    var t = (typeof fieldType === 'object' && fieldType !== null && 'name' in fieldType) ? fieldType.name : fieldType;
+                    return t === 'text-editor' || t === 'large-text-editor' || t === 'string' ? 'string-filter' :
+                           t === 'number-editor' || t === 'number' ? 'number-filter' :
+                           t === 'date-time-editor' || t === 'datetime' || t === 'date' ? 'datetime-filter' :
+                           t === 'select-editor' || t === 'select' ? 'select-filter' :
+                           t === 'checkbox-editor' || t === 'toggle-editor' || t === 'boolean' ? 'boolean-filter' :
+                           t === 'color-editor' ? 'color-filter' : 'string-filter';
+                  })();
+                  
+                  context.set('widgetType', widgetType);
+                  context.set('fieldType', fieldType);
+                  context.set('filter', null);
+                }}`,
+                            },
+                        ],
                     },
                 ],
             },
+            // Logical Operator (And/Or)
             {
                 type: 'grid-item-layout',
                 mode: 'view',
-                options: { colSpan: 7 },
+                options: { colSpan: 2 },
                 children: [
                     {
-                        type: 'string-filter',
+                        type: 'select-editor',
                         mode: 'edit',
-                        path: 'defaultValue',
+                        path: 'logicOperator',
+                        defaultValue: 'and',
                         options: {
-                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Enter filter value" : "Filter is disabled" }}  ',
+                            placeholder: 'Logic',
+                            dataSource: [
+                                { value: 'and', text: 'And' },
+                                { value: 'or', text: 'Or' }
+                            ],
+                            valueField: 'value',
+                            textField: 'text',
                             readonly: '{{ !context.eval(">enabled") }}',
                         },
                     },
                 ],
             },
+            // Dynamic Filter Widget based on field type
+            {
+                type: 'grid-item-layout',
+                mode: 'view',
+                options: { colSpan: 3 },
+                children: [
+                    // String Filter
+                    {
+                        type: 'string-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Enter filter value" : "Filter is disabled" }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ !context.eval("widgetType") || context.eval("widgetType") === "string-filter" }}',
+                        },
+                    },
+                    // Number Filter
+                    {
+                        type: 'number-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Enter number value" : "Filter is disabled" }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ context.eval("widgetType") === "number-filter" }}',
+                        },
+                    },
+                    // DateTime Filter
+                    {
+                        type: 'datetime-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Select date" : "Filter is disabled" }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ context.eval("widgetType") === "datetime-filter" }}',
+                        },
+                    },
+                    // Select Filter
+                    {
+                        type: 'select-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Select value" : "Filter is disabled" }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ context.eval("widgetType") === "select-filter" }}',
+                        },
+                    },
+                    // Boolean Filter
+                    {
+                        type: 'boolean-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ context.eval("widgetType") === "boolean-filter" }}',
+                        },
+                    },
+                    // Color Filter
+                    {
+                        type: 'color-filter',
+                        mode: 'edit',
+                        path: 'filter',
+                        options: {
+                            placeholder: '{{ (context.eval(">enabled") ?? true) ? "Select color" : "Filter is disabled" }}',
+                            readonly: '{{ !context.eval(">enabled") || !context.eval("columnName") }}',
+                            visibility: '{{ context.eval("widgetType") === "color-filter" }}',
+                        },
+                    },
+                ],
+            },
         ],
-        // options:{
-        //   "spacing":{"margin":"0px","padding":"25px 7px 27px"}
-        // }
+        options: {
+            spacing: { margin: "0px", padding: "8px" }
+        }
     },
 ];
 //#endregion
@@ -442,6 +590,17 @@ async function dataSetFactory(injector) {
                             isDraggable: true
                         },
                         children: AXM_DATASET_FILTER_WIDGET,
+                        triggers: [
+                            {
+                                event: "{{ events.context('dataSource') }}",
+                                action: `{{ 
+                  var selectedDataSource = context.eval('dataSource');
+                  if (selectedDataSource) {
+                    context.set('dataSources', [selectedDataSource]);
+                  }
+                }}`,
+                            },
+                        ],
                     },
                 },
             },
@@ -849,7 +1008,7 @@ function routesFacory() {
             children: [
                 {
                     path: '**',
-                    loadComponent: () => import('./acorex-modules-report-management-report-runner-root-page.component-sI0yzJ4s.mjs').then((c) => c.AXMReportRunnerRootPageComponent),
+                    loadComponent: () => import('./acorex-modules-report-management-report-runner-root-page.component-CAxcD_pe.mjs').then((c) => c.AXMReportRunnerRootPageComponent),
                     data: { reuse: true },
                 },
             ],