@hostlink/nuxt-light 1.21.0 → 1.21.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -267,37 +267,36 @@ const module = defineNuxtModule({
     await addComponentsDir({
       path: resolver.resolve("./runtime/components")
     });
-    const from = resolver.resolve("./runtime/lib");
     const index = resolver.resolve("./runtime/index");
     const SystemValue = resolver.resolve("./runtime/lib/SystemValue");
     addImports([
-      { name: "api", from },
-      { name: "id", from },
-      { name: "getID", from },
-      { name: "addObject", from },
-      { name: "f", from },
-      { name: "getApiUrl", from },
-      { name: "getCurrentUser", from },
-      { name: "getObject", from },
-      { name: "list", from },
-      { name: "m", from },
-      { name: "q", from },
-      { name: "removeObject", from },
-      { name: "t", from },
+      { name: "api", from: index },
+      { name: "id", from: index },
+      { name: "getID", from: index },
+      { name: "addObject", from: index },
+      { name: "f", from: index },
+      { name: "getApiUrl", from: index },
+      { name: "getCurrentUser", from: index },
+      { name: "getObject", from: index },
+      { name: "list", from: index },
+      { name: "m", from: index },
+      { name: "q", from: index },
+      { name: "removeObject", from: index },
+      { name: "t", from: index },
       { name: "useLight", from: index },
-      { name: "isGranted", from },
-      { name: "sv", from },
+      { name: "isGranted", from: index },
+      { name: "sv", from: index },
       { name: "loadSV", from: SystemValue },
       { name: "getSV", from: SystemValue },
-      { name: "getModelColumns", from },
-      { name: "getModelFields", from },
-      { name: "getModelField", from },
-      { name: "getGQLFields", from },
-      { name: "model", from },
-      { name: "notify", from },
-      { name: "defineLightModel", from },
-      { name: "LightModelField", from, type: true },
-      { name: "LightModel", from, type: true },
+      { name: "getModelColumns", from: index },
+      { name: "getModelFields", from: index },
+      { name: "getModelField", from: index },
+      { name: "getGQLFields", from: index },
+      { name: "model", from: index },
+      { name: "notify", from: index },
+      { name: "defineLightModel", from: index },
+      { name: "LightModelField", from: index, type: true },
+      { name: "LightModel", from: index, type: true },
       { name: "collect", from: index }
     ]);
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);

package/dist/runtime/components/l-user-overview.vue

@@ -1,79 +1,48 @@
 <script setup lang="ts">
 
-import { model } from "#imports";
-const props = defineProps(['id']);
-
-const obj = await model('User').get({ user_id: props.id }, ["user_id", "username", "first_name", "last_name", "email", "phone", "roles", 'status', 'join_date'])
+import { collect, model } from "#imports";
+const props = defineProps({
+    id: {
+        type: String,
+        required: true
+    }
+});
+
+const obj = await collect("User", {
+    user_id: true,
+    username: true,
+    first_name: true,
+    last_name: true,
+    email: true,
+    phone: true,
+    roles: true,
+    status: true,
+    join_date: true
+}).where("user_id", props.id).first()
 
 </script>
 <template>
-    <l-card class="q-mb-md">
+    <l-card>
         <q-card-section>
             <l-row>
-                <l-col md="5">
+                <l-col md="6">
                     <q-list dense separator>
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Username') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.username }}</q-item-section>
-                        </q-item>
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('First name') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.first_name }}</q-item-section>
-                        </q-item>
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Last name') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.last_name }}</q-item-section>
-                        </q-item>
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Email') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.email }}</q-item-section>
-                        </q-item>
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Phone') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.phone }}</q-item-section>
-                        </q-item>
-
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Roles') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>
-                                <div class="q-gutter-xs float-left">
-                                    <q-badge v-for="role in obj.roles" :key="role" :color="$light.color">{{ role }}</q-badge>
-                                </div>
-                            </q-item-section>
-                        </q-item>
-
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Status') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ model('User').columns(["status"])[0].format(obj.status) }}</q-item-section>
-                        </q-item>
-
-                        <q-item>
-                            <q-item-section>
-                                <q-item-label>{{ $t('Join date') }}</q-item-label>
-                            </q-item-section>
-                            <q-item-section>{{ obj.join_date }}</q-item-section>
-                        </q-item>
+                        <l-item label="Username">{{ obj.username }}</l-item>
+                        <l-item label="First name">{{ obj.first_name }}</l-item>
+                        <l-item label="Last name">{{ obj.last_name }}</l-item>
+                        <l-item label="Email">{{ obj.email }}</l-item>
+                        <l-item label="Phone">{{ obj.phone }}</l-item>
+                        <l-item label="Roles">
+                            <div class="q-gutter-xs float-left">
+                                <q-badge v-for="role in obj.roles" :key="role" :color="$light.color">{{ role
+                                    }}</q-badge>
+                            </div>
+                        </l-item>
+                        <l-item label="Status">{{ model('User').columns(["status"])[0].format(obj.status) }}</l-item>
+                        <l-item label="Join date">{{ obj.join_date }}</l-item>
                     </q-list>
-
-
                 </l-col>
             </l-row>
-
         </q-card-section>
-
     </l-card>
 </template>

package/dist/runtime/index.d.ts

@@ -35,5 +35,3 @@ declare module '@formkit/inputs' {
     }
 }
 export * from "./lib/index.js";
-import { api } from "./lib/index.js";
-export declare const collect: (name: string, fields: Object) => ReturnType<typeof api.collect>;

package/dist/runtime/index.js

@@ -1,5 +1 @@
 export * from "./lib/index.js";
-import { api } from "./lib/index.js";
-export const collect = (name, fields) => {
-  return api.collect(name, fields);
-};

package/dist/runtime/lib/collect.d.ts

@@ -0,0 +1,3 @@
+import { default as api } from "./api.js";
+declare const _default: (name: string, fields: Object) => ReturnType<typeof api.collect>;
+export default _default;

package/dist/runtime/lib/collect.js

@@ -0,0 +1,4 @@
+import { default as api } from "./api.js";
+export default (name, fields) => {
+  return api.collect(name, fields);
+};

package/dist/runtime/lib/getObject.js

@@ -1,7 +1,7 @@
 import { toQuery } from "@hostlink/light";
 import { useRoute } from "vue-router";
 import { default as getModelField } from "./getModelField.js";
-import { collect } from "#imports";
+import { default as collect } from "./collect.js";
 export default async function(fields = []) {
   let route = useRoute();
   if (!route.name) {

package/dist/runtime/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { default as api } from "./api.js";
+export { default as collect } from "./collect.js";
 export { default as f } from "./f.js";
 export { default as getApiUrl } from "./getApiUrl.js";
 export { default as getCurrentUser } from "./getCurrentUser.js";

package/dist/runtime/lib/index.js

@@ -1,6 +1,7 @@
 import { useRuntimeConfig } from "nuxt/app";
 import { Notify } from "quasar";
 export { default as api } from "./api.js";
+export { default as collect } from "./collect.js";
 export { default as f } from "./f.js";
 export { default as getApiUrl } from "./getApiUrl.js";
 export { default as getCurrentUser } from "./getCurrentUser.js";

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

@@ -4,16 +4,18 @@ import { m, api } from '#imports'
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 
-const { app, listRole: roles } = await api.query({
+const { app } = await api.query({
     app: {
-        permissions: true
-    },
-    listRole: {
-        name: true,
-        permissions: true
+        permissions: true,
+        roles: {
+            name: true,
+            permissions: true
+        }
     }
 })
 
+const roles = app.roles;
+
 const columns = [{
     label: t("Permission"),
     field: "permission",

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

@@ -6,18 +6,17 @@ const obj = reactive({
     roles: []
 });
 
-const { app, listRole } = await api.query({
+const { app } = await api.query({
     app: {
-        permissions: true
-    },
-    listRole: {
-        name: true,
-        permissions: true
+        permissions: true,
+        roles: {
+            name: true,
+            permissions: true
+        }
     }
-
 })
 
-let roles = listRole.map((role) => {
+let roles = app.roles.map((role) => {
     return {
         label: role.name,
         value: role.name,
@@ -27,7 +26,7 @@ let roles = listRole.map((role) => {
 const submit = () => {
 
     //filter roles
-    let e = listRole.filter((role) => {
+    let e = app.roles.filter((role) => {
         return obj.roles.indexOf(role.name) != -1;
     });
 

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

@@ -14,6 +14,7 @@ const columns = [
     }
 ]
 
+
 </script>
 <template>
     <l-page>

package/dist/runtime/pages/System/fs.vue

@@ -89,12 +89,13 @@ const columns = [
                     ]"></FormKit>
 
                     <FormKit type="group" name="data">
+                        <FormKit type="l-input" label="Url" name="url"
+                            hint="URL is used to generate the full URL of the file.">
+                        </FormKit>
+
                         <template v-if="value.type == 'local'">
                             <FormKit type="l-input" label="Location" name="location" validation="required"
                                 hint="Location is the path to the directory where the files are stored."></FormKit>
-                            <FormKit type="l-input" label="Base Url" name="base_url" validation="required"
-                                hint="Base URL is used to generate the full URL of the file."></FormKit>
-
                         </template>
 
                         <template v-if="value.type == 's3'">

package/dist/runtime/plugin.js

@@ -30,6 +30,7 @@ export default defineNuxtPlugin((nuxtApp) => {
   api.model("User").setDataPath("app.listUser");
   api.model("UserLog").setDataPath("app.listUserLog");
   api.model("SystemValue").setDataPath("app.listSystemValue");
+  api.model("Permission").setDataPath("app.listPermission");
   nuxtApp.vueApp.config.errorHandler = (err, instance, info) => {
     console.log(err);
     const light = useLight();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",