@hostlink/nuxt-light 1.54.1 → 1.54.3

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.54.1",
+  "version": "1.54.3",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -358,7 +358,6 @@ const module$1 = defineNuxtModule({
     });
     addImports({ name: "isGranted", from: "@hostlink/light" });
     addImports({ name: "getGrantedRights", from: "@hostlink/light" });
-    addImports({ name: "list", from: "@hostlink/light" });
     addImports({ name: "query", as: "q", from: "@hostlink/light" });
     addImports({ name: "mutation", from: "@hostlink/light" });
     addImports({ name: "query", from: "@hostlink/light" });
@@ -366,10 +365,11 @@ const module$1 = defineNuxtModule({
       path: resolver.resolve("./runtime/components")
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
+    const files0 = await resolveFiles(resolver.resolve("./runtime/models"), ["*"]);
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);
     const files2 = await resolveFiles(process.cwd() + "/app/models", ["*"]);
     let content = "";
-    for (const file of [...files, ...files2]) {
+    for (const file of [...files0, ...files, ...files2]) {
       content += `(await import('${file}')).default();
 `;
     }

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

@@ -7,6 +7,7 @@ export type LightModelField = Omit<LTableColumn, "name" | "field"> & Field & {
 export interface LightModel {
     name: string;
     fields: Record<string, LightModelField>;
+    dataPath?: string;
 }
 declare const _default: (model: LightModel) => () => void;
 export default _default;

package/dist/runtime/composables/defineLightModel.js

@@ -1,6 +1,9 @@
-import { getApiClient } from "@hostlink/light";
+import { defineModel } from "@hostlink/light";
 export default (model) => {
   return () => {
-    getApiClient().models.create(model.name, model.fields);
+    const m = defineModel(model.name, model.fields);
+    if (model.dataPath) {
+      m.setDataPath(model.dataPath);
+    }
   };
 };

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

@@ -1,2 +1,2 @@
-declare const _default: (name: string, fields: string[]) => Record<string, any>;
+declare const _default: (name: string, fields: string[]) => any;
 export default _default;

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

@@ -1,2 +1,2 @@
-declare const _default: (name: string, field: string) => import("@hostlink/light").Field | null;
+declare const _default: (name: string, field: string) => any;
 export default _default;

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

@@ -0,0 +1,2 @@
+declare const _default: (name: string, fields: Record<string, any>) => any;
+export default _default;

package/dist/runtime/composables/list.js

@@ -0,0 +1,6 @@
+import { getModel } from "@hostlink/light";
+export default (name, fields) => {
+  console.log(name);
+  const m = getModel(name);
+  return m.list(fields);
+};

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

@@ -1,7 +1,2 @@
-import type { Model } from '@hostlink/light';
-import type { LTableColumn } from "../components/l-table.vue.js";
-interface LModel extends Model {
-    columns(fields: string[]): Array<LTableColumn>;
-}
-declare const _default: (name: string) => LModel;
+declare const _default: (name: string) => any;
 export default _default;

package/dist/runtime/composables/model.js

@@ -1,7 +1,9 @@
-import { useGlobalModel } from "@hostlink/light";
+import { getModel } from "@hostlink/light";
+import defu from "defu";
 export default (name) => {
-  const m = useGlobalModel().getModel(name);
-  return Object.assign(m, {
+  const m = getModel(name);
+  console.log(m.getDataPath());
+  return defu(m, {
     columns(fields) {
       let columns = [];
       if (!Array.isArray(fields)) {

package/dist/runtime/models/CustomField.d.ts

@@ -1,26 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        model: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        type: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        validation: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/CustomField.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "CustomField",
   fields: {
     name: {
@@ -22,4 +23,4 @@ export default {
       searchable: true
     }
   }
-};
+});

package/dist/runtime/models/EventLog.d.ts

@@ -1,38 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        eventlog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            autoWidth: boolean;
-        };
-        class: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        action: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        created_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/EventLog.js

@@ -1,5 +1,7 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "EventLog",
+  dataPath: "app.listEventLog",
   fields: {
     eventlog_id: {
       label: "EventLog ID",
@@ -34,4 +36,4 @@ export default {
       searchable: true
     }
   }
-};
+});

package/dist/runtime/models/MailLog.d.ts

@@ -1,34 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        maillog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-            autoWidth: boolean;
-        };
-        from: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        to: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        subject: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        created_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/MailLog.js

@@ -1,5 +1,7 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "MailLog",
+  dataPath: "app.listMailLog",
   fields: {
     maillog_id: {
       label: "ID",
@@ -30,4 +32,4 @@ export default {
       searchType: "date"
     }
   }
-};
+});

package/dist/runtime/models/User.d.ts

@@ -1,71 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        Name: {
-            label: string;
-            gql: {
-                first_name: boolean;
-                last_name: boolean;
-            };
-            format: (row: any) => string;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            required: boolean;
-        };
-        first_name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        last_name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        email: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        phone: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        join_date: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        roles: {
-            label: string;
-            format: (value: any) => any;
-        };
-        status: {
-            label: string;
-            searchable: boolean;
-            searchType: string;
-            searchOptions: {
-                label: string;
-                value: number;
-            }[];
-            format: (value: any) => string | undefined;
-        };
-        has2FA: {
-            label: string;
-            format: (value: any) => "" | "✔️";
-        };
-        _test2: {
-            label: string;
-            component: any;
-            componentProps: (a: any) => {
-                test: any;
-            };
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/User.js

@@ -1,6 +1,7 @@
-import MyTest from "../components/MyTest.vue";
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "User",
+  dataPath: "app.listUser",
   fields: {
     Name: {
       label: "Name",
@@ -17,16 +18,6 @@ export default {
       sortable: true,
       searchable: true,
       required: true
-      //cellClass: (row: any) => (row.username == "admin" ? "text-danger" : ""),
-      /* backgroundColor: (row: any) => {
-          
-          
-          if (row.username == "admin") {
-              return "red";
-          } else {
-              return "white";
-          }
-      } */
     },
     first_name: {
       label: "First name",
@@ -67,7 +58,7 @@ export default {
         { label: "Inactive", value: 1 }
       ],
       format: (value) => {
-        return ["Active", "Inactive"][value];
+        return value == 0 ? "Active" : "Inactive";
       }
     },
     has2FA: {
@@ -75,15 +66,6 @@ export default {
       format: (value) => {
         return value ? "\u2714\uFE0F" : "";
       }
-    },
-    _test2: {
-      label: "Test",
-      component: MyTest,
-      componentProps: (a) => {
-        return {
-          test: a.username
-        };
-      }
     }
   }
-};
+});

package/dist/runtime/models/UserLog.d.ts

@@ -1,51 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        userlog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            autoWidth: boolean;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        login_dt: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        logout_dt: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        result: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-            searchOptions: {
-                label: string;
-                value: string;
-            }[];
-            autoWidth: boolean;
-        };
-        user_agent: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            whiteSpace: string;
-        };
-        last_access_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/UserLog.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "UserLog",
   fields: {
     userlog_id: {
@@ -44,7 +45,7 @@ export default {
       label: "User agent",
       sortable: true,
       searchable: true,
-      whiteSpace: "pre-line"
+      style: "white-space:pre-wrap;"
     },
     last_access_time: {
       label: "Last access time",
@@ -53,4 +54,4 @@ export default {
       searchType: "date"
     }
   }
-};
+});

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

@@ -37,10 +37,10 @@ const options = [
   { label: "Active", value: 0 },
   { label: "Inactive", value: 1 }
 ];
-const tt = await q({
-  app: ["languages"]
+const { app } = await q({
+  app: { languages: true }
 });
-const languages = tt.app.languages.map((lang) => {
+const languages = app.languages.map((lang) => {
   return {
     label: lang.name,
     value: lang.value
@@ -50,7 +50,7 @@ const languages = tt.app.languages.map((lang) => {
 
 <template>
     <l-page>
-        
+
         <FormKit type="l-form" :value="obj">
             <l-row class="col">
                 <l-col md="6">

package/dist/runtime/plugin.d.ts

@@ -1,4 +1,4 @@
 import '@quasar/quasar-ui-qmarkdown/dist/index.css';
 import "./assets/main.css.js";
-declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
+declare const _default: import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/plugin.js

@@ -1,6 +1,6 @@
 import QMarkdownVuePlugin from "@quasar/quasar-ui-qmarkdown";
 import "@quasar/quasar-ui-qmarkdown/dist/index.css";
-import { createClient, useGlobalModel, setApiClient } from "@hostlink/light";
+import { createClient, setApiClient, defineModel } from "@hostlink/light";
 import { q } from "#imports";
 import { createI18n } from "vue-i18n";
 import createLight from "./composables/createLight.js";
@@ -14,12 +14,6 @@ import { createLightPlugin } from "./formkit/index.js";
 import { plugin, defaultConfig } from "@formkit/vue";
 import getApiBase from "./composables/getApiBase.js";
 import useLight from "./composables/useLight.js";
-import TypeUser from "./models/User.js";
-import TypeUserLog from "./models/UserLog.js";
-import TypeSystemValue from "./models/SystemValue.js";
-import TypeMailLog from "./models/MailLog.js";
-import TypeEventLog from "./models/EventLog.js";
-import TypeCustomerField from "./models/CustomField.js";
 import { zhTW } from "@formkit/i18n";
 export default defineNuxtPlugin((nuxtApp) => {
   addRouteMiddleware("auth", async (to, from) => {
@@ -44,20 +38,9 @@ export default defineNuxtPlugin((nuxtApp) => {
   }, { global: true });
   const client = createClient(getApiBase());
   setApiClient(client);
-  const models = useGlobalModel();
-  models.createModel("User", TypeUser.fields);
-  models.createModel("CustomField", TypeCustomerField.fields);
-  models.createModel("UserLog", TypeUserLog.fields);
-  models.createModel("SystemValue", TypeSystemValue.fields);
-  models.createModel("MailLog", TypeMailLog.fields);
-  models.createModel("EventLog", TypeEventLog.fields);
-  models.createModel("Permission", {});
-  models.getModel("User").setDataPath("app.listUser");
-  models.getModel("MailLog").setDataPath("app.listMailLog");
-  models.getModel("EventLog").setDataPath("app.listEventLog");
-  models.getModel("UserLog").setDataPath("app.listUserLog");
-  models.getModel("SystemValue").setDataPath("app.listSystemValue");
-  models.getModel("Permission").setDataPath("app.listPermission");
+  defineModel("Permission", {}).setDataPath("app.listPermission");
+  defineModel("SystemValue", {}).setDataPath("app.listSystemValue");
+  defineModel("Config", {}).setDataPath("app.listConfig");
   nuxtApp.vueApp.config.errorHandler = (err, instance, info) => {
     const $route = useRoute();
     const light = useLight();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.54.1",
+  "version": "1.54.3",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@azure/msal-browser": "^4.26.2",
     "@formkit/drag-and-drop": "^0.5.3",
-    "@hostlink/light": "^3.0.1",
+    "@hostlink/light": "^3.0.5",
     "@nuxt/module-builder": "^1.0.1",
     "@quasar/extras": "^1.17.0",
     "@quasar/quasar-ui-qmarkdown": "^2.0.5",

package/dist/runtime/models/SystemValue.d.ts

@@ -1,14 +0,0 @@
-declare const _default: {
-    name: string;
-    fields: {
-        name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        value: {
-            label: string;
-        };
-    };
-};
-export default _default;

package/dist/runtime/models/SystemValue.js

@@ -1,13 +0,0 @@
-export default {
-  name: "SystemValue",
-  fields: {
-    name: {
-      label: "Name",
-      sortable: true,
-      searchable: true
-    },
-    value: {
-      label: "Value"
-    }
-  }
-};