@faasjs/ant-design 8.0.0-beta.12 → 8.0.0-beta.14

package/README.md

@@ -22,11 +22,15 @@ In `@faasjs/ant-design`, we use `FaasItemProps` to provide data structures for c
 
 ```ts
 type FaasItemType =
-  'string' | 'string[]' |
-  'number' | 'number[]' |
-  'boolean' |
-  'date' | 'time' |
-  'object' | 'object[]'
+  | 'string'
+  | 'string[]'
+  | 'number'
+  | 'number[]'
+  | 'boolean'
+  | 'date'
+  | 'time'
+  | 'object'
+  | 'object[]'
 
 type FaasItemProps = {
   type: FaasItemTypes

package/dist/index.cjs

@@ -1,4 +1,4 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -7,16 +7,12 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
 	}
 	return to;
 };
@@ -24,7 +20,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
 let _faasjs_react = require("@faasjs/react");
 let antd = require("antd");
@@ -35,7 +30,6 @@ let react_jsx_runtime = require("react/jsx-runtime");
 let _ant_design_icons = require("@ant-design/icons");
 let dayjs = require("dayjs");
 dayjs = __toESM(dayjs);
-
 //#region src/Loading.tsx
 /**
 * Loading component based on Spin
@@ -62,7 +56,6 @@ function Loading(props) {
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Spin, { size: props.size || "large" })
 	});
 }
-
 //#endregion
 //#region src/FaasDataWrapper.tsx
 /**
@@ -101,7 +94,6 @@ function withFaasData(Component, faasProps) {
 		...faasProps
 	});
 }
-
 //#endregion
 //#region src/Config.tsx
 const zh = {
@@ -173,7 +165,6 @@ function ConfigProvider(props) {
 function useConfigContext() {
 	return (0, react.useContext)(ConfigContext);
 }
-
 //#endregion
 //#region src/Drawer.tsx
 /**
@@ -216,7 +207,6 @@ function useDrawer(init) {
 		setDrawerProps
 	};
 }
-
 //#endregion
 //#region src/ErrorBoundary.tsx
 function ErrorChildren(props) {
@@ -241,7 +231,6 @@ function ErrorBoundary(props) {
 		...props
 	});
 }
-
 //#endregion
 //#region src/Modal.tsx
 /**
@@ -282,7 +271,6 @@ function useModal(init) {
 		setModalProps
 	};
 }
-
 //#endregion
 //#region src/App.tsx
 const AppContext = (0, _faasjs_react.createSplittingContext)([
@@ -388,7 +376,6 @@ function App(props) {
 */
 const useApp = AppContext.use;
 App.useApp = useApp;
-
 //#endregion
 //#region src/Blank.tsx
 /**
@@ -410,7 +397,6 @@ function Blank(options) {
 		children: options?.text || theme.Blank.text
 	}) : options.value;
 }
-
 //#endregion
 //#region src/data.ts
 /**
@@ -480,7 +466,6 @@ function transferValue(type, value) {
 function cloneUnionFaasItemElement(element, props) {
 	return (0, react.cloneElement)((0, react.isValidElement)(element) ? element : (0, react.createElement)(element), props);
 }
-
 //#endregion
 //#region src/Description.tsx
 function DescriptionItemContent(props) {
@@ -607,7 +592,6 @@ function Description({ faasData, dataSource, renderTitle, extendTypes, ...props
 	});
 }
 Description.displayName = "Description";
-
 //#endregion
 //#region src/FormItem.tsx
 function isOptionsProps(item) {
@@ -716,6 +700,59 @@ function FormItem(props) {
 		id: computedProps.id.toString(),
 		children: cloneUnionFaasItemElement(extendType.children, { scene: "form" })
 	});
+	const renderFormItemList = (inputElement) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.List, {
+		name: computedProps.name,
+		rules: computedProps.rules,
+		children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+			computedProps.label && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "ant-form-item-label",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
+					className: (computedProps.rules || []).find((r) => r.required) && "ant-form-item-required",
+					children: computedProps.label
+				})
+			}),
+			fields.map((field) => {
+				const { key, ...fieldProps } = field;
+				return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
+					id: key.toString(),
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Row, {
+						gutter: 24,
+						style: { flexFlow: "row nowrap" },
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
+							span: 23,
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
+								...fieldProps,
+								noStyle: true,
+								children: inputElement
+							})
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
+							span: 1,
+							children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
+								danger: true,
+								type: "link",
+								style: { float: "right" },
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.MinusCircleOutlined, {}),
+								onClick: () => remove(field.name)
+							})
+						})]
+					})
+				}, key);
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Form.Item, { children: [
+				!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
+					type: "dashed",
+					block: true,
+					onClick: () => add(),
+					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.PlusOutlined, {})
+				}),
+				computedProps.extra && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "ant-form-item-extra",
+					children: computedProps.extra
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.ErrorList, { errors })
+			] })
+		] })
+	});
 	switch (itemType) {
 		case "string":
 			if (isOptionsProps(computedProps)) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
@@ -737,59 +774,7 @@ function FormItem(props) {
 					...computedProps.input
 				})
 			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.List, {
-				name: computedProps.name,
-				rules: computedProps.rules,
-				children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-					computedProps.label && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "ant-form-item-label",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
-							className: (computedProps.rules || []).find((r) => r.required) && "ant-form-item-required",
-							children: computedProps.label
-						})
-					}),
-					fields.map((field) => {
-						const { key, ...fieldProps } = field;
-						return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
-							id: key.toString(),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Row, {
-								gutter: 24,
-								style: { flexFlow: "row nowrap" },
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
-									span: 23,
-									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
-										...fieldProps,
-										noStyle: true,
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input, { ...computedProps.input })
-									})
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
-									span: 1,
-									children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
-										danger: true,
-										type: "link",
-										style: { float: "right" },
-										icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.MinusCircleOutlined, {}),
-										onClick: () => remove(field.name)
-									})
-								})]
-							})
-						}, key);
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Form.Item, { children: [
-						!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
-							type: "dashed",
-							block: true,
-							onClick: () => add(),
-							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.PlusOutlined, {})
-						}),
-						computedProps.extra && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "ant-form-item-extra",
-							children: computedProps.extra
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.ErrorList, { errors })
-					] })
-				] })
-			});
+			return renderFormItemList(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input, { ...computedProps.input }));
 		case "number":
 			if (isOptionsProps(computedProps)) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
 				...computedProps,
@@ -813,62 +798,10 @@ function FormItem(props) {
 					...computedProps.input
 				})
 			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.List, {
-				name: computedProps.name,
-				rules: computedProps.rules,
-				children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-					computedProps.label && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "ant-form-item-label",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
-							className: computedProps.rules?.find((r) => r.required) && "ant-form-item-required",
-							children: computedProps.label
-						})
-					}),
-					fields.map((field) => {
-						const { key, ...fieldProps } = field;
-						return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
-							id: key.toString(),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Row, {
-								gutter: 24,
-								style: { flexFlow: "row nowrap" },
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
-									span: 23,
-									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
-										...fieldProps,
-										noStyle: true,
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.InputNumber, {
-											style: { width: "100%" },
-											...computedProps.input
-										})
-									})
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Col, {
-									span: 1,
-									children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
-										danger: true,
-										type: "link",
-										style: { float: "right" },
-										icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.MinusCircleOutlined, {}),
-										onClick: () => remove(field.name)
-									})
-								})]
-							})
-						}, key);
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(antd.Form.Item, { children: [
-						!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Button, {
-							type: "dashed",
-							block: true,
-							onClick: () => add(),
-							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_ant_design_icons.PlusOutlined, {})
-						}),
-						computedProps.extra && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "ant-form-item-extra",
-							children: computedProps.extra
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.ErrorList, { errors })
-					] })
-				] })
-			});
+			return renderFormItemList(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.InputNumber, {
+				style: { width: "100%" },
+				...computedProps.input
+			}));
 		case "boolean": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Form.Item, {
 			...computedProps,
 			id: computedProps.id.toString(),
@@ -949,7 +882,6 @@ function FormItem(props) {
 	}
 }
 FormItem.useStatus = antd.Form.Item.useStatus;
-
 //#endregion
 //#region src/Form.tsx
 function isFormItemProps(item) {
@@ -1066,7 +998,6 @@ Form.Item = FormItem;
 Form.List = antd.Form.List;
 Form.ErrorList = antd.Form.ErrorList;
 Form.Provider = antd.Form.Provider;
-
 //#endregion
 //#region src/Link.tsx
 /**
@@ -1125,7 +1056,6 @@ function Link(props) {
 		children: props.children ?? props.text
 	});
 }
-
 //#endregion
 //#region src/Routers.tsx
 function PageNotFound() {
@@ -1173,7 +1103,6 @@ function Routes(props) {
 		element: props.notFound || /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PageNotFound, {})
 	}, "*")] });
 }
-
 //#endregion
 //#region src/Table.tsx
 function processValue(item, value) {
@@ -1242,6 +1171,18 @@ function Table(props) {
 	};
 	(0, react.useEffect)(() => {
 		const items = (0, lodash_es.cloneDeep)(props.items).filter((item) => !(item.tableChildren === null || item.children === null || item.tableRender === null || item.render === null));
+		const createTextSearchFilterDropdown = (item, transformValue) => ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input.Search, {
+			placeholder: `${theme.common.search} ${item.title}`,
+			allowClear: true,
+			onSearch: (v) => {
+				if (v) setSelectedKeys(transformValue ? [transformValue(v)] : [v]);
+				else {
+					setSelectedKeys([]);
+					clearFilters?.();
+				}
+				confirm();
+			}
+		});
 		for (const item of items) {
 			if (!item.key) item.key = item.id;
 			if (!item.dataIndex) item.dataIndex = item.id;
@@ -1302,18 +1243,7 @@ function Table(props) {
 							if ((0, lodash_es.isNil)(row[item.id])) return false;
 							return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([v]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = createTextSearchFilterDropdown(item);
 					}
 					break;
 				case "string[]":
@@ -1324,18 +1254,7 @@ function Table(props) {
 							if (!row[item.id] || !row[item.id].length || !value) return false;
 							return row[item.id].some((v) => v.trim().toLowerCase().includes(value.trim().toLowerCase()));
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([v]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = createTextSearchFilterDropdown(item);
 					}
 					break;
 				case "number":
@@ -1347,18 +1266,7 @@ function Table(props) {
 							if ((0, lodash_es.isNil)(row[item.id])) return false;
 							return value == row[item.id];
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([Number(v)]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = createTextSearchFilterDropdown(item, Number);
 					}
 					break;
 				case "number[]":
@@ -1369,18 +1277,7 @@ function Table(props) {
 							if (!row[item.id] || !row[item.id].length) return false;
 							return row[item.id].includes(Number(value));
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([Number(v)]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = createTextSearchFilterDropdown(item, Number);
 					}
 					break;
 				case "boolean":
@@ -1436,26 +1333,8 @@ function Table(props) {
 					}
 					break;
 				case "date":
-					if (!item.render) item.render = (value) => processValue(item, value);
-					if (typeof item.sorter === "undefined") item.sorter = (a, b, order) => {
-						if ((0, lodash_es.isNil)(a[item.id])) return order === "ascend" ? 1 : -1;
-						if ((0, lodash_es.isNil)(b[item.id])) return order === "ascend" ? -1 : 1;
-						return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
-					};
-					if (item.filterDropdown !== false) {
-						if (typeof item.filterDropdown === "undefined") item.filterDropdown = ({ setSelectedKeys, confirm }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(antd.DatePicker.RangePicker, { onChange: (dates) => {
-							setSelectedKeys(dates?.[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
-							confirm();
-						} });
-						if (!item.onFilter && !props.faasData) item.onFilter = (value, row) => {
-							if ((0, lodash_es.isNil)(value[0])) return true;
-							if ((0, lodash_es.isNil)(row[item.id])) return false;
-							return (0, dayjs.default)(row[item.id]) >= (0, dayjs.default)(value[0]) && (0, dayjs.default)(row[item.id]) <= (0, dayjs.default)(value[1]);
-						};
-					}
-					break;
 				case "time":
-					item.width = item.width ?? 200;
+					if (itemType === "time") item.width = item.width ?? 200;
 					if (!item.render) item.render = (value) => processValue(item, value);
 					if (typeof item.sorter === "undefined") item.sorter = (a, b, order) => {
 						if ((0, lodash_es.isNil)(a[item.id])) return order === "ascend" ? 1 : -1;
@@ -1615,7 +1494,6 @@ function FaasDataTable({ props, columns, data, params, reload, loading }) {
 		}
 	});
 }
-
 //#endregion
 //#region src/Tabs.tsx
 /**
@@ -1653,7 +1531,6 @@ function Tabs(props) {
 		}))
 	});
 }
-
 //#endregion
 //#region src/Title.tsx
 /**
@@ -1692,7 +1569,6 @@ function Title(props) {
 	if (props.children) return (0, react.cloneElement)(props.children, { title: props.title });
 	return null;
 }
-
 //#endregion
 //#region src/useThemeToken.ts
 /**
@@ -1706,7 +1582,6 @@ function Title(props) {
 function useThemeToken() {
 	return antd.theme.useToken().token;
 }
-
 //#endregion
 exports.App = App;
 exports.Blank = Blank;
@@ -1730,11 +1605,11 @@ exports.Title = Title;
 exports.cloneUnionFaasItemElement = cloneUnionFaasItemElement;
 exports.faas = _faasjs_react.faas;
 exports.idToTitle = idToTitle;
-Object.defineProperty(exports, 'lazy', {
-  enumerable: true,
-  get: function () {
-    return react.lazy;
-  }
+Object.defineProperty(exports, "lazy", {
+	enumerable: true,
+	get: function() {
+		return react.lazy;
+	}
 });
 exports.transferOptions = transferOptions;
 exports.transferValue = transferValue;
@@ -1744,4 +1619,4 @@ exports.useDrawer = useDrawer;
 exports.useFaas = _faasjs_react.useFaas;
 exports.useModal = useModal;
 exports.useThemeToken = useThemeToken;
-exports.withFaasData = withFaasData;
+exports.withFaasData = withFaasData;

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import { ErrorBoundaryProps, FaasDataInjection as FaasDataInjection$1, FaasDataWrapperProps as FaasDataWrapperProps$1, FaasDataWrapperRef, FaasReactClient, FaasReactClientOptions, faas, useFaas } from "@faasjs/react";
 import { ButtonProps, ConfigProviderProps as ConfigProviderProps$1, DatePickerProps, DescriptionsProps, Drawer, DrawerProps as DrawerProps$1, FormInstance, FormItemProps as FormItemProps$1, FormProps as FormProps$1, GlobalToken, InputNumberProps, InputProps, Modal, ModalProps as ModalProps$1, RadioProps, SelectProps, SwitchProps, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1, TabsProps as TabsProps$1 } from "antd";
-import { MessageInstance } from "antd/es/message/interface";
-import { NotificationInstance } from "antd/es/notification/interface";
 import { BrowserRouterProps, RouteProps } from "react-router-dom";
 import * as react from "react";
 import { CSSProperties, ComponentType, Dispatch, FC, JSX, LazyExoticComponent, ReactElement, ReactNode, SetStateAction, lazy } from "react";
-import { ErrorBoundaryProps, FaasDataInjection as FaasDataInjection$1, FaasDataWrapperProps as FaasDataWrapperProps$1, FaasDataWrapperRef, FaasReactClient, FaasReactClientOptions, faas, useFaas } from "@faasjs/react";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { Dayjs } from "dayjs";
+import { MessageInstance } from "antd/es/message/interface";
+import { NotificationInstance } from "antd/es/notification/interface";
 import * as antd_es_form_FormItem0 from "antd/es/form/FormItem";
 import * as antd_es_form0 from "antd/es/form";
 import { RuleObject } from "antd/es/form";

package/dist/index.mjs

@@ -6,7 +6,6 @@ import { Suspense, cloneElement, createContext, createElement, isValidElement, l
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { CheckOutlined, CloseOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
 import dayjs from "dayjs";
-
 //#region src/Loading.tsx
 /**
 * Loading component based on Spin
@@ -33,7 +32,6 @@ function Loading(props) {
 		children: /* @__PURE__ */ jsx(Spin, { size: props.size || "large" })
 	});
 }
-
 //#endregion
 //#region src/FaasDataWrapper.tsx
 /**
@@ -72,7 +70,6 @@ function withFaasData(Component, faasProps) {
 		...faasProps
 	});
 }
-
 //#endregion
 //#region src/Config.tsx
 const zh = {
@@ -144,7 +141,6 @@ function ConfigProvider(props) {
 function useConfigContext() {
 	return useContext(ConfigContext);
 }
-
 //#endregion
 //#region src/Drawer.tsx
 /**
@@ -187,7 +183,6 @@ function useDrawer(init) {
 		setDrawerProps
 	};
 }
-
 //#endregion
 //#region src/ErrorBoundary.tsx
 function ErrorChildren(props) {
@@ -212,7 +207,6 @@ function ErrorBoundary(props) {
 		...props
 	});
 }
-
 //#endregion
 //#region src/Modal.tsx
 /**
@@ -253,7 +247,6 @@ function useModal(init) {
 		setModalProps
 	};
 }
-
 //#endregion
 //#region src/App.tsx
 const AppContext = createSplittingContext([
@@ -359,7 +352,6 @@ function App(props) {
 */
 const useApp = AppContext.use;
 App.useApp = useApp;
-
 //#endregion
 //#region src/Blank.tsx
 /**
@@ -381,7 +373,6 @@ function Blank(options) {
 		children: options?.text || theme.Blank.text
 	}) : options.value;
 }
-
 //#endregion
 //#region src/data.ts
 /**
@@ -451,7 +442,6 @@ function transferValue(type, value) {
 function cloneUnionFaasItemElement(element, props) {
 	return cloneElement(isValidElement(element) ? element : createElement(element), props);
 }
-
 //#endregion
 //#region src/Description.tsx
 function DescriptionItemContent(props) {
@@ -578,7 +568,6 @@ function Description({ faasData, dataSource, renderTitle, extendTypes, ...props
 	});
 }
 Description.displayName = "Description";
-
 //#endregion
 //#region src/FormItem.tsx
 function isOptionsProps(item) {
@@ -687,6 +676,59 @@ function FormItem(props) {
 		id: computedProps.id.toString(),
 		children: cloneUnionFaasItemElement(extendType.children, { scene: "form" })
 	});
+	const renderFormItemList = (inputElement) => /* @__PURE__ */ jsx(Form$1.List, {
+		name: computedProps.name,
+		rules: computedProps.rules,
+		children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs(Fragment, { children: [
+			computedProps.label && /* @__PURE__ */ jsx("div", {
+				className: "ant-form-item-label",
+				children: /* @__PURE__ */ jsx("label", {
+					className: (computedProps.rules || []).find((r) => r.required) && "ant-form-item-required",
+					children: computedProps.label
+				})
+			}),
+			fields.map((field) => {
+				const { key, ...fieldProps } = field;
+				return /* @__PURE__ */ jsx(Form$1.Item, {
+					id: key.toString(),
+					children: /* @__PURE__ */ jsxs(Row, {
+						gutter: 24,
+						style: { flexFlow: "row nowrap" },
+						children: [/* @__PURE__ */ jsx(Col, {
+							span: 23,
+							children: /* @__PURE__ */ jsx(Form$1.Item, {
+								...fieldProps,
+								noStyle: true,
+								children: inputElement
+							})
+						}), /* @__PURE__ */ jsx(Col, {
+							span: 1,
+							children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ jsx(Button, {
+								danger: true,
+								type: "link",
+								style: { float: "right" },
+								icon: /* @__PURE__ */ jsx(MinusCircleOutlined, {}),
+								onClick: () => remove(field.name)
+							})
+						})]
+					})
+				}, key);
+			}),
+			/* @__PURE__ */ jsxs(Form$1.Item, { children: [
+				!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx(Button, {
+					type: "dashed",
+					block: true,
+					onClick: () => add(),
+					icon: /* @__PURE__ */ jsx(PlusOutlined, {})
+				}),
+				computedProps.extra && /* @__PURE__ */ jsx("div", {
+					className: "ant-form-item-extra",
+					children: computedProps.extra
+				}),
+				/* @__PURE__ */ jsx(Form$1.ErrorList, { errors })
+			] })
+		] })
+	});
 	switch (itemType) {
 		case "string":
 			if (isOptionsProps(computedProps)) return /* @__PURE__ */ jsx(Form$1.Item, {
@@ -708,59 +750,7 @@ function FormItem(props) {
 					...computedProps.input
 				})
 			});
-			return /* @__PURE__ */ jsx(Form$1.List, {
-				name: computedProps.name,
-				rules: computedProps.rules,
-				children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs(Fragment, { children: [
-					computedProps.label && /* @__PURE__ */ jsx("div", {
-						className: "ant-form-item-label",
-						children: /* @__PURE__ */ jsx("label", {
-							className: (computedProps.rules || []).find((r) => r.required) && "ant-form-item-required",
-							children: computedProps.label
-						})
-					}),
-					fields.map((field) => {
-						const { key, ...fieldProps } = field;
-						return /* @__PURE__ */ jsx(Form$1.Item, {
-							id: key.toString(),
-							children: /* @__PURE__ */ jsxs(Row, {
-								gutter: 24,
-								style: { flexFlow: "row nowrap" },
-								children: [/* @__PURE__ */ jsx(Col, {
-									span: 23,
-									children: /* @__PURE__ */ jsx(Form$1.Item, {
-										...fieldProps,
-										noStyle: true,
-										children: /* @__PURE__ */ jsx(Input, { ...computedProps.input })
-									})
-								}), /* @__PURE__ */ jsx(Col, {
-									span: 1,
-									children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ jsx(Button, {
-										danger: true,
-										type: "link",
-										style: { float: "right" },
-										icon: /* @__PURE__ */ jsx(MinusCircleOutlined, {}),
-										onClick: () => remove(field.name)
-									})
-								})]
-							})
-						}, key);
-					}),
-					/* @__PURE__ */ jsxs(Form$1.Item, { children: [
-						!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx(Button, {
-							type: "dashed",
-							block: true,
-							onClick: () => add(),
-							icon: /* @__PURE__ */ jsx(PlusOutlined, {})
-						}),
-						computedProps.extra && /* @__PURE__ */ jsx("div", {
-							className: "ant-form-item-extra",
-							children: computedProps.extra
-						}),
-						/* @__PURE__ */ jsx(Form$1.ErrorList, { errors })
-					] })
-				] })
-			});
+			return renderFormItemList(/* @__PURE__ */ jsx(Input, { ...computedProps.input }));
 		case "number":
 			if (isOptionsProps(computedProps)) return /* @__PURE__ */ jsx(Form$1.Item, {
 				...computedProps,
@@ -784,62 +774,10 @@ function FormItem(props) {
 					...computedProps.input
 				})
 			});
-			return /* @__PURE__ */ jsx(Form$1.List, {
-				name: computedProps.name,
-				rules: computedProps.rules,
-				children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs(Fragment, { children: [
-					computedProps.label && /* @__PURE__ */ jsx("div", {
-						className: "ant-form-item-label",
-						children: /* @__PURE__ */ jsx("label", {
-							className: computedProps.rules?.find((r) => r.required) && "ant-form-item-required",
-							children: computedProps.label
-						})
-					}),
-					fields.map((field) => {
-						const { key, ...fieldProps } = field;
-						return /* @__PURE__ */ jsx(Form$1.Item, {
-							id: key.toString(),
-							children: /* @__PURE__ */ jsxs(Row, {
-								gutter: 24,
-								style: { flexFlow: "row nowrap" },
-								children: [/* @__PURE__ */ jsx(Col, {
-									span: 23,
-									children: /* @__PURE__ */ jsx(Form$1.Item, {
-										...fieldProps,
-										noStyle: true,
-										children: /* @__PURE__ */ jsx(InputNumber, {
-											style: { width: "100%" },
-											...computedProps.input
-										})
-									})
-								}), /* @__PURE__ */ jsx(Col, {
-									span: 1,
-									children: !computedProps.input?.disabled && (!(computedProps.rules || []).find((r) => r.required) || key > 0) && /* @__PURE__ */ jsx(Button, {
-										danger: true,
-										type: "link",
-										style: { float: "right" },
-										icon: /* @__PURE__ */ jsx(MinusCircleOutlined, {}),
-										onClick: () => remove(field.name)
-									})
-								})]
-							})
-						}, key);
-					}),
-					/* @__PURE__ */ jsxs(Form$1.Item, { children: [
-						!computedProps.input?.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx(Button, {
-							type: "dashed",
-							block: true,
-							onClick: () => add(),
-							icon: /* @__PURE__ */ jsx(PlusOutlined, {})
-						}),
-						computedProps.extra && /* @__PURE__ */ jsx("div", {
-							className: "ant-form-item-extra",
-							children: computedProps.extra
-						}),
-						/* @__PURE__ */ jsx(Form$1.ErrorList, { errors })
-					] })
-				] })
-			});
+			return renderFormItemList(/* @__PURE__ */ jsx(InputNumber, {
+				style: { width: "100%" },
+				...computedProps.input
+			}));
 		case "boolean": return /* @__PURE__ */ jsx(Form$1.Item, {
 			...computedProps,
 			id: computedProps.id.toString(),
@@ -920,7 +858,6 @@ function FormItem(props) {
 	}
 }
 FormItem.useStatus = Form$1.Item.useStatus;
-
 //#endregion
 //#region src/Form.tsx
 function isFormItemProps(item) {
@@ -1037,7 +974,6 @@ Form.Item = FormItem;
 Form.List = Form$1.List;
 Form.ErrorList = Form$1.ErrorList;
 Form.Provider = Form$1.Provider;
-
 //#endregion
 //#region src/Link.tsx
 /**
@@ -1096,7 +1032,6 @@ function Link(props) {
 		children: props.children ?? props.text
 	});
 }
-
 //#endregion
 //#region src/Routers.tsx
 function PageNotFound() {
@@ -1144,7 +1079,6 @@ function Routes(props) {
 		element: props.notFound || /* @__PURE__ */ jsx(PageNotFound, {})
 	}, "*")] });
 }
-
 //#endregion
 //#region src/Table.tsx
 function processValue(item, value) {
@@ -1213,6 +1147,18 @@ function Table(props) {
 	};
 	useEffect(() => {
 		const items = cloneDeep(props.items).filter((item) => !(item.tableChildren === null || item.children === null || item.tableRender === null || item.render === null));
+		const createTextSearchFilterDropdown = (item, transformValue) => ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ jsx(Input.Search, {
+			placeholder: `${theme.common.search} ${item.title}`,
+			allowClear: true,
+			onSearch: (v) => {
+				if (v) setSelectedKeys(transformValue ? [transformValue(v)] : [v]);
+				else {
+					setSelectedKeys([]);
+					clearFilters?.();
+				}
+				confirm();
+			}
+		});
 		for (const item of items) {
 			if (!item.key) item.key = item.id;
 			if (!item.dataIndex) item.dataIndex = item.id;
@@ -1273,18 +1219,7 @@ function Table(props) {
 							if (isNil(row[item.id])) return false;
 							return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ jsx(Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([v]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = createTextSearchFilterDropdown(item);
 					}
 					break;
 				case "string[]":
@@ -1295,18 +1230,7 @@ function Table(props) {
 							if (!row[item.id] || !row[item.id].length || !value) return false;
 							return row[item.id].some((v) => v.trim().toLowerCase().includes(value.trim().toLowerCase()));
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ jsx(Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([v]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto") item.filterDropdown = createTextSearchFilterDropdown(item);
 					}
 					break;
 				case "number":
@@ -1318,18 +1242,7 @@ function Table(props) {
 							if (isNil(row[item.id])) return false;
 							return value == row[item.id];
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ jsx(Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([Number(v)]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = createTextSearchFilterDropdown(item, Number);
 					}
 					break;
 				case "number[]":
@@ -1340,18 +1253,7 @@ function Table(props) {
 							if (!row[item.id] || !row[item.id].length) return false;
 							return row[item.id].includes(Number(value));
 						};
-						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = ({ setSelectedKeys, confirm, clearFilters }) => /* @__PURE__ */ jsx(Input.Search, {
-							placeholder: `${theme.common.search} ${item.title}`,
-							allowClear: true,
-							onSearch: (v) => {
-								if (v) setSelectedKeys([Number(v)]);
-								else {
-									setSelectedKeys([]);
-									clearFilters?.();
-								}
-								confirm();
-							}
-						});
+						if (typeof item.filterDropdown === "undefined" && !item.filters) item.filterDropdown = createTextSearchFilterDropdown(item, Number);
 					}
 					break;
 				case "boolean":
@@ -1407,26 +1309,8 @@ function Table(props) {
 					}
 					break;
 				case "date":
-					if (!item.render) item.render = (value) => processValue(item, value);
-					if (typeof item.sorter === "undefined") item.sorter = (a, b, order) => {
-						if (isNil(a[item.id])) return order === "ascend" ? 1 : -1;
-						if (isNil(b[item.id])) return order === "ascend" ? -1 : 1;
-						return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
-					};
-					if (item.filterDropdown !== false) {
-						if (typeof item.filterDropdown === "undefined") item.filterDropdown = ({ setSelectedKeys, confirm }) => /* @__PURE__ */ jsx(DatePicker.RangePicker, { onChange: (dates) => {
-							setSelectedKeys(dates?.[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
-							confirm();
-						} });
-						if (!item.onFilter && !props.faasData) item.onFilter = (value, row) => {
-							if (isNil(value[0])) return true;
-							if (isNil(row[item.id])) return false;
-							return dayjs(row[item.id]) >= dayjs(value[0]) && dayjs(row[item.id]) <= dayjs(value[1]);
-						};
-					}
-					break;
 				case "time":
-					item.width = item.width ?? 200;
+					if (itemType === "time") item.width = item.width ?? 200;
 					if (!item.render) item.render = (value) => processValue(item, value);
 					if (typeof item.sorter === "undefined") item.sorter = (a, b, order) => {
 						if (isNil(a[item.id])) return order === "ascend" ? 1 : -1;
@@ -1586,7 +1470,6 @@ function FaasDataTable({ props, columns, data, params, reload, loading }) {
 		}
 	});
 }
-
 //#endregion
 //#region src/Tabs.tsx
 /**
@@ -1624,7 +1507,6 @@ function Tabs(props) {
 		}))
 	});
 }
-
 //#endregion
 //#region src/Title.tsx
 /**
@@ -1663,7 +1545,6 @@ function Title(props) {
 	if (props.children) return cloneElement(props.children, { title: props.title });
 	return null;
 }
-
 //#endregion
 //#region src/useThemeToken.ts
 /**
@@ -1677,6 +1558,5 @@ function Title(props) {
 function useThemeToken() {
 	return theme.useToken().token;
 }
-
 //#endregion
-export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, FaasReactClient, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, cloneUnionFaasItemElement, faas, idToTitle, lazy, transferOptions, transferValue, useApp, useConfigContext, useDrawer, useFaas, useModal, useThemeToken, withFaasData };
+export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, FaasReactClient, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, cloneUnionFaasItemElement, faas, idToTitle, lazy, transferOptions, transferValue, useApp, useConfigContext, useDrawer, useFaas, useModal, useThemeToken, withFaasData };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "8.0.0-beta.12",
+  "version": "8.0.0-beta.14",
   "homepage": "https://faasjs.com/doc/ant-design",
   "bugs": {
     "url": "https://github.com/faasjs/faasjs/issues"
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@ant-design/icons": "*",
-    "@faasjs/react": ">=8.0.0-beta.12",
+    "@faasjs/react": ">=8.0.0-beta.14",
     "@types/lodash-es": "*",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
@@ -43,7 +43,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "*",
-    "@faasjs/react": ">=8.0.0-beta.12",
+    "@faasjs/react": ">=8.0.0-beta.14",
     "antd": "^6.0.0",
     "lodash-es": "*",
     "react": "^19.0.0",