ngx-sp-infra 5.2.10 → 5.2.12

package/fesm2022/ngx-sp-infra.mjs

@@ -4774,13 +4774,13 @@ class OrderingComponent {
     }
     // #region ==========> UTILS <==========
     /** Chamada quando o botão de ordenação é clicado */
-    emitSort() {
+    emitSort(direction) {
         // Inverte a direção de ordenação atual
-        this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
+        this.sortDirection = direction;
         // Emite o evento com a nova direção de ordenação
         this.sortDirectionChange.emit(this.sortDirection);
         // Emite o evento de mudança na ordenação com a direção e os atributos de ordenação
-        this.sortChange.emit({ direction: this.sortDirection, column: this.sortAttributes });
+        this.sortChange.emit({ direction: direction, column: this.sortAttributes });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: OrderingComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.14", type: OrderingComponent, isStandalone: true, selector: "app-ordering, lib-ordering", inputs: { sortDirection: "sortDirection", sortAttributes: "sortAttributes" }, outputs: { sortDirectionChange: "sortDirectionChange", sortChange: "sortChange" }, ngImport: i0, template: `
@@ -4788,17 +4788,17 @@ class OrderingComponent {
         @case ('asc') {
           <lib-icon tooltip="Crescente" class="glb-cursor-pointer"
             iconName="seta-cima" iconColor="blue"
-            [iconSize]="20" (click)="emitSort()" />
+            [iconSize]="20" (click)="emitSort('desc')" />
         }
         @case ('desc') {
           <lib-icon tooltip="Decrescente" class="glb-cursor-pointer"
-          iconName="seta-baixo" iconColor="blue"
-          [iconSize]="20" (click)="emitSort()" />
+            iconName="seta-baixo" iconColor="blue"
+            [iconSize]="20" (click)="emitSort('asc')" />
         }
         @default {
           <lib-icon tooltip="Sem ordenação aplicada" class="glb-cursor-pointer"
-          iconName="cimabaixo" iconColor="gray"
-          [iconSize]="20" (click)="emitSort()" />
+            iconName="cimabaixo" iconColor="gray"
+            [iconSize]="20" (click)="emitSort('asc')" />
         }
       }
     `, isInline: true, styles: [""], dependencies: [{ kind: "component", type: LibIconsComponent, selector: "lib-icon", inputs: ["iconName", "iconColor", "iconSize", "iconFill"] }, { kind: "ngmodule", type: TooltipModule }, { kind: "directive", type: i1$3.TooltipDirective, selector: "[tooltip], [tooltipHtml]", inputs: ["adaptivePosition", "tooltip", "placement", "triggers", "container", "containerClass", "boundariesElement", "isOpen", "isDisabled", "delay", "tooltipHtml", "tooltipPlacement", "tooltipIsOpen", "tooltipEnable", "tooltipAppendToBody", "tooltipAnimation", "tooltipClass", "tooltipContext", "tooltipPopupDelay", "tooltipFadeDuration", "tooltipTrigger"], outputs: ["tooltipChange", "onShown", "onHidden", "tooltipStateChanged"], exportAs: ["bs-tooltip"] }] }); }
@@ -4810,17 +4810,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
         @case ('asc') {
           <lib-icon tooltip="Crescente" class="glb-cursor-pointer"
             iconName="seta-cima" iconColor="blue"
-            [iconSize]="20" (click)="emitSort()" />
+            [iconSize]="20" (click)="emitSort('desc')" />
         }
         @case ('desc') {
           <lib-icon tooltip="Decrescente" class="glb-cursor-pointer"
-          iconName="seta-baixo" iconColor="blue"
-          [iconSize]="20" (click)="emitSort()" />
+            iconName="seta-baixo" iconColor="blue"
+            [iconSize]="20" (click)="emitSort('asc')" />
         }
         @default {
           <lib-icon tooltip="Sem ordenação aplicada" class="glb-cursor-pointer"
-          iconName="cimabaixo" iconColor="gray"
-          [iconSize]="20" (click)="emitSort()" />
+            iconName="cimabaixo" iconColor="gray"
+            [iconSize]="20" (click)="emitSort('asc')" />
         }
       }
     ` }]
@@ -5501,6 +5501,38 @@ class Utils {
         }
         return 0;
     }
+    /** Método de ordenação alfanumérico com possibilidade de direção */
+    static alphanumericSortOld(a, b, direction = 'asc') {
+        const regex = /(\d+|\D+)/g;
+        const stringA = this.propertyIsNullUndefinedOrEmpty(a) ? "" : a;
+        const stringB = this.propertyIsNullUndefinedOrEmpty(b) ? "" : b;
+        const aParts = stringA.toString().match(regex) || [];
+        const bParts = stringB.toString().match(regex) || [];
+        const length = Math.max(aParts.length, bParts.length);
+        for (let i = 0; i < length; i++) {
+            const aPart = aParts[i] || "";
+            const bPart = bParts[i] || "";
+            const aIsNumber = !isNaN(Number(aPart));
+            const bIsNumber = !isNaN(Number(bPart));
+            if (aIsNumber && bIsNumber) {
+                const numCompare = Number(aPart) - Number(bPart);
+                if (numCompare !== 0)
+                    return direction === 'asc' ? numCompare : -numCompare;
+            }
+            else if (aIsNumber) {
+                return direction === 'asc' ? -1 : 1;
+            }
+            else if (bIsNumber) {
+                return direction === 'asc' ? 1 : -1;
+            }
+            else {
+                const strCompare = aPart.localeCompare(bPart);
+                if (strCompare !== 0)
+                    return direction === 'asc' ? strCompare : -strCompare;
+            }
+        }
+        return 0;
+    }
     // #endregion ORDENAÇÃO
     // #region ==========> VALIDAÇÕES DE VAZIO <==========
     /** Retorna se a variável informada é === null || undefined || "" (string vazia) */
@@ -6055,7 +6087,7 @@ class TableComponent {
             recordsList.sort((a, b) => {
                 const propertyA = this.getProperty(a, attribute).toUpperCase(); // Puxa o nome da coluna que irá ordenar
                 const propertyB = this.getProperty(b, attribute).toUpperCase(); // Puxa o nome da coluna que irá ordenar
-                return Utils.alphanumericSort(propertyA, propertyB, this.sortDirection[attribute]);
+                return Utils.alphanumericSortOld(propertyA, propertyB, this.sortDirection[attribute]);
             });
         }
     }
@@ -7626,7 +7658,7 @@ class LibTransferListComponent {
     atualizarSelecoes(origem, destino, origemConfig, origemSelecionados, componenteOrigem, componenteDestino) {
         origemSelecionados.forEach(item => destino.push(item));
         // destino = [ ...origemSelecionados ];
-        destino.sort((a, b) => Utils.alphanumericSort(a.ID, b.ID));
+        destino.sort((a, b) => Utils.alphanumericSortOld(a.ID, b.ID));
         origemSelecionados.forEach(selectedItem => {
             const index = origem.findIndex(item => item === selectedItem);
             if (index !== -1)
@@ -8778,7 +8810,7 @@ class LibCustomizableTableComponent {
         this.list.sort((a, b) => {
             const propertyA = this.getProperty(a, attribute).toUpperCase();
             const propertyB = this.getProperty(b, attribute).toUpperCase();
-            return Utils.alphanumericSort(propertyA, propertyB, this.sortDirection[attribute]);
+            return Utils.alphanumericSortOld(propertyA, propertyB, this.sortDirection[attribute]);
         });
     }
     /** Compara os valores das propriedades entre dois objetos */