From 7dda6e8e07ebcb5e9b192714243c148ebf985a63 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sun, 9 Jan 2022 22:50:29 +0800 Subject: [PATCH] feat: update ts type --- components/list/index.tsx | 24 ++++++++++++------------ components/table/interface.tsx | 3 +++ components/vc-table/interface.ts | 6 +++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/components/list/index.tsx b/components/list/index.tsx index 195b43c28..809d178bd 100644 --- a/components/list/index.tsx +++ b/components/list/index.tsx @@ -23,17 +23,17 @@ export type { ListItemMetaProps } from './ItemMeta'; export type ColumnType = 'gutter' | 'column' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'; -export const ListGridType = { - gutter: PropTypes.oneOfType([PropTypes.number, PropTypes.arrayOf(Number)]), - column: PropTypes.number, - xs: PropTypes.number, - sm: PropTypes.number, - md: PropTypes.number, - lg: PropTypes.number, - xl: PropTypes.number, - xxl: PropTypes.number, - xxxl: PropTypes.number, -}; +export type ColumnCount = number; +export interface ListGridType { + gutter?: number; + column?: ColumnCount; + xs?: ColumnCount; + sm?: ColumnCount; + md?: ColumnCount; + lg?: ColumnCount; + xl?: ColumnCount; + xxl?: ColumnCount; +} export const ListSize = tuple('small', 'default', 'large'); @@ -43,7 +43,7 @@ export const listProps = { bordered: PropTypes.looseBool, dataSource: PropTypes.array, extra: PropTypes.any, - grid: PropTypes.shape(ListGridType).loose, + grid: { type: Object as PropType, default: undefined }, itemLayout: PropTypes.oneOf(tuple('horizontal', 'vertical')), loading: withUndefined(PropTypes.oneOfType([PropTypes.looseBool, PropTypes.object])), loadMore: PropTypes.any, diff --git a/components/table/interface.tsx b/components/table/interface.tsx index eb92b5907..f82b5fb61 100644 --- a/components/table/interface.tsx +++ b/components/table/interface.tsx @@ -12,6 +12,7 @@ import type { Breakpoint } from '../_util/responsiveObserve'; import type { INTERNAL_SELECTION_ITEM } from './hooks/useSelection'; import type { VueNode } from '../_util/type'; import { tuple } from '../_util/type'; +import type { CSSProperties } from 'vue'; // import { TableAction } from './Table'; export type { GetRowKey, ExpandableConfig }; @@ -195,6 +196,8 @@ type TablePaginationPosition = export interface TablePaginationConfig extends PaginationProps { position?: TablePaginationPosition[]; + class?: string; + style?: CSSProperties; } export interface TransformCellTextProps { diff --git a/components/vc-table/interface.ts b/components/vc-table/interface.ts index 27325249d..d60283066 100644 --- a/components/vc-table/interface.ts +++ b/components/vc-table/interface.ts @@ -15,7 +15,7 @@ * - onFilterDropdownVisibleChange */ -import type { CSSProperties, DefineComponent, FunctionalComponent, HTMLAttributes, Ref } from 'vue'; +import type { CSSProperties, HTMLAttributes, Ref } from 'vue'; export type Key = number | string; @@ -139,9 +139,9 @@ export type GetComponentProps = ( column?: ColumnType, ) => Omit & { style?: CSSProperties }; -type Component

= DefineComponent

| FunctionalComponent

| string; +// type Component

= DefineComponent

| FunctionalComponent

| string; -export type CustomizeComponent = Component; +export type CustomizeComponent = any; export type CustomizeScrollBody = ( data: readonly RecordType[],