@hostlink/nuxt-light 1.41.0 → 1.42.0

package/dist/module.json

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

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

@@ -3,7 +3,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useLight, q, m } from "#imports";
 import { useQuasar } from "quasar";
 import { useI18n } from "vue-i18n";
-import { ref, computed, reactive, provide, watch, toRaw } from "vue";
+import { ref, computed, reactive, provide, watch, toRaw, onBeforeUnmount } from "vue";
 import { useRuntimeConfig } from "nuxt/app";
 import { api } from "#imports";
 const emits = defineEmits(["logout"]);
@@ -58,6 +58,7 @@ light.init(my.styles);
 light.setMyRoles(my.roles);
 light.setPermissions(my.permissions);
 light.setMyFavorites(toRaw(my.myFavorites));
+const _errorTimers = /* @__PURE__ */ new Map();
 const myFavorites = computed(() => {
   return light.getMyFavorites();
 });
@@ -361,14 +362,7 @@ const onLogout = async () => {
         <q-page-container :class="containerClass" :style="containerStyle"> <!-- Error message -->
             <div class="q-gutter-sm q-pa-sm" v-if="system.devMode && $light.errors.length > 0">
                 <q-banner dense inline-actions class="bg-grey-4" v-for="error in $light.errors" rounded>
-                    <q-expansion-item expand-separator :label="error.message">
-                        <q-card>
-                            <q-card-section style="white-space: pre-wrap; overflow: auto;">
-                                {{ error.stack }}
-                            </q-card-section>
-                        </q-card>
-                    </q-expansion-item>
-
+                    {{ error }}
                     <template v-slot:action>
                         <q-btn flat icon="sym_o_close" round dense @click="$light.removeError(error)" />
                     </template>

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

@@ -1,5 +1,6 @@
 <script setup>
 import { useQuasar, QTable, Dialog } from "quasar";
+import { defu } from "defu";
 import { ref, computed, onMounted, useSlots, watch, reactive } from "vue";
 import useLight from "../composables/useLight";
 import GQLFieldBuilder from "../composables/GQLFieldBuilder";
@@ -256,9 +257,7 @@ const onLocalRequest = async (p) => {
           p.pagination.rowsPerPage = saved;
         }
       }
-      fields.forEach((f) => {
-        builder.add(f);
-      });
+      builder.add(fields);
       let localFilters = getFilterValue();
       if (filters2) {
         localFilters = {
@@ -601,13 +600,11 @@ const searchSelectFilter = (val, update, name) => {
 
                         <template v-if="col.searchType == 'select'">
                             <q-select dense clearable filled square v-model="filters[col.name]"
-                                @update:model-value="onFilters" options-dense :options="localSearchOptions[col.name]" emit-value
-                                map-options :multiple="col.searchMultiple" :color="$light.color" use-input
-                                input-debounce="0"
-                                @filter="(val, update) => {
+                                @update:model-value="onFilters" options-dense :options="localSearchOptions[col.name]"
+                                emit-value map-options :multiple="col.searchMultiple" :color="$light.color" use-input
+                                input-debounce="0" @filter="(val, update) => {
   searchSelectFilter(val, update, col.name);
-}"
-                                />
+}" />
                         </template>
 
                         <template v-if="col.searchType == 'date'">

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

@@ -44,8 +44,8 @@ export interface LTableRequest {
     };
     offset: number;
     limit: number;
-    loadData: (model: string, filters: any, fields: Array<any>) => void;
-    loadObjects: (model: string, filters: any, fields: Array<any>) => void;
+    loadData: (model: string, filters: any, fields: Array<any> | Object) => void;
+    loadObjects: (model: string, filters: any, fields: Array<any> | Object) => void;
     setData: (data: {
         data: Array<{
             data: any;

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

@@ -17,7 +17,7 @@ declare const light: {
     devMode: boolean;
     styles: any;
     version: string;
-    errors: Array<Error>;
+    errors: Array<string>;
     $q: {
         addressbarColor: {
             set: (hexColor: string) => void;
@@ -608,8 +608,8 @@ declare const light: {
     reloadMyFavorites: () => Promise<void>;
     getMyFavorites: () => any[];
     isDarkMode: () => boolean;
-    addError: (err: Error) => void;
-    removeError: (error: Error) => void;
+    addError: (err: string) => void;
+    removeError: (error: string) => void;
     setStyle: (name: string, value: any) => Promise<void>;
     setCurrentRoute: (to: any) => void;
     getID: () => number | null;
@@ -623,7 +623,7 @@ declare const _default: () => {
     devMode: boolean;
     styles: any;
     version: string;
-    errors: Array<Error>;
+    errors: Array<string>;
     $q: {
         addressbarColor: {
             set: (hexColor: string) => void;
@@ -1214,8 +1214,8 @@ declare const _default: () => {
     reloadMyFavorites: () => Promise<void>;
     getMyFavorites: () => any[];
     isDarkMode: () => boolean;
-    addError: (err: Error) => void;
-    removeError: (error: Error) => void;
+    addError: (err: string) => void;
+    removeError: (error: string) => void;
     setStyle: (name: string, value: any) => Promise<void>;
     setCurrentRoute: (to: any) => void;
     getID: () => number | null;

package/dist/runtime/plugin.js

@@ -2,7 +2,7 @@ import QMarkdownVuePlugin from "@quasar/quasar-ui-qmarkdown";
 import "@quasar/quasar-ui-qmarkdown/dist/index.css";
 import { createI18n } from "vue-i18n";
 import createLight from "./composables/createLight.js";
-import { defineNuxtPlugin } from "#app";
+import { defineNuxtPlugin, useRoute } from "#app";
 import "./assets/main.css";
 import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
@@ -35,14 +35,15 @@ export default defineNuxtPlugin((nuxtApp) => {
   api.model("SystemValue").setDataPath("app.listSystemValue");
   api.model("Permission").setDataPath("app.listPermission");
   nuxtApp.vueApp.config.errorHandler = (err, instance, info) => {
+    const $route = useRoute();
     const light = useLight();
     if (light.devMode) {
       console.log(err);
     }
     if (err instanceof Error) {
-      light.addError(err);
+      light.addError(err.message + " at " + $route.fullPath);
     } else {
-      light.addError(new Error(err));
+      light.addError(JSON.stringify(err) + " at " + $route.fullPath);
     }
   };
   nuxtApp.vueApp.use(QMarkdownVuePlugin);

package/package.json

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

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

@@ -1 +0,0 @@
-export default function (fields: Object): import("#app").AsyncData<any, import("#app").NuxtError<unknown> | undefined> | undefined;

package/dist/runtime/composables/useAsyncObject.js

@@ -1,43 +0,0 @@
-import { toQuery } from "@hostlink/light";
-import { default as getModelField } from "./getModelField.js";
-import { default as collect } from "./collect.js";
-import { defu } from "defu";
-import { useAsyncData, useRoute } from "#app";
-let route = useRoute();
-export default function(fields) {
-  if (!route.name) {
-    return;
-  }
-  const [module, id_name] = route.name.split("-");
-  if (isNaN(Number(route.params[id_name]))) {
-    return useAsyncData(async () => {
-      return {};
-    });
-  }
-  const id = parseInt(route.params[id_name]);
-  let query = {};
-  const specialFields = {};
-  for (const [key, value] of Object.entries(fields)) {
-    const f = getModelField(module, key);
-    if (f) {
-      const gqlField = f.getGQLField();
-      if (typeof gqlField === "string") {
-        query[gqlField] = value;
-      } else {
-        query = defu(query, gqlField);
-        specialFields[key] = f;
-      }
-    } else {
-      query[key] = value;
-    }
-  }
-  return useAsyncData(async () => {
-    const data = await collect(module, toQuery(query)).where(id_name, id).first();
-    for (const [key, value] of Object.entries(specialFields)) {
-      if (value && typeof value === "object" && typeof value.getValue === "function") {
-        data[key] = value.getValue(data);
-      }
-    }
-    return data;
-  });
-}