@faasjs/ant-design 0.0.2-beta.417 → 0.0.2-beta.418

package/dist/index.d.ts

@@ -145,13 +145,13 @@ declare type DescriptionItemProps<T = any> = {
     render?: (value: T, values: any) => JSX.Element | string | number | boolean | null;
 } & FaasItemProps;
 declare type DescriptionProps<T = any, ExtendItemProps = any> = {
+    title?: ReactNode | ((values: T) => ReactNode);
     items: (DescriptionItemProps | ExtendItemProps)[];
     extendTypes?: {
         [key: string]: ExtendDescriptionTypeProps;
     };
     dataSource?: T;
     faasData?: FaasDataWrapperProps<T>;
-    footer?: (values: T) => JSX.Element;
 } & DescriptionsProps;
 declare function Description<T = any>(props: DescriptionProps<T>): JSX.Element;
 

package/dist/index.js

@@ -258,29 +258,27 @@ function DescriptionItemContent(props) {
 }
 function Description(props) {
   if (!props.faasData)
-    return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_antd3.Descriptions, {
+    return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions, {
       ...props,
-      children: [
-        props.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions.Item, {
-          label: item.title || (0, import_lodash4.upperFirst)(item.id),
-          children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(DescriptionItemContent, {
-            item,
-            value: props.dataSource[item.id],
-            values: props.dataSource,
-            extendTypes: props.extendTypes
-          })
-        }, item.id)),
-        props.footer && props.footer(props.dataSource)
-      ]
+      children: props.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions.Item, {
+        label: item.title || (0, import_lodash4.upperFirst)(item.id),
+        children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(DescriptionItemContent, {
+          item,
+          value: props.dataSource[item.id],
+          values: props.dataSource,
+          extendTypes: props.extendTypes
+        })
+      }, item.id))
     });
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react4.FaasDataWrapper, {
     fallback: props.faasData.fallback || /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Skeleton, {
       active: true
     }),
-    render: ({ data }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_antd3.Descriptions, {
-      ...props,
-      children: [
-        props.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions.Item, {
+    render: ({ data }) => {
+      return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions, {
+        ...props,
+        title: (0, import_lodash4.isFunction)(props.title) ? props.title(data) : props.title,
+        children: props.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd3.Descriptions.Item, {
           label: item.title || (0, import_lodash4.upperFirst)(item.id),
           children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(DescriptionItemContent, {
             item,
@@ -288,10 +286,9 @@ function Description(props) {
             values: data,
             extendTypes: props.extendTypes
           })
-        }, item.id)),
-        props.footer && props.footer(data)
-      ]
-    }),
+        }, item.id))
+      });
+    },
     ...props.faasData
   });
 }
@@ -974,7 +971,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter) {
-            item.onFilter = (value, row) => row[item.id].includes(value);
+            item.onFilter = (value, row) => {
+              if (!row[item.id])
+                return false;
+              return row[item.id].includes(value);
+            };
           }
           if (!item.filters && item.filterDropdown !== false && item.optionsType !== "auto")
             item.filterDropdown = ({
@@ -1001,7 +1002,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value).join(", ");
           if (!item.onFilter)
-            item.onFilter = (value, row) => row[item.id].includes(value);
+            item.onFilter = (value, row) => {
+              if (!row[item.id] || !row[item.id].length)
+                return false;
+              return row[item.id].some((v) => v.includes(value));
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1042,7 +1047,7 @@ function Table(props) {
               allowClear: true,
               onSearch: (v) => {
                 if (v) {
-                  setSelectedKeys([v]);
+                  setSelectedKeys([Number(v)]);
                 } else {
                   setSelectedKeys([]);
                   clearFilters();
@@ -1068,7 +1073,7 @@ function Table(props) {
               allowClear: true,
               onSearch: (v) => {
                 if (v) {
-                  setSelectedKeys([v]);
+                  setSelectedKeys([Number(v)]);
                 } else {
                   setSelectedKeys([]);
                   clearFilters();

package/dist/index.mjs

@@ -121,7 +121,7 @@ import {
   Descriptions,
   Skeleton
 } from "antd";
-import { upperFirst as upperFirst2 } from "lodash";
+import { isFunction, upperFirst as upperFirst2 } from "lodash";
 import {
   cloneElement,
   useEffect as useEffect2,
@@ -129,7 +129,7 @@ import {
 } from "react";
 import dayjs from "dayjs";
 import { FaasDataWrapper } from "@faasjs/react";
-import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx as jsx3 } from "react/jsx-runtime";
 function DescriptionItemContent(props) {
   const [computedProps, setComputedProps] = useState2();
   useEffect2(() => {
@@ -219,29 +219,27 @@ function DescriptionItemContent(props) {
 }
 function Description(props) {
   if (!props.faasData)
-    return /* @__PURE__ */ jsxs(Descriptions, {
+    return /* @__PURE__ */ jsx3(Descriptions, {
       ...props,
-      children: [
-        props.items.map((item) => /* @__PURE__ */ jsx3(Descriptions.Item, {
-          label: item.title || upperFirst2(item.id),
-          children: /* @__PURE__ */ jsx3(DescriptionItemContent, {
-            item,
-            value: props.dataSource[item.id],
-            values: props.dataSource,
-            extendTypes: props.extendTypes
-          })
-        }, item.id)),
-        props.footer && props.footer(props.dataSource)
-      ]
+      children: props.items.map((item) => /* @__PURE__ */ jsx3(Descriptions.Item, {
+        label: item.title || upperFirst2(item.id),
+        children: /* @__PURE__ */ jsx3(DescriptionItemContent, {
+          item,
+          value: props.dataSource[item.id],
+          values: props.dataSource,
+          extendTypes: props.extendTypes
+        })
+      }, item.id))
     });
   return /* @__PURE__ */ jsx3(FaasDataWrapper, {
     fallback: props.faasData.fallback || /* @__PURE__ */ jsx3(Skeleton, {
       active: true
     }),
-    render: ({ data }) => /* @__PURE__ */ jsxs(Descriptions, {
-      ...props,
-      children: [
-        props.items.map((item) => /* @__PURE__ */ jsx3(Descriptions.Item, {
+    render: ({ data }) => {
+      return /* @__PURE__ */ jsx3(Descriptions, {
+        ...props,
+        title: isFunction(props.title) ? props.title(data) : props.title,
+        children: props.items.map((item) => /* @__PURE__ */ jsx3(Descriptions.Item, {
           label: item.title || upperFirst2(item.id),
           children: /* @__PURE__ */ jsx3(DescriptionItemContent, {
             item,
@@ -249,10 +247,9 @@ function Description(props) {
             values: data,
             extendTypes: props.extendTypes
           })
-        }, item.id)),
-        props.footer && props.footer(data)
-      ]
-    }),
+        }, item.id))
+      });
+    },
     ...props.faasData
   });
 }
@@ -325,7 +322,7 @@ TimePicker.displayName = "TimePicker";
 
 // src/FormItem.tsx
 import dayjs2, { isDayjs } from "dayjs";
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx6, jsxs } from "react/jsx-runtime";
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
     propsCopy.title = upperFirst3(propsCopy.id);
@@ -446,7 +443,7 @@ function FormItem(props) {
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
           var _a2;
-          return /* @__PURE__ */ jsxs2(Fragment2, {
+          return /* @__PURE__ */ jsxs(Fragment2, {
             children: [
               computedProps.label && /* @__PURE__ */ jsx6("div", {
                 className: "ant-form-item-label",
@@ -458,7 +455,7 @@ function FormItem(props) {
               fields.map((field) => {
                 var _a3;
                 return /* @__PURE__ */ jsx6(AntdForm.Item, {
-                  children: /* @__PURE__ */ jsxs2(Row, {
+                  children: /* @__PURE__ */ jsxs(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
@@ -486,7 +483,7 @@ function FormItem(props) {
                   })
                 }, field.key);
               }),
-              /* @__PURE__ */ jsxs2(AntdForm.Item, {
+              /* @__PURE__ */ jsxs(AntdForm.Item, {
                 children: [
                   !((_a2 = computedProps.input) == null ? void 0 : _a2.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx6(Button, {
                     type: "dashed",
@@ -527,7 +524,7 @@ function FormItem(props) {
         rules: computedProps.rules,
         children: (fields, { add, remove }, { errors }) => {
           var _a2, _b;
-          return /* @__PURE__ */ jsxs2(Fragment2, {
+          return /* @__PURE__ */ jsxs(Fragment2, {
             children: [
               computedProps.label && /* @__PURE__ */ jsx6("div", {
                 className: "ant-form-item-label",
@@ -539,7 +536,7 @@ function FormItem(props) {
               fields.map((field) => {
                 var _a3;
                 return /* @__PURE__ */ jsx6(AntdForm.Item, {
-                  children: /* @__PURE__ */ jsxs2(Row, {
+                  children: /* @__PURE__ */ jsxs(Row, {
                     gutter: 24,
                     style: { flexFlow: "row nowrap" },
                     children: [
@@ -568,7 +565,7 @@ function FormItem(props) {
                   })
                 }, field.key);
               }),
-              /* @__PURE__ */ jsxs2(AntdForm.Item, {
+              /* @__PURE__ */ jsxs(AntdForm.Item, {
                 children: [
                   !((_b = computedProps.input) == null ? void 0 : _b.disabled) && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsx6(Button, {
                     type: "dashed",
@@ -607,7 +604,7 @@ function FormItem(props) {
         })
       });
     case "object":
-      return /* @__PURE__ */ jsxs2(Fragment2, {
+      return /* @__PURE__ */ jsxs(Fragment2, {
         children: [
           computedProps.label && /* @__PURE__ */ jsx6("div", {
             className: "ant-form-item-label",
@@ -625,14 +622,14 @@ function FormItem(props) {
       return /* @__PURE__ */ jsx6(AntdForm.List, {
         name: computedProps.name,
         rules: computedProps.rules,
-        children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs2(Fragment2, {
+        children: (fields, { add, remove }, { errors }) => /* @__PURE__ */ jsxs(Fragment2, {
           children: [
-            fields.map((field) => /* @__PURE__ */ jsxs2(AntdForm.Item, {
+            fields.map((field) => /* @__PURE__ */ jsxs(AntdForm.Item, {
               style: { marginBottom: 0 },
               children: [
                 /* @__PURE__ */ jsx6("div", {
                   className: "ant-form-item-label",
-                  children: /* @__PURE__ */ jsxs2("label", {
+                  children: /* @__PURE__ */ jsxs("label", {
                     children: [
                       computedProps.label,
                       " ",
@@ -658,9 +655,9 @@ function FormItem(props) {
                 })
               ]
             }, field.key)),
-            /* @__PURE__ */ jsxs2(AntdForm.Item, {
+            /* @__PURE__ */ jsxs(AntdForm.Item, {
               children: [
-                !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsxs2(Button, {
+                !computedProps.disabled && (!computedProps.maxCount || computedProps.maxCount > fields.length) && /* @__PURE__ */ jsxs(Button, {
                   type: "dashed",
                   block: true,
                   onClick: () => add(),
@@ -685,7 +682,7 @@ function FormItem(props) {
 }
 
 // src/Form.tsx
-import { jsx as jsx7, jsxs as jsxs3 } from "react/jsx-runtime";
+import { jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
 function Form(props) {
   var _a, _b;
   const [loading, setLoading] = useState5(false);
@@ -729,7 +726,7 @@ function Form(props) {
   }, []);
   if (!computedProps)
     return null;
-  return /* @__PURE__ */ jsxs3(AntdForm2, {
+  return /* @__PURE__ */ jsxs2(AntdForm2, {
     ...computedProps,
     children: [
       computedProps.beforeItems,
@@ -849,7 +846,7 @@ import {
   Routes as OriginRoutes,
   Route
 } from "react-router-dom";
-import { jsx as jsx10, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs3 } from "react/jsx-runtime";
 function PageNotFound() {
   const config = useConfigContext();
   return /* @__PURE__ */ jsx10(Result, {
@@ -858,7 +855,7 @@ function PageNotFound() {
   });
 }
 function Routes(props) {
-  return /* @__PURE__ */ jsxs4(OriginRoutes, {
+  return /* @__PURE__ */ jsxs3(OriginRoutes, {
     children: [
       props.routes.map((r) => /* @__PURE__ */ jsx10(Route, {
         ...r,
@@ -900,7 +897,7 @@ import {
   upperFirst as upperFirst4
 } from "lodash";
 import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
-import { jsx as jsx11, jsxs as jsxs5 } 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)
@@ -968,7 +965,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter) {
-            item.onFilter = (value, row) => row[item.id].includes(value);
+            item.onFilter = (value, row) => {
+              if (!row[item.id])
+                return false;
+              return row[item.id].includes(value);
+            };
           }
           if (!item.filters && item.filterDropdown !== false && item.optionsType !== "auto")
             item.filterDropdown = ({
@@ -995,7 +996,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value).join(", ");
           if (!item.onFilter)
-            item.onFilter = (value, row) => row[item.id].includes(value);
+            item.onFilter = (value, row) => {
+              if (!row[item.id] || !row[item.id].length)
+                return false;
+              return row[item.id].some((v) => v.includes(value));
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1036,7 +1041,7 @@ function Table(props) {
               allowClear: true,
               onSearch: (v) => {
                 if (v) {
-                  setSelectedKeys([v]);
+                  setSelectedKeys([Number(v)]);
                 } else {
                   setSelectedKeys([]);
                   clearFilters();
@@ -1062,7 +1067,7 @@ function Table(props) {
               allowClear: true,
               onSearch: (v) => {
                 if (v) {
-                  setSelectedKeys([v]);
+                  setSelectedKeys([Number(v)]);
                 } else {
                   setSelectedKeys([]);
                   clearFilters();
@@ -1089,7 +1094,7 @@ function Table(props) {
               setSelectedKeys,
               selectedKeys,
               confirm
-            }) => /* @__PURE__ */ jsxs5(Radio.Group, {
+            }) => /* @__PURE__ */ jsxs4(Radio.Group, {
               style: { padding: 8 },
               buttonStyle: "solid",
               value: selectedKeys[0],

package/package.json

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