quasar-factory-lib 0.0.48 → 0.0.50

package/dist/store/table.d.ts

@@ -3,6 +3,7 @@ export const tableStore: import("pinia").StoreDefinition<"tableStore", {
     filterValue: import("@vueuse/shared").RemovableRef<string>;
     lastFilterValue: import("@vueuse/shared").RemovableRef<string>;
     visiblecolumns: import("@vueuse/shared").RemovableRef<never[]>;
+    prepared: import("@vueuse/shared").RemovableRef<boolean>;
 }, {}, {
     setFilterValue(val: any): void;
     cleanTableFilter(): void;

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -11,6 +11,7 @@
       :grid="smallDevice"
       :style="tableStyle"
       flat
+      :filter-method="customFilter"
       bordered
       :rows="rowsData"
       :columns="columns"
@@ -21,7 +22,6 @@
       table-class="text-grey-9"
       table-header-class="main-color"
       :filter="filterComputed"
-      :filter-method="filterMethod"
       :sort-method="customSortMethod"
       separator="horizontal"
       binary-state-sort
@@ -127,10 +127,10 @@ export default defineComponent({
       type: Array as () => string[],
       required: true
     },
-    filterMethod: {
-      type: Function,
-      default: function () {}
-    },
+    // filterMethod: {
+    //   type: Function,
+    //   default: function () {}
+    // },
     // sortMethod: {
     //   type: Function,
     //   default: function () {}
@@ -181,7 +181,17 @@ export default defineComponent({
     getCellClass: {
       type: Function,
       default: function () {}
+    },
+    // Needs to be used together
+    additionalFilterConditions: {
+      type: Function,
+      default: function () {}
+    },
+    additionalSortConditions: {
+      type: Function,
+      default: function () {}
     }
+    //
   },
   emits: [
     'onSelectVisibleColumns',
@@ -207,7 +217,8 @@ export default defineComponent({
       loading: false,
       forceRender: false,
       totalPage: 0,
-      pageSize: 20
+      pageSize: 20,
+      filteredRows: [] as object [] | []
     }
   },
   computed: {
@@ -236,6 +247,7 @@ export default defineComponent({
     pageLength (): number {
       return (this.totalPage + 1) * this.pageSize
     }
+
   },
   watch: {
     rows (val) {
@@ -244,6 +256,7 @@ export default defineComponent({
     visibleColumns (val: string [] | []) {
       this.visibleColumnsData = val
     }
+    
   },
   mounted () {
   },
@@ -299,13 +312,23 @@ export default defineComponent({
     toogleLoading () {
       this.loading = !this.loading
     },
-    customSortMethod(
-      rows, 
-      sortBy: string, 
-      descending: boolean
-    ) {
-      const data = [...rows];
-
+    customSortMethod(rows: object[] | [], sortBy: string, descending: boolean) {
+      let data = []
+      if (this.store.filterValue !== '') {
+       data = [...this.filteredRows];
+      }
+      else {
+        data = [...this.rows];
+      }
+      if (this.additionalSortConditions && this.additionalSortConditions.toString().replace(/\s+/g, '') !== 'function(){}') {
+        data = this.additionalSortConditions(this.store, this.filteredRows, rows);
+      } else {
+        console.log('else sort')
+      }
+      this.getSortedData(sortBy, data, descending)
+      return data.slice(0, this.pageLength);
+    },
+    getSortedData (sortBy: string, data: object[] | [], descending: boolean) {
       if (sortBy) {
         data.sort((a, b) => {
           const x = descending ? b : a;
@@ -316,12 +339,12 @@ export default defineComponent({
 
           const parseDate = (dateString: string): Date => {
             const [day, month, year] = dateString.split('/');
-            return new Date(`${year}-${month}-${day}`);  // Converte para 'yyyy-mm-dd'
+            return new Date(`${year}-${month}-${day}`);
           };
 
           const parseTime = (timeString: string): number => {
             const [hours, minutes, seconds] = timeString.split(':').map(Number);
-            return (hours * 3600) + (minutes * 60) + seconds; // Converte para o total de segundos
+            return (hours * 3600) + (minutes * 60) + seconds;
           };
 
           if (typeof xValue === 'string' && typeof yValue === 'string') {
@@ -352,9 +375,38 @@ export default defineComponent({
           }
         });
       }
-      return data;
+    },
+    containsSearchTermInRow (row: object, lowerSearch: string): boolean {
+      if (lowerSearch !== '') {
+        const values = Object.values(row)
+        const valuesLowerCase = values.map((x) => (x + '').toLowerCase())
+        for (let val = 0; val < valuesLowerCase.length; val++) {
+          if (valuesLowerCase[val].includes(lowerSearch)) {
+            return true
+          }
+        }
+      }
+      return false
+    },
+    customFilter(rows: object[] | [], terms: { search: string, prepared: boolean }) {
+      let filteredRows_ = []
+      if (terms.search !== '') {
+        const lowerSearch = terms.search ? terms.search.toLowerCase() : ''
+        for (let i = 0; i < this.rows.length; i++) {
+          if (this.containsSearchTermInRow(this.rows[i], lowerSearch)) {
+            filteredRows_.push(this.rows[i])
+          }
+        }
+      } 
+      else {
+        filteredRows_ = rows
+      }
+      if (this.additionalFilterConditions && this.additionalFilterConditions.toString().replace(/\s+/g, '') !== 'function(){}') {
+        filteredRows_ = this.additionalFilterConditions(this.store, this.rows, filteredRows_)
+      }
+      this.filteredRows = filteredRows_
+      return  filteredRows_.slice(0, this.pageLength)
     }
-
   }
 })
 </script>

package/src/components/Table/utils/filterMethod.ts

@@ -2,7 +2,8 @@
 
 import infiniteScroll from './infiniteScroll'
 const filterMethod = {
-  filter (self: { filteredRows: object [] | [] }, rows: string | [], terms: { search: string }): object[] | [] {
+  filter (self: { filteredRows: object [] | [] }, rows: string | [], terms: { search: string }) {
+    console.log(rows)
     if (terms.search !== '') {
       const filteredRows = []
       const lowerSearch = terms.search ? terms.search.toLowerCase() : ''
@@ -14,6 +15,7 @@ const filterMethod = {
       self.filteredRows = filteredRows
       return infiniteScroll.paginationNewTable(self, filteredRows)
     } else {
+      self.filteredRows = rows
       return infiniteScroll.paginationNewTable(self, rows)
     }
   },

package/src/pages/TablePage.vue

@@ -2,11 +2,13 @@
   <q-page-container class=" full-width column justify-center">
     <q-page
       class="full-width column justify-center align-center items-center"
-      style="height: 70vh;"
+      style=""
     >
       <div
         class="full-width"
       >
+      {{ store.prepared }}
+      <q-btn @click="store.prepared = !store.prepared">Click</q-btn>
         <Table
           ref="table"
           :rows="rows"
@@ -18,7 +20,9 @@
           :show-skeleton="false"
           :selection-type="'multiple'"
           :getCellClass="getCellClass"
-          :filter-method="filterMethod"
+          :filterComputedOptions="{ preparedQuantity: store.prepared}"
+          :additionalSortConditions="additionalSortConditions"
+          :additional-filter-conditions="additionalFilterConditions"
           @on-select-visible-columns="saveSelectedColumns"
           @on-update-basic-checkbox-value="onUpdateBasicCheckboxValue"
           @on-update-customized-checkbox-value="onUpdateCustomizedCheckboxValue"
@@ -151,7 +155,8 @@ export default {
         name: 'sodium',
         label: 'Sodium (mg)',
         align: 'left',
-        field: 'sodium'
+        field: 'sodium',
+        sortable: true
       },
       {
         name: 'calcium',
@@ -321,9 +326,7 @@ export default {
           iron: '6%'
         }
       ],
-      visibleColumns: [],
-      sortDateValues: ['dateCreation'],
-      filteredRows: []
+      visibleColumns: []
     }
   },
   mounted () {
@@ -387,6 +390,37 @@ export default {
         return 'text-color-negative-bold'; 
       }
       return '';
+    },
+    additionalFilterConditions (store_: { prepared: boolean }, rows_: object[] | [], filteredRowsParam_: object[] | []) {
+      console.log('additional filter conditions')
+      filteredRowsParam_ = []
+        if (store_.prepared) {
+        for (let i = 0; i < rows_.length; i++) {
+          if (rows_[i].sodium >= 300) {
+            filteredRowsParam_.push(rows_[i])
+          }
+        }
+        return filteredRowsParam_
+      } else {
+        return rows_
+      }
+    },
+    additionalSortConditions (store_, filteredRowsData, rows) {
+      console.log('conditions sort function')
+      if (store_.prepared) {
+
+      const filteredRows_ = []
+      for (let i = 0; i < rows.length; i++) {
+        if (rows[i].sodium >= 300) {
+         filteredRows_.push(rows[i])
+        }
+      }
+        filteredRowsData = filteredRows_
+        return  [...filteredRowsData]
+      } 
+      else if (!store_.prepared) {
+        return [...rows]
+      }
     }
   }
 }

package/src/store/table.js

@@ -5,7 +5,8 @@ export const tableStore = defineStore('tableStore', {
     disableScannerButtons: useStorage('disableScannerButtons', false),
     filterValue: useStorage('filterValue', ''),
     lastFilterValue: useStorage('lastFilterValue', ''),
-    visiblecolumns: useStorage('visiblecolumns', [])
+    visiblecolumns: useStorage('visiblecolumns', []),
+    prepared: useStorage('prepared', false),
   }),
   getters: {
   },