@faasjs/ant-design 0.0.3-beta.64 → 0.0.3-beta.66

package/dist/index.mjs

@@ -1,23 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
 // react-shim.js
 import React from "react";
 
@@ -40,17 +20,24 @@ import { Modal } from "antd";
 import { useState } from "react";
 import { jsx } from "react/jsx-runtime";
 function useModal(init) {
-  const [props, setProps] = useState(__spreadValues({
+  const [props, setProps] = useState({
     open: false,
-    onCancel: () => setProps((prev) => __spreadProps(__spreadValues({}, prev), {
+    onCancel: () => setProps((prev) => ({
+      ...prev,
       open: false
-    }))
-  }, init));
+    })),
+    ...init
+  });
   return {
-    modal: /* @__PURE__ */ jsx(Modal, __spreadValues({}, props)),
+    modal: /* @__PURE__ */ jsx(Modal, {
+      ...props
+    }),
     modalProps: props,
     setModalProps(changes) {
-      setProps((prev) => __spreadValues(__spreadValues({}, prev), changes));
+      setProps((prev) => ({
+        ...prev,
+        ...changes
+      }));
     }
   };
 }
@@ -60,17 +47,24 @@ import { Drawer } from "antd";
 import { useState as useState2 } from "react";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function useDrawer(init) {
-  const [props, setProps] = useState2(__spreadValues({
+  const [props, setProps] = useState2({
     open: false,
-    onClose: () => setProps((prev) => __spreadProps(__spreadValues({}, prev), {
+    onClose: () => setProps((prev) => ({
+      ...prev,
       open: false
-    }))
-  }, init));
+    })),
+    ...init
+  });
   return {
-    drawer: /* @__PURE__ */ jsx2(Drawer, __spreadValues({}, props)),
+    drawer: /* @__PURE__ */ jsx2(Drawer, {
+      ...props
+    }),
     drawerProps: props,
     setDrawerProps(changes) {
-      setProps((prev) => __spreadValues(__spreadValues({}, prev), changes));
+      setProps((prev) => ({
+        ...prev,
+        ...changes
+      }));
     }
   };
 }
@@ -92,7 +86,9 @@ function RoutesApp(props) {
     setDrawerProps({ open: false });
     setModalProps({ open: false });
   }, [location]);
-  return /* @__PURE__ */ jsx3(Fragment, { children: props.children });
+  return /* @__PURE__ */ jsx3(Fragment, {
+    children: props.children
+  });
 }
 function App(props) {
   const [messageApi, messageContextHolder] = message.useMessage();
@@ -113,21 +109,30 @@ function App(props) {
       setDrawerProps
     ]
   );
-  return /* @__PURE__ */ jsx3(
-    StyleProvider,
-    __spreadProps(__spreadValues({}, Object.assign(props.styleProviderProps || {}, {
+  return /* @__PURE__ */ jsx3(StyleProvider, {
+    ...Object.assign(props.styleProviderProps || {}, {
       hashPriority: "high",
       transformers: [legacyLogicalPropertiesTransformer]
-    })), {
-      children: /* @__PURE__ */ jsx3(ConfigProvider, __spreadProps(__spreadValues({}, props.configProviderProps), { children: /* @__PURE__ */ jsx3(AppContext.Provider, { value: memoizedContextValue, children: /* @__PURE__ */ jsxs(BrowserRouter, __spreadProps(__spreadValues({}, props.browserRouterProps), { children: [
-        messageContextHolder,
-        notificationContextHolder,
-        modal,
-        drawer,
-        /* @__PURE__ */ jsx3(RoutesApp, { children: props.children })
-      ] })) }) }))
+    }),
+    children: /* @__PURE__ */ jsx3(ConfigProvider, {
+      ...props.configProviderProps,
+      children: /* @__PURE__ */ jsx3(AppContext.Provider, {
+        value: memoizedContextValue,
+        children: /* @__PURE__ */ jsxs(BrowserRouter, {
+          ...props.browserRouterProps,
+          children: [
+            messageContextHolder,
+            notificationContextHolder,
+            modal,
+            drawer,
+            /* @__PURE__ */ jsx3(RoutesApp, {
+              children: props.children
+            })
+          ]
+        })
+      })
     })
-  );
+  });
 }
 function useApp() {
   return useContext(AppContext);
@@ -202,7 +207,10 @@ function ConfigProvider2({
     } else
       setValues(defaultsDeep(config, values));
   }, []);
-  return /* @__PURE__ */ jsx4(ConfigContext.Provider, { value: values, children });
+  return /* @__PURE__ */ jsx4(ConfigContext.Provider, {
+    value: values,
+    children
+  });
 }
 function useConfigContext() {
   return useContext2(ConfigContext);
@@ -212,7 +220,10 @@ function useConfigContext() {
 import { jsx as jsx5 } from "react/jsx-runtime";
 function Blank(options) {
   const { Blank: Blank2 } = useConfigContext();
-  return !options || isNil(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsx5(Typography.Text, { disabled: true, children: (options == null ? void 0 : options.text) || Blank2.text }) : options.value;
+  return !options || isNil(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsx5(Typography.Text, {
+    disabled: true,
+    children: (options == null ? void 0 : options.text) || Blank2.text
+  }) : options.value;
 }
 
 // src/data.ts
@@ -250,71 +261,55 @@ import {
 } from "antd";
 import { isFunction, upperFirst as upperFirst2 } from "lodash-es";
 import {
-  cloneElement as cloneElement2,
-  useEffect as useEffect4,
-  useState as useState5
-} from "react";
-
-// ../react/src/index.tsx
-import {
-  useState as useState4,
+  cloneElement,
   useEffect as useEffect3,
-  createElement,
-  cloneElement
+  useState as useState4
 } from "react";
-var clients = {};
-function getClient(domain) {
-  const client = clients[domain || Object.keys(clients)[0]];
-  if (!client)
-    throw Error("FaasReactClient is not initialized");
-  return client;
-}
-async function faas(action, params) {
-  return getClient().faas(action, params);
-}
-function FaasDataWrapper(props) {
-  const [client, setClient] = useState4();
-  useEffect3(() => {
-    if (client)
-      return;
-    setClient(getClient());
-  }, []);
-  if (!client)
-    return props.fallback || null;
-  return createElement(client.FaasDataWrapper, props);
-}
+
+// src/FaasDataWrapper.tsx
+import { FaasDataWrapper as Origin } from "@faasjs/react";
 
 // src/Loading.tsx
 import { Spin } from "antd";
 import { Fragment as Fragment2, jsx as jsx6 } from "react/jsx-runtime";
 function Loading(props) {
   if (props.loading === false)
-    return /* @__PURE__ */ jsx6(Fragment2, { children: props.children });
-  return /* @__PURE__ */ jsx6("div", { style: __spreadValues(__spreadValues({}, props.style || {}), !props.size || props.size === "large" ? {
-    margin: "20vh auto",
-    textAlign: "center"
-  } : {}), children: /* @__PURE__ */ jsx6(Spin, { size: props.size || "large" }) });
+    return /* @__PURE__ */ jsx6(Fragment2, {
+      children: props.children
+    });
+  return /* @__PURE__ */ jsx6("div", {
+    style: {
+      ...props.style || {},
+      ...!props.size || props.size === "large" ? {
+        margin: "20vh auto",
+        textAlign: "center"
+      } : {}
+    },
+    children: /* @__PURE__ */ jsx6(Spin, {
+      size: props.size || "large"
+    })
+  });
 }
 
 // src/FaasDataWrapper.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
-function FaasDataWrapper2(props) {
-  return /* @__PURE__ */ jsx7(
-    FaasDataWrapper,
-    __spreadValues({
-      fallback: props.loading || /* @__PURE__ */ jsx7(Loading, __spreadValues({}, props.loadingProps))
-    }, props)
-  );
+function FaasDataWrapper(props) {
+  return /* @__PURE__ */ jsx7(Origin, {
+    fallback: props.loading || /* @__PURE__ */ jsx7(Loading, {
+      ...props.loadingProps
+    }),
+    ...props
+  });
 }
 
 // src/Description.tsx
 import { Fragment as Fragment3, jsx as jsx8 } from "react/jsx-runtime";
 function DescriptionItemContent(props) {
   var _a;
-  const [computedProps, setComputedProps] = useState5();
-  useEffect4(() => {
+  const [computedProps, setComputedProps] = useState4();
+  useEffect3(() => {
     var _a2, _b;
-    const propsCopy = __spreadValues({}, props);
+    const propsCopy = { ...props };
     if (!propsCopy.item.title)
       propsCopy.item.title = upperFirst2(propsCopy.item.id);
     if (!propsCopy.item.type)
@@ -342,7 +337,7 @@ function DescriptionItemContent(props) {
     return null;
   if (computedProps.extendTypes && computedProps.extendTypes[computedProps.item.type])
     if (computedProps.extendTypes[computedProps.item.type].children)
-      return cloneElement2(
+      return cloneElement(
         computedProps.extendTypes[computedProps.item.type].children,
         {
           scene: "description",
@@ -351,13 +346,15 @@ function DescriptionItemContent(props) {
         }
       );
     else if (computedProps.extendTypes[computedProps.item.type].render)
-      return /* @__PURE__ */ jsx8(Fragment3, { children: computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values, 0, "description") });
+      return /* @__PURE__ */ jsx8(Fragment3, {
+        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 cloneElement2(computedProps.item.descriptionChildren, {
+    return cloneElement(computedProps.item.descriptionChildren, {
       scene: "description",
       value: computedProps.value,
       values: computedProps.values
@@ -365,120 +362,112 @@ function DescriptionItemContent(props) {
   if (computedProps.item.children === null)
     return null;
   if (computedProps.item.children)
-    return cloneElement2(computedProps.item.children, {
+    return 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");
+    return /* @__PURE__ */ jsx8(Fragment3, {
+      children: computedProps.item.descriptionRender(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.item.render)
-    return computedProps.item.render(computedProps.value, computedProps.values, 0, "description");
+    return /* @__PURE__ */ jsx8(Fragment3, {
+      children: computedProps.item.render(computedProps.value, computedProps.values, 0, "description")
+    });
   if (computedProps.value === null || Array.isArray(computedProps.value) && !computedProps.value.length)
     return /* @__PURE__ */ jsx8(Blank, {});
   switch (computedProps.item.type) {
     case "string[]":
-      return /* @__PURE__ */ jsx8(Fragment3, { children: computedProps.value.join(", ") });
+      return /* @__PURE__ */ jsx8(Fragment3, {
+        children: computedProps.value.join(", ")
+      });
     case "number":
       return computedProps.value || null;
     case "number[]":
-      return /* @__PURE__ */ jsx8(Fragment3, { children: computedProps.value.join(", ") });
+      return /* @__PURE__ */ jsx8(Fragment3, {
+        children: computedProps.value.join(", ")
+      });
     case "boolean":
-      return computedProps.value ? /* @__PURE__ */ jsx8(CheckOutlined, { style: {
-        marginTop: "4px",
-        color: "#52c41a"
-      } }) : /* @__PURE__ */ jsx8(CloseOutlined, { style: {
-        marginTop: "4px",
-        color: "#ff4d4f"
-      } });
+      return computedProps.value ? /* @__PURE__ */ jsx8(CheckOutlined, {
+        style: {
+          marginTop: "4px",
+          color: "#52c41a"
+        }
+      }) : /* @__PURE__ */ jsx8(CloseOutlined, {
+        style: {
+          marginTop: "4px",
+          color: "#ff4d4f"
+        }
+      });
     case "time":
-      return /* @__PURE__ */ jsx8(Fragment3, { children: computedProps.value.format("YYYY-MM-DD HH:mm:ss") });
+      return /* @__PURE__ */ jsx8(Fragment3, {
+        children: computedProps.value.format("YYYY-MM-DD HH:mm:ss")
+      });
     case "date":
-      return /* @__PURE__ */ jsx8(Fragment3, { children: computedProps.value.format("YYYY-MM-DD") });
+      return /* @__PURE__ */ jsx8(Fragment3, {
+        children: computedProps.value.format("YYYY-MM-DD")
+      });
     case "object":
       if (!computedProps.value)
         return /* @__PURE__ */ jsx8(Blank, {});
-      return /* @__PURE__ */ jsx8(
-        Description,
-        {
-          items: computedProps.item.object,
-          dataSource: computedProps.value,
-          column: 1
-        }
-      );
+      return /* @__PURE__ */ jsx8(Description, {
+        items: computedProps.item.object,
+        dataSource: computedProps.value,
+        column: 1
+      });
     case "object[]":
       if (!((_a = computedProps.value) == null ? void 0 : _a.length))
         return /* @__PURE__ */ jsx8(Blank, {});
-      return /* @__PURE__ */ jsx8(Space, { direction: "vertical", children: computedProps.value.map((value, index) => /* @__PURE__ */ jsx8(
-        Description,
-        {
+      return /* @__PURE__ */ jsx8(Space, {
+        direction: "vertical",
+        children: computedProps.value.map((value, index) => /* @__PURE__ */ jsx8(Description, {
           items: computedProps.item.object,
           dataSource: value,
           column: 1
-        },
-        index
-      )) });
+        }, index))
+      });
     default:
       return computedProps.value || null;
   }
 }
 function Description(props) {
   if (props.dataSource)
-    return /* @__PURE__ */ jsx8(
-      Descriptions,
-      __spreadProps(__spreadValues({}, props), {
-        title: isFunction(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
+    return /* @__PURE__ */ jsx8(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__ */ jsx8(Descriptions.Item, {
+          label: item.title || upperFirst2(item.id),
+          children: /* @__PURE__ */ jsx8(DescriptionItemContent, {
+            item,
+            value: props.dataSource[item.id],
+            values: props.dataSource,
+            extendTypes: props.extendTypes
+          })
+        }, item.id) : null;
+      }).filter(Boolean)
+    });
+  return /* @__PURE__ */ jsx8(FaasDataWrapper, {
+    render: ({ data }) => {
+      return /* @__PURE__ */ jsx8(Descriptions, {
+        ...props,
+        title: isFunction(props.renderTitle) ? props.renderTitle(data) : props.title,
         children: props.items.map((item) => {
-          return !item.if || item.if(props.dataSource) ? /* @__PURE__ */ jsx8(
-            Descriptions.Item,
-            {
-              label: item.title || upperFirst2(item.id),
-              children: /* @__PURE__ */ jsx8(
-                DescriptionItemContent,
-                {
-                  item,
-                  value: props.dataSource[item.id],
-                  values: props.dataSource,
-                  extendTypes: props.extendTypes
-                }
-              )
-            },
-            item.id
-          ) : null;
+          return !item.if || item.if(data) ? /* @__PURE__ */ jsx8(Descriptions.Item, {
+            label: item.title || upperFirst2(item.id),
+            children: /* @__PURE__ */ jsx8(DescriptionItemContent, {
+              item,
+              value: data[item.id],
+              values: data,
+              extendTypes: props.extendTypes
+            })
+          }, item.id) : null;
         }).filter(Boolean)
-      })
-    );
-  return /* @__PURE__ */ jsx8(
-    FaasDataWrapper2,
-    __spreadValues({
-      render: ({ data }) => {
-        return /* @__PURE__ */ jsx8(
-          Descriptions,
-          __spreadProps(__spreadValues({}, props), {
-            title: isFunction(props.renderTitle) ? props.renderTitle(data) : props.title,
-            children: props.items.map((item) => {
-              return !item.if || item.if(data) ? /* @__PURE__ */ jsx8(
-                Descriptions.Item,
-                {
-                  label: item.title || upperFirst2(item.id),
-                  children: /* @__PURE__ */ jsx8(
-                    DescriptionItemContent,
-                    {
-                      item,
-                      value: data[item.id],
-                      values: data,
-                      extendTypes: props.extendTypes
-                    }
-                  )
-                },
-                item.id
-              ) : null;
-            }).filter(Boolean)
-          })
-        );
-      }
-    }, props.faasData)
-  );
+      });
+    },
+    ...props.faasData
+  });
 }
 
 // src/ErrorBoundary.tsx
@@ -512,30 +501,31 @@ var ErrorBoundary = class extends Component {
     if (error) {
       if (this.props.onError)
         return this.props.onError(error, info);
-      return /* @__PURE__ */ jsx9(
-        Alert,
-        {
-          type: "error",
-          message: errorMessage,
-          description: /* @__PURE__ */ jsx9("pre", { style: {
+      return /* @__PURE__ */ jsx9(Alert, {
+        type: "error",
+        message: errorMessage,
+        description: /* @__PURE__ */ jsx9("pre", {
+          style: {
             fontSize: "0.9em",
             overflowX: "auto"
-          }, children: errorDescription })
-        }
-      );
+          },
+          children: errorDescription
+        })
+      });
     }
     return children;
   }
 };
 
 // src/Form.tsx
+import { faas } from "@faasjs/react";
 import {
   Button as Button2,
   Form as AntdForm2
 } from "antd";
 import {
-  useEffect as useEffect6,
-  useState as useState7,
+  useEffect as useEffect5,
+  useState as useState6,
   useCallback,
   isValidElement
 } from "react";
@@ -555,9 +545,9 @@ import {
 } from "antd";
 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
 import {
-  cloneElement as cloneElement3,
-  useEffect as useEffect5,
-  useState as useState6
+  cloneElement as cloneElement2,
+  useEffect as useEffect4,
+  useState as useState5
 } from "react";
 import { upperFirst as upperFirst3 } from "lodash-es";
 import { Fragment as Fragment4, jsx as jsx10, jsxs as jsxs2 } from "react/jsx-runtime";
@@ -609,12 +599,12 @@ function processProps(propsCopy, config) {
 }
 function FormItem(props) {
   var _a;
-  const [computedProps, setComputedProps] = useState6();
-  const [extendTypes, setExtendTypes] = useState6();
+  const [computedProps, setComputedProps] = useState5();
+  const [extendTypes, setExtendTypes] = useState5();
   const { common: common2 } = useConfigContext();
-  const [hidden, setHidden] = useState6(props.hidden || false);
-  useEffect5(() => {
-    const propsCopy = __spreadValues({}, props);
+  const [hidden, setHidden] = useState5(props.hidden || false);
+  useEffect4(() => {
+    const propsCopy = { ...props };
     if (propsCopy.extendTypes) {
       setExtendTypes(propsCopy.extendTypes);
       delete propsCopy.extendTypes;
@@ -637,231 +627,290 @@ function FormItem(props) {
   if (!computedProps)
     return null;
   if (hidden)
-    return /* @__PURE__ */ jsx10(
-      AntdForm.Item,
-      __spreadProps(__spreadValues({}, computedProps), {
-        noStyle: true,
-        rules: [],
-        children: /* @__PURE__ */ jsx10(Input, { hidden: true })
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      noStyle: true,
+      rules: [],
+      children: /* @__PURE__ */ jsx10(Input, {
+        hidden: true
       })
-    );
+    });
   if (extendTypes && extendTypes[computedProps.type])
-    return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: extendTypes[computedProps.type].children }));
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      children: extendTypes[computedProps.type].children
+    });
   if (computedProps.formChildren === null)
     return null;
   if (computedProps.formChildren)
-    return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: cloneElement3(computedProps.formChildren, { scene: "form" }) }));
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      children: cloneElement2(computedProps.formChildren, { scene: "form" })
+    });
   if (computedProps.children === null)
     return null;
   if (computedProps.children)
-    return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: cloneElement3(computedProps.children, { scene: "form" }) }));
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      children: cloneElement2(computedProps.children, { scene: "form" })
+    });
   if (computedProps.formRender)
-    return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: computedProps.formRender(null, null, 0, "form") }));
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      children: computedProps.formRender(null, null, 0, "form")
+    });
   if (computedProps.render)
-    return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: computedProps.render(null, null, 0, "form") }));
+    return /* @__PURE__ */ jsx10(AntdForm.Item, {
+      ...computedProps,
+      children: computedProps.render(null, null, 0, "form")
+    });
   switch (computedProps.type) {
     case "string":
-      return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: computedProps.options ? /* @__PURE__ */ jsx10(Select, __spreadValues({}, computedProps.input)) : /* @__PURE__ */ jsx10(Input, __spreadValues({}, computedProps.input)) }));
+      return /* @__PURE__ */ jsx10(AntdForm.Item, {
+        ...computedProps,
+        children: computedProps.options ? /* @__PURE__ */ jsx10(Select, {
+          ...computedProps.input
+        }) : /* @__PURE__ */ jsx10(Input, {
+          ...computedProps.input
+        })
+      });
     case "string[]":
       if (computedProps.options)
-        return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: /* @__PURE__ */ jsx10(
-          Select,
-          __spreadValues({
-            mode: "multiple"
-          }, computedProps.input)
-        ) }));
-      return /* @__PURE__ */ jsx10(
-        AntdForm.List,
-        {
-          name: computedProps.name,
-          rules: computedProps.rules,
-          children: (fields, { add, remove }, { errors }) => {
-            var _a2;
-            return /* @__PURE__ */ jsxs2(Fragment4, { children: [
-              computedProps.label && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-label", children: /* @__PURE__ */ jsx10("label", { className: computedProps.rules.find((r) => r.required) && "ant-form-item-required", children: computedProps.label }) }),
+        return /* @__PURE__ */ jsx10(AntdForm.Item, {
+          ...computedProps,
+          children: /* @__PURE__ */ jsx10(Select, {
+            mode: "multiple",
+            ...computedProps.input
+          })
+        });
+      return /* @__PURE__ */ jsx10(AntdForm.List, {
+        name: computedProps.name,
+        rules: computedProps.rules,
+        children: (fields, { add, remove }, { errors }) => {
+          var _a2;
+          return /* @__PURE__ */ jsxs2(Fragment4, {
+            children: [
+              computedProps.label && /* @__PURE__ */ jsx10("div", {
+                className: "ant-form-item-label",
+                children: /* @__PURE__ */ jsx10("label", {
+                  className: computedProps.rules.find((r) => r.required) && "ant-form-item-required",
+                  children: computedProps.label
+                })
+              }),
               fields.map((field) => {
                 var _a3;
-                return /* @__PURE__ */ jsx10(AntdForm.Item, { children: /* @__PURE__ */ jsxs2(
-                  Row,
-                  {
+                return /* @__PURE__ */ jsx10(AntdForm.Item, {
+                  children: /* @__PURE__ */ jsxs2(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ jsx10(Col, { span: 23, children: /* @__PURE__ */ jsx10(
-                        AntdForm.Item,
-                        __spreadProps(__spreadValues({}, field), {
+                      /* @__PURE__ */ jsx10(Col, {
+                        span: 23,
+                        children: /* @__PURE__ */ jsx10(AntdForm.Item, {
+                          ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ jsx10(Input, __spreadValues({}, computedProps.input))
+                          children: /* @__PURE__ */ jsx10(Input, {
+                            ...computedProps.input
+                          })
                         })
-                      ) }),
-                      /* @__PURE__ */ jsx10(Col, { span: 1, children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(
-                        Button,
-                        {
+                      }),
+                      /* @__PURE__ */ jsx10(Col, {
+                        span: 1,
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
                           icon: /* @__PURE__ */ jsx10(MinusCircleOutlined, {}),
                           onClick: () => remove(field.name)
-                        }
-                      ) })
+                        })
+                      })
                     ]
-                  }
-                ) }, field.key);
+                  })
+                }, field.key);
               }),
-              /* @__PURE__ */ jsxs2(AntdForm.Item, { children: [
-                !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx10(
-                  Button,
-                  {
+              /* @__PURE__ */ jsxs2(AntdForm.Item, {
+                children: [
+                  !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx10(Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
                     icon: /* @__PURE__ */ jsx10(PlusOutlined, {})
-                  }
-                ),
-                computedProps.extra && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-extra", children: computedProps.extra }),
-                /* @__PURE__ */ jsx10(AntdForm.ErrorList, { errors })
-              ] })
-            ] });
-          }
+                  }),
+                  computedProps.extra && /* @__PURE__ */ jsx10("div", {
+                    className: "ant-form-item-extra",
+                    children: computedProps.extra
+                  }),
+                  /* @__PURE__ */ jsx10(AntdForm.ErrorList, {
+                    errors
+                  })
+                ]
+              })
+            ]
+          });
         }
-      );
+      });
     case "number":
-      return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: computedProps.options ? /* @__PURE__ */ jsx10(Select, __spreadValues({}, computedProps.input)) : /* @__PURE__ */ jsx10(
-        InputNumber,
-        __spreadValues({
-          style: { width: "100%" }
-        }, computedProps.input)
-      ) }));
+      return /* @__PURE__ */ jsx10(AntdForm.Item, {
+        ...computedProps,
+        children: computedProps.options ? /* @__PURE__ */ jsx10(Select, {
+          ...computedProps.input
+        }) : /* @__PURE__ */ jsx10(InputNumber, {
+          style: { width: "100%" },
+          ...computedProps.input
+        })
+      });
     case "number[]":
       if (computedProps.options)
-        return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: /* @__PURE__ */ jsx10(
-          Select,
-          __spreadValues({
-            mode: "multiple"
-          }, computedProps.input)
-        ) }));
-      return /* @__PURE__ */ jsx10(
-        AntdForm.List,
-        {
-          name: computedProps.name,
-          rules: computedProps.rules,
-          children: (fields, { add, remove }, { errors }) => {
-            var _a2, _b;
-            return /* @__PURE__ */ jsxs2(Fragment4, { children: [
-              computedProps.label && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-label", children: /* @__PURE__ */ jsx10("label", { className: ((_a2 = computedProps.rules) == null ? void 0 : _a2.find((r) => r.required)) && "ant-form-item-required", children: computedProps.label }) }),
+        return /* @__PURE__ */ jsx10(AntdForm.Item, {
+          ...computedProps,
+          children: /* @__PURE__ */ jsx10(Select, {
+            mode: "multiple",
+            ...computedProps.input
+          })
+        });
+      return /* @__PURE__ */ jsx10(AntdForm.List, {
+        name: computedProps.name,
+        rules: computedProps.rules,
+        children: (fields, { add, remove }, { errors }) => {
+          var _a2, _b;
+          return /* @__PURE__ */ jsxs2(Fragment4, {
+            children: [
+              computedProps.label && /* @__PURE__ */ jsx10("div", {
+                className: "ant-form-item-label",
+                children: /* @__PURE__ */ jsx10("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__ */ jsx10(AntdForm.Item, { children: /* @__PURE__ */ jsxs2(
-                  Row,
-                  {
+                return /* @__PURE__ */ jsx10(AntdForm.Item, {
+                  children: /* @__PURE__ */ jsxs2(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
-                      /* @__PURE__ */ jsx10(Col, { span: 23, children: /* @__PURE__ */ jsx10(
-                        AntdForm.Item,
-                        __spreadProps(__spreadValues({}, field), {
+                      /* @__PURE__ */ jsx10(Col, {
+                        span: 23,
+                        children: /* @__PURE__ */ jsx10(AntdForm.Item, {
+                          ...field,
                           noStyle: true,
-                          children: /* @__PURE__ */ jsx10(
-                            InputNumber,
-                            __spreadValues({
-                              style: { width: "100%" }
-                            }, computedProps.input)
-                          )
+                          children: /* @__PURE__ */ jsx10(InputNumber, {
+                            style: { width: "100%" },
+                            ...computedProps.input
+                          })
                         })
-                      ) }),
-                      /* @__PURE__ */ jsx10(Col, { span: 1, children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(
-                        Button,
-                        {
+                      }),
+                      /* @__PURE__ */ jsx10(Col, {
+                        span: 1,
+                        children: !((_a3 = computedProps.input) == null ? void 0 : _a3.disabled) && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(Button, {
                           danger: true,
                           type: "link",
                           style: { float: "right" },
                           icon: /* @__PURE__ */ jsx10(MinusCircleOutlined, {}),
                           onClick: () => remove(field.name)
-                        }
-                      ) })
+                        })
+                      })
                     ]
-                  }
-                ) }, field.key);
+                  })
+                }, field.key);
               }),
-              /* @__PURE__ */ jsxs2(AntdForm.Item, { children: [
-                !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx10(
-                  Button,
-                  {
+              /* @__PURE__ */ jsxs2(AntdForm.Item, {
+                children: [
+                  !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx10(Button, {
                     type: "dashed",
                     block: true,
                     onClick: () => add(),
                     icon: /* @__PURE__ */ jsx10(PlusOutlined, {})
-                  }
-                ),
-                computedProps.extra && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-extra", children: computedProps.extra }),
-                /* @__PURE__ */ jsx10(AntdForm.ErrorList, { errors })
-              ] })
-            ] });
-          }
+                  }),
+                  computedProps.extra && /* @__PURE__ */ jsx10("div", {
+                    className: "ant-form-item-extra",
+                    children: computedProps.extra
+                  }),
+                  /* @__PURE__ */ jsx10(AntdForm.ErrorList, {
+                    errors
+                  })
+                ]
+              })
+            ]
+          });
         }
-      );
+      });
     case "boolean":
-      return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: /* @__PURE__ */ jsx10(Switch, __spreadValues({}, computedProps.input)) }));
+      return /* @__PURE__ */ jsx10(AntdForm.Item, {
+        ...computedProps,
+        children: /* @__PURE__ */ jsx10(Switch, {
+          ...computedProps.input
+        })
+      });
     case "date":
-      return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: /* @__PURE__ */ jsx10(DatePicker, __spreadValues({}, computedProps.input)) }));
+      return /* @__PURE__ */ jsx10(AntdForm.Item, {
+        ...computedProps,
+        children: /* @__PURE__ */ jsx10(DatePicker, {
+          ...computedProps.input
+        })
+      });
     case "time":
-      return /* @__PURE__ */ jsx10(AntdForm.Item, __spreadProps(__spreadValues({}, computedProps), { children: /* @__PURE__ */ jsx10(TimePicker, __spreadValues({}, computedProps.input)) }));
+      return /* @__PURE__ */ jsx10(AntdForm.Item, {
+        ...computedProps,
+        children: /* @__PURE__ */ jsx10(TimePicker, {
+          ...computedProps.input
+        })
+      });
     case "object":
-      return /* @__PURE__ */ jsxs2(Fragment4, { children: [
-        computedProps.label && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-label", children: /* @__PURE__ */ jsx10("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__ */ jsx10(
-          FormItem,
-          __spreadValues({}, o),
-          o.id
-        ))
-      ] });
+      return /* @__PURE__ */ jsxs2(Fragment4, {
+        children: [
+          computedProps.label && /* @__PURE__ */ jsx10("div", {
+            className: "ant-form-item-label",
+            children: /* @__PURE__ */ jsx10("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__ */ jsx10(FormItem, {
+            ...o
+          }, o.id))
+        ]
+      });
     case "object[]":
-      return /* @__PURE__ */ jsx10(
-        AntdForm.List,
-        {
-          name: computedProps.name,
-          rules: computedProps.rules,
-          children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs2(Fragment4, { children: [
-            fields.map((field) => /* @__PURE__ */ jsxs2(
-              AntdForm.Item,
-              {
-                style: { marginBottom: 0 },
-                children: [
-                  /* @__PURE__ */ jsx10("div", { className: "ant-form-item-label", children: /* @__PURE__ */ jsxs2("label", { children: [
-                    computedProps.label,
-                    " ",
-                    field.name + 1,
-                    !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(
-                      Button,
-                      {
+      return /* @__PURE__ */ jsx10(AntdForm.List, {
+        name: computedProps.name,
+        rules: computedProps.rules,
+        children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs2(Fragment4, {
+          children: [
+            fields.map((field) => /* @__PURE__ */ jsxs2(AntdForm.Item, {
+              style: { marginBottom: 0 },
+              children: [
+                /* @__PURE__ */ jsx10("div", {
+                  className: "ant-form-item-label",
+                  children: /* @__PURE__ */ jsxs2("label", {
+                    children: [
+                      computedProps.label,
+                      " ",
+                      field.name + 1,
+                      !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ jsx10(Button, {
                         danger: true,
                         type: "link",
                         onClick: () => remove(field.name),
                         children: common2.delete
-                      }
-                    )
-                  ] }) }),
-                  /* @__PURE__ */ jsx10(Row, { gutter: 24, children: computedProps.object.map((o) => /* @__PURE__ */ jsx10(
-                    Col,
-                    {
-                      span: o.col || 24,
-                      children: /* @__PURE__ */ jsx10(
-                        FormItem,
-                        __spreadProps(__spreadValues({}, o), {
-                          name: [field.name, o.id]
-                        })
-                      )
-                    },
-                    o.id
-                  )) })
-                ]
-              },
-              field.key
-            )),
-            /* @__PURE__ */ jsxs2(AntdForm.Item, { children: [
-              !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsxs2(
-                Button,
-                {
+                      })
+                    ]
+                  })
+                }),
+                /* @__PURE__ */ jsx10(Row, {
+                  gutter: 24,
+                  children: computedProps.object.map((o) => /* @__PURE__ */ jsx10(Col, {
+                    span: o.col || 24,
+                    children: /* @__PURE__ */ jsx10(FormItem, {
+                      ...o,
+                      name: [field.name, o.id]
+                    })
+                  }, o.id))
+                })
+              ]
+            }, field.key)),
+            /* @__PURE__ */ jsxs2(AntdForm.Item, {
+              children: [
+                !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsxs2(Button, {
                   type: "dashed",
                   block: true,
                   onClick: () => add(),
@@ -871,14 +920,19 @@ function FormItem(props) {
                     " ",
                     computedProps.label
                   ]
-                }
-              ),
-              computedProps.extra && /* @__PURE__ */ jsx10("div", { className: "ant-form-item-extra", children: computedProps.extra }),
-              /* @__PURE__ */ jsx10(AntdForm.ErrorList, { errors })
-            ] })
-          ] })
-        }
-      );
+                }),
+                computedProps.extra && /* @__PURE__ */ jsx10("div", {
+                  className: "ant-form-item-extra",
+                  children: computedProps.extra
+                }),
+                /* @__PURE__ */ jsx10(AntdForm.ErrorList, {
+                  errors
+                })
+              ]
+            })
+          ]
+        })
+      });
     default:
       return null;
   }
@@ -889,17 +943,18 @@ FormItem.useStatus = AntdForm.Item.useStatus;
 import { jsx as jsx11, jsxs as jsxs3 } from "react/jsx-runtime";
 function Form(props) {
   var _a, _b;
-  const [loading, setLoading] = useState7(false);
-  const [computedProps, setComputedProps] = useState7();
+  const [loading, setLoading] = useState6(false);
+  const [computedProps, setComputedProps] = useState6();
   const config = useConfigContext();
-  const [extendTypes, setExtendTypes] = useState7();
+  const [extendTypes, setExtendTypes] = useState6();
   const [form] = AntdForm2.useForm(props.form);
-  const [initialValues, setInitialValues] = useState7(props.initialValues);
-  useEffect6(() => {
+  const [initialValues, setInitialValues] = useState6(props.initialValues);
+  useEffect5(() => {
     var _a2, _b2, _c;
-    const propsCopy = __spreadProps(__spreadValues({}, props), {
+    const propsCopy = {
+      ...props,
       form
-    });
+    };
     if (propsCopy.initialValues && ((_a2 = propsCopy.items) == null ? void 0 : _a2.length)) {
       for (const key in propsCopy.initialValues) {
         propsCopy.initialValues[key] = transferValue(
@@ -923,7 +978,10 @@ function Form(props) {
         setLoading(true);
         try {
           if (propsCopy.submit && ((_a3 = propsCopy.submit.to) == null ? void 0 : _a3.action)) {
-            await props.onFinish(values, async (values2) => faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? __spreadValues(__spreadValues({}, values2), propsCopy.submit.to.params) : values2));
+            await props.onFinish(values, async (values2) => faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
+              ...values2,
+              ...propsCopy.submit.to.params
+            } : values2));
           } else
             await props.onFinish(values);
         } catch (error) {
@@ -934,7 +992,10 @@ function Form(props) {
     } 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 ? __spreadValues(__spreadValues({}, values), propsCopy.submit.to.params) : values).then((result) => {
+        return faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
+          ...values,
+          ...propsCopy.submit.to.params
+        } : values).then((result) => {
           if (propsCopy.submit.to.then)
             propsCopy.submit.to.then(result);
           return result;
@@ -968,7 +1029,7 @@ function Form(props) {
         item.onValueChange(changedValues[key], allValues, form);
     }
   }, [computedProps]);
-  useEffect6(() => {
+  useEffect5(() => {
     if (!initialValues)
       return;
     console.debug("Form:initialValues", initialValues);
@@ -977,33 +1038,25 @@ function Form(props) {
   }, [computedProps]);
   if (!computedProps)
     return null;
-  return /* @__PURE__ */ jsxs3(
-    AntdForm2,
-    __spreadProps(__spreadValues({}, computedProps), {
-      onValuesChange,
-      children: [
-        computedProps.beforeItems,
-        (_a = computedProps.items) == null ? void 0 : _a.map((item) => isValidElement(item) ? item : /* @__PURE__ */ jsx11(
-          FormItem,
-          __spreadProps(__spreadValues({}, item), {
-            extendTypes
-          }),
-          item.id
-        )),
-        computedProps.children,
-        computedProps.submit !== false && /* @__PURE__ */ jsx11(
-          Button2,
-          {
-            htmlType: "submit",
-            type: "primary",
-            loading,
-            children: ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text
-          }
-        ),
-        computedProps.footer
-      ]
-    })
-  );
+  return /* @__PURE__ */ jsxs3(AntdForm2, {
+    ...computedProps,
+    onValuesChange,
+    children: [
+      computedProps.beforeItems,
+      (_a = computedProps.items) == null ? void 0 : _a.map((item) => isValidElement(item) ? item : /* @__PURE__ */ jsx11(FormItem, {
+        ...item,
+        extendTypes
+      }, item.id)),
+      computedProps.children,
+      computedProps.submit !== false && /* @__PURE__ */ jsx11(Button2, {
+        htmlType: "submit",
+        type: "primary",
+        loading,
+        children: ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text
+      }),
+      computedProps.footer
+    ]
+  });
 }
 Form.useForm = AntdForm2.useForm;
 Form.useFormInstance = AntdForm2.useFormInstance;
@@ -1020,9 +1073,11 @@ import { jsx as jsx12 } from "react/jsx-runtime";
 function Link(props) {
   var _a, _b, _c, _d;
   const { Link: Link2 } = useConfigContext();
-  let style = __spreadValues(__spreadProps(__spreadValues({}, Link2.style || {}), {
-    cursor: "pointer"
-  }), props.style);
+  let style = {
+    ...Link2.style || {},
+    cursor: "pointer",
+    ...props.style
+  };
   if (props.block)
     style = Object.assign({
       display: "block",
@@ -1030,49 +1085,36 @@ function Link(props) {
     }, style);
   if (props.href.startsWith("http")) {
     if (props.button)
-      return /* @__PURE__ */ jsx12(
-        Button3,
-        __spreadProps(__spreadValues({}, 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__ */ jsx12(
-      "a",
-      {
-        href: props.href,
+      return /* @__PURE__ */ jsx12(Button3, {
+        ...props.button,
         target: props.target || (Link2 == null ? void 0 : Link2.target) || "_blank",
         style,
-        children: (_b = props.text) != null ? _b : props.children
-      }
-    );
+        href: props.href,
+        children: (_a = props.text) != null ? _a : props.children
+      });
+    return /* @__PURE__ */ jsx12("a", {
+      href: props.href,
+      target: props.target || (Link2 == null ? void 0 : Link2.target) || "_blank",
+      style,
+      children: (_b = props.text) != null ? _b : props.children
+    });
   }
   if (props.button)
-    return /* @__PURE__ */ jsx12(
-      RouterLink,
-      {
-        to: props.href,
-        target: props.target || (Link2 == null ? void 0 : Link2.target),
-        children: /* @__PURE__ */ jsx12(
-          Button3,
-          __spreadProps(__spreadValues({}, props.button), {
-            style,
-            children: (_c = props.text) != null ? _c : props.children
-          })
-        )
-      }
-    );
-  return /* @__PURE__ */ jsx12(
-    RouterLink,
-    {
+    return /* @__PURE__ */ jsx12(RouterLink, {
       to: props.href,
       target: props.target || (Link2 == null ? void 0 : Link2.target),
-      style,
-      children: (_d = props.text) != null ? _d : props.children
-    }
-  );
+      children: /* @__PURE__ */ jsx12(Button3, {
+        ...props.button,
+        style,
+        children: (_c = props.text) != null ? _c : props.children
+      })
+    });
+  return /* @__PURE__ */ jsx12(RouterLink, {
+    to: props.href,
+    target: props.target || (Link2 == null ? void 0 : Link2.target),
+    style,
+    children: (_d = props.text) != null ? _d : props.children
+  });
 }
 
 // src/Routers.tsx
@@ -1088,39 +1130,39 @@ import { lazy } from "react";
 import { jsx as jsx13, jsxs as jsxs4 } from "react/jsx-runtime";
 function PageNotFound() {
   const config = useConfigContext();
-  return /* @__PURE__ */ jsx13(
-    Result,
-    {
-      status: "404",
-      title: config.common.pageNotFound
-    }
-  );
+  return /* @__PURE__ */ jsx13(Result, {
+    status: "404",
+    title: config.common.pageNotFound
+  });
 }
 function Routes(props) {
-  return /* @__PURE__ */ jsxs4(OriginRoutes, { children: [
-    props.routes.map((r) => /* @__PURE__ */ jsx13(
-      Route,
-      __spreadProps(__spreadValues({}, r), {
-        element: r.element || /* @__PURE__ */ jsx13(Suspense, { fallback: props.fallback || /* @__PURE__ */ jsx13("div", { style: { padding: "24px" }, children: /* @__PURE__ */ jsx13(Skeleton, { active: true }) }), children: /* @__PURE__ */ jsx13(r.page, {}) })
-      }),
-      r.path
-    )),
-    /* @__PURE__ */ jsx13(
-      Route,
-      {
+  return /* @__PURE__ */ jsxs4(OriginRoutes, {
+    children: [
+      props.routes.map((r) => /* @__PURE__ */ jsx13(Route, {
+        ...r,
+        element: r.element || /* @__PURE__ */ jsx13(Suspense, {
+          fallback: props.fallback || /* @__PURE__ */ jsx13("div", {
+            style: { padding: "24px" },
+            children: /* @__PURE__ */ jsx13(Skeleton, {
+              active: true
+            })
+          }),
+          children: /* @__PURE__ */ jsx13(r.page, {})
+        })
+      }, r.path)),
+      /* @__PURE__ */ jsx13(Route, {
         path: "*",
         element: props.notFound || /* @__PURE__ */ jsx13(PageNotFound, {})
-      },
-      "*"
-    )
-  ] });
+      }, "*")
+    ]
+  });
 }
 
 // src/Table.tsx
 import {
-  useState as useState8,
-  useEffect as useEffect7,
-  cloneElement as cloneElement4
+  useState as useState7,
+  useEffect as useEffect6,
+  cloneElement as cloneElement3
 } from "react";
 import {
   Table as AntdTable,
@@ -1162,9 +1204,52 @@ function processValue(item, value) {
   return value;
 }
 function Table(props) {
-  const [columns, setColumns] = useState8();
+  const [columns, setColumns] = useState7();
   const { common: common2 } = useConfigContext();
-  useEffect7(() => {
+  const generateFilterDropdown = (item) => {
+    if (typeof item.filterDropdown !== "undefined")
+      return;
+    if (item.options.length < 11) {
+      if (!item.filters)
+        item.filters = item.options.map((o) => ({
+          text: o.label,
+          value: o.value
+        }));
+      return;
+    }
+    item.filterDropdown = ({
+      setSelectedKeys,
+      selectedKeys,
+      confirm
+    }) => /* @__PURE__ */ jsx14("div", {
+      style: {
+        padding: 8,
+        width: "200px"
+      },
+      onKeyDown: (e) => e.stopPropagation(),
+      children: /* @__PURE__ */ jsx14(Select2, {
+        options: item.options,
+        allowClear: true,
+        showSearch: true,
+        style: { width: "100%" },
+        placeholder: `${common2.search} ${item.title}`,
+        value: selectedKeys,
+        onChange: (v) => {
+          setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
+          confirm();
+        },
+        mode: "multiple",
+        filterOption: (input, option) => {
+          if (!input || !option || !option.label)
+            return true;
+          input = input.trim();
+          return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
+        }
+      })
+    });
+    return item;
+  };
+  useEffect6(() => {
     var _a;
     for (const item of props.items) {
       if (!item.key)
@@ -1184,11 +1269,12 @@ function Table(props) {
           text: /* @__PURE__ */ jsx14(Blank, {}),
           value: null
         });
+        generateFilterDropdown(item);
       }
       if (item.tableChildren === null)
         item.render = () => null;
       else if (item.tableChildren)
-        item.render = (value, values) => cloneElement4(
+        item.render = (value, values) => cloneElement3(
           item.tableChildren,
           {
             scene: "table",
@@ -1199,7 +1285,7 @@ function Table(props) {
       else if (item.children === null)
         item.render = () => null;
       else if (item.children)
-        item.render = (value, values) => cloneElement4(
+        item.render = (value, values) => cloneElement3(
           item.children,
           {
             scene: "table",
@@ -1209,7 +1295,7 @@ function Table(props) {
         );
       if (props.extendTypes && props.extendTypes[item.type]) {
         if (props.extendTypes[item.type].children)
-          item.render = (value, values) => cloneElement4(
+          item.render = (value, values) => cloneElement3(
             props.extendTypes[item.type].children,
             {
               scene: "table",
@@ -1242,22 +1328,19 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx14(
-              Input2.Search,
-              {
-                placeholder: `${common2.search} ${item.title}`,
-                allowClear: true,
-                onSearch: (v) => {
-                  if (v) {
-                    setSelectedKeys([v]);
-                  } else {
-                    setSelectedKeys([]);
-                    clearFilters();
-                  }
-                  confirm();
+            }) => /* @__PURE__ */ jsx14(Input2.Search, {
+              placeholder: `${common2.search} ${item.title}`,
+              allowClear: true,
+              onSearch: (v) => {
+                if (v) {
+                  setSelectedKeys([v]);
+                } else {
+                  setSelectedKeys([]);
+                  clearFilters();
                 }
+                confirm();
               }
-            );
+            });
           break;
         case "string[]":
           if (!item.render)
@@ -1277,22 +1360,19 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx14(
-              Input2.Search,
-              {
-                placeholder: `${common2.search} ${item.title}`,
-                allowClear: true,
-                onSearch: (v) => {
-                  if (v) {
-                    setSelectedKeys([v]);
-                  } else {
-                    setSelectedKeys([]);
-                    clearFilters();
-                  }
-                  confirm();
+            }) => /* @__PURE__ */ jsx14(Input2.Search, {
+              placeholder: `${common2.search} ${item.title}`,
+              allowClear: true,
+              onSearch: (v) => {
+                if (v) {
+                  setSelectedKeys([v]);
+                } else {
+                  setSelectedKeys([]);
+                  clearFilters();
                 }
+                confirm();
               }
-            );
+            });
           break;
         case "number":
           if (!item.render)
@@ -1314,22 +1394,19 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx14(
-              Input2.Search,
-              {
-                placeholder: `${common2.search} ${item.title}`,
-                allowClear: true,
-                onSearch: (v) => {
-                  if (v) {
-                    setSelectedKeys([Number(v)]);
-                  } else {
-                    setSelectedKeys([]);
-                    clearFilters();
-                  }
-                  confirm();
+            }) => /* @__PURE__ */ jsx14(Input2.Search, {
+              placeholder: `${common2.search} ${item.title}`,
+              allowClear: true,
+              onSearch: (v) => {
+                if (v) {
+                  setSelectedKeys([Number(v)]);
+                } else {
+                  setSelectedKeys([]);
+                  clearFilters();
                 }
+                confirm();
               }
-            );
+            });
           break;
         case "number[]":
           if (!item.render)
@@ -1349,66 +1426,79 @@ function Table(props) {
               setSelectedKeys,
               confirm,
               clearFilters
-            }) => /* @__PURE__ */ jsx14(
-              Input2.Search,
-              {
-                placeholder: `${common2.search} ${item.title}`,
-                allowClear: true,
-                onSearch: (v) => {
-                  if (v) {
-                    setSelectedKeys([Number(v)]);
-                  } else {
-                    setSelectedKeys([]);
-                    clearFilters();
-                  }
-                  confirm();
+            }) => /* @__PURE__ */ jsx14(Input2.Search, {
+              placeholder: `${common2.search} ${item.title}`,
+              allowClear: true,
+              onSearch: (v) => {
+                if (v) {
+                  setSelectedKeys([Number(v)]);
+                } else {
+                  setSelectedKeys([]);
+                  clearFilters();
                 }
+                confirm();
               }
-            );
+            });
           break;
         case "boolean":
           if (!item.render)
-            item.render = (value) => isNil2(value) ? /* @__PURE__ */ jsx14(Blank, {}) : value ? /* @__PURE__ */ jsx14(CheckOutlined2, { style: {
-              marginTop: "4px",
-              color: "#52c41a"
-            } }) : /* @__PURE__ */ jsx14(CloseOutlined2, { style: {
-              marginTop: "4px",
-              color: "#ff4d4f"
-            } });
+            item.render = (value) => isNil2(value) ? /* @__PURE__ */ jsx14(Blank, {}) : value ? /* @__PURE__ */ jsx14(CheckOutlined2, {
+              style: {
+                marginTop: "4px",
+                color: "#52c41a"
+              }
+            }) : /* @__PURE__ */ jsx14(CloseOutlined2, {
+              style: {
+                marginTop: "4px",
+                color: "#ff4d4f"
+              }
+            });
           if (item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               selectedKeys,
               confirm
-            }) => /* @__PURE__ */ jsxs5(
-              Radio.Group,
-              {
-                style: { padding: 8 },
-                buttonStyle: "solid",
-                value: JSON.stringify(selectedKeys[0]),
-                onChange: (e) => {
-                  const Values = {
-                    true: true,
-                    false: false,
-                    null: null
-                  };
-                  setSelectedKeys(e.target.value ? [Values[e.target.value]] : []);
-                  confirm();
-                },
-                children: [
-                  /* @__PURE__ */ jsx14(Radio.Button, { children: common2.all }),
-                  /* @__PURE__ */ jsx14(Radio.Button, { value: "true", children: /* @__PURE__ */ jsx14(CheckOutlined2, { style: {
-                    color: "#52c41a",
-                    verticalAlign: "middle"
-                  } }) }),
-                  /* @__PURE__ */ jsx14(Radio.Button, { value: "false", children: /* @__PURE__ */ jsx14(CloseOutlined2, { style: {
-                    verticalAlign: "middle",
-                    color: "#ff4d4f"
-                  } }) }),
-                  /* @__PURE__ */ jsx14(Radio.Button, { value: "null", children: common2.blank })
-                ]
-              }
-            );
+            }) => /* @__PURE__ */ jsxs5(Radio.Group, {
+              style: { padding: 8 },
+              buttonStyle: "solid",
+              value: JSON.stringify(selectedKeys[0]),
+              onChange: (e) => {
+                const Values = {
+                  true: true,
+                  false: false,
+                  null: null
+                };
+                setSelectedKeys(e.target.value ? [Values[e.target.value]] : []);
+                confirm();
+              },
+              children: [
+                /* @__PURE__ */ jsx14(Radio.Button, {
+                  children: common2.all
+                }),
+                /* @__PURE__ */ jsx14(Radio.Button, {
+                  value: "true",
+                  children: /* @__PURE__ */ jsx14(CheckOutlined2, {
+                    style: {
+                      color: "#52c41a",
+                      verticalAlign: "middle"
+                    }
+                  })
+                }),
+                /* @__PURE__ */ jsx14(Radio.Button, {
+                  value: "false",
+                  children: /* @__PURE__ */ jsx14(CloseOutlined2, {
+                    style: {
+                      verticalAlign: "middle",
+                      color: "#ff4d4f"
+                    }
+                  })
+                }),
+                /* @__PURE__ */ jsx14(Radio.Button, {
+                  value: "null",
+                  children: common2.blank
+                })
+              ]
+            });
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               switch (value) {
@@ -1436,15 +1526,12 @@ function Table(props) {
             item.filterDropdown = ({
               setSelectedKeys,
               confirm
-            }) => /* @__PURE__ */ jsx14(
-              DatePicker2.RangePicker,
-              {
-                onChange: (dates) => {
-                  setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
-                  confirm();
-                }
+            }) => /* @__PURE__ */ jsx14(DatePicker2.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
               }
-            );
+            });
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (isNil2(value[0]))
@@ -1469,15 +1556,12 @@ function Table(props) {
             item.filterDropdown = ({
               setSelectedKeys,
               confirm
-            }) => /* @__PURE__ */ jsx14(
-              DatePicker2.RangePicker,
-              {
-                onChange: (dates) => {
-                  setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
-                  confirm();
-                }
+            }) => /* @__PURE__ */ jsx14(DatePicker2.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
               }
-            );
+            });
           if (!item.onFilter)
             item.onFilter = (value, row) => {
               if (isNil2(value[0]))
@@ -1489,26 +1573,21 @@ function Table(props) {
           break;
         case "object":
           if (!item.render)
-            item.render = (value) => /* @__PURE__ */ jsx14(
-              Description,
-              {
-                items: item.object,
-                dataSource: value || {},
-                column: 1
-              }
-            );
+            item.render = (value) => /* @__PURE__ */ jsx14(Description, {
+              items: item.object,
+              dataSource: value || {},
+              column: 1
+            });
           break;
         case "object[]":
           if (!item.render)
-            item.render = (value) => /* @__PURE__ */ jsx14(Fragment5, { children: value.map((v, i) => /* @__PURE__ */ jsx14(
-              Description,
-              {
+            item.render = (value) => /* @__PURE__ */ jsx14(Fragment5, {
+              children: value.map((v, i) => /* @__PURE__ */ jsx14(Description, {
                 items: item.object,
                 dataSource: v || [],
                 column: 1
-              },
-              i
-            )) });
+              }, i))
+            });
           break;
         default:
           if (!item.render)
@@ -1524,64 +1603,21 @@ function Table(props) {
     }
     setColumns(props.items);
   }, [props.items]);
-  useEffect7(() => {
+  useEffect6(() => {
     if (!props.dataSource || !columns)
       return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
-        const filters = uniqBy(props.dataSource, column.id).map((v) => ({
-          text: v[column.id],
+        const options = uniqBy(props.dataSource, column.id).map((v) => ({
+          label: v[column.id],
           value: v[column.id]
         }));
-        if (filters.length)
+        if (options.length)
           setColumns((prev) => {
             const newColumns = [...prev];
             const index = newColumns.findIndex((item) => item.id === column.id);
-            if (filters.length < 11)
-              newColumns[index].filters = filters.concat({
-                text: /* @__PURE__ */ jsx14(Blank, {}),
-                value: null
-              });
-            else
-              newColumns[index].filterDropdown = ({
-                setSelectedKeys,
-                selectedKeys,
-                confirm
-              }) => /* @__PURE__ */ jsx14(
-                "div",
-                {
-                  style: {
-                    padding: 8,
-                    width: "200px"
-                  },
-                  onKeyDown: (e) => e.stopPropagation(),
-                  children: /* @__PURE__ */ jsx14(
-                    Select2,
-                    {
-                      options: filters.map((f) => ({
-                        label: f.text,
-                        value: f.value
-                      })),
-                      allowClear: true,
-                      showSearch: true,
-                      style: { width: "100%" },
-                      placeholder: `${common2.search} ${newColumns[index].title}`,
-                      value: selectedKeys,
-                      onChange: (v) => {
-                        setSelectedKeys((v == null ? void 0 : v.length) ? v : []);
-                        confirm();
-                      },
-                      mode: "multiple",
-                      filterOption: (input, option) => {
-                        if (!input || !option || !option.label)
-                          return true;
-                        input = input.trim();
-                        return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
-                      }
-                    }
-                  )
-                }
-              );
+            newColumns[index].options = options;
+            generateFilterDropdown(newColumns[index]);
             return newColumns;
           });
       }
@@ -1590,26 +1626,19 @@ function Table(props) {
   if (!columns)
     return null;
   if (props.dataSource)
-    return /* @__PURE__ */ jsx14(
-      AntdTable,
-      __spreadProps(__spreadValues({}, props), {
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: props.dataSource
-      })
-    );
-  return /* @__PURE__ */ jsx14(
-    FaasDataWrapper2,
-    __spreadProps(__spreadValues({}, props.faasData), {
-      children: /* @__PURE__ */ jsx14(
-        FaasDataTable,
-        {
-          props,
-          columns
-        }
-      )
+    return /* @__PURE__ */ jsx14(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns,
+      dataSource: props.dataSource
+    });
+  return /* @__PURE__ */ jsx14(FaasDataWrapper, {
+    ...props.faasData,
+    children: /* @__PURE__ */ jsx14(FaasDataTable, {
+      props,
+      columns
     })
-  );
+  });
 }
 function FaasDataTable({
   props,
@@ -1618,8 +1647,8 @@ function FaasDataTable({
   params,
   reload
 }) {
-  const [currentColumns, setCurrentColumns] = useState8(columns);
-  useEffect7(() => {
+  const [currentColumns, setCurrentColumns] = useState7(columns);
+  useEffect6(() => {
     if (!data || Array.isArray(data))
       return;
     setCurrentColumns((prev) => {
@@ -1655,75 +1684,75 @@ function FaasDataTable({
     });
   }, [columns, data]);
   if (!data)
-    return /* @__PURE__ */ jsx14(
-      AntdTable,
-      __spreadProps(__spreadValues({}, props), {
-        rowKey: props.rowKey || "id",
-        columns: currentColumns,
-        dataSource: []
-      })
-    );
+    return /* @__PURE__ */ jsx14(AntdTable, {
+      ...props,
+      rowKey: props.rowKey || "id",
+      columns: currentColumns,
+      dataSource: []
+    });
   if (Array.isArray(data))
-    return /* @__PURE__ */ jsx14(
-      AntdTable,
-      __spreadProps(__spreadValues({}, props), {
-        rowKey: props.rowKey || "id",
-        columns: currentColumns,
-        dataSource: data
-      })
-    );
-  return /* @__PURE__ */ jsx14(
-    AntdTable,
-    __spreadProps(__spreadValues({}, props), {
+    return /* @__PURE__ */ jsx14(AntdTable, {
+      ...props,
       rowKey: props.rowKey || "id",
       columns: currentColumns,
-      dataSource: data.rows,
-      pagination: __spreadValues(__spreadValues({}, props.pagination), data.pagination),
-      onChange: (pagination, filters, sorter, extra) => {
-        if (props.onChange) {
-          const processed = props.onChange(pagination, filters, sorter, extra);
-          reload(__spreadProps(__spreadValues({}, params), {
-            pagination: processed.pagination,
-            filters: processed.filters,
-            sorter: processed.sorter
-          }));
-          return;
-        }
-        reload(__spreadProps(__spreadValues({}, params), {
-          pagination,
-          filters,
-          sorter
-        }));
+      dataSource: data
+    });
+  return /* @__PURE__ */ jsx14(AntdTable, {
+    ...props,
+    rowKey: props.rowKey || "id",
+    columns: currentColumns,
+    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
+      });
+    }
+  });
 }
 
 // src/Title.tsx
-import { useEffect as useEffect8, cloneElement as cloneElement5 } from "react";
+import { useEffect as useEffect7, cloneElement as cloneElement4 } from "react";
 import { Fragment as Fragment6, jsx as jsx15 } from "react/jsx-runtime";
 function Title(props) {
   const { Title: Title2 } = useConfigContext();
-  useEffect8(() => {
+  useEffect7(() => {
     const title = Array.isArray(props.title) ? props.title : [props.title];
     document.title = title.concat(props.suffix || Title2.suffix).filter((t) => !!t).join(props.separator || Title2.separator);
   }, [props]);
   if (props.h1) {
     if (typeof props.h1 === "boolean")
-      return /* @__PURE__ */ jsx15("h1", { children: Array.isArray(props.title) ? props.title[0] : props.title });
-    return /* @__PURE__ */ jsx15(
-      "h1",
-      {
-        className: props.h1.className,
-        style: props.h1.style,
+      return /* @__PURE__ */ jsx15("h1", {
         children: Array.isArray(props.title) ? props.title[0] : props.title
-      }
-    );
+      });
+    return /* @__PURE__ */ jsx15("h1", {
+      className: props.h1.className,
+      style: props.h1.style,
+      children: Array.isArray(props.title) ? props.title[0] : props.title
+    });
   }
   if (props.plain)
-    return /* @__PURE__ */ jsx15(Fragment6, { children: Array.isArray(props.title) ? props.title[0] : props.title });
+    return /* @__PURE__ */ jsx15(Fragment6, {
+      children: Array.isArray(props.title) ? props.title[0] : props.title
+    });
   if (props.children)
-    return cloneElement5(props.children, { title: props.title });
+    return cloneElement4(props.children, { title: props.title });
   return null;
 }
 export {
@@ -1734,7 +1763,7 @@ export {
   Description,
   Drawer,
   ErrorBoundary,
-  FaasDataWrapper2 as FaasDataWrapper,
+  FaasDataWrapper,
   Form,
   FormItem,
   Link,