@hostlink/nuxt-light 1.73.2 → 1.74.0

package/dist/runtime/components/L/Form.vue.d.ts

@@ -1,70 +1,43 @@
-declare var __VLS_23: {};
+import type { LFormGutter, LFormLayout } from "../../types/form.js";
+type __VLS_Props = {
+    actions?: boolean;
+    bordered?: boolean;
+    gutter?: LFormGutter;
+    layout?: LFormLayout;
+    modelValue?: Record<string, unknown>;
+    noRedirect?: boolean;
+    submitIcon?: string;
+    submitLabel?: string;
+};
+declare var __VLS_17: {}, __VLS_20: {
+    loading: boolean;
+}, __VLS_22: {
+    loading: boolean;
+};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_23) => any;
+    default?: (props: typeof __VLS_17) => any;
+} & {
+    actions?: (props: typeof __VLS_20) => any;
+} & {
+    buttons?: (props: typeof __VLS_22) => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-    modelValue: {
-        type: ObjectConstructor;
-    };
-    bordered: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    gutter: {
-        type: StringConstructor;
-        default: string;
-    };
-    submitLabel: {
-        type: StringConstructor;
-        default: string;
-    };
-    submitIcon: {
-        type: StringConstructor;
-        default: string;
-    };
-    noRedirect: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     submit: (...args: any[]) => void;
     save: (...args: any[]) => void;
     submitted: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    modelValue: {
-        type: ObjectConstructor;
-    };
-    bordered: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    gutter: {
-        type: StringConstructor;
-        default: string;
-    };
-    submitLabel: {
-        type: StringConstructor;
-        default: string;
-    };
-    submitIcon: {
-        type: StringConstructor;
-        default: string;
-    };
-    noRedirect: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-}>> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onSubmit?: ((...args: any[]) => any) | undefined;
     onSave?: ((...args: any[]) => any) | undefined;
     onSubmitted?: ((...args: any[]) => any) | undefined;
 }>, {
+    actions: boolean;
     bordered: boolean;
-    gutter: string;
-    submitLabel: string;
-    submitIcon: string;
+    gutter: LFormGutter;
+    layout: LFormLayout;
     noRedirect: boolean;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+    submitIcon: string;
+    submitLabel: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/L/FormLayout.d.vue.ts

@@ -0,0 +1,36 @@
+import type { LFormGutter, LFormLayout } from "../../types/form.js";
+type __VLS_Props = {
+    actions?: boolean;
+    bordered?: boolean;
+    contentClass?: string | string[] | Record<string, boolean>;
+    gutter?: LFormGutter;
+    layout?: LFormLayout;
+    submitDisable?: boolean;
+    submitIcon?: string;
+    submitLabel?: string;
+    submitLoading?: boolean;
+};
+declare var __VLS_14: {}, __VLS_22: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_14) => any;
+} & {
+    actions?: (props: typeof __VLS_22) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+    actions: boolean;
+    bordered: boolean;
+    gutter: LFormGutter;
+    layout: LFormLayout;
+    submitIcon: string;
+    submitLabel: string;
+    submitDisable: boolean;
+    submitLoading: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/L/FormLayout.vue

@@ -0,0 +1,36 @@
+<script setup>
+import { computed } from "vue";
+import { getFormLayoutClasses } from "../../utils/formLayout";
+const props = defineProps({
+  actions: { type: Boolean, required: false, default: true },
+  bordered: { type: Boolean, required: false, default: true },
+  contentClass: { type: [String, Array, Object], required: false },
+  gutter: { type: String, required: false, default: "md" },
+  layout: { type: String, required: false, default: "grid" },
+  submitDisable: { type: Boolean, required: false, default: false },
+  submitIcon: { type: String, required: false, default: "sym_o_save" },
+  submitLabel: { type: String, required: false, default: "Save" },
+  submitLoading: { type: Boolean, required: false, default: false }
+});
+const layoutClass = computed(() => getFormLayoutClasses(props.layout, props.gutter));
+</script>
+
+<template>
+    <l-card :bordered="bordered">
+        <q-card-section :class="[layoutClass, contentClass]">
+            <slot />
+        </q-card-section>
+
+        <q-card-actions v-if="actions" align="right">
+            <slot name="actions">
+                <l-btn
+                    type="submit"
+                    :icon="submitIcon"
+                    :label="submitLabel"
+                    :loading="submitLoading"
+                    :disable="submitDisable"
+                />
+            </slot>
+        </q-card-actions>
+    </l-card>
+</template>

package/dist/runtime/components/L/FormLayout.vue.d.ts

@@ -0,0 +1,36 @@
+import type { LFormGutter, LFormLayout } from "../../types/form.js";
+type __VLS_Props = {
+    actions?: boolean;
+    bordered?: boolean;
+    contentClass?: string | string[] | Record<string, boolean>;
+    gutter?: LFormGutter;
+    layout?: LFormLayout;
+    submitDisable?: boolean;
+    submitIcon?: string;
+    submitLabel?: string;
+    submitLoading?: boolean;
+};
+declare var __VLS_14: {}, __VLS_22: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_14) => any;
+} & {
+    actions?: (props: typeof __VLS_22) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+    actions: boolean;
+    bordered: boolean;
+    gutter: LFormGutter;
+    layout: LFormLayout;
+    submitIcon: string;
+    submitLabel: string;
+    submitDisable: boolean;
+    submitLoading: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/L/Login.vue

@@ -305,7 +305,7 @@ const facebookLogin = (accessToken) => {
     </q-card-actions>
 
     <q-card-actions v-if="facebookAppId">
-      <l-facebook-button @login="facebookLogin" />
+      <l-facebook-button :app-id="facebookAppId" @login="facebookLogin" />
     </q-card-actions>
   </q-card>
 </template>

package/dist/runtime/components/L/Menu.d.vue.ts

@@ -3,7 +3,9 @@ export default _default;
 declare const __VLS_export: import("vue").DefineComponent<{
     value?: any;
     dense?: any;
+    expandAll?: any;
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{
     value?: any;
     dense?: any;
+    expandAll?: any;
 }> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/L/Menu.vue

@@ -2,7 +2,7 @@
 import { useRoute } from "vue-router";
 import { ref, computed } from "vue";
 import { useLight } from "#imports";
-const props = defineProps(["value", "dense"]);
+const props = defineProps(["value", "dense", "expandAll"]);
 const light = useLight();
 const isShowExpansionItem = (menu) => {
   if (menu.children && menu.children.length > 0) {
@@ -47,9 +47,9 @@ const hasChildLink = () => {
     <q-list class="menu-list" :dense="dense">
         <template v-for="menu in value">
 
-            <q-expansion-item :default-opened="hasLink(menu)" :label="$t(menu.label)" :icon="menu.icon" :dense="dense"
-                v-if="isShowExpansionItem(menu)" :group="group">
-                <l-menu class="q-pl-md" :value="menu.children" :dense="dense"></l-menu>
+            <q-expansion-item :default-opened="expandAll || hasLink(menu)" :label="$t(menu.label)" :icon="menu.icon" :dense="dense"
+                v-if="isShowExpansionItem(menu)" :group="expandAll ? undefined : group">
+                <l-menu class="q-pl-md" :value="menu.children" :dense="dense" :expand-all="expandAll"></l-menu>
             </q-expansion-item>
 
             <template v-else>

package/dist/runtime/components/L/Menu.vue.d.ts

@@ -3,7 +3,9 @@ export default _default;
 declare const __VLS_export: import("vue").DefineComponent<{
     value?: any;
     dense?: any;
+    expandAll?: any;
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{
     value?: any;
     dense?: any;
+    expandAll?: any;
 }> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

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

@@ -135,8 +135,6 @@ declare const light: {
                 ipod: boolean;
                 kindle: boolean;
                 winphone: boolean;
-                blackberry: boolean;
-                playbook: boolean;
                 silk: boolean;
             };
             has: {
@@ -732,8 +730,6 @@ declare const _default: () => {
                 ipod: boolean;
                 kindle: boolean;
                 winphone: boolean;
-                blackberry: boolean;
-                playbook: boolean;
                 silk: boolean;
             };
             has: {

package/dist/runtime/formkit/Form.d.vue.ts

@@ -1,8 +1,8 @@
-declare var __VLS_14: {
+declare var __VLS_7: {
     [x: string]: any;
 };
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_14) => any;
+    default?: (props: typeof __VLS_7) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: {

package/dist/runtime/formkit/Form.vue

@@ -14,7 +14,6 @@ let props = defineProps({
 let onSubmit = async () => {
   props.context?.handlers.submit(new Event("submit"));
 };
-const gutter = props.context?.gutter ?? "md";
 let bordered = true;
 if (props.context.bordered !== void 0) {
   bordered = props.context.bordered;
@@ -89,24 +88,22 @@ if (!props.context.onSubmit) {
 const isNoDirtyCheck = computed(() => {
   return props.context.attrs["no-dirty-check"] !== void 0;
 });
-const localClass = computed(() => {
-  if (props.context.attrs.class) {
-    return props.context.attrs.class;
-  }
-  return "row q-col-gutter-md";
-});
 </script>
 
 <template>
-    <l-card :bordered="bordered">
-        <form @submit.prevent="onSubmit">
-            <q-card-section :class="localClass">
-                <slot v-bind="context"></slot>
-            </q-card-section>
-            <q-card-actions align="right" v-if="context.actions">
-                <l-btn type="submit" icon="sym_o_check" :label="context.submitLabel ?? 'Submit'"
-                    :disabled="!isNoDirtyCheck && !context.state.dirty" :loading="context.state.loading"></l-btn>
-            </q-card-actions>
-        </form>
-    </l-card>
+    <form @submit.prevent="onSubmit">
+        <l-form-layout
+            :actions="context.actions"
+            :bordered="bordered"
+            :content-class="context.attrs.class"
+            :gutter="context.gutter ?? 'md'"
+            :layout="context.layout ?? 'grid'"
+            :submit-disable="!isNoDirtyCheck && !context.state.dirty"
+            :submit-icon="context.submitIcon ?? 'sym_o_check'"
+            :submit-label="context.submitLabel ?? 'Submit'"
+            :submit-loading="context.state.loading"
+        >
+            <slot v-bind="context" />
+        </l-form-layout>
+    </form>
 </template>

package/dist/runtime/formkit/Form.vue.d.ts

@@ -1,8 +1,8 @@
-declare var __VLS_14: {
+declare var __VLS_7: {
     [x: string]: any;
 };
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_14) => any;
+    default?: (props: typeof __VLS_7) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: {

package/dist/runtime/formkit/index.js

@@ -110,9 +110,11 @@ export const createLightPlugin = () => {
           props: [
             "actions",
             "submitLabel",
+            "submitIcon",
             "submit",
             "onSubmit",
             "gutter",
+            "layout",
             "bordered",
             "modelName",
             "modelId"

package/dist/runtime/locales/en.json

@@ -6,5 +6,11 @@
     "contains_symbol": "Must contain at least one special character",
     "storage_usage": "{0} free of {1}",
     "input_required": "Please input {0}",
-    "input_min": "Please input at least {0} characters"
-}
+    "input_min": "Please input at least {0} characters",
+    "Filesystem decorators": "Filesystem decorators",
+    "Decorators are applied in order to every file operation.": "Decorators are applied in order to every file operation.",
+    "Add decorator": "Add decorator",
+    "Decorator": "Decorator",
+    "Search menu": "Search menu",
+    "No matching menu": "No matching menu"
+}

package/dist/runtime/locales/zh-hk.json

@@ -126,6 +126,8 @@
     "File": "檔案",
     "Folder": "資料夾",
     "Search": "搜尋",
+    "Search menu": "搜尋選單",
+    "No matching menu": "找不到符合的選單",
     "Reset": "重設",
     "Reload": "重新載入",
     "Rename": "重新命名",
@@ -210,5 +212,9 @@
     "Are you sure you want to reset 2FA?" : "您確定要重置雙重認證嗎？",
     "Update role": "更新角色",
     "Overview": "概覽",
-    "Click the button below to link your Google account.": "點擊下面的按鈕連接您的Google帳戶。"
-}
+    "Click the button below to link your Google account.": "點擊下面的按鈕連接您的Google帳戶。",
+    "Filesystem decorators": "檔案系統路徑處理器",
+    "Decorators are applied in order to every file operation.": "路徑處理器會按顯示次序套用到每個檔案操作。",
+    "Add decorator": "新增路徑處理器",
+    "Decorator": "路徑處理器"
+}

package/dist/runtime/pages/Role/[name]/update-child.vue

@@ -1,6 +1,9 @@
 <script setup>
 import { useRoute } from "vue-router";
-import { q } from "#imports";
+import { definePageMeta, q } from "#imports";
+definePageMeta({
+  permission: "role.update-child"
+});
 const route = useRoute();
 const name = route.params.name;
 const role = await q("getRole", {

package/dist/runtime/pages/System/fs.vue

@@ -6,17 +6,34 @@ const $q = useQuasar();
 const { data: app, refresh } = await useAsyncData(async () => {
   return await q({
     app: {
+      listFileSystem: true,
       fs: {
-        list: true,
-        types: true
+        types: true,
+        decoratorTypes: true
       },
       driveTypes: true
     }
   }).then((res) => res.app);
 });
-const items = computed(() => app.value.fs.list);
+const items = computed(() => app.value?.listFileSystem ?? []);
 const dialog = ref(false);
 const value = ref({});
+const clone = (data) => JSON.parse(JSON.stringify(data));
+const openAdd = () => {
+  value.value = {
+    data: {},
+    decorators: []
+  };
+  dialog.value = true;
+};
+const openEdit = (row) => {
+  value.value = clone({
+    ...row,
+    data: row.data ?? {},
+    decorators: row.decorators ?? []
+  });
+  dialog.value = true;
+};
 const onSubmit = async (data) => {
   loading.value = true;
   try {
@@ -39,19 +56,19 @@ const onSubmit = async (data) => {
   }
   loading.value = false;
 };
-const onRemove = async (selected2) => {
+const onRemove = async (rows) => {
   $q.dialog({
     title: "Confirm",
     message: "Are you sure you want to delete this file system?",
     ok: "Yes",
     cancel: "No"
   }).onOk(async () => {
-    for (let row of selected2) {
+    for (let row of rows) {
       await m("lightFSdelete", {
         uuid: row.uuid
       });
     }
-    selected2.value = [];
+    selected.value = [];
     refresh();
   });
 };
@@ -88,6 +105,11 @@ const columns = [
     name: "data",
     label: "Data",
     align: "left"
+  },
+  {
+    name: "decorators",
+    label: "Decorators",
+    align: "left"
   }
 ];
 const selected = ref([]);
@@ -96,12 +118,28 @@ const getType = (type) => {
   if (!type) return null;
   return app.value.fs.types.find((t) => t.name == type);
 };
+const getDecoratorType = (type) => {
+  if (!type) return null;
+  return app.value.fs.decoratorTypes.find((t) => t.name == type);
+};
+const isSecret = (key) => [
+  "secret_key",
+  "secretKey",
+  "password",
+  "token",
+  "access_key_secret"
+].includes(key);
+const displayValue = (key, optionValue) => {
+  if (isSecret(key) && optionValue) return "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
+  if (typeof optionValue === "boolean") return optionValue ? "Yes" : "No";
+  return optionValue;
+};
 </script>
 
 <template>
     <l-page title="File system">
         <q-dialog v-model="dialog" persistent>
-            <q-card style="width: 500px;">
+            <q-card style="width: 720px; max-width: 90vw;">
 
                 <q-toolbar>
                     <q-toolbar-title v-if="value.uuid">{{ $t('Edit File System') }}</q-toolbar-title>
@@ -116,15 +154,60 @@ const getType = (type) => {
                         option-value="name"></form-kit>
 
                     <form-kit type="group" name="data" v-if="value.type">
-                        <template v-for="(option, name) in getType(value.type).options">
-                            <form-kit type="l-input" :name="name" :label="name"
+                        <template v-for="(option, name) in getType(value.type)?.options" :key="name">
+                            <form-kit v-if="option.type === 'select'" type="l-select" :name="name" :label="name"
+                                :options="option.options" :validation="option.required ? 'required' : ''"
+                                :help="option.description"></form-kit>
+
+                            <form-kit v-else-if="option.type === 'boolean'" type="l-toggle" :name="name" :label="name"
+                                :help="option.description"></form-kit>
+
+                            <form-kit v-else type="l-input" :name="name" :label="name"
                                 :validation="option.required ? 'required' : ''" :help="option.description"
-                                :placeholder="option.placeholder"></form-kit>
+                                :placeholder="option.placeholder" :input-type="option.type === 'password' ? 'password' : 'text'"
+                                :number="option.type === 'int' ? 'integer' : undefined"></form-kit>
 
                         </template>
 
                     </form-kit>
 
+                    <div class="col-12">
+                        <q-separator class="q-mb-md"></q-separator>
+                        <div class="text-subtitle2">{{ $t('Filesystem decorators') }}</div>
+                        <div class="text-caption text-grey-7 q-mb-sm">
+                            {{ $t('Decorators are applied in order to every file operation.') }}
+                        </div>
+
+                        <form-kit type="l-repeater" name="decorators" :sortable="true"
+                            :add-label="$t('Add decorator')" #default="{ value: decorator }">
+                            <div class="row q-col-gutter-sm">
+                                <form-kit class="col-12" type="l-select" label="Decorator" name="type"
+                                    validation="required" :options="app.fs.decoratorTypes"
+                                    option-value="name"></form-kit>
+
+                                <form-kit class="col-12" type="group" name="data" v-if="decorator.type">
+                                    <template
+                                        v-for="(option, name) in getDecoratorType(decorator.type)?.options"
+                                        :key="name">
+                                        <form-kit v-if="option.type === 'select'" type="l-select" :name="name"
+                                            :label="name" :options="option.options"
+                                            :validation="option.required ? 'required' : ''"
+                                            :help="option.description"></form-kit>
+
+                                        <form-kit v-else-if="option.type === 'boolean'" type="l-toggle" :name="name"
+                                            :label="name" :help="option.description"></form-kit>
+
+                                        <form-kit v-else type="l-input" :name="name" :label="name"
+                                            :validation="option.required ? 'required' : ''"
+                                            :help="option.description" :placeholder="option.placeholder"
+                                            :input-type="option.type === 'password' ? 'password' : 'text'"
+                                            :number="option.type === 'int' ? 'integer' : undefined"></form-kit>
+                                    </template>
+                                </form-kit>
+                            </div>
+                        </form-kit>
+                    </div>
+
                 </form-kit>
 
             </q-card>
@@ -133,9 +216,7 @@ const getType = (type) => {
         <q-table :rows="items" :columns="columns" selection="multiple" flat bordered dense separator="cell"
             v-model:selected="selected" row-key="uuid" :loading="loading">
             <template #top-left>
-                <q-btn icon="sym_o_add" @click="value = {
-                    data: {}
-                }; dialog = true" flat round dense>
+                <q-btn icon="sym_o_add" @click="openAdd" flat round dense>
                     <q-tooltip>Add File System</q-tooltip>
                 </q-btn>
             </template>
@@ -152,16 +233,36 @@ const getType = (type) => {
                         <q-item v-for="(value, key) in props.row.data" :key="key">
                             <q-item-section>
                                 <q-item-label caption>{{ key }}</q-item-label>
-                                <q-item-label>{{ value }}</q-item-label>
+                                <q-item-label>{{ displayValue(key, value) }}</q-item-label>
+                            </q-item-section>
+                        </q-item>
+                    </q-list>
+                </q-td>
+            </template>
+
+            <template #body-cell-decorators="props">
+                <q-td>
+                    <q-list v-if="props.row.decorators?.length" flat dense>
+                        <q-item v-for="(decorator, index) in props.row.decorators"
+                            :key="`${decorator.type}-${index}`">
+                            <q-item-section>
+                                <q-item-label>{{ getDecoratorType(decorator.type)?.label ?? decorator.type }}</q-item-label>
+                                <q-item-label caption>
+                                    <span v-if="decorator.data?.prefix">
+                                        {{ decorator.data.prefix }} /
+                                    </span>
+                                    {{ decorator.data?.scope ?? 'fixed' }}
+                                </q-item-label>
                             </q-item-section>
                         </q-item>
                     </q-list>
+                    <span v-else class="text-grey-6">—</span>
                 </q-td>
             </template>
 
             <template #body-cell-action="props">
                 <q-td auto-width>
-                    <q-btn icon="sym_o_edit" @click="value = props.row; dialog = true" flat round dense>
+                    <q-btn icon="sym_o_edit" @click="openEdit(props.row)" flat round dense>
                         <q-tooltip>Edit</q-tooltip>
                     </q-btn>
                 </q-td>