@faasjs/ant-design 0.0.3-beta.1 → 0.0.3-beta.3

package/dist/index.js

@@ -52,12 +52,12 @@ var import_react = __toESM(require("react"));
 
 // src/Blank.tsx
 var import_antd2 = require("antd");
-var import_lodash2 = require("lodash");
+var import_lodash_es2 = require("lodash-es");
 
 // src/Config.tsx
 var import_react2 = require("react");
 var import_antd = require("antd");
-var import_lodash = require("lodash");
+var import_lodash_es = require("lodash-es");
 var import_jsx_runtime = require("react/jsx-runtime");
 var isZH = /^zh/i.test(navigator.language);
 var zh = {
@@ -105,7 +105,7 @@ function ConfigProvider({
   const [values, setValues] = (0, import_react2.useState)(baseConfig);
   (0, import_react2.useEffect)(() => {
     if (config.lang === "zh") {
-      setValues((0, import_lodash.defaultsDeep)(config, {
+      setValues((0, import_lodash_es.defaultsDeep)(config, {
         lang: "zh",
         common: zh,
         Blank: { text: zh.blank },
@@ -130,20 +130,20 @@ function useConfigContext() {
 var import_jsx_runtime = require("react/jsx-runtime");
 function Blank(options) {
   const { Blank: Blank2 } = useConfigContext();
-  return !options || (0, import_lodash2.isNil)(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd2.Typography.Text, {
+  return !options || (0, import_lodash_es2.isNil)(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd2.Typography.Text, {
     disabled: true,
     children: (options == null ? void 0 : options.text) || Blank2.text
   }) : options.value;
 }
 
 // src/data.ts
-var import_lodash3 = require("lodash");
+var import_lodash_es3 = require("lodash-es");
 var import_dayjs = __toESM(require("dayjs"));
 function transferOptions(options) {
   if (!options)
     return [];
   return options.map((item) => typeof item === "object" ? item : {
-    label: (0, import_lodash3.upperFirst)(item.toString()),
+    label: (0, import_lodash_es3.upperFirst)(item.toString()),
     value: item
   });
 }
@@ -166,7 +166,7 @@ function transferValue(type, value) {
 // src/Description.tsx
 var import_icons = require("@ant-design/icons");
 var import_antd3 = require("antd");
-var import_lodash4 = require("lodash");
+var import_lodash_es4 = require("lodash-es");
 var import_react3 = require("react");
 var import_react4 = require("@faasjs/react");
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -177,7 +177,7 @@ function DescriptionItemContent(props) {
     var _a2, _b;
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
-      propsCopy.item.title = (0, import_lodash4.upperFirst)(propsCopy.item.id);
+      propsCopy.item.title = (0, import_lodash_es4.upperFirst)(propsCopy.item.id);
     if (!propsCopy.item.type)
       propsCopy.item.type = "string";
     if ((_a2 = propsCopy.item.options) == null ? void 0 : _a2.length) {
@@ -282,10 +282,10 @@ function Description(props) {
   if (!props.faasData)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions, {
       ...props,
-      title: (0, import_lodash4.isFunction)(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
+      title: (0, import_lodash_es4.isFunction)(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
       children: props.items.map((item) => {
         return !item.if || item.if(props.dataSource) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions.Item, {
-          label: item.title || (0, import_lodash4.upperFirst)(item.id),
+          label: item.title || (0, import_lodash_es4.upperFirst)(item.id),
           children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DescriptionItemContent, {
             item,
             value: props.dataSource[item.id],
@@ -302,10 +302,10 @@ function Description(props) {
     render: ({ data }) => {
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions, {
         ...props,
-        title: (0, import_lodash4.isFunction)(props.renderTitle) ? props.renderTitle(data) : props.title,
+        title: (0, import_lodash_es4.isFunction)(props.renderTitle) ? props.renderTitle(data) : props.title,
         children: props.items.map((item) => {
           return !item.if || item.if(data) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd3.Descriptions.Item, {
-            label: item.title || (0, import_lodash4.upperFirst)(item.id),
+            label: item.title || (0, import_lodash_es4.upperFirst)(item.id),
             children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DescriptionItemContent, {
               item,
               value: data[item.id],
@@ -356,11 +356,11 @@ var import_react8 = require("react");
 var import_antd5 = require("antd");
 var import_icons2 = require("@ant-design/icons");
 var import_react6 = require("react");
-var import_lodash5 = require("lodash");
+var import_lodash_es5 = require("lodash-es");
 var import_jsx_runtime = require("react/jsx-runtime");
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
-    propsCopy.title = (0, import_lodash5.upperFirst)(propsCopy.id);
+    propsCopy.title = (0, import_lodash_es5.upperFirst)(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
     propsCopy.label = propsCopy.title;
   if (!propsCopy.name)
@@ -943,7 +943,7 @@ var import_react11 = require("react");
 var import_antd10 = require("antd");
 var import_dayjs2 = __toESM(require("dayjs"));
 var import_icons3 = require("@ant-design/icons");
-var import_lodash6 = require("lodash");
+var import_lodash_es6 = require("lodash-es");
 var import_react12 = require("@faasjs/react");
 var import_jsx_runtime = require("react/jsx-runtime");
 function processValue(item, value) {
@@ -981,7 +981,7 @@ function Table(props) {
       if (!item.dataIndex)
         item.dataIndex = item.id;
       if (!item.title)
-        item.title = (0, import_lodash6.upperFirst)(item.id);
+        item.title = (0, import_lodash_es6.upperFirst)(item.id);
       if (!item.type)
         item.type = "string";
       if ((_a = item.options) == null ? void 0 : _a.length) {
@@ -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,
@@ -1173,11 +1187,11 @@ function Table(props) {
             item.onFilter = (value, row) => {
               switch (value) {
                 case "true":
-                  return !(0, import_lodash6.isNil)(row[item.id]) && !!row[item.id];
+                  return !(0, import_lodash_es6.isNil)(row[item.id]) && !!row[item.id];
                 case "false":
-                  return !(0, import_lodash6.isNil)(row[item.id]) && !row[item.id];
+                  return !(0, import_lodash_es6.isNil)(row[item.id]) && !row[item.id];
                 case "empty":
-                  return (0, import_lodash6.isNil)(row[item.id]);
+                  return (0, import_lodash_es6.isNil)(row[item.id]);
                 default:
                   return true;
               }
@@ -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;
       }
     }
@@ -1233,10 +1251,13 @@ function Table(props) {
         setColumns((prev) => {
           const newColumns = [...prev];
           const index = newColumns.findIndex((item) => item.id === column.id);
-          newColumns[index].filters = (0, import_lodash6.uniqBy)(props.dataSource, column.id).map((v) => ({
+          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;
         });
       }

package/dist/index.mjs

@@ -3,7 +3,7 @@ import React from "react";
 
 // src/Blank.tsx
 import { Typography } from "antd";
-import { isNil } from "lodash";
+import { isNil } from "lodash-es";
 
 // src/Config.tsx
 import {
@@ -13,7 +13,7 @@ import {
   useState
 } from "react";
 import { ConfigProvider as AntdConfigProvider } from "antd";
-import { defaultsDeep } from "lodash";
+import { defaultsDeep } from "lodash-es";
 import { jsx } from "react/jsx-runtime";
 var isZH = /^zh/i.test(navigator.language);
 var zh = {
@@ -93,7 +93,7 @@ function Blank(options) {
 }
 
 // src/data.ts
-import { upperFirst } from "lodash";
+import { upperFirst } from "lodash-es";
 import dayjs from "dayjs";
 function transferOptions(options) {
   if (!options)
@@ -126,7 +126,7 @@ import {
   Skeleton,
   Space
 } from "antd";
-import { isFunction, upperFirst as upperFirst2 } from "lodash";
+import { isFunction, upperFirst as upperFirst2 } from "lodash-es";
 import {
   cloneElement,
   useEffect as useEffect2,
@@ -341,7 +341,7 @@ import {
   useEffect as useEffect3,
   useState as useState4
 } from "react";
-import { upperFirst as upperFirst3 } from "lodash";
+import { upperFirst as upperFirst3 } from "lodash-es";
 import { Fragment as Fragment2, jsx as jsx5, jsxs } from "react/jsx-runtime";
 function processProps(propsCopy, config) {
   if (!propsCopy.title)
@@ -946,7 +946,7 @@ import {
   isNil as isNil2,
   uniqBy,
   upperFirst as upperFirst4
-} from "lodash";
+} from "lodash-es";
 import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
 import { jsx as jsx10, jsxs as jsxs4 } from "react/jsx-runtime";
 function processValue(item, value) {
@@ -1017,6 +1017,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 +1047,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 +1078,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 +1106,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 +1236,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 +1257,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;
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.3-beta.1",
+  "version": "0.0.3-beta.3",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -25,15 +25,15 @@
   "dependencies": {
     "@ant-design/icons": "*",
     "antd": "*",
-    "lodash": "*",
+    "lodash-es": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.3-beta.1",
+    "@faasjs/react": "^0.0.3-beta.3",
     "react-router-dom": "*",
     "dayjs": "*"
   },
   "devDependencies": {
-    "@types/lodash": "*",
+    "@types/lodash-es": "*",
     "@testing-library/jest-dom": "*",
     "@testing-library/react": "*",
     "@testing-library/user-event": "*"