@faasjs/ant-design 0.0.3-beta.5 → 0.0.3-beta.50

package/dist/index.js

@@ -31,10 +31,13 @@ __export(src_exports, {
   ConfigProvider: () => ConfigProvider,
   Description: () => Description,
   Drawer: () => import_antd4.Drawer,
+  ErrorBoundary: () => ErrorBoundary,
+  FaasDataWrapper: () => FaasDataWrapper,
   Form: () => Form,
   FormItem: () => FormItem,
   Link: () => Link,
-  Modal: () => import_antd8.Modal,
+  Loading: () => Loading,
+  Modal: () => import_antd9.Modal,
   PageNotFound: () => PageNotFound,
   Routes: () => Routes,
   Table: () => Table,
@@ -51,12 +54,11 @@ module.exports = __toCommonJS(src_exports);
 var import_react = __toESM(require("react"));
 
 // src/Blank.tsx
-var import_antd2 = require("antd");
+var import_antd = require("antd");
 var import_lodash_es2 = require("lodash-es");
 
 // src/Config.tsx
 var import_react2 = require("react");
-var import_antd = require("antd");
 var import_lodash_es = require("lodash-es");
 var import_jsx_runtime = require("react/jsx-runtime");
 var isZH = /^zh/i.test(navigator.language);
@@ -112,14 +114,11 @@ function ConfigProvider({
         Form: { submit: { text: zh.submit } }
       }, baseConfig));
     } else
-      setValues(values);
+      setValues((0, import_lodash_es.defaultsDeep)(config, values));
   }, []);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ConfigContext.Provider, {
     value: values,
-    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.ConfigProvider, {
-      ...config.antd,
-      children
-    })
+    children
   });
 }
 function useConfigContext() {
@@ -130,7 +129,7 @@ function useConfigContext() {
 var import_jsx_runtime = require("react/jsx-runtime");
 function Blank(options) {
   const { Blank: Blank2 } = useConfigContext();
-  return !options || (0, import_lodash_es2.isNil)(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd2.Typography.Text, {
+  return !options || (0, import_lodash_es2.isNil)(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Typography.Text, {
     disabled: true,
     children: (options == null ? void 0 : options.text) || Blank2.text
   }) : options.value;
@@ -167,13 +166,50 @@ function transferValue(type, value) {
 var import_icons = require("@ant-design/icons");
 var import_antd3 = require("antd");
 var import_lodash_es4 = require("lodash-es");
-var import_react3 = require("react");
-var import_react4 = require("@faasjs/react");
+var import_react4 = require("react");
+
+// src/FaasDataWrapper.tsx
+var import_react3 = require("@faasjs/react");
+
+// src/Loading.tsx
+var import_antd2 = require("antd");
+var import_jsx_runtime = require("react/jsx-runtime");
+function Loading(props) {
+  if (props.loading === false)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+      children: props.children
+    });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+    style: {
+      ...props.style || {},
+      ...!props.size || props.size === "large" ? {
+        margin: "20vh auto",
+        textAlign: "center"
+      } : {}
+    },
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd2.Spin, {
+      size: props.size || "large"
+    })
+  });
+}
+
+// src/FaasDataWrapper.tsx
+var import_jsx_runtime = require("react/jsx-runtime");
+function FaasDataWrapper(props) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react3.FaasDataWrapper, {
+    fallback: props.loading || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {
+      ...props.loadingProps
+    }),
+    ...props
+  });
+}
+
+// src/Description.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function DescriptionItemContent(props) {
   var _a;
-  const [computedProps, setComputedProps] = (0, import_react3.useState)();
-  (0, import_react3.useEffect)(() => {
+  const [computedProps, setComputedProps] = (0, import_react4.useState)();
+  (0, import_react4.useEffect)(() => {
     var _a2, _b;
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
@@ -203,25 +239,40 @@ function DescriptionItemContent(props) {
     return null;
   if (computedProps.extendTypes && computedProps.extendTypes[computedProps.item.type])
     if (computedProps.extendTypes[computedProps.item.type].children)
-      return (0, import_react3.cloneElement)(
+      return (0, import_react4.cloneElement)(
         computedProps.extendTypes[computedProps.item.type].children,
         {
+          scene: "description",
           value: computedProps.value,
           values: computedProps.values
         }
       );
     else if (computedProps.extendTypes[computedProps.item.type].render)
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-        children: computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values)
+        children: computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values, 0, "description")
       });
     else
       throw Error(computedProps.item.type + " requires children or render");
+  if (computedProps.item.descriptionChildren === null)
+    return null;
+  if (computedProps.item.descriptionChildren)
+    return (0, import_react4.cloneElement)(computedProps.item.descriptionChildren, {
+      scene: "description",
+      value: computedProps.value,
+      values: computedProps.values
+    });
+  if (computedProps.item.children === null)
+    return null;
   if (computedProps.item.children)
-    return (0, import_react3.cloneElement)(computedProps.item.children, { value: computedProps.value });
-  if (computedProps.item.render)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-      children: computedProps.item.render(computedProps.value, computedProps.values)
+    return (0, import_react4.cloneElement)(computedProps.item.children, {
+      scene: "description",
+      value: computedProps.value,
+      values: computedProps.values
     });
+  if (computedProps.item.descriptionRender)
+    return computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description");
+  if (computedProps.item.render)
+    return computedProps.item.render(computedProps.value, computedProps.values, 0, "description");
   if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {});
   switch (computedProps.item.type) {
@@ -279,7 +330,7 @@ function DescriptionItemContent(props) {
   }
 }
 function Description(props) {
-  if (!props.faasData)
+  if (props.dataSource)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions, {
       ...props,
       title: (0, import_lodash_es4.isFunction)(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
@@ -295,10 +346,7 @@ function Description(props) {
         }, item.id) : null;
       }).filter(Boolean)
     });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react4.FaasDataWrapper, {
-    fallback: props.faasData.fallback || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Skeleton, {
-      active: true
-    }),
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FaasDataWrapper, {
     render: ({ data }) => {
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions, {
         ...props,
@@ -347,15 +395,62 @@ function useDrawer(init) {
   };
 }
 
+// src/ErrorBoundary.tsx
+var import_react6 = require("react");
+var import_antd5 = require("antd");
+var import_jsx_runtime = require("react/jsx-runtime");
+var ErrorBoundary = class extends import_react6.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      error: void 0,
+      info: { componentStack: "" }
+    };
+  }
+  componentDidCatch(error, info) {
+    this.setState({
+      error,
+      info
+    });
+  }
+  render() {
+    const {
+      message,
+      description,
+      children
+    } = this.props;
+    const { error, info } = this.state;
+    const componentStack = info && info.componentStack ? info.componentStack : null;
+    const errorMessage = typeof message === "undefined" ? (error || "").toString() : message;
+    const errorDescription = typeof description === "undefined" ? componentStack : description;
+    if (error) {
+      if (this.props.onError)
+        return this.props.onError(error, info);
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Alert, {
+        type: "error",
+        message: errorMessage,
+        description: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", {
+          style: {
+            fontSize: "0.9em",
+            overflowX: "auto"
+          },
+          children: errorDescription
+        })
+      });
+    }
+    return children;
+  }
+};
+
 // src/Form.tsx
-var import_react7 = require("@faasjs/react");
-var import_antd6 = require("antd");
-var import_react8 = require("react");
+var import_react8 = require("@faasjs/react");
+var import_antd7 = require("antd");
+var import_react9 = require("react");
 
 // src/FormItem.tsx
-var import_antd5 = require("antd");
+var import_antd6 = require("antd");
 var import_icons2 = require("@ant-design/icons");
-var import_react6 = require("react");
+var import_react7 = require("react");
 var import_lodash_es5 = require("lodash-es");
 var import_jsx_runtime = require("react/jsx-runtime");
 function processProps(propsCopy, config) {
@@ -406,11 +501,11 @@ function processProps(propsCopy, config) {
 }
 function FormItem(props) {
   var _a;
-  const [computedProps, setComputedProps] = (0, import_react6.useState)();
-  const [extendTypes, setExtendTypes] = (0, import_react6.useState)();
+  const [computedProps, setComputedProps] = (0, import_react7.useState)();
+  const [extendTypes, setExtendTypes] = (0, import_react7.useState)();
   const { common: common2 } = useConfigContext();
-  const [hidden, setHidden] = (0, import_react6.useState)(props.hidden || false);
-  (0, import_react6.useEffect)(() => {
+  const [hidden, setHidden] = (0, import_react7.useState)(props.hidden || false);
+  (0, import_react7.useEffect)(() => {
     const propsCopy = { ...props };
     if (propsCopy.extendTypes) {
       setExtendTypes(propsCopy.extendTypes);
@@ -418,61 +513,79 @@ 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, common2));
   }, [props]);
   if (!computedProps)
     return null;
   if (hidden)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
       ...computedProps,
       noStyle: true,
       rules: [],
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Input, {
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Input, {
         hidden: true
       })
     });
   if (extendTypes && extendTypes[computedProps.type])
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
       ...computedProps,
       children: extendTypes[computedProps.type].children
     });
+  if (computedProps.formChildren === null)
+    return null;
+  if (computedProps.formChildren)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
+      ...computedProps,
+      children: (0, import_react7.cloneElement)(computedProps.formChildren, { scene: "form" })
+    });
+  if (computedProps.children === null)
+    return null;
   if (computedProps.children)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
       ...computedProps,
-      children: computedProps.children
+      children: (0, import_react7.cloneElement)(computedProps.children, { scene: "form" })
+    });
+  if (computedProps.formRender)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
+      ...computedProps,
+      children: computedProps.formRender(null, null, 0, "form")
     });
   if (computedProps.render)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
       ...computedProps,
-      children: computedProps.render()
+      children: computedProps.render(null, null, 0, "form")
     });
   switch (computedProps.type) {
     case "string":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
         ...computedProps,
-        children: computedProps.options ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Select, {
+        children: computedProps.options ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Select, {
           ...computedProps.input
-        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Input, {
+        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Input, {
           ...computedProps.input
         })
       });
     case "string[]":
       if (computedProps.options)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
           ...computedProps,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Select, {
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Select, {
             mode: "multiple",
             ...computedProps.input
           })
         });
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.List, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
@@ -488,24 +601,24 @@ function FormItem(props) {
               }),
               fields.map((field) => {
                 var _a3;
-                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
-                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Row, {
+                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
+                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Col, {
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Col, {
                         span: 23,
-                        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+                        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
                           ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Input, {
+                          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Input, {
                             ...computedProps.input
                           })
                         })
                       }),
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Col, {
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Col, {
                         span: 1,
-                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Button, {
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
@@ -517,15 +630,19 @@ function FormItem(props) {
                   })
                 }, field.key);
               }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Form.Item, {
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Form.Item, {
                 children: [
-                  !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Button, {
+                  !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
                     icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons2.PlusOutlined, {})
                   }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.ErrorList, {
+                  computedProps.extra && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+                    className: "ant-form-item-extra",
+                    children: computedProps.extra
+                  }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.ErrorList, {
                     errors
                   })
                 ]
@@ -535,25 +652,25 @@ function FormItem(props) {
         }
       });
     case "number":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
         ...computedProps,
-        children: computedProps.options ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Select, {
+        children: computedProps.options ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Select, {
           ...computedProps.input
-        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.InputNumber, {
+        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.InputNumber, {
           style: { width: "100%" },
           ...computedProps.input
         })
       });
     case "number[]":
       if (computedProps.options)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
           ...computedProps,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Select, {
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Select, {
             mode: "multiple",
             ...computedProps.input
           })
         });
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.List, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
@@ -569,25 +686,25 @@ function FormItem(props) {
               }),
               fields.map((field) => {
                 var _a3;
-                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
-                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Row, {
+                return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
+                  children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Col, {
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Col, {
                         span: 23,
-                        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+                        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
                           ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.InputNumber, {
+                          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.InputNumber, {
                             style: { width: "100%" },
                             ...computedProps.input
                           })
                         })
                       }),
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Col, {
+                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Col, {
                         span: 1,
-                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Button, {
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
@@ -599,15 +716,19 @@ function FormItem(props) {
                   })
                 }, field.key);
               }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Form.Item, {
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Form.Item, {
                 children: [
-                  !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Button, {
+                  !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
                     icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons2.PlusOutlined, {})
                   }),
-                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.ErrorList, {
+                  computedProps.extra && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+                    className: "ant-form-item-extra",
+                    children: computedProps.extra
+                  }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.ErrorList, {
                     errors
                   })
                 ]
@@ -617,23 +738,23 @@ function FormItem(props) {
         }
       });
     case "boolean":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Switch, {
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Switch, {
           ...computedProps.input
         })
       });
     case "date":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.DatePicker, {
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.DatePicker, {
           ...computedProps.input
         })
       });
     case "time":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.Item, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.Item, {
         ...computedProps,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.TimePicker, {
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.TimePicker, {
           ...computedProps.input
         })
       });
@@ -653,12 +774,12 @@ function FormItem(props) {
         ]
       });
     case "object[]":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.List, {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.List, {
         name: computedProps.name,
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
           children: [
-            fields.map((field) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Form.Item, {
+            fields.map((field) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Form.Item, {
               style: { marginBottom: 0 },
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -668,7 +789,7 @@ function FormItem(props) {
                       computedProps.label,
                       " ",
                       field.name + 1,
-                      !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Button, {
+                      !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
                         danger: true,
                         type: "link",
                         onClick: () => remove(field.name),
@@ -677,9 +798,9 @@ function FormItem(props) {
                     ]
                   })
                 }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Row, {
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Row, {
                   gutter: 24,
-                  children: computedProps.object.map((o) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Col, {
+                  children: computedProps.object.map((o) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Col, {
                     span: o.col || 24,
                     children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FormItem, {
                       ...o,
@@ -689,9 +810,9 @@ function FormItem(props) {
                 })
               ]
             }, field.key)),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Form.Item, {
+            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Form.Item, {
               children: [
-                !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd5.Button, {
+                !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Button, {
                   type: "dashed",
                   block: true,
                   onClick: () => add(),
@@ -702,7 +823,11 @@ function FormItem(props) {
                     computedProps.label
                   ]
                 }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd5.Form.ErrorList, {
+                computedProps.extra && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+                  className: "ant-form-item-extra",
+                  children: computedProps.extra
+                }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Form.ErrorList, {
                   errors
                 })
               ]
@@ -714,27 +839,28 @@ function FormItem(props) {
       return null;
   }
 }
+FormItem.useStatus = import_antd6.Form.Item.useStatus;
 
 // src/Form.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function Form(props) {
   var _a, _b;
-  const [loading, setLoading] = (0, import_react8.useState)(false);
-  const [computedProps, setComputedProps] = (0, import_react8.useState)();
+  const [loading, setLoading] = (0, import_react9.useState)(false);
+  const [computedProps, setComputedProps] = (0, import_react9.useState)();
   const config = useConfigContext();
-  const [extendTypes, setExtendTypes] = (0, import_react8.useState)();
-  const [form] = import_antd6.Form.useForm(props.form);
-  const [initialValues, setInitialValues] = (0, import_react8.useState)(props.initialValues);
-  (0, import_react8.useEffect)(() => {
-    var _a2, _b2;
+  const [extendTypes, setExtendTypes] = (0, import_react9.useState)();
+  const [form] = import_antd7.Form.useForm(props.form);
+  const [initialValues, setInitialValues] = (0, import_react9.useState)(props.initialValues);
+  (0, import_react9.useEffect)(() => {
+    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);
@@ -754,7 +880,7 @@ function Form(props) {
         setLoading(true);
         try {
           if (propsCopy.submit && ((_a3 = propsCopy.submit.to) == null ? void 0 : _a3.action)) {
-            await props.onFinish(values, async (values2) => (0, import_react7.faas)(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
+            await props.onFinish(values, async (values2) => (0, import_react8.faas)(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
               ...values2,
               ...propsCopy.submit.to.params
             } : values2));
@@ -765,13 +891,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 ? {
+        return (0, import_react8.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) {
@@ -780,7 +918,7 @@ function Form(props) {
     }
     setComputedProps(propsCopy);
   }, [props]);
-  const onValuesChange = (0, import_react8.useCallback)((changedValues, allValues) => {
+  const onValuesChange = (0, import_react9.useCallback)((changedValues, allValues) => {
     console.debug("Form:onValuesChange", changedValues, allValues);
     if (props.onValuesChange) {
       props.onValuesChange(changedValues, allValues);
@@ -793,7 +931,7 @@ function Form(props) {
         item.onValueChange(changedValues[key], allValues, form);
     }
   }, [computedProps]);
-  (0, import_react8.useEffect)(() => {
+  (0, import_react9.useEffect)(() => {
     if (!initialValues)
       return;
     console.debug("Form:initialValues", initialValues);
@@ -802,17 +940,17 @@ function Form(props) {
   }, [computedProps]);
   if (!computedProps)
     return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd6.Form, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd7.Form, {
     ...computedProps,
     onValuesChange,
     children: [
       computedProps.beforeItems,
-      (_a = computedProps.items) == null ? void 0 : _a.map((item) => (0, import_react8.isValidElement)(item) ? item : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FormItem, {
+      (_a = computedProps.items) == null ? void 0 : _a.map((item) => (0, import_react9.isValidElement)(item) ? item : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FormItem, {
         ...item,
         extendTypes
       }, item.id)),
       computedProps.children,
-      computedProps.submit !== false && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd6.Button, {
+      computedProps.submit !== false && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd7.Button, {
         htmlType: "submit",
         type: "primary",
         loading,
@@ -822,76 +960,71 @@ function Form(props) {
     ]
   });
 }
-Form.useForm = import_antd6.Form.useForm;
+Form.useForm = import_antd7.Form.useForm;
+Form.useFormInstance = import_antd7.Form.useFormInstance;
+Form.useWatch = import_antd7.Form.useWatch;
+Form.Item = FormItem;
+Form.List = import_antd7.Form.List;
+Form.ErrorList = import_antd7.Form.ErrorList;
+Form.Provider = import_antd7.Form.Provider;
 
 // src/Link.tsx
 var import_react_router_dom = require("react-router-dom");
-var import_antd7 = require("antd");
+var import_antd8 = require("antd");
 var import_jsx_runtime = require("react/jsx-runtime");
-function Link({
-  href,
-  target,
-  text,
-  children,
-  style,
-  button
-}) {
+function Link(props) {
+  var _a, _b, _c, _d;
   const { Link: Link2 } = useConfigContext();
-  style = Object.assign({ cursor: "pointer" }, style);
-  if (href.startsWith("http")) {
-    if (button)
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd7.Button, {
-        ...button,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-          href,
-          target: target || (Link2 == null ? void 0 : Link2.target) || "_blank",
-          style: {
-            ...Link2.style,
-            ...style || {}
-          },
-          children: text || children
-        })
+  let style = {
+    ...Link2.style || {},
+    cursor: "pointer",
+    ...props.style
+  };
+  if (props.block)
+    style = Object.assign({
+      display: "block",
+      width: "100%"
+    }, style);
+  if (props.href.startsWith("http")) {
+    if (props.button)
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd8.Button, {
+        ...props.button,
+        target: props.target || (Link2 == null ? void 0 : Link2.target) || "_blank",
+        style,
+        href: props.href,
+        children: (_a = props.text) != null ? _a : props.children
       });
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
-      href,
-      target: target || (Link2 == null ? void 0 : Link2.target) || "_blank",
-      style: {
-        ...Link2.style,
-        ...style || {}
-      },
-      children: text || children
+      href: props.href,
+      target: props.target || (Link2 == null ? void 0 : Link2.target) || "_blank",
+      style,
+      children: (_b = props.text) != null ? _b : props.children
     });
   }
-  if (button)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd7.Button, {
-      ...button,
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Link, {
-        to: href,
-        target: target || (Link2 == null ? void 0 : Link2.target),
-        style: {
-          ...Link2.style,
-          ...style || {}
-        },
-        children: text || children
+  if (props.button)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Link, {
+      to: props.href,
+      target: props.target || (Link2 == null ? void 0 : Link2.target),
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd8.Button, {
+        ...props.button,
+        style,
+        children: (_c = props.text) != null ? _c : props.children
       })
     });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Link, {
-    to: href,
-    target: target || (Link2 == null ? void 0 : Link2.target),
-    style: {
-      ...Link2.style,
-      ...style || {}
-    },
-    children: text || children
+    to: props.href,
+    target: props.target || (Link2 == null ? void 0 : Link2.target),
+    style,
+    children: (_d = props.text) != null ? _d : props.children
   });
 }
 
 // src/Modal.tsx
-var import_antd8 = require("antd");
-var import_react9 = require("react");
+var import_antd9 = require("antd");
+var import_react10 = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 function useModal(init) {
-  const [props, setProps] = (0, import_react9.useState)({
+  const [props, setProps] = (0, import_react10.useState)({
     open: false,
     onCancel: () => setProps((prev) => ({
       ...prev,
@@ -900,7 +1033,7 @@ function useModal(init) {
     ...init
   });
   return {
-    modal: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd8.Modal, {
+    modal: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Modal, {
       ...props
     }),
     modalProps: props,
@@ -914,13 +1047,13 @@ function useModal(init) {
 }
 
 // src/Routers.tsx
-var import_antd9 = require("antd");
-var import_react10 = require("react");
+var import_antd10 = require("antd");
+var import_react11 = require("react");
 var import_react_router_dom2 = require("react-router-dom");
 var import_jsx_runtime = require("react/jsx-runtime");
 function PageNotFound() {
   const config = useConfigContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Result, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Result, {
     status: "404",
     title: config.common.pageNotFound
   });
@@ -930,10 +1063,10 @@ function Routes(props) {
     children: [
       props.routes.map((r) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom2.Route, {
         ...r,
-        element: r.element || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react10.Suspense, {
+        element: r.element || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react11.Suspense, {
           fallback: props.fallback || /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
             style: { padding: "24px" },
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd9.Skeleton, {
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Skeleton, {
               active: true
             })
           }),
@@ -949,12 +1082,11 @@ function Routes(props) {
 }
 
 // src/Table.tsx
-var import_react11 = require("react");
-var import_antd10 = require("antd");
+var import_react12 = require("react");
+var import_antd11 = require("antd");
 var import_dayjs2 = __toESM(require("dayjs"));
 var import_icons3 = require("@ant-design/icons");
 var import_lodash_es6 = require("lodash-es");
-var import_react12 = require("@faasjs/react");
 var import_jsx_runtime = require("react/jsx-runtime");
 function processValue(item, value) {
   var _a;
@@ -981,9 +1113,9 @@ function processValue(item, value) {
   return value;
 }
 function Table(props) {
-  const [columns, setColumns] = (0, import_react11.useState)();
-  const { common: common2, antd } = useConfigContext();
-  (0, import_react11.useEffect)(() => {
+  const [columns, setColumns] = (0, import_react12.useState)();
+  const { common: common2 } = useConfigContext();
+  (0, import_react12.useEffect)(() => {
     var _a;
     for (const item of props.items) {
       if (!item.key)
@@ -999,15 +1131,39 @@ function Table(props) {
         item.filters = item.options.map((o) => ({
           text: o.label,
           value: o.value
-        }));
+        })).concat({
+          text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+          value: null
+        });
       }
-      if (item.children)
-        delete item.children;
+      if (item.tableChildren === null)
+        item.render = () => null;
+      else if (item.tableChildren)
+        item.render = (value, values) => (0, import_react12.cloneElement)(
+          item.tableChildren,
+          {
+            scene: "table",
+            value,
+            values
+          }
+        );
+      else if (item.children === null)
+        item.render = () => null;
+      else if (item.children)
+        item.render = (value, values) => (0, import_react12.cloneElement)(
+          item.children,
+          {
+            scene: "table",
+            value,
+            values
+          }
+        );
       if (props.extendTypes && props.extendTypes[item.type]) {
         if (props.extendTypes[item.type].children)
-          item.render = (value, values) => (0, import_react11.cloneElement)(
+          item.render = (value, values) => (0, import_react12.cloneElement)(
             props.extendTypes[item.type].children,
             {
+              scene: "table",
               value,
               values
             }
@@ -1035,7 +1191,7 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Input.Search, {
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Input.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1065,7 +1221,7 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Input.Search, {
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Input.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1088,14 +1244,14 @@ function Table(props) {
             item.onFilter = (value, row) => {
               if (value === null && (0, import_lodash_es6.isNil)(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__ */ (0, import_jsx_runtime.jsx)(import_antd10.Input.Search, {
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Input.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1118,14 +1274,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__ */ (0, import_jsx_runtime.jsx)(import_antd10.Input.Search, {
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Input.Search, {
               placeholder: `${common2.search} ${item.title}`,
               allowClear: true,
               onSearch: (v) => {
@@ -1141,7 +1297,7 @@ function Table(props) {
           break;
         case "boolean":
           if (!item.render)
-            item.render = (value) => typeof value === "undefined" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}) : value ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons3.CheckOutlined, {
+            item.render = (value) => (0, import_lodash_es6.isNil)(value) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}) : value ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons3.CheckOutlined, {
               style: {
                 marginTop: "4px",
                 color: "#52c41a"
@@ -1157,7 +1313,7 @@ function Table(props) {
               setSelectedKeys,
               selectedKeys,
               confirm
-            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd10.Radio.Group, {
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd11.Radio.Group, {
               style: { padding: 8 },
               buttonStyle: "solid",
               value: selectedKeys[0],
@@ -1166,11 +1322,11 @@ function Table(props) {
                 confirm();
               },
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Radio.Button, {
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Radio.Button, {
                   children: common2.all
                 }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Radio.Button, {
-                  value: "true",
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Radio.Button, {
+                  value: true,
                   children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons3.CheckOutlined, {
                     style: {
                       color: "#52c41a",
@@ -1178,8 +1334,8 @@ function Table(props) {
                     }
                   })
                 }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Radio.Button, {
-                  value: "false",
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Radio.Button, {
+                  value: false,
                   children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons3.CloseOutlined, {
                     style: {
                       verticalAlign: "middle",
@@ -1187,8 +1343,8 @@ function Table(props) {
                     }
                   })
                 }),
-                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Radio.Button, {
-                  value: "empty",
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Radio.Button, {
+                  value: null,
                   children: common2.blank
                 })
               ]
@@ -1196,11 +1352,11 @@ function Table(props) {
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               switch (value) {
-                case "true":
+                case true:
                   return !(0, import_lodash_es6.isNil)(row[item.id]) && !!row[item.id];
-                case "false":
+                case false:
                   return !(0, import_lodash_es6.isNil)(row[item.id]) && !row[item.id];
-                case "empty":
+                case null:
                   return (0, import_lodash_es6.isNil)(row[item.id]);
                 default:
                   return true;
@@ -1211,9 +1367,15 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs2.default)(row[item.id]).isSame((0, import_dayjs2.default)(value));
+            item.onFilter = (value, row) => (0, import_dayjs2.default)(row[item.id]).isSame((0, import_dayjs2.default)(value), "date");
           if (!item.sorter)
-            item.sorter = (a, b) => (0, import_dayjs2.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if ((0, import_lodash_es6.isNil)(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if ((0, import_lodash_es6.isNil)(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "time":
           if (!item.render)
@@ -1221,7 +1383,13 @@ function Table(props) {
           if (!item.onFilter)
             item.onFilter = (value, row) => (0, import_dayjs2.default)(row[item.id]).isSame((0, import_dayjs2.default)(value));
           if (!item.sorter)
-            item.sorter = (a, b) => (0, import_dayjs2.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if ((0, import_lodash_es6.isNil)(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if ((0, import_lodash_es6.isNil)(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "object":
           if (!item.render)
@@ -1233,11 +1401,13 @@ function Table(props) {
           break;
         case "object[]":
           if (!item.render)
-            item.render = (value) => value.map((v, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Description, {
-              items: item.object,
-              dataSource: v || [],
-              column: 1
-            }, i));
+            item.render = (value) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+              children: value.map((v, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Description, {
+                items: item.object,
+                dataSource: v || [],
+                column: 1
+              }, i))
+            });
           break;
         default:
           if (!item.render)
@@ -1253,100 +1423,129 @@ function Table(props) {
     }
     setColumns(props.items);
   }, [props.items]);
-  (0, import_react11.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     if (!props.dataSource || !columns)
       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 = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
-            text: v[column.id],
-            value: v[column.id]
-          })).concat({
-            text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
-            value: null
+        const filters = (0, import_lodash_es6.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__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+              value: null
+            });
+            return newColumns;
           });
-          return newColumns;
-        });
       }
     }
   }, [props.dataSource, columns]);
   if (!columns)
     return null;
-  if (!props.faasData)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
-      ...antd,
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: props.dataSource
-      })
+  if (props.dataSource)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Table, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns,
+      dataSource: props.dataSource
     });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react12.FaasDataWrapper, {
-    fallback: props.faasData.fallback || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Skeleton, {
-      active: true
-    }),
-    render: ({
-      data,
-      params,
-      reload
-    }) => {
-      if (!data)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
-          ...antd,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-            ...props,
-            rowKey: props.rowKey || "id",
-            columns,
-            dataSource: []
-          })
-        });
-      if (Array.isArray(data))
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
-          ...antd,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-            ...props,
-            rowKey: props.rowKey || "id",
-            columns,
-            dataSource: data
-          })
-        });
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
-        ...antd,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-          ...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
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FaasDataWrapper, {
+    ...props.faasData,
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FaasDataTable, {
+      props,
+      columns
+    })
+  });
+}
+function FaasDataTable({
+  props,
+  columns,
+  data,
+  params,
+  reload
+}) {
+  const [currentColumns, setCurrentColumns] = (0, import_react12.useState)(columns);
+  (0, import_react12.useEffect)(() => {
+    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__ */ (0, import_jsx_runtime.jsx)(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 = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
+            text: v[column.id],
+            value: v[column.id]
+          }));
+          if (filters.length)
+            column.filters = filters.concat({
+              text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+              value: null
             });
-          }
-        })
-      });
+        }
+      }
+      return newColumns;
+    });
+  }, [columns, data]);
+  if (!data)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Table, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: []
+    });
+  if (Array.isArray(data))
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Table, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: data
+    });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd11.Table, {
+    ...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
+      });
+    }
   });
 }
 
@@ -1385,9 +1584,12 @@ function Title(props) {
   ConfigProvider,
   Description,
   Drawer,
+  ErrorBoundary,
+  FaasDataWrapper,
   Form,
   FormItem,
   Link,
+  Loading,
   Modal,
   PageNotFound,
   Routes,