Merge commit 'ca3e3dec19a3500457d50011dbb4b71fdd3c33d5' into weather

src/GlobalModal.tsx

@@ -30,7 +30,7 @@ export default defineComponent(() => {
           <div
             class="w-full h-screen bg-black/20 backdrop-blur"
             onClick={() => {
-              router.path = ''
+              router.back()
             }}
           ></div>
         )}
@@ -53,7 +53,7 @@ export default defineComponent(() => {
                 (router.path === 'global-adder' ? 'top-6 right-4' : 'top-2 right-2')
               }
               onClick={() => {
-                router.path = ''
+                router.back()
               }}
             >
               <OhVueIcon name="md-close" scale={0.7} fill="white" />

src/layout/grid/WidgetBlock.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
             menu.open(props.block)
           }}
           onClick={() => {
-            router.path = `widget-${props.block.name}`
+            router.go(`widget-${props.block.name}`)
           }}
         >
           <compo />

src/layout/grid/index.tsx

@@ -67,7 +67,7 @@ export default defineComponent(() => {
             class="w-full h-full overflow-hidden rounded-[calc(var(--block-radius)_*_var(--block-size))] bg-white/60 backdrop-blur flex justify-center items-center cursor-pointer hover:scale-105 transition-all"
             onClick={() => {
               if (layout.state.content[layout.state.current].pages[layout.state.currentPage]) {
-                router.path = 'global-adder'
+                router.go('global-adder')
               } else {
                 globalToast.warning('请先添加页面')
               }

src/layout/header/search/SearchConfig.tsx

@@ -53,7 +53,7 @@ export default defineComponent({
             class="w-full h-10 rounded-lg overflow-hidden flex justify-center items-center p-2 transition-all cursor-pointer bg-white/40 hover:bg-white/60"
             onClick={() => {
               search.showSearchConfig = false
-              router.path = 'global-search'
+              router.go('global-search')
             }}
           >
             <OhVueIcon name="fa-plus" scale={1.4} fill="rgba(0,0,0,.4)" />

src/layout/sider/index.tsx

@@ -114,16 +114,16 @@ export default defineComponent(() => {
               name="px-headset"
               label="反馈"
               onClick={() => {
-                router.path = 'settings-fallback'
+                router.go('settings-fallback')
               }}
             />
             <div
               class="w-[56px] h-[56px] rounded-full border-white border-[2px] border-solid overflow-hidden cursor-pointer"
               onClick={() => {
                 if (user.isLogin) {
-                  router.path = 'settings-user'
+                  router.go('settings-user')
                 } else {
-                  router.path = 'global-login'
+                  router.go('global-login')
                 }
               }}
             >

src/settings/SettingsButton.tsx

@@ -10,7 +10,7 @@ export default defineComponent(() => {
       class="absolute left-10 bottom-8 p-1 z-10 flex justify-center items-center cursor-pointer rounded-lg hover:bg-black/20 transition-all"
       style="filter: drop-shadow(0 0 4px rgba(0,0,0,0.2))"
       onClick={() => {
-        router.path = 'settings-background'
+        router.go('settings-background')
       }}
     >
       <OhVueIcon name="md-settings" fill="white" scale={1.2} />

src/settings/SettingsOverlay.tsx

@@ -25,7 +25,7 @@ const SettingsTab = defineComponent({
           (router.path === props.path ? 'bg-white/70 font-bold shadow-lg' : '')
         }
         onClick={() => {
-          router.path = props.path as any
+          router.go(props.path as any)
         }}
       >
         {props.label}
@@ -44,7 +44,7 @@ export default defineComponent(() => {
         <div
           class="w-full h-screen"
           onClick={() => {
-            router.path = ''
+            router.back()
           }}
         ></div>
       )}
@@ -59,7 +59,7 @@ export default defineComponent(() => {
                   (router.path === 'settings-user' ? 'bg-white/70 shadow-lg' : '')
                 }
                 onClick={() => {
-                  router.path = 'settings-user'
+                  router.go('settings-user')
                 }}
               >
                 <div class="w-12 h-12 relative">

src/useRouterStore.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 export type GlobalStr = 'search' | 'block' | 'adder' | 'login' | 'background'
 export type SettingStr =
@@ -17,8 +17,24 @@ export type CustomStr = 'background'
 export type RouteStr = '' | `widget-${string}` | `global-${GlobalStr}` | `settings-${SettingStr}`
 
 export default defineStore('router', () => {
-  const path = ref<RouteStr>('')
+  const his = ref<RouteStr[]>([])
+  const go = (p: RouteStr) => {
+    his.value.unshift(p)
+    if (his.value.length > 10) {
+      his.value.pop()
+    }
+  }
+  const back = () => {
+    if (his.value.length > 0) {
+      his.value.shift()
+    }
+  }
+  const path = computed(() => {
+    return his.value[0] || ''
+  })
   return {
-    path
+    path,
+    go,
+    back
   }
 })

src/user/LoginModal.tsx

@@ -17,7 +17,7 @@ export default defineComponent(() => {
           <div
             class="w-full h-screen bg-black/20 backdrop-blur"
             onClick={() => {
-              router.path = ''
+              router.back()
             }}
           ></div>
         )}
@@ -45,7 +45,7 @@ export default defineComponent(() => {
                       returnType: 'text'
                     }).then((res) => {
                       user.token = res
-                      router.path = ''
+                      router.go('')
                     })
                   }}
                 >

src/user/UserPage.tsx

@@ -43,7 +43,7 @@ export default defineComponent(() => {
           <>
             <Button
               onClick={() => {
-                router.path = 'global-login'
+                router.go('global-login')
               }}
               icon={<EditOutlined />}
               type="primary"
@@ -58,7 +58,7 @@ export default defineComponent(() => {
                   title: '退出登录',
                   content: '确定要退出登录吗？',
                   onOk: () => {
-                    router.path = ''
+                    router.go('')
                     user.logout()
                     globalToast.success('已退出登录')
                   }
@@ -74,7 +74,7 @@ export default defineComponent(() => {
             icon={<LoginOutlined />}
             size="large"
             onClick={() => {
-              router.path = 'global-login'
+              router.go('global-login')
             }}
           >
             登录