@faasjs/ant-design 0.0.3-beta.2 → 0.0.3-beta.4

package/dist/index.js

@@ -972,7 +972,7 @@ function processValue(item, value) {
 }
 function Table(props) {
   const [columns, setColumns] = (0, import_react11.useState)();
-  const { common: common2 } = useConfigContext();
+  const { common: common2, antd } = useConfigContext();
   (0, import_react11.useEffect)(() => {
     var _a;
     for (const item of props.items) {
@@ -1014,6 +1014,8 @@ function Table(props) {
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
+              if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
+                return true;
               if (!row[item.id])
                 return false;
               return row[item.id].toLowerCase().includes(value.toLowerCase());
@@ -1042,6 +1044,8 @@ function Table(props) {
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
+              if (value === null && (!row[item.id] || !row[item.id].length))
+                return true;
               if (!row[item.id] || !row[item.id].length)
                 return false;
               return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
@@ -1071,7 +1075,11 @@ function Table(props) {
           if (!item.sorter)
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (!item.onFilter)
-            item.onFilter = (value, row) => value === row[item.id];
+            item.onFilter = (value, row) => {
+              if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
+                return true;
+              return value === row[item.id];
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1095,7 +1103,13 @@ 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 (value === null && (!row[item.id] || !row[item.id].length))
+                return true;
+              if (!row[item.id] || !row[item.id].length)
+                return false;
+              return row[item.id].includes(value);
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1219,7 +1233,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => value === row[item.id];
+            item.onFilter = (value, row) => {
+              if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
+                return true;
+              return value === row[item.id];
+            };
           break;
       }
     }
@@ -1236,7 +1254,10 @@ function Table(props) {
           newColumns[index].filters = (0, import_lodash_es6.uniqBy)(props.dataSource, column.id).map((v) => ({
             text: v[column.id],
             value: v[column.id]
-          }));
+          })).concat({
+            text: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Blank, {}),
+            value: null
+          });
           return newColumns;
         });
       }
@@ -1245,11 +1266,14 @@ function Table(props) {
   if (!columns)
     return null;
   if (!props.faasData)
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-      ...props,
-      rowKey: props.rowKey || "id",
-      columns,
-      dataSource: props.dataSource
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
+      ...antd,
+      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
+        ...props,
+        rowKey: props.rowKey || "id",
+        columns,
+        dataSource: props.dataSource
+      })
     });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react12.FaasDataWrapper, {
     fallback: props.faasData.fallback || /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Skeleton, {
@@ -1261,46 +1285,55 @@ function Table(props) {
       reload
     }) => {
       if (!data)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: []
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
+          ...antd,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
+            ...props,
+            rowKey: props.rowKey || "id",
+            columns,
+            dataSource: []
+          })
         });
       if (Array.isArray(data))
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
+          ...antd,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
+            ...props,
+            rowKey: props.rowKey || "id",
+            columns,
+            dataSource: data
+          })
+        });
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.ConfigProvider, {
+        ...antd,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
           ...props,
           rowKey: props.rowKey || "id",
           columns,
-          dataSource: data
-        });
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd10.Table, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: data.rows,
-        pagination: {
-          ...props.pagination,
-          ...data.pagination
-        },
-        onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange) {
-            const processed = props.onChange(pagination, filters, sorter, extra);
+          dataSource: data.rows,
+          pagination: {
+            ...props.pagination,
+            ...data.pagination
+          },
+          onChange: (pagination, filters, sorter, extra) => {
+            if (props.onChange) {
+              const processed = props.onChange(pagination, filters, sorter, extra);
+              reload({
+                ...params,
+                pagination: processed.pagination,
+                filters: processed.filters,
+                sorter: processed.sorter
+              });
+              return;
+            }
             reload({
               ...params,
-              pagination: processed.pagination,
-              filters: processed.filters,
-              sorter: processed.sorter
+              pagination,
+              filters,
+              sorter
             });
-            return;
           }
-          reload({
-            ...params,
-            pagination,
-            filters,
-            sorter
-          });
-        }
+        })
       });
     },
     ...props.faasData

package/dist/index.mjs

@@ -938,7 +938,8 @@ import {
   Table as AntdTable,
   Radio,
   Skeleton as Skeleton3,
-  Input as Input2
+  Input as Input2,
+  ConfigProvider as ConfigProvider2
 } from "antd";
 import dayjs2 from "dayjs";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
@@ -975,7 +976,7 @@ function processValue(item, value) {
 }
 function Table(props) {
   const [columns, setColumns] = useState7();
-  const { common: common2 } = useConfigContext();
+  const { common: common2, antd } = useConfigContext();
   useEffect5(() => {
     var _a;
     for (const item of props.items) {
@@ -1017,6 +1018,8 @@ function Table(props) {
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
+              if (value === null && isNil2(row[item.id]))
+                return true;
               if (!row[item.id])
                 return false;
               return row[item.id].toLowerCase().includes(value.toLowerCase());
@@ -1045,6 +1048,8 @@ function Table(props) {
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
+              if (value === null && (!row[item.id] || !row[item.id].length))
+                return true;
               if (!row[item.id] || !row[item.id].length)
                 return false;
               return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
@@ -1074,7 +1079,11 @@ function Table(props) {
           if (!item.sorter)
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (!item.onFilter)
-            item.onFilter = (value, row) => value === row[item.id];
+            item.onFilter = (value, row) => {
+              if (value === null && isNil2(row[item.id]))
+                return true;
+              return value === row[item.id];
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1098,7 +1107,13 @@ 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 (value === null && (!row[item.id] || !row[item.id].length))
+                return true;
+              if (!row[item.id] || !row[item.id].length)
+                return false;
+              return row[item.id].includes(value);
+            };
           if (!item.filters && item.filterDropdown !== false)
             item.filterDropdown = ({
               setSelectedKeys,
@@ -1222,7 +1237,11 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => value === row[item.id];
+            item.onFilter = (value, row) => {
+              if (value === null && isNil2(row[item.id]))
+                return true;
+              return value === row[item.id];
+            };
           break;
       }
     }
@@ -1239,7 +1258,10 @@ function Table(props) {
           newColumns[index].filters = uniqBy(props.dataSource, column.id).map((v) => ({
             text: v[column.id],
             value: v[column.id]
-          }));
+          })).concat({
+            text: /* @__PURE__ */ jsx10(Blank, {}),
+            value: null
+          });
           return newColumns;
         });
       }
@@ -1248,11 +1270,14 @@ function Table(props) {
   if (!columns)
     return null;
   if (!props.faasData)
-    return /* @__PURE__ */ jsx10(AntdTable, {
-      ...props,
-      rowKey: props.rowKey || "id",
-      columns,
-      dataSource: props.dataSource
+    return /* @__PURE__ */ jsx10(ConfigProvider2, {
+      ...antd,
+      children: /* @__PURE__ */ jsx10(AntdTable, {
+        ...props,
+        rowKey: props.rowKey || "id",
+        columns,
+        dataSource: props.dataSource
+      })
     });
   return /* @__PURE__ */ jsx10(FaasDataWrapper2, {
     fallback: props.faasData.fallback || /* @__PURE__ */ jsx10(Skeleton3, {
@@ -1264,46 +1289,55 @@ function Table(props) {
       reload
     }) => {
       if (!data)
-        return /* @__PURE__ */ jsx10(AntdTable, {
-          ...props,
-          rowKey: props.rowKey || "id",
-          columns,
-          dataSource: []
+        return /* @__PURE__ */ jsx10(ConfigProvider2, {
+          ...antd,
+          children: /* @__PURE__ */ jsx10(AntdTable, {
+            ...props,
+            rowKey: props.rowKey || "id",
+            columns,
+            dataSource: []
+          })
         });
       if (Array.isArray(data))
-        return /* @__PURE__ */ jsx10(AntdTable, {
+        return /* @__PURE__ */ jsx10(ConfigProvider2, {
+          ...antd,
+          children: /* @__PURE__ */ jsx10(AntdTable, {
+            ...props,
+            rowKey: props.rowKey || "id",
+            columns,
+            dataSource: data
+          })
+        });
+      return /* @__PURE__ */ jsx10(ConfigProvider2, {
+        ...antd,
+        children: /* @__PURE__ */ jsx10(AntdTable, {
           ...props,
           rowKey: props.rowKey || "id",
           columns,
-          dataSource: data
-        });
-      return /* @__PURE__ */ jsx10(AntdTable, {
-        ...props,
-        rowKey: props.rowKey || "id",
-        columns,
-        dataSource: data.rows,
-        pagination: {
-          ...props.pagination,
-          ...data.pagination
-        },
-        onChange: (pagination, filters, sorter, extra) => {
-          if (props.onChange) {
-            const processed = props.onChange(pagination, filters, sorter, extra);
+          dataSource: data.rows,
+          pagination: {
+            ...props.pagination,
+            ...data.pagination
+          },
+          onChange: (pagination, filters, sorter, extra) => {
+            if (props.onChange) {
+              const processed = props.onChange(pagination, filters, sorter, extra);
+              reload({
+                ...params,
+                pagination: processed.pagination,
+                filters: processed.filters,
+                sorter: processed.sorter
+              });
+              return;
+            }
             reload({
               ...params,
-              pagination: processed.pagination,
-              filters: processed.filters,
-              sorter: processed.sorter
+              pagination,
+              filters,
+              sorter
             });
-            return;
           }
-          reload({
-            ...params,
-            pagination,
-            filters,
-            sorter
-          });
-        }
+        })
       });
     },
     ...props.faasData

package/package.json

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