Skip to content

Commit 24c8af9

Browse files
types: 调整类型
1 parent de0cb43 commit 24c8af9

File tree

15 files changed

+32
-26
lines changed

15 files changed

+32
-26
lines changed

src/components/Icon/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import Icon from './src/Icon.vue'
22

3+
export type { IconTypes } from './src/types'
4+
35
export { Icon }
File renamed without changes.

src/components/Infotip/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import Infotip from './src/Infotip.vue'
22

3+
export type { InfoTipSchema } from './src/types'
4+
35
export { Infotip }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export interface TipSchema {
1+
export interface InfoTipSchema {
22
label: string
33
keys?: string[]
44
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import LocaleDropdown from './src/LocaleDropdown.vue'
22

3+
export type { Language, LocaleDropdownType } from './src/types'
4+
35
export { LocaleDropdown }

src/components/Qrcode/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import Qrcode from './src/Qrcode.vue'
22

3+
export type { QrcodeLogo } from './src/types'
4+
35
export { Qrcode }

src/components/Qrcode/src/Qrcode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { cloneDeep } from 'lodash-es'
66
import { propTypes } from '@/utils/propTypes'
77
import { useDesign } from '@/hooks/web/useDesign'
88
import { isString } from '@/utils/is'
9-
import { QrcodeLogo } from '@/types/qrcode'
9+
import { QrcodeLogo } from '@/components/Qrcode'
1010
1111
const props = defineProps({
1212
// img 或者 canvas,img不支持logo嵌套
File renamed without changes.

src/components/Table/src/types.ts renamed to src/components/Table/src/types/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Pagination, TableColumn } from '@/types/table'
22

3-
export type TableProps = {
3+
export interface TableProps {
44
pageSize?: number
55
currentPage?: number
66
// 是否多选
@@ -23,4 +23,5 @@ export type TableProps = {
2323
headerAlign?: 'left' | 'center' | 'right'
2424
data?: Recordable
2525
expand?: boolean
26-
} & Recordable
26+
[key: string]: any
27+
}

src/hooks/web/useIcon.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { h } from 'vue'
22
import type { VNode } from 'vue'
3-
import { Icon } from '@/components/Icon'
4-
import { IconTypes } from '@/types/icon'
3+
import { Icon, IconTypes } from '@/components/Icon'
54

65
export const useIcon = (props: IconTypes): VNode => {
76
return h(Icon, props)

src/store/modules/app.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import { defineStore } from 'pinia'
22
import { store } from '../index'
33
import { setCssVar, humpToUnderline } from '@/utils'
44
import { ElMessage } from 'element-plus'
5-
import { ElementPlusSize } from '@/types/elementPlus'
65
import { useCache } from '@/hooks/web/useCache'
7-
import { LayoutType } from '@/types/layout'
8-
import { ThemeTypes } from '@/types/theme'
96

107
const { wsCache } = useCache()
118

src/store/modules/locale.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { store } from '../index'
33
import zhCn from 'element-plus/es/locale/lang/zh-cn'
44
import en from 'element-plus/es/locale/lang/en'
55
import { useCache } from '@/hooks/web/useCache'
6-
import { LocaleDropdownType } from '@/types/localeDropdown'
6+
import { LocaleDropdownType } from '@/components/LocaleDropdown'
77

88
const { wsCache } = useCache()
99

src/types/theme.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

types/global.d.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,21 @@ declare global {
4545
code: string
4646
data: T extends any ? T : T & any
4747
}
48+
49+
declare interface ThemeTypes {
50+
elColorPrimary?: string
51+
leftMenuBorderColor?: string
52+
leftMenuBgColor?: string
53+
leftMenuBgLightColor?: string
54+
leftMenuBgActiveColor?: string
55+
leftMenuCollapseBgActiveColor?: string
56+
leftMenuTextColor?: string
57+
leftMenuTextActiveColor?: string
58+
logoTitleTextColor?: string
59+
logoBorderColor?: string
60+
topHeaderBgColor?: string
61+
topHeaderTextColor?: string
62+
topHeaderHoverColor?: string
63+
topToolBorderColor?: string
64+
}
4865
}

0 commit comments

Comments
 (0)