quasar-factory-lib 0.0.45 → 0.0.46

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -129,10 +129,6 @@ export default defineComponent({
       type: Function,
       default: function () {}
     },
-    filterComputed: {
-      type: Object,
-      default: function () {}
-    },
     sortMethod: {
       type: Function,
       default: function () {}
@@ -199,8 +195,9 @@ export default defineComponent({
       showColumnsSelector: false,
       showSearch: false,
       loading: false,
-      storeData: this.store,
-      forceRender: false
+      forceRender: false,
+      totalPage: 0,
+      pageSize: 20
     }
   },
   computed: {
@@ -218,6 +215,15 @@ export default defineComponent({
     },
     getGridSkeletonVisibility () {
       return this.smallDevice && this.showSkeleton
+    },
+    filterComputed ():object {
+      return {
+        search: this.store.filterValue,
+        forceRender: this.forceRender
+      }
+    },
+    pageLength (): number {
+      return (this.totalPage + 1) * this.pageSize
     }
   },
   watch: {
@@ -261,8 +267,6 @@ export default defineComponent({
       this.$emit('onUpdateCustomizedCheckboxValue', row)
     },
     clearTableSelection () {
-      // const table = this.$refs.myTable as QTable
-      // table.clearSelection()
       this.selected = []
     },
     toggleSearchVisibility (store: {disableScannerButtons: boolean, lastFilterValue: string, valueInputFilterTable: string}) {

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

@@ -11,8 +11,8 @@ const infiniteScroll = {
       const fnAddScroll = (event: Event) => {
         const { scrollHeight, scrollTop, clientHeight } = event.target as HTMLElement
         if (Math.abs(scrollHeight - clientHeight - scrollTop) < 1) {
-          console.log(`[${tableType}] You are at the bottom!`, self.totalPage)
-          self.totalPage++
+          console.log(`[${tableType}] You are at the bottom!`, self.$refs.table.totalPage)
+          self.$refs.table.totalPage++
         }
       }
       window.removeEventListener('scroll', fnAddScroll)
@@ -20,11 +20,11 @@ const infiniteScroll = {
       elementToScroll.addEventListener('scroll', fnAddScroll)
     })
   },
-  paginationNewTable (self: { pageLength: number; rowsPaginationCount: number; }, rows: object []): object [] {
-    const rowsPagination = rows.slice(0, self.pageLength)
-    return rowsPagination
+  paginationNewTable (self: { pageLength: number;  }, rows: object []): object [] {
+    return rows.slice(0, self.$refs.table.pageLength)
   },
   handleInfiniteScrollModal (self: { $nextTick: (arg0: () => void) => void; totalPageModal: number; smallDevice: boolean }, tableID: string): void {
+    console.log('handleInfiniteScrollModal')
     self.$nextTick(() => {
       const tableElement = document.getElementById(tableID)
       const elemClass = self.smallDevice ? 'q-table__grid-content' : 'q-table__middle scroll'
@@ -36,13 +36,13 @@ const infiniteScroll = {
         if (self.smallDevice) {
           if (elementToScroll.scrollTop + elementToScroll.clientHeight >= elementToScroll.scrollHeight) {
             console.log('[Grid] You are at the bottom!')
-            self.totalPageModal++
+            self.$refs.table.totalPage++
           }
         } else {
           const { scrollHeight, scrollTop, clientHeight } = target
           if (Math.abs(scrollHeight - clientHeight - scrollTop) < 1) {
             console.log('[Table] You are at the bottom!')
-            self.totalPageModal++
+            self.$refs.table.totalPage++
           }
         }
       }
@@ -52,7 +52,7 @@ const infiniteScroll = {
     })
   },
   paginationModal (self: { pageLengthModal: number; rowsPaginationCount: number; }, rows: object []): object [] {
-    const rowsPagination = rows.slice(0, self.pageLengthModal)
+    const rowsPagination = rows.slice(0, self.$refs.table.totalPage++)
     return rowsPagination
   }
 }

package/src/layouts/PdaLayout.vue

@@ -31,8 +31,6 @@
           :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"
@@ -63,7 +61,7 @@ export default {
       forceRender: false,
       store: tableStore(),
       totalPage: 0,
-      pageSize:15,
+      pageSize: 20,
       tableStyle: '',
       columns: [{
         name: 'name',
@@ -173,7 +171,6 @@ export default {
         {
           id: 1,
           name: 'Frozen Yogurt',
-          date: '21/12/2024',
           booleanIcon: true,
           available: true,
           calories: 159,
@@ -188,7 +185,6 @@ export default {
         {
           id: 2,
           name: 'Ice cream sandwich',
-          date: '12/12/2024',
           booleanIcon: true,
           available: false,
           calories: 237,
@@ -203,7 +199,6 @@ export default {
         {
           id: 3,
           name: 'Eclair',
-          date: '21/12/2025',
           booleanIcon: true,
           available: true,
           calories: 262,
@@ -218,7 +213,6 @@ export default {
         {
           id: 4,
           name: 'Cupcake',
-          date: '05/07/2024',
           booleanIcon: false,
           available: false,
           calories: 305,
@@ -233,7 +227,6 @@ export default {
         {
           id: 5,
           name: 'Gingerbread',
-          date: '07/05/2024',
           booleanIcon: true,
           available: true,
           calories: 356,
@@ -248,7 +241,6 @@ export default {
         {
           id: 5,
           name: 'Jelly bean',
-          date: '11/12/2025',
           booleanIcon: false,
           available: false,
           calories: 375,
@@ -264,7 +256,6 @@ export default {
           id: 6,
           name: 'Lollipop',
           booleanIcon: true,
-          date: '21/12/2024',
           available: true,
           calories: 392,
           fat: 0.2,
@@ -279,7 +270,6 @@ export default {
           id: 7,
           name: 'Honeycomb',
           booleanIcon: true,
-          date: '22/12/2023',
           available: false,
           calories: 408,
           fat: 3.2,
@@ -294,7 +284,6 @@ export default {
           id: 8,
           name: 'Donut',
           booleanIcon: true,
-          date: '25/12/2024',
           available: true,
           calories: 452,
           fat: 25.0,
@@ -308,172 +297,6 @@ 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,
@@ -486,8 +309,7 @@ export default {
           iron: '6%'
         }
       ],
-      visibleColumns: [],
-      filteredRows: []
+      visibleColumns: []
     }
   },
   computed: {