fix(Table): 修复 Column 的 CellProps 导出类型不对的问题 (#769)

WeBankFinTech · Apr 26, 2024 · 2f60437 · 2f60437
1 parent 9b5142e
commit 2f60437
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/components/date-picker/useCalendar.ts b/components/date-picker/useCalendar.ts
@@ -566,6 +566,11 @@ export function useDay({
     };
 }
 
+export interface QuarterItem {
+    name: string;
+    value: number;
+}
+
 export const useQuarter = (
     props: CalendarProps,
     selectedDates: Ref<DateObj[]>,
@@ -575,11 +580,6 @@ export const useQuarter = (
 ) => {
     const isQuarterSelect = computed(() => props.type === PickerType.quarter);
 
-    interface QuarterItem {
-        name: string;
-        value: number;
-    }
-
     const format = 'yyyy-MM';
 
     const quarterList = [

diff --git a/components/table/column.tsx b/components/table/column.tsx
@@ -21,7 +21,7 @@ import {
     provideKey,
 } from './const';
 
-import type { CellProps } from './components/cell';
+import type { InnerCellProps } from './components/cell';
 import type { ActionType, RowType } from './interface';
 
 export type SortOrderType = 'descend' | 'ascend' | false;
@@ -82,7 +82,7 @@ export const columnProps = {
     fixed: {
         type: [Boolean, String] as PropType<'left' | 'right' | true | false>,
     },
-    formatter: Function as PropType<(data: CellProps) => any>,
+    formatter: Function as PropType<(data: InnerCellProps) => any>,
     resizable: {
         type: Boolean,
         default: false,
@@ -121,8 +121,8 @@ export type ColumnProps = ExtractPublicPropTypes<typeof columnProps>;
 
 export type ColumnChildren = Array<
     ColumnProps & {
-        render?: (data: CellProps) => VNode[];
-        renderHeader?: (data: CellProps) => VNode[];
+        render?: (data: InnerCellProps) => VNode[];
+        renderHeader?: (data: InnerCellProps) => VNode[];
         children?: ColumnChildren;
     }
 >;

diff --git a/components/table/components/cell.tsx b/components/table/components/cell.tsx
@@ -38,7 +38,7 @@ const cellProps = {
     ] as PropType<any>,
 } as const satisfies ComponentObjectPropsOptions;
 
-export type CellProps = Partial<ExtractPropTypes<typeof cellProps>>;
+export type InnerCellProps = ExtractPropTypes<typeof cellProps>;
 
 export default defineComponent({
     name: 'FTableCell',