listpage-next 0.0.118 → 0.0.120

package/dist/components/Page/components/ListPage/DataTable.d.ts

@@ -3,11 +3,12 @@ import { ColumnType } from 'antd/es/table';
 import { ListPageStore } from '../../context/listpage';
 import { ColumnRender } from '../../../DataTable/components/Render';
 import { ComponentProps, ComponentType } from '../../../DataTable/typings';
-export interface DataTableProps<RecordValue extends Record<string, any> = any> extends Omit<TableProps<RecordValue>, 'dataSource' | 'title' | 'columns'> {
+export interface DataTableProps<RecordValue extends Record<string, any> = any> {
     title?: React.ReactNode;
     rowSelectionType?: 'checkbox' | 'radio';
     extra?: React.ReactNode | ((ctx: ListPageStore<any, RecordValue>) => React.ReactNode);
     columns?: ListPageTableColumn<RecordValue>[];
+    tableProps?: Omit<TableProps<RecordValue>, 'dataSource' | 'title' | 'columns'>;
 }
 export interface ListPageTableColumn<RecordValue extends Record<string, any> = any, FilterValue = any> extends ColumnType<RecordValue> {
     component?: ComponentType | ColumnRender<RecordValue, ListPageStore<FilterValue, RecordValue>>;

package/dist/components/Page/components/ListPage/DataTable.js

@@ -6,9 +6,9 @@ import { TableContainer } from "../../../DataTable/index.js";
 import { usePagination } from "../../hooks/usePagination.js";
 import { useColumns } from "../../hooks/useColumns.js";
 const DataTable = observer((props)=>{
-    const { title, extra, columns, rowSelectionType, ...restProps } = props;
+    const { title, extra, columns, rowSelectionType, tableProps } = props;
     const store = useListPageStore();
-    const paginationEle = usePagination(props.pagination);
+    const paginationEle = usePagination(tableProps?.pagination);
     const newColumns = useColumns(columns);
     const extraEle = 'function' == typeof extra ? extra(store) : extra;
     return /*#__PURE__*/ jsxs(Card, {
@@ -23,14 +23,14 @@ const DataTable = observer((props)=>{
             /*#__PURE__*/ jsx(TableContainer, {
                 children: /*#__PURE__*/ jsx(Table, {
                     bordered: false,
-                    ...restProps,
+                    ...tableProps,
                     columns: newColumns,
                     loading: store.loadingData,
                     dataSource: store.dataSource,
                     pagination: false,
                     rowSelection: rowSelectionType && {
                         preserveSelectedRowKeys: true,
-                        ...restProps.rowSelection,
+                        ...tableProps?.rowSelection,
                         type: rowSelectionType,
                         selectedRowKeys: store.selection.selectedRowKeys,
                         onChange: store.onSelectChange

package/dist/components/Page/components/ListPage/v2.d.ts

@@ -1,8 +1,7 @@
 import { ReactNode } from 'react';
-import { TableProps } from 'antd';
 import { FloatRender, ListPageStore, TableRequest } from '../../context/listpage';
 import { FilterFormOption } from '../../../FilterGroup';
-import { DataTableColumns } from '../../../DataTable';
+import { DataTableProps } from './DataTable';
 import { HeaderProps } from '../../hooks/useHeader';
 export interface ListPageProps<FilterValue = any, RecordValue extends Record<string, any> = any> {
     storageKey?: string;
@@ -25,12 +24,7 @@ export interface ListPageProps<FilterValue = any, RecordValue extends Record<str
     toolbar?: {
         render: (ctx: ListPageStore<FilterValue, RecordValue>) => ReactNode;
     };
-    table: {
-        columns: DataTableColumns<RecordValue, ListPageStore>[];
-        title?: React.ReactNode;
-        extra?: React.ReactNode;
-        tableProps?: Omit<TableProps<RecordValue>, 'dataSource' | 'title' | 'columns'>;
-    };
+    table: DataTableProps<RecordValue>;
 }
 export declare const PureListPage: ((props: ListPageProps) => import("react/jsx-runtime").JSX.Element) & {
     displayName: string;

package/dist/components/Page/components/ListPage/v2.js

@@ -36,7 +36,7 @@ const PureListPage = observer((props)=>{
                 children: toolbar.render(store)
             }),
             /*#__PURE__*/ jsx(DataTable, {
-                ...table.tableProps,
+                tableProps: table.tableProps,
                 title: table.title,
                 extra: table.extra,
                 columns: table.columns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.118",
+  "version": "0.0.120",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",