From 3a72fb8a4beb5d507d6e3a6b965cd60533fcd1d2 Mon Sep 17 00:00:00 2001 From: hujiale <13306077+hujiale9527@user.noreply.gitee.com> Date: Fri, 11 Oct 2024 19:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AE=BE=E7=BD=AE=E3=80=81?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=AE=BE=E7=BD=AE=E3=80=81=E6=B7=B1=E8=89=B2?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E3=80=81=E7=A3=81=E8=B4=B4?= =?UTF-8?q?=E5=B0=8Fdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layouts/basic/header/header.vue | 166 +++++++++++-- .../layouts/global-search/global-search.vue | 2 +- apps/web-test/src/layouts/user/builtin.vue | 141 +++++++++++ .../layouts/user/icons/content-compact.vue | 119 +++++++++ .../src/layouts/user/icons/full-content.vue | 50 ++++ .../src/layouts/user/icons/header-nav.vue | 119 +++++++++ apps/web-test/src/layouts/user/icons/index.ts | 10 + .../src/layouts/user/icons/mixed-nav.vue | 161 ++++++++++++ .../src/layouts/user/icons/setting.vue | 12 + .../layouts/user/icons/sidebar-mixed-nav.vue | 173 +++++++++++++ .../src/layouts/user/icons/sidebar-nav.vue | 153 ++++++++++++ apps/web-test/src/layouts/user/layout.vue | 101 ++++++++ apps/web-test/src/layouts/user/like.vue | 146 +++++++++-- apps/web-test/src/layouts/user/theme.vue | 69 ++++++ apps/web-test/src/preferences.ts | 2 +- .../src/router/routes/modules/dashboard.ts | 1 + .../home/components/Output1/index.vue | 17 +- .../home/components/Output2/index.vue | 17 +- .../home/components/Output3/index.vue | 17 +- .../home/components/Output4/index.vue | 18 ++ .../src/views/dashboard/home/index.vue | 87 ++++--- .../src/views/dashboard/home/main.vue | 234 ++++++++++++++++++ 22 files changed, 1748 insertions(+), 67 deletions(-) create mode 100644 apps/web-test/src/layouts/user/builtin.vue create mode 100644 apps/web-test/src/layouts/user/icons/content-compact.vue create mode 100644 apps/web-test/src/layouts/user/icons/full-content.vue create mode 100644 apps/web-test/src/layouts/user/icons/header-nav.vue create mode 100644 apps/web-test/src/layouts/user/icons/index.ts create mode 100644 apps/web-test/src/layouts/user/icons/mixed-nav.vue create mode 100644 apps/web-test/src/layouts/user/icons/setting.vue create mode 100644 apps/web-test/src/layouts/user/icons/sidebar-mixed-nav.vue create mode 100644 apps/web-test/src/layouts/user/icons/sidebar-nav.vue create mode 100644 apps/web-test/src/layouts/user/layout.vue create mode 100644 apps/web-test/src/layouts/user/theme.vue create mode 100644 apps/web-test/src/views/dashboard/home/components/Output4/index.vue create mode 100644 apps/web-test/src/views/dashboard/home/main.vue diff --git a/apps/web-test/src/layouts/basic/header/header.vue b/apps/web-test/src/layouts/basic/header/header.vue index 6324fae5..4923d4dd 100644 --- a/apps/web-test/src/layouts/basic/header/header.vue +++ b/apps/web-test/src/layouts/basic/header/header.vue @@ -1,9 +1,10 @@ + \ No newline at end of file diff --git a/apps/web-test/src/layouts/global-search/global-search.vue b/apps/web-test/src/layouts/global-search/global-search.vue index 36e2bdc2..36c9d11d 100644 --- a/apps/web-test/src/layouts/global-search/global-search.vue +++ b/apps/web-test/src/layouts/global-search/global-search.vue @@ -137,7 +137,7 @@ const {sidebarCollapsed } = usePreferences(); -
+
diff --git a/apps/web-test/src/layouts/user/builtin.vue b/apps/web-test/src/layouts/user/builtin.vue new file mode 100644 index 00000000..54725a64 --- /dev/null +++ b/apps/web-test/src/layouts/user/builtin.vue @@ -0,0 +1,141 @@ + + + diff --git a/apps/web-test/src/layouts/user/icons/content-compact.vue b/apps/web-test/src/layouts/user/icons/content-compact.vue new file mode 100644 index 00000000..a1bcefdc --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/content-compact.vue @@ -0,0 +1,119 @@ + diff --git a/apps/web-test/src/layouts/user/icons/full-content.vue b/apps/web-test/src/layouts/user/icons/full-content.vue new file mode 100644 index 00000000..5cbcaca8 --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/full-content.vue @@ -0,0 +1,50 @@ + diff --git a/apps/web-test/src/layouts/user/icons/header-nav.vue b/apps/web-test/src/layouts/user/icons/header-nav.vue new file mode 100644 index 00000000..18158b3a --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/header-nav.vue @@ -0,0 +1,119 @@ + diff --git a/apps/web-test/src/layouts/user/icons/index.ts b/apps/web-test/src/layouts/user/icons/index.ts new file mode 100644 index 00000000..c0c5a28e --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/index.ts @@ -0,0 +1,10 @@ +import HeaderNav from './header-nav.vue'; + +export { default as ContentCompact } from './content-compact.vue'; +export { default as FullContent } from './full-content.vue'; +export { default as MixedNav } from './mixed-nav.vue'; +export { default as SidebarMixedNav } from './sidebar-mixed-nav.vue'; +export { default as SidebarNav } from './sidebar-nav.vue'; + +const ContentWide = HeaderNav; +export { ContentWide, HeaderNav }; diff --git a/apps/web-test/src/layouts/user/icons/mixed-nav.vue b/apps/web-test/src/layouts/user/icons/mixed-nav.vue new file mode 100644 index 00000000..d194383f --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/mixed-nav.vue @@ -0,0 +1,161 @@ + diff --git a/apps/web-test/src/layouts/user/icons/setting.vue b/apps/web-test/src/layouts/user/icons/setting.vue new file mode 100644 index 00000000..d824e11f --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/setting.vue @@ -0,0 +1,12 @@ + diff --git a/apps/web-test/src/layouts/user/icons/sidebar-mixed-nav.vue b/apps/web-test/src/layouts/user/icons/sidebar-mixed-nav.vue new file mode 100644 index 00000000..8fc0ba40 --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/sidebar-mixed-nav.vue @@ -0,0 +1,173 @@ + diff --git a/apps/web-test/src/layouts/user/icons/sidebar-nav.vue b/apps/web-test/src/layouts/user/icons/sidebar-nav.vue new file mode 100644 index 00000000..83ff3998 --- /dev/null +++ b/apps/web-test/src/layouts/user/icons/sidebar-nav.vue @@ -0,0 +1,153 @@ + diff --git a/apps/web-test/src/layouts/user/layout.vue b/apps/web-test/src/layouts/user/layout.vue new file mode 100644 index 00000000..a790d025 --- /dev/null +++ b/apps/web-test/src/layouts/user/layout.vue @@ -0,0 +1,101 @@ + + + diff --git a/apps/web-test/src/layouts/user/like.vue b/apps/web-test/src/layouts/user/like.vue index cd9d67a9..505c49b2 100644 --- a/apps/web-test/src/layouts/user/like.vue +++ b/apps/web-test/src/layouts/user/like.vue @@ -1,32 +1,142 @@ + + diff --git a/apps/web-test/src/preferences.ts b/apps/web-test/src/preferences.ts index c2afd368..1f86698c 100644 --- a/apps/web-test/src/preferences.ts +++ b/apps/web-test/src/preferences.ts @@ -21,7 +21,7 @@ export const overridesPreferences = defineOverridesPreferences({ // 检查更新的时间间隔,单位为分钟 checkUpdatesInterval: 1, // 开启布局设置按钮 - enablePreferences: true, + enablePreferences: false, enableRefreshToken: false, isMobile: false, layout: 'sidebar-topbar', diff --git a/apps/web-test/src/router/routes/modules/dashboard.ts b/apps/web-test/src/router/routes/modules/dashboard.ts index f9f371a0..f74cf7eb 100644 --- a/apps/web-test/src/router/routes/modules/dashboard.ts +++ b/apps/web-test/src/router/routes/modules/dashboard.ts @@ -64,6 +64,7 @@ const routes: RouteRecordRaw[] = [ { name: 'home', path: '/home', + // component: () => import('#/views/dashboard/home/index.vue'), component: () => import('#/views/dashboard/home/index.vue'), meta: { hideInMenu: true, diff --git a/apps/web-test/src/views/dashboard/home/components/Output1/index.vue b/apps/web-test/src/views/dashboard/home/components/Output1/index.vue index ea9f719e..7de97b66 100644 --- a/apps/web-test/src/views/dashboard/home/components/Output1/index.vue +++ b/apps/web-test/src/views/dashboard/home/components/Output1/index.vue @@ -1,3 +1,18 @@ + + \ No newline at end of file diff --git a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue index 93576846..7de97b66 100644 --- a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue +++ b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue @@ -1,3 +1,18 @@ + + \ No newline at end of file diff --git a/apps/web-test/src/views/dashboard/home/components/Output3/index.vue b/apps/web-test/src/views/dashboard/home/components/Output3/index.vue index c9b2c92c..7de97b66 100644 --- a/apps/web-test/src/views/dashboard/home/components/Output3/index.vue +++ b/apps/web-test/src/views/dashboard/home/components/Output3/index.vue @@ -1,3 +1,18 @@ + + \ No newline at end of file diff --git a/apps/web-test/src/views/dashboard/home/components/Output4/index.vue b/apps/web-test/src/views/dashboard/home/components/Output4/index.vue new file mode 100644 index 00000000..7de97b66 --- /dev/null +++ b/apps/web-test/src/views/dashboard/home/components/Output4/index.vue @@ -0,0 +1,18 @@ + + + \ No newline at end of file diff --git a/apps/web-test/src/views/dashboard/home/index.vue b/apps/web-test/src/views/dashboard/home/index.vue index 3ea1069f..7dab6b19 100644 --- a/apps/web-test/src/views/dashboard/home/index.vue +++ b/apps/web-test/src/views/dashboard/home/index.vue @@ -1,5 +1,9 @@ + + \ No newline at end of file