Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

chore: cleanup layouts codes #107

Merged
merged 5 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/hooks/src/config/useAppConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useClipboard, _omit } from '@vben/utils'
export const useAppConfig = () => {
const useAppConfigStore = appConfigStore()
const appConfigOptions = storeToRefs(useAppConfigStore)
const { openSettingDrawer, sidebar, menu, isMixSidebar, isSidebar, header } =
const { openSettingDrawer, sidebar, menu, isMixSidebar, isSidebar } =
appConfigOptions

const setAppConfig = (configs: DeepPartial<DefineAppConfigOptions>) => {
Expand Down Expand Up @@ -80,7 +80,6 @@ function handlerResults(
value: any,
configOptions: DefineAppConfigOptions,
): DeepPartial<DefineAppConfigOptions> {
console.log(event, value)
const { themeColor, theme, sidebar, header } = configOptions
switch (event) {
case HandlerSettingEnum.CHANGE_LAYOUT:
Expand Down
2 changes: 1 addition & 1 deletion packages/layouts/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { default as Layout } from './src/index.vue'
export { initLayout } from './bridge'
export { default as DarkModeToggle } from './src/components/setting/components/DarkModeToggle.vue'
export { DarkModeToggle } from './src/components/setting'
37 changes: 0 additions & 37 deletions packages/layouts/src/components/aside.vue

This file was deleted.

11 changes: 6 additions & 5 deletions packages/layouts/src/components/breadcrumb/index.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<script lang="ts" setup>
import { RouteLocationMatched, useRouter } from 'vue-router'
import { h, ref, watchEffect } from 'vue'
import { ref, watchEffect } from 'vue'
import { useI18n } from '@vben/locale'
import { useAppConfig, useGo } from '@vben/hooks'
import { useGo } from '@vben/hooks'
import { filterTree, isString } from '@vben/utils'
import { REDIRECT_NAME } from '@vben/constants'
import { VbenIconify } from '@vben/vbencomponents'
import { Menu } from '@vben/types'
import { renderIcon } from '../index'
import { getMenus, getAllParentPath } from '@vben/router'
import { context } from '../../../bridge'

const { useAppConfig } = context

const { header } = useAppConfig()
// withDefaults(defineProps<{ theme: 'dark' | 'light' }>(), {
// theme: 'light',
// })

const { currentRoute } = useRouter()
const { t } = useI18n()
Expand Down
54 changes: 0 additions & 54 deletions packages/layouts/src/components/container.vue

This file was deleted.

22 changes: 11 additions & 11 deletions packages/layouts/src/components/feature/index.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<script lang="ts" setup>
import { SettingButtonPosition } from '../setting'
import {context} from '../../../bridge'
import {computed, unref} from "vue";
import { context } from '../../../bridge'
import { computed, unref } from 'vue'
import { SettingButtonPositionEnum } from '@vben/constants'


const { useRootSetting, useHeaderSetting } = context;
const { getShowSettingButton, getSettingButtonPosition, getFullContent } = useRootSetting();
const { getShowHeader } = useHeaderSetting();
const { useRootSetting, useHeaderSetting } = context
const { getShowSettingButton, getSettingButtonPosition, getFullContent } =
useRootSetting()
const { getShowHeader } = useHeaderSetting()
const getIsFixedSettingDrawer = computed(() => {
if (!unref(getShowSettingButton)) {
return false;
return false
}
const settingButtonPosition = unref(getSettingButtonPosition);
const settingButtonPosition = unref(getSettingButtonPosition)

if (settingButtonPosition === SettingButtonPositionEnum.AUTO) {
return !unref(getShowHeader) || unref(getFullContent);
return !unref(getShowHeader) || unref(getFullContent)
}
return settingButtonPosition === SettingButtonPositionEnum.FIXED;
});
return settingButtonPosition === SettingButtonPositionEnum.FIXED
})
</script>
<template>
<SettingButtonPosition v-if="getIsFixedSettingDrawer" />
Expand Down
25 changes: 8 additions & 17 deletions packages/layouts/src/components/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,26 @@ import { SettingButton } from '../components/setting'
import UserDropdown from '../components/user-dropdown/index.vue'
import { context } from '../../bridge'
import { computed, unref } from 'vue'
import {
SettingButtonPositionEnum,
ThemeEnum,
NavBarModeEnum,
} from '@vben/constants'
import {
useAppConfig,
useMenuSetting,
useHeaderSetting,
useRootSetting,
useAppTheme,
} from '@vben/hooks'
import { SettingButtonPositionEnum, NavBarModeEnum } from '@vben/constants'
import { useAppTheme } from '@vben/hooks'

const { isMixSidebar, isTopMenu, isMix, sidebar, menu, header } = useAppConfig()
const { useAppConfig, useMenuSetting, useHeaderSetting, useRootSetting } =
context

const { useConfigStore, Logo, useAppInject, useMultipleTabSetting } = context
const { isTopMenu, isMix, menu } = useAppConfig()

const { Logo, useAppInject, useMultipleTabSetting } = context
const {
getShowBread,
getShowFullScreen,
getShowLocalePicker,
getShowSearch,
getShowHeader,
getShowNotice,
getShowFullHeaderRef,
getShowHeaderLogo,
} = useHeaderSetting()
const { isDark } = useAppTheme()
const { getSettingButtonPosition, getShowSettingButton } = useRootSetting()
const { getMenuType, getMenuWidth, getIsTopMenu } = useMenuSetting()
const { getMenuType, getMenuWidth } = useMenuSetting()
const { getIsMobile } = useAppInject()
const { getShowMultipleTab } = useMultipleTabSetting()
const getShowSetting = computed(() => {
Expand Down
10 changes: 5 additions & 5 deletions packages/layouts/src/components/menu/index.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script lang="ts" setup>
import { ref, h, onMounted, unref, nextTick, computed } from 'vue'
import { createNamespace, mapTree } from '@vben/utils'
import { context } from '../../../bridge'
import {
RouteLocationNormalizedLoaded,
RouterLink,
Expand All @@ -10,12 +9,13 @@ import {
import { useI18n } from '@vben/locale'
import { REDIRECT_NAME } from '@vben/constants'
import { renderIcon } from '../index'
const { Logo, useMenuSetting, useAppInject } = context
import { context } from '../../../bridge'

const { Logo, useAppInject, useAppConfig } = context
import { getMenus, listenerRouteChange } from '@vben/router'
import { useAppConfig } from '@vben/hooks'
// const { getAccordion } = useMenuSetting()
// const { getMenuShowLogo } = useMenuSetting()

const { getIsMobile } = useAppInject()

const { menu, isMixSidebar, getCollapsedShowTitle, sidebar, isSidebar } =
useAppConfig()
const showSidebarLogo = computed(() => {
Expand Down
2 changes: 0 additions & 2 deletions packages/layouts/src/components/search/AppSearchFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ const { t } = useI18n()
</div>
</template>
<style lang="less" scoped>
// @prefix-cls: ~'@{namespace}-app-search-footer';

.vben-app-search-footer {
position: relative;
display: flex;
Expand Down
2 changes: 0 additions & 2 deletions packages/layouts/src/components/search/AppSearchModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ function handleClose() {
</template>

<style lang="less" scoped>
// @prefix-cls: ~'@{namespace}-app-search-modal';
// @footer-prefix-cls: ~'@{namespace}-app-search-footer';
.vben-app-search-modal {
position: fixed;
top: 0;
Expand Down
4 changes: 0 additions & 4 deletions packages/layouts/src/components/search/useMenuSearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ export interface SearchResult {
icon?: string
}

// interface ChangeEvent extends Event {
// target: HTMLInputElement
// }

// Translate special characters
function transform(c: string) {
const code: string[] = [
Expand Down
Loading