File tree Expand file tree Collapse file tree 5 files changed +33
-21
lines changed
valaxy-theme-yun/components Expand file tree Collapse file tree 5 files changed +33
-21
lines changed Original file line number Diff line number Diff line change @@ -88,15 +88,15 @@ onContentUpdated(() => {
88
88
89
89
<div p =" x-4 b-8" class =" sm:px-6 lg:px-12 xl:px-16" w =" full" >
90
90
<slot name =" main-content" >
91
- <Transition appear >
92
- <ValaxyMd :frontmatter =" frontmatter" >
93
- <YunAiExcerpt v-if =" frontmatter.excerpt_type === 'ai' && frontmatter.excerpt" />
94
- <YunMdTimeWarning />
95
-
96
- <slot name =" main-content-md" />
97
- <slot />
98
- </ValaxyMd >
99
- </Transition >
91
+ <!-- < Transition appear> -- >
92
+ <ValaxyMd :frontmatter =" frontmatter" >
93
+ <YunAiExcerpt v-if =" frontmatter.excerpt_type === 'ai' && frontmatter.excerpt" />
94
+ <YunMdTimeWarning />
95
+
96
+ <slot name =" main-content-md" />
97
+ <slot />
98
+ </ValaxyMd >
99
+ <!-- < /Transition> -- >
100
100
</slot >
101
101
102
102
<slot name =" main-content-after" />
Original file line number Diff line number Diff line change 1
1
import type { ComputedRef } from 'vue'
2
2
import { computed } from 'vue'
3
- import { useRoute , useRouter } from 'vue-router'
3
+ import { useRoute } from 'vue-router'
4
4
import { useI18n } from 'vue-i18n'
5
5
import type { Post } from 'valaxy'
6
6
import { sortByDate } from '../utils'
7
- import { useSiteStore } from '../stores'
7
+ import { useRouterStore , useSiteStore } from '../stores'
8
8
9
9
export function usePostTitle ( post : ComputedRef < Post > ) {
10
10
const { locale } = useI18n ( )
@@ -18,12 +18,11 @@ export function usePostTitle(post: ComputedRef<Post>) {
18
18
* get all page in 'pages' folder
19
19
*/
20
20
export function usePageList ( ) {
21
- const router = useRouter ( )
21
+ const routerStore = useRouterStore ( )
22
+ const router = routerStore . router
23
+
22
24
return computed < Post [ ] > ( ( ) => {
23
25
const excludePages = [ '/:..all' , '/:all(.*)*' , '/' , '/:path(.*)' ]
24
- if ( ! router )
25
- return [ ]
26
-
27
26
const routes = router . getRoutes ( )
28
27
. filter ( i => i . name )
29
28
. filter ( i => i . meta )
Original file line number Diff line number Diff line change 1
1
export * from './app'
2
+ export * from './router'
2
3
export * from './site'
Original file line number Diff line number Diff line change
1
+ import { defineStore } from 'pinia'
2
+ import { useRouter } from 'vue-router'
3
+
4
+ export const useRouterStore = defineStore ( 'routerStore' , ( ) => {
5
+ const router = useRouter ( )
6
+
7
+ return {
8
+ router,
9
+ }
10
+ } )
Original file line number Diff line number Diff line change 1
1
import { computed , ref } from 'vue'
2
2
import { acceptHMRUpdate , defineStore } from 'pinia'
3
- import { useRouter } from 'vue-router'
4
- import { usePostList } from '..'
3
+ import { usePostList , useRouterStore } from '..'
5
4
import type { PageDataPayload } from '../../types'
6
5
7
6
/**
@@ -11,18 +10,21 @@ import type { PageDataPayload } from '../../types'
11
10
* - category
12
11
*/
13
12
export const useSiteStore = defineStore ( 'site' , ( ) => {
13
+ const routerStore = useRouterStore ( )
14
+ const router = routerStore . router
15
+
14
16
const reload = ref ( 1 )
15
17
// for dev hot reload
16
18
const postList = computed ( ( ) => {
17
- if ( reload . value )
18
- return usePostList ( ) . value
19
+ const val = usePostList ( ) . value
20
+ if ( reload . value && val )
21
+ return val
19
22
else
20
- return usePostList ( ) . value
23
+ return val
21
24
} )
22
25
23
26
// const postList = usePostList()
24
27
25
- const router = useRouter ( )
26
28
if ( router ) {
27
29
router . isReady ( ) . then ( ( ) => {
28
30
// hot reload when save md
You can’t perform that action at this time.
0 commit comments