@faasjs/ant-design 0.0.2-beta.359 → 0.0.2-beta.360

package/dist/index.d.ts

@@ -1,11 +1,12 @@
 import * as react_use_lib_misc_hookState from 'react-use/lib/misc/hookState';
-import { DescriptionsProps, DrawerProps as DrawerProps$1, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, FormProps as FormProps$1, TableColumnProps, TableProps as TableProps$1 } from 'antd';
+import { DescriptionsProps, DrawerProps as DrawerProps$1, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, FormProps as FormProps$1, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1 } from 'antd';
 export { Drawer } from 'antd';
 import { FaasDataWrapperProps } from '@faasjs/react';
 import * as antd_lib_form_Form from 'antd/lib/form/Form';
 import { RuleObject } from 'rc-field-form/lib/interface';
 import { LazyExoticComponent, ComponentType } from 'react';
 import { RouteProps } from 'react-router-dom';
+import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/lib/table/interface';
 
 declare type BlankProps = {
     value?: any;
@@ -179,6 +180,12 @@ declare type TableProps<T = any, ExtendTypes = any> = {
         [key: string]: ExtendTableTypeProps;
     };
     faasData?: FaasDataWrapperProps<T>;
+    onChange?: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<T> | SorterResult<T>[], extra: TableCurrentDataSource<T>) => {
+        pagination: TablePaginationConfig;
+        filters: Record<string, FilterValue | null>;
+        sorter: SorterResult<T> | SorterResult<T>[];
+        extra: TableCurrentDataSource<T>;
+    };
 } & TableProps$1<T>;
 declare function Table<T = any, ExtendTypes = any>(props: TableProps<T, ExtendTypes>): JSX.Element;
 

package/dist/index.js

@@ -200,6 +200,11 @@ function Description(props) {
       extendTypes: props.extendTypes
     }))));
   return /* @__PURE__ */ import_react.default.createElement(import_react4.FaasDataWrapper, __spreadValues({
+    fallback: props.faasData.fallback || /* @__PURE__ */ import_react.default.createElement("div", {
+      style: { padding: "24px" }
+    }, /* @__PURE__ */ import_react.default.createElement(import_antd2.Skeleton, {
+      active: true
+    })),
     render: ({ data }) => /* @__PURE__ */ import_react.default.createElement(import_antd2.Descriptions, __spreadValues({}, props), props.items.map((item) => /* @__PURE__ */ import_react.default.createElement(import_antd2.Descriptions.Item, {
       key: item.id,
       label: item.title || (0, import_lodash3.upperFirst)(item.id)
@@ -592,6 +597,11 @@ function Table(props) {
       dataSource: props.dataSource
     }));
   return /* @__PURE__ */ import_react.default.createElement(import_react10.FaasDataWrapper, __spreadValues({
+    fallback: props.faasData.fallback || /* @__PURE__ */ import_react.default.createElement("div", {
+      style: { padding: "24px" }
+    }, /* @__PURE__ */ import_react.default.createElement(import_antd7.Skeleton, {
+      active: true
+    })),
     render: ({
       data,
       params,
@@ -615,8 +625,15 @@ function Table(props) {
         dataSource: data.rows,
         pagination: __spreadValues(__spreadValues({}, props.pagination), data.pagination),
         onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange)
-            props.onChange(pagination, filters, sorter, extra);
+          if (props.onChange) {
+            const processed = props.onChange(pagination, filters, sorter, extra);
+            reload(__spreadProps(__spreadValues({}, params), {
+              pagination: processed.pagination,
+              filters: processed.filters,
+              sorter: processed.sorter
+            }));
+            return;
+          }
           reload(__spreadProps(__spreadValues({}, params), {
             pagination,
             filters,

package/dist/index.mjs

@@ -78,7 +78,10 @@ function transferOptions(options) {
 
 // src/Description.tsx
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
-import { Descriptions } from "antd";
+import {
+  Descriptions,
+  Skeleton
+} from "antd";
 import { upperFirst as upperFirst2 } from "lodash";
 import {
   cloneElement,
@@ -162,6 +165,11 @@ function Description(props) {
       extendTypes: props.extendTypes
     }))));
   return /* @__PURE__ */ React.createElement(FaasDataWrapper, __spreadValues({
+    fallback: props.faasData.fallback || /* @__PURE__ */ React.createElement("div", {
+      style: { padding: "24px" }
+    }, /* @__PURE__ */ React.createElement(Skeleton, {
+      active: true
+    })),
     render: ({ data }) => /* @__PURE__ */ React.createElement(Descriptions, __spreadValues({}, props), props.items.map((item) => /* @__PURE__ */ React.createElement(Descriptions.Item, {
       key: item.id,
       label: item.title || upperFirst2(item.id)
@@ -390,7 +398,7 @@ Form.useForm = AntdForm2.useForm;
 Form.Item = FormItem;
 
 // src/Routers.tsx
-import { Result, Skeleton } from "antd";
+import { Result, Skeleton as Skeleton2 } from "antd";
 import {
   Suspense
 } from "react";
@@ -412,7 +420,7 @@ function Routes(props) {
     element: r.element || /* @__PURE__ */ React.createElement(Suspense, {
       fallback: props.fallback || /* @__PURE__ */ React.createElement("div", {
         style: { padding: "24px" }
-      }, /* @__PURE__ */ React.createElement(Skeleton, {
+      }, /* @__PURE__ */ React.createElement(Skeleton2, {
         active: true
       }))
     }, /* @__PURE__ */ React.createElement(r.page, null))
@@ -431,7 +439,8 @@ import {
 } from "react";
 import {
   Table as AntdTable,
-  Radio
+  Radio,
+  Skeleton as Skeleton3
 } from "antd";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
 import { isNil as isNil2, upperFirst as upperFirst4 } from "lodash";
@@ -578,6 +587,11 @@ function Table(props) {
       dataSource: props.dataSource
     }));
   return /* @__PURE__ */ React.createElement(FaasDataWrapper2, __spreadValues({
+    fallback: props.faasData.fallback || /* @__PURE__ */ React.createElement("div", {
+      style: { padding: "24px" }
+    }, /* @__PURE__ */ React.createElement(Skeleton3, {
+      active: true
+    })),
     render: ({
       data,
       params,
@@ -601,8 +615,15 @@ function Table(props) {
         dataSource: data.rows,
         pagination: __spreadValues(__spreadValues({}, props.pagination), data.pagination),
         onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange)
-            props.onChange(pagination, filters, sorter, extra);
+          if (props.onChange) {
+            const processed = props.onChange(pagination, filters, sorter, extra);
+            reload(__spreadProps(__spreadValues({}, params), {
+              pagination: processed.pagination,
+              filters: processed.filters,
+              sorter: processed.sorter
+            }));
+            return;
+          }
           reload(__spreadProps(__spreadValues({}, params), {
             pagination,
             filters,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.2-beta.359",
+  "version": "0.0.2-beta.360",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,7 +28,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.359",
+    "@faasjs/react": "^0.0.2-beta.360",
     "react-use": "*",
     "react-router-dom": "*"
   },