@hostlink/nuxt-light 0.0.78 → 0.0.80

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.78"
+  "version": "0.0.80"
 }

package/dist/module.mjs

@@ -52,7 +52,9 @@ const module = defineNuxtModule({
       { name: "updateObject", from },
       { name: "listObject", from },
       { name: "useLight", from: index },
-      { name: "isGranted", from }
+      { name: "isGranted", from },
+      { name: "getTypeColumns", from },
+      { name: "defineType", from }
     ]);
     addPlugin({
       src: resolver.resolve("./runtime/plugin"),

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

@@ -312,12 +312,12 @@ const storageUsagePercent = computed(() => {
 
         <q-page-container class="bg-grey-2" style="color:#1f1f1f">
             <!-- Error message -->
-            <q-card v-for="error in errors" flat class="q-ma-md" bordered style="border-color: var(--q-negative)">
-                <q-card-section>
-                    <q-btn dense flat round icon="close" class="q-mr-sm" @click="light.removeError(error)"></q-btn>{{
-                        error }}
-                </q-card-section>
-            </q-card>
+            <q-banner dense inline-actions class="bg-grey-4 q-ma-md" v-for="error in errors" rounded>
+                {{ error }}
+                <template v-slot:action>
+                    <q-btn flat icon="sym_o_close" round dense @click="light.removeError(error)" />
+                </template>
+            </q-banner>
 
             <router-view v-slot="{ Component }">
                 <template v-if="Component">

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

@@ -30,6 +30,8 @@ const props = defineProps({
     }
 });
 
+const loading = ref(false)
+
 const que = useQuasar();
 const emit = defineEmits(["save", "submit"]);
 const save = async () => {
@@ -37,6 +39,7 @@ const save = async () => {
     let valid = await form.value.validate();
     if (!valid) return;
     if (valid) {
+        loading.value = true;
         emit("save");
         emit('submit');
     }
@@ -72,6 +75,7 @@ const save = async () => {
             }
         }
     }
+    loading.value = false
 }
 const onSubmit = (e) => {
     e.preventDefault();
@@ -90,7 +94,7 @@ const onSubmit = (e) => {
             </q-card-section>
 
             <q-card-actions align="right">
-                <l-btn color="primary" :icon="submitIcon" :label="submitLabel" @click="save" />
+                <l-btn color="primary" :icon="submitIcon" :label="submitLabel" @click="save" :loading="loading" />
             </q-card-actions>
         </l-card>
     </q-form>

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

@@ -168,7 +168,7 @@ const validateData = () => {
             let row = rows.value[0];
             //check has primary key
 
-            if (!primaryKey.value) {
+            if (!row[primaryKey.value]) {
                 errors.value.push("[edit] Primary key not found in the data");
             }
         }
@@ -409,10 +409,8 @@ const filter = ref('');
 </script>
 <template>
     <template v-if="errors.length > 0">
-        <div class="text-white bg-negative">
-            <ul>
-                <li v-for="e in errors">{{ e }}</li>
-            </ul>
+        <div class="q-gutter-sm">
+            <q-banner inline-actions v-for="e in errors" rounded class="bg-negative text-white">{{ e }}</q-banner>
         </div>
     </template>
 

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

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

package/dist/runtime/lib/defineType.mjs

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

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

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

package/dist/runtime/lib/getTypeColumns.mjs

@@ -0,0 +1,19 @@
+import { getData } from "./defineType.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;
+};

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

@@ -15,7 +15,9 @@ import listObject from "./listObject";
 import loadObject from "./loadObject";
 import isGranted from "./isGranted";
 import GQLFieldBuilder from "./GQLFieldBuilder";
+import getTypeColumns from "./getTypeColumns";
 declare const notify: (message: string, color?: string) => void;
 import getID from "./getID";
 declare const getApiBase: () => {};
-export { addObject, f, getApiUrl, getCurrentUser, getObject, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, };
+import defineType from './defineType';
+export { addObject, f, getApiUrl, getCurrentUser, getObject, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, defineType, getTypeColumns };

package/dist/runtime/lib/index.mjs

@@ -17,6 +17,7 @@ import listObject from "./listObject.mjs";
 import loadObject from "./loadObject.mjs";
 import isGranted from "./isGranted.mjs";
 import GQLFieldBuilder from "./GQLFieldBuilder.mjs";
+import getTypeColumns from "./getTypeColumns.mjs";
 const notify = function(message, color = "green") {
   Notify.create({
     message,
@@ -29,6 +30,7 @@ const getApiBase = () => {
   const config = useRuntimeConfig();
   return config?.public?.apiBase ?? "/api/";
 };
+import defineType from "./defineType.mjs";
 export {
   addObject,
   f,
@@ -49,5 +51,7 @@ export {
   isGranted,
   getApiBase,
   loadObject,
-  GQLFieldBuilder
+  GQLFieldBuilder,
+  defineType,
+  getTypeColumns
 };

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

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

package/dist/runtime/lib/sv.mjs

@@ -0,0 +1,11 @@
+import { query } from "@hostlink/light";
+export default async (name) => {
+  const resp = await query({
+    systemValue: {
+      __args: {
+        name
+      }
+    }
+  });
+  return resp.systemValue;
+};

package/dist/runtime/pages/SystemValue/_systemvalue_id/edit.vue

@@ -0,0 +1,15 @@
+<script setup>
+import { reactive } from 'vue'
+import { getObject } from '../../../'
+const obj = reactive(await getObject(["name", "value"]))
+</script>
+
+<template>
+    <l-page>
+        <l-form v-model="obj">
+            <l-input label="Name" v-model="obj.name" required />
+            <l-input label="Value" v-model="obj.value" required type="textarea" />
+        </l-form>
+
+    </l-page>
+</template>

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

@@ -0,0 +1,15 @@
+<script setup>
+import { reactive } from 'vue'
+
+const obj = reactive({})
+</script>
+
+<template>
+    <l-page>
+        <l-form v-model="obj">
+            <l-input label="Name" v-model="obj.name" required />
+            <l-input label="Value" v-model="obj.value" required type="textarea" />
+        </l-form>
+
+    </l-page>
+</template>

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

@@ -0,0 +1,12 @@
+<script setup>
+import { ref } from 'vue'
+import getTypeColumns from "../../lib/getTypeColumns";
+import sv from "../../lib/sv";
+const columns = getTypeColumns("SystemValue", ["name", "value"]);
+</script>
+<template>
+    <l-page>
+        <l-table row-key="systemvalue_id" :columns="columns" @request="$event.loadObjects('SystemValue')"
+            :actions="['edit', 'delete']"></l-table>
+    </l-page>
+</template>

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

@@ -1,51 +1,15 @@
 <script setup>
 import { ref } from 'vue'
+import getTypeColumns from "../../lib/getTypeColumns";
 const onRequest = async (request) => {
     request.loadObjects("User", { status: status.value });
 };
-
-const columns = [
-    {
-        label: "Username",
-        name: "username",
-        sortable: true,
-        searchable: true,
-    },
-    {
-        label: "First name",
-        name: "first_name",
-        sortable: true,
-        searchable: true,
-    }, {
-
-        label: "Last name",
-        name: "last_name",
-        sortable: true,
-        searchable: true,
-    }, {
-        label: "Email",
-        name: "email",
-        sortable: true,
-        searchable: true,
-    }, {
-        label: "Phone",
-        name: "phone",
-        sortable: true,
-        searchable: true,
-    }, {
-        label: "Join date",
-        name: "join_date",
-        sortable: true,
-        searchable: true,
-        searchType: "date"
-    }
-]
+const columns = getTypeColumns("User", ["username", "first_name", "label_name", "email", "phone", "join_date"]);
 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']">
@@ -56,6 +20,5 @@ const status = ref("0");
                 </l-table>
             </l-tab>
         </l-tabs>
-
     </l-page>
 </template>

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

@@ -1,53 +1,6 @@
 <script setup>
-const columns = [
-    {
-        label: "ID",
-        name: "userlog_id",
-        sortable: true,
-        searchable: true,
-    },
-    {
-        label: "User",
-        name: "username",
-        sortable: true,
-        searchable: true,
-    },
-    {
-        label: "Login time",
-        name: "login_dt",
-        sortable: true,
-        searchable: true,
-        searchType: "date",
-    }, {
-        label: "Logout time",
-        name: "logout_dt",
-        sortable: true,
-        searchable: true,
-    },
-    {
-        label: "Result",
-        name: "result",
-        sortable: true,
-        searchable: true,
-        searchType: "select",
-        searchOptions: [
-            {
-                label: "SUCCESS",
-                value: "SUCCESS"
-            },
-            {
-                label: "FAIL",
-                value: "FAIL"
-            }
-        ]
-    }, {
-        label: "User agent",
-        name: "user_agent",
-        sortable: true,
-        searchable: true,
-    },
-]
-
+import getTypeColumns from "../../lib/getTypeColumns";
+const columns = getTypeColumns("UserLog", ["userlog_id", "username", "login_dt", "logout_dt", "result", "user_agent"]);
 </script>
 <template>
     <l-page>

package/dist/runtime/plugin.mjs

@@ -7,8 +7,14 @@ import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
 import routes from "./routes.mjs";
 localStorage.getItem("locale") || localStorage.setItem("locale", "en");
-import { useLight } from "./index.mjs";
+import { useLight, defineType } 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) => {
+  defineType("User", TypeUser);
+  defineType("UserLog", TypeUserLog);
+  defineType("SystemValue", TypeSystemValue);
   nuxtApp.vueApp.config.errorHandler = (error) => {
     console.log(error);
     const light = useLight();

package/dist/runtime/routes.mjs

@@ -29,6 +29,11 @@ function System_index() {
     /* webpackChunkName: "System-index" */ './pages/System/index.vue'
   )
 }
+function SystemValue_index() {
+  return import(
+    /* webpackChunkName: "SystemValue-index" */ './pages/SystemValue/index.vue'
+  )
+}
 function Translate_index() {
   return import(
     /* webpackChunkName: "Translate-index" */ './pages/Translate/index.vue'
@@ -93,6 +98,11 @@ function System_menu_index() {
     /* webpackChunkName: "System-menu-index" */ './pages/System/menu/index.vue'
   )
 }
+function SystemValue_add() {
+  return import(
+    /* webpackChunkName: "SystemValue-add" */ './pages/SystemValue/add.vue'
+  )
+}
 function User_add() {
   return import(/* webpackChunkName: "User-add" */ './pages/User/add.vue')
 }
@@ -166,6 +176,11 @@ function Role__name_update_child() {
     /* webpackChunkName: "Role-name-update-child" */ './pages/Role/_name/update-child.vue'
   )
 }
+function SystemValue__systemvalue_id_edit() {
+  return import(
+    /* webpackChunkName: "SystemValue-systemvalue_id-edit" */ './pages/SystemValue/_systemvalue_id/edit.vue'
+  )
+}
 function User__user_id_change_password() {
   return import(
     /* webpackChunkName: "User-user_id-change-password" */ './pages/User/_user_id/change-password.vue'
@@ -223,6 +238,11 @@ export default [
     path: '/System',
     component: System_index,
   },
+  {
+    name: 'SystemValue',
+    path: '/SystemValue',
+    component: SystemValue_index,
+  },
   {
     name: 'Translate',
     path: '/Translate',
@@ -293,6 +313,11 @@ export default [
     path: '/System/menu',
     component: System_menu_index,
   },
+  {
+    name: 'SystemValue-add',
+    path: '/SystemValue/add',
+    component: SystemValue_add,
+  },
   {
     name: 'User-add',
     path: '/User/add',
@@ -369,6 +394,11 @@ export default [
     path: '/Role/:name/update-child',
     component: Role__name_update_child,
   },
+  {
+    name: 'SystemValue-systemvalue_id-edit',
+    path: '/SystemValue/:systemvalue_id/edit',
+    component: SystemValue__systemvalue_id_edit,
+  },
   {
     name: 'User-user_id-change-password',
     path: '/User/:user_id/change-password',

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

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

package/dist/runtime/types/SystemValue.mjs

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

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

@@ -0,0 +1,34 @@
+declare const _default: {
+    username: {
+        label: string;
+        sortable: boolean;
+        searchable: 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;
+    };
+};
+export default _default;

package/dist/runtime/types/User.mjs

@@ -0,0 +1,33 @@
+export default {
+  username: {
+    label: "Username",
+    sortable: true,
+    searchable: true
+  },
+  first_name: {
+    label: "First Name",
+    sortable: true,
+    searchable: true
+  },
+  last_name: {
+    label: "Last Name",
+    sortable: true,
+    searchable: true
+  },
+  email: {
+    label: "Email",
+    sortable: true,
+    searchable: true
+  },
+  phone: {
+    label: "Phone",
+    sortable: true,
+    searchable: true
+  },
+  join_date: {
+    label: "Join Date",
+    sortable: true,
+    searchable: true,
+    searchType: "date"
+  }
+};

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

@@ -0,0 +1,39 @@
+declare const _default: {
+    userlog_id: {
+        label: string;
+        sortable: boolean;
+        searchable: 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;
+        }[];
+    };
+    user_agent: {
+        label: string;
+        sortable: boolean;
+        searchable: boolean;
+    };
+};
+export default _default;

package/dist/runtime/types/UserLog.mjs

@@ -0,0 +1,44 @@
+export default {
+  userlog_id: {
+    label: "ID",
+    sortable: true,
+    searchable: true
+  },
+  username: {
+    label: "User",
+    sortable: true,
+    searchable: true
+  },
+  login_dt: {
+    label: "Login time",
+    sortable: true,
+    searchable: true,
+    searchType: "date"
+  },
+  logout_dt: {
+    label: "Logout time",
+    sortable: true,
+    searchable: true
+  },
+  result: {
+    label: "Result",
+    sortable: true,
+    searchable: true,
+    searchType: "select",
+    searchOptions: [
+      {
+        label: "SUCCESS",
+        value: "SUCCESS"
+      },
+      {
+        label: "FAIL",
+        value: "FAIL"
+      }
+    ]
+  },
+  user_agent: {
+    label: "User agent",
+    sortable: true,
+    searchable: true
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",