@hostlink/nuxt-light 1.20.3 → 1.20.5

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

@@ -4,6 +4,7 @@ import { useQuasar, QTable, type QTableColumn, type QTableProps, Dialog, QTab }
 import { ref, computed, onMounted, useSlots, useAttrs, watch, defineComponent, h } from "vue";
 import { t, q, useLight, GQLFieldBuilder, model } from '../';
 import { toQuery } from '@hostlink/light';
+import { collect } from "#imports"
 
 const $q = useQuasar();
 
@@ -206,57 +207,6 @@ const validateData = () => {
 
 }
 
-const getData = async (
-    operation: string,
-    filters = {},
-    sort: String,
-    offset: number,
-    limit: number,
-    fields: Array<string> = []) => {
-
-    const query: any = {};
-    query[operation] = {
-        meta: {
-            total: true,
-            key: true,
-            name: true
-        }
-    }
-
-    let offset_limit: any = {}
-    if (offset) {
-        offset_limit.offset = offset;
-    }
-
-    if (limit) {
-        offset_limit.limit = limit;
-    }
-
-    if (offset_limit) {
-        query[operation].data = {
-            __args: offset_limit
-        };
-    }
-
-    let params: any = {}
-    if (sort) {
-        params.sort = sort;
-    }
-
-    if (filters) {
-        params.filters = filters
-    }
-
-    query[operation].__args = params;
-
-    query[operation].data = query[operation].data || {};
-    Object.assign(query[operation].data, fields);
-
-    const resp = await q(query);
-    return resp[operation];
-
-}
-
 const onLocalRequest = async (p: any) => {
     if (!isServerSide) return;
 
@@ -338,9 +288,9 @@ const onLocalRequest = async (p: any) => {
             validateData();
         },
         loadObjects(model: string, filters: any = null, fields: Array<any> = []) {
-            return this.loadData("list" + model, filters, fields);
+            return this.loadData(model, filters, fields);
         },
-        async loadData(operation: string, filters: any = null, fields: Array<any> = []) {
+        async loadData(model: string, filters: any = null, fields: Array<any> = []) {
             fields.forEach((f) => {
                 builder.add(f);
             })
@@ -353,8 +303,41 @@ const onLocalRequest = async (p: any) => {
                 }
             }
             loading.value = true;
+
             try {
-                const allData = await getData(operation, localFilters, sort, this.offset, this.limit, builder.get());
+                let c = collect(model, builder.get())
+
+                if (localFilters) {
+                    for (let [key, value] of Object.entries(localFilters)) {
+                        if (typeof value == "object") {
+                            if (value.contains) {
+                                c = c.whereContains(key, value.contains);
+                            }
+                            if (value.between) {
+                                c = c.whereBetween(key, value.between);
+                            }
+                        } else {
+                            c = c.where(key, value);
+                        }
+                    }
+                }
+
+                if (sort) {
+                    if (sort.split(":")[1] == "asc") {
+                        c = c.sortBy(sort.split(":")[0]);
+                    } else {
+                        c = c.sortByDesc(sort.split(":")[0]);
+                    }
+                }
+
+                c = c.forPage(p.pagination.page, p.pagination.rowsPerPage);
+
+                const data = await c.all();
+                const allData = {
+                    data,
+                    meta: c.meta
+                }
+
                 this.setData(allData);
             } catch (e: any) {
                 quasar.dialog({
@@ -363,9 +346,6 @@ const onLocalRequest = async (p: any) => {
                 })
                 this.setData({ data: [], meta: { total: 0, key: "", name: "" } });
             }
-
-
-
         }
     }