From 0cfaa40bd0b0d57a040510f00d9568d4d5c9dbc4 Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 23 Nov 2023 12:14:06 +0800 Subject: [PATCH] refactor: layouts use setup (#3312) * refactor: layouts use setup * refactor: dashboard use setup * fix: breadcrumbs types * fix: noticeList type check error * fix: noticeList type check error * chore(Breadcrumb): revert setup change --------- Co-authored-by: invalid w --- .../Application/src/search/AppSearchModal.vue | 1 - src/layouts/default/content/index.vue | 33 +- .../default/content/useContentContext.ts | 2 +- .../default/content/useContentViewHeight.ts | 2 +- src/layouts/default/feature/index.vue | 104 ++-- src/layouts/default/footer/index.vue | 64 +-- src/layouts/default/header/MultipleHeader.vue | 150 +++--- .../default/header/components/Breadcrumb.vue | 2 +- .../header/components/ChangeApi/index.vue | 9 +- .../default/header/components/ErrorAction.vue | 41 +- .../default/header/components/FullScreen.vue | 45 +- .../default/header/components/index.ts | 2 +- .../header/components/lock/LockModal.vue | 103 ++-- .../header/components/notify/NoticeList.vue | 189 +++---- .../header/components/notify/index.vue | 56 +-- .../components/user-dropdown/DropMenuItem.vue | 34 +- .../header/components/user-dropdown/index.vue | 158 +++--- src/layouts/default/index.vue | 77 ++- src/layouts/default/menu/index.vue | 26 +- src/layouts/default/menu/useLayoutMenu.ts | 12 +- src/layouts/default/setting/SettingDrawer.tsx | 28 +- .../setting/components/InputNumberItem.vue | 39 +- .../default/setting/components/SelectItem.vue | 73 ++- .../setting/components/SettingFooter.vue | 111 ++--- .../default/setting/components/SwitchItem.vue | 66 ++- .../setting/components/ThemeColorPicker.vue | 47 +- .../default/setting/components/TypePicker.vue | 45 +- .../default/setting/components/index.ts | 2 +- src/layouts/default/setting/enum.ts | 8 +- src/layouts/default/setting/handler.ts | 12 +- src/layouts/default/setting/index.vue | 18 +- src/layouts/default/sider/DragBar.vue | 56 +-- src/layouts/default/sider/MixSider.vue | 471 ++++++++---------- src/layouts/default/sider/index.vue | 34 +- src/layouts/default/sider/useLayoutSider.ts | 6 +- .../default/tabs/components/FoldButton.vue | 52 +- .../default/tabs/components/SettingButton.vue | 25 +- .../default/tabs/components/TabContent.vue | 83 ++- .../default/tabs/components/TabRedo.vue | 38 +- src/layouts/default/tabs/index.vue | 189 +++---- src/layouts/default/tabs/types.ts | 2 +- src/layouts/default/tabs/useMultipleTabs.ts | 12 +- src/layouts/default/tabs/useTabDropdown.ts | 8 +- src/layouts/default/trigger/HeaderTrigger.vue | 6 +- src/layouts/default/trigger/SiderTrigger.vue | 2 +- src/layouts/default/trigger/index.vue | 2 +- src/layouts/iframe/index.vue | 18 +- src/layouts/iframe/useFrameKeepAlive.ts | 6 +- src/layouts/page/index.vue | 49 +- .../analysis/components/VisitAnalysis.vue | 4 +- .../analysis/components/VisitAnalysisBar.vue | 4 +- .../workbench/components/ProjectCard.vue | 12 +- 52 files changed, 1121 insertions(+), 1517 deletions(-) diff --git a/src/components/Application/src/search/AppSearchModal.vue b/src/components/Application/src/search/AppSearchModal.vue index daccd14f..76cc0c31 100644 --- a/src/components/Application/src/search/AppSearchModal.vue +++ b/src/components/Application/src/search/AppSearchModal.vue @@ -62,7 +62,6 @@ import { SearchOutlined } from '@ant-design/icons-vue'; import AppSearchFooter from './AppSearchFooter.vue'; import Icon from '@/components/Icon/Icon.vue'; - // @ts-ignore import vClickOutside from '@/directives/clickOutside'; import { useDesign } from '@/hooks/web/useDesign'; import { useRefs } from '@vben/hooks'; diff --git a/src/layouts/default/content/index.vue b/src/layouts/default/content/index.vue index 00cad203..87144aaf 100644 --- a/src/layouts/default/content/index.vue +++ b/src/layouts/default/content/index.vue @@ -3,31 +3,20 @@ - diff --git a/src/layouts/default/header/components/ErrorAction.vue b/src/layouts/default/header/components/ErrorAction.vue index 086f2ffd..f865c976 100644 --- a/src/layouts/default/header/components/ErrorAction.vue +++ b/src/layouts/default/header/components/ErrorAction.vue @@ -10,38 +10,27 @@ - diff --git a/src/layouts/default/header/components/FullScreen.vue b/src/layouts/default/header/components/FullScreen.vue index 2e124b5d..6fa5d7d4 100644 --- a/src/layouts/default/header/components/FullScreen.vue +++ b/src/layouts/default/header/components/FullScreen.vue @@ -6,40 +6,29 @@ - diff --git a/src/layouts/default/header/components/index.ts b/src/layouts/default/header/components/index.ts index 09e767e7..6593e58a 100644 --- a/src/layouts/default/header/components/index.ts +++ b/src/layouts/default/header/components/index.ts @@ -1,4 +1,4 @@ -import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; +import { createAsyncComponent } from '@/utils/factory/createAsyncComponent'; import FullScreen from './FullScreen.vue'; export const UserDropDown = createAsyncComponent(() => import('./user-dropdown/index.vue'), { diff --git a/src/layouts/default/header/components/lock/LockModal.vue b/src/layouts/default/header/components/lock/LockModal.vue index 3a17ec65..0920f36c 100644 --- a/src/layouts/default/header/components/lock/LockModal.vue +++ b/src/layouts/default/header/components/lock/LockModal.vue @@ -24,75 +24,60 @@ -