Browse Source

refactor: 将 layout 组件移动到 layout 目录下

xingyu4j 2 years ago
parent
commit
2b6fcc138c
42 changed files with 18 additions and 18 deletions
  1. 1 1
      yudao-ui-admin-vue3/src/layout/Layout.vue
  2. 1 1
      yudao-ui-admin-vue3/src/layout/components/AppView.vue
  3. 0 0
      yudao-ui-admin-vue3/src/layout/components/Breadcrumb/index.ts
  4. 0 0
      yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/Breadcrumb.vue
  5. 0 0
      yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/helper.ts
  6. 0 0
      yudao-ui-admin-vue3/src/layout/components/Collapse/index.ts
  7. 0 0
      yudao-ui-admin-vue3/src/layout/components/Collapse/src/Collapse.vue
  8. 0 0
      yudao-ui-admin-vue3/src/layout/components/ContextMenu/index.ts
  9. 0 0
      yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue
  10. 0 0
      yudao-ui-admin-vue3/src/layout/components/Footer/index.ts
  11. 0 0
      yudao-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue
  12. 0 0
      yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/index.ts
  13. 0 0
      yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
  14. 0 0
      yudao-ui-admin-vue3/src/layout/components/Logo/index.ts
  15. 0 0
      yudao-ui-admin-vue3/src/layout/components/Logo/src/Logo.vue
  16. 0 0
      yudao-ui-admin-vue3/src/layout/components/Menu/index.ts
  17. 0 0
      yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
  18. 0 0
      yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuItem.tsx
  19. 0 0
      yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx
  20. 0 0
      yudao-ui-admin-vue3/src/layout/components/Menu/src/helper.ts
  21. 0 0
      yudao-ui-admin-vue3/src/layout/components/Screenfull/index.ts
  22. 0 0
      yudao-ui-admin-vue3/src/layout/components/Screenfull/src/Screenfull.vue
  23. 0 0
      yudao-ui-admin-vue3/src/layout/components/Setting/index.ts
  24. 1 1
      yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue
  25. 0 0
      yudao-ui-admin-vue3/src/layout/components/Setting/src/components/ColorRadioPicker.vue
  26. 0 0
      yudao-ui-admin-vue3/src/layout/components/Setting/src/components/InterfaceDisplay.vue
  27. 0 0
      yudao-ui-admin-vue3/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
  28. 0 0
      yudao-ui-admin-vue3/src/layout/components/SizeDropdown/index.ts
  29. 0 0
      yudao-ui-admin-vue3/src/layout/components/SizeDropdown/src/SizeDropdown.vue
  30. 0 0
      yudao-ui-admin-vue3/src/layout/components/TabMenu/index.ts
  31. 1 1
      yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue
  32. 1 1
      yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts
  33. 0 0
      yudao-ui-admin-vue3/src/layout/components/TagsView/index.ts
  34. 1 1
      yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue
  35. 0 0
      yudao-ui-admin-vue3/src/layout/components/TagsView/src/helper.ts
  36. 0 0
      yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/index.ts
  37. 0 0
      yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
  38. 6 6
      yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue
  39. 0 0
      yudao-ui-admin-vue3/src/layout/components/UserInfo/index.ts
  40. 0 0
      yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
  41. 4 4
      yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx
  42. 2 2
      yudao-ui-admin-vue3/src/views/Login/Login.vue

+ 1 - 1
yudao-ui-admin-vue3/src/layout/Layout.vue

@@ -2,7 +2,7 @@
 import { computed, defineComponent, unref } from 'vue'
 import { useAppStore } from '@/store/modules/app'
 import { Backtop } from '@/components/Backtop'
-import { Setting } from '@/components/Setting'
+import { Setting } from '@/layout/components/Setting'
 import { useRenderLayout } from './components/useRenderLayout'
 import { useDesign } from '@/hooks/web/useDesign'
 

+ 1 - 1
yudao-ui-admin-vue3/src/layout/components/AppView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
-import { Footer } from '@/components/Footer'
+import { Footer } from '@/layout/components/Footer'
 import { computed } from 'vue'
 
 const appStore = useAppStore()

+ 0 - 0
yudao-ui-admin-vue3/src/components/Breadcrumb/index.ts → yudao-ui-admin-vue3/src/layout/components/Breadcrumb/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue → yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/Breadcrumb.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Breadcrumb/src/helper.ts → yudao-ui-admin-vue3/src/layout/components/Breadcrumb/src/helper.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Collapse/index.ts → yudao-ui-admin-vue3/src/layout/components/Collapse/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Collapse/src/Collapse.vue → yudao-ui-admin-vue3/src/layout/components/Collapse/src/Collapse.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/ContextMenu/index.ts → yudao-ui-admin-vue3/src/layout/components/ContextMenu/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/ContextMenu/src/ContextMenu.vue → yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Footer/index.ts → yudao-ui-admin-vue3/src/layout/components/Footer/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Footer/src/Footer.vue → yudao-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/LocaleDropdown/index.ts → yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/LocaleDropdown/src/LocaleDropdown.vue → yudao-ui-admin-vue3/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Logo/index.ts → yudao-ui-admin-vue3/src/layout/components/Logo/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Logo/src/Logo.vue → yudao-ui-admin-vue3/src/layout/components/Logo/src/Logo.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Menu/index.ts → yudao-ui-admin-vue3/src/layout/components/Menu/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Menu/src/Menu.vue → yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuItem.tsx → yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuItem.tsx


+ 0 - 0
yudao-ui-admin-vue3/src/components/Menu/src/components/useRenderMenuTitle.tsx → yudao-ui-admin-vue3/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx


+ 0 - 0
yudao-ui-admin-vue3/src/components/Menu/src/helper.ts → yudao-ui-admin-vue3/src/layout/components/Menu/src/helper.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Screenfull/index.ts → yudao-ui-admin-vue3/src/layout/components/Screenfull/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/Screenfull/src/Screenfull.vue → yudao-ui-admin-vue3/src/layout/components/Screenfull/src/Screenfull.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Setting/index.ts → yudao-ui-admin-vue3/src/layout/components/Setting/index.ts


+ 1 - 1
yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue → yudao-ui-admin-vue3/src/layout/components/Setting/src/Setting.vue

@@ -9,7 +9,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { trim, setCssVar } from '@/utils'
 import { colorIsDark, lighten, hexToRGB } from '@/utils/color'
 import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/components/ThemeSwitch'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 import InterfaceDisplay from './components/InterfaceDisplay.vue'
 import LayoutRadioPicker from './components/LayoutRadioPicker.vue'

+ 0 - 0
yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue → yudao-ui-admin-vue3/src/layout/components/Setting/src/components/ColorRadioPicker.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Setting/src/components/InterfaceDisplay.vue → yudao-ui-admin-vue3/src/layout/components/Setting/src/components/InterfaceDisplay.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/Setting/src/components/LayoutRadioPicker.vue → yudao-ui-admin-vue3/src/layout/components/Setting/src/components/LayoutRadioPicker.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/SizeDropdown/index.ts → yudao-ui-admin-vue3/src/layout/components/SizeDropdown/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/SizeDropdown/src/SizeDropdown.vue → yudao-ui-admin-vue3/src/layout/components/SizeDropdown/src/SizeDropdown.vue


+ 0 - 0
yudao-ui-admin-vue3/src/components/TabMenu/index.ts → yudao-ui-admin-vue3/src/layout/components/TabMenu/index.ts


+ 1 - 1
yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue → yudao-ui-admin-vue3/src/layout/components/TabMenu/src/TabMenu.vue

@@ -5,7 +5,7 @@ import { computed, unref, defineComponent, watch, ref, onMounted } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElScrollbar } from 'element-plus'
 import { Icon } from '@/components/Icon'
-import { Menu } from '@/components/Menu'
+import { Menu } from '@/layout/components/Menu'
 import { useRouter } from 'vue-router'
 import { pathResolve } from '@/utils/routerHelper'
 import { cloneDeep } from 'lodash-es'

+ 1 - 1
yudao-ui-admin-vue3/src/components/TabMenu/src/helper.ts → yudao-ui-admin-vue3/src/layout/components/TabMenu/src/helper.ts

@@ -1,4 +1,4 @@
-import { getAllParentPath } from '@/components/Menu/src/helper'
+import { getAllParentPath } from '@/layout/components/Menu/src/helper'
 import type { RouteMeta } from 'vue-router'
 import { isUrl } from '@/utils/is'
 import { cloneDeep } from 'lodash-es'

+ 0 - 0
yudao-ui-admin-vue3/src/components/TagsView/index.ts → yudao-ui-admin-vue3/src/layout/components/TagsView/index.ts


+ 1 - 1
yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue → yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue

@@ -7,7 +7,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
 import { useI18n } from '@/hooks/web/useI18n'
 import { filterAffixTags } from './helper'
-import { ContextMenu, ContextMenuExpose } from '@/components/ContextMenu'
+import { ContextMenu, ContextMenuExpose } from '@/layout/components/ContextMenu'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useTemplateRefsList } from '@vueuse/core'
 import { ElScrollbar } from 'element-plus'

+ 0 - 0
yudao-ui-admin-vue3/src/components/TagsView/src/helper.ts → yudao-ui-admin-vue3/src/layout/components/TagsView/src/helper.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/ThemeSwitch/index.ts → yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/ThemeSwitch/src/ThemeSwitch.vue → yudao-ui-admin-vue3/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue


+ 6 - 6
yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue

@@ -1,11 +1,11 @@
 <script lang="tsx">
 import { defineComponent, computed } from 'vue'
-import { Collapse } from '@/components/Collapse'
-import { LocaleDropdown } from '@/components/LocaleDropdown'
-import { SizeDropdown } from '@/components/SizeDropdown'
-import { UserInfo } from '@/components/UserInfo'
-import { Screenfull } from '@/components/Screenfull'
-import { Breadcrumb } from '@/components/Breadcrumb'
+import { Collapse } from '@/layout/components/Collapse'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+import { SizeDropdown } from '@/layout/components/SizeDropdown'
+import { UserInfo } from '@/layout/components/UserInfo'
+import { Screenfull } from '@/layout/components/Screenfull'
+import { Breadcrumb } from '@/layout/components/Breadcrumb'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 

+ 0 - 0
yudao-ui-admin-vue3/src/components/UserInfo/index.ts → yudao-ui-admin-vue3/src/layout/components/UserInfo/index.ts


+ 0 - 0
yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue → yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue


+ 4 - 4
yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx

@@ -1,9 +1,9 @@
 import { computed } from 'vue'
 import { useAppStore } from '@/store/modules/app'
-import { Menu } from '@/components/Menu'
-import { TabMenu } from '@/components/TabMenu'
-import { TagsView } from '@/components/TagsView'
-import { Logo } from '@/components/Logo'
+import { Menu } from '@/layout/components/Menu'
+import { TabMenu } from '@/layout/components/TabMenu'
+import { TagsView } from '@/layout/components/TagsView'
+import { Logo } from '@/layout/components/Logo'
 import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'

+ 2 - 2
yudao-ui-admin-vue3/src/views/Login/Login.vue

@@ -63,8 +63,8 @@ import { underlineToHump } from '@/utils'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/components/ThemeSwitch'
-import { LocaleDropdown } from '@/components/LocaleDropdown'
+import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
 import { LoginForm, MobileForm, RegisterForm, QrCodeForm } from './components'
 
 const { t } = useI18n()