@hostlink/nuxt-light 1.10.21 → 1.10.23

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.10.21"
+  "version": "1.10.23"
 }

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

@@ -421,14 +421,17 @@ if (route.fullPath == "/" && my.default_page) {
                 </template>
             </q-banner>
 
-            <router-view v-slot="{ Component }">
+            <!-- router-view v-slot="{ Component }">
 
                 <template v-if="Component">
                     <suspense>
                         <component :is="Component" :reloadMenu="reloadMenu"></component>
                     </suspense>
                 </template>
-            </router-view>
+            </router-view -->
+            <NuxtLoadingIndicator />
+            
+            <NuxtPage />
 
 
         </q-page-container>

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

@@ -3,7 +3,7 @@ import { provide, ref } from 'vue'
 import { useLight, watch } from "#imports";
 import { useRuntimeConfig } from 'nuxt/app'
 import { setApiUrl } from '@hostlink/light'
-import { useQuasar, Dialog } from 'quasar'
+import { useQuasar } from 'quasar'
 import { q } from '#imports'
 import { useRoute } from "vue-router";
 const config = useRuntimeConfig();
@@ -56,7 +56,8 @@ provide('color', color)
             <slot name="header"></slot>
         </template>
 
-        <slot></slot>
+      
+
 
 
     </l-app-main>

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

@@ -1,4 +1,5 @@
 <script setup>
+import { useRoute } from 'vue-router'
 import { ref, computed } from 'vue'
 import { useLight } from '#imports'
 const props = defineProps(["value", "dense"])
@@ -24,6 +25,28 @@ const color2 = computed(() => {
 
 //generate a random group name
 const group = Math.random().toString(36).substring(7);
+
+const route = useRoute();
+const path = route.path
+const hasLink = (item) => {
+    if (item.children) {
+        for (let i = 0; i < item.children.length; i++) {
+            if (hasLink(item.children[i])) {
+                return true;
+            }
+        }
+    }
+    if (item.to == path) {
+        return true;
+    }
+    return false;
+}
+
+const hasChildLink = () => {
+    return hasLink(props.value)
+}
+
+
 </script>
 
 <style scoped>
@@ -33,7 +56,7 @@ const group = Math.random().toString(36).substring(7);
     <q-list class="menu-list" :dense="dense">
         <template v-for="menu in value">
 
-            <q-expansion-item  :label="$t(menu.label)" :icon="menu.icon" :dense="dense" v-if="isShowExpansionItem(menu)"
+            <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>

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

@@ -11,29 +11,28 @@ const route = useRoute()
             <q-splitter unit="px" :model-value="120">
                 <template #before>
                     <q-tabs v-model="tab" vertical :active-color="$light.color">
-                        <q-route-tab name="general" icon="sym_o_info" :label="$t('General')" to="/User/setting" exact
-                            replace />
+                        <q-route-tab name="general" icon="sym_o_info" :label="$t('General')" to="/User/setting" exact />
                         <q-route-tab name="information" icon="sym_o_info" :label="$t('Information')"
-                            to="/User/setting/information" exact replace />
+                            to="/User/setting/information" exact />
                         <q-route-tab name="password" icon="sym_o_password" :label="$t('Password')"
-                            to="/User/setting/password" exact replace />
-                        <q-route-tab name="style" icon="sym_o_style" :label="$t('Style')" to="/User/setting/style" exact
-                            replace />
-                        <q-route-tab name="2fa" icon="sym_o_key" :label="$t('2FA')" to="/User/setting/two-factor-auth" exact
-                            replace />
+                            to="/User/setting/password" exact />
+                        <q-route-tab name="style" icon="sym_o_style" :label="$t('Style')" to="/User/setting/style"
+                            exact />
+                        <q-route-tab name="2fa" icon="sym_o_key" :label="$t('2FA')" to="/User/setting/two-factor-auth"
+                            exact />
                         <q-route-tab name="bio" icon="sym_o_fingerprint" :label="$t('Bio')" to="/User/setting/bio-auth"
-                            exact replace />
-                        <q-route-tab name="openid" icon="sym_o_key" :label="$t('Open ID')" to="/User/setting/open_id" exact
-                            replace />
+                            exact />
+                        <q-route-tab name="openid" icon="sym_o_key" :label="$t('Open ID')" to="/User/setting/open_id"
+                            exact />
                         <q-route-tab name="myfav" icon="sym_o_star" :label="$t('My favorite')"
-                            to="/User/setting/my_favorite" exact replace />
+                            to="/User/setting/my_favorite" exact />
 
                     </q-tabs>
                 </template>
 
                 <template #after>
-                    <router-view :key="route.path">
-                    </router-view>
+                    <NuxtPage :key="route.path"></NuxtPage>
+
                 </template>
             </q-splitter>
         </l-card>

package/package.json

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