@hostlink/nuxt-light 0.0.67 → 0.0.69

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.67"
+  "version": "0.0.69"
 }

package/dist/runtime/components/l-table.vue

@@ -49,23 +49,27 @@ const props = defineProps({
     selection: {
         type: String,
         default: "none"
+    },
+    rowsPerPageOptions: {
+        type: Array,
+        default: () => [3, 5, 7, 10, 15, 20, 25, 50, 0]
+    }, pagination: {
+        type: Object,
+        default: () => {
+            return {
+                sortBy: "",
+                descending: true,
+                page: 1,
+                rowsPerPage: 10,
+            }
+        }
     }
 })
 
-const hideBottom = ref(false)
-
-const pagination = ref({
-    sortBy: "",
-    descending: true,
-    page: 1,
-    rowsPerPage: 10,
-})
-
+const pagination = ref(props.pagination);
 
-if (props.rows == undefined) {
-    console.log(props.rows);
-    //server side
-    //pagination.value.rowsNumber = 0;
+if (props.rowsPerPageOptions[0] == 0) {
+    pagination.value.rowsPerPage = 0;
 }
 
 //apply all aligns to the columns 
@@ -277,11 +281,12 @@ const onRequest = async (p: any) => {
             modelName.value = allData.meta.name;
 
 
-            pagination.value.rowsPerPage = p.pagination.rowsPerPage;
+            //pagination.value.rowsPerPage = p.pagination.rowsPerPage;
             pagination.value.page = p.pagination.page;
             pagination.value.sortBy = p.pagination.sortBy;
             pagination.value.descending = p.pagination.descending;
             pagination.value.rowsNumber = allData.meta.total;
+            
             loading.value = false;
             validateData()
 
@@ -324,9 +329,9 @@ const onFilters = () => {
     onRequest({
         pagination: {
             page: 1,
-            rowsPerPage: pagination.value.rowsPerPage,
-            sortBy: pagination.value.sortBy,
-            descending: pagination.value.descending
+            rowsPerPage: props.pagination.rowsPerPage,
+            sortBy: props.pagination.sortBy,
+            descending: props.pagination.descending
         }
     })
 }
@@ -358,14 +363,6 @@ const onDelete = async (id: any) => {
 
 //style
 
-let rowsPerPageOptions = [3, 5, 7, 10, 15, 20, 25, 50, 0];
-if (props.pagination == false) {
-    hideBottom.value = true;
-    pagination.value = null;
-    rowsPerPageOptions = [0]
-}
-
-
 const attrs = {
     ...{
         dense: light.getStyle("tableDense", false),
@@ -387,21 +384,21 @@ const attrs = {
 
     <template v-if="debug">
         <pre>primaryKey:{{ primaryKey }}
-modelName:{{ modelName }}
-filters:{{ filters }}
-pagination:{{ pagination }}
-actionView:{{ actionView }}
-actionDelete:{{ actionDelete }}
-activeEdit:{{ activeEdit }}
-attrs:{{ attrs }}
-$attrs:{{ $attrs }}
-        </pre>
+        modelName:{{ modelName }}
+        filters:{{ filters }}
+        pagination:{{ pagination }}
+        actionView:{{ actionView }}
+        actionDelete:{{ actionDelete }}
+        activeEdit:{{ activeEdit }}
+        attrs:{{ attrs }}
+        $attrs:{{ $attrs }}
+    </pre>
         rows:{{ props.rows }}
     </template>
 
-    <q-table v-bind="attrs" :row-key="rowKey" :loading="loading" :rows="rows" :hide-bottom="hideBottom" ref="table"
-        @request="onRequest" :rows-per-page-label="$t(props.rowsPerPageLabel)" :columns="renderColumns"
-        :rows-per-page-options="rowsPerPageOptions" :selection="selection" :pagination="pagination">
+    <q-table v-bind="attrs" :row-key="rowKey" :loading="loading" :rows="rows" ref="table" @request="onRequest"
+        :rows-per-page-label="$t(props.rowsPerPageLabel)" :columns="renderColumns"
+        :rows-per-page-options="rowsPerPageOptions" :selection="selection" v-model:pagination="pagination">
 
 
         <template v-for="s in ss" v-slot:[s]="props">
@@ -416,7 +413,8 @@ $attrs:{{ $attrs }}
                     <l-view-btn v-if="actionView && props.row.canView"
                         :to="`/${modelName}/${props.row[primaryKey]}/view`" />
 
-                    <l-edit-btn :to="`/${modelName}/${props.row[primaryKey]}/edit`" v-if="activeEdit && props.row.canUpdate" />
+                    <l-edit-btn :to="`/${modelName}/${props.row[primaryKey]}/edit`"
+                        v-if="activeEdit && props.row.canUpdate" />
 
                     <l-delete-btn v-if="actionDelete && props.row.canDelete"
                         @submit="onDelete(props.row[primaryKey])"></l-delete-btn>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",