@faasjs/ant-design 0.0.2-beta.406 → 0.0.2-beta.408

package/dist/index.mjs

@@ -6,10 +6,17 @@ import { Typography } from "antd";
 import { isNil } from "lodash";
 
 // src/Config.tsx
-import { createContext, useContext } from "react";
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useState
+} from "react";
+import { ConfigProvider as AntdConfigProvider } from "antd";
+import { defaultsDeep } from "lodash";
 import { jsx } from "react/jsx-runtime";
 var isZH = /^zh/i.test(navigator.language);
-var common = isZH ? {
+var zh = {
   lang: "zh",
   blank: "\u7A7A",
   all: "\u5168\u90E8",
@@ -18,7 +25,8 @@ var common = isZH ? {
   add: "\u6DFB\u52A0",
   delete: "\u5220\u9664",
   required: "\u5FC5\u586B"
-} : {
+};
+var en = {
   lang: "en",
   blank: "Empty",
   all: "All",
@@ -28,7 +36,9 @@ var common = isZH ? {
   delete: "Delete",
   required: "is required"
 };
+var common = isZH ? zh : en;
 var baseConfig = {
+  antd: {},
   lang: "en",
   common,
   Blank: { text: common.blank },
@@ -36,19 +46,32 @@ var baseConfig = {
   Title: {
     separator: " - ",
     suffix: ""
-  }
+  },
+  Link: { style: {} }
 };
 var ConfigContext = createContext(baseConfig);
 function ConfigProvider({
   config,
   children
 }) {
+  const [values, setValues] = useState(baseConfig);
+  useEffect(() => {
+    if (config.lang === "zh") {
+      setValues(defaultsDeep(config, {
+        lang: "zh",
+        common: zh,
+        Blank: { text: zh.blank },
+        Form: { submit: { text: zh.submit } }
+      }, baseConfig));
+    } else
+      setValues(values);
+  }, []);
   return /* @__PURE__ */ jsx(ConfigContext.Provider, {
-    value: {
-      ...baseConfig,
-      ...config
-    },
-    children
+    value: values,
+    children: /* @__PURE__ */ jsx(AntdConfigProvider, {
+      ...config.antd,
+      children
+    })
   });
 }
 function useConfigContext() {
@@ -58,10 +81,10 @@ function useConfigContext() {
 // src/Blank.tsx
 import { jsx as jsx2 } from "react/jsx-runtime";
 function Blank(options) {
-  const config = useConfigContext();
+  const { Blank: Blank2 } = useConfigContext();
   return !options || isNil(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsx2(Typography.Text, {
     disabled: true,
-    children: (options == null ? void 0 : options.text) || config.Blank.text
+    children: (options == null ? void 0 : options.text) || Blank2.text
   }) : options.value;
 }
 
@@ -97,15 +120,15 @@ import {
 import { upperFirst as upperFirst2 } from "lodash";
 import {
   cloneElement,
-  useEffect,
-  useState
+  useEffect as useEffect2,
+  useState as useState2
 } from "react";
 import dayjs from "dayjs";
 import { FaasDataWrapper } from "@faasjs/react";
 import { Fragment, jsx as jsx3 } from "react/jsx-runtime";
 function DescriptionItemContent(props) {
-  const [computedProps, setComputedProps] = useState();
-  useEffect(() => {
+  const [computedProps, setComputedProps] = useState2();
+  useEffect2(() => {
     var _a, _b;
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
@@ -226,10 +249,10 @@ function Description(props) {
 
 // src/Drawer.tsx
 import { Drawer } from "antd";
-import { useState as useState2 } from "react";
+import { useState as useState3 } from "react";
 import { jsx as jsx4 } from "react/jsx-runtime";
 function useDrawer(init) {
-  const [props, setProps] = useState2({
+  const [props, setProps] = useState3({
     visible: false,
     onClose: () => setProps((prev) => ({
       ...prev,
@@ -258,8 +281,8 @@ import {
   Form as AntdForm2
 } from "antd";
 import {
-  useEffect as useEffect3,
-  useState as useState4
+  useEffect as useEffect4,
+  useState as useState5
 } from "react";
 
 // src/FormItem.tsx
@@ -274,7 +297,7 @@ import {
   Select
 } from "antd";
 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
-import { useEffect as useEffect2, useState as useState3 } from "react";
+import { useEffect as useEffect3, useState as useState4 } from "react";
 import { upperFirst as upperFirst3 } from "lodash";
 
 // src/TimePicker.tsx
@@ -340,8 +363,8 @@ function processProps(propsCopy, config) {
   return propsCopy;
 }
 function DateItem(options) {
-  const [value, setValue] = useState3();
-  useEffect2(() => {
+  const [value, setValue] = useState4();
+  useEffect3(() => {
     setValue(options.value && !isDayjs(options.value) ? dayjs2(options.value) : null);
   }, [options.value]);
   return /* @__PURE__ */ jsx6(DatePicker, {
@@ -350,8 +373,8 @@ function DateItem(options) {
   });
 }
 function TimeItem(options) {
-  const [value, setValue] = useState3();
-  useEffect2(() => {
+  const [value, setValue] = useState4();
+  useEffect3(() => {
     setValue(options.value && !isDayjs(options.value) ? dayjs2(options.value) : null);
   }, [options.value]);
   return /* @__PURE__ */ jsx6(TimePicker, {
@@ -361,10 +384,10 @@ function TimeItem(options) {
 }
 function FormItem(props) {
   var _a;
-  const [computedProps, setComputedProps] = useState3();
-  const [extendTypes, setExtendTypes] = useState3();
+  const [computedProps, setComputedProps] = useState4();
+  const [extendTypes, setExtendTypes] = useState4();
   const config = useConfigContext();
-  useEffect2(() => {
+  useEffect3(() => {
     const propsCopy = { ...props };
     if (propsCopy.extendTypes) {
       setExtendTypes(propsCopy.extendTypes);
@@ -655,11 +678,11 @@ function FormItem(props) {
 import { jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
 function Form(props) {
   var _a, _b;
-  const [loading, setLoading] = useState4(false);
-  const [computedProps, setComputedProps] = useState4();
+  const [loading, setLoading] = useState5(false);
+  const [computedProps, setComputedProps] = useState5();
   const config = useConfigContext();
-  const [extendTypes, setExtendTypes] = useState4();
-  useEffect3(() => {
+  const [extendTypes, setExtendTypes] = useState5();
+  useEffect4(() => {
     var _a2;
     const propsCopy = { ...props };
     if (propsCopy.onFinish) {
@@ -681,10 +704,11 @@ function Form(props) {
       };
     } else if (propsCopy.submit && ((_a2 = propsCopy.submit.to) == null ? void 0 : _a2.action)) {
       propsCopy.onFinish = async (values) => {
-        return await faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
+        setLoading(true);
+        return faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? {
           ...values,
           ...propsCopy.submit.to.params
-        } : values);
+        } : values).finally(() => setLoading(false));
       };
     }
     if (propsCopy.extendTypes) {
@@ -717,12 +741,50 @@ function Form(props) {
 Form.useForm = AntdForm2.useForm;
 Form.Item = FormItem;
 
+// src/Link.tsx
+import { Link as RouterLink } from "react-router-dom";
+import { Button as Button3 } from "antd";
+import { jsx as jsx8 } from "react/jsx-runtime";
+function Link({
+  href,
+  target,
+  text,
+  children,
+  style,
+  button
+}) {
+  const { Link: Link2 } = useConfigContext();
+  style = Object.assign({ cursor: "pointer" }, style);
+  if (button)
+    return /* @__PURE__ */ jsx8(Button3, {
+      ...button,
+      children: /* @__PURE__ */ jsx8(RouterLink, {
+        to: href,
+        target: target || (Link2 == null ? void 0 : Link2.target),
+        style: {
+          ...Link2.style,
+          ...style || {}
+        },
+        children: text || children
+      })
+    });
+  return /* @__PURE__ */ jsx8(RouterLink, {
+    to: href,
+    target: target || (Link2 == null ? void 0 : Link2.target),
+    style: {
+      ...Link2.style,
+      ...style || {}
+    },
+    children: text || children
+  });
+}
+
 // src/Modal.tsx
 import { Modal } from "antd";
-import { useState as useState5 } from "react";
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { useState as useState6 } from "react";
+import { jsx as jsx9 } from "react/jsx-runtime";
 function useModal(init) {
-  const [props, setProps] = useState5({
+  const [props, setProps] = useState6({
     visible: false,
     onCancel: () => setProps((prev) => ({
       ...prev,
@@ -731,7 +793,7 @@ function useModal(init) {
     ...init
   });
   return {
-    modal: /* @__PURE__ */ jsx8(Modal, {
+    modal: /* @__PURE__ */ jsx9(Modal, {
       ...props
     }),
     modalProps: props,
@@ -753,10 +815,10 @@ import {
   Routes as OriginRoutes,
   Route
 } from "react-router-dom";
-import { jsx as jsx9, jsxs as jsxs3 } from "react/jsx-runtime";
-function NotFound() {
+import { jsx as jsx10, jsxs as jsxs3 } from "react/jsx-runtime";
+function PageNotFound() {
   const config = useConfigContext();
-  return /* @__PURE__ */ jsx9(Result, {
+  return /* @__PURE__ */ jsx10(Result, {
     status: "404",
     title: config.common.pageNotFound
   });
@@ -764,21 +826,21 @@ function NotFound() {
 function Routes(props) {
   return /* @__PURE__ */ jsxs3(OriginRoutes, {
     children: [
-      props.routes.map((r) => /* @__PURE__ */ jsx9(Route, {
+      props.routes.map((r) => /* @__PURE__ */ jsx10(Route, {
         ...r,
-        element: r.element || /* @__PURE__ */ jsx9(Suspense, {
-          fallback: props.fallback || /* @__PURE__ */ jsx9("div", {
+        element: r.element || /* @__PURE__ */ jsx10(Suspense, {
+          fallback: props.fallback || /* @__PURE__ */ jsx10("div", {
             style: { padding: "24px" },
-            children: /* @__PURE__ */ jsx9(Skeleton2, {
+            children: /* @__PURE__ */ jsx10(Skeleton2, {
               active: true
             })
           }),
-          children: /* @__PURE__ */ jsx9(r.page, {})
+          children: /* @__PURE__ */ jsx10(r.page, {})
         })
       }, r.path)),
-      /* @__PURE__ */ jsx9(Route, {
+      /* @__PURE__ */ jsx10(Route, {
         path: "*",
-        element: props.notFound || /* @__PURE__ */ jsx9(NotFound, {})
+        element: props.notFound || /* @__PURE__ */ jsx10(PageNotFound, {})
       }, "*")
     ]
   });
@@ -786,8 +848,8 @@ function Routes(props) {
 
 // src/Table.tsx
 import {
-  useState as useState6,
-  useEffect as useEffect4,
+  useState as useState7,
+  useEffect as useEffect5,
   cloneElement as cloneElement2
 } from "react";
 import {
@@ -799,7 +861,7 @@ import dayjs3 from "dayjs";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
 import { isNil as isNil2, upperFirst as upperFirst4 } from "lodash";
 import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
-import { jsx as jsx10, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
   var _a;
   if (typeof value !== "undefined" && value !== null) {
@@ -830,9 +892,9 @@ function processValue(item, value) {
   return value;
 }
 function Table(props) {
-  const [columns, setColumns] = useState6();
+  const [columns, setColumns] = useState7();
   const config = useConfigContext();
-  useEffect4(() => {
+  useEffect5(() => {
     var _a;
     for (const item of props.items) {
       if (!item.key)
@@ -888,12 +950,12 @@ function Table(props) {
             item.onFilter = (value, row) => row[item.id].includes(value);
           break;
         case "boolean":
-          item.render = (value) => typeof value === "undefined" ? /* @__PURE__ */ jsx10(Blank, {}) : value ? /* @__PURE__ */ jsx10(CheckOutlined2, {
+          item.render = (value) => typeof value === "undefined" ? /* @__PURE__ */ jsx11(Blank, {}) : value ? /* @__PURE__ */ jsx11(CheckOutlined2, {
             style: {
               marginTop: "4px",
               color: "#52c41a"
             }
-          }) : /* @__PURE__ */ jsx10(CloseOutlined2, {
+          }) : /* @__PURE__ */ jsx11(CloseOutlined2, {
             style: {
               marginTop: "4px",
               color: "#ff4d4f"
@@ -913,28 +975,28 @@ function Table(props) {
                 confirm();
               },
               children: [
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx11(Radio.Button, {
                   children: config.common.all
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx11(Radio.Button, {
                   value: "true",
-                  children: /* @__PURE__ */ jsx10(CheckOutlined2, {
+                  children: /* @__PURE__ */ jsx11(CheckOutlined2, {
                     style: {
                       color: "#52c41a",
                       verticalAlign: "middle"
                     }
                   })
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx11(Radio.Button, {
                   value: "false",
-                  children: /* @__PURE__ */ jsx10(CloseOutlined2, {
+                  children: /* @__PURE__ */ jsx11(CloseOutlined2, {
                     style: {
                       verticalAlign: "middle",
                       color: "#ff4d4f"
                     }
                   })
                 }),
-                /* @__PURE__ */ jsx10(Radio.Button, {
+                /* @__PURE__ */ jsx11(Radio.Button, {
                   value: "empty",
                   children: config.common.blank
                 })
@@ -976,14 +1038,14 @@ function Table(props) {
   if (!columns)
     return null;
   if (!props.faasData)
-    return /* @__PURE__ */ jsx10(AntdTable, {
+    return /* @__PURE__ */ jsx11(AntdTable, {
       ...props,
       rowKey: props.rowKey || "id",
       columns,
       dataSource: props.dataSource
     });
-  return /* @__PURE__ */ jsx10(FaasDataWrapper2, {
-    fallback: props.faasData.fallback || /* @__PURE__ */ jsx10(Skeleton3, {
+  return /* @__PURE__ */ jsx11(FaasDataWrapper2, {
+    fallback: props.faasData.fallback || /* @__PURE__ */ jsx11(Skeleton3, {
       active: true
     }),
     render: ({
@@ -992,20 +1054,20 @@ function Table(props) {
       reload
     }) => {
       if (!data)
-        return /* @__PURE__ */ jsx10(AntdTable, {
+        return /* @__PURE__ */ jsx11(AntdTable, {
           ...props,
           rowKey: props.rowKey || "id",
           columns,
           dataSource: []
         });
       if (Array.isArray(data))
-        return /* @__PURE__ */ jsx10(AntdTable, {
+        return /* @__PURE__ */ jsx11(AntdTable, {
           ...props,
           rowKey: props.rowKey || "id",
           columns,
           dataSource: data
         });
-      return /* @__PURE__ */ jsx10(AntdTable, {
+      return /* @__PURE__ */ jsx11(AntdTable, {
         ...props,
         rowKey: props.rowKey || "id",
         columns,
@@ -1039,20 +1101,20 @@ function Table(props) {
 }
 
 // src/Title.tsx
-import { useEffect as useEffect5, cloneElement as cloneElement3 } from "react";
-import { jsx as jsx11 } from "react/jsx-runtime";
+import { useEffect as useEffect6, cloneElement as cloneElement3 } from "react";
+import { jsx as jsx12 } from "react/jsx-runtime";
 function Title(props) {
   const config = useConfigContext();
-  useEffect5(() => {
+  useEffect6(() => {
     const title = Array.isArray(props.title) ? props.title : [props.title];
     document.title = title.concat(props.suffix || config.Title.suffix).filter((t) => !!t).join(props.separator || config.Title.separator);
   }, []);
   if (props.h1) {
     if (typeof props.h1 === "boolean")
-      return /* @__PURE__ */ jsx11("h1", {
+      return /* @__PURE__ */ jsx12("h1", {
         children: Array.isArray(props.title) ? props.title[0] : props.title
       });
-    return /* @__PURE__ */ jsx11("h1", {
+    return /* @__PURE__ */ jsx12("h1", {
       className: props.h1.className,
       style: props.h1.style,
       children: Array.isArray(props.title) ? props.title[0] : props.title
@@ -1072,7 +1134,9 @@ export {
   Drawer,
   Form,
   FormItem,
+  Link,
   Modal,
+  PageNotFound,
   Routes,
   Table,
   TimePicker,

package/package.json

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