@hostlink/nuxt-light 0.0.83 → 0.0.84

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.83"
+  "version": "0.0.84"
 }

package/dist/module.mjs

@@ -36,6 +36,7 @@ const module = defineNuxtModule({
     });
     const from = resolver.resolve("./runtime/lib");
     const index = resolver.resolve("./runtime/index");
+    const SystemValue = resolver.resolve("./runtime/lib/SystemValue");
     addImports([
       { name: "addObject", from },
       { name: "f", from },
@@ -53,10 +54,12 @@ const module = defineNuxtModule({
       { name: "listObject", from },
       { name: "useLight", from: index },
       { name: "isGranted", from },
-      { name: "getObjectColumns", from },
-      { name: "defineObject", from },
-      { name: "getObjectColumn", from },
-      { name: "sv", from }
+      { name: "sv", from },
+      { name: "loadSV", from: SystemValue },
+      { name: "getSV", from: SystemValue },
+      { name: "getModelColumns", from },
+      { name: "getModelFields", from },
+      { name: "getModelField", from }
     ]);
     addPlugin({
       src: resolver.resolve("./runtime/plugin"),

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

@@ -5,6 +5,10 @@ import { useLight, q, getCurrentUser, m, f } from '../';
 import { ref, computed, reactive, provide, watch } from 'vue';
 import { useRuntimeConfig } from 'nuxt/app';
 
+//download system value
+import { download } from './../lib/SystemValue'
+await download();
+
 const config = useRuntimeConfig();
 
 const appVersion = config.public.appVersion ?? '0.0.1';

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

@@ -1,45 +1,22 @@
-<script setup>
+<script setup lang="ts">
+import { ModelField } from '@hostlink/light';
+
 
 const props = defineProps({
     modelValue: {
         type: Object
     },
-    columns: {
-        type: Array
+    fields: {
+        type: Array<ModelField>
     }
 })
 
-const getValue = (column) => {
-
-    //type of column field is function
-    if (column.field && typeof column.field == 'function') {
-        return column.field(props.modelValue);
-    }
-
-    //if field is string
-    if (column.field && typeof column.field == 'string') {
-        return props.modelValue[column.field];
-    }
-
-    return props.modelValue[column.name];
-
-}
-const getDisplayValue = (column) => {
-    const value = getValue(column);
-
-    if (column.format) {
-        return column.format(value);
-    }
-    return value;
-
-}
-
 </script>
 <template>
     <q-list bordered separator>
-        <template v-if="columns">
-            <l-item v-for="column in columns" :label="column.label">
-                {{ getDisplayValue(column) }}
+        <template v-if="fields">
+            <l-item v-for="field in fields" :label="field.getRaw().label">
+                {{ field.getFormattedValue(props.modelValue as any) }}
             </l-item>
 
         </template>

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

@@ -0,0 +1,4 @@
+export declare const sv_data: any;
+export declare const loadSV: (name: string) => void;
+export declare const download: () => Promise<void>;
+export declare const getSV: (name: string, value: any) => string;

package/dist/runtime/lib/SystemValue.mjs

@@ -0,0 +1,22 @@
+import sv from "./sv.mjs";
+import { cache } from "./sv.mjs";
+export const sv_data = [];
+export const loadSV = (name) => {
+  sv_data.push(name);
+};
+export const download = async () => {
+  for (let i = 0; i < sv_data.length; i++) {
+    const name = sv_data[i];
+    await sv(name);
+  }
+};
+export const getSV = (name, value) => {
+  const data = cache[name];
+  let result = "";
+  data.forEach((item) => {
+    if (item.value == value) {
+      result = item.label;
+    }
+  });
+  return result;
+};

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

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

package/dist/runtime/lib/getGQLFields.mjs

@@ -0,0 +1,8 @@
+import GQLFieldBuilder from "./GQLFieldBuilder.mjs";
+export default (name, fields) => {
+  const builder = GQLFieldBuilder();
+  fields.forEach((field) => {
+    builder.add(getObjectField(name, field).getGQLField());
+  });
+  return builder.get();
+};

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

@@ -0,0 +1,2 @@
+declare const _default: (model: string, names: string[]) => any;
+export default _default;

package/dist/runtime/lib/getModelColumns.mjs

@@ -0,0 +1,13 @@
+import { getModelField } from "@hostlink/light";
+export default (model, names) => {
+  let columns = [];
+  for (let name of names) {
+    const field = getModelField(model, name);
+    if (!field)
+      continue;
+    const option = field.getRaw();
+    option.name = field.getName();
+    columns.push(option);
+  }
+  return columns;
+};

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

@@ -0,0 +1 @@
+export declare const getModelFields: (model: string, names: string[]) => any;

package/dist/runtime/lib/getModelFields.mjs

@@ -0,0 +1,11 @@
+import { getModelField } from "@hostlink/light";
+export const getModelFields = (model, names) => {
+  let fields = [];
+  for (let name of names) {
+    const field = getModelField(model, name);
+    if (!field)
+      continue;
+    fields.push(field);
+  }
+  return fields;
+};

package/dist/runtime/lib/getObject.mjs

@@ -1,6 +1,6 @@
 import { useRoute } from "vue-router";
 import loadObject from "./loadObject.mjs";
-import getObjectColumn from "./getObjectColumn.mjs";
+import { getModelField } from "@hostlink/light";
 export default async function(fields = []) {
   let route = useRoute();
   if (!route.name) {
@@ -15,9 +15,9 @@ export default async function(fields = []) {
   }
   let fs = fields.map((field) => {
     if (typeof field == "string") {
-      const column = getObjectColumn(module, field);
-      if (column && column.gqlField) {
-        return column.gqlField;
+      const f = getModelField(module, field);
+      if (f) {
+        return f.getGQLField();
       }
     }
     return field;

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

@@ -15,10 +15,10 @@ import listObject from "./listObject";
 import loadObject from "./loadObject";
 import isGranted from "./isGranted";
 import GQLFieldBuilder from "./GQLFieldBuilder";
-import getObjectColumns from "./getObjectColumns";
-import getObjectColumn from './getObjectColumn';
+import { getModelField } from "@hostlink/light";
+import { getModelFields } from './getModelFields';
+import getModelColumns from './getModelColumns';
 declare const notify: (message: string, color?: string) => void;
 import getID from "./getID";
 declare const getApiBase: () => {};
-import defineObject from './defineObject';
-export { addObject, f, getApiUrl, getCurrentUser, getObject, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, defineObject, getObjectColumns, getObjectColumn };
+export { addObject, f, getApiUrl, getCurrentUser, getObject, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, getModelField, getModelFields, getModelColumns };

package/dist/runtime/lib/index.mjs

@@ -17,8 +17,9 @@ import listObject from "./listObject.mjs";
 import loadObject from "./loadObject.mjs";
 import isGranted from "./isGranted.mjs";
 import GQLFieldBuilder from "./GQLFieldBuilder.mjs";
-import getObjectColumns from "./getObjectColumns.mjs";
-import getObjectColumn from "./getObjectColumn.mjs";
+import { getModelField } from "@hostlink/light";
+import { getModelFields } from "./getModelFields.mjs";
+import getModelColumns from "./getModelColumns.mjs";
 const notify = function(message, color = "green") {
   Notify.create({
     message,
@@ -31,7 +32,6 @@ const getApiBase = () => {
   const config = useRuntimeConfig();
   return config?.public?.apiBase ?? "/api/";
 };
-import defineObject from "./defineObject.mjs";
 export {
   addObject,
   f,
@@ -53,7 +53,7 @@ export {
   getApiBase,
   loadObject,
   GQLFieldBuilder,
-  defineObject,
-  getObjectColumns,
-  getObjectColumn
+  getModelField,
+  getModelFields,
+  getModelColumns
 };

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

@@ -0,0 +1,3 @@
+export declare const sv_data: any;
+declare const _default: (name: string) => Promise<void>;
+export default _default;

package/dist/runtime/lib/loadSV.mjs

@@ -0,0 +1,4 @@
+export const sv_data = [];
+export default async (name) => {
+  sv_data.push(name);
+};

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

@@ -1,2 +1,3 @@
+export declare const cache: any;
 declare const _default: (name: string) => Promise<any>;
 export default _default;

package/dist/runtime/lib/sv.mjs

@@ -1,5 +1,9 @@
 import { query } from "@hostlink/light";
+export const cache = {};
 export default async (name) => {
+  if (cache[name]) {
+    return cache[name];
+  }
   const resp = await query({
     systemValue: {
       __args: {
@@ -7,5 +11,6 @@ export default async (name) => {
       }
     }
   });
+  cache[name] = resp.systemValue;
   return resp.systemValue;
 };

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

@@ -13,7 +13,7 @@ const obj = reactive(await getObject(["first_name", "last_name", "email", "phone
                 <l-col md="6" gutter="md">
                     <l-input label="First name" v-model="obj.first_name" required />
                     <l-input label="Last name" v-model="obj.last_name" />
-                    <l-input label="Email" v-model="obj.email" required type="email" />
+                    <l-input label="Email" v-model="obj.email" required type="email"  />
                 </l-col>
                 <l-col md="6" gutter="md">
                     <l-input label="Phone" v-model="obj.phone" />

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

@@ -1,6 +1,7 @@
 <script setup>
-import { getObject, getObjectColumns } from '../../../';
+import { getObject, getModelFields } from '../../../';
 const obj = await getObject(["user_id", "username", "first_name", "last_name", "email", "phone", "roles", 'status', 'join_date']);
+
 </script>
 
 <template>
@@ -11,7 +12,7 @@ const obj = await getObject(["user_id", "username", "first_name", "last_name", "
         </template>
 
         <l-card>
-            <l-list v-model="obj" :columns="getObjectColumns('User', [
+            <l-list v-model="obj" :fields="getModelFields('User', [
                 'username',
                 'first_name',
                 'last_name',

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

@@ -1,15 +1,16 @@
 <script setup>
 import { ref } from 'vue'
-import getObjectColumns from "../../lib/getObjectColumns";
+import getModelColumns from "../../lib/getModelColumns";
 const onRequest = async (request) => {
     request.loadObjects("User", { status: status.value });
 };
-const columns = getObjectColumns("User", ["username", "first_name", "label_name", "email", "phone", "join_date"]);
+const columns = getModelColumns("User", ["username", "first_name", "label_name", "email", "phone", "join_date", "status"]);
 const status = ref("0");
 </script>
 
 <template>
     <l-page>
+
         <l-tabs v-model="status">
             <l-tab label="Active" name="0">
                 <l-table row-key="user_id" @request="onRequest" :columns="columns" :actions="['view', 'edit', 'delete']">

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

@@ -1,6 +1,6 @@
 <script setup>
-import getObjectColumns from "../../lib/getObjectColumns";
-const columns = getObjectColumns("UserLog", ["userlog_id", "username", "login_dt", "logout_dt", "result", "user_agent"]);
+import getModelColumns from "../../lib/getModelColumns";
+const columns = getModelColumns("UserLog", ["userlog_id", "username", "login_dt", "logout_dt", "result", "user_agent"]);
 </script>
 <template>
     <l-page>

package/dist/runtime/plugin.mjs

@@ -6,15 +6,16 @@ import "./assets/main.css";
 import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
 import routes from "./routes.mjs";
+import { defineModel } from "@hostlink/light";
 localStorage.getItem("locale") || localStorage.setItem("locale", "en");
-import { useLight, defineObject } from "./index.mjs";
+import { useLight } from "./index.mjs";
 import TypeUser from "./types/User.mjs";
 import TypeUserLog from "./types/UserLog.mjs";
 import TypeSystemValue from "./types/SystemValue.mjs";
 export default defineNuxtPlugin((nuxtApp) => {
-  defineObject("User", TypeUser);
-  defineObject("UserLog", TypeUserLog);
-  defineObject("SystemValue", TypeSystemValue);
+  defineModel("User", TypeUser);
+  defineModel("UserLog", TypeUserLog);
+  defineModel("SystemValue", TypeSystemValue);
   nuxtApp.vueApp.config.errorHandler = (error) => {
     console.log(error);
     const light = useLight();

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

@@ -36,7 +36,7 @@ declare const _default: {
     };
     status: {
         label: string;
-        format: (value: any) => "Active" | "Inactive";
+        format: (value: any) => string;
     };
 };
 export default _default;

package/dist/runtime/types/User.mjs

@@ -1,3 +1,5 @@
+import { loadSV, getSV } from "./../lib/SystemValue.mjs";
+loadSV("UserStatus");
 export default {
   username: {
     label: "Username",
@@ -37,7 +39,7 @@ export default {
   status: {
     label: "Status",
     format: (value) => {
-      return value == 0 ? "Active" : "Inactive";
+      return getSV("UserStatus", value);
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.83",
+  "version": "0.0.84",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "route-gen": "node route-generate.mjs"
   },
   "dependencies": {
-    "@hostlink/light": "^0.0.24",
+    "@hostlink/light": "^1.0.0",
     "@nuxt/kit": "^3.7.4",
     "@nuxt/module-builder": "^0.5.2",
     "@quasar/extras": "^1.16.6",

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

@@ -1,3 +0,0 @@
-declare const _default: (name: string, fields: Object) => void;
-export default _default;
-export declare const getData: () => any;

package/dist/runtime/lib/defineObject.mjs

@@ -1,5 +0,0 @@
-let data = {};
-export default (name, fields) => {
-  data[name] = fields;
-};
-export const getData = () => data;

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

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

package/dist/runtime/lib/getObjectColumn.mjs

@@ -1,15 +0,0 @@
-import { getData } from "./defineObject.mjs";
-export default (type, name) => {
-  let data = getData();
-  if (!data[type])
-    return;
-  if (!data[type][name])
-    return;
-  let options = data[type][name];
-  if (!options)
-    return;
-  if (!options.name) {
-    options.name = name;
-  }
-  return options;
-};

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

@@ -1,2 +0,0 @@
-declare const _default: (type: string, names: string[]) => any;
-export default _default;

package/dist/runtime/lib/getObjectColumns.mjs

@@ -1,19 +0,0 @@
-import { getData } from "./defineObject.mjs";
-export default (type, names) => {
-  let data = getData();
-  let columns = [];
-  for (let name of names) {
-    if (!data[type])
-      continue;
-    if (!data[type][name])
-      continue;
-    let options = data[type][name];
-    if (!options)
-      continue;
-    if (!options.name) {
-      options.name = name;
-    }
-    columns.push(options);
-  }
-  return columns;
-};