diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index 41584c6..a802d46 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -3,6 +3,7 @@ import type { Slots } from 'vue' import { getSlot } from '@/utils/tsxHelper' import { PlaceholderMoel } from './types' import { FormSchema } from '@/types/form' +import { ColProps } from '@/types/components' const { t } = useI18n() diff --git a/src/components/Infotip/src/Infotip.vue b/src/components/Infotip/src/Infotip.vue index ca92f1e..3d88fe9 100644 --- a/src/components/Infotip/src/Infotip.vue +++ b/src/components/Infotip/src/Infotip.vue @@ -3,7 +3,7 @@ import { PropType } from 'vue' import { Highlight } from '@/components/Highlight' import { useDesign } from '@/hooks/web/useDesign' import { propTypes } from '@/utils/propTypes' -import { TipSchema } from '@/types/infoTip'; +import { TipSchema } from '@/types/infoTip' const { getPrefixCls } = useDesign() diff --git a/src/components/Menu/src/Menu.vue b/src/components/Menu/src/Menu.vue index 9fc7996..24d7f19 100644 --- a/src/components/Menu/src/Menu.vue +++ b/src/components/Menu/src/Menu.vue @@ -3,11 +3,11 @@ import { computed, defineComponent, unref, PropType } from 'vue' import { ElMenu, ElScrollbar } from 'element-plus' import { useAppStore } from '@/store/modules/app' import { usePermissionStore } from '@/store/modules/permission' -import type { LayoutType } from '@/config/app' import { useRenderMenuItem } from './components/useRenderMenuItem' import { useRouter } from 'vue-router' import { isUrl } from '@/utils/is' import { useDesign } from '@/hooks/web/useDesign' +import { LayoutType } from '@/types/layout' const { getPrefixCls } = useDesign() diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 0ba2e1c..27ae3b6 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -4,27 +4,11 @@ import { setCssVar, humpToUnderline } from '@/utils' import { ElMessage } from 'element-plus' import { ElementPlusSize } from '@/types/elementPlus' import { useCache } from '@/hooks/web/useCache' +import { LayoutType } from '@/types/layout' +import { ThemeTypes } from '@/types/theme' const { wsCache } = useCache() -type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu' - -type ThemeTypes = { - elColorPrimary?: string - leftMenuBorderColor?: string - leftMenuBgColor?: string - leftMenuBgLightColor?: string - leftMenuBgActiveColor?: string - leftMenuCollapseBgActiveColor?: string - leftMenuTextColor?: string - leftMenuTextActiveColor?: string - logoTitleTextColor?: string - logoBorderColor?: string - topHeaderBgColor?: string - topHeaderTextColor?: string - topHeaderHoverColor?: string - topToolBorderColor?: string -} interface AppState { breadcrumb: boolean breadcrumbIcon: boolean diff --git a/src/types/layout.d.ts b/src/types/layout.d.ts new file mode 100644 index 0000000..c7ac4c2 --- /dev/null +++ b/src/types/layout.d.ts @@ -0,0 +1 @@ +export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu' \ No newline at end of file diff --git a/src/types/theme.d.ts b/src/types/theme.d.ts new file mode 100644 index 0000000..879b895 --- /dev/null +++ b/src/types/theme.d.ts @@ -0,0 +1,16 @@ +export type ThemeTypes = { + elColorPrimary?: string + leftMenuBorderColor?: string + leftMenuBgColor?: string + leftMenuBgLightColor?: string + leftMenuBgActiveColor?: string + leftMenuCollapseBgActiveColor?: string + leftMenuTextColor?: string + leftMenuTextActiveColor?: string + logoTitleTextColor?: string + logoBorderColor?: string + topHeaderBgColor?: string + topHeaderTextColor?: string + topHeaderHoverColor?: string + topToolBorderColor?: string + } \ No newline at end of file