@faasjs/ant-design 0.0.2-beta.382 → 0.0.2-beta.385

package/README.md

@@ -281,17 +281,21 @@ ___
 | `Title` | { `separator`: `string` ; `suffix`: `string`  } |
 | `Title.separator` | `string` |
 | `Title.suffix` | `string` |
-| `common` | { `all`: `string` ; `blank`: `string` ; `pageNotFound`: `string` ; `submit`: `string`  } |
+| `common` | { `add`: `string` ; `all`: `string` ; `blank`: `string` ; `delete`: `string` ; `pageNotFound`: `string` ; `required`: `string` ; `submit`: `string`  } |
+| `common.add` | `string` |
 | `common.all` | `string` |
 | `common.blank` | `string` |
+| `common.delete` | `string` |
 | `common.pageNotFound` | `string` |
+| `common.required` | `string` |
 | `common.submit` | `string` |
+| `lang` | `string` |
 
 ___
 
 ### FormItemProps
 
-Ƭ **FormItemProps**<`T`\>: { `children?`: `JSX.Element` \| ``null`` ; `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `label?`: `string` \| ``false`` ; `rules?`: `RuleObject`[] ; `render?`: () => `Element`  } & `FormItemInputProps` & [`FaasItemProps`](#faasitemprops) & `AntdFormItemProps`<`T`\>
+Ƭ **FormItemProps**<`T`\>: { `children?`: `JSX.Element` \| ``null`` ; `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `label?`: `string` \| ``false`` ; `rules?`: `RuleObject`[] ; `render?`: () => `Element`  } & `FormItemInputProps` & [`FaasItemProps`](#faasitemprops) & `Omit`<`AntdFormItemProps`<`T`\>, ``"children"``\>
 
 #### Type parameters
 
@@ -303,7 +307,7 @@ ___
 
 ### FormProps
 
-Ƭ **FormProps**<`Values`, `ExtendItemProps`\>: { `beforeItems?`: `JSX.Element` \| `JSX.Element`[] ; `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `items?`: ([`FormItemProps`](#formitemprops) \| `ExtendItemProps`)[] ; `submit?`: ``false`` \| { `text?`: `string` ; `to?`: { `action`: `string` ; `params?`: `Record`<`string`, `any`\>  }  } ; `onFinish?`: (`values`: `Values`, `submit?`: (`values`: `any`) => `Promise`<`any`\>) => `Promise`<`any`\>  } & `Omit`<`AntdFormProps`<`Values`\>, ``"onFinish"``\>
+Ƭ **FormProps**<`Values`, `ExtendItemProps`\>: { `beforeItems?`: `JSX.Element` \| `JSX.Element`[] ; `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `footer?`: `JSX.Element` \| `JSX.Element`[] ; `items?`: ([`FormItemProps`](#formitemprops) \| `ExtendItemProps`)[] ; `submit?`: ``false`` \| { `text?`: `string` ; `to?`: { `action`: `string` ; `params?`: `Record`<`string`, `any`\>  }  } ; `onFinish?`: (`values`: `Values`, `submit?`: (`values`: `any`) => `Promise`<`any`\>) => `Promise`<`any`\>  } & `Omit`<`AntdFormProps`<`Values`\>, ``"onFinish"``\>
 
 #### Type parameters
 
@@ -423,7 +427,7 @@ ___
 
 ### DatePicker
 
-• `Const` **DatePicker**: `PickerComponentClass`<`PickerProps`<`Dayjs`\>, `unknown`\> & {}
+• `Const` **DatePicker**: `PickerComponentClass`<`Omit`<`PickerBaseProps`<`Dayjs`\>, ``"locale"`` \| ``"generateConfig"`` \| ``"hideHeader"`` \| ``"components"``\> & {} & {} & `Omit`<`PickerDateProps`<`Dayjs`\>, ``"locale"`` \| ``"generateConfig"`` \| ``"hideHeader"`` \| ``"components"``\> & {} & {} & `Omit`<`PickerTimeProps`<`Dayjs`\>, ``"locale"`` \| ``"generateConfig"`` \| ``"hideHeader"`` \| ``"components"``\> & {} & {}, `unknown`\> & {}
 
 ___
 

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;
@@ -108,7 +112,9 @@ declare function transferOptions(options: BaseOption[]): {
 }[];
 
 declare type DatePickerProps = PickerDateProps<Dayjs>;
-declare const DatePicker: antd_es_date_picker_generatePicker_interface.PickerComponentClass<antd_es_date_picker_generatePicker.PickerProps<Dayjs>, unknown> & {
+declare const DatePicker: antd_es_date_picker_generatePicker_interface.PickerComponentClass<antd_es_date_picker_generatePicker.PickerProps<Dayjs> & {
+    status?: "" | "error" | "warning";
+}, unknown> & {
     WeekPicker: antd_es_date_picker_generatePicker_interface.PickerComponentClass<Omit<PickerDateProps<Dayjs>, "picker">, unknown>;
     MonthPicker: antd_es_date_picker_generatePicker_interface.PickerComponentClass<Omit<PickerDateProps<Dayjs>, "picker">, unknown>;
     YearPicker: antd_es_date_picker_generatePicker_interface.PickerComponentClass<Omit<PickerDateProps<Dayjs>, "picker">, unknown>;
@@ -225,7 +231,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.
  *
@@ -280,6 +286,7 @@ declare type FormProps<Values = any, ExtendItemProps = any> = {
     };
     onFinish?: (values: Values, submit?: (values: any) => Promise<any>) => Promise<any>;
     beforeItems?: JSX.Element | JSX.Element[];
+    footer?: JSX.Element | JSX.Element[];
     extendTypes?: {
         [type: string]: ExtendFormTypeProps;
     };

package/dist/index.js

@@ -21,27 +21,20 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
@@ -64,6 +57,7 @@ __export(src_exports, {
   useFaasState: () => useFaasState,
   useModal: () => useModal
 });
+module.exports = __toCommonJS(src_exports);
 
 // react-shim.js
 var import_react = __toESM(require("react"));
@@ -75,19 +69,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 +286,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 +303,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 +326,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 +335,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 +468,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 +481,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:
@@ -526,7 +529,7 @@ function Form(props) {
     htmlType: "submit",
     type: "primary",
     loading
-  }, ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text));
+  }, ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text), computedProps.footer);
 }
 Form.useForm = import_antd5.Form.useForm;
 Form.Item = FormItem;
@@ -682,7 +685,7 @@ function Table(props) {
               color: "#ff4d4f"
             }
           });
-          if (!item.filterDropdown)
+          if (item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
               selectedKeys,
@@ -820,7 +823,6 @@ function Title(props) {
     return (0, import_react14.cloneElement)(props.children, { title: props.title });
   return null;
 }
-module.exports = __toCommonJS(src_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Blank,

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:
@@ -498,7 +507,7 @@ function Form(props) {
     htmlType: "submit",
     type: "primary",
     loading
-  }, ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text));
+  }, ((_b = computedProps.submit) == null ? void 0 : _b.text) || config.Form.submit.text), computedProps.footer);
 }
 Form.useForm = AntdForm2.useForm;
 Form.Item = FormItem;
@@ -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.382",
+  "version": "0.0.2-beta.385",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,7 +28,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.382",
+    "@faasjs/react": "^0.0.2-beta.385",
     "react-use": "*",
     "react-router-dom": "*",
     "dayjs": "*"