@faasjs/ant-design 0.0.2-beta.381 → 0.0.2-beta.384

package/dist/index.d.ts

@@ -36,11 +36,15 @@ declare type CalendarProps = CalendarProps$1<Dayjs>;
 declare const Calendar: (props: antd_es_calendar_generateCalendar_js.CalendarProps<Dayjs>) => JSX.Element;
 
 declare type FaasState = {
+    lang: string;
     common: {
         blank: string;
         all: string;
         submit: string;
         pageNotFound: string;
+        add: string;
+        delete: string;
+        required: string;
     };
     Blank: {
         text: string;
@@ -225,7 +229,7 @@ declare type FormItemProps<T = any> = {
     extendTypes?: {
         [type: string]: ExtendFormTypeProps;
     };
-} & FormItemInputProps & FaasItemProps & FormItemProps$1<T>;
+} & FormItemInputProps & FaasItemProps & Omit<FormItemProps$1<T>, 'children'>;
 /**
  * FormItem, can be used without Form.
  *

package/dist/index.js

@@ -75,19 +75,28 @@ var import_lodash = require("lodash");
 // src/Config.tsx
 var import_react2 = require("react");
 var import_react_use = require("react-use");
-var isCN = /^zh/i.test(navigator.language);
-var common = isCN ? {
+var isZH = /^zh/i.test(navigator.language);
+var common = isZH ? {
+  lang: "zh",
   blank: "\u7A7A",
   all: "\u5168\u90E8",
   submit: "\u63D0\u4EA4",
-  pageNotFound: "\u9875\u9762\u672A\u627E\u5230"
+  pageNotFound: "\u9875\u9762\u672A\u627E\u5230",
+  add: "\u6DFB\u52A0",
+  delete: "\u5220\u9664",
+  required: "\u5FC5\u586B"
 } : {
+  lang: "en",
   blank: "Empty",
   all: "All",
   submit: "Submit",
-  pageNotFound: "Page Not Found"
+  pageNotFound: "Page Not Found",
+  add: "Add",
+  delete: "Delete",
+  required: "is required"
 };
 var useFaasState = (0, import_react_use.createGlobalState)({
+  lang: "en",
   common,
   Blank: { text: common.blank },
   Form: { submit: { text: common.submit } },
@@ -283,7 +292,7 @@ var TimePicker = (0, import_react6.forwardRef)((props, ref) => {
 TimePicker.displayName = "TimePicker";
 
 // src/FormItem.tsx
-function processProps(propsCopy) {
+function processProps(propsCopy, config) {
   if (!propsCopy.title)
     propsCopy.title = (0, import_lodash4.upperFirst)(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
@@ -300,13 +309,13 @@ function processProps(propsCopy) {
         required: true,
         validator: async (_, values) => {
           if (!values || values.length < 1)
-            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} is required`));
+            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} ${config.common.required}`));
         }
       });
     else
       propsCopy.rules.push({
         required: true,
-        message: `${propsCopy.label || propsCopy.title} is required`
+        message: `${propsCopy.label || propsCopy.title} ${config.common.required}`
       });
   }
   if (!propsCopy.input)
@@ -323,7 +332,7 @@ function processProps(propsCopy) {
       for (const sub of propsCopy.object) {
         if (!sub.name)
           sub.name = propsCopy.name.concat(sub.id);
-        processProps(sub);
+        processProps(sub, config);
       }
       break;
   }
@@ -332,8 +341,9 @@ function processProps(propsCopy) {
 function FormItem(props) {
   var _a;
   const [computedProps, setComputedProps] = (0, import_react7.useState)();
+  const [config] = useFaasState();
   (0, import_react7.useEffect)(() => {
-    setComputedProps(processProps(__spreadValues({}, props)));
+    setComputedProps(processProps(__spreadValues({}, props), config));
   }, [props]);
   if (!computedProps)
     return null;
@@ -464,9 +474,8 @@ function FormItem(props) {
       }, /* @__PURE__ */ import_react.default.createElement("label", null, computedProps.label, " ", field.name + 1, !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ import_react.default.createElement(import_antd4.Button, {
         danger: true,
         type: "link",
-        icon: /* @__PURE__ */ import_react.default.createElement(import_icons2.MinusCircleOutlined, null),
         onClick: () => remove(field.name)
-      }))), /* @__PURE__ */ import_react.default.createElement(import_antd4.Row, {
+      }, config.common.delete))), /* @__PURE__ */ import_react.default.createElement(import_antd4.Row, {
         gutter: 24
       }, computedProps.object.map((o) => /* @__PURE__ */ import_react.default.createElement(import_antd4.Col, {
         key: o.id,
@@ -478,7 +487,7 @@ function FormItem(props) {
         block: true,
         onClick: () => add(),
         icon: /* @__PURE__ */ import_react.default.createElement(import_icons2.PlusOutlined, null)
-      }, computedProps.label), /* @__PURE__ */ import_react.default.createElement(import_antd4.Form.ErrorList, {
+      }, config.common.add, " ", computedProps.label), /* @__PURE__ */ import_react.default.createElement(import_antd4.Form.ErrorList, {
         errors
       }))));
     default:
@@ -682,7 +691,7 @@ function Table(props) {
               color: "#ff4d4f"
             }
           });
-          if (!item.filterDropdown)
+          if (item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               selectedKeys,

package/dist/index.mjs

@@ -28,19 +28,28 @@ import { isNil } from "lodash";
 // src/Config.tsx
 import { useEffect } from "react";
 import { createGlobalState } from "react-use";
-var isCN = /^zh/i.test(navigator.language);
-var common = isCN ? {
+var isZH = /^zh/i.test(navigator.language);
+var common = isZH ? {
+  lang: "zh",
   blank: "\u7A7A",
   all: "\u5168\u90E8",
   submit: "\u63D0\u4EA4",
-  pageNotFound: "\u9875\u9762\u672A\u627E\u5230"
+  pageNotFound: "\u9875\u9762\u672A\u627E\u5230",
+  add: "\u6DFB\u52A0",
+  delete: "\u5220\u9664",
+  required: "\u5FC5\u586B"
 } : {
+  lang: "en",
   blank: "Empty",
   all: "All",
   submit: "Submit",
-  pageNotFound: "Page Not Found"
+  pageNotFound: "Page Not Found",
+  add: "Add",
+  delete: "Delete",
+  required: "is required"
 };
 var useFaasState = createGlobalState({
+  lang: "en",
   common,
   Blank: { text: common.blank },
   Form: { submit: { text: common.submit } },
@@ -255,7 +264,7 @@ var TimePicker = forwardRef((props, ref) => {
 TimePicker.displayName = "TimePicker";
 
 // src/FormItem.tsx
-function processProps(propsCopy) {
+function processProps(propsCopy, config) {
   if (!propsCopy.title)
     propsCopy.title = upperFirst3(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
@@ -272,13 +281,13 @@ function processProps(propsCopy) {
         required: true,
         validator: async (_, values) => {
           if (!values || values.length < 1)
-            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} is required`));
+            return Promise.reject(Error(`${propsCopy.label || propsCopy.title} ${config.common.required}`));
         }
       });
     else
       propsCopy.rules.push({
         required: true,
-        message: `${propsCopy.label || propsCopy.title} is required`
+        message: `${propsCopy.label || propsCopy.title} ${config.common.required}`
       });
   }
   if (!propsCopy.input)
@@ -295,7 +304,7 @@ function processProps(propsCopy) {
       for (const sub of propsCopy.object) {
         if (!sub.name)
           sub.name = propsCopy.name.concat(sub.id);
-        processProps(sub);
+        processProps(sub, config);
       }
       break;
   }
@@ -304,8 +313,9 @@ function processProps(propsCopy) {
 function FormItem(props) {
   var _a;
   const [computedProps, setComputedProps] = useState3();
+  const [config] = useFaasState();
   useEffect3(() => {
-    setComputedProps(processProps(__spreadValues({}, props)));
+    setComputedProps(processProps(__spreadValues({}, props), config));
   }, [props]);
   if (!computedProps)
     return null;
@@ -436,9 +446,8 @@ function FormItem(props) {
       }, /* @__PURE__ */ React.createElement("label", null, computedProps.label, " ", field.name + 1, !computedProps.disabled && (!computedProps.rules.find((r) => r.required) || field.key > 0) && /* @__PURE__ */ React.createElement(Button, {
         danger: true,
         type: "link",
-        icon: /* @__PURE__ */ React.createElement(MinusCircleOutlined, null),
         onClick: () => remove(field.name)
-      }))), /* @__PURE__ */ React.createElement(Row, {
+      }, config.common.delete))), /* @__PURE__ */ React.createElement(Row, {
         gutter: 24
       }, computedProps.object.map((o) => /* @__PURE__ */ React.createElement(Col, {
         key: o.id,
@@ -450,7 +459,7 @@ function FormItem(props) {
         block: true,
         onClick: () => add(),
         icon: /* @__PURE__ */ React.createElement(PlusOutlined, null)
-      }, computedProps.label), /* @__PURE__ */ React.createElement(AntdForm.ErrorList, {
+      }, config.common.add, " ", computedProps.label), /* @__PURE__ */ React.createElement(AntdForm.ErrorList, {
         errors
       }))));
     default:
@@ -667,7 +676,7 @@ function Table(props) {
               color: "#ff4d4f"
             }
           });
-          if (!item.filterDropdown)
+          if (item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               selectedKeys,

package/package.json

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