quasar-factory-lib 0.0.39 → 0.0.41

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -99,7 +99,6 @@ import TableColumnsSelector from './components/TableColumnsSelector.vue'
 import TableSlotBody from './components/TableSlotBody.vue'
 import TableSlotGrid from './components/TableSlotGrid.vue'
 import TableFilter from './components/TableFilter.vue'
-import TableSort from './utils/sort.js'
 import TableSkeleton from './components/TableSkeleton.vue'
 import CardListSkeleton from './components/CardListSkeleton.vue'
 
@@ -128,15 +127,15 @@ export default defineComponent({
     },
     filterMethod: {
       type: Function,
-      default: function () {}
+      required: true
     },
     filterComputed: {
       type: Object,
-      default: () => {}
+      required: true
     },
-    sortDataValues: {
-      type: Array,
-      default: () => ['']
+    sortMethod: {
+      type: Function,
+      required: true
     },
     selectionType: {
       type: String as () => 'none' | 'single' | 'multiple',
@@ -284,19 +283,7 @@ export default defineComponent({
     },
     toogleLoading () {
       this.loading = !this.loading
-    },
-    sortMethod (rows: object[], sortBy: string, descending: boolean): object[] | [] {
-      const allrowsSorted = TableSort.sortMethod(rows, sortBy, descending, this.sortDataValues)
-      const rowsSliced = allrowsSorted.slice(0, rows.length)
-      if (this.store.valueInputFilterTable === '') {
-        return rowsSliced
-      } else {
-        return TableSort.sortMethod(rows, sortBy, descending, this.sortDataValues)
-      }
     }
   }
 })
-</script>
-<style>
-/* @import url('./style.css'); */
-</style>
+</script>

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

@@ -2,16 +2,16 @@
 
 import infiniteScroll from './infiniteScroll'
 const filterMethod = {
-  filter (self: {filterTerms: string }, rows: string | [], terms: { search: string }): object[] | [] {
-    self.filterTerms = terms.search
-    if (terms.search) {
+  filter (self: {filterTerms: string, filteredRows: object [] | [] }, rows: string | [], terms: { search: string }): object[] | [] {
+    if (self.store.filterValue !== '') {
       const filteredRows = []
       const lowerSearch = terms.search ? terms.search.toLowerCase() : ''
-      for (let i = 0; i < rows.length; i++) {
-        if (this.containsSearchTermInRow(rows[i], lowerSearch)) {
-          filteredRows.push(rows[i])
+      for (let i = 0; i < self.rows.length; i++) {
+        if (this.containsSearchTermInRow(self.rows[i], lowerSearch)) {
+          filteredRows.push(self.rows[i])
         }
       }
+      self.filteredRows = filteredRows
       return infiniteScroll.paginationNewTable(self, filteredRows)
     } else {
       return infiniteScroll.paginationNewTable(self, rows)

package/src/layouts/PdaLayout.vue

@@ -31,6 +31,8 @@
           :selection-type="'multiple'"
           :filter-method="filterMethod"
           :filter-computed="filter"
+          :sortDataValues="['date']"
+          :filteredRows="filteredRows"
           @on-select-visible-columns="saveSelectedColumns"
           @on-update-basic-checkbox-value="onUpdateBasicCheckboxValue"
           @on-update-customized-checkbox-value="onUpdateCustomizedCheckboxValue"
@@ -61,7 +63,7 @@ export default {
       forceRender: false,
       store: tableStore(),
       totalPage: 0,
-      pageSize: 20,
+      pageSize:15,
       tableStyle: '',
       columns: [{
         name: 'name',
@@ -70,6 +72,13 @@ export default {
         align: 'left',
         sortable: true
       },
+      {
+        name: 'date',
+        required: true,
+        label: 'Fecha',
+        align: 'left',
+        sortable: true
+      },
       {
         name: 'available',
         required: true,
@@ -164,6 +173,7 @@ export default {
         {
           id: 1,
           name: 'Frozen Yogurt',
+          date: '21/12/2024',
           booleanIcon: true,
           available: true,
           calories: 159,
@@ -178,6 +188,7 @@ export default {
         {
           id: 2,
           name: 'Ice cream sandwich',
+          date: '12/12/2024',
           booleanIcon: true,
           available: false,
           calories: 237,
@@ -192,6 +203,7 @@ export default {
         {
           id: 3,
           name: 'Eclair',
+          date: '21/12/2025',
           booleanIcon: true,
           available: true,
           calories: 262,
@@ -206,6 +218,7 @@ export default {
         {
           id: 4,
           name: 'Cupcake',
+          date: '05/07/2024',
           booleanIcon: false,
           available: false,
           calories: 305,
@@ -220,6 +233,7 @@ export default {
         {
           id: 5,
           name: 'Gingerbread',
+          date: '07/05/2024',
           booleanIcon: true,
           available: true,
           calories: 356,
@@ -234,6 +248,7 @@ export default {
         {
           id: 5,
           name: 'Jelly bean',
+          date: '11/12/2025',
           booleanIcon: false,
           available: false,
           calories: 375,
@@ -249,6 +264,7 @@ export default {
           id: 6,
           name: 'Lollipop',
           booleanIcon: true,
+          date: '21/12/2024',
           available: true,
           calories: 392,
           fat: 0.2,
@@ -263,6 +279,7 @@ export default {
           id: 7,
           name: 'Honeycomb',
           booleanIcon: true,
+          date: '22/12/2023',
           available: false,
           calories: 408,
           fat: 3.2,
@@ -277,6 +294,7 @@ export default {
           id: 8,
           name: 'Donut',
           booleanIcon: true,
+          date: '25/12/2024',
           available: true,
           calories: 452,
           fat: 25.0,
@@ -290,6 +308,172 @@ export default {
         {
           id: 9,
           name: 'KitKat',
+          date: '20/12/2024',
+          booleanIcon: false,
+          available: false,
+          calories: 518,
+          fat: 26.0,
+          carbs: 65,
+          checked: true,
+          protein: 7,
+          sodium: 54,
+          calcium: '12%',
+          iron: '6%'
+        },
+        {
+          id: 10,
+          name: 'Frozen Yogurt',
+          date: '21/12/2024',
+          booleanIcon: true,
+          available: true,
+          calories: 159,
+          fat: 6.0,
+          carbs: 24,
+          checked: false,
+          protein: 4.0,
+          sodium: 87,
+          calcium: '14%',
+          iron: '1%'
+        },
+        {
+          id: 11,
+          name: 'Frozen Yogurt',
+          date: '21/12/2024',
+          booleanIcon: true,
+          available: true,
+          calories: 159,
+          fat: 6.0,
+          carbs: 24,
+          checked: false,
+          protein: 4.0,
+          sodium: 87,
+          calcium: '14%',
+          iron: '1%'
+        },
+        {
+          id: 12,
+          name: 'Ice cream sandwich',
+          date: '12/12/2024',
+          booleanIcon: true,
+          available: false,
+          calories: 237,
+          fat: 9.0,
+          carbs: 37,
+          checked: false,
+          protein: 4.3,
+          sodium: 129,
+          calcium: '8%',
+          iron: '1%'
+        },
+        {
+          id: 13,
+          name: 'Eclair',
+          date: '21/12/2025',
+          booleanIcon: true,
+          available: true,
+          calories: 262,
+          fat: 16.0,
+          carbs: 23,
+          checked: false,
+          protein: 6.0,
+          sodium: 337,
+          calcium: '6%',
+          iron: '7%'
+        },
+        {
+          id: 14,
+          name: 'Cupcake',
+          date: '05/07/2024',
+          booleanIcon: false,
+          available: false,
+          calories: 305,
+          fat: 3.7,
+          carbs: 67,
+          checked: false,
+          protein: 4.3,
+          sodium: 413,
+          calcium: '3%',
+          iron: '8%'
+        },
+        {
+          id: 15,
+          name: 'Gingerbread',
+          date: '07/05/2024',
+          booleanIcon: true,
+          available: true,
+          calories: 356,
+          fat: 16.0,
+          carbs: 49,
+          checked: false,
+          protein: 3.9,
+          sodium: 327,
+          calcium: '7%',
+          iron: '16%'
+        },
+        {
+          id: 16,
+          name: 'Jelly bean',
+          date: '11/12/2025',
+          booleanIcon: false,
+          available: false,
+          calories: 375,
+          fat: 0.0,
+          carbs: 94,
+          checked: true,
+          protein: 0.0,
+          sodium: 50,
+          calcium: '0%',
+          iron: '0%'
+        },
+        {
+          id: 17,
+          name: 'Lollipop',
+          booleanIcon: true,
+          date: '21/12/2024',
+          available: true,
+          calories: 392,
+          fat: 0.2,
+          carbs: 98,
+          checked: false,
+          protein: 0,
+          sodium: 38,
+          calcium: '0%',
+          iron: '2%'
+        },
+        {
+          id: 18,
+          name: 'Honeycomb',
+          booleanIcon: true,
+          date: '22/12/2023',
+          available: false,
+          calories: 408,
+          fat: 3.2,
+          carbs: 87,
+          checked: true,
+          protein: 6.5,
+          sodium: 562,
+          calcium: '0%',
+          iron: '45%'
+        },
+        {
+          id: 19,
+          name: 'Donut',
+          booleanIcon: true,
+          date: '25/12/2024',
+          available: true,
+          calories: 452,
+          fat: 25.0,
+          carbs: 51,
+          checked: false,
+          protein: 4.9,
+          sodium: 326,
+          calcium: '2%',
+          iron: '22%'
+        },
+        {
+          id: 20,
+          name: 'Last line',
+          date: '31/12/2026',
           booleanIcon: false,
           available: false,
           calories: 518,
@@ -302,7 +486,8 @@ export default {
           iron: '6%'
         }
       ],
-      visibleColumns: []
+      visibleColumns: [],
+      filteredRows: []
     }
   },
   computed: {

package/src/pages/TablePage.vue

@@ -18,6 +18,7 @@
           :selection-type="'multiple'"
           :filter-method="filterMethod"
           :filter-computed="filter"
+          :sort-method="sortMethod"
           @on-select-visible-columns="saveSelectedColumns"
           @on-update-basic-checkbox-value="onUpdateBasicCheckboxValue"
           @on-update-customized-checkbox-value="onUpdateCustomizedCheckboxValue"
@@ -32,6 +33,7 @@ import Table from '../components/Table/Table.vue'
 import setTableHeight from '../components/Table/utils/setTableHeight'
 import infiniteScroll from '../components/Table/utils/infiniteScroll'
 import FilterMethod from '../components/Table/utils/filterMethod'
+import TableSort from '../components/Table/utils/sort.js'
 import { tableStore } from '../store/table.js'
 export default {
   components: {
@@ -275,7 +277,9 @@ export default {
           iron: '6%'
         }
       ],
-      visibleColumns: []
+      visibleColumns: [],
+      sortDateValues: ['dateCreation'],
+      filteredRows: []
     }
   },
   computed: {
@@ -291,10 +295,10 @@ export default {
   },
   mounted () {
     this.store.cleanTableFilter()
+    this.visibleColumns = this.store.visiblecolumns
     this.tableStyle = setTableHeight.setTableHeight()
     infiniteScroll.handleInfiniteScrollNewTable(this)
     this.rows = this.rowsData
-    this.visibleColumns = this.store.visiblecolumns
   },
   methods: {
     saveSelectedColumns (columns: string []): void {
@@ -312,6 +316,15 @@ export default {
     },
     setItemNotFound (rows: object []) {
       console.log(rows, 'onClickButton')
+    },
+    sortMethod (rows: object[], sortBy: string, descending: boolean): object[] | [] {
+      let allrowsSorted = []
+      if (this.store.filterValue !== '') {
+        allrowsSorted = TableSort.sortMethod(this.filteredRows, sortBy, descending, this.sortDateValues)
+      } else {
+        allrowsSorted = TableSort.sortMethod(this.rows, sortBy, descending, this.sortDateValues)
+      }
+       return allrowsSorted.slice(0, rows.length)
     }
   }
 }