@faasjs/ant-design 0.0.3-beta.3 → 0.0.3-beta.30

package/dist/index.mjs

@@ -12,7 +12,6 @@ import {
   useEffect,
   useState
 } from "react";
-import { ConfigProvider as AntdConfigProvider } from "antd";
 import { defaultsDeep } from "lodash-es";
 import { jsx } from "react/jsx-runtime";
 var isZH = /^zh/i.test(navigator.language);
@@ -72,10 +71,7 @@ function ConfigProvider({
   }, []);
   return /* @__PURE__ */ jsx(ConfigContext.Provider, {
     value: values,
-    children: /* @__PURE__ */ jsx(AntdConfigProvider, {
-      ...config.antd,
-      children
-    })
+    children
   });
 }
 function useConfigContext() {
@@ -132,8 +128,42 @@ import {
   useEffect as useEffect2,
   useState as useState2
 } from "react";
-import { FaasDataWrapper } from "@faasjs/react";
-import { Fragment, jsx as jsx3 } from "react/jsx-runtime";
+
+// src/FaasDataWrapper.tsx
+import { FaasDataWrapper as Origin } from "@faasjs/react";
+
+// src/Loading.tsx
+import { Spin } from "antd";
+import { jsx as jsx3 } from "react/jsx-runtime";
+function Loading(props) {
+  return /* @__PURE__ */ jsx3("div", {
+    style: {
+      ...props.style || {},
+      ...!props.size || props.size === "large" ? {
+        margin: "20vh auto",
+        textAlign: "center"
+      } : {}
+    },
+    children: /* @__PURE__ */ jsx3(Spin, {
+      size: props.size || "large"
+    })
+  });
+}
+
+// src/FaasDataWrapper.tsx
+import { Alert } from "antd";
+import { jsx as jsx4 } from "react/jsx-runtime";
+function FaasDataWrapper(props) {
+  return /* @__PURE__ */ jsx4(Alert.ErrorBoundary, {
+    children: /* @__PURE__ */ jsx4(Origin, {
+      fallback: /* @__PURE__ */ jsx4(Loading, {}),
+      ...props
+    })
+  });
+}
+
+// src/Description.tsx
+import { Fragment, jsx as jsx5 } from "react/jsx-runtime";
 function DescriptionItemContent(props) {
   var _a;
   const [computedProps, setComputedProps] = useState2();
@@ -175,64 +205,67 @@ function DescriptionItemContent(props) {
         }
       );
     else if (computedProps.extendTypes[computedProps.item.type].render)
-      return /* @__PURE__ */ jsx3(Fragment, {
+      return /* @__PURE__ */ jsx5(Fragment, {
         children: computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values)
       });
     else
       throw Error(computedProps.item.type + " requires children or render");
   if (computedProps.item.children)
-    return cloneElement(computedProps.item.children, { value: computedProps.value });
+    return cloneElement(computedProps.item.children, {
+      value: computedProps.value,
+      values: computedProps.values
+    });
   if (computedProps.item.render)
-    return /* @__PURE__ */ jsx3(Fragment, {
+    return /* @__PURE__ */ jsx5(Fragment, {
       children: computedProps.item.render(computedProps.value, computedProps.values)
     });
   if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
-    return /* @__PURE__ */ jsx3(Blank, {});
+    return /* @__PURE__ */ jsx5(Blank, {});
   switch (computedProps.item.type) {
     case "string[]":
-      return /* @__PURE__ */ jsx3(Fragment, {
+      return /* @__PURE__ */ jsx5(Fragment, {
         children: computedProps.value.join(", ")
       });
     case "number":
       return computedProps.value || null;
     case "number[]":
-      return /* @__PURE__ */ jsx3(Fragment, {
+      return /* @__PURE__ */ jsx5(Fragment, {
         children: computedProps.value.join(", ")
       });
     case "boolean":
-      return computedProps.value ? /* @__PURE__ */ jsx3(CheckOutlined, {
+      return computedProps.value ? /* @__PURE__ */ jsx5(CheckOutlined, {
         style: {
           marginTop: "4px",
           color: "#52c41a"
         }
-      }) : /* @__PURE__ */ jsx3(CloseOutlined, {
+      }) : /* @__PURE__ */ jsx5(CloseOutlined, {
         style: {
           marginTop: "4px",
           color: "#ff4d4f"
         }
       });
     case "time":
-      return /* @__PURE__ */ jsx3(Fragment, {
+      return /* @__PURE__ */ jsx5(Fragment, {
         children: computedProps.value.format("YYYY-MM-DD HH:mm:ss")
       });
     case "date":
-      return /* @__PURE__ */ jsx3(Fragment, {
+      return /* @__PURE__ */ jsx5(Fragment, {
         children: computedProps.value.format("YYYY-MM-DD")
       });
     case "object":
       if (!computedProps.value)
-        return /* @__PURE__ */ jsx3(Blank, {});
-      return /* @__PURE__ */ jsx3(Description, {
+        return /* @__PURE__ */ jsx5(Blank, {});
+      return /* @__PURE__ */ jsx5(Description, {
         items: computedProps.item.object,
         dataSource: computedProps.value,
         column: 1
       });
     case "object[]":
       if (!((_a = computedProps.value) == null ? void 0 : _a.length))
-        return /* @__PURE__ */ jsx3(Blank, {});
-      return /* @__PURE__ */ jsx3(Space, {
+        return /* @__PURE__ */ jsx5(Blank, {});
+      return /* @__PURE__ */ jsx5(Space, {
         direction: "vertical",
-        children: computedProps.value.map((value, index) => /* @__PURE__ */ jsx3(Description, {
+        children: computedProps.value.map((value, index) => /* @__PURE__ */ jsx5(Description, {
           items: computedProps.item.object,
           dataSource: value,
           column: 1
@@ -244,13 +277,13 @@ function DescriptionItemContent(props) {
 }
 function Description(props) {
   if (!props.faasData)
-    return /* @__PURE__ */ jsx3(Descriptions, {
+    return /* @__PURE__ */ jsx5(Descriptions, {
       ...props,
       title: isFunction(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
       children: props.items.map((item) => {
-        return !item.if || item.if(props.dataSource) ? /* @__PURE__ */ jsx3(Descriptions.Item, {
+        return !item.if || item.if(props.dataSource) ? /* @__PURE__ */ jsx5(Descriptions.Item, {
           label: item.title || upperFirst2(item.id),
-          children: /* @__PURE__ */ jsx3(DescriptionItemContent, {
+          children: /* @__PURE__ */ jsx5(DescriptionItemContent, {
             item,
             value: props.dataSource[item.id],
             values: props.dataSource,
@@ -259,18 +292,18 @@ function Description(props) {
         }, item.id) : null;
       }).filter(Boolean)
     });
-  return /* @__PURE__ */ jsx3(FaasDataWrapper, {
-    fallback: props.faasData.fallback || /* @__PURE__ */ jsx3(Skeleton, {
+  return /* @__PURE__ */ jsx5(FaasDataWrapper, {
+    fallback: props.faasData.fallback || /* @__PURE__ */ jsx5(Skeleton, {
       active: true
     }),
     render: ({ data }) => {
-      return /* @__PURE__ */ jsx3(Descriptions, {
+      return /* @__PURE__ */ jsx5(Descriptions, {
         ...props,
         title: isFunction(props.renderTitle) ? props.renderTitle(data) : props.title,
         children: props.items.map((item) => {
-          return !item.if || item.if(data) ? /* @__PURE__ */ jsx3(Descriptions.Item, {
+          return !item.if || item.if(data) ? /* @__PURE__ */ jsx5(Descriptions.Item, {
             label: item.title || upperFirst2(item.id),
-            children: /* @__PURE__ */ jsx3(DescriptionItemContent, {
+            children: /* @__PURE__ */ jsx5(DescriptionItemContent, {
               item,
               value: data[item.id],
               values: data,
@@ -287,7 +320,7 @@ function Description(props) {
 // src/Drawer.tsx
 import { Drawer } from "antd";
 import { useState as useState3 } from "react";
-import { jsx as jsx4 } from "react/jsx-runtime";
+import { jsx as jsx6 } from "react/jsx-runtime";
 function useDrawer(init) {
   const [props, setProps] = useState3({
     open: false,
@@ -298,7 +331,7 @@ function useDrawer(init) {
     ...init
   });
   return {
-    drawer: /* @__PURE__ */ jsx4(Drawer, {
+    drawer: /* @__PURE__ */ jsx6(Drawer, {
       ...props
     }),
     drawerProps: props,
@@ -320,7 +353,8 @@ import {
 import {
   useEffect as useEffect4,
   useState as useState5,
-  useCallback
+  useCallback,
+  isValidElement
 } from "react";
 
 // src/FormItem.tsx
@@ -342,7 +376,7 @@ import {
   useState as useState4
 } from "react";
 import { upperFirst as upperFirst3 } from "lodash-es";
-import { Fragment as Fragment2, jsx as jsx5, jsxs } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx7, jsxs } from "react/jsx-runtime";
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
     propsCopy.title = upperFirst3(propsCopy.id);
@@ -360,13 +394,13 @@ function processProps(propsCopy, config) {
         required: true,
         validator: async (_, values) => {
           if (!values || values.length < 1)
-            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} ${config.common.required}`));
+            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} ${config.required}`));
         }
       });
     else
       propsCopy.rules.push({
         required: true,
-        message: `${propsCopy.label || propsCopy.title} ${config.common.required}`
+        message: `${propsCopy.label || propsCopy.title} ${config.required}`
       });
   }
   if (!propsCopy.input)
@@ -393,8 +427,8 @@ function FormItem(props) {
   var _a;
   const [computedProps, setComputedProps] = useState4();
   const [extendTypes, setExtendTypes] = useState4();
-  const config = useConfigContext();
-  const [hidden, setHidden] = useState4(false);
+  const { common: common2 } = useConfigContext();
+  const [hidden, setHidden] = useState4(props.hidden || false);
   useEffect3(() => {
     const propsCopy = { ...props };
     if (propsCopy.extendTypes) {
@@ -403,98 +437,102 @@ function FormItem(props) {
     }
     if (propsCopy.if) {
       const condition = propsCopy.if;
-      propsCopy.shouldUpdate = (_, cur) => {
+      const originShouldUpdate = propsCopy.shouldUpdate;
+      propsCopy.shouldUpdate = (prev, cur) => {
         const show = condition(cur);
+        const shouldUpdate = hidden !== show;
         setHidden(!show);
-        return show;
+        const origin = originShouldUpdate ? typeof originShouldUpdate === "boolean" ? originShouldUpdate : originShouldUpdate(prev, cur, {}) : true;
+        return shouldUpdate || origin;
       };
       delete propsCopy.if;
+      delete propsCopy.hidden;
     }
-    setComputedProps(processProps(propsCopy, config));
+    setComputedProps(processProps(propsCopy, common2));
   }, [props]);
   if (!computedProps)
     return null;
   if (hidden)
-    return /* @__PURE__ */ jsx5(AntdForm.Item, {
+    return /* @__PURE__ */ jsx7(AntdForm.Item, {
       ...computedProps,
       noStyle: true,
       rules: [],
-      children: /* @__PURE__ */ jsx5(Input, {
+      children: /* @__PURE__ */ jsx7(Input, {
         hidden: true
       })
     });
   if (extendTypes && extendTypes[computedProps.type])
-    return /* @__PURE__ */ jsx5(AntdForm.Item, {
+    return /* @__PURE__ */ jsx7(AntdForm.Item, {
       ...computedProps,
       children: extendTypes[computedProps.type].children
     });
   if (computedProps.children)
-    return /* @__PURE__ */ jsx5(AntdForm.Item, {
+    return /* @__PURE__ */ jsx7(AntdForm.Item, {
       ...computedProps,
       children: computedProps.children
     });
   if (computedProps.render)
-    return /* @__PURE__ */ jsx5(AntdForm.Item, {
+    return /* @__PURE__ */ jsx7(AntdForm.Item, {
       ...computedProps,
       children: computedProps.render()
     });
   switch (computedProps.type) {
     case "string":
-      return /* @__PURE__ */ jsx5(AntdForm.Item, {
+      return /* @__PURE__ */ jsx7(AntdForm.Item, {
         ...computedProps,
-        children: computedProps.options ? /* @__PURE__ */ jsx5(Select, {
+        children: computedProps.options ? /* @__PURE__ */ jsx7(Select, {
           ...computedProps.input
-        }) : /* @__PURE__ */ jsx5(Input, {
+        }) : /* @__PURE__ */ jsx7(Input, {
           ...computedProps.input
         })
       });
     case "string[]":
       if (computedProps.options)
-        return /* @__PURE__ */ jsx5(AntdForm.Item, {
+        return /* @__PURE__ */ jsx7(AntdForm.Item, {
           ...computedProps,
-          children: /* @__PURE__ */ jsx5(Select, {
+          children: /* @__PURE__ */ jsx7(Select, {
             mode: "multiple",
             ...computedProps.input
           })
         });
-      return /* @__PURE__ */ jsx5(AntdForm.List, {
+      return /* @__PURE__ */ jsx7(AntdForm.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
           var _a2;
           return /* @__PURE__ */ jsxs(Fragment2, {
             children: [
-              computedProps.label && /* @__PURE__ */ jsx5("div", {
+              computedProps.label && /* @__PURE__ */ jsx7("div", {
                 className: "ant-form-item-label",
-                children: /* @__PURE__ */ jsx5("label", {
+                children: /* @__PURE__ */ jsx7("label", {
                   className: computedProps.rules.find((r) => r.required) && "ant-form-item-required",
                   children: computedProps.label
                 })
               }),
               fields.map((field) => {
                 var _a3;
-                return /* @__PURE__ */ jsx5(AntdForm.Item, {
+                return /* @__PURE__ */ jsx7(AntdForm.Item, {
                   children: /* @__PURE__ */ jsxs(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ jsx5(Col, {
+                      /* @__PURE__ */ jsx7(Col, {
                         span: 23,
-                        children: /* @__PURE__ */ jsx5(AntdForm.Item, {
+                        children: /* @__PURE__ */ jsx7(AntdForm.Item, {
                           ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ jsx5(Input, {
+                          children: /* @__PURE__ */ jsx7(Input, {
                             ...computedProps.input
                           })
                         })
                       }),
-                      /* @__PURE__ */ jsx5(Col, {
+                      /* @__PURE__ */ jsx7(Col, {
                         span: 1,
-                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx5(Button, {
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx7(Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
-                          icon: /* @__PURE__ */ jsx5(MinusCircleOutlined, {}),
+                          icon: /* @__PURE__ */ jsx7(MinusCircleOutlined, {}),
                           onClick: () => remove(field.name)
                         })
                       })
@@ -504,13 +542,13 @@ function FormItem(props) {
               }),
               /* @__PURE__ */ jsxs(AntdForm.Item, {
                 children: [
-                  !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx5(Button, {
+                  !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx7(Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
-                    icon: /* @__PURE__ */ jsx5(PlusOutlined, {})
+                    icon: /* @__PURE__ */ jsx7(PlusOutlined, {})
                   }),
-                  /* @__PURE__ */ jsx5(AntdForm.ErrorList, {
+                  /* @__PURE__ */ jsx7(AntdForm.ErrorList, {
                     errors
                   })
                 ]
@@ -520,63 +558,63 @@ function FormItem(props) {
         }
       });
     case "number":
-      return /* @__PURE__ */ jsx5(AntdForm.Item, {
+      return /* @__PURE__ */ jsx7(AntdForm.Item, {
         ...computedProps,
-        children: computedProps.options ? /* @__PURE__ */ jsx5(Select, {
+        children: computedProps.options ? /* @__PURE__ */ jsx7(Select, {
           ...computedProps.input
-        }) : /* @__PURE__ */ jsx5(InputNumber, {
+        }) : /* @__PURE__ */ jsx7(InputNumber, {
           style: { width: "100%" },
           ...computedProps.input
         })
       });
     case "number[]":
       if (computedProps.options)
-        return /* @__PURE__ */ jsx5(AntdForm.Item, {
+        return /* @__PURE__ */ jsx7(AntdForm.Item, {
           ...computedProps,
-          children: /* @__PURE__ */ jsx5(Select, {
+          children: /* @__PURE__ */ jsx7(Select, {
             mode: "multiple",
             ...computedProps.input
           })
         });
-      return /* @__PURE__ */ jsx5(AntdForm.List, {
+      return /* @__PURE__ */ jsx7(AntdForm.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
           var _a2, _b;
           return /* @__PURE__ */ jsxs(Fragment2, {
             children: [
-              computedProps.label && /* @__PURE__ */ jsx5("div", {
+              computedProps.label && /* @__PURE__ */ jsx7("div", {
                 className: "ant-form-item-label",
-                children: /* @__PURE__ */ jsx5("label", {
+                children: /* @__PURE__ */ jsx7("label", {
                   className: ((_a2 = computedProps.rules) == null ? void 0 : _a2.find((r) => r.required)) && "ant-form-item-required",
                   children: computedProps.label
                 })
               }),
               fields.map((field) => {
                 var _a3;
-                return /* @__PURE__ */ jsx5(AntdForm.Item, {
+                return /* @__PURE__ */ jsx7(AntdForm.Item, {
                   children: /* @__PURE__ */ jsxs(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ jsx5(Col, {
+                      /* @__PURE__ */ jsx7(Col, {
                         span: 23,
-                        children: /* @__PURE__ */ jsx5(AntdForm.Item, {
+                        children: /* @__PURE__ */ jsx7(AntdForm.Item, {
                           ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ jsx5(InputNumber, {
+                          children: /* @__PURE__ */ jsx7(InputNumber, {
                             style: { width: "100%" },
                             ...computedProps.input
                           })
                         })
                       }),
-                      /* @__PURE__ */ jsx5(Col, {
+                      /* @__PURE__ */ jsx7(Col, {
                         span: 1,
-                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx5(Button, {
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx7(Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
-                          icon: /* @__PURE__ */ jsx5(MinusCircleOutlined, {}),
+                          icon: /* @__PURE__ */ jsx7(MinusCircleOutlined, {}),
                           onClick: () => remove(field.name)
                         })
                       })
@@ -586,13 +624,13 @@ function FormItem(props) {
               }),
               /* @__PURE__ */ jsxs(AntdForm.Item, {
                 children: [
-                  !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx5(Button, {
+                  !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx7(Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
-                    icon: /* @__PURE__ */ jsx5(PlusOutlined, {})
+                    icon: /* @__PURE__ */ jsx7(PlusOutlined, {})
                   }),
-                  /* @__PURE__ */ jsx5(AntdForm.ErrorList, {
+                  /* @__PURE__ */ jsx7(AntdForm.ErrorList, {
                     errors
                   })
                 ]
@@ -602,43 +640,43 @@ function FormItem(props) {
         }
       });
     case "boolean":
-      return /* @__PURE__ */ jsx5(AntdForm.Item, {
+      return /* @__PURE__ */ jsx7(AntdForm.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ jsx5(Switch, {
+        children: /* @__PURE__ */ jsx7(Switch, {
           ...computedProps.input
         })
       });
     case "date":
-      return /* @__PURE__ */ jsx5(AntdForm.Item, {
+      return /* @__PURE__ */ jsx7(AntdForm.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ jsx5(DatePicker, {
+        children: /* @__PURE__ */ jsx7(DatePicker, {
           ...computedProps.input
         })
       });
     case "time":
-      return /* @__PURE__ */ jsx5(AntdForm.Item, {
+      return /* @__PURE__ */ jsx7(AntdForm.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ jsx5(TimePicker, {
+        children: /* @__PURE__ */ jsx7(TimePicker, {
           ...computedProps.input
         })
       });
     case "object":
       return /* @__PURE__ */ jsxs(Fragment2, {
         children: [
-          computedProps.label && /* @__PURE__ */ jsx5("div", {
+          computedProps.label && /* @__PURE__ */ jsx7("div", {
             className: "ant-form-item-label",
-            children: /* @__PURE__ */ jsx5("label", {
+            children: /* @__PURE__ */ jsx7("label", {
               className: ((_a = computedProps.rules) == null ? void 0 : _a.find((r) => r.required)) && "ant-form-item-required",
               children: computedProps.label
             })
           }),
-          computedProps.object.map((o) => /* @__PURE__ */ jsx5(FormItem, {
+          computedProps.object.map((o) => /* @__PURE__ */ jsx7(FormItem, {
             ...o
           }, o.id))
         ]
       });
     case "object[]":
-      return /* @__PURE__ */ jsx5(AntdForm.List, {
+      return /* @__PURE__ */ jsx7(AntdForm.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs(Fragment2, {
@@ -646,27 +684,27 @@ function FormItem(props) {
             fields.map((field) => /* @__PURE__ */ jsxs(AntdForm.Item, {
               style: { marginBottom: 0 },
               children: [
-                /* @__PURE__ */ jsx5("div", {
+                /* @__PURE__ */ jsx7("div", {
                   className: "ant-form-item-label",
                   children: /* @__PURE__ */ jsxs("label", {
                     children: [
                       computedProps.label,
                       " ",
                       field.name + 1,
-                      !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx5(Button, {
+                      !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx7(Button, {
                         danger: true,
                         type: "link",
                         onClick: () => remove(field.name),
-                        children: config.common.delete
+                        children: common2.delete
                       })
                     ]
                   })
                 }),
-                /* @__PURE__ */ jsx5(Row, {
+                /* @__PURE__ */ jsx7(Row, {
                   gutter: 24,
-                  children: computedProps.object.map((o) => /* @__PURE__ */ jsx5(Col, {
+                  children: computedProps.object.map((o) => /* @__PURE__ */ jsx7(Col, {
                     span: o.col || 24,
-                    children: /* @__PURE__ */ jsx5(FormItem, {
+                    children: /* @__PURE__ */ jsx7(FormItem, {
                       ...o,
                       name: [field.name, o.id]
                     })
@@ -680,14 +718,14 @@ function FormItem(props) {
                   type: "dashed",
                   block: true,
                   onClick: () => add(),
-                  icon: /* @__PURE__ */ jsx5(PlusOutlined, {}),
+                  icon: /* @__PURE__ */ jsx7(PlusOutlined, {}),
                   children: [
-                    config.common.add,
+                    common2.add,
                     " ",
                     computedProps.label
                   ]
                 }),
-                /* @__PURE__ */ jsx5(AntdForm.ErrorList, {
+                /* @__PURE__ */ jsx7(AntdForm.ErrorList, {
                   errors
                 })
               ]
@@ -699,9 +737,10 @@ function FormItem(props) {
       return null;
   }
 }
+FormItem.useStatus = AntdForm.Item.useStatus;
 
 // src/Form.tsx
-import { jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs2 } from "react/jsx-runtime";
 function Form(props) {
   var _a, _b;
   const [loading, setLoading] = useState5(false);
@@ -711,17 +750,25 @@ 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) {
-      for (const key in 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((item) => item.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);
+        if (item == null ? void 0 : item.if)
+          item.hidden = !item.if(propsCopy.initialValues);
+      }
+      for (const item of propsCopy.items) {
+        if (item.if)
+          item.hidden = !item.if(propsCopy.initialValues);
+      }
       setInitialValues(propsCopy.initialValues);
       delete propsCopy.initialValues;
     }
@@ -742,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) {
@@ -758,6 +817,7 @@ function Form(props) {
     setComputedProps(propsCopy);
   }, [props]);
   const onValuesChange = useCallback((changedValues, allValues) => {
+    console.debug("Form:onValuesChange", changedValues, allValues);
     if (props.onValuesChange) {
       props.onValuesChange(changedValues, allValues);
     }
@@ -772,6 +832,7 @@ function Form(props) {
   useEffect4(() => {
     if (!initialValues)
       return;
+    console.debug("Form:initialValues", initialValues);
     form.setFieldsValue(initialValues);
     setInitialValues(null);
   }, [computedProps]);
@@ -782,12 +843,12 @@ function Form(props) {
     onValuesChange,
     children: [
       computedProps.beforeItems,
-      (_a = computedProps.items) == null ? void 0 : _a.map((item) => /* @__PURE__ */ jsx6(FormItem, {
+      (_a = computedProps.items) == null ? void 0 : _a.map((item) => isValidElement(item) ? item : /* @__PURE__ */ jsx8(FormItem, {
         ...item,
         extendTypes
       }, item.id)),
       computedProps.children,
-      computedProps.submit !== false && /* @__PURE__ */ jsx6(Button2, {
+      computedProps.submit !== false && /* @__PURE__ */ jsx8(Button2, {
         htmlType: "submit",
         type: "primary",
         loading,
@@ -798,11 +859,17 @@ function Form(props) {
   });
 }
 Form.useForm = AntdForm2.useForm;
+Form.useFormInstance = AntdForm2.useFormInstance;
+Form.useWatch = AntdForm2.useWatch;
+Form.Item = FormItem;
+Form.List = AntdForm2.List;
+Form.ErrorList = AntdForm2.ErrorList;
+Form.Provider = AntdForm2.Provider;
 
 // src/Link.tsx
 import { Link as RouterLink } from "react-router-dom";
 import { Button as Button3 } from "antd";
-import { jsx as jsx7 } from "react/jsx-runtime";
+import { jsx as jsx9 } from "react/jsx-runtime";
 function Link({
   href,
   target,
@@ -815,56 +882,54 @@ function Link({
   style = Object.assign({ cursor: "pointer" }, style);
   if (href.startsWith("http")) {
     if (button)
-      return /* @__PURE__ */ jsx7(Button3, {
+      return /* @__PURE__ */ jsx9(Button3, {
         ...button,
-        children: /* @__PURE__ */ jsx7("a", {
-          href,
-          target: target || (Link2 == null ? void 0 : Link2.target) || "_blank",
-          style: {
-            ...Link2.style,
-            ...style || {}
-          },
-          children: text || children
-        })
+        target: target || (Link2 == null ? void 0 : Link2.target) || "_blank",
+        style: {
+          ...Link2.style,
+          ...style || {}
+        },
+        href,
+        children: text != null ? text : children
       });
-    return /* @__PURE__ */ jsx7("a", {
+    return /* @__PURE__ */ jsx9("a", {
       href,
       target: target || (Link2 == null ? void 0 : Link2.target) || "_blank",
       style: {
         ...Link2.style,
         ...style || {}
       },
-      children: text || children
+      children: text != null ? text : children
     });
   }
   if (button)
-    return /* @__PURE__ */ jsx7(Button3, {
-      ...button,
-      children: /* @__PURE__ */ jsx7(RouterLink, {
-        to: href,
-        target: target || (Link2 == null ? void 0 : Link2.target),
+    return /* @__PURE__ */ jsx9(RouterLink, {
+      to: href,
+      target: target || (Link2 == null ? void 0 : Link2.target),
+      children: /* @__PURE__ */ jsx9(Button3, {
+        ...button,
         style: {
           ...Link2.style,
           ...style || {}
         },
-        children: text || children
+        children: text != null ? text : children
       })
     });
-  return /* @__PURE__ */ jsx7(RouterLink, {
+  return /* @__PURE__ */ jsx9(RouterLink, {
     to: href,
     target: target || (Link2 == null ? void 0 : Link2.target),
     style: {
       ...Link2.style,
       ...style || {}
     },
-    children: text || children
+    children: text != null ? text : children
   });
 }
 
 // src/Modal.tsx
 import { Modal } from "antd";
 import { useState as useState6 } from "react";
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { jsx as jsx10 } from "react/jsx-runtime";
 function useModal(init) {
   const [props, setProps] = useState6({
     open: false,
@@ -875,7 +940,7 @@ function useModal(init) {
     ...init
   });
   return {
-    modal: /* @__PURE__ */ jsx8(Modal, {
+    modal: /* @__PURE__ */ jsx10(Modal, {
       ...props
     }),
     modalProps: props,
@@ -889,7 +954,11 @@ function useModal(init) {
 }
 
 // src/Routers.tsx
-import { Result, Skeleton as Skeleton2 } from "antd";
+import {
+  Result,
+  Skeleton as Skeleton2,
+  Alert as Alert2
+} from "antd";
 import {
   Suspense
 } from "react";
@@ -897,34 +966,36 @@ import {
   Routes as OriginRoutes,
   Route
 } from "react-router-dom";
-import { jsx as jsx9, jsxs as jsxs3 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs3 } from "react/jsx-runtime";
 function PageNotFound() {
   const config = useConfigContext();
-  return /* @__PURE__ */ jsx9(Result, {
+  return /* @__PURE__ */ jsx11(Result, {
     status: "404",
     title: config.common.pageNotFound
   });
 }
 function Routes(props) {
-  return /* @__PURE__ */ jsxs3(OriginRoutes, {
-    children: [
-      props.routes.map((r) => /* @__PURE__ */ jsx9(Route, {
-        ...r,
-        element: r.element || /* @__PURE__ */ jsx9(Suspense, {
-          fallback: props.fallback || /* @__PURE__ */ jsx9("div", {
-            style: { padding: "24px" },
-            children: /* @__PURE__ */ jsx9(Skeleton2, {
-              active: true
-            })
-          }),
-          children: /* @__PURE__ */ jsx9(r.page, {})
-        })
-      }, r.path)),
-      /* @__PURE__ */ jsx9(Route, {
-        path: "*",
-        element: props.notFound || /* @__PURE__ */ jsx9(PageNotFound, {})
-      }, "*")
-    ]
+  return /* @__PURE__ */ jsx11(Alert2.ErrorBoundary, {
+    children: /* @__PURE__ */ jsxs3(OriginRoutes, {
+      children: [
+        props.routes.map((r) => /* @__PURE__ */ jsx11(Route, {
+          ...r,
+          element: r.element || /* @__PURE__ */ jsx11(Suspense, {
+            fallback: props.fallback || /* @__PURE__ */ jsx11("div", {
+              style: { padding: "24px" },
+              children: /* @__PURE__ */ jsx11(Skeleton2, {
+                active: true
+              })
+            }),
+            children: /* @__PURE__ */ jsx11(r.page, {})
+          })
+        }, r.path)),
+        /* @__PURE__ */ jsx11(Route, {
+          path: "*",
+          element: props.notFound || /* @__PURE__ */ jsx11(PageNotFound, {})
+        }, "*")
+      ]
+    })
   });
 }
 
@@ -947,13 +1018,12 @@ import {
   uniqBy,
   upperFirst as upperFirst4
 } from "lodash-es";
-import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
-import { jsx as jsx10, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx12, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
   var _a;
   const transferred = transferValue(item.type, value);
   if (transferred === null || Array.isArray(transferred) && transferred.length === 0)
-    return /* @__PURE__ */ jsx10(Blank, {});
+    return /* @__PURE__ */ jsx12(Blank, {});
   if (item.options) {
     if (item.type.endsWith("[]"))
       return transferred.map((v) => {
@@ -992,10 +1062,19 @@ function Table(props) {
         item.filters = item.options.map((o) => ({
           text: o.label,
           value: o.value
-        }));
+        })).concat({
+          text: /* @__PURE__ */ jsx12(Blank, {}),
+          value: null
+        });
       }
       if (item.children)
-        delete item.children;
+        item.render = (value, values) => cloneElement2(
+          item.children,
+          {
+            value,
+            values
+          }
+        );
       if (props.extendTypes && props.extendTypes[item.type]) {
         if (props.extendTypes[item.type].children)
           item.render = (value, values) => cloneElement2(
@@ -1028,7 +1107,7 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx10(Input2.Search, {
+            }) => /* @__PURE__ */ jsx12(Input2.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1058,7 +1137,7 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx10(Input2.Search, {
+            }) => /* @__PURE__ */ jsx12(Input2.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1081,14 +1160,14 @@ function Table(props) {
             item.onFilter = (value, row) => {
               if (value === null && isNil2(row[item.id]))
                 return true;
-              return value === row[item.id];
+              return value == row[item.id];
             };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx10(Input2.Search, {
+            }) => /* @__PURE__ */ jsx12(Input2.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1111,14 +1190,14 @@ function Table(props) {
                 return true;
               if (!row[item.id] || !row[item.id].length)
                 return false;
-              return row[item.id].includes(value);
+              return row[item.id].includes(Number(value));
             };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx10(Input2.Search, {
+            }) => /* @__PURE__ */ jsx12(Input2.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1134,12 +1213,12 @@ function Table(props) {
           break;
         case "boolean":
           if (!item.render)
-            item.render = (value) => typeof value === "undefined" ? /* @__PURE__ */ jsx10(Blank, {}) : value ? /* @__PURE__ */ jsx10(CheckOutlined2, {
+            item.render = (value) => typeof value === "undefined" ? /* @__PURE__ */ jsx12(Blank, {}) : value ? /* @__PURE__ */ jsx12(CheckOutlined2, {
               style: {
                 marginTop: "4px",
                 color: "#52c41a"
               }
-            }) : /* @__PURE__ */ jsx10(CloseOutlined2, {
+            }) : /* @__PURE__ */ jsx12(CloseOutlined2, {
               style: {
                 marginTop: "4px",
                 color: "#ff4d4f"
@@ -1159,28 +1238,28 @@ function Table(props) {
                 confirm();
               },
               children: [
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx12(Radio.Button, {
                   children: common2.all
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx12(Radio.Button, {
                   value: "true",
-                  children: /* @__PURE__ */ jsx10(CheckOutlined2, {
+                  children: /* @__PURE__ */ jsx12(CheckOutlined2, {
                     style: {
                       color: "#52c41a",
                       verticalAlign: "middle"
                     }
                   })
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx12(Radio.Button, {
                   value: "false",
-                  children: /* @__PURE__ */ jsx10(CloseOutlined2, {
+                  children: /* @__PURE__ */ jsx12(CloseOutlined2, {
                     style: {
                       verticalAlign: "middle",
                       color: "#ff4d4f"
                     }
                   })
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx12(Radio.Button, {
                   value: "empty",
                   children: common2.blank
                 })
@@ -1218,7 +1297,7 @@ function Table(props) {
           break;
         case "object":
           if (!item.render)
-            item.render = (value) => /* @__PURE__ */ jsx10(Description, {
+            item.render = (value) => /* @__PURE__ */ jsx12(Description, {
               items: item.object,
               dataSource: value || {},
               column: 1
@@ -1226,7 +1305,7 @@ function Table(props) {
           break;
         case "object[]":
           if (!item.render)
-            item.render = (value) => value.map((v, i) => /* @__PURE__ */ jsx10(Description, {
+            item.render = (value) => value.map((v, i) => /* @__PURE__ */ jsx12(Description, {
               items: item.object,
               dataSource: v || [],
               column: 1
@@ -1251,89 +1330,133 @@ function Table(props) {
       return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
-        setColumns((prev) => {
-          const newColumns = [...prev];
-          const index = newColumns.findIndex((item) => item.id === column.id);
-          newColumns[index].filters = uniqBy(props.dataSource, column.id).map((v) => ({
-            text: v[column.id],
-            value: v[column.id]
-          })).concat({
-            text: /* @__PURE__ */ jsx10(Blank, {}),
-            value: null
+        const filters = uniqBy(props.dataSource, column.id).map((v) => ({
+          text: v[column.id],
+          value: v[column.id]
+        }));
+        if (filters.length)
+          setColumns((prev) => {
+            const newColumns = [...prev];
+            const index = newColumns.findIndex((item) => item.id === column.id);
+            newColumns[index].filters = filters.concat({
+              text: /* @__PURE__ */ jsx12(Blank, {}),
+              value: null
+            });
+            return newColumns;
           });
-          return newColumns;
-        });
       }
     }
   }, [props.dataSource, columns]);
   if (!columns)
     return null;
   if (!props.faasData)
-    return /* @__PURE__ */ jsx10(AntdTable, {
+    return /* @__PURE__ */ jsx12(AntdTable, {
       ...props,
       rowKey: props.rowKey || "id",
       columns,
       dataSource: props.dataSource
     });
-  return /* @__PURE__ */ jsx10(FaasDataWrapper2, {
-    fallback: props.faasData.fallback || /* @__PURE__ */ jsx10(Skeleton3, {
+  return /* @__PURE__ */ jsx12(FaasDataWrapper, {
+    fallback: props.faasData.fallback || /* @__PURE__ */ jsx12(Skeleton3, {
       active: true
     }),
-    render: ({
-      data,
-      params,
-      reload
-    }) => {
-      if (!data)
-        return /* @__PURE__ */ jsx10(AntdTable, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: []
-        });
-      if (Array.isArray(data))
-        return /* @__PURE__ */ jsx10(AntdTable, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: data
-        });
-      return /* @__PURE__ */ jsx10(AntdTable, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: data.rows,
-        pagination: {
-          ...props.pagination,
-          ...data.pagination
-        },
-        onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange) {
-            const processed = props.onChange(pagination, filters, sorter, extra);
-            reload({
-              ...params,
-              pagination: processed.pagination,
-              filters: processed.filters,
-              sorter: processed.sorter
-            });
-            return;
-          }
-          reload({
-            ...params,
-            pagination,
-            filters,
-            sorter
+    ...props.faasData,
+    children: /* @__PURE__ */ jsx12(FaasDataTable, {
+      props,
+      columns
+    })
+  });
+}
+function FaasDataTable({
+  props,
+  columns,
+  data,
+  params,
+  reload
+}) {
+  const [currentColumns, setCurrentColumns] = useState7(columns);
+  useEffect5(() => {
+    if (!data || Array.isArray(data))
+      return;
+    setCurrentColumns((prev) => {
+      const newColumns = [...prev];
+      for (const column of newColumns) {
+        if (data["options"] && data.options[column.id]) {
+          column.options = data["options"][column.id];
+          column.filters = data["options"][column.id].map((v) => ({
+            text: v.label,
+            value: v.value
+          })).concat({
+            text: /* @__PURE__ */ jsx12(Blank, {}),
+            value: null
           });
+          column.render = (value) => processValue(column, value);
+          if (column.filterDropdown)
+            delete column.filterDropdown;
+          continue;
         }
-      });
+        if (column.optionsType === "auto" && !column.options && !column.filters) {
+          const filters = uniqBy(props.dataSource, column.id).map((v) => ({
+            text: v[column.id],
+            value: v[column.id]
+          }));
+          if (filters.length)
+            column.filters = filters.concat({
+              text: /* @__PURE__ */ jsx12(Blank, {}),
+              value: null
+            });
+        }
+      }
+      return newColumns;
+    });
+  }, [columns, data]);
+  if (!data)
+    return /* @__PURE__ */ jsx12(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: []
+    });
+  if (Array.isArray(data))
+    return /* @__PURE__ */ jsx12(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: data
+    });
+  return /* @__PURE__ */ jsx12(AntdTable, {
+    ...props,
+    rowKey: props.rowKey || "id",
+    columns: currentColumns,
+    dataSource: data.rows,
+    pagination: {
+      ...props.pagination,
+      ...data.pagination
     },
-    ...props.faasData
+    onChange: (pagination, filters, sorter, extra) => {
+      if (props.onChange) {
+        const processed = props.onChange(pagination, filters, sorter, extra);
+        reload({
+          ...params,
+          pagination: processed.pagination,
+          filters: processed.filters,
+          sorter: processed.sorter
+        });
+        return;
+      }
+      reload({
+        ...params,
+        pagination,
+        filters,
+        sorter
+      });
+    }
   });
 }
 
 // src/Title.tsx
 import { useEffect as useEffect6, cloneElement as cloneElement3 } from "react";
-import { Fragment as Fragment3, jsx as jsx11 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx13 } from "react/jsx-runtime";
 function Title(props) {
   const { Title: Title2 } = useConfigContext();
   useEffect6(() => {
@@ -1342,17 +1465,17 @@ function Title(props) {
   }, [props]);
   if (props.h1) {
     if (typeof props.h1 === "boolean")
-      return /* @__PURE__ */ jsx11("h1", {
+      return /* @__PURE__ */ jsx13("h1", {
         children: Array.isArray(props.title) ? props.title[0] : props.title
       });
-    return /* @__PURE__ */ jsx11("h1", {
+    return /* @__PURE__ */ jsx13("h1", {
       className: props.h1.className,
       style: props.h1.style,
       children: Array.isArray(props.title) ? props.title[0] : props.title
     });
   }
   if (props.plain)
-    return /* @__PURE__ */ jsx11(Fragment3, {
+    return /* @__PURE__ */ jsx13(Fragment3, {
       children: Array.isArray(props.title) ? props.title[0] : props.title
     });
   if (props.children)
@@ -1365,9 +1488,11 @@ export {
   ConfigProvider,
   Description,
   Drawer,
+  FaasDataWrapper,
   Form,
   FormItem,
   Link,
+  Loading,
   Modal,
   PageNotFound,
   Routes,