@gx-design-vue/pro-table 0.2.0-beta.74 → 0.2.0-beta.76

package/dist/props.d.ts

@@ -29,7 +29,6 @@ export declare const proTableProps: {
     };
     virtualScroll: PropType<ProTableProps["virtualScroll"]>;
     params: PropType<ProTableProps["params"]>;
-    postData: PropType<ProTableProps["postData"]>;
     waitRequest: {
         type: PropType<ProTableProps["waitRequest"]>;
         default: boolean;
@@ -67,12 +66,6 @@ export declare const proTableProps: {
         type: PropType<ProTableProps["emptyText"]>;
         default: () => undefined;
     };
-    /**
-     * @Author      gx12358
-     * @DateTime    2022/2/8
-     * @lastTime    2022/2/8
-     * @description 添加表格class
-     */
     showLoading: {
         type: PropType<ProTableProps["showLoading"]>;
         default: boolean;
@@ -244,6 +237,7 @@ export declare const proTableProps: {
      * @lastTime    2022/2/8
      * @description Pro-Table 的方法
      */
+    postData: PropType<ProTableProps["postData"]>;
     onReset: PropType<ProTableProps["onReset"]>;
     onReload: PropType<ProTableProps["onReload"]>;
     onSubmit: PropType<ProTableProps["onSubmit"]>;
@@ -252,167 +246,19 @@ export declare const proTableProps: {
     onRequestError: PropType<ProTableProps["onRequestError"]>;
     onBeforeSearchSubmit: PropType<ProTableProps["onBeforeSearchSubmit"]>;
     onColumnsStateChange: PropType<ProTableProps["onColumnsStateChange"]>;
-    prefixCls: {
-        type: PropType<string>;
-        default: undefined;
-    };
-    tableLayout: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["tableLayout"]>;
-        default: undefined;
-    };
-    rowClassName: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["rowClassName"]>;
-        default: undefined;
-    };
-    title: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["title"]>;
-        default: undefined;
-    };
-    footer: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["footer"]>;
-        default: undefined;
-    };
-    id: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["id"]>;
-        default: undefined;
-    };
-    showHeader: {
-        type: PropType<boolean>;
-        default: undefined;
-    };
-    components: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["components"]>;
-        default: undefined;
-    };
-    customRow: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["customRow"]>;
-        default: undefined;
-    };
-    customHeaderRow: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["customHeaderRow"]>;
-        default: undefined;
-    };
-    direction: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["direction"]>;
-        default: undefined;
-    };
-    expandFixed: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["expandFixed"]>;
-        default: undefined;
-    };
-    expandColumnWidth: {
-        type: PropType<number>;
-        default: undefined;
-    };
-    expandedRowKeys: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["expandedRowKeys"]>;
-        default: undefined;
-    };
-    defaultExpandedRowKeys: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["defaultExpandedRowKeys"]>;
-        default: undefined;
-    };
-    expandedRowRender: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["expandedRowRender"]>;
-        default: undefined;
-    };
-    expandRowByClick: {
-        type: PropType<boolean>;
-        default: undefined;
-    };
-    expandIcon: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["expandIcon"]>;
-        default: undefined;
-    };
-    onExpand: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["onExpand"]>;
-        default: undefined;
-    };
-    onExpandedRowsChange: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["onExpandedRowsChange"]>;
-        default: undefined;
-    };
-    'onUpdate:expandedRowKeys': {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["onExpandedRowsChange"]>;
-        default: undefined;
-    };
-    defaultExpandAllRows: {
-        type: PropType<boolean>;
-        default: undefined;
-    };
-    indentSize: {
-        type: PropType<number>;
-        default: undefined;
-    };
-    expandIconColumnIndex: {
-        type: PropType<number>;
-        default: undefined;
-    };
-    showExpandColumn: {
-        type: PropType<boolean>;
-        default: undefined;
-    };
-    expandedRowClassName: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["expandedRowClassName"]>;
-        default: undefined;
-    };
-    childrenColumnName: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["childrenColumnName"]>;
-        default: undefined;
-    };
-    rowExpandable: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["rowExpandable"]>;
-        default: undefined;
-    };
-    sticky: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["sticky"]>;
-        default: undefined;
-    };
-    dropdownPrefixCls: {
-        type: PropType<string>;
-        default: undefined;
-    };
-    dataSource: {
-        type: PropType<import("ant-design-vue/es/vc-table/Table").TableProps["data"]>;
-        default: undefined;
-    };
     loading: {
         type: PropType<boolean | import("ant-design-vue/es/spin/Spin").SpinProps>;
         default: undefined;
     };
-    locale: {
-        type: PropType<import("ant-design-vue/es/table/interface").TableLocale>;
-        default: undefined;
-    };
-    onChange: {
-        type: PropType<(pagination: import("./types/TableTypings").ProTablePagination, filters: Record<string, import("ant-design-vue/es/table/interface").FilterValue | null>, sorter: import("ant-design-vue/es/table/interface").SorterResult | import("ant-design-vue/es/table/interface").SorterResult[], extra: import("ant-design-vue/es/table/interface").TableCurrentDataSource) => void>;
-        default: undefined;
-    };
-    onResizeColumn: {
-        type: PropType<(w: number, col: import("ant-design-vue/es/table/interface").ColumnType) => void>;
-        default: undefined;
-    };
-    getPopupContainer: {
-        type: PropType<import("ant-design-vue/es/table/interface").GetPopupContainer>;
-        default: undefined;
-    };
     scroll: {
         type: PropType<import("ant-design-vue/es/vc-table/Table").TableProps["scroll"] & {
             scrollToFirstRowOnChange?: boolean;
         }>;
         default: undefined;
     };
-    sortDirections: {
-        type: PropType<import("ant-design-vue/es/table/interface").SortOrder[]>;
-        default: undefined;
-    };
-    showSorterTooltip: {
-        type: PropType<boolean | import("ant-design-vue").TooltipProps>;
-        default: boolean;
-    };
-    transformCellText: {
-        type: PropType<import("ant-design-vue/es/table/Table").TableProps["transformCellText"]>;
-        default: undefined;
+    '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/types/ColumnTypings.d.ts

@@ -1,4 +1,4 @@
-import type { ProColumn, RecordType, VueNode } from '@gx-design-vue/pro-utils';
+import type { ProColumn, VueNode } from '@gx-design-vue/pro-utils';
 import type { DefaultRecordType } from '../typing';
 import type { ColumnType } from '../_utils';
 /**
@@ -50,13 +50,13 @@ export type ProSearchMap<ValueType = 'text', ParamsKey = string> = {
     /** valueType为select生效 */
     loading?: boolean;
     /** valueType为date、dateRange生效 */
-    showTime?: RecordType | boolean;
+    showTime?: DefaultRecordType | boolean;
     /** 搜索表单的默认值 */
     initialValue?: any;
     /** 针对select、treeselect取值的key */
     valueKey?: string;
     /** 表单的属性值（ant-design） */
-    field?: RecordType;
+    field?: DefaultRecordType;
     /**
      * 支持 object 和Map，Map 是支持其他基础类型作为 key
      *
@@ -64,7 +64,7 @@ export type ProSearchMap<ValueType = 'text', ParamsKey = string> = {
      */
     valueEnum?: ProSchemaValueEnumType[];
 };
-export type ProColumnType<DataValue = DefaultRecordType, SearchParama = RecordType> = ProColumn<Omit<ColumnType<DataValue>, 'key' | 'dataIndex' | 'width'> & {
+export type ProColumnType<DataValue = DefaultRecordType, SearchParama = DefaultRecordType> = ProColumn<Omit<ColumnType<DataValue>, 'key' | 'dataIndex' | 'width'> & {
     children?: ProColumnsType<DataValue, SearchParama>;
     uuid?: string | number;
     index?: number;
@@ -84,7 +84,7 @@ export type ProColumnType<DataValue = DefaultRecordType, SearchParama = RecordTy
     columnEmptyText?: string;
     valueType?: ProColumnsValueType;
 }>;
-export type ProColumnsType<DataValue = DefaultRecordType, SearchParama = RecordType> = ProColumnType<DataValue, SearchParama>[];
+export type ProColumnsType<DataValue = DefaultRecordType, SearchParama = DefaultRecordType> = ProColumnType<DataValue, SearchParama>[];
 export type ProColumnsValueType = 'text' | 'link' | 'time' | 'dateMonth' | 'dateTime' | {
     node?: string;
     class?: string;

package/dist/types/SlotsTypings.d.ts

@@ -1,7 +1,8 @@
-import type { CustomRender, RecordType, WithFalse } from '@gx-design-vue/pro-utils';
+import type { CustomRender, WithFalse } from '@gx-design-vue/pro-utils';
+import type { DefaultRecordType } from '../typing';
 import type { ProColumnType } from '../types/ColumnTypings';
 import type { ColumnType, RenderExpandIconProps } from '../_utils';
-export type ProTableBodyCellProps<T = Record<string, any>> = {
+export type ProTableBodyCellProps<T = DefaultRecordType> = {
     text: any;
     value: any;
     record: T;
@@ -28,9 +29,9 @@ export type AntTabelSlotsType = {
 export type ProTableSlotsKey = 'search' | 'headerTitle' | 'toolBarBtn' | 'titleTip' | 'settingExtra' | 'optionsExtra' | 'pageItemRender' | 'customRender';
 export declare const proTableSlotsKey: ProTableSlotsKey[];
 export type Slots = Readonly<Omit<Record<ProTableSlotsKey, () => void>, 'customRender'> & {
-    customRender: (currentData: any[], dataSource: any[]) => void;
+    customRender: (params: CustomRenderResult) => void;
 }>;
-export type CustomRenderResult<T = RecordType> = {
+export type CustomRenderResult<T = DefaultRecordType> = {
     currentData: T[];
     dataSource: T[];
 };
@@ -39,7 +40,7 @@ export type PageItemFn = (opt: {
     type: 'page' | 'prev' | 'next' | 'jump-prev' | 'jump-next';
     originalElement: any;
 }) => CustomRender;
-export type CustomDataFn<T = any> = (params: CustomRenderResult<T>) => CustomRender;
+export type CustomDataFn<T = DefaultRecordType> = (params: CustomRenderResult<T>) => CustomRender;
 export type DefaultRender = WithFalse<CustomRender>;
 export type PageItemRender = WithFalse<PageItemFn>;
-export type CustomDataRender = WithFalse<CustomDataFn>;
+export type CustomDataRender<T = DefaultRecordType> = WithFalse<CustomDataFn<T>>;

package/dist/types/TableTypings.d.ts

@@ -1,11 +1,12 @@
 import type { CSSProperties, ComputedRef, Ref } from 'vue';
-import type { Breakpoint, CustomRender, RecordType, SizeType, VueNode, WithFalse } from '@gx-design-vue/pro-utils';
+import type { Breakpoint, CustomRender, SizeType, VueNode, WithFalse } from '@gx-design-vue/pro-utils';
 import type { ProColumnType, ProColumnsType, ProSearchMap } from './ColumnTypings';
 import type { CustomDataRender, DefaultRender, PageItemRender } from './SlotsTypings';
-import type { FilterValue, SorterResult, TableCurrentDataSource, TablePaginationConfig, TableProps, TableRowSelection } from '../_utils';
+import type { FilterValue, SelectionSelectFn, SorterResult, TableCurrentDataSource, TablePaginationConfig, TableProps, TableRowSelection } from '../_utils';
+import type { DefaultRecordType } from '../typing';
 import type { ColumnSettingProps } from '../components/ColumnSetting';
 import type { ColumnsState, ColumnsStateType } from '../hooks/useColumnSetting';
-export type ProTabelFeachParams<R = RecordType> = {
+export type ProTabelFeachParams<R = DefaultRecordType> = {
     params?: R;
     filters?: Record<string, FilterValue | null>;
     sorter?: SorterResult | SorterResult[];
@@ -63,17 +64,21 @@ export interface OptionConfig {
     fullScreen?: (() => VueNode | JSX.Element) | boolean | (() => Promise<void>);
 }
 /** action表格实例 */
-export interface ProCoreActionType<T = RecordType, R = RecordType> {
+export interface ProCoreActionType<T = DefaultRecordType, R = DefaultRecordType> {
     /** @name loadingStatus */
     loading: Ref<boolean>;
     dataSource: ComputedRef<T[]>;
     getLoadingStatus: () => boolean;
     pagination: R | boolean;
     pageState: PageState;
-    rowsSelection?: () => {
-        keys: (string | number)[];
-        items: T[];
+    selectedKey: ComputedRef<(string | number)[]>;
+    selectedItem: ComputedRef<T[]>;
+    rowsSelection?: {
         clear: () => void;
+        sync: (data: T[]) => void;
+        remove: (keys: (string | number)[]) => void;
+        select: SelectionSelectFn<T>;
+        selectAll: TableRowSelection<T>['onSelectAll'];
     };
     /** @name 刷新 */
     reload: (info?: ProTabelFeachParams<R>) => void;
@@ -98,7 +103,7 @@ export interface ProCoreActionType<T = RecordType, R = RecordType> {
     setLoading: (loading: boolean) => void;
 }
 /** form查询表单实例 */
-export interface ProCoreFormType<R = RecordType> {
+export interface ProCoreFormType<R = DefaultRecordType> {
     /** @name 获取表格-表单请求参数 */
     getFormState?: () => R;
     /** @name 获取表格-内部表单参数 */
@@ -106,23 +111,23 @@ export interface ProCoreFormType<R = RecordType> {
     /** @name 重置内部表单组件参数 */
     restFormState?: (callBack?: () => void) => void;
 }
-export interface ProTableRef<T = RecordType, R = RecordType> {
+export interface ProTableRef<T = DefaultRecordType, R = DefaultRecordType> {
     formRef: () => ProCoreFormType<R>;
     actionRef: () => ProCoreActionType<T, R>;
 }
-export type ProTableProps<DataRecord extends object = Record<string, any>, ParamsType extends object = Record<string, any>> = Omit<TableProps, 'columns' | 'dataSource'> & Partial<{
+export type ProTableProps<DataRecord extends object = DefaultRecordType, ParamsType extends object = DefaultRecordType> = Omit<TableProps, 'columns' | 'dataSource'> & Partial<{
     dataSource: DataRecord[];
     tableProps: {
         class?: string;
         style?: CSSProperties;
     };
-    rowKey: string;
+    rowKey: keyof DataRecord;
     titleTipText: string;
     autoScroll: boolean;
     emptyTextProps: {
         class?: string;
         style?: CSSProperties;
-        extraProps?: Record<string, any>;
+        extraProps?: DefaultRecordType;
     };
     columnEmptyText: ProFieldEmptyText;
     showLoading: boolean;
@@ -144,17 +149,17 @@ export type ProTableProps<DataRecord extends object = Record<string, any>, Param
     debounceTime: number;
     request: RequsetFunction<DataRecord, ParamsType>;
     params: ParamsType;
-    postData: (data: any[]) => any;
+    postData: (data: DataRecord[]) => DataRecord[];
     pagination: ProTablePagination;
     search: SearchConfig | boolean;
     searchMap: ProSearchMap<undefined, keyof ParamsType | keyof DataRecord>[];
-    onReset: (params?: Partial<ParamsType>) => any;
-    onReload: (params?: Partial<ParamsType>) => any;
-    onSubmit: (params?: Partial<ParamsType>) => any;
+    onReset: (params?: Partial<ParamsType>) => void;
+    onReload: (params?: Partial<ParamsType>) => void;
+    onSubmit: (params?: Partial<ParamsType>) => void;
     onSizeChange: (size: string) => any;
     onLoadingChange: (loading: boolean) => any;
     onRequestError: (e: Error) => void;
-    onBeforeSearchSubmit: RequsetFunction<RecordType>;
+    onBeforeSearchSubmit: RequsetFunction<DataRecord, ParamsType>;
     onColumnsStateChange: (data: ColumnsState[]) => void;
     titleTip: DefaultRender;
     emptyText: DefaultRender;

package/dist/typing.d.ts

@@ -1 +1 @@
-export declare type DefaultRecordType = Record<string, unknown>;
+export declare type DefaultRecordType = Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gx-design-vue/pro-table",
-  "version": "0.2.0-beta.74",
+  "version": "0.2.0-beta.76",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -28,7 +28,7 @@
     "@vueuse/core": "^9.10.0",
     "@gx-design-vue/pro-utils": "^0.2.0-beta.47",
     "@gx-design-vue/pro-hooks": "^0.2.0-beta.32",
-    "@gx-design-vue/pro-provider": "^0.1.0-beta.92",
+    "@gx-design-vue/pro-provider": "^0.1.0-beta.94",
     "@gx-design-vue/pro-app": "^0.1.0-beta.22",
     "dayjs": "^1.11.0",
     "lodash-es": "^4.17.21"