@po-ui/ng-templates 20.1.0 → 20.2.1

package/fesm2022/po-ui-ng-templates.mjs

@@ -5086,12 +5086,14 @@ class PoPageDynamicSearchComponent extends PoPageDynamicSearchBaseComponent {
         this.poAdvancedFilter.open();
     }
     onAdvancedSearch(filteredItems, isAdvancedSearch) {
-        const { filter, optionsService } = filteredItems;
+        const { optionsService } = filteredItems;
+        let { filter } = filteredItems;
         const visibleFilters = this.visibleFixedFilters === false
             ? this.filters.filter(filter => !('fixed' in filter) || !filter.fixed)
             : this.filters;
         this._disclaimerGroup.disclaimers = this.setDisclaimers(filter, optionsService, visibleFilters);
         this.setFilters(filter);
+        filter = this.addComplexFilter(filter);
         this.advancedSearch.emit(filter);
         if (isAdvancedSearch) {
             this.poPageList.clearInputSearch();
@@ -5161,7 +5163,7 @@ class PoPageDynamicSearchComponent extends PoPageDynamicSearchBaseComponent {
         if (field.type === PoDynamicFieldType.Currency && value) {
             return this.formatValueToCurrency(field, value);
         }
-        if (field.type === PoDynamicFieldType.Date) {
+        if (field.type === PoDynamicFieldType.Date || field.type?.toLowerCase() === PoDynamicFieldType.DateTime) {
             return field.range ? this.formatDate(value.start) + ' - ' + this.formatDate(value.end) : this.formatDate(value);
         }
         if (field.options && value) {
@@ -5271,6 +5273,25 @@ class PoPageDynamicSearchComponent extends PoPageDynamicSearchBaseComponent {
         };
         return this.poPageCustomizationService.getCustomOptions(onLoad, originalOption, pageOptionSchema);
     }
+    addComplexFilter(filter) {
+        let complexFilter;
+        Object.keys(filter).forEach(property => {
+            if (filter[property].start && filter[property].end) {
+                if (!complexFilter) {
+                    complexFilter = '';
+                }
+                else {
+                    complexFilter += ' and ';
+                }
+                complexFilter += `${property} ge '${filter[property].start}' and ${property} le '${filter[property].end}'`;
+                delete filter[property];
+            }
+        });
+        if (complexFilter) {
+            filter = Object.assign(filter, { $filter: complexFilter });
+        }
+        return filter;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.7", ngImport: i0, type: PoPageDynamicSearchComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.0.7", type: PoPageDynamicSearchComponent, isStandalone: false, selector: "po-page-dynamic-search", viewQueries: [{ propertyName: "poAdvancedFilter", first: true, predicate: PoAdvancedFilterComponent, descendants: true, static: true }, { propertyName: "poPageList", first: true, predicate: PoPageListComponent, descendants: true, static: true }], usesInheritance: true, usesOnChanges: true, ngImport: i0, template: "<po-page-list\n  #poPageList\n  [p-actions]=\"actions\"\n  [p-breadcrumb]=\"breadcrumb\"\n  [p-components-size]=\"componentsSize\"\n  [p-disclaimer-group]=\"disclaimerGroup\"\n  [p-filter]=\"filterSettings\"\n  [p-title]=\"title\"\n  [p-quick-search-value]=\"quickSearchValue\"\n>\n  <po-advanced-filter\n    [p-components-size]=\"componentsSize\"\n    [p-filters]=\"filters\"\n    [p-keep-filters]=\"keepFilters\"\n    [p-literals]=\"advancedFilterLiterals\"\n    (p-search-event)=\"onAdvancedSearch($event, true)\"\n  >\n  </po-advanced-filter>\n\n  <ng-content></ng-content>\n</po-page-list>\n", dependencies: [{ kind: "component", type: i3.PoPageListComponent, selector: "po-page-list" }, { kind: "component", type: PoAdvancedFilterComponent, selector: "po-advanced-filter" }] });
 }