@gx-design-vue/pro-table 0.2.0-beta.1 → 0.2.0-beta.100

package/dist/props.d.ts

@@ -1,24 +1,21 @@
-import type { PropType } from 'vue';
-import type { SearchConfig } from './types/TableTypings';
+import type { ExtractPropTypes, PropType } from 'vue';
+import type { ProTableProps, ProTableRowSelection, SearchConfig } from './types/TableTypings';
 export declare const proTableProps: {
     rowSelection: {
-        type: PropType<(import("ant-design-vue/es/table/interface").TableRowSelection<import("./typing").DefaultRecordType> & import("ant-design-vue/es/table/interface").TableRowSelection<any> & {
-            defaultSelectKeys: (string | number)[];
-            defaultSelectRows: any[];
-        }) | undefined>;
+        type: PropType<ProTableRowSelection>;
         default: undefined;
     };
     columns: {
-        type: PropType<import(".").ProColumnsType<import("./typing").DefaultRecordType> | undefined>;
+        type: PropType<ProTableProps["columns"]>;
         default: never[];
     };
     pagination: {
-        type: PropType<((false | import("ant-design-vue/es/table/interface").TablePaginationConfig) & import("./types/TableTypings").ProTablePagination) | undefined>;
+        type: PropType<ProTableProps["pagination"]>;
         default: () => undefined;
     };
     rowKey: {
-        type: PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<import("./typing").DefaultRecordType> & string) | undefined>;
-        default: undefined;
+        type: PropType<string>;
+        default: string;
     };
     /**
      * @Author      gx12358
@@ -27,19 +24,21 @@ export declare const proTableProps: {
      * @description 获取 dataSource 的方法
      */
     request: {
-        type: PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType> | undefined>;
+        type: PropType<ProTableProps["request"]>;
         default: null;
     };
-    virtualScroll: PropType<boolean | undefined>;
-    params: PropType<Record<string, unknown> | undefined>;
-    postData: PropType<((data: any[]) => any) | undefined>;
+    virtualScroll: PropType<ProTableProps["virtualScroll"]>;
+    params: {
+        type: PropType<ProTableProps["params"]>;
+        default: () => {};
+    };
     waitRequest: {
-        type: PropType<boolean | undefined>;
+        type: PropType<ProTableProps["waitRequest"]>;
         default: boolean;
     };
-    polling: PropType<number | undefined>;
+    polling: PropType<ProTableProps["polling"]>;
     debounceTime: {
-        type: PropType<number | undefined>;
+        type: PropType<ProTableProps["debounceTime"]>;
         default: number;
     };
     /**
@@ -49,11 +48,11 @@ export declare const proTableProps: {
      * @description 是否显示搜索表单，传入对象时为搜索表单的配置
      */
     search: {
-        type: PropType<SearchConfig | undefined>;
+        type: PropType<ProTableProps["search"]>;
         default: () => SearchConfig;
     };
     searchMap: {
-        type: PropType<import(".").ProSearchMap<"text">[] | undefined>;
+        type: PropType<ProTableProps["searchMap"]>;
         default: () => never[];
     };
     /**
@@ -63,24 +62,24 @@ export declare const proTableProps: {
      * @description 自定义表格渲染模式：默认表格展示，也可以自定义数据列表展示
      */
     customRender: {
-        type: PropType<import("./types/SlotsTypings").CustomizeRender | undefined>;
+        type: PropType<ProTableProps["customRender"]>;
         default: () => undefined;
     };
-    /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 添加表格class
-     */
-    tableClassName: PropType<string | undefined>;
-    /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 表格样式
-     */
-    tableStyle: {
-        type: PropType<import("vue").CSSProperties | undefined>;
+    emptyText: {
+        type: PropType<ProTableProps["emptyText"]>;
+        default: () => undefined;
+    };
+    showLoading: {
+        type: PropType<ProTableProps["showLoading"]>;
+        default: boolean;
+    };
+    tableProps: {
+        type: PropType<ProTableProps["tableProps"]>;
+        default: () => ProTableProps["tableProps"];
+    };
+    emptyTextProps: {
+        type: PropType<ProTableProps["emptyTextProps"]>;
+        default: () => ProTableProps["emptyTextProps"];
     };
     /**
      * @Author      gx12358
@@ -89,19 +88,19 @@ export declare const proTableProps: {
      * @description 渲染按钮工具栏，支持返回一个 dom 数组，会自动增加 margin-right
      */
     toolBarBtn: {
-        type: PropType<import("./types/SlotsTypings").ToolBarBtnRender>;
+        type: PropType<ProTableProps["toolBarBtn"]>;
         default: () => undefined;
     };
     headerTitle: {
-        type: PropType<import("./types/SlotsTypings").HeaderTitleRender>;
+        type: PropType<ProTableProps["headerTitle"]>;
         default: () => undefined;
     };
     titleTip: {
-        type: PropType<import("./types/SlotsTypings").TitleTipRender>;
+        type: PropType<ProTableProps["titleTip"]>;
         default: () => undefined;
     };
     titleTipText: {
-        type: PropType<string | undefined>;
+        type: PropType<ProTableProps["titleTipText"]>;
         default: string;
     };
     /**
@@ -111,7 +110,7 @@ export declare const proTableProps: {
      * @description table 工具栏，设为 false 时不显示
      */
     options: {
-        type: PropType<boolean | import("./types/TableTypings").OptionConfig | undefined>;
+        type: PropType<ProTableProps["options"]>;
         default: boolean;
     };
     /**
@@ -121,10 +120,10 @@ export declare const proTableProps: {
      * @description 列状态配置，可以配置是否浮动和是否展示
      */
     columnsState: {
-        type: PropType<import("./hooks/useColumnSetting").ColumnsStateType | undefined>;
+        type: PropType<ProTableProps["columnsState"]>;
     };
     optionsExtra: {
-        type: PropType<import("./types/SlotsTypings").OptionsExtraRender>;
+        type: PropType<ProTableProps["optionsExtra"]>;
         default: () => undefined;
     };
     /**
@@ -134,9 +133,13 @@ export declare const proTableProps: {
      * @description 列设置额外的元素
      */
     settingExtra: {
-        type: PropType<import("./types/SlotsTypings").SettingExtraRender>;
+        type: PropType<ProTableProps["settingExtra"]>;
         default: () => undefined;
     };
+    keepAliveReload: {
+        type: PropType<ProTableProps["keepAliveReload"]>;
+        default: boolean;
+    };
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
@@ -144,7 +147,17 @@ export declare const proTableProps: {
      * @description 是否展示序号栏
      */
     showIndex: {
-        type: PropType<boolean | undefined>;
+        type: PropType<ProTableProps["showIndex"]>;
+        default: boolean;
+    };
+    /**
+     * @Author      gx12358
+     * @DateTime    2024/11/15
+     * @lastTime    2024/11/15
+     * @description 是否已card分割
+     */
+    cardBordered: {
+        type: PropType<ProTableProps["showIndex"]>;
         default: boolean;
     };
     /**
@@ -154,7 +167,7 @@ export declare const proTableProps: {
      * @description 翻页item设置
      */
     pageItemRender: {
-        type: PropType<import("./types/SlotsTypings").PageItemRender | undefined>;
+        type: PropType<ProTableProps["pageItemRender"]>;
         default: () => undefined;
     };
     /**
@@ -164,7 +177,7 @@ export declare const proTableProps: {
      * @description 表格大小
      */
     size: {
-        type: PropType<"small" | "large" | "middle" | undefined>;
+        type: PropType<ProTableProps["size"]>;
         default: string;
     };
     /**
@@ -174,26 +187,16 @@ export declare const proTableProps: {
      * @description 表格全局对齐方式
      */
     align: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").AlignType | undefined>;
+        type: PropType<ProTableProps["align"]>;
         default: string;
     };
-    /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 是否展示外边框和列边框
-     */
-    bordered: {
-        type: PropType<boolean | undefined>;
-        default: boolean;
-    };
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
      * @lastTime    2022/2/8
      * @description 是否列拖动
      */
-    draggabled: PropType<boolean | undefined>;
+    draggabled: PropType<ProTableProps["draggabled"]>;
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
@@ -201,7 +204,7 @@ export declare const proTableProps: {
      * @description 根据屏幕大小或者scrollBreakpoint或者scroll?.x是否存在判断action列是否固定
      */
     autoScroll: {
-        type: PropType<boolean | undefined>;
+        type: PropType<ProTableProps["autoScroll"]>;
         default: boolean;
     };
     /**
@@ -210,21 +213,21 @@ export declare const proTableProps: {
      * @lastTime    2022/2/8
      * @description 滚动断点支持数字（屏幕宽度）；也支持md、xl，xxl等
      */
-    scrollBreakpoint: PropType<number | import("@gx-design-vue/pro-utils/dist").Breakpoint | undefined>;
+    scrollBreakpoint: PropType<ProTableProps["scrollBreakpoint"]>;
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
      * @lastTime    2022/2/8
      * @description modalTable时，自动固定滚动高度
      */
-    modalScroll: PropType<boolean | undefined>;
+    modalScroll: PropType<ProTableProps["modalScroll"]>;
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
      * @lastTime    2022/2/8
      * @description 从不滚动
      */
-    neverScroll: PropType<boolean | undefined>;
+    neverScroll: PropType<ProTableProps["neverScroll"]>;
     /**
      * @Author      gx12358
      * @DateTime    2022/2/8
@@ -232,7 +235,7 @@ export declare const proTableProps: {
      * @description 空值时的显示，不设置时显示 -， false 可以关闭此功能
      */
     columnEmptyText: {
-        type: PropType<import("./types/TableTypings").ProFieldEmptyText | undefined>;
+        type: PropType<ProTableProps["columnEmptyText"]>;
         default: boolean;
     };
     /**
@@ -241,244 +244,33 @@ export declare const proTableProps: {
      * @lastTime    2022/2/8
      * @description Pro-Table 的方法
      */
-    onReset: PropType<((params?: Partial<Record<string, any>> | undefined) => any) | undefined>;
-    onReload: PropType<((params?: Partial<Record<string, any>> | undefined) => any) | undefined>;
-    onSubmit: PropType<((params?: Partial<Record<string, any>> | undefined) => any) | undefined>;
-    onSizeChange: PropType<((size: string) => any) | undefined>;
-    onLoadingChange: PropType<((loading: boolean) => any) | undefined>;
-    onRequestError: PropType<((e: Error) => void) | undefined>;
-    onBeforeSearchSubmit: PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType> | undefined>;
-    onColumnsStateChange: PropType<((data: import("./hooks/useColumnSetting").ColumnsState[]) => void) | undefined>;
-    prefixCls: {
-        type: PropType<string>;
-        default: any;
-    };
-    tableLayout: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").TableLayout>;
-        default: any;
-    };
-    rowClassName: {
-        type: PropType<string | import("ant-design-vue/es/vc-table/interface").RowClassName<any>>;
-        default: any;
-    };
-    title: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").PanelRender<any>>;
-        default: any;
-    };
-    footer: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").PanelRender<any>>;
-        default: any;
-    };
-    id: {
-        type: PropType<string>;
-        default: any;
-    };
-    showHeader: {
-        type: PropType<boolean>;
-        default: any;
-    };
-    components: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").TableComponents<any>>;
-        default: any;
-    };
-    customRow: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").GetComponentProps<any>>;
-        default: any;
-    };
-    customHeaderRow: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").GetComponentProps<import("ant-design-vue/es/vc-table/interface").ColumnType<any>[]>>;
-        default: any;
-    };
-    direction: {
-        type: PropType<"ltr" | "rtl">;
-        default: any;
-    };
-    expandFixed: {
-        type: PropType<boolean | "right" | "left">;
-        default: any;
-    };
-    expandColumnWidth: {
-        type: PropType<number>;
-        default: any;
-    };
-    expandedRowKeys: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").Key[]>;
-        default: import("ant-design-vue/es/vc-table/interface").Key[];
-    };
-    defaultExpandedRowKeys: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").Key[]>;
-        default: import("ant-design-vue/es/vc-table/interface").Key[];
-    };
-    expandedRowRender: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").ExpandedRowRender<any>>;
-        default: any;
-    };
-    expandRowByClick: {
-        type: PropType<boolean>;
-        default: any;
-    };
-    expandIcon: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").RenderExpandIcon<any>>;
-        default: any;
-    };
-    onExpand: {
-        type: PropType<(expanded: boolean, record: any) => void>;
-        default: any;
-    };
-    onExpandedRowsChange: {
-        type: PropType<(expandedKeys: import("ant-design-vue/es/vc-table/interface").Key[]) => void>;
-        default: any;
-    };
-    'onUpdate:expandedRowKeys': {
-        type: PropType<(expandedKeys: import("ant-design-vue/es/vc-table/interface").Key[]) => void>;
-        default: any;
-    };
-    defaultExpandAllRows: {
-        type: PropType<boolean>;
-        default: any;
-    };
-    indentSize: {
-        type: PropType<number>;
-        default: any;
-    }; /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 表格大小
-     */
-    expandIconColumnIndex: {
-        type: PropType<number>;
-        default: any;
-    };
-    showExpandColumn: {
-        type: BooleanConstructor;
-        default: any;
-    };
-    expandedRowClassName: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").RowClassName<any>>;
-        default: any;
-    };
-    childrenColumnName: {
-        type: PropType<string>;
-        default: any;
-    };
-    rowExpandable: {
-        type: PropType<(record: any) => boolean>;
-        default: any;
-    };
-    sticky: {
-        type: PropType<boolean | import("ant-design-vue/es/vc-table/interface").TableSticky>;
-        default: any;
+    postData: PropType<ProTableProps["postData"]>;
+    onReset: PropType<ProTableProps["onReset"]>;
+    onReload: PropType<ProTableProps["onReload"]>;
+    onSubmit: PropType<ProTableProps["onSubmit"]>;
+    onSizeChange: PropType<ProTableProps["onSizeChange"]>;
+    onLoadingChange: PropType<ProTableProps["onLoadingChange"]>;
+    onRequestError: PropType<ProTableProps["onRequestError"]>;
+    onBeforeSearchSubmit: PropType<ProTableProps["onBeforeSearchSubmit"]>;
+    onColumnsStateChange: PropType<ProTableProps["onColumnsStateChange"]>;
+    transformCellText: PropType<import("ant-design-vue/es/table/Table").TableProps["transformCellText"]>;
+    bordered: {
+        type: PropType<import("ant-design-vue/es/table/Table").TableProps["bordered"]>;
+        default: undefined;
     };
-    dropdownPrefixCls: StringConstructor;
-    dataSource: {
-        type: PropType<any[]>;
-        default: any;
-    }; /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 根据屏幕大小或者scrollBreakpoint或者scroll?.x是否存在判断action列是否固定
-     */
     loading: {
-        type: PropType<boolean | Partial<import("vue").ExtractPropTypes<{
-            prefixCls: StringConstructor;
-            spinning: {
-                type: BooleanConstructor;
-                default: any;
-            };
-            size: PropType<import("ant-design-vue/es/spin/Spin").SpinSize>;
-            wrapperClassName: StringConstructor;
-            tip: import("vue-types").VueTypeValidableDef<any>;
-            delay: NumberConstructor;
-            indicator: import("vue-types").VueTypeValidableDef<any>;
-        }>>>;
-        default: any;
-    };
-    locale: {
-        type: PropType<import("ant-design-vue/es/table/interface").TableLocale>;
-        default: any;
-    };
-    onChange: {
-        type: PropType<(pagination: import("ant-design-vue/es/table/interface").TablePaginationConfig, filters: Record<string, import("ant-design-vue/es/table/interface").FilterValue | null>, sorter: import("ant-design-vue/es/table/interface").SorterResult<any> | import("ant-design-vue/es/table/interface").SorterResult<any>[], extra: import("ant-design-vue/es/table/interface").TableCurrentDataSource<any>) => void>;
-        default: any;
-    };
-    onResizeColumn: {
-        type: PropType<(w: number, col: import("ant-design-vue/es/table/interface").ColumnType<any>) => void>;
-        default: any;
-    };
-    getPopupContainer: {
-        type: PropType<import("ant-design-vue/es/table/interface").GetPopupContainer>;
-        default: any;
+        type: PropType<boolean | import("ant-design-vue/es/spin/Spin").SpinProps>;
+        default: undefined;
     };
     scroll: {
-        type: PropType<{
-            x?: string | number | true | undefined;
-            y?: string | number | undefined;
-        } & {
-            scrollToFirstRowOnChange?: boolean | undefined;
+        type: PropType<import("ant-design-vue/es/vc-table/Table").TableProps["scroll"] & {
+            scrollToFirstRowOnChange?: boolean;
         }>;
-        default: any;
-    };
-    sortDirections: {
-        type: PropType<import("ant-design-vue/es/table/interface").SortOrder[]>;
-        default: any;
-    };
-    showSorterTooltip: {
-        type: PropType<boolean | Partial<import("vue").ExtractPropTypes<{
-            title: import("vue-types").VueTypeValidableDef<any>;
-            trigger: PropType<import("ant-design-vue/es/tooltip/abstractTooltipProps").TriggerType | import("ant-design-vue/es/tooltip/abstractTooltipProps").TriggerType[]>;
-            visible: {
-                type: BooleanConstructor;
-                default: any;
-            };
-            defaultVisible: {
-                type: BooleanConstructor;
-                default: any;
-            };
-            placement: PropType<import("ant-design-vue/es/tooltip").TooltipPlacement>;
-            color: StringConstructor;
-            transitionName: StringConstructor;
-            overlayStyle: {
-                type: PropType<import("vue").CSSProperties>;
-                default: import("vue").CSSProperties;
-            };
-            overlayClassName: StringConstructor;
-            openClassName: StringConstructor;
-            prefixCls: StringConstructor;
-            mouseEnterDelay: NumberConstructor;
-            mouseLeaveDelay: NumberConstructor;
-            getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
-            arrowPointAtCenter: {
-                type: BooleanConstructor;
-                default: any;
-            };
-            autoAdjustOverflow: {
-                type: PropType<boolean | import("ant-design-vue/es/tooltip").AdjustOverflow>;
-                default: boolean | import("ant-design-vue/es/tooltip").AdjustOverflow;
-            };
-            destroyTooltipOnHide: {
-                type: BooleanConstructor;
-                default: any;
-            };
-            align: {
-                type: PropType<import("ant-design-vue/es/vc-trigger/interface").AlignType>;
-                default: import("ant-design-vue/es/vc-trigger/interface").AlignType;
-            };
-            builtinPlacements: {
-                type: PropType<import("ant-design-vue/es/vc-trigger/interface").BuildInPlacements>;
-                default: import("ant-design-vue/es/vc-trigger/interface").BuildInPlacements;
-            };
-            children: ArrayConstructor;
-            onVisibleChange: PropType<(vis: boolean) => void>;
-            'onUpdate:visible': PropType<(vis: boolean) => void>;
-        }>>>;
-        default: boolean;
-    };
-    contextSlots: {
-        type: PropType<import("ant-design-vue/es/table/context").ContextSlots>;
+        default: undefined;
     };
-    transformCellText: {
-        type: PropType<import("ant-design-vue/es/vc-table/interface").TransformCellText<any>>;
+    'onUpdate:expandedRowKeys': {
+        type: import("vue").PropType<(expandedKeys: import("ant-design-vue/es/vc-table/interface").Key[]) => void>;
+        default: (expandedKeys: import("ant-design-vue/es/vc-table/interface").Key[]) => void;
     };
 };
+export type BaseTableProps = Partial<ExtractPropTypes<typeof proTableProps>>;

package/dist/style.d.ts

@@ -0,0 +1,3 @@
+import type { ProAliasToken } from '@gx-design-vue/pro-provider';
+import type { GenerateStyle } from 'ant-design-vue/es/theme/internal';
+export declare const genProTabelStyle: GenerateStyle<ProAliasToken>;

package/dist/types/ColumnTypings.d.ts

@@ -1,6 +1,6 @@
-import type { RecordType, VueNode } from '@gx-design-vue/pro-utils';
-import type { DefaultRecordType } from '../typing';
-import type { ColumnType } from '../_utils';
+import type { Fn, ProColumn, RecordType, VueNode } from '@gx-design-vue/pro-utils';
+import type { CSSProperties } from 'vue';
+import type { ColumnType, TooltipProps } from '../_utils';
 /**
  * @param text 文本框
  * @param date 日期 YYYY-MM-DD
@@ -9,7 +9,7 @@ import type { ColumnType } from '../_utils';
  * @param time: 时间 HH:mm:ss
  * @param select 下拉选择器
  */
-export type ProFieldValueType = 'text' | 'date' | 'select' | 'treeSelect' | 'dateMonth' | 'dateRange' | 'time';
+export type ProFieldValueType = 'text' | 'select' | 'treeSelect' | 'date' | 'dateWeek' | 'dateQuarter' | 'dateMonth' | 'dateYear' | 'dateRange' | 'time';
 /**
  * @param text 文本框
  * @param date 日期 YYYY-MM-DD
@@ -19,17 +19,17 @@ export type ProFieldValueType = 'text' | 'date' | 'select' | 'treeSelect' | 'dat
  * @param select 下拉选择器
  */
 export type ProFieldValueFormat = 'YYYY-MM-DD' | 'YYYY-MM' | 'YYYY-MM-DD HH:mm:ss' | 'HH:mm:ss';
-export type ProSchemaValueEnumType = {
+export interface ProSchemaValueEnumType {
     /** @name 演示的文案 */
     text: VueNode | JSX.Element;
     /** @name 演示的value值 */
     value: any;
     /** @name 是否禁用 */
     disabled?: boolean;
-};
+}
 type ProSchemaValueType<ValueType> = (ValueType | ProFieldValueType);
-export type ProSearchMap<ValueType = 'text'> = {
-    name?: string;
+export interface ProSearchMap<ValueType = 'text', ParamsKey = string> {
+    name: ParamsKey;
     /** 选择如何渲染相应的模式 */
     valueType?: ProSchemaValueType<ValueType>;
     /** valueType为date|dateMonth|dateRange|time生效 */
@@ -55,7 +55,15 @@ export type ProSearchMap<ValueType = 'text'> = {
     initialValue?: any;
     /** 针对select、treeselect取值的key */
     valueKey?: string;
-    /** 表单的属性值（ant-design）*/
+    /** 远程查询数据 */
+    request?: Fn;
+    /** 查询表单label */
+    label?: string;
+    /** 查询表单label - 宽度 */
+    labelWidth?: string | number;
+    /** 查询表单label - 对齐方式 */
+    labelAlign?: 'center' | 'left' | 'right';
+    /** 表单的属性值（ant-design） */
     field?: RecordType;
     /**
      * 支持 object 和Map，Map 是支持其他基础类型作为 key
@@ -63,26 +71,36 @@ export type ProSearchMap<ValueType = 'text'> = {
      * @name 映射值的类型
      */
     valueEnum?: ProSchemaValueEnumType[];
-};
-export type ProColumnType<RecordType = DefaultRecordType> = ColumnType<RecordType> & {
-    children?: ProColumnsType<RecordType>;
+}
+export type ProColumnType<DataValue = RecordType, SearchParama = RecordType> = ProColumn<Omit<ColumnType<DataValue>, 'key' | 'dataIndex' | 'width'> & {
+    children?: ProColumnsType<DataValue, SearchParama>;
     uuid?: string | number;
+    index?: number;
+    copyText?: string | ((record: ProColumnType) => string);
+    tooltip?: false | (TooltipProps & {
+        width?: number;
+        targetStyle?: Partial<CSSProperties>;
+        hiddenLine?: number;
+        class?: string;
+    });
     /** 不在列表中显示 */
     show?: boolean;
+    key?: keyof DataValue | string | 'action';
+    dataIndex?: keyof DataValue | string | 'action';
     /** 列表顺序值 */
     order?: number;
     /** 不在配置工具中显示 */
     hideInSetting?: boolean;
     /** 表单搜索配置 */
-    searchConfig?: ProSearchMap;
+    searchConfig?: ProSearchMap<undefined, keyof DataValue | keyof SearchParama>;
     /** 是否拷贝 */
     copyable?: boolean;
     /** 值为空时，默认取值 */
     columnEmptyText?: string;
     valueType?: ProColumnsValueType;
-};
-export type ProColumnsType<RecordType = DefaultRecordType> = (ProColumnType<RecordType>)[];
-export type ProColumnsValueType = 'text' | 'link' | 'time' | 'dateMonth' | 'dateTime' | {
+}>;
+export type ProColumnsType<DataValue = RecordType, SearchParama = RecordType> = ProColumnType<DataValue, SearchParama>[];
+export type ProColumnsValueType = 'text' | 'link' | 'time' | 'dateMonth' | 'dateTime' | 'date' | {
     node?: string;
     class?: string;
     attr?: string;