@gx-design-vue/pro-table 0.2.0-beta.45 → 0.2.0-beta.46

package/dist/ProTable.d.ts

@@ -9,7 +9,7 @@ declare const GProTable: import("vue").DefineComponent<{
         default: undefined;
     };
     columns: {
-        type: import("vue").PropType<ProColumnsType<import("./typing").DefaultRecordType> | undefined>;
+        type: import("vue").PropType<ProColumnsType<any> | undefined>;
         default: never[];
     };
     pagination: {
@@ -17,14 +17,11 @@ declare const GProTable: import("vue").DefineComponent<{
         default: () => undefined;
     };
     rowKey: {
-        type: import("vue").PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<import("./typing").DefaultRecordType> & string) | undefined>;
+        type: import("vue").PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<any> & string) | undefined>;
         default: undefined;
     };
     request: {
-        type: import("vue").PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-            pageSize?: number | undefined;
-            pageNum?: number | undefined;
-        }> | undefined>;
+        type: import("vue").PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
         default: null;
     };
     virtualScroll: import("vue").PropType<boolean | undefined>;
@@ -128,10 +125,7 @@ declare const GProTable: import("vue").DefineComponent<{
     onSizeChange: import("vue").PropType<((size: string) => any) | undefined>;
     onLoadingChange: import("vue").PropType<((loading: boolean) => any) | undefined>;
     onRequestError: import("vue").PropType<((e: Error) => void) | undefined>;
-    onBeforeSearchSubmit: import("vue").PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-        pageSize?: number | undefined;
-        pageNum?: number | undefined;
-    }> | undefined>;
+    onBeforeSearchSubmit: import("vue").PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
     onColumnsStateChange: import("vue").PropType<((data: import("./hooks/useColumnSetting").ColumnsState[]) => void) | undefined>;
     prefixCls: {
         type: import("vue").PropType<string>;
@@ -368,7 +362,7 @@ declare const GProTable: import("vue").DefineComponent<{
         default: undefined;
     };
     columns: {
-        type: import("vue").PropType<ProColumnsType<import("./typing").DefaultRecordType> | undefined>;
+        type: import("vue").PropType<ProColumnsType<any> | undefined>;
         default: never[];
     };
     pagination: {
@@ -376,14 +370,11 @@ declare const GProTable: import("vue").DefineComponent<{
         default: () => undefined;
     };
     rowKey: {
-        type: import("vue").PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<import("./typing").DefaultRecordType> & string) | undefined>;
+        type: import("vue").PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<any> & string) | undefined>;
         default: undefined;
     };
     request: {
-        type: import("vue").PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-            pageSize?: number | undefined;
-            pageNum?: number | undefined;
-        }> | undefined>;
+        type: import("vue").PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
         default: null;
     };
     virtualScroll: import("vue").PropType<boolean | undefined>;
@@ -487,10 +478,7 @@ declare const GProTable: import("vue").DefineComponent<{
     onSizeChange: import("vue").PropType<((size: string) => any) | undefined>;
     onLoadingChange: import("vue").PropType<((loading: boolean) => any) | undefined>;
     onRequestError: import("vue").PropType<((e: Error) => void) | undefined>;
-    onBeforeSearchSubmit: import("vue").PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-        pageSize?: number | undefined;
-        pageNum?: number | undefined;
-    }> | undefined>;
+    onBeforeSearchSubmit: import("vue").PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
     onColumnsStateChange: import("vue").PropType<((data: import("./hooks/useColumnSetting").ColumnsState[]) => void) | undefined>;
     prefixCls: {
         type: import("vue").PropType<string>;
@@ -734,7 +722,7 @@ declare const GProTable: import("vue").DefineComponent<{
     onBeforeSearchSubmit?: ((...args: any[]) => any) | undefined;
     onColumnsStateChange?: ((...args: any[]) => any) | undefined;
 }, {
-    columns: ProColumnsType<import("./typing").DefaultRecordType> | undefined;
+    columns: ProColumnsType<any> | undefined;
     scroll: {
         x?: string | number | true | undefined;
         y?: string | number | undefined;
@@ -742,7 +730,7 @@ declare const GProTable: import("vue").DefineComponent<{
         scrollToFirstRowOnChange?: boolean | undefined;
     };
     prefixCls: string;
-    rowKey: string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<import("./typing").DefaultRecordType> & string) | undefined;
+    rowKey: string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<any> & string) | undefined;
     tableLayout: import("ant-design-vue/es/vc-table/interface").TableLayout | undefined;
     rowClassName: string | import("ant-design-vue/es/vc-table/interface").RowClassName<any> | undefined;
     title: import("ant-design-vue/es/vc-table/interface").PanelRender<any> | undefined;
@@ -857,10 +845,7 @@ declare const GProTable: import("vue").DefineComponent<{
     options: boolean | OptionConfig | undefined;
     waitRequest: boolean | undefined;
     debounceTime: number | undefined;
-    request: import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-        pageSize?: number | undefined;
-        pageNum?: number | undefined;
-    }> | undefined;
+    request: import("./types/TableTypings").RequsetFunction<any, undefined> | undefined;
     search: boolean | SearchConfig | undefined;
     searchMap: import("./types/ColumnTypings").ProSearchMap[] | undefined;
     titleTip: TitleTipRender;

package/dist/props.d.ts

@@ -6,7 +6,7 @@ export declare const proTableProps: {
         default: undefined;
     };
     columns: {
-        type: PropType<import(".").ProColumnsType<import("./typing").DefaultRecordType> | undefined>;
+        type: PropType<import(".").ProColumnsType<any> | undefined>;
         default: never[];
     };
     pagination: {
@@ -14,7 +14,7 @@ export declare const proTableProps: {
         default: () => undefined;
     };
     rowKey: {
-        type: PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<import("./typing").DefaultRecordType> & string) | undefined>;
+        type: PropType<string | (import("ant-design-vue/es/vc-table/interface").GetRowKey<any> & string) | undefined>;
         default: undefined;
     };
     /**
@@ -24,10 +24,7 @@ export declare const proTableProps: {
      * @description 获取 dataSource 的方法
      */
     request: {
-        type: PropType<import("./types/TableTypings").RequsetFunction<import("./typing").DefaultRecordType, {
-            pageSize?: number | undefined;
-            pageNum?: number | undefined;
-        }> | undefined>;
+        type: PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
         default: null;
     };
     virtualScroll: PropType<boolean | undefined>;
@@ -251,10 +248,7 @@ export declare const proTableProps: {
     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, {
-        pageSize?: number | undefined;
-        pageNum?: number | undefined;
-    }> | undefined>;
+    onBeforeSearchSubmit: PropType<import("./types/TableTypings").RequsetFunction<any, undefined> | undefined>;
     onColumnsStateChange: PropType<((data: import("./hooks/useColumnSetting").ColumnsState[]) => void) | undefined>;
     prefixCls: {
         type: PropType<string>;

package/dist/types/TableTypings.d.ts

@@ -1,7 +1,6 @@
 import type { ComputedRef, CSSProperties } from 'vue';
 import type { RecordType, WithFalse, CustomRender, VueNode, SizeType, Breakpoint } from '@gx-design-vue/pro-utils';
 import type { ProSearchMap, ProColumnType, ProColumnsType } from './ColumnTypings';
-import type { DefaultRecordType } from '../typing';
 import type { HeaderTitleRender, ToolBarBtnRender, CustomizeRender, TitleTipRender, OptionsExtraRender, SettingExtraRender, PageItemRender } from './SlotsTypings';
 import type { FilterValue, SorterResult, TableCurrentDataSource, TableRowSelection, TablePaginationConfig, TableProps } from '../_utils';
 import type { ColumnSettingProps } from '../components/ColumnSetting';
@@ -27,27 +26,25 @@ export interface ProTablePaginationConfig extends Omit<TablePaginationConfig, 'p
     position?: TablePaginationPosition[];
 }
 export type ProTablePagination = ProTablePaginationConfig | false;
+export type DefaultParams = {
+    pageSize: number;
+    pageNum: number;
+};
 export type RequestData<T = any> = {
     data: T[] | undefined;
     success: boolean;
     total: number;
-} & RecordType;
-export type RequsetConfig<T = {
-    pageSize?: number;
-    pageNum?: number;
-}> = {
-    params: {
-        pageSize?: number;
-        pageNum?: number;
-    } & T;
+};
+export type RequsetConfig<T> = {
+    params: T extends undefined ? DefaultParams : {
+        pageSize: number;
+        pageNum: number;
+    } & Partial<T>;
     sort: SorterResult | SorterResult[];
     filter: Record<string, FilterValue | null>;
     extra: TableCurrentDataSource;
 };
-export type RequsetFunction<T = any, D = {
-    pageSize?: number;
-    pageNum?: number;
-}> = (params: RequsetConfig<D>['params'], sort: RequsetConfig<D>['sort'], filter: RequsetConfig<D>['filter']) => Promise<Partial<RequestData<T>>>;
+export type RequsetFunction<T = any, D = undefined> = (params: RequsetConfig<D>['params'], sort: RequsetConfig<D>['sort'], filter: RequsetConfig<D>['filter']) => Promise<Partial<RequestData<T>>>;
 export type ColConfig = Partial<Record<Breakpoint, number>>;
 export type SearchConfig = {
     searchText?: string;
@@ -106,7 +103,7 @@ export interface ProTableRef {
     formRef: () => ProCoreFormType;
     actionRef: () => ProCoreActionType;
 }
-export type ProTableProps<RecordType extends DefaultRecordType = DefaultRecordType> = Omit<TableProps<RecordType>, 'columns'> & Partial<{
+export type ProTableProps<RecordType = any> = Omit<TableProps<RecordType>, 'columns'> & Partial<{
     tableClassName: string;
     tableStyle: CSSProperties;
     rowKey: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gx-design-vue/pro-table",
-  "version": "0.2.0-beta.45",
+  "version": "0.2.0-beta.46",
   "scripts": {
     "dev": "vite",
     "build": "vite build",