@hostlink/nuxt-light 1.21.10 → 1.21.12

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.21.10",
+  "version": "1.21.12",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

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

@@ -268,7 +268,7 @@ watch(menuWidth, () => {
 })
 
 const c1 = computed(() => {
-    return light.getColorValue(light.color)
+    return light.getColorValue()
 })
 
 if (route.fullPath == "/" && my.default_page) {
@@ -401,13 +401,10 @@ const onLogout = async () => {
             @mouseover="isMouseOnDrawer = true">
             <!-- drawer content -->
             <q-scroll-area class="fit">
-
-                <div class="q-mx-sm">
+                <div class="q-mx-xs q-mt-xs">
                     <l-fav-menu :value="myFavorites" :dense="style.dense" v-if="myFavoritesCount > 0" />
                     <l-menu :value="menus" :dense="style.dense" />
-
                 </div>
-
             </q-scroll-area>
         </q-drawer>
 
@@ -448,13 +445,8 @@ const onLogout = async () => {
                 </template>
             </router-view -->
             <NuxtLoadingIndicator />
-
             <NuxtPage />
-
-
         </q-page-container>
-
-
         <q-footer bordered v-if="style.footer">
             <q-item>
                 <q-item-section>

package/dist/runtime/components/l-file-manager.vue

@@ -656,7 +656,7 @@ selectedNodePath.value = drives[0].index.toString();
         <q-list padding class="text-grey-8">
           <q-item>
             <q-item-section>
-              <q-btn icon="add" outline rounded :color="light.color" :label="$t('New')" :disable="!selectedNodePath">
+              <l-btn icon="add" label="New" :disable="!selectedNodePath">
                 <q-menu>
                   <q-list>
                     <q-item clickable v-close-popup @click="onNewFolder" v-if="permission.includes('fs.folder.create')">
@@ -675,7 +675,7 @@ selectedNodePath.value = drives[0].index.toString();
                     </q-item>
                   </q-list>
                 </q-menu>
-              </q-btn>
+              </l-btn>
             </q-item-section>
           </q-item>
 
@@ -747,7 +747,7 @@ selectedNodePath.value = drives[0].index.toString();
 
       <template v-if="grid">
         <q-table :title="$t('Folders')" flat grid :columns="columns" :rows="folders" hide-pagination
-          :pagination="{ rowsPerPage: 0 }">
+          :pagination="{ rowsPerPage: 0 }" color="$light.color">
           <template v-slot:item="props">
             <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4" @click="onDblclickRow(null, props.row, null)">
               <q-card flat bordered>
@@ -768,7 +768,7 @@ selectedNodePath.value = drives[0].index.toString();
         </q-table>
 
         <q-table :title="$t('Files')" flat grid :columns="columns" :rows="files" hide-pagination
-          :pagination="{ rowsPerPage: 0 }">
+          :pagination="{ rowsPerPage: 0 }" :color="$light.color">
 
           <template v-slot:item="props">
             <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4" @click="onClickRow(null, props.row, null)">
@@ -798,7 +798,8 @@ selectedNodePath.value = drives[0].index.toString();
 
         <q-table flat :columns="columns" :rows="items" @row-dblclick="onDblclickRow" @row-click="onClickRow"
           :pagination="pagination" row-key="path" selection="multiple" v-model:selected="selected" dense
-          :loading="loading" :loading-label="$t('Loading...')" :no-data-label="$t('No data available')">
+          :loading="loading" :loading-label="$t('Loading...')" :no-data-label="$t('No data available')"
+          :color="$light.color">
           <template #body-cell-icon="props">
             <q-td auto-width>
               <q-icon name="sym_o_folder" v-if="props.value == 'folder'" size="sm" />

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

@@ -118,7 +118,7 @@ const localShowPassword = computed(() => {
 });
 
 const onClickTc2Sc = () => {
-    modelValue.value = tc2sc(modelValue.value);
+    modelValue.value = tc2sc(modelValue.value ?? "");
 }
 
 </script>
@@ -135,12 +135,10 @@ const onClickTc2Sc = () => {
                 </q-menu>
             </q-btn>
         </template>
-
         <template v-for="(s, name) in $slots" v-slot:[name]="props" :key="name">
             <slot :name="name" v-bind="props ?? {}"></slot>
         </template>
 
-
         <template v-if="localShowPassword" v-slot:append>
             <q-icon name="sym_o_visibility" class="cursor-pointer" :color="showPassword ? 'primary' : 'grey-5'"
                 @click="isShowPassword = false" v-if="isShowPassword" />

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

@@ -56,8 +56,8 @@ 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">
+            <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>
 
@@ -69,9 +69,7 @@ const hasChildLink = () => {
                     <q-item-section avatar>
                         <q-icon :name="menu.icon" />
                     </q-item-section>
-                    <q-item-section>
-                        <q-item-label v-text="$t(menu.label)"></q-item-label>
-                    </q-item-section>
+                    <q-item-section>{{ $t(menu.label) }}</q-item-section>
                 </q-item>
             </template>
 

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

@@ -558,7 +558,7 @@ const onAdd = () => {
         </template>
 
         <q-table v-bind="attrs" :loading="loading" :rows="rows" ref="table" @request="onLocalRequest" :columns="columns"
-            v-model:pagination="pagination" :filter="filter" v-model:selected="localSelected">
+            v-model:pagination="pagination" :filter="filter" v-model:selected="localSelected" :color="$light.color">
 
             <template #header="props">
                 <q-tr :props="props">

package/dist/runtime/light.js

@@ -31,7 +31,6 @@ const COLOR_CODE = {
   warning: "#ff9f43",
   dark: "#4b4b4b"
 };
-let styles = {};
 const light = reactive({
   styles: {
     table: {
@@ -46,8 +45,8 @@ const light = reactive({
       square: false
     },
     button: {
-      outline: true,
-      rounded: true,
+      outline: false,
+      rounded: false,
       unelevated: false,
       dense: false
     },
@@ -56,7 +55,7 @@ const light = reactive({
       outlined: true,
       standout: false,
       rounded: false,
-      dense: true,
+      dense: false,
       square: false,
       stackLabel: true
     }
@@ -189,7 +188,7 @@ const light = reactive({
       name,
       value
     });
-    styles[name] = value;
+    light.styles[name] = value;
   },
   setCurrentRoute(to) {
     currentRoute = to;
@@ -202,22 +201,18 @@ const light = reactive({
     const keyname = parts[1];
     return parseInt(currentRoute.params[keyname]);
   },
-  init(styles2) {
-    light.color = styles2.color || "primary";
-    light.theme = styles2.theme || "semi-dark";
-    styles2.input = { ...light.styles.input, ...styles2.input || {} };
-    styles2.card = { ...light.styles.card, ...styles2.card || {} };
-    styles2.button = { ...light.styles.button, ...styles2.button || {} };
-    styles2.table = { ...light.styles.table, ...styles2.table || {} };
-    light.styles = styles2;
+  init(styles) {
+    light.color = styles.color || "primary";
+    light.theme = styles.theme || "semi-dark";
+    light.styles.input = { ...light.styles.input, ...styles.input || {} };
+    light.styles.card = { ...light.styles.card, ...styles.card || {} };
+    light.styles.button = { ...light.styles.button, ...styles.button || {} };
+    light.styles.table = { ...light.styles.table, ...styles.table || {} };
     watch(() => light.theme, async () => {
       await light.setStyle("theme", light.theme);
     });
     watch(() => light.color, async () => {
-      await m("updateMyStyle", {
-        name: "color",
-        value: light.color
-      });
+      await light.setStyle("color", light.color);
     });
   },
   isGranted(right) {

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

@@ -18,13 +18,30 @@ const dialog = ref(false)
 const value = ref({})
 
 const onSubmit = async (data) => {
-    //save data
-    await m("addFileSystem", {
-        data: data
-    })
+    loading.value = true
+
+    try {
+        if (data.uuid) {
+            await m("lightFSupdate", {
+                data: data
+            })
+        } else {
+            //save data
+            await m("lightFSadd", {
+                data: data
+            })
+        }
+        dialog.value = false
+        refresh()
+
+    } catch (e) {
+        $q.notify({
+            type: 'negative',
+            message: e.message
+        })
+    }
 
-    dialog.value = false
-    refresh()
+    loading.value = false
 }
 
 const onRemove = async (selected) => {
@@ -36,11 +53,9 @@ const onRemove = async (selected) => {
         ok: 'Yes',
         cancel: 'No'
     }).onOk(async () => {
-
-
         for (let row of selected) {
-            await m("deleteFileSystem", {
-                name: row.name
+            await m("lightFSdelete", {
+                uuid: row.uuid
             })
         }
         selected.value = []
@@ -52,6 +67,15 @@ const onRemove = async (selected) => {
 
 const columns = [
     {
+        name: "action"
+    },
+/*     {
+        name: 'uuid',
+        required: true,
+        label: 'UUID',
+        field: row => row.uuid,
+    },
+ */    {
         name: 'name',
         required: true,
         label: 'Name',
@@ -74,8 +98,9 @@ const columns = [
         align: 'left',
     }
 ]
-
 const selected = ref([])
+
+const loading = ref(false)
 </script>
 <template>
 
@@ -85,69 +110,76 @@ const selected = ref([])
             <q-card style="width: 500px;">
 
                 <q-toolbar>
-                    <q-toolbar-title>{{ $t('Add File System') }}</q-toolbar-title>
+                    <q-toolbar-title v-if="value.uuid">{{ $t('Edit File System') }}</q-toolbar-title>
+                    <q-toolbar-title v-else>{{ $t('Add File System') }}</q-toolbar-title>
                     <q-space></q-space>
                     <q-btn flat round dense icon="sym_o_close" v-close-popup></q-btn>
                 </q-toolbar>
 
-                <FormKit type="l-form" :value="value" @submit="onSubmit" #default="{ value }">
-                    <FormKit type="l-input" label="Name" name="name" validation="required"></FormKit>
-                    <FormKit type="l-select" label="Type" name="type" validation="required" :options="[
+                <form-kit type="l-form" :value="value" @submit="onSubmit" #default="{ value }">
+                    <form-kit type="l-input" label="Name" name="name" validation="required"></form-kit>
+                    <form-kit type="l-select" label="Type" name="type" validation="required" :options="[
                         { label: 'Local', value: 'local', disable: !app.driveTypes.includes('local') },
                         { label: 'S3', value: 's3', disable: !app.driveTypes.includes('s3') },
                         { label: 'HostLink storage', value: 'hostlink', disable: !app.driveTypes.includes('hostlink') },
                         { label: 'Aliyun OSS', value: 'aliyun-oss', disable: !app.driveTypes.includes('aliyun-oss') },
-                    ]"></FormKit>
+                    ]"></form-kit>
 
-                    <FormKit type="group" name="data">
-                        <FormKit type="l-input" label="Url" name="url"
+                    <form-kit type="group" name="data">
+                        <form-kit type="l-input" label="Url" name="url"
                             hint="URL is used to generate the full URL of the file.">
-                        </FormKit>
+                        </form-kit>
 
                         <template v-if="value.type == 'local'">
-                            <FormKit type="l-input" label="Location" name="location" validation="required"
-                                hint="Location is the path to the directory where the files are stored."></FormKit>
+                            <form-kit type="l-input" label="Location" name="location" validation="required"
+                                hint="Location is the path to the directory where the files are stored."></form-kit>
                         </template>
 
                         <template v-if="value.type == 's3'">
-                            <FormKit type="l-input" label="Bucket" name="bucket" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Access Key" name="accessKey" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Secret Key" name="secretKey" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Region" name="region" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Endpoint" name="endpoint" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Prefix" name="prefix"></FormKit>
-                            <FormKit type="l-select" label="Visibility" name="visibility" validation="required"
+                            <form-kit type="l-input" label="Bucket" name="bucket" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Access Key" name="accessKey"
+                                validation="required"></form-kit>
+                            <form-kit type="l-input" label="Secret Key" name="secretKey"
+                                validation="required"></form-kit>
+                            <form-kit type="l-input" label="Region" name="region" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Endpoint" name="endpoint" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Prefix" name="prefix"></form-kit>
+                            <form-kit type="l-select" label="Visibility" name="visibility" validation="required"
                                 :options="[
                                     { label: 'Public', value: 'public' },
                                     { label: 'Private', value: 'private' }
-                                ]"></FormKit>
+                                ]"></form-kit>
                         </template>
 
                         <template v-if="value.type == 'hostlink'">
-                            <FormKit type="l-input" label="Endpoint" name="endpoint" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Token" name="token" validation="required"></FormKit>
+                            <form-kit type="l-input" label="Endpoint" name="endpoint" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Token" name="token" validation="required"></form-kit>
                         </template>
 
                         <template v-if="value.type == 'aliyun-oss'">
-                            <FormKit type="l-input" label="Access Key" name="access_key_id" validation="required">
-                            </FormKit>
-                            <FormKit type="l-input" label="Secret Key" name="access_key_secret" validation="required">
-                            </FormKit>
-                            <FormKit type="l-input" label="Endpoint" name="endpoint" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Bucket" name="bucket" validation="required"></FormKit>
-                            <FormKit type="l-input" label="Prefix" name="prefix"></FormKit>
+                            <form-kit type="l-input" label="Access Key" name="access_key_id" validation="required">
+                            </form-kit>
+                            <form-kit type="l-input" label="Secret Key" name="access_key_secret" validation="required">
+                            </form-kit>
+                            <form-kit type="l-input" label="Endpoint" name="endpoint" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Bucket" name="bucket" validation="required"></form-kit>
+                            <form-kit type="l-input" label="Prefix" name="prefix"></form-kit>
                         </template>
-                    </FormKit>
+                    </form-kit>
 
-                </FormKit>
+                </form-kit>
 
             </q-card>
         </q-dialog>
 
         <q-table :rows="items" :columns="columns" selection="multiple" flat bordered dense separator="cell"
-            v-model:selected="selected" row-key="name">
+            v-model:selected="selected" row-key="uuid" :loading="loading" :color="$light.color">
             <template #top-left>
-                <q-btn icon="sym_o_add" @click="dialog = true" flat round dense>
+                <q-btn icon="sym_o_add" @click="value = {
+                    data: {
+                        url: '',
+                    }
+                }; dialog = true" flat round dense>
                     <q-tooltip>Add File System</q-tooltip>
                 </q-btn>
                 <q-btn icon="sym_o_delete" @click="onRemove(selected)" flat round dense :disable="selected.length == 0">
@@ -161,6 +193,14 @@ const selected = ref([])
                 </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-tooltip>Edit</q-tooltip>
+                    </q-btn>
+                </q-td>
+            </template>
+
         </q-table>
     </l-page>
 </template>

package/package.json

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