@esfaenza/es-table 19.2.20 → 19.2.22

package/fesm2022/esfaenza-es-table.mjs

@@ -1661,29 +1661,32 @@ class HierarchyModeHandler {
      */
     assignLevel(objs, levelToAssign) {
         let assigned = 0;
+        let own = this.est.OwnKey();
+        let parent = this.est.ParentKey();
+        let expanded = this.est.StartsExpanded();
         for (let i = 0; i < objs.length; i++) {
             let obj = objs[i];
             // Se la parentKey non è valorizzata, questo è il livello 0 (1... perché gli 0 son perciolosi)
-            if (!obj[this.est.ParentKey()] && levelToAssign == 1) {
+            if (!obj[parent] && levelToAssign == 1) {
                 obj._level = 1;
                 obj._visible = true;
-                obj._expanded = this.est.StartsExpanded;
+                obj._expanded = expanded;
                 assigned++;
                 continue;
             }
             // Per i livelli superiore al primo
-            if (obj[this.est.ParentKey()] && levelToAssign > 1) {
+            if (obj[parent] && levelToAssign > 1) {
                 // trovo il parent
                 for (let p = 0; p < objs.length; p++) {
                     let possibleParent = objs[p];
                     // Trovato il parent dell'item, assegno all'item il livello giusto
-                    if (possibleParent[this.est.OwnKey()] == obj[this.est.ParentKey()] && possibleParent._level == levelToAssign - 1) {
+                    if (possibleParent[own] == obj[parent] && possibleParent._level == levelToAssign - 1) {
                         obj._level = levelToAssign;
                         // So che questo item ha un parent. Ribadisco che il parent è espanso in base alle impostazione e stessa logica
                         // per la visibilità del figlio
-                        possibleParent._expanded = this.est.StartsExpanded;
+                        possibleParent._expanded = expanded;
                         possibleParent.parent = true;
-                        obj._visible = this.est.StartsExpanded;
+                        obj._visible = expanded;
                         assigned++;
                         break;
                     }
@@ -1699,15 +1702,17 @@ class HierarchyModeHandler {
      */
     expandParent(key) {
         let bs = this.est.boundSource();
+        let own = this.est.OwnKey();
+        let parent = this.est.ParentKey();
         for (let i = 0; i < bs.length; i++) {
             let obj = bs[i];
             // Trovo il parent con quell'id e lo espando
-            if (obj[this.est.OwnKey()] == key) {
+            if (obj[own] == key) {
                 obj._expanded = true;
                 for (let ic = 0; ic < bs.length; ic++) {
                     let child = bs[ic];
                     // Trovo tutti i child di quel parent e li rendo visibili
-                    if (child[this.est.ParentKey()] == key)
+                    if (child[parent] == key)
                         child._visible = true;
                 }
                 return;
@@ -1721,10 +1726,11 @@ class HierarchyModeHandler {
      */
     collapseParent(key) {
         let bs = this.est.boundSource();
+        let own = this.est.OwnKey();
         for (let i = 0; i < bs.length; i++) {
             let obj = bs[i];
             // Trovo il parent con quell'id e lo collasso
-            if (obj[this.est.OwnKey()] == key) {
+            if (obj[own] == key) {
                 obj._expanded = false;
                 // Collasso/nascondo tutti i child del parent
                 this.collapseChildOfParent(key);
@@ -1739,16 +1745,18 @@ class HierarchyModeHandler {
      */
     collapseChildOfParent(parentKey) {
         let bs = this.est.boundSource();
+        let parent = this.est.ParentKey();
+        let own = this.est.OwnKey();
         for (let ic = 0; ic < bs.length; ic++) {
             let child = bs[ic];
             // Trovo tutti i child di quel parent e li rendo invisibili. Se il child trovato è a sua volta un parent,
             // lo collasso e vado in ricorsione sui figli
-            if (child[this.est.ParentKey()] == parentKey && !child.parent)
+            if (child[parent] == parentKey && !child.parent)
                 child._visible = false;
-            else if (child[this.est.ParentKey()] == parentKey && child.parent) {
+            else if (child[parent] == parentKey && child.parent) {
                 child._expanded = false;
                 child._visible = false;
-                this.collapseChildOfParent(child[this.est.OwnKey()]);
+                this.collapseChildOfParent(child[own]);
             }
         }
     }
@@ -4349,15 +4357,15 @@ class EsTableComponent {
         if (usesThsAndTdsDirectives || hasNoContentProjection) {
             if (this.UseCustomCells() == null)
                 this.UseCustomCells.set(true);
-            if (this.HiddenColumns() == null && this.UseCustomCells)
+            if (this.HiddenColumns() == null && this.UseCustomCells())
                 this.HiddenColumns.set(true);
-            if (this.ColumnsOrdering() == null && this.UseCustomCells)
+            if (this.ColumnsOrdering() == null && this.UseCustomCells())
                 this.ColumnsOrdering.set(true);
-            if (this.OrderByColumn() == null && this.UseCustomCells)
+            if (this.OrderByColumn() == null && this.UseCustomCells())
                 this.OrderByColumn.set(true);
-            if (this.SelectAll() == null && this.Selection)
+            if (this.SelectAll() == null && this.Selection())
                 this.SelectAll.set(true);
-            if (this.ShiftClick() == null && this.Selection)
+            if (this.ShiftClick() == null && this.Selection())
                 this.ShiftClick.set(true);
             this.DirectivesBased.set(true);
         }
@@ -4418,13 +4426,14 @@ class EsTableComponent {
         else if (this.SearchView() && typeof this.SearchView().itemsperpageoverride != 'undefined' && !(this.SearchView() instanceof AppSearch))
             this.SearchView().__proto__ = new AppSearch();
         // -------------------------------------------------------------------------------------------------------------------------
+        let isp = this.ItemSourceProperty();
         if (this.View && this.View instanceof AppSearch) {
             // Se cambia l'oggetto intero significa che ho rimandato la ricerca
             this.setMode('view');
             let firstItemGroupOrNoGrouping = (this.View.requestedgroups?.length || 0) == 0;
             // Queste sono item source custom. Le valorizzo al default se non esistono
-            if (this.ItemSourceProperty() && !this.View[this.ItemSourceProperty()])
-                this.View[this.ItemSourceProperty()] = [];
+            if (isp && !this.View[isp])
+                this.View[isp] = [];
             // Se vengo da una ricerca interna mantengo lo stato di selezione precedente (quindi su cambio pagina, cambio ipp, ecc...)
             // se invece l'utente ha fatto una ricerca lui (quindi cambiando filtri), secco le info di selezione
             if (!this.View.selection || (!this.View.internalsearchrequest && firstItemGroupOrNoGrouping) || !this.UseSelectionCache())
@@ -4483,7 +4492,7 @@ class EsTableComponent {
                 }
             }
             if (firstItemGroupOrNoGrouping)
-                this.arrayPulsanti.set(this.utilities_H.getPagesArray(6, this.View.page, this.View.pages || 1, (this.ItemSourceProperty() ? this.View[this.ItemSourceProperty()] : this.View.items).length, this.View.itemsperpageoverride));
+                this.arrayPulsanti.set(this.utilities_H.getPagesArray(6, this.View.page, this.View.pages || 1, (isp ? this.View[isp] : this.View.items).length, this.View.itemsperpageoverride));
         }
         else if (this.View && (this.View.length != null && this.View.length != undefined)) {
             this.setMode('array');
@@ -4533,12 +4542,14 @@ class EsTableComponent {
         }
         this.finalizeContext();
         this.postBoundSourceCalculation();
-        if (this.View && !this.View.selfsearch && this.EsTableHandledSearch() && !this.View.firstsearch) {
+        if (!this.EsTableHandledSearch() || !this.View)
+            return;
+        if (!this.View.selfsearch && !this.View.firstsearch) {
             this.View.selfsearch = true;
             this.changed(true);
             this.onSearchRequest.emit(false);
         }
-        else if (this.View && this.View.selfsearch && this.EsTableHandledSearch()) {
+        else if (this.View.selfsearch) {
             this.View.selfsearch = false;
             this.changed();
         }
@@ -4577,22 +4588,23 @@ class EsTableComponent {
         this.PagerOptions.ShowButtons = !this.HidePagingButtons();
         this.PagerOptions.ShowPaging = !this.HidePaging();
         this.PagerOptions.UsesView = true;
-        if (this.arrayMode() && this.UseArrayModePaging() && !this.SearchView()) {
+        let sv = this.SearchView();
+        if (this.arrayMode() && this.UseArrayModePaging() && !sv) {
             this.PagerOptions.PagerCount = this.View.length || 0;
             this.PagerOptions.ShowButtons = this.PagerOptions.ShowButtons && this.View.length > 10;
             this.PagerOptions.View = this.View;
             this.PagerOptions.UsesView = false;
             this.PagerOptions.ShowPagingOptions = this.PagerOptions.ShowButtons;
         }
-        else if (this.arrayMode() && (!this.UseArrayModePaging() || this.SearchView())) {
-            if (this.SearchView()) {
-                this.PagerOptions.View = this.SearchView();
-                this.PagerOptions.PagerCount = this.SearchView().objectcount || 0;
+        else if (this.arrayMode() && (!this.UseArrayModePaging() || sv)) {
+            if (sv) {
+                this.PagerOptions.View = sv;
+                this.PagerOptions.PagerCount = sv.objectcount || 0;
             }
             else
                 this.PagerOptions.PagerCount = this.View.length || 0;
-            this.PagerOptions.ShowButtons = this.PagerOptions.ShowButtons && (this.View.length > 10 || (this.SearchView()?.objectcount || 0) > 10);
-            this.PagerOptions.ShowCount = this.PagerOptions.ShowCount || (this.View && this.View.length) || (this.SearchView() && this.SearchView().objectcount && this.SearchView().objectcount != -1);
+            this.PagerOptions.ShowButtons = this.PagerOptions.ShowButtons && (this.View.length > 10 || (sv?.objectcount || 0) > 10);
+            this.PagerOptions.ShowCount = this.PagerOptions.ShowCount || (this.View && this.View.length) || (sv && sv.objectcount && sv.objectcount != -1);
             this.PagerOptions.ShowPaging = this.PagerOptions.ShowPaging && (this.PagerOptions.ShowButtons || this.PagerOptions.ShowCount);
             this.PagerOptions.ShowPagingOptions = this.PagerOptions.ShowButtons;
         }
@@ -4621,6 +4633,11 @@ class EsTableComponent {
     /** Per poter distinguere le chiamate a questo metodo: Dopo il setTimeout se uso gli EsTd/EsTh vecchi, senza il setTimeout se uso le nuove direttive */
     async internalPostBoundSource() {
         let View = this.View;
+        let viewMode = this.viewMode();
+        let arrayMode = this.arrayMode();
+        let isp = this.ItemSourceProperty();
+        let customCells = this.UseCustomCells();
+        let dynColDefs = this.DynamicRowColumnsDefinition();
         let thsTdsProviders = [...(this.EsThTdProvider ? [this.EsThTdProvider] : []), ...this.ThTdProvider];
         if (thsTdsProviders?.length > 0)
             await forkJoin(thsTdsProviders.map(t => t.LoadedSignal)).toPromise();
@@ -4631,14 +4648,14 @@ class EsTableComponent {
         // Questo dev'essere per forza lanciato dopo **bindDisplayToLoadedItemsOrGroups** dato che è lì che alcune cose vengono valorizzate
         this.setupPagingInformations();
         // Molte cose sono ovviamente disponibili solo in modalità View
-        if ((this.viewMode() || this.arrayMode()) && this.UseCustomCells()) {
-            let view = this.viewMode() ? View : null;
-            let itemsAndGroups = this.viewMode() ? [...((this.ItemSourceProperty() ? view[this.ItemSourceProperty()] : view.items) || []), ...(view.groups || [])] : View;
-            let si = this.viewMode() ? view.selection : this.arraymodeSelection;
+        if ((viewMode || arrayMode) && customCells) {
+            let view = viewMode ? View : null;
+            let itemsAndGroups = viewMode ? [...((isp ? view[isp] : view.items) || []), ...(view.groups || [])] : View;
+            let si = viewMode ? view.selection : this.arraymodeSelection;
             // N.B: Rispettare l'ordine di queste 3 macrocategorie è VITALE
             // *************************************        Sistemazioni di TH, TD, e visibilità varie      *************************************
             // Se ho definizioni dinamiche, prima di qualsiasi altra cosa devo trasformarle in th/td in modo che poi il codice qui sotto faccia le sue magie
-            if ((this.DynamicRowColumnsDefinition()?.length || 0) > 0) {
+            if ((dynColDefs?.length || 0) > 0) {
                 this.logger.log("Generating ths and tds from Dynamic definition");
                 let ret = this.dynamicMode_H.emitThsAndTdsBasedOnDynamicDefinition();
                 this.EsThs = ret.ths;
@@ -4664,7 +4681,7 @@ class EsTableComponent {
             // Prepassaggio per tirare fuori tutte le info utili sugli headers in modo da non ricacolarseli sempre dopo
             let hI = this.columnMetadata_H.evaluateHeadersGroupingInfos(this.EsThs);
             // Valuta lo stato iniziale di selezione a range
-            this.selection_H.evaluateSingleCellSelection(itemsAndGroups, hI.leafs, this.DynamicRowColumnsDefinition());
+            this.selection_H.evaluateSingleCellSelection(itemsAndGroups, hI.leafs, dynColDefs);
             if (this.arrayMode()) // In modalità array non ho un backend...
                 this.rowGrouping_H.arrayModeReviewGroupings(hI.leafs); // ... i raggruppamenti li devo fare lato client
             this.columnMetadata_H.reviewColumnsList(hI.leafs); // Aggiorna la lista delle colonne da mostrare nella dialog per ordinamento ecc
@@ -4688,10 +4705,10 @@ class EsTableComponent {
                 this.ResearchNeeded = false;
             }
         }
-        else if ((this.viewMode() || this.arrayMode()) && !this.UseCustomCells()) {
+        else if ((viewMode || arrayMode) && !customCells) {
             // Riallineo le info di selezione degli elementi della View
-            let items = this.viewMode() ? (this.ItemSourceProperty() ? View[this.ItemSourceProperty()] : View.items) : View;
-            let si = this.viewMode() ? View.selection : this.arraymodeSelection;
+            let items = viewMode ? (isp ? View[isp] : View.items) : View;
+            let si = viewMode ? View.selection : this.arraymodeSelection;
             this.selection_H.evaluateSelection(items, si);
         }
         // Per essere sicuro che dopo un bind di oggetti la es-table aggiorni la grafica
@@ -4845,11 +4862,12 @@ class EsTableComponent {
             columnsCache[col.id] = col;
         }
         this.TMPRowTDs = {};
+        let bs = this.boundSource();
+        let defaultAlignment = this.DefaultAlignment();
         // Variabile d'appoggio per permettermi di inserire tutte le colonne "Fixed" davanti
         let contextFixeds = {};
         for (let i = 0; i < tds.length; i++) {
             let td = tds[i];
-            let bs = this.boundSource();
             for (let i = 0; i < bs.length; i++) {
                 let item = bs[i];
                 let ctx = item._hash;
@@ -4882,7 +4900,7 @@ class EsTableComponent {
                             Multi: td._multi,
                             MultiProp: td._multi ? td.td.split('_')[0] : null,
                             MultiIndex: td._multi ? td.td.split('_')[1] : null,
-                            Alignment: (td.tdAlignment || th.thAlignment || this.DefaultAlignment()).toLowerCase(),
+                            Alignment: (td.tdAlignment || th.thAlignment || defaultAlignment).toLowerCase(),
                             Format: td.tdFormat || th.thFormat,
                             PropertyName: th.thProperty,
                             PropertyType: th.thType,
@@ -5070,10 +5088,10 @@ class EsTableComponent {
      * @param {boolean} forcedVal Valore forzato di check da assegnare agli oggetti
      */
     globalCheckChanged(forcedVal = null) {
-        debugger;
         this.selection_H.clearSelectionStatusExcluding(null);
+        let bs = this.boundSource();
         // Prendo tutti gli elementi presenti in questa vista. Se ho gruppi prendo solo i gruppi a livello 0, altrimenti prendo tutti gli oggetti per selezionarli
-        let items = this.boundSource().find(t => t._group) ? this.boundSource().filter(t => t._group && !t._parent) : this.boundSource();
+        let items = bs.find(t => t._group) ? bs.filter(t => t._group && !t._parent) : bs;
         var itemSelection = this.selection_H.handleItemsSelection(items, forcedVal, this.globalCheck());
         this.changed();
         this.onSelectionChanged.emit(itemSelection);
@@ -5313,8 +5331,10 @@ class EsTableComponent {
      * @param {any} item Item che rappresenta il contesto su cui è stato effettuato un click
      */
     dbClickEditOrSingleClickRowSelection($event, rowItem, item) {
+        let rowItm = rowItem();
+        let selection = this.Selection();
         // Prima cosa da fare è controllare se ci sono dei range lasciati da operazioni precedenti (se applicabile) e ripulirli
-        if (this.rangeSelected && !$event.ctrlKey && this.Selection()) {
+        if (this.rangeSelected && !$event.ctrlKey && selection) {
             this.logger.log("clearing previously selected range");
             this.selection_H.clearSelectionStatusExcluding(null);
             this.rangeSelected = false;
@@ -5324,11 +5344,11 @@ class EsTableComponent {
         if (this.Editable()) {
             // Secondo click: se il timer non è scaduto è un doppio click ed eseguo il resto
             if (this.cellDbClickTimer) {
-                this.logger.log("handling doubleclick on editable cell: " + (rowItem().PropertyName ? 'edit mode for property ' + rowItem().PropertyName : 'no property set, fallback to simple click'));
-                if (rowItem().PropertyName)
+                this.logger.log("handling doubleclick on editable cell: " + (rowItm.PropertyName ? 'edit mode for property ' + rowItm.PropertyName : 'no property set, fallback to simple click'));
+                if (rowItm.PropertyName)
                     this.setupUserEdit(rowItem, item);
                 else
-                    this.handleRowClick($event, item, this.Selection(), true);
+                    this.handleRowClick($event, item, selection, true);
                 this.clearCellClickTimer();
                 return;
             }
@@ -5337,7 +5357,7 @@ class EsTableComponent {
                 this.clearCellClickTimer();
                 if (!this.RangeSelection() || !this.mouseIsDown) {
                     this.logger.log("time's up for second click, handling single click");
-                    this.handleRowClick($event, item, this.Selection(), true);
+                    this.handleRowClick($event, item, selection, true);
                 }
             }, this.doubleClickBufferMs);
         }
@@ -5349,11 +5369,11 @@ class EsTableComponent {
         if ($event.ctrlKey)
             return;
         // Tutti i click su una cella già in edit non devono effettuare la selezione della riga
-        if (rowItem()._editing)
+        if (rowItm._editing)
             return;
         // Per evitare di rallentare a prescindere
         if (!this.Editable()) {
-            this.handleRowClick($event, item, this.Selection(), true);
+            this.handleRowClick($event, item, selection, true);
             return;
         }
     }
@@ -5457,10 +5477,11 @@ class EsTableComponent {
      */
     setupUserEdit(rowItem, item) {
         this.selection_H.clearSelectionStatusExcluding(null);
-        if (this.Editable() && rowItem().PropertyName) {
+        let rowItm = rowItem();
+        if (this.Editable() && rowItm.PropertyName) {
             let dynMode = (this.DynamicRowColumnsDefinition()?.length || 0) > 0;
-            let newValues = { _editing: true, old_value: dynMode ? item.properties[rowItem().PropertyName] : item[rowItem().PropertyName] };
-            rowItem.set(Object.assign(rowItem(), newValues));
+            let newValues = { _editing: true, old_value: dynMode ? item.properties[rowItm.PropertyName] : item[rowItm.PropertyName] };
+            rowItem.set(Object.assign(rowItm, newValues));
         }
         this.cdr.detectChanges();
         requestAnimationFrame(() => { this.FocusSubject.next(); });
@@ -5477,14 +5498,15 @@ class EsTableComponent {
         requestAnimationFrame(() => {
             let dynMode = (this.DynamicRowColumnsDefinition()?.length || 0) > 0;
             let newValues = { _editing: false };
-            rowItem.set(Object.assign(rowItem(), newValues));
-            let old = rowItem().old_value;
-            let niu = dynMode ? item.properties[rowItem().PropertyName] : item[rowItem().PropertyName];
+            let newRowItem = Object.assign(rowItem(), newValues);
+            rowItem.set(newRowItem);
+            let old = newRowItem.old_value;
+            let niu = dynMode ? item.properties[newRowItem.PropertyName] : item[newRowItem.PropertyName];
             let olddate = this.dateExts.getDateConvertion(old);
             let niudate = this.dateExts.getDateConvertion(niu);
             if ((olddate && niudate && olddate.isSame && olddate.isSame(niudate)) || old === niu)
                 return;
-            this.onModelChange.emit([new EsTableModelChange(item, rowItem().ID, rowItem().PropertyName, old, niu)]);
+            this.onModelChange.emit([new EsTableModelChange(item, newRowItem.ID, newRowItem.PropertyName, old, niu)]);
             this.selectionStatus[item._ordinal][columnIndex].val_setter(niu);
         });
     }