@faasjs/ant-design 0.0.3-beta.27 → 0.0.3-beta.29

package/README.md

@@ -42,6 +42,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 ### Namespaces
 
 - [Form](modules/Form.md)
+- [FormItem](modules/FormItem.md)
 
 ### Interfaces
 
@@ -75,6 +76,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 - [FaasDataWrapperProps](#faasdatawrapperprops)
 - [FaasItemType](#faasitemtype)
 - [FaasItemTypeValue](#faasitemtypevalue)
+- [FormSubmitProps](#formsubmitprops)
 - [TableProps](#tableprops)
 - [setDrawerProps](#setdrawerprops)
 - [setModalProps](#setmodalprops)
@@ -253,6 +255,24 @@ FaasItemType's value type
 
 ___
 
+### FormSubmitProps
+
+Ƭ **FormSubmitProps**: `Object`
+
+#### Type declaration
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `text?` | `string` | Default: Submit |
+| `to?` | { `action`: `string` ; `catch?`: (`error`: `any`) => `void` ; `finally?`: () => `void` ; `params?`: `Record`<`string`, `any`\> ; `then?`: (`result`: `any`) => `void`  } | Submit to FaasJS server. If use onFinish, you should call submit manually. ```ts { submit: { to: { action: 'action_name' } }, onFinish: (values, submit) => { // do something before submit // submit await submit({ ...values, extraProps: 'some extra props' }) // do something after submit } } ``` |
+| `to.action` | `string` | - |
+| `to.catch?` | (`error`: `any`) => `void` | - |
+| `to.finally?` | () => `void` | - |
+| `to.params?` | `Record`<`string`, `any`\> | params will overwrite form values before submit |
+| `to.then?` | (`result`: `any`) => `void` | - |
+
+___
+
 ### TableProps
 
 Ƭ **TableProps**<`T`, `ExtendTypes`\>: { `extendTypes?`: { `[key: string]`: [`ExtendTableTypeProps`](#extendtabletypeprops);  } ; `faasData?`: [`FaasDataWrapperProps`](#faasdatawrapperprops)<`T`\> ; `items`: ([`TableItemProps`](interfaces/TableItemProps.md) \| `ExtendTypes` & [`ExtendTableItemProps`](#extendtableitemprops))[] ; `onChange?`: (`pagination`: `TablePaginationConfig`, `filters`: `Record`<`string`, `FilterValue` \| ``null``\>, `sorter`: `SorterResult`<`T`\> \| `SorterResult`<`T`\>[], `extra`: `TableCurrentDataSource`<`T`\>) => { `extra`: `TableCurrentDataSource`<`T`\> ; `filters`: `Record`<`string`, `FilterValue` \| ``null``\> ; `pagination`: `TablePaginationConfig` ; `sorter`: `SorterResult`<`T`\> \| `SorterResult`<`T`\>[]  }  } & `AntdTableProps`<`T`\>
@@ -513,7 +533,7 @@ Loading component based on Spin
 | Name | Type |
 | :------ | :------ |
 | `props` | `Object` |
-| `props.size?` | ``"small"`` \| ``"default"`` \| ``"large"`` |
+| `props.size?` | ``"default"`` \| ``"small"`` \| ``"large"`` |
 | `props.style?` | `CSSProperties` |
 
 #### Returns

package/dist/index.d.ts

@@ -232,43 +232,47 @@ declare namespace FormItem {
     };
 }
 
+type FormSubmitProps = {
+    /** Default: Submit */
+    text?: string;
+    /**
+     * Submit to FaasJS server.
+     *
+     * If use onFinish, you should call submit manually.
+     * ```ts
+     * {
+     *   submit: {
+     *     to: {
+     *       action: 'action_name'
+     *     }
+     *   },
+     *   onFinish: (values, submit) => {
+     *     // do something before submit
+     *
+     *     // submit
+     *     await submit({
+     *      ...values,
+     *      extraProps: 'some extra props'
+     *     })
+     *
+     *     // do something after submit
+     *   }
+     * }
+     * ```
+     */
+    to?: {
+        action: string;
+        /** params will overwrite form values before submit */
+        params?: Record<string, any>;
+        then?: (result: any) => void;
+        catch?: (error: any) => void;
+        finally?: () => void;
+    };
+};
 interface FormProps<Values extends Record<string, any> = any, ExtendItemProps = any> extends Omit<FormProps$1<Values>, 'onFinish' | 'children' | 'initialValues'> {
     items?: (FormItemProps | ExtendItemProps | JSX.Element)[];
     /** Default: { text: 'Submit' }, set false to disable it */
-    submit?: false | {
-        /** Default: Submit */
-        text?: string;
-        /**
-         * Submit to FaasJS server.
-         *
-         * If use onFinish, you should call submit manually.
-         * ```ts
-         * {
-         *   submit: {
-         *     to: {
-         *       action: 'action_name'
-         *     }
-         *   },
-         *   onFinish: (values, submit) => {
-         *     // do something before submit
-         *
-         *     // submit
-         *     await submit({
-         *      ...values,
-         *      extraProps: 'some extra props'
-         *     })
-         *
-         *     // do something after submit
-         *   }
-         * }
-         * ```
-         */
-        to?: {
-            action: string;
-            /** params will overwrite form values before submit */
-            params?: Record<string, any>;
-        };
-    };
+    submit?: false | FormSubmitProps;
     onFinish?: (values: Values, submit?: (values: any) => Promise<any>) => Promise<any>;
     beforeItems?: JSX.Element | JSX.Element[];
     footer?: JSX.Element | JSX.Element[];
@@ -438,4 +442,4 @@ interface TitleProps {
  */
 declare function Title(props: TitleProps): JSX.Element;
 
-export { BaseItemProps, BaseOption, Blank, BlankProps, ConfigContext, ConfigProvider, ConfigProviderProps, Description, DescriptionItemContentProps, DescriptionItemProps, DescriptionProps, DrawerProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, ExtendTypes, FaasDataWrapper, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, Link, LinkProps, Loading, ModalProps, PageNotFound, Routes, RoutesProps, Table, TableItemProps, TableProps, Title, TitleProps, setDrawerProps, setModalProps, transferOptions, transferValue, useConfigContext, useDrawer, useModal };
+export { BaseItemProps, BaseOption, Blank, BlankProps, ConfigContext, ConfigProvider, ConfigProviderProps, Description, DescriptionItemContentProps, DescriptionItemProps, DescriptionProps, DrawerProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, ExtendTypes, FaasDataWrapper, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, FormSubmitProps, Link, LinkProps, Loading, ModalProps, PageNotFound, Routes, RoutesProps, Table, TableItemProps, TableProps, Title, TitleProps, setDrawerProps, setModalProps, transferOptions, transferValue, useConfigContext, useDrawer, useModal };

package/dist/index.js

@@ -31,9 +31,7 @@ __export(src_exports, {
   ConfigProvider: () => ConfigProvider,
   Description: () => Description,
   Drawer: () => import_antd5.Drawer,
-  FaasDataInjection: () => import_react3.FaasDataInjection,
   FaasDataWrapper: () => FaasDataWrapper,
-  FaasDataWrapperProps: () => import_react3.FaasDataWrapperProps,
   Form: () => Form,
   FormItem: () => FormItem,
   Link: () => Link,
@@ -768,15 +766,15 @@ function Form(props) {
   const [form] = import_antd7.Form.useForm(props.form);
   const [initialValues, setInitialValues] = (0, import_react8.useState)(props.initialValues);
   (0, import_react8.useEffect)(() => {
-    var _a2, _b2;
+    var _a2, _b2, _c;
     const propsCopy = {
       ...props,
       form
     };
-    if (propsCopy.initialValues) {
+    if (propsCopy.initialValues && ((_a2 = propsCopy.items) == null ? void 0 : _a2.length)) {
       for (const key in propsCopy.initialValues) {
         propsCopy.initialValues[key] = transferValue(
-          (_a2 = propsCopy.items.find((item2) => item2.id === key)) == null ? void 0 : _a2.type,
+          (_b2 = propsCopy.items.find((item2) => item2.id === key)) == null ? void 0 : _b2.type,
           propsCopy.initialValues[key]
         );
         const item = propsCopy.items.find((item2) => item2.id === key);
@@ -807,13 +805,25 @@ function Form(props) {
         }
         setLoading(false);
       };
-    } else if (propsCopy.submit && ((_b2 = propsCopy.submit.to) == null ? void 0 : _b2.action)) {
+    } else if (propsCopy.submit && ((_c = propsCopy.submit.to) == null ? void 0 : _c.action)) {
       propsCopy.onFinish = async (values) => {
         setLoading(true);
         return (0, import_react7.faas)(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
           ...values,
           ...propsCopy.submit.to.params
-        } : values).finally(() => setLoading(false));
+        } : values).then((result) => {
+          if (propsCopy.submit.to.then)
+            propsCopy.submit.to.then(result);
+          return result;
+        }).catch((error) => {
+          if (propsCopy.submit.to.catch)
+            propsCopy.submit.to.catch(error);
+          return Promise.reject(error);
+        }).finally(() => {
+          if (propsCopy.submit.to.finally)
+            propsCopy.submit.to.finally();
+          setLoading(false);
+        });
       };
     }
     if (propsCopy.extendTypes) {
@@ -1473,9 +1483,7 @@ function Title(props) {
   ConfigProvider,
   Description,
   Drawer,
-  FaasDataInjection,
   FaasDataWrapper,
-  FaasDataWrapperProps,
   Form,
   FormItem,
   Link,

package/dist/index.mjs

@@ -130,11 +130,7 @@ import {
 } from "react";
 
 // src/FaasDataWrapper.tsx
-import {
-  FaasDataWrapper as Origin,
-  FaasDataWrapperProps,
-  FaasDataInjection
-} from "@faasjs/react";
+import { FaasDataWrapper as Origin } from "@faasjs/react";
 
 // src/Loading.tsx
 import { Spin } from "antd";
@@ -754,15 +750,15 @@ function Form(props) {
   const [form] = AntdForm2.useForm(props.form);
   const [initialValues, setInitialValues] = useState5(props.initialValues);
   useEffect4(() => {
-    var _a2, _b2;
+    var _a2, _b2, _c;
     const propsCopy = {
       ...props,
       form
     };
-    if (propsCopy.initialValues) {
+    if (propsCopy.initialValues && ((_a2 = propsCopy.items) == null ? void 0 : _a2.length)) {
       for (const key in propsCopy.initialValues) {
         propsCopy.initialValues[key] = transferValue(
-          (_a2 = propsCopy.items.find((item2) => item2.id === key)) == null ? void 0 : _a2.type,
+          (_b2 = propsCopy.items.find((item2) => item2.id === key)) == null ? void 0 : _b2.type,
           propsCopy.initialValues[key]
         );
         const item = propsCopy.items.find((item2) => item2.id === key);
@@ -793,13 +789,25 @@ function Form(props) {
         }
         setLoading(false);
       };
-    } else if (propsCopy.submit && ((_b2 = propsCopy.submit.to) == null ? void 0 : _b2.action)) {
+    } else if (propsCopy.submit && ((_c = propsCopy.submit.to) == null ? void 0 : _c.action)) {
       propsCopy.onFinish = async (values) => {
         setLoading(true);
         return faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
           ...values,
           ...propsCopy.submit.to.params
-        } : values).finally(() => setLoading(false));
+        } : values).then((result) => {
+          if (propsCopy.submit.to.then)
+            propsCopy.submit.to.then(result);
+          return result;
+        }).catch((error) => {
+          if (propsCopy.submit.to.catch)
+            propsCopy.submit.to.catch(error);
+          return Promise.reject(error);
+        }).finally(() => {
+          if (propsCopy.submit.to.finally)
+            propsCopy.submit.to.finally();
+          setLoading(false);
+        });
       };
     }
     if (propsCopy.extendTypes) {
@@ -1480,9 +1488,7 @@ export {
   ConfigProvider,
   Description,
   Drawer,
-  FaasDataInjection,
   FaasDataWrapper,
-  FaasDataWrapperProps,
   Form,
   FormItem,
   Link,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.3-beta.27",
+  "version": "0.0.3-beta.29",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,7 +28,7 @@
     "lodash-es": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.3-beta.27",
+    "@faasjs/react": "^0.0.3-beta.29",
     "react-router-dom": "*",
     "dayjs": "*"
   },