@dev-tcloud/tcloud-ui 0.0.35 → 0.0.37

package/fesm2020/dev-tcloud-tcloud-ui.mjs

@@ -2034,6 +2034,10 @@ class TCloudUiSearchInObjectService {
         }
         return false;
     }
+    normalize(text) {
+        const v = (((`${text}`).normalize('NFD').replace(/[\u0300-\u036f]/g, "")).trim()).toLowerCase();
+        return v;
+    }
     /**
      * meet - Procura em object - filtro utilizado para busca em tabelas
      * @param valor texto a ser procurado
@@ -2054,7 +2058,7 @@ class TCloudUiSearchInObjectService {
             if (camposDebusca.length < 1) {
                 return emObject;
             }
-            valor = valor.toLowerCase();
+            valor = this.normalize(valor);
             var result = [];
             for (const key in emObject) {
                 var oObject = emObject[key];
@@ -2064,14 +2068,14 @@ class TCloudUiSearchInObjectService {
                         if (this.isADate(dt) && typeof ((dt).getMonth) === 'function') {
                             const data1 = this.datepipe.transform(dt, 'dd/MM/yyyy hh:mm');
                             const data2 = this.datepipe.transform(dt, 'medium');
-                            const strToTest = (data1 + " " + data2 + " " + oObject[objectvalue]).toLowerCase();
+                            const strToTest = this.normalize(data1 + " " + data2 + " " + oObject[objectvalue]);
                             if ((strToTest.indexOf(valor) >= 0) && (result).indexOf(oObject) == -1) {
                                 result.push(oObject);
                                 break;
                             }
                         }
                         else {
-                            const strToTest = (this.statusinfo.transform(oObject[objectvalue], 'ALL') + "").toLowerCase();
+                            const strToTest = this.normalize(this.statusinfo.transform(oObject[objectvalue], 'ALL') + "");
                             if ((strToTest.indexOf(valor) >= 0) && (result).indexOf(oObject) == -1) {
                                 result.push(oObject);
                                 break;
@@ -2082,9 +2086,9 @@ class TCloudUiSearchInObjectService {
             }
             if (emObject && typeof emObject === 'object' && Array.isArray(emObject)) {
                 // is array 
-                const v = (`${valor}`).toUpperCase();
+                const v = this.normalize(`${valor}`);
                 for (let i = 0; i < (emObject).length; i++) {
-                    const item = (`${emObject[i]}`).toUpperCase();
+                    const item = this.normalize(`${emObject[i]}`);
                     if (item.includes(v) || item === v) {
                         result.push(emObject[i]);
                     }
@@ -2786,15 +2790,44 @@ class TCloudUiFiltersComponent {
         const v = (((`${text}`).normalize('NFD').replace(/[\u0300-\u036f]/g, "")).trim()).toLowerCase();
         return v;
     }
-    fetchFromObject(obj, prop) {
-        if (typeof obj === 'undefined') {
-            return false;
-        }
-        var _index = `${prop}`.indexOf('.');
-        if (_index > -1) {
-            return this.fetchFromObject(obj[prop.substring(0, _index)], prop.substr(_index + 1));
+    collectionFind(obj, path) {
+        const pathArray = path.split(".");
+        let current = obj;
+        for (let i = 0; i < pathArray.length; i++) {
+            const key = pathArray[i];
+            if (key.includes('[') && key.includes(']')) {
+                const nextKeys = pathArray.slice(i + 1);
+                const index = key.substring(key.indexOf('[') + 1, key.indexOf(']'));
+                const arrayKey = key.substring(0, key.indexOf('['));
+                if (current[arrayKey][index]) {
+                    console.log('current[arrayKey][index]', current[arrayKey][index]);
+                    return this.collectionFind(current[arrayKey][index], nextKeys.join("."));
+                }
+            }
+            if (key.includes("[]")) {
+                const arrayKey = key.replace("[]", "");
+                current = current[arrayKey] || [];
+                const nextKeys = pathArray.slice(i + 1);
+                const results = [];
+                for (let j = 0; j < current.length; j++) {
+                    let result = this.collectionFind(current[j], nextKeys.join("."));
+                    if (result !== undefined) {
+                        results.push(result);
+                    }
+                }
+                if (results.length === 0) {
+                    return undefined;
+                }
+                return results;
+            }
+            else {
+                current = current[key];
+                if (current === undefined) {
+                    return undefined;
+                }
+            }
         }
-        return obj[prop];
+        return current;
     }
     searchIn(item, event) {
         if (typeof event === 'boolean') {
@@ -2814,7 +2847,7 @@ class TCloudUiFiltersComponent {
                 const filter_item = this.filters[j];
                 if (filter_item.searchText && typeof (filter_item.searchText) === 'string' && filter_item.searchText !== '') {
                     filter_item.searchText = this.normalize(filter_item.searchText);
-                    let item_value = this.fetchFromObject(this.data[i], filter_item.searchIn);
+                    let item_value = this.collectionFind(this.data[i], filter_item.searchIn);
                     if (item_value) {
                         item_value = this.normalize(item_value);
                         if (!(item_value.includes(filter_item.searchText) || item_value === filter_item.searchText)) {
@@ -2822,9 +2855,21 @@ class TCloudUiFiltersComponent {
                         }
                     }
                 }
-                if (typeof (filter_item.searchText) === 'boolean') {
-                    let item_value = this.fetchFromObject(this.data[i], filter_item.searchIn);
-                    if (filter_item.searchText) {
+                if (typeof (filter_item.searchText) === 'boolean' && filter_item.searchText) {
+                    let item_value = this.collectionFind(this.data[i], filter_item.searchIn);
+                    if (item_value && (item_value).length > 0) {
+                        let qtd_is_true = 0;
+                        for (let i = 0; i < ((item_value).length); i++) {
+                            const item = item_value[i];
+                            if (item === filter_item.searchText) {
+                                qtd_is_true++;
+                            }
+                        }
+                        if (qtd_is_true === 0) {
+                            this.data[i]['tc_filter_accept'] = false;
+                        }
+                    }
+                    else {
                         if (!(item_value === filter_item.searchText)) {
                             this.data[i]['tc_filter_accept'] = false;
                         }