@hostlink/nuxt-light 1.32.3 → 1.33.0

package/dist/module.json

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

package/dist/module.mjs

@@ -336,10 +336,11 @@ const module = defineNuxtModule({
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);
+    const files2 = await resolveFiles(process.cwd() + "/app/models", ["*"]);
     nuxt.options.runtimeConfig.public.light = {
       model: []
     };
-    for (const file of files) {
+    for (const file of [...files, ...files2]) {
       const n1 = "Model_" + file.match(/([a-zA-Z0-9]+)\.ts$/)?.[1];
       addPlugin({
         src: file,

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

@@ -237,6 +237,10 @@ const onLogout = async () => {
                     </template>
                 </q-toolbar-title>
 
+
+                <slot name="header" ></slot>
+                    
+
                 <q-space />
 
                 <q-btn :icon="isFav ? 'favorite' : 'sym_o_favorite'" round flat dense class="q-mr-xs"
@@ -356,7 +360,6 @@ const onLogout = async () => {
         </q-drawer>
 
         <q-page-container :class="containerClass" :style="containerStyle"> <!-- Error message -->
-            <slot name="header"></slot>
             <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">

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

@@ -1,6 +1,6 @@
-declare var __VLS_247: {};
+declare var __VLS_26: {};
 type __VLS_Slots = {} & {
-    header?: (props: typeof __VLS_247) => any;
+    header?: (props: typeof __VLS_26) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     logout: (...args: any[]) => void;

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

@@ -5,16 +5,16 @@ declare const _default: import("vue").DefineComponent<{}, {
     dense: boolean;
     footer: boolean;
     menuOverlayHeader: boolean;
-    time: string;
     theme: string;
+    time: string;
     $props: {
         readonly color?: string | undefined;
         readonly miniState?: boolean | undefined;
         readonly dense?: boolean | undefined;
         readonly footer?: boolean | undefined;
         readonly menuOverlayHeader?: boolean | undefined;
-        readonly time?: string | undefined;
         readonly theme?: string | undefined;
+        readonly time?: string | undefined;
     };
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/runtime/components/l-form-dialog.vue.d.ts

@@ -6,16 +6,16 @@ type __VLS_WithSlots<T, S> = T & (new () => {
 declare const __VLS_component: import("vue").DefineComponent<{}, {
     $emit: (event: "submit", ...args: any[]) => void;
     cancel: Function;
-    title: string;
     width: string;
     value: Record<string, any>;
+    title: string;
     save: Function;
     showNotification: boolean;
     $props: {
         readonly cancel?: Function | undefined;
-        readonly title?: string | undefined;
         readonly width?: string | undefined;
         readonly value?: Record<string, any> | undefined;
+        readonly title?: string | undefined;
         readonly save?: Function | undefined;
         readonly showNotification?: boolean | undefined;
     };

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

@@ -450,6 +450,20 @@ const onAdd = () => {
     requestServerInteraction();
   });
 };
+const localSearchOptions = ref({});
+const searchSelectFilter = (val, update, name) => {
+  if (val == "") {
+    update(() => {
+      localSearchOptions.value[name] = props.columns.find((col) => col.name == name).searchOptions;
+    });
+  } else {
+    update(() => {
+      const needle = val.toLocaleLowerCase();
+      localSearchOptions.value[name] = props.columns.find((col) => col.name == name).searchOptions.filter((v) => v.label.toLocaleLowerCase().indexOf(needle) > -1);
+      console.log(localSearchOptions.value[name]);
+    });
+  }
+};
 </script>
 
 <template>
@@ -579,12 +593,15 @@ const onAdd = () => {
 
                         <template v-if="col.searchType == 'select'">
                             <q-select dense clearable filled square v-model="filters[col.name]"
-                                @update:model-value="onFilters" options-dense :options="col.searchOptions" emit-value
-                                map-options :multiple="col.searchMultiple" :color="$light.color" />
-
+                                @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'">
                             <l-date-picker dense clearable filled square :outlined="false" hide-bottom-space
                                 v-model="filters[col.name]" @update:model-value="onFilters" range @clear="onFilters" />

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

@@ -58,11 +58,11 @@ export interface LTableRequest {
     }) => void;
 }
 declare function requestServerInteraction(): void;
-declare var __VLS_91: any, __VLS_94: string, __VLS_95: any, __VLS_117: any, __VLS_183: string, __VLS_184: any;
+declare var __VLS_91: any, __VLS_94: string, __VLS_95: any, __VLS_117: any, __VLS_184: string, __VLS_185: any;
 type __VLS_Slots = {} & {
     [K in NonNullable<typeof __VLS_94>]?: (props: typeof __VLS_95) => any;
 } & {
-    [K in NonNullable<typeof __VLS_183>]?: (props: typeof __VLS_184) => any;
+    [K in NonNullable<typeof __VLS_184>]?: (props: typeof __VLS_185) => any;
 } & {
     actions?: (props: typeof __VLS_91) => any;
 } & {

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

@@ -14,6 +14,7 @@ export interface LightModelField {
     field?: (row: any) => string;
     component?: Component;
     componentProps?: any;
+    format?: (value: any) => any;
 }
 export interface LightModelFields {
     [key: string]: LightModelField;

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

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

package/dist/runtime/composables/useAsyncObject.js

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

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

@@ -266,11 +266,11 @@ declare const light: {
             };
             editor: {
                 align: string;
-                code: string;
-                hr: string;
                 left: string;
                 right: string;
                 bold: string;
+                code: string;
+                hr: string;
                 center: string;
                 fontSize: string;
                 url: string;
@@ -362,11 +362,11 @@ declare const light: {
             editor: {
                 size: string;
                 align: string;
-                code: string;
-                hr: string;
                 left: string;
                 right: string;
                 bold: string;
+                code: string;
+                hr: string;
                 center: string;
                 font: string;
                 fontSize: string;
@@ -870,11 +870,11 @@ declare const _default: () => {
             };
             editor: {
                 align: string;
-                code: string;
-                hr: string;
                 left: string;
                 right: string;
                 bold: string;
+                code: string;
+                hr: string;
                 center: string;
                 fontSize: string;
                 url: string;
@@ -966,11 +966,11 @@ declare const _default: () => {
             editor: {
                 size: string;
                 align: string;
-                code: string;
-                hr: string;
                 left: string;
                 right: string;
                 bold: string;
+                code: string;
+                hr: string;
                 center: string;
                 font: string;
                 fontSize: string;

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

@@ -0,0 +1 @@
+export default function (fields: Object): Promise<any>;

package/dist/runtime/composables/useObject.js

@@ -0,0 +1,22 @@
+import { toQuery } from "@hostlink/light";
+import { useRoute } from "vue-router";
+import { default as getModelField } from "./getModelField.js";
+import { default as collect } from "./collect.js";
+import { defu } from "defu";
+export default async function(fields) {
+  let route = useRoute();
+  if (!route.name) {
+    return;
+  }
+  const [module, id_name] = route.name.split("-");
+  const id = parseInt(route.params[id_name]);
+  let query = {};
+  for (const [key, value] of Object.entries(fields)) {
+    query[key] = value;
+    const f = getModelField(module, key);
+    if (f) {
+      query = defu(query, f.getGQLField());
+    }
+  }
+  return await collect(module, toQuery(query)).where(id_name, id).first();
+}

package/dist/runtime/pages/User/_user_id/view.vue

@@ -1,9 +1,9 @@
 <script setup>
-import { useLight, getObject, m } from "#imports";
+import { useLight, useAsyncObject, m } from "#imports";
 import { useRoute } from "vue-router";
 import { ref } from "vue";
 const route = useRoute();
-const obj = await getObject(["canUpdate"]);
+const { data: obj } = await useAsyncObject({ canUpdate: true, canDelete: true });
 const light = useLight();
 const tab = ref("overview");
 const id = route.params.user_id;
@@ -39,6 +39,7 @@ const reset2fa = async () => {
                 label="Change password"></l-btn>
             <l-btn to="update-role" icon="sym_o_people" permission="user.role.add" label="Update role"></l-btn>
             <l-btn label="Reset 2FA" icon="sym_o_key" permission="user.reset2fa" @click="reset2fa"></l-btn>
+
         </template>
 
         <q-card flat bordered>

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

@@ -11,7 +11,7 @@ const columns = model("User").columns({
   email: true,
   phone: true,
   join_date: true,
-  status: true,
+  //status: true,
   has2FA: true
   //_test: true,
 });

package/package.json

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