quasar-factory-lib 0.0.40 → 0.0.41

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.40",
+  "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',
@@ -176,10 +175,6 @@ export default defineComponent({
     },
     showSkeleton: {
       type: Boolean
-    },
-    filteredRows: {
-      type: Array as () => object [] | [],
-      required: true
     }
   },
   emits: [
@@ -288,17 +283,7 @@ export default defineComponent({
     },
     toogleLoading () {
       this.loading = !this.loading
-    },
-    sortMethod (rows: object[], sortBy: string, descending: boolean): object[] | [] {
-      console.log(rows.length)
-      const allrowsSorted = TableSort.sortMethod(this.filteredRows, sortBy, descending, this.sortDataValues)
-      const rowsSliced = allrowsSorted.slice(0, rows.length)
-      if (this.store.filterValue === '') {
-        return rowsSliced
-      } else {
-        return TableSort.sortMethod(rows, sortBy, descending, this.sortDataValues)
-      }
-    },
+    }
   }
 })
-</script>
+</script>

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

@@ -2,22 +2,18 @@
 
 import infiniteScroll from './infiniteScroll'
 const filterMethod = {
-  filter (self: {filterTerms: string, filteredRows: object[] | [] }, rows: string | [], terms: { search: string }): object[] | [] {
-    console.log(rows.length, 'rows')
-    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
-      // console.log(filteredRows.length, 'filteredRows terms')
+      self.filteredRows = filteredRows
       return infiniteScroll.paginationNewTable(self, filteredRows)
     } else {
-      self.filteredRows = rows
       return infiniteScroll.paginationNewTable(self, rows)
     }
   },

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)
     }
   }
 }