From 37797c95794a83b83114b7c219a01d58ee888da7 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Tue, 10 Aug 2021 15:36:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?tr:searchApi=E9=80=8F=E5=87=BAsorter?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/table-render/demo/advanced.tsx | 8 ++++---- packages/table-render/src/Table.tsx | 9 +++++---- packages/table-render/src/index.tsx | 13 +++++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/docs/table-render/demo/advanced.tsx b/docs/table-render/demo/advanced.tsx index 902df4359..582e08ea9 100644 --- a/docs/table-render/demo/advanced.tsx +++ b/docs/table-render/demo/advanced.tsx @@ -38,8 +38,8 @@ const schema = { const Demo = () => { const { refresh, tableState }: any = useTable(); - const searchApi = params => { - console.log('params >>> ', params); + const searchApi = (params, sorter) => { + console.group(sorter); return request .get( 'https://www.fastmock.site/mock/62ab96ff94bc013592db1f67667e9c76/getTableList/api/basic', @@ -106,6 +106,7 @@ const Demo = () => { { title: '酒店GMV', key: 'money', + sorter: true, dataIndex: 'money', valueType: 'money', }, @@ -153,8 +154,6 @@ const Demo = () => { console.log('onSearch', search)} - afterSearch={params => console.log('afterSearch', params)} api={[ { name: '全部数据', @@ -168,6 +167,7 @@ const Demo = () => { /> { const { dataSource, pagination, loading, api, tableSize } = tableState; const rootRef = useRef(null); // ProTable组件的ref - const onPageChange = (page: any, pageSize: any) => { - setTable({ pagination: { ...pagination, current: page, pageSize } }); + const onChange = ({ current, pageSize }, filters, sorter) => { + setTable({ pagination: { ...pagination, current, pageSize } }); if ( !props.pageChangeWithRequest && props.pageChangeWithRequest !== undefined ) return; - doSearch({ current: page, pageSize }); + doSearch({ current, pageSize, sorter }); }; const { @@ -67,13 +67,14 @@ const ProTable = (props: ProTableProps) => { }); const tableProps = { ...props, + onChange, // dataSource不准在使用ProTable时用props赋值 dataSource, pagination: props.pagination === false ? false : { - onChange: onPageChange, + // onChange: onPageChange, size: 'small', ...props.pagination, pageSize: props.pagination?.pageSize || pagination.pageSize, diff --git a/packages/table-render/src/index.tsx b/packages/table-render/src/index.tsx index eabca586e..4ac440a38 100644 --- a/packages/table-render/src/index.tsx +++ b/packages/table-render/src/index.tsx @@ -35,12 +35,17 @@ const useTableRoot = props => { const table = useTable(); const doSearch = ( - params: { current?: any; tab?: any; pageSize?: any }, + params: { + current?: number; + tab?: number | string; + pageSize?: number; + sorter: any; + }, customSearch?: any ) => { // console.log(checkPassed); // if (!checkPassed) return; - const { current, pageSize, tab, ...extraSearch } = params || {}; + const { current, pageSize, tab, sorter, ...extraSearch } = params || {}; const _current = current || 1; const _pageSize = pageSize || 10; let _tab = currentTab; @@ -62,7 +67,7 @@ const useTableRoot = props => { message.warning('api 不是函数，检查 的 props'); } - function basicSearch(api: (arg0: any) => any) { + function basicSearch(api: (arg0: any, sorter: any) => any) { set({ loading: true }); let _params = { ...form.getValues(), @@ -74,7 +79,7 @@ const useTableRoot = props => { if (Array.isArray(api)) { _params = { ..._params, tab }; } - Promise.resolve(api(_params)) + Promise.resolve(api(_params, sorter)) .then(res => { // TODO：这里校验res是否规范 const { rows, total, pageSize, ...extraData } = res; From 6bbbd4f6ad94ffc599b0650802792c6615f01c40 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Tue, 10 Aug 2021 15:37:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?tr:searchApi=E9=80=8F=E5=87=BAsorter?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/table-render/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table-render/package.json b/packages/table-render/package.json index bd54d3525..70e5d2f30 100644 --- a/packages/table-render/package.json +++ b/packages/table-render/package.json @@ -1,6 +1,6 @@ { "name": "table-render", - "version": "1.1.3", + "version": "1.1.4", "description": "中后台表格解决方案", "scripts": { "start": "dumi dev", From 5ce9bfa476db494397e95e377c2b50a0efc98fde Mon Sep 17 00:00:00 2001 From: siyi98 Date: Tue, 10 Aug 2021 15:39:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E5=85=85ts=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/table-render/src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table-render/src/index.tsx b/packages/table-render/src/index.tsx index 4ac440a38..484c0849b 100644 --- a/packages/table-render/src/index.tsx +++ b/packages/table-render/src/index.tsx @@ -39,7 +39,7 @@ const useTableRoot = props => { current?: number; tab?: number | string; pageSize?: number; - sorter: any; + sorter?: any; }, customSearch?: any ) => {