diff --git a/src/components/Layout/BasicLayout.tsx b/src/components/Layout/BasicLayout.tsx index d091510a..18cfcdf2 100644 --- a/src/components/Layout/BasicLayout.tsx +++ b/src/components/Layout/BasicLayout.tsx @@ -7,21 +7,16 @@ import { provide } from 'vue' -import type { DefineComponent, ExtractPropTypes, PropType, CSSProperties, Plugin, App } from 'vue' +import type { ExtractPropTypes, PropType, CSSProperties} from 'vue' import { Layout } from 'ant-design-vue' -import useConfigInject from 'ant-design-vue/es/_util/hooks/useConfigInject' -import { defaultSettingProps, defaultSettings } from './defaultSetting' -import type { PureSettings } from './defaultSetting' +import { defaultSettingProps } from './defaultSetting' import type { BreadcrumbProps, RouteContextProps } from './RouteContext' import type { BreadcrumbRender, CollapsedButtonRender, CustomRender, - FooterRender, - HeaderContentRender, HeaderRender, MenuContentRender, MenuExtraRender, - MenuFooterRender, MenuHeaderRender, MenuItemRender, RightContentRender, diff --git a/src/components/Layout/components/Header/Header.tsx b/src/components/Layout/components/Header/Header.tsx index f3ff3654..8d7de6d7 100644 --- a/src/components/Layout/components/Header/Header.tsx +++ b/src/components/Layout/components/Header/Header.tsx @@ -8,7 +8,6 @@ import { defaultSettingProps } from 'components/Layout/defaultSetting' import PropTypes from 'ant-design-vue/es/_util/vue-types' import { CustomRender, MenuDataItem, ProProps, RightContentRender, WithFalse } from 'components/Layout/typings' import './index.less' -import { omit } from 'lodash-es' import { RouteRecordRaw } from 'vue-router' import { clearMenuItem } from 'components/Layout/utils' diff --git a/src/components/Layout/components/Header/index.tsx b/src/components/Layout/components/Header/index.tsx index ad2a8461..c4bfc014 100644 --- a/src/components/Layout/components/Header/index.tsx +++ b/src/components/Layout/components/Header/index.tsx @@ -1,13 +1,8 @@ -import type { ExtractPropTypes, PropType } from 'vue' -import PropTypes from 'ant-design-vue/es/_util/vue-types'; -import type { MenuDataItem, WithFalse, ProProps, CustomRender, RightContentRender } from '../../typings' -import { siderMenuProps } from '../SiderMenu/SiderMenu' -import { defaultSettingProps } from 'components/Layout/defaultSetting' +import type { ExtractPropTypes } from 'vue' import Header, { headerProps } from './Header' import { useRouteContext } from 'components/Layout/RouteContext' import type { RouteRecordRaw } from 'vue-router' import { clearMenuItem } from 'components/Layout/utils' -import DefaultSetting from '../../../../../config/config' import { Layout } from 'ant-design-vue' export const headerViewProps = { diff --git a/src/components/Layout/components/SiderMenu/SiderMenu.tsx b/src/components/Layout/components/SiderMenu/SiderMenu.tsx index 29587b4a..89496a93 100644 --- a/src/components/Layout/components/SiderMenu/SiderMenu.tsx +++ b/src/components/Layout/components/SiderMenu/SiderMenu.tsx @@ -18,10 +18,6 @@ import './SiderMenu.less' import { computed } from 'vue' import { omit } from 'lodash-es' -export type PrivateSiderMenuProps = { - matchMenuKeys?: string[]; -} - const { Sider } = Layout export const defaultRenderLogo = (logo?: CustomRender, logoStyle?: CSSProperties): CustomRender => { @@ -89,7 +85,6 @@ const SiderMenu: FunctionalComponent = (props, { slots, emit}) = const { collapsed, collapsedWidth = 48, - menuExtraRender = false, menuContentRender = false, collapsedButtonRender = defaultRenderCollapsedButton, } = props; @@ -97,7 +92,6 @@ const SiderMenu: FunctionalComponent = (props, { slots, emit}) = const context = useRouteContext(); const sSideWidth = computed(() => (props.collapsed ? props.collapsedWidth : props.siderWidth)); - const extraDom = menuExtraRender && menuExtraRender(props); const handleSelect = ($event: string[]) => { if (props.onSelect) { diff --git a/src/utils/comm.ts b/src/utils/comm.ts index addc6a11..be44886c 100644 --- a/src/utils/comm.ts +++ b/src/utils/comm.ts @@ -1,7 +1,5 @@ import type { Slots } from 'vue' import { TOKEN_KEY } from '@/utils/variable' -import { Terms } from 'components/Search/types' -import { urlReg } from '@/utils/regular' /** * 静态图片资源处理