fixes #822 - fix externalQuery duplicates

xaksis · Mar 2, 2021 · afe09f3 · afe09f3
1 parent b8b572c
commit afe09f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/dev/App.vue b/dev/App.vue
@@ -54,8 +54,8 @@ export default {
       rowStyleClass: 'red',
       searchTerm: '',
       paginationOptions: {
+        enabled: false,
         mode: 'records',
-        enabled: true,
         perPage: 5,
         perPageDropdown: [3, 50, 100, 200, 300, 500, 1000],
         perPageDropdownEnabled: true,

diff --git a/src/components/Table.vue b/src/components/Table.vue
@@ -763,7 +763,8 @@ export default {
         });
         const filteredRows = [];
         allRows.forEach((row) => {
-          this.columns.forEach((col) => {
+          for (let i = 0; i < this.columns.length; i += 1) {
+            const col = this.columns[i];
             // if col does not have search disabled,
             if (!col.globalSearchDisabled) {
               // if a search function is provided,
@@ -778,7 +779,7 @@ export default {
                 );
                 if (foundMatch) {
                   filteredRows.push(row);
-                  return false; // break the loop
+                  break; // break the loop
                 }
               } else {
                 // comparison
@@ -789,11 +790,11 @@ export default {
                 );
                 if (matched) {
                   filteredRows.push(row);
-                  return false; // break loop
+                  break; // break loop
                 }
               }
             }
-          });
+          }
         });
 
         // this is where we emit on search
@@ -808,6 +809,7 @@ export default {
         this.filteredRows.forEach((headerRow) => {
           const i = headerRow.vgt_header_id;
           const children = filteredRows.filter((r) => r.vgt_id === i);
+          console.log(children);
           if (children.length) {
             const newHeaderRow = JSON.parse(JSON.stringify(headerRow));
             newHeaderRow.children = children;