@solidev/data 0.0.1-beta.1 → 0.0.1-beta.2

package/fesm2020/solidev-data.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { InjectionToken, PLATFORM_ID, Injectable, Inject, Optional, Component, Input, ViewChild, Pipe, LOCALE_ID, DEFAULT_CURRENCY_CODE, EventEmitter, Output, Directive, HostListener, NgModule } from '@angular/core';
 import 'reflect-metadata';
 import * as i2$2 from '@angular/forms';
-import { FormControl, Validators, FormGroup, UntypedFormControl, ReactiveFormsModule, NG_VALUE_ACCESSOR, UntypedFormGroup } from '@angular/forms';
+import { FormControl, Validators, FormGroup, ReactiveFormsModule, UntypedFormControl, NG_VALUE_ACCESSOR, UntypedFormGroup } from '@angular/forms';
 import { throwError, ReplaySubject, share, combineLatest, of, takeUntil, NEVER, Subject, debounceTime, distinctUntilChanged, isObservable, firstValueFrom, timer, Observable, BehaviorSubject, merge } from 'rxjs';
 import { tap, switchMap, map, throttleTime, filter, mergeMap, finalize, catchError, take, first } from 'rxjs/operators';
 import * as i2 from '@angular/platform-browser';
@@ -1584,14 +1584,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0", ngImpor
 class ModelListTextFilterComponent {
     constructor() {
         this.classes = '';
-        this.fc = new UntypedFormControl();
+        this.fc = new FormControl(null);
     }
     ngOnInit() {
         this.filter.valueChanges.subscribe((val) => {
             this.fc.setValue(val.value, { emitEvent: false });
         });
         this.fc.valueChanges.pipe(debounceTime(250)).subscribe((val) => {
-            if (this.filter.set(val, val)) {
+            if (this.filter.set(val, val || '')) {
                 this.list.filters.update();
             }
         });
@@ -1856,7 +1856,6 @@ class ModelListSelectFilterComponent {
     }
     ngOnInit() {
         this.filter.valueChanges.subscribe((val) => {
-            console.log('Changing value', val);
             this.fc.setValue(val ? val.value : null, {
                 emitEvent: false,
             });
@@ -2084,6 +2083,7 @@ class ModelListFilter {
         this.allowed = false;
         this.enabled = false;
         this.type = 'text';
+        this.default = params.default;
         // FIXME: add value init
     }
     get mcurrent$() {
@@ -2387,7 +2387,12 @@ class ModelListSelectFilter extends ModelListFilter {
                 this.choices = params.choices;
             }
         }
+        // Set default only for cur type
+        if (this.default && this.type == 'select') {
+            this.set(this.default, '', true);
+        }
     }
+    setDefault() { }
 }
 
 class ModelListSelectMultiFilter extends ModelListSelectFilter {
@@ -2401,18 +2406,27 @@ class ModelListSelectMultiFilter extends ModelListSelectFilter {
         if (this.help == '') {
             this.help = 'Choix par liste déroulante (multiple)';
         }
+        // Set default only for cur type
+        if (this.default && this.type == 'selectmulti') {
+            for (const f of this.default) {
+                this.set(f.value, f.desc, true);
+            }
+        }
     }
 }
 
 class ModelListTextFilter extends ModelListFilter {
     constructor(params) {
         super(params);
-        this.type = "text";
-        if (this.label == "") {
-            this.label = "Recherche par texte";
+        this.type = 'text';
+        if (this.label == '') {
+            this.label = 'Recherche par texte';
         }
-        if (this.help == "") {
-            this.help = "Texte à rechercher";
+        if (this.help == '') {
+            this.help = 'Texte à rechercher';
+        }
+        if (this.default) {
+            this.set(this.default, '', true);
         }
     }
 }
@@ -2558,7 +2572,8 @@ class PChoicePipe {
         if (!value) {
             return '-';
         }
-        const fvalue = model[field];
+        // Use value from input, not from field
+        const fvalue = value; //- (model as any)[field];
         if (mode === 'code') {
             return `${fvalue}`;
         }
@@ -2644,7 +2659,8 @@ class PFactorPipe {
         if (!value)
             return null;
         locale = locale || this._locale;
-        const fvalue = model[field];
+        // Use value from input, not from model
+        const fvalue = value; // (model as any)[field];
         if (!isValue(fvalue))
             return null;
         const manager = model.FM(field);
@@ -2722,9 +2738,11 @@ class PFactorcPipe {
             return null;
         if (!value)
             return null;
-        const fvalue = model[field];
-        if (!isValue(fvalue))
+        // Use value from input, not from model
+        const fvalue = value; // (model as any)[field];
+        if (!isValue(fvalue)) {
             return null;
+        }
         locale = locale || this._locale;
         let currency = currencyCode || this._defaultCurrencyCode;
         if (!display) {
@@ -5556,4 +5574,3 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0", ngImpor
 
 export { AuthInterceptor, AuthServiceBase, BanAdapter, BootstrapDataDisplayConfig, BreadcrumbComponent, ChoicePipe, Collection, CollectionMock, DATA_API_URL, DATA_AUTH_PARAMS, DATA_AUTH_SERVICE, DATA_AUTH_USER_SERVICE, DATA_DISPLAY_CONFIG, DATA_MAX_TRANSFERSTATE_TIME, DATA_MESSAGE_SOUNDS, DEFAULT_TIMEOUTS, DataBackend, DataMessageService, DataModel, DataUploaderService, DispeditComponent, FactorPipe, FactorcPipe, FkselectComponent, FlagsComponent, Jwt, Link, M2mselectComponent, Message, MessageZoneComponent, ModelList, ModelListAutocompleteFilter, ModelListAutocompleteMultiFilter, ModelListDateFilter, ModelListDatetimeFilter, ModelListDatetimerangeFilter, ModelListFieldHeaderComponent, ModelListFieldsSelectorComponent, ModelListFilters, ModelListFiltersComponent, ModelListFiltersSelectComponent, ModelListFlagsFilter, ModelListGeodistanceFilter, ModelListNumberFilter, ModelListNumberOperations, ModelListPaginatorComponent, ModelListSelectFilter, ModelListSelectMultiFilter, ModelListService, ModelListSorterComponent, ModelListTextFilter, ModelListTreeFilter, NavDriver, NgFileDropDirective, NgFileSelectDirective, NgxUploaderModule, PChoicePipe, PFactorPipe, PFactorcPipe, Queryset, RData, RicheditComponent, STATUS, SafeDeleteComponent, TabMemoryService, UpdateComponent, UpdateService, UploadStatus, booleanField, charField, computedField, dateField, datetimeField, decimalField, detailsField, emailField, floatField, foreignKeyField, humanizeBytes, integerField, isValue, manyToManyField, passwordField, primaryField, reverseForeignKeyField, slugify, strToNumber, textField };
 //# sourceMappingURL=solidev-data.mjs.map
-//# sourceMappingURL=solidev-data.mjs.map