diff --git a/.vitepress/inlined-scripts/restorePreference.js b/.vitepress/inlined-scripts/restorePreference.js index ffff09487..8ff972eed 100644 --- a/.vitepress/inlined-scripts/restorePreference.js +++ b/.vitepress/inlined-scripts/restorePreference.js @@ -8,6 +8,6 @@ restore('vue-docs-prefer-composition', 'prefer-composition') restore('vue-docs-prefer-sfc', 'prefer-sfc', true) - // window.__VUE_BANNER_ID__ = '' - // restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed') + window.__VUE_BANNER_ID__ = 'VS-FW' + restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed') })() diff --git a/.vitepress/theme/components/Banner.vue b/.vitepress/theme/components/Banner.vue index 0f5d0551a..c920d79e2 100644 --- a/.vitepress/theme/components/Banner.vue +++ b/.vitepress/theme/components/Banner.vue @@ -14,17 +14,220 @@ let open = $ref(true) function dismiss() { open = false document.documentElement.classList.add('banner-dismissed') - localStorage.setItem(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'true') + localStorage.setItem(`vue-docs-banner-${window.__VUE_BANNER_ID__}`, 'true') } - + + + + + + + + + + + Free Weekend 1st & 2nd of October + + + Get Access to ALL Vue School premium courses + + + + + Join for Free + + + + + + + + + diff --git a/.vitepress/theme/index.ts b/.vitepress/theme/index.ts index 425d1d615..a6c22bf35 100644 --- a/.vitepress/theme/index.ts +++ b/.vitepress/theme/index.ts @@ -10,14 +10,14 @@ import { import SponsorsAside from './components/SponsorsAside.vue' import VueJobs from './components/VueJobs.vue' import VueSchoolLink from './components/VueSchoolLink.vue' -// import Banner from './components/Banner.vue' +import Banner from './components/Banner.vue' import WwAds from './components/WwAds.vue' export default Object.assign({}, VPTheme, { Layout: () => { // @ts-ignore return h(VPTheme.Layout, null, { - // banner: () => h(Banner), + banner: () => h(Banner), 'sidebar-top': () => h(PreferenceSwitch), 'aside-mid': () => h(SponsorsAside), 'aside-bottom': () => h(WwAds) diff --git a/src/api/options-lifecycle.md b/src/api/options-lifecycle.md index 5edfd9179..3e5b5ffae 100644 --- a/src/api/options-lifecycle.md +++ b/src/api/options-lifecycle.md @@ -213,6 +213,8 @@ 在一个响应式依赖被组件的渲染作用追踪后调用。 +**这个钩子仅在开发模式下可用,且在服务器端渲染期间不会被调用。** + - **类型** ```ts @@ -234,6 +236,8 @@ 在一个响应式依赖被组件触发了重新渲染之后调用。 +**这个钩子仅在开发模式下可用,且在服务器端渲染期间不会被调用。** + - **类型** ```ts diff --git a/src/public/images/vueschool/bg-desktop.svg b/src/public/images/vueschool/bg-desktop.svg new file mode 100644 index 000000000..a05fbd8a7 --- /dev/null +++ b/src/public/images/vueschool/bg-desktop.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/public/images/vueschool/bg-mobile.png b/src/public/images/vueschool/bg-mobile.png new file mode 100644 index 000000000..f18973d13 Binary files /dev/null and b/src/public/images/vueschool/bg-mobile.png differ diff --git a/src/public/images/vueschool/bg-tablet.svg b/src/public/images/vueschool/bg-tablet.svg new file mode 100644 index 000000000..95e08041a --- /dev/null +++ b/src/public/images/vueschool/bg-tablet.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/public/images/vueschool/vs-close.svg b/src/public/images/vueschool/close.svg similarity index 98% rename from src/public/images/vueschool/vs-close.svg rename to src/public/images/vueschool/close.svg index 0e2f31fcd..a9d51d1d8 100644 --- a/src/public/images/vueschool/vs-close.svg +++ b/src/public/images/vueschool/close.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/src/public/images/vueschool/vs-fw-bg-small.svg b/src/public/images/vueschool/vs-fw-bg-small.svg deleted file mode 100644 index a914f4005..000000000 --- a/src/public/images/vueschool/vs-fw-bg-small.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/public/images/vueschool/vs-fw-bg.svg b/src/public/images/vueschool/vs-fw-bg.svg deleted file mode 100644 index 8c5222062..000000000 --- a/src/public/images/vueschool/vs-fw-bg.svg +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/public/images/vueschool/vs-iso.svg b/src/public/images/vueschool/vs-iso.svg index a95d92607..b3bb7a8ca 100644 --- a/src/public/images/vueschool/vs-iso.svg +++ b/src/public/images/vueschool/vs-iso.svg @@ -1,7 +1,10 @@ - - - - - + + + + + + + + - + \ No newline at end of file diff --git a/src/public/images/vueschool/vs-logo.svg b/src/public/images/vueschool/vs-logo.svg index b44c00458..9b72a0ed0 100644 --- a/src/public/images/vueschool/vs-logo.svg +++ b/src/public/images/vueschool/vs-logo.svg @@ -1,8 +1,13 @@ - - - - - - + + + + + + + + + + + - + \ No newline at end of file