@hostlink/nuxt-light 1.28.4 → 1.29.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.28.4",
+  "version": "1.29.0",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/runtime/components/l-app-main.vue

@@ -289,11 +289,11 @@ const onLogout = async () => {
                 <q-btn flat round dense icon="sym_o_person" class="q-mr-sm">
                     <q-menu max-width="250px">
                         <q-list>
-                            <q-item v-close-popup to="/User/profile">
+                            <q-item v-close-popup to="/User/profile" >
                                 <q-item-section avatar>
                                     <q-icon name="sym_o_person" />
                                 </q-item-section>
-                                <q-item-section>{{ $t('Profile') }}</q-item-section>
+                                <q-item-section >{{ $t('Profile') }}</q-item-section>
                             </q-item>
 
                             <q-item v-close-popup to="/User/setting">

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

@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from "vue";
-import { reloadNuxtApp, useLight, watch } from "#imports";
+import { useLight, watch } from "#imports";
 import { useQuasar } from "quasar";
 import { q } from "#imports";
 import { useRoute } from "vue-router";

package/dist/runtime/components/l-file-manager.vue

@@ -666,7 +666,9 @@ selectedNodePath.value = drives[0].index.toString();
         <q-table flat :columns="columns" :rows="items" @row-dblclick="onDblclickRow" @row-click="onClickRow"
           :pagination="pagination" row-key="path" selection="multiple" v-model:selected="selected" dense
           :loading="loading" :loading-label="$t('Loading...')" :no-data-label="$t('No data available')"
-          :color="$light.color">
+          :color="$light.color"
+          separator="horizontal" :rows-per-page-options="[0]"
+          >
           <template #body-cell-icon="props">
             <q-td auto-width>
               <q-icon name="sym_o_folder" v-if="props.value == 'folder'" size="sm" />

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

@@ -158,13 +158,9 @@ const forgetPassword = async () => {
     });
   });
 };
-const hasBioLogin = ref(false);
-if (localStorage.getItem("username")) {
-  hasBioLogin.value = true;
-}
 const bioLogin = async () => {
   try {
-    await api.auth.WebAuthn.login(localStorage.getItem("username"));
+    await api.auth.WebAuthn.login();
     window.self.location.reload();
   } catch (e) {
     $q.notify({
@@ -275,9 +271,9 @@ const facebookLogin = (accessToken) => {
       </q-form>
     </q-card-section>
     <q-card-actions>
+      <l-btn outline rounded color="primary" icon="sym_o_fingerprint" @click="bioLogin" />
       <l-btn label="Login" outline rounded color="primary" icon="sym_o_login" @click="submit"
         v-if="passwordBasedEnabled" />
-      <l-btn v-if="hasBioLogin" outline rounded color="primary" icon="sym_o_fingerprint" @click="bioLogin" />
       <l-btn label="Forget password" outline rounded color="primary" icon="sym_o_lock_reset" @click="forgetPassword"
         v-if="forgetPasswordEnabled" />
     </q-card-actions>

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

@@ -184,8 +184,8 @@ declare const __VLS_self: import("vue").DefineComponent<__VLS_PublicProps, {
     selection: "none" | "multiple" | "single";
     loadingLabel: string;
     noDataLabel: string;
-    rowsPerPageLabel: string;
     rowsPerPageOptions: readonly any[];
+    rowsPerPageLabel: string;
     searchable: any;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps, {
@@ -222,8 +222,8 @@ declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps,
     selection: "none" | "multiple" | "single";
     loadingLabel: string;
     noDataLabel: string;
-    rowsPerPageLabel: string;
     rowsPerPageOptions: readonly any[];
+    rowsPerPageLabel: string;
     searchable: any;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;

package/dist/runtime/composables/GQLFieldBuilder.d.ts

@@ -1,5 +1 @@
-export default function (): {
-    merge: (obj1: any, obj2: any) => any;
-    add: (f: any) => void;
-    get(): any;
-};
+export default function (): any;

package/dist/runtime/composables/GQLFieldBuilder.js

@@ -1,30 +1,23 @@
 import { toQuery } from "@hostlink/light";
+import { defu } from "defu";
 export default function() {
-  const merge = (obj1, obj2) => {
-    for (let key in obj2) {
-      if (obj2.hasOwnProperty(key)) {
-        obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ? merge(obj1[key], obj2[key]) : obj1[key] = obj2[key];
-      }
-    }
-    return obj1;
-  };
   let fields = {};
   return {
     //deep merge
-    merge,
+    merge: defu,
     add: (f) => {
       if (typeof f === "string") {
-        fields[f] = true;
+        fields = defu(fields, { [f]: true });
         return;
       }
       if (Array.isArray(f)) {
         f.forEach((item) => {
-          fields[item] = true;
+          fields = defu(fields, { [item]: true });
         });
         return;
       }
       if (typeof f === "object") {
-        fields = merge(fields, toQuery(f));
+        fields = defu(fields, toQuery(f));
         return;
       }
     },

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

@@ -1,6 +1,13 @@
 <script setup>
 import { model } from "#imports";
-const columns = model("EventLog").columns(["eventlog_id", "class", "id", "action", "created_time", "username"]);
+const columns = model("EventLog").columns({
+  eventlog_id: true,
+  class: true,
+  id: true,
+  action: true,
+  created_time: true,
+  username: true
+});
 </script>
 
 <template>

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

@@ -1,6 +1,13 @@
 <script setup>
 import { model } from "#imports";
-const columns = model("MailLog").columns(["maillog_id", "from", "to", "subject", "created_time"]);
+const columns = model("MailLog").columns({
+  maillog_id: true,
+  from: true,
+  to: true,
+  subject: true,
+  created_time: true,
+  body: true
+});
 </script>
 
 <template>

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

@@ -1,8 +1,6 @@
 <script setup>
 import { list, m, useLight } from "#imports";
-import { useRouter } from "vue-router";
 import { ref, computed } from "vue";
-import { useQuasar } from "quasar";
 const light = useLight();
 let { data: users } = await list("User", null, ["user_id", "username", "name", "roles", "email"]);
 let columns = [

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

@@ -23,7 +23,6 @@ const status = ref("0");
         <l-tabs v-model="status">
             <l-tab label="Active" name="0">
                 <l-table ref="table" row-key="user_id" @request-data="onRequest" :columns="columns"
-                    :add-component="testDialog"
                     :actions="['view', 'edit', 'delete']"></l-table>
             </l-tab>
             <l-tab label="Inactive" name="1">

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

@@ -1,6 +1,14 @@
 <script setup>
 import { model } from "#imports";
-const columns = model("UserLog").columns(["userlog_id", "username", "login_dt", "last_access_time", "logout_dt", "result", "user_agent"]);
+const columns = model("UserLog").columns({
+  userlog_id: true,
+  username: true,
+  login_dt: true,
+  last_access_time: true,
+  logout_dt: true,
+  result: true,
+  user_agent: true
+});
 </script>
 
 <template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.28.4",
+  "version": "1.29.0",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -36,6 +36,7 @@
     "@nuxt/module-builder": "^1.0.1",
     "@quasar/extras": "^1.16.11",
     "axios": "^1.5.0",
+    "defu": "^6.1.4",
     "diff2html": "^3.4.47",
     "formkit-quasar": "^0.0.15",
     "json-to-graphql-query": "^2.2.5",