🐛 bug: fix pagesize no work error

close #637 #625
ant-design · Jul 19, 2020 · 8e05fc4 · 8e05fc4
1 parent 8d63629
commit 8e05fc4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/docs/demo/single.tsx b/docs/demo/single.tsx
@@ -190,6 +190,9 @@ export default () => {
       </Drawer>
       <ProTable<GithubIssueItem>
         columns={columns}
+        pagination={{
+          showQuickJumper: true,
+        }}
         actionRef={actionRef}
         request={async (params = {}) =>
           request<{

diff --git a/src/Table.tsx b/src/Table.tsx
@@ -346,10 +346,10 @@ const mergePagination = <T extends any[], U>(
     onChange: (page: number, newPageSize?: number) => {
       // pageSize 改变之后就没必要切换页码
       if (newPageSize !== pageSize && current !== page) {
-        action.setPageInfo({ pageSize, page });
+        action.setPageInfo({ pageSize: newPageSize, page });
       } else {
         if (newPageSize !== pageSize) {
-          action.setPageInfo({ pageSize });
+          action.setPageInfo({ pageSize: newPageSize });
         }
         if (current !== page) {
           action.setPageInfo({ page });
@@ -361,17 +361,6 @@ const mergePagination = <T extends any[], U>(
         onChange(page, newPageSize || 20);
       }
     },
-
-    onShowSizeChange: (page: number, showPageSize: number) => {
-      action.setPageInfo({
-        pageSize: showPageSize,
-        page,
-      });
-      const { onShowSizeChange } = pagination as TablePaginationConfig;
-      if (onShowSizeChange) {
-        onShowSizeChange(page, showPageSize || 20);
-      }
-    },
   };
 };
 

diff --git a/src/form/index.tsx b/src/form/index.tsx
@@ -143,7 +143,7 @@ export const FormInputRender: React.FC<{
   intl: IntlType;
   onChange?: (value: any) => void;
   onSelect?: (value: any) => void;
-}> = (props) => {
+}> = React.forwardRef((props, ref: any) => {
   const { item, intl, form, type, ...rest } = props;
   const { valueType: itemValueType } = item;
   // if function， run it
@@ -185,6 +185,7 @@ export const FormInputRender: React.FC<{
     if (valueEnum) {
       return (
         <Select
+          ref={ref}
           allowClear
           placeholder={intl.getMessage('tableForm.selectPlaceholder', '请选择')}
           {...rest}
@@ -200,6 +201,7 @@ export const FormInputRender: React.FC<{
     }
     return (
       <Input
+        ref={ref}
         placeholder={intl.getMessage('tableForm.inputPlaceholder', '请输入')}
         {...rest}
         {...item.formItemProps}
@@ -209,6 +211,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'date') {
     return (
       <DatePicker
+        ref={ref}
         placeholder={intl.getMessage('tableForm.selectPlaceholder', '请选择')}
         style={{
           width: '100%',
@@ -222,6 +225,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'dateTime') {
     return (
       <DatePicker
+        ref={ref}
         showTime
         placeholder={intl.getMessage('tableForm.selectPlaceholder', '请选择')}
         style={{
@@ -236,6 +240,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'dateRange') {
     return (
       <DatePicker.RangePicker
+        ref={ref}
         placeholder={[
           intl.getMessage('tableForm.selectPlaceholder', '请选择'),
           intl.getMessage('tableForm.selectPlaceholder', '请选择'),
@@ -251,6 +256,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'dateTimeRange') {
     return (
       <DatePicker.RangePicker
+        ref={ref}
         showTime
         placeholder={[
           intl.getMessage('tableForm.selectPlaceholder', '请选择'),
@@ -268,6 +274,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'time') {
     return (
       <TimePicker
+        ref={ref}
         placeholder={intl.getMessage('tableForm.selectPlaceholder', '请选择')}
         style={{
           width: '100%',
@@ -280,6 +287,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'digit') {
     return (
       <InputNumber
+        ref={ref}
         placeholder={intl.getMessage('tableForm.inputPlaceholder', '请输入')}
         style={{
           width: '100%',
@@ -292,6 +300,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'money') {
     return (
       <InputNumber
+        ref={ref}
         min={0}
         precision={2}
         formatter={(value) => {
@@ -323,6 +332,7 @@ export const FormInputRender: React.FC<{
   if (valueType === 'textarea' && type === 'form') {
     return (
       <Input.TextArea
+        ref={ref}
         placeholder={intl.getMessage('tableForm.inputPlaceholder', '请输入')}
         {...rest}
         {...item.formItemProps}
@@ -331,12 +341,13 @@ export const FormInputRender: React.FC<{
   }
   return (
     <Input
+      ref={ref}
       placeholder={intl.getMessage('tableForm.inputPlaceholder', '请输入')}
       {...rest}
       {...item.formItemProps}
     />
   );
-};
+});
 
 export const proFormItemRender: (props: {
   item: ProColumns<any>;