quasar-factory-lib 0.0.79 → 0.0.81

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.79",
+  "version": "0.0.81",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -207,11 +207,6 @@ export default defineComponent({
       type: Function,
       default: function () {}
     },
-    advancedFilters: {
-      type: Object,
-      default: () => ({}),
-      deep: true
-    },
     showIconAdvancedFilter: {
       type: Boolean,
       default: false
@@ -249,8 +244,8 @@ export default defineComponent({
       totalPage: 0,
       pageSize: 20,
       filteredRows: [] as object [] | [],
-      showAdvancedFilter: true,
-      advancedFiltersData: this.advancedFilters
+      showAdvancedFilter: false,
+      advancedFiltersData: {}
     }
   },
   computed: {
@@ -284,9 +279,6 @@ export default defineComponent({
     rows (val) {
       this.rowsData = val
     },
-    advancedFilters (val) {
-      this.advancedFiltersData = val
-    },
     showAdvancedFilter (val: boolean) {
       if (!val) {
         this.advancedFiltersData = {}
@@ -294,6 +286,7 @@ export default defineComponent({
     }
   },
   mounted () {
+    this.getAdvancedFilterColumns()
   },
   methods: {
     getSelectedString (val: number): string {
@@ -463,6 +456,12 @@ export default defineComponent({
 
       this.filteredRows = filteredRows_
       return  filteredRows_.slice(0, this.pageLength)
+    },
+    getAdvancedFilterColumns (): void {
+      this.advancedFiltersData = this.columns.reduce((acc, column) => {
+            acc[column.name] = ''
+          return acc
+        }, {} as { [key: string]: string })
     }
   }
 })

package/src/components/Table/components/advanced-filters/GridAdvancedFilters.vue

@@ -1,6 +1,9 @@
 <template>
   <q-dialog
     v-model="showDialog" 
+    persistent
+    seamless
+    :position="'bottom'"
     full-width
     transition-show="slide-up"
     transition-hide="slide-down">

package/src/layouts/PdaLayout.vue

@@ -43,11 +43,10 @@
           :table-style="tableStyle"
           :show-skeleton="showSkeleton"
           :selection-type="'multiple'"
-          :advanced-filters="advancedFilters" 
-          :show-icon-advanced-filter="true"
           @on-select-visible-columns="(columns) => {
             store.visiblecolumns = columns
           }"
+          :show-icon-advanced-filter="true"
           @on-update-basic-checkbox-value="onUpdateBasicCheckboxValue"
           @on-update-customized-checkbox-value="onUpdateCustomizedCheckboxValue"
           @on-click-button="setItemNotFound"
@@ -89,13 +88,13 @@ export default {
       tabletMaxWidth: 1100,
       store: tableStore(),
       tableStyle: '',
-      advancedFilters: {},
       columns: [{
         name: 'name',
         required: true,
         label: 'Dessert (100g serving)',
         align: 'left',
-        sortable: true
+        sortable: true,
+        type: 'string',
       },
       {
         name: 'date',
@@ -423,12 +422,6 @@ export default {
         icon: 'cancel',
         spinner: false
       })
-    },
-    getAdvancedFilterColumns (): void {
-      this.advancedFilters = this.columns.reduce((acc, column) => {
-            acc[column.name] = ''
-          return acc
-        }, {} as { [key: string]: string })
     }
   }
 }

package/src/pages/TablePage.vue

@@ -22,7 +22,6 @@
           :filterComputedOptions="{ preparedQuantity: store.prepared}"
           :additional-sort-conditions="additionalSortConditions"
           :additional-filter-conditions="additionalFilterConditions"
-          :advanced-filters="advancedFilters" 
           :show-icon-advanced-filter="true"
           @on-select-visible-columns="(columns) => {
             store.visiblecolumns = columns
@@ -55,7 +54,6 @@ export default {
       showDialog: false,
       store: tableStore(),
       tableStyle: '',
-      advancedFilters: {},
       columns: [
         {
           name: 'date',
@@ -404,8 +402,6 @@ export default {
     this.tableStyle = setTableHeight.setTableHeight()
     infiniteScroll.handleInfiniteScrollNewTable(this)
     this.getRows()
-    this.getAdvancedFilterColumns()
-
   },
   methods: {
     getRows () {
@@ -518,12 +514,6 @@ export default {
       else if (!this.store.prepared) {
         return [...rows]
       }
-    },
-    getAdvancedFilterColumns (): void {
-      this.advancedFilters = this.columns.reduce((acc, column) => {
-            acc[column.name] = ''
-          return acc
-        }, {} as { [key: string]: string })
     }
   }
 }