@hostlink/nuxt-light 0.0.21 → 0.0.22

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.21"
+  "version": "0.0.22"
 }

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

@@ -2,7 +2,7 @@
 import { useQuasar, QTable } from 'quasar';
 import { useRoute } from 'vue-router';
 import { ref, computed, onMounted, useSlots, reactive } from "vue";
-import { t, deleteObject, listObject } from '../';
+import { t, deleteObject, q, f } from '../';
 
 const route = useRoute();
 const module = route.path.split("/")[1];
@@ -150,11 +150,45 @@ const validateData = () => {
 
 }
 
+const getData = async (
+    operation: string,
+    filters = {},
+    sort: String,
+    offset: number,
+    limit: number,
+    fields: Array<string> = []) => {
+
+    let offset_limit: any = {}
+    if (offset) {
+        offset_limit.offset = offset;
+    }
+
+    if (limit) {
+        offset_limit.limit = limit;
+    }
+
+    let params: any = {}
+    if (sort) {
+        params.sort = sort;
+    }
+
+    if (filters) {
+        params.filters = filters
+    }
+
+    return await q(operation, params, [f("data", offset_limit, fields), f("meta", ["total", "key", "name"])]);
+
+}
+
 const onRequest = async (p: any) => {
 
 
     const callback = {
-        async loadData(model: String, filters: null, fields: Array<any> = []) {
+
+        loadObjects(model: string, filters: any = null, fields: Array<any> = []) {
+            return this.loadData("list" + model, filters, fields);
+        },
+        async loadData(operation: string, filters: any = null, fields: Array<any> = []) {
 
             //
             let localFields: Array<any> = [];
@@ -206,12 +240,10 @@ const onRequest = async (p: any) => {
             loading.value = true;
             const offset = (p.pagination.page - 1) * p.pagination.rowsPerPage;
             const limit = p.pagination.rowsPerPage;
-            const allData = await listObject(model, localFilters, sort, offset, limit, localFields);
+            const allData = await getData(operation, localFilters, sort, offset, limit, localFields);
 
             rows.value = allData.data;
 
-
-            console.log(allData.meta)
             //meta
             primaryKey.value = allData.meta.key;
             modelName.value = allData.meta.name;

package/dist/runtime/pages/EventLog/index.vue

@@ -42,7 +42,7 @@ const columns = [
 
 <template>
     <l-page>
-        <l-table @request="$event.loadData('EventLog')" :columns="columns" sort-by="eventlog_id:desc"
+        <l-table @request="$event.loadObjects('EventLog')" :columns="columns" sort-by="eventlog_id:desc"
             :show-actions="['view']">
 
         </l-table>

package/dist/runtime/pages/MailLog/index.vue

@@ -35,7 +35,7 @@ const columns = [
 
 <template>
     <l-page>
-        <l-table @request="$event.loadData('MailLog', null, ['body'])" :columns="columns" sort-by="maillog_id:desc">
+        <l-table @request="$event.loadObjects('MailLog', null, ['body'])" :columns="columns" sort-by="maillog_id:desc">
 
 
         </l-table>

package/dist/runtime/pages/Permission/index.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { listData } from '../../';
-const onRequest = async (params) => {
-    listData("Permission", params, ["permission_id"]);
+const onRequest = async (request) => {
+    request.loadObjects("Permission", null, ["permission_id"])
 };
 
 const columns = [

package/dist/runtime/pages/User/index.vue

@@ -3,7 +3,7 @@
 const onRequest = async (request) => {
     //listData("User", params, ["canDelete", "canUpdate", "canRead", "user_id"]);
 
-    request.loadData("User", null, ["user_id"]);
+    request.loadObjects("User", null, ["user_id"]);
 };
 
 const columns = [

package/dist/runtime/pages/UserLog/index.vue

@@ -37,7 +37,7 @@ const columns = [
 </script>
 <template>
     <l-page>
-        <l-table @request="$event.loadData('UserLog')" :columns="columns" sort-by="login_dt:desc">
+        <l-table @request="$event.loadObjects('UserLog')" :columns="columns" sort-by="login_dt:desc">
         </l-table>
     </l-page>
 </template>

package/package.json

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