Commit 2b6fcc138c11a58cc48e00ae66f58d87f9dd0852
1 parent
88603ab8
refactor: 将 layout 组件移动到 layout 目录下
Showing
42 changed files
with
18 additions
and
18 deletions
yudao-ui-admin-vue3/src/layout/Layout.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | import { computed, defineComponent, unref } from 'vue' | 2 | import { computed, defineComponent, unref } from 'vue' |
| 3 | import { useAppStore } from '@/store/modules/app' | 3 | import { useAppStore } from '@/store/modules/app' |
| 4 | import { Backtop } from '@/components/Backtop' | 4 | import { Backtop } from '@/components/Backtop' |
| 5 | -import { Setting } from '@/components/Setting' | 5 | +import { Setting } from '@/layout/components/Setting' |
| 6 | import { useRenderLayout } from './components/useRenderLayout' | 6 | import { useRenderLayout } from './components/useRenderLayout' |
| 7 | import { useDesign } from '@/hooks/web/useDesign' | 7 | import { useDesign } from '@/hooks/web/useDesign' |
| 8 | 8 |
yudao-ui-admin-vue3/src/layout/components/AppView.vue
| 1 | <script setup lang="ts"> | 1 | <script setup lang="ts"> |
| 2 | import { useTagsViewStore } from '@/store/modules/tagsView' | 2 | import { useTagsViewStore } from '@/store/modules/tagsView' |
| 3 | import { useAppStore } from '@/store/modules/app' | 3 | import { useAppStore } from '@/store/modules/app' |
| 4 | -import { Footer } from '@/components/Footer' | 4 | +import { Footer } from '@/layout/components/Footer' |
| 5 | import { computed } from 'vue' | 5 | import { computed } from 'vue' |
| 6 | 6 | ||
| 7 | const appStore = useAppStore() | 7 | const appStore = useAppStore() |
yudao-ui-admin-vue3/src/components/Breadcrumb/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/index.ts
yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue renamed to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/Breadcrumb.vue
yudao-ui-admin-vue3/src/components/Breadcrumb/src/helper.ts renamed to yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/helper.ts
yudao-ui-admin-vue3/src/components/Collapse/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Collapse/index.ts
yudao-ui-admin-vue3/src/components/Collapse/src/Collapse.vue renamed to yudao-ui-admin-vue3/src/layout/components/Collapse/src/Collapse.vue
yudao-ui-admin-vue3/src/components/ContextMenu/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/ContextMenu/index.ts
yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue renamed to yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue
yudao-ui-admin-vue3/src/components/Footer/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Footer/index.ts
yudao-ui-admin-vue3/src/components/Footer/src/Footer.vue renamed to yudao-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue
yudao-ui-admin-vue3/src/components/LocaleDropdown/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/index.ts
yudao-ui-admin-vue3/src/components/LocaleDropdown/src/LocaleDropdown.vue renamed to yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
yudao-ui-admin-vue3/src/components/Logo/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Logo/index.ts
yudao-ui-admin-vue3/src/components/Logo/src/Logo.vue renamed to yudao-ui-admin-vue3/src/layout/components/Logo/src/Logo.vue
yudao-ui-admin-vue3/src/components/Menu/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Menu/index.ts
yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue renamed to yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuItem.tsx renamed to yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuTitle.tsx renamed to yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
yudao-ui-admin-vue3/src/components/Menu/src/helper.ts renamed to yudao-ui-admin-vue3/src/layout/components/Menu/src/helper.ts
yudao-ui-admin-vue3/src/components/Screenfull/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Screenfull/index.ts
yudao-ui-admin-vue3/src/components/Screenfull/src/Screenfull.vue renamed to yudao-ui-admin-vue3/src/layout/components/Screenfull/src/Screenfull.vue
yudao-ui-admin-vue3/src/components/Setting/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/Setting/index.ts
yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue renamed to yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue
| @@ -9,7 +9,7 @@ import { useDesign } from '@/hooks/web/useDesign' | @@ -9,7 +9,7 @@ import { useDesign } from '@/hooks/web/useDesign' | ||
| 9 | import { trim, setCssVar } from '@/utils' | 9 | import { trim, setCssVar } from '@/utils' |
| 10 | import { colorIsDark, lighten, hexToRGB } from '@/utils/color' | 10 | import { colorIsDark, lighten, hexToRGB } from '@/utils/color' |
| 11 | import { useAppStore } from '@/store/modules/app' | 11 | import { useAppStore } from '@/store/modules/app' |
| 12 | -import { ThemeSwitch } from '@/components/ThemeSwitch' | 12 | +import { ThemeSwitch } from '@/layout/components/ThemeSwitch' |
| 13 | import ColorRadioPicker from './components/ColorRadioPicker.vue' | 13 | import ColorRadioPicker from './components/ColorRadioPicker.vue' |
| 14 | import InterfaceDisplay from './components/InterfaceDisplay.vue' | 14 | import InterfaceDisplay from './components/InterfaceDisplay.vue' |
| 15 | import LayoutRadioPicker from './components/LayoutRadioPicker.vue' | 15 | import LayoutRadioPicker from './components/LayoutRadioPicker.vue' |
yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue renamed to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/ColorRadioPicker.vue
yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue renamed to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/InterfaceDisplay.vue
yudao-ui-admin-vue3/src/components/Setting/src/components/LayoutRadioPicker.vue renamed to yudao-ui-admin-vue3/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
yudao-ui-admin-vue3/src/components/SizeDropdown/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/SizeDropdown/index.ts
yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue renamed to yudao-ui-admin-vue3/src/layout/components/SizeDropdown/src/SizeDropdown.vue
yudao-ui-admin-vue3/src/components/TabMenu/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/TabMenu/index.ts
yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue renamed to yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue
| @@ -5,7 +5,7 @@ import { computed, unref, defineComponent, watch, ref, onMounted } from 'vue' | @@ -5,7 +5,7 @@ import { computed, unref, defineComponent, watch, ref, onMounted } from 'vue' | ||
| 5 | import { useI18n } from '@/hooks/web/useI18n' | 5 | import { useI18n } from '@/hooks/web/useI18n' |
| 6 | import { ElScrollbar } from 'element-plus' | 6 | import { ElScrollbar } from 'element-plus' |
| 7 | import { Icon } from '@/components/Icon' | 7 | import { Icon } from '@/components/Icon' |
| 8 | -import { Menu } from '@/components/Menu' | 8 | +import { Menu } from '@/layout/components/Menu' |
| 9 | import { useRouter } from 'vue-router' | 9 | import { useRouter } from 'vue-router' |
| 10 | import { pathResolve } from '@/utils/routerHelper' | 10 | import { pathResolve } from '@/utils/routerHelper' |
| 11 | import { cloneDeep } from 'lodash-es' | 11 | import { cloneDeep } from 'lodash-es' |
yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts renamed to yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts
| 1 | -import { getAllParentPath } from '@/components/Menu/src/helper' | 1 | +import { getAllParentPath } from '@/layout/components/Menu/src/helper' |
| 2 | import type { RouteMeta } from 'vue-router' | 2 | import type { RouteMeta } from 'vue-router' |
| 3 | import { isUrl } from '@/utils/is' | 3 | import { isUrl } from '@/utils/is' |
| 4 | import { cloneDeep } from 'lodash-es' | 4 | import { cloneDeep } from 'lodash-es' |
yudao-ui-admin-vue3/src/components/TagsView/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/TagsView/index.ts
yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue renamed to yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue
| @@ -7,7 +7,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView' | @@ -7,7 +7,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView' | ||
| 7 | import { useAppStore } from '@/store/modules/app' | 7 | import { useAppStore } from '@/store/modules/app' |
| 8 | import { useI18n } from '@/hooks/web/useI18n' | 8 | import { useI18n } from '@/hooks/web/useI18n' |
| 9 | import { filterAffixTags } from './helper' | 9 | import { filterAffixTags } from './helper' |
| 10 | -import { ContextMenu, ContextMenuExpose } from '@/components/ContextMenu' | 10 | +import { ContextMenu, ContextMenuExpose } from '@/layout/components/ContextMenu' |
| 11 | import { useDesign } from '@/hooks/web/useDesign' | 11 | import { useDesign } from '@/hooks/web/useDesign' |
| 12 | import { useTemplateRefsList } from '@vueuse/core' | 12 | import { useTemplateRefsList } from '@vueuse/core' |
| 13 | import { ElScrollbar } from 'element-plus' | 13 | import { ElScrollbar } from 'element-plus' |
yudao-ui-admin-vue3/src/components/TagsView/src/helper.ts renamed to yudao-ui-admin-vue3/src/layout/components/TagsView/src/helper.ts
yudao-ui-admin-vue3/src/components/ThemeSwitch/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/index.ts
yudao-ui-admin-vue3/src/components/ThemeSwitch/src/ThemeSwitch.vue renamed to yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue
| 1 | <script lang="tsx"> | 1 | <script lang="tsx"> |
| 2 | import { defineComponent, computed } from 'vue' | 2 | import { defineComponent, computed } from 'vue' |
| 3 | -import { Collapse } from '@/components/Collapse' | ||
| 4 | -import { LocaleDropdown } from '@/components/LocaleDropdown' | ||
| 5 | -import { SizeDropdown } from '@/components/SizeDropdown' | ||
| 6 | -import { UserInfo } from '@/components/UserInfo' | ||
| 7 | -import { Screenfull } from '@/components/Screenfull' | ||
| 8 | -import { Breadcrumb } from '@/components/Breadcrumb' | 3 | +import { Collapse } from '@/layout/components/Collapse' |
| 4 | +import { LocaleDropdown } from '@/layout/components/LocaleDropdown' | ||
| 5 | +import { SizeDropdown } from '@/layout/components/SizeDropdown' | ||
| 6 | +import { UserInfo } from '@/layout/components/UserInfo' | ||
| 7 | +import { Screenfull } from '@/layout/components/Screenfull' | ||
| 8 | +import { Breadcrumb } from '@/layout/components/Breadcrumb' | ||
| 9 | import { useAppStore } from '@/store/modules/app' | 9 | import { useAppStore } from '@/store/modules/app' |
| 10 | import { useDesign } from '@/hooks/web/useDesign' | 10 | import { useDesign } from '@/hooks/web/useDesign' |
| 11 | 11 |
yudao-ui-admin-vue3/src/components/UserInfo/index.ts renamed to yudao-ui-admin-vue3/src/layout/components/UserInfo/index.ts
yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue renamed to yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
| 1 | import { computed } from 'vue' | 1 | import { computed } from 'vue' |
| 2 | import { useAppStore } from '@/store/modules/app' | 2 | import { useAppStore } from '@/store/modules/app' |
| 3 | -import { Menu } from '@/components/Menu' | ||
| 4 | -import { TabMenu } from '@/components/TabMenu' | ||
| 5 | -import { TagsView } from '@/components/TagsView' | ||
| 6 | -import { Logo } from '@/components/Logo' | 3 | +import { Menu } from '@/layout/components/Menu' |
| 4 | +import { TabMenu } from '@/layout/components/TabMenu' | ||
| 5 | +import { TagsView } from '@/layout/components/TagsView' | ||
| 6 | +import { Logo } from '@/layout/components/Logo' | ||
| 7 | import AppView from './AppView.vue' | 7 | import AppView from './AppView.vue' |
| 8 | import ToolHeader from './ToolHeader.vue' | 8 | import ToolHeader from './ToolHeader.vue' |
| 9 | import { ElScrollbar } from 'element-plus' | 9 | import { ElScrollbar } from 'element-plus' |
yudao-ui-admin-vue3/src/views/Login/Login.vue
| @@ -63,8 +63,8 @@ import { underlineToHump } from '@/utils' | @@ -63,8 +63,8 @@ import { underlineToHump } from '@/utils' | ||
| 63 | import { useI18n } from '@/hooks/web/useI18n' | 63 | import { useI18n } from '@/hooks/web/useI18n' |
| 64 | import { useDesign } from '@/hooks/web/useDesign' | 64 | import { useDesign } from '@/hooks/web/useDesign' |
| 65 | import { useAppStore } from '@/store/modules/app' | 65 | import { useAppStore } from '@/store/modules/app' |
| 66 | -import { ThemeSwitch } from '@/components/ThemeSwitch' | ||
| 67 | -import { LocaleDropdown } from '@/components/LocaleDropdown' | 66 | +import { ThemeSwitch } from '@/layout/components/ThemeSwitch' |
| 67 | +import { LocaleDropdown } from '@/layout/components/LocaleDropdown' | ||
| 68 | import { LoginForm, MobileForm, RegisterForm, QrCodeForm } from './components' | 68 | import { LoginForm, MobileForm, RegisterForm, QrCodeForm } from './components' |
| 69 | 69 | ||
| 70 | const { t } = useI18n() | 70 | const { t } = useI18n() |