@hostlink/nuxt-light 1.20.6 → 1.21.1

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

@@ -53,7 +53,7 @@ const passwordExpiredProcess = (username: string, password: string) => {
         color: "positive",
         icon: "sym_o_check",
       });
-    } catch (e) {
+    } catch (e: any) {
       $q.notify({
         message: e.message,
         color: "negative",
@@ -205,7 +205,7 @@ const bioLogin = async () => {
 }
 const handleGoogleCredentialResponse = async (response) => {
   try {
-    await api.auth.googleLogin(response.credential);
+    await api.auth.google.login(response.credential);
     window.self.location.reload();
   } catch (e: any) {
     $q.notify({
@@ -255,7 +255,7 @@ onMounted(() => {
 
 const microsoftLogin = async (resp) => {
   try {
-    await api.auth.microsoftLogin(resp.accessToken);
+    await api.auth.microsoft.login(resp.accessToken);
     emits("login");
   } catch (e) {
     $q.notify({
@@ -268,7 +268,7 @@ const microsoftLogin = async (resp) => {
 }
 
 const facebookLogin = (accessToken) => {
-  m("facebookLogin", { access_token: accessToken }).then(() => {
+  api.auth.facebook.login(accessToken).then(() => {
     emits("login");
   }).catch((e) => {
     $q.notify({

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/lib/getCurrentUser.d.ts

@@ -1,2 +1,3 @@
-declare const _default: () => Promise<any>;
+import type { UserFields } from "@hostlink/light";
+declare const _default: (fields?: UserFields) => Promise<any>;
 export default _default;

package/dist/runtime/lib/getCurrentUser.js

@@ -1,9 +1,16 @@
-import q from "./q.js";
-export default async () => {
+import { default as api } from "./api.js";
+export default async (fields = {
+  username: true,
+  first_name: true,
+  last_name: true,
+  roles: true
+}) => {
   try {
-    return await q("my", ["username", "first_name", "last_name", "roles"]);
+    const { my } = await api.query({
+      my: fields
+    });
+    return my;
   } catch (e) {
     return null;
   }
-  return null;
 };

package/dist/runtime/lib/getObject.js

@@ -1,6 +1,7 @@
+import { toQuery } from "@hostlink/light";
 import { useRoute } from "vue-router";
-import loadObject from "./loadObject.js";
 import { default as getModelField } from "./getModelField.js";
+import { collect } from "#imports";
 export default async function(fields = []) {
   let route = useRoute();
   if (!route.name) {
@@ -8,8 +9,6 @@ export default async function(fields = []) {
   }
   const [module, id_name] = route.name.split("-");
   const id = parseInt(route.params[id_name]);
-  const filters = {};
-  filters[id_name] = id;
   if (fields instanceof Object && !(fields instanceof Array)) {
     fields = [fields];
   }
@@ -25,5 +24,5 @@ export default async function(fields = []) {
     }
     return field;
   });
-  return await loadObject(module, filters, fs);
+  return await collect(module, toQuery(fs)).where(id_name, id).first();
 }

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

@@ -7,8 +7,6 @@ export { default as list } from "./list.js";
 export { default as m } from "./m.js";
 export { default as q } from "./q.js";
 export { default as t } from "./t.js";
-export { default as listObject } from "./listObject.js";
-export { default as loadObject } from "./loadObject.js";
 export { default as isGranted } from "./isGranted.js";
 export { default as GQLFieldBuilder } from "./GQLFieldBuilder.js";
 export { default as getModelField } from "./getModelField.js";

package/dist/runtime/lib/index.js

@@ -9,8 +9,6 @@ export { default as list } from "./list.js";
 export { default as m } from "./m.js";
 export { default as q } from "./q.js";
 export { default as t } from "./t.js";
-export { default as listObject } from "./listObject.js";
-export { default as loadObject } from "./loadObject.js";
 export { default as isGranted } from "./isGranted.js";
 export { default as GQLFieldBuilder } from "./GQLFieldBuilder.js";
 export { default as getModelField } from "./getModelField.js";

package/dist/runtime/lib/isGranted.js

@@ -1,4 +1,13 @@
+import { default as api } from "./api.js";
 export default async function isGranted(right) {
-  const my = await q("my", [f("granted", { right }, [])]);
+  const { my } = await api.query({
+    my: {
+      granted: {
+        __args: {
+          right
+        }
+      }
+    }
+  });
   return my.granted;
 }

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

@@ -1,18 +1,9 @@
 <script setup>
-import { model, collect, api } from "#imports"
-import { ref } from 'vue'
+import { model } from "#imports"
 const columns = model("MailLog").columns(["maillog_id", "from", "to", "subject", "created_time"])
 </script>
-
 <template>
     <l-page>
-        <q-dialog v-model="show" full-width>
-            <l-card title="Mail content">
-                <q-card-section>
-                    <iframe width="100%" height="500px" :srcdoc="content" frameborder="0"></iframe>
-                </q-card-section>
-            </l-card>
-        </q-dialog>
         <l-table row-key="maillog_id" @request-data="$event.loadObjects('MailLog', {}, ['body'])" :columns="columns"
             sort-by="maillog_id:desc">
 

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

@@ -1,7 +1,13 @@
 <script setup>
 import { ref } from 'vue';
 import { m, q } from "#imports"
-const { listFileSystem } = await q({ listFileSystem: true });
+const { app, listFileSystem } = await q({
+    app: {
+        driveTypes: true
+    },
+    listFileSystem: true
+});
+
 const items = ref(listFileSystem)
 const dialog = ref(false)
 const value = ref({})
@@ -58,10 +64,12 @@ const columns = [
 ]
 </script>
 <template>
+
     <l-page gutter="xs">
         <template #header>
             <l-btn label="Add" icon="sym_o_add" @click="dialog = true"></l-btn>
         </template>
+
         <q-dialog v-model="dialog" persistent>
             <q-card style="width: 500px;">
 
@@ -74,18 +82,23 @@ const columns = [
                 <FormKit type="l-form" :value="value" @submit="onSubmit" #default="{ value }">
                     <FormKit type="l-input" label="Name" name="name" validation="required"></FormKit>
                     <FormKit type="l-select" label="Type" name="type" validation="required" :options="[
-                        { label: 'Local', value: 'local' },
-                        { label: 'S3', value: 'S3' },
-                        { label: 'HostLink storage', value: 'hostlink' },
-                        { label: 'Aliyun OSS', value: 'aliyun-oss' }
+                        { label: 'Local', value: 'local', disable: !app.driveTypes.includes('local') },
+                        { label: 'S3', value: 's3', disable: !app.driveTypes.includes('s3') },
+                        { label: 'HostLink storage', value: 'hostlink', disable: !app.driveTypes.includes('hostlink') },
+                        { label: 'Aliyun OSS', value: 'aliyun-oss', disable: !app.driveTypes.includes('aliyun-oss') },
                     ]"></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"></FormKit>
+                            <FormKit type="l-input" label="Location" name="location" validation="required"
+                                hint="Location is the path to the directory where the files are stored."></FormKit>
                         </template>
 
-                        <template v-if="value.type == 'S3'">
+                        <template v-if="value.type == 's3'">
                             <FormKit type="l-input" label="Bucket" name="bucket" validation="required"></FormKit>
                             <FormKit type="l-input" label="Access Key" name="accessKey" validation="required"></FormKit>
                             <FormKit type="l-input" label="Secret Key" name="secretKey" validation="required"></FormKit>

package/dist/runtime/pages/User/setting/bio-auth.vue

@@ -1,21 +1,22 @@
 <script setup>
 import { useQuasar } from "quasar";
-import { ref, reactive } from "vue"
-import { refreshNuxtData } from "#imports";
+import { reactive } from "vue"
+
 import { q, m, getCurrentUser, api } from '#imports'
-const { app, listWebAuthn: data } = reactive(await q({
+const { app, my: { webAuthn } } = reactive(await q({
     app: {
         hasBioAuth: true
     },
-    listWebAuthn: {
-        uuid: true,
-        ip: true,
-        user_agent: true,
-        createdTime: true
+    my: {
+        webAuthn: {
+            uuid: true,
+            ip: true,
+            user_agent: true,
+            createdTime: true
+        }
     }
 }));
 
-
 const quasar = useQuasar();
 
 const register = async () => {
@@ -25,19 +26,21 @@ const register = async () => {
         localStorage.setItem("username", user.username);
 
         //refresh data
-        const { listWebAuthn: d } = await q({
-            listWebAuthn: {
-                uuid: true,
-                ip: true,
-                user_agent: true,
-                createdTime: true
+        const { my } = await q({
+            my: {
+                webAuthn: {
+                    uuid: true,
+                    ip: true,
+                    user_agent: true,
+                    createdTime: true
+                }
             }
         });
 
         //clear data
-        data.splice(0, data.length);
+        webAuthn.splice(0, webAuthn.length);
 
-        data.push(...d);
+        webAuthn.push(...my.webAuthn);
 
     } catch (e) {
         quasar.dialog({
@@ -83,7 +86,7 @@ const deleteItem = async (uuid) => {
     }).onOk(async () => {
         await m("deleteWebAuthn", { uuid });
         //remove from data
-        data.splice(data.findIndex(item => item.uuid === uuid), 1);
+        webAuthn.splice(webAuthn.findIndex(item => item.uuid === uuid), 1);
     })
 }
 
@@ -100,7 +103,7 @@ const deleteItem = async (uuid) => {
                 <l-btn label="Register" @click="register" icon="sym_o_add"></l-btn>
             </q-toolbar>
 
-            <q-table :rows="data" :columns="columns" dense :rows-per-page-options="[0]">
+            <q-table :rows="webAuthn" :columns="columns" dense :rows-per-page-options="[0]">
                 <template #body-cell-action="props">
                     <q-td :props="props" auto-width>
                         <q-btn @click="deleteItem(props.row.uuid)" icon="sym_o_delete" round flat dense></q-btn>

package/dist/runtime/pages/User/setting/open_id.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { reactive, onMounted, nextTick } from "vue"
 import { useQuasar } from "quasar";
-import { q, m, useLight } from '#imports'
+import { q, m, useLight, api } from '#imports'
 import { useI18n } from 'vue-i18n'
 
 const light = useLight()
@@ -20,13 +20,13 @@ let { app, my } = await q({
     }
 })
 
+
 const $q = useQuasar();
 my = reactive(my);
 
 const handleGoogleCredentialResponse = async (response) => {
     try {
-        await m("googleRegister", { credential: response.credential })
-
+        await api.auth.google.register(response.credential);
         const resp = await q("my", ["gmail"]);
         my.google = resp.google;
 
@@ -91,14 +91,12 @@ const onUnlink = async () => {
         ok: "Yes",
         cancel: "No",
     }).onOk(async () => {
-        await m("unlinkGoogle");
+        await api.auth.google.unlink();
         my.gmail = null;
         window.location.reload();
     })
 }
 
-const ms = reactive({});
-
 const onUnlinkMicrosoft = async () => {
     //confirm
     light.dialog({
@@ -108,7 +106,7 @@ const onUnlinkMicrosoft = async () => {
         ok: "Yes",
         cancel: "No",
     }).onOk(async () => {
-        await m("unlinkMicrosoft");
+        await api.auth.microsoft.unlink();
         my.microsoft = null;
         window.location.reload();
     })
@@ -116,7 +114,7 @@ const onUnlinkMicrosoft = async () => {
 
 const onLinkMicrosoft = async (resp) => {
     try {
-        await m("microsoftRegister", { account_id: resp.account.localAccountId });
+        await api.auth.microsoft.register(resp.account.localAccountId);
         light.notify({
             message: "Microsoft account linked",
             color: "positive",
@@ -131,9 +129,9 @@ const onLinkMicrosoft = async (resp) => {
     }
 }
 
-const onLinkFacebook = (accessToken) => {
+const onLinkFacebook = async (accessToken) => {
     try {
-        m("facebookRegister", { access_token: accessToken })
+        await api.auth.facebook.register(accessToken);
         light.notify({
             message: "Facebook account linked",
             color: "positive",
@@ -156,7 +154,7 @@ const onUnlinkFacebook = async () => {
         ok: "Yes",
         cancel: "No",
     }).onOk(async () => {
-        await m("unlinkFacebook");
+        await api.auth.facebook.unlink();
         my.facebook = null;
         window.location.reload();
     })

package/dist/runtime/plugin.js

@@ -25,8 +25,12 @@ export default defineNuxtPlugin((nuxtApp) => {
   api.models.create("SystemValue", TypeSystemValue);
   api.models.create("MailLog", TypeMailLog);
   api.models.create("EventLog", TypeEventLog);
-  api.model("MailLog").setDataPath("app.mailLogs");
-  api.model("EventLog").setDataPath("app.eventLogs");
+  api.model("MailLog").setDataPath("app.listMailLog");
+  api.model("EventLog").setDataPath("app.listEventLog");
+  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.20.6",
+  "version": "1.21.1",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@azure/msal-browser": "^3.26.1",
     "@formkit/drag-and-drop": "^0.1.6",
-    "@hostlink/light": "^2.3.7",
+    "@hostlink/light": "^2.5.2",
     "@nuxt/kit": "^3.7.4",
     "@nuxt/module-builder": "^0.8.3",
     "@quasar/extras": "^1.16.11",

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

@@ -1,2 +0,0 @@
-import type { Fields } from "@hostlink/light";
-export default function listObject(name: string, filters: {} | undefined, sort: string, offset: number, limit: number, fields?: Fields): Promise<any>;

package/dist/runtime/lib/listObject.js

@@ -1,10 +0,0 @@
-import list from "./list.js";
-export default async function listObject(name, filters = {}, sort, offset, limit, fields = []) {
-  const resp = await list(name, {
-    filters,
-    sort,
-    offset,
-    limit
-  }, fields);
-  return resp.data;
-}

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

@@ -1 +0,0 @@
-export default function (module: string, filters: Object, fields?: Array<string | Object>): Promise<any>;

package/dist/runtime/lib/loadObject.js

@@ -1,10 +0,0 @@
-import list from "./list.js";
-export default async function(module, filters, fields = []) {
-  let { data } = await list(module, {
-    filters
-  }, fields);
-  if (data.length > 0) {
-    return data[0];
-  }
-  return null;
-}