quasar-factory-lib 0.1.13 → 0.1.15

package/package.json

@@ -98,6 +98,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -541,7 +541,7 @@ export default defineComponent({
         }, {} as { [key: string]: string })
     },
     handleInfiniteScrollTableCompositionAPi () {
-      const offSet = this.showIconAdvancedFilter   && this.smallDevice ? document.getElementsByClassName('q-table__control')[0].offsetHeight : 0
+      // const offSet = this.showIconAdvancedFilter   && this.smallDevice ? document.getElementsByClassName('q-table__control')[0].offsetHeight : 0
       this.$nextTick(() => {
         const elemClass = this.smallDevice ? 'q-table__grid-content' : 'q-table__middle scroll'
         const tableType = this.smallDevice ? 'Grid' : 'Table'
@@ -550,7 +550,7 @@ export default defineComponent({
           qtableScrollElem.length > 0 ? qtableScrollElem[0] : window
         const fnAddScroll = (event: Event) => {
           const { scrollHeight, scrollTop, clientHeight } = event.target as HTMLElement
-          if (Math.abs(scrollHeight - clientHeight - scrollTop - offSet) < 1) {
+          if (Math.abs(scrollHeight - clientHeight - scrollTop) <= 1) {
             console.log(`[${tableType}] You are at the bottom!`, this.totalPage)
             this.totalPage++
           }

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

@@ -20,30 +20,6 @@ const infiniteScroll = {
       elementToScroll.addEventListener('scroll', fnAddScroll)
     })
   },
-  handleInfiniteScrollNewTableCompositionAPi (nextTick, smallDevice, totalPage) {
-    nextTick(() => {
-      const elemClass = smallDevice ? 'q-table__grid-content' : 'q-table__middle scroll'
-      const tableType = smallDevice ? 'Grid' : 'Table'
-      const qtableScrollElem = document.getElementsByClassName(elemClass) as HTMLCollectionOf<HTMLElement>
-      const elementToScroll =
-        qtableScrollElem.length > 0 ? qtableScrollElem[0] : window
-      const fnAddScroll = (event: Event) => {
-        console.log(totalPage, 'totalPage')
-        const { scrollHeight, scrollTop, clientHeight } = event.target as HTMLElement
-        if (Math.abs(scrollHeight - clientHeight - scrollTop) <= 1) {
-          debugger
-          console.log(`[${tableType}] You are at the bottom!`, totalPage)
-          totalPage++
-        }
-      }
-      window.removeEventListener('scroll', fnAddScroll)
-      elementToScroll.removeEventListener('scroll', fnAddScroll)
-      elementToScroll.addEventListener('scroll', fnAddScroll)
-    })
-  },
-  /* 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(() => {

package/src/layouts/PdaLayout.vue

@@ -555,16 +555,16 @@ export default {
     '$q.screen.width' (): void {
       setTimeout(() => {
         this.tableStyle = setTableHeight.setTableHeight()
-        // this.$refs.table.handleInfiniteScrollTableCompositionAPi()
-        infiniteScroll.handleInfiniteScrollNewTable(this)
+        this.$refs.table.handleInfiniteScrollTableCompositionAPi()
+        //infiniteScroll.handleInfiniteScrollNewTable(this)
       }, 500)
     },
     showSkeleton (val: boolean) {
       if (!val) {
         setTimeout(() => {
           this.tableStyle = setTableHeight.setTableHeight()
-          // this.$refs.table.handleInfiniteScrollTableCompositionAPi()
-          infiniteScroll.handleInfiniteScrollNewTable(this)
+          this.$refs.table.handleInfiniteScrollTableCompositionAPi()
+          // infiniteScroll.handleInfiniteScrollNewTable(this)
         }, 500)
       }
     }