Skip to content

Commit 59bac64

Browse files
committed
更新
1 parent 24b4bd2 commit 59bac64

File tree

18 files changed

+868
-386
lines changed

18 files changed

+868
-386
lines changed

plume/docs/.vuepress/client.components.ts

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import { setup } from "@css-render/vue3-ssr";
77
import { NaiveUI } from "./modules/NaiveUi";
88
import TestNaiveUi from "./components/TestNaiveUi.vue";
99
// TDesign
10-
import TestTDesign from "./components/TestTDesign.vue";
10+
import mTDesign from 'tdesign-mobile-vue';
1111
// 引入组件库的少量全局样式变量
12-
import "tdesign-vue-next/es/style/index.css";
1312
import "tdesign-mobile-vue/es/style/index.css";
14-
import { isMobileDevice } from "./utils/env";
1513

1614
// 组件
1715
import BannerTopArchived from "./plugins/vuepress-plugin-sillot-block/banner/components/BannerTopArchived.vue";
@@ -42,7 +40,6 @@ export const components = {
4240
GithubLabel,
4341
C,
4442
TestNaiveUi,
45-
TestTDesign,
4643
TestRelationGraph,
4744
SSRComponent,
4845
IndexMe,
@@ -81,16 +78,17 @@ function setupNaiveUI(app: App, isSSR: boolean) {
8178
/**
8279
* 初始化 TDesign
8380
* 调用侧同样使用 isMobileDevice 加载对应组件,刷新页面生效
81+
* 还是有些问题无法解决,最终放弃混用
8482
*/
85-
function setupTDesign(app: App, isSSR: boolean) {
86-
const ComponentLib = isMobileDevice()
87-
? import("tdesign-mobile-vue")
88-
: import("tdesign-vue-next");
83+
// function setupTDesign(app: App, isSSR: boolean) {
84+
// const ComponentLib = isMobileDevice()
85+
// ? import("tdesign-mobile-vue")
86+
// : import("tdesign-vue-next");
8987

90-
ComponentLib.then((lib) => {
91-
app.use(lib.default);
92-
});
93-
}
88+
// ComponentLib.then((lib) => {
89+
// app.use(lib.default);
90+
// });
91+
// }
9492

9593
/**
9694
* 初始化所有组件库
@@ -103,8 +101,7 @@ export async function setupUI(context: EnhanceContext) {
103101
// 初始化 NaiveUI
104102
setupNaiveUI(app, isSSR);
105103
// 初始化 TDesign
106-
setupTDesign(app, isSSR);
107-
// app.use(TDesign);
104+
app.use(mTDesign);
108105

109106
// 注册全局组件,不在 md 中使用则不需注册
110107
registerGlobalComponents(context.app);

plume/docs/.vuepress/components/TestTDesign.vue

Lines changed: 0 additions & 17 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestAvatar.vue

Lines changed: 0 additions & 9 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestButton.vue

Lines changed: 0 additions & 8 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestDivider.vue

Lines changed: 0 additions & 19 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestDrawer.vue

Lines changed: 0 additions & 57 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestDropdown.vue

Lines changed: 0 additions & 20 deletions
This file was deleted.

plume/docs/.vuepress/components/test_tdesign/TestSwitch.vue

Lines changed: 0 additions & 17 deletions
This file was deleted.

plume/docs/.vuepress/layouts/Layout.vue

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<!-- 文章的默认布局 -->
22
<script lang="ts" setup>
3-
import { computed, onMounted, watch } from "vue";
3+
import { computed, defineAsyncComponent, onMounted, watch } from "vue";
44
import { Layout } from 'vuepress-theme-plume/client'
55
import { isMobileDevice } from "../utils/env";
66
import Backlink from "../plugins/BiGraph/client/components/Backlink.vue";
77
import LocalGraph from "../plugins/BiGraph/client/components/LocalGraphView.vue";
88
import GlobalGraph from "../plugins/BiGraph/client/components/GlobalGraphView.vue";
99
import AuthorLink from "../plugins/vuepress-plugin-sillot-author/components/AuthorLink.vue";
10-
import SiteSettings from "../plugins/vuepress-plugin-sillot-site-settings/components/SiteSettings.vue";
1110
import mSiteSettings from "../plugins/vuepress-plugin-sillot-site-settings/components/mSiteSettings.vue";
11+
import NSiteSettings from "../plugins/vuepress-plugin-sillot-site-settings/components/NSiteSettings.vue";
1212
// https://theme-plume.vuejs.press/guide/api/client/#usedarkmode
1313
import { useDarkMode } from "vuepress-theme-plume/composables";
1414
// <n-config-provider :theme="isDark ? darkTheme : lightTheme"> 包裹 vuepress-theme-plume/client 的 <Layout>
1515
import { darkTheme, lightTheme } from 'naive-ui'
16+
import { useDeviceDetection } from "../plugins/vuepress-plugin-sillot-site-settings/composables/useDeviceDetection";
1617
const isDark = useDarkMode();
1718
const updateDarkMode = () => {
1819
if (isDark.value) {
@@ -23,6 +24,12 @@ const updateDarkMode = () => {
2324
document.documentElement.removeAttribute("theme-mode");
2425
}
2526
};
27+
const { isMobile, componentKey } = useDeviceDetection()
28+
29+
const currentComponent = computed(() =>
30+
isMobile.value ? mSiteSettings : NSiteSettings
31+
)
32+
2633
watch(isDark, (newValue) => {
2734
updateDarkMode();
2835
});
@@ -41,22 +48,25 @@ const options = computed(() => {
4148

4249
<template>
4350
<n-config-provider :theme="isDark ? darkTheme : lightTheme">
44-
<global-graph v-if="options.enableGlobalGraph"></global-graph>
45-
<Layout>
46-
<template #doc-footer-before>
47-
<backlink></backlink>
48-
</template>
49-
<template #nav-bar-content-after>
50-
<mSiteSettings v-if="isMobileDevice()" />
51-
<SiteSettings v-if="!isMobileDevice()" />
52-
</template>
53-
<template #aside-outline-before>
54-
<local-graph v-if="options.enableLocalGraph"></local-graph>
55-
</template>
56-
<template #doc-meta-bottom>
57-
<AuthorLink></AuthorLink>
58-
</template>
59-
</Layout>
51+
<n-message-provider>
52+
<global-graph v-if="options.enableGlobalGraph"></global-graph>
53+
<Layout>
54+
<template #doc-footer-before>
55+
<backlink></backlink>
56+
</template>
57+
<template #nav-bar-content-after>
58+
<ClientOnly>
59+
<component :is="currentComponent" :key="componentKey" />
60+
</ClientOnly>
61+
</template>
62+
<template #aside-outline-before>
63+
<local-graph v-if="options.enableLocalGraph"></local-graph>
64+
</template>
65+
<template #doc-meta-bottom>
66+
<AuthorLink></AuthorLink>
67+
</template>
68+
</Layout>
69+
</n-message-provider>
6070
</n-config-provider>
6171
</template>
6272

0 commit comments

Comments
 (0)