@faasjs/ant-design 0.0.3-beta.63 → 0.0.3-beta.65

package/README.md

@@ -41,6 +41,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 
 ### Namespaces
 
+- [App](modules/App.md)
 - [Form](modules/Form.md)
 - [FormItem](modules/FormItem.md)
 
@@ -50,6 +51,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 
 ### Interfaces
 
+- [AppProps](interfaces/AppProps.md)
 - [BaseItemProps](interfaces/BaseItemProps.md)
 - [BlankProps](interfaces/BlankProps.md)
 - [ConfigProviderProps](interfaces/ConfigProviderProps.md)
@@ -59,7 +61,6 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 - [DrawerProps](interfaces/DrawerProps.md)
 - [ErrorBoundaryProps](interfaces/ErrorBoundaryProps.md)
 - [ExtendDescriptionTypeProps](interfaces/ExtendDescriptionTypeProps.md)
-- [FaasDataInjection](interfaces/FaasDataInjection.md)
 - [FaasDataWrapperProps](interfaces/FaasDataWrapperProps.md)
 - [FaasItemProps](interfaces/FaasItemProps.md)
 - [FormItemProps](interfaces/FormItemProps.md)
@@ -70,6 +71,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 - [TableItemProps](interfaces/TableItemProps.md)
 - [TitleProps](interfaces/TitleProps.md)
 - [UnionFaasItemProps](interfaces/UnionFaasItemProps.md)
+- [useAppProps](interfaces/useAppProps.md)
 
 ### Type Aliases
 
@@ -80,6 +82,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 - [ExtendTableItemProps](#extendtableitemprops)
 - [ExtendTableTypeProps](#extendtabletypeprops)
 - [ExtendTypes](#extendtypes)
+- [FaasDataInjection](#faasdatainjection)
 - [FaasItemType](#faasitemtype)
 - [FaasItemTypeValue](#faasitemtypevalue)
 - [FormSubmitProps](#formsubmitprops)
@@ -98,6 +101,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 
 ### Functions
 
+- [App](#app)
 - [Blank](#blank)
 - [ConfigProvider](#configprovider)
 - [Description](#description)
@@ -112,6 +116,7 @@ Form are based on [Ant Design's Form.Item component](https://ant.design/componen
 - [Title](#title)
 - [transferOptions](#transferoptions)
 - [transferValue](#transfervalue)
+- [useApp](#useapp)
 - [useConfigContext](#useconfigcontext)
 - [useDrawer](#usedrawer)
 - [useModal](#usemodal)
@@ -195,6 +200,18 @@ ___
 
 ___
 
+### FaasDataInjection
+
+Ƭ **FaasDataInjection**<`T`\>: `Partial`<`OriginFaasDataInjection`<`T`\>\>
+
+#### Type parameters
+
+| Name | Type |
+| :------ | :------ |
+| `T` | `any` |
+
+___
+
 ### FaasItemType
 
 Ƭ **FaasItemType**: ``"string"`` \| ``"string[]"`` \| ``"number"`` \| ``"number[]"`` \| ``"boolean"`` \| ``"date"`` \| ``"time"`` \| ``"object"`` \| ``"object[]"``
@@ -386,6 +403,22 @@ ___
 
 ## Functions
 
+### App
+
+▸ **App**(`props`): `Element`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `props` | [`AppProps`](interfaces/AppProps.md) |
+
+#### Returns
+
+`Element`
+
+___
+
 ### Blank
 
 ▸ **Blank**(`options?`): `JSX.Element`
@@ -470,6 +503,18 @@ ___
 
 FaasDataWrapper component with Loading
 
+```tsx
+function MyComponent (props: FaasDataInjection) {
+  return <div>{ props.data }</div>
+}
+
+function MyPage () {
+  return <FaasDataWrapper action="test" params={{ a: 1 }}>
+    <MyComponent />
+  </FaasDataWrapper>
+}
+```
+
 #### Type parameters
 
 | Name | Type |
@@ -619,7 +664,7 @@ ___
 Routes with lazy loading and 404 page.
 
 ```tsx
-import { lazy } from 'react'
+import { Routes, lazy } from '@faasjs/ant-design'
 import { BrowserRouter } from 'react-router-dom'
 
 export function App () {
@@ -742,6 +787,16 @@ ___
 
 ___
 
+### useApp
+
+▸ **useApp**(): [`useAppProps`](interfaces/useAppProps.md)
+
+#### Returns
+
+[`useAppProps`](interfaces/useAppProps.md)
+
+___
+
 ### useConfigContext
 
 ▸ **useConfigContext**(): [`ConfigProviderProps`](interfaces/ConfigProviderProps.md)

package/dist/index.js

@@ -1259,11 +1259,11 @@ 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]))
+              if (!value || (0, import_lodash_es6.isNil)(value))
                 return true;
-              if (!row[item.id] || !value)
+              if ((0, import_lodash_es6.isNil)(row[item.id]))
                 return false;
-              return row[item.id].toLowerCase().includes(value.toLowerCase());
+              return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
             };
           if (item.filterDropdown === false || item.filterDropdown)
             break;
@@ -1295,7 +1295,7 @@ function Table(props) {
                 return true;
               if (!row[item.id] || !row[item.id].length || !value)
                 return false;
-              return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
+              return row[item.id].some((v) => v.trim().toLowerCase().includes(value.trim().toLowerCase()));
             };
           if (item.filterDropdown === false || item.filterDropdown)
             break;
@@ -1325,8 +1325,10 @@ function Table(props) {
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (!item.onFilter)
             item.onFilter = (value, row) => {
-              if (value === null && (0, import_lodash_es6.isNil)(row[item.id]))
+              if (value === null)
                 return true;
+              if ((0, import_lodash_es6.isNil)(row[item.id]))
+                return false;
               return value == row[item.id];
             };
           if (item.filterDropdown === false || item.filterDropdown)
@@ -1456,8 +1458,6 @@ function Table(props) {
         case "date":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs2.default)(row[item.id]).isSame((0, import_dayjs2.default)(value), "date");
           if (!item.sorter)
             item.sorter = (a, b, order) => {
               if ((0, import_lodash_es6.isNil)(a[item.id]))
@@ -1466,12 +1466,28 @@ function Table(props) {
                 return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
+          if (!item.filterDropdown)
+            item.filterDropdown = ({
+              setSelectedKeys,
+              confirm
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd12.DatePicker.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
+              }
+            });
+          if (!item.onFilter)
+            item.onFilter = (value, row) => {
+              if ((0, import_lodash_es6.isNil)(value[0]))
+                return true;
+              if ((0, import_lodash_es6.isNil)(row[item.id]))
+                return false;
+              return (0, import_dayjs2.default)(row[item.id]) >= (0, import_dayjs2.default)(value[0]) && (0, import_dayjs2.default)(row[item.id]) <= (0, import_dayjs2.default)(value[1]);
+            };
           break;
         case "time":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs2.default)(row[item.id]).isSame((0, import_dayjs2.default)(value));
           if (!item.sorter)
             item.sorter = (a, b, order) => {
               if ((0, import_lodash_es6.isNil)(a[item.id]))
@@ -1480,6 +1496,24 @@ function Table(props) {
                 return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
+          if (!item.filterDropdown)
+            item.filterDropdown = ({
+              setSelectedKeys,
+              confirm
+            }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd12.DatePicker.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
+              }
+            });
+          if (!item.onFilter)
+            item.onFilter = (value, row) => {
+              if ((0, import_lodash_es6.isNil)(value[0]))
+                return true;
+              if ((0, import_lodash_es6.isNil)(row[item.id]))
+                return false;
+              return (0, import_dayjs2.default)(row[item.id]) >= (0, import_dayjs2.default)(value[0]) && (0, import_dayjs2.default)(row[item.id]) <= (0, import_dayjs2.default)(value[1]);
+            };
           break;
         case "object":
           if (!item.render)

package/dist/index.mjs

@@ -1164,7 +1164,8 @@ import {
   Table as AntdTable,
   Radio,
   Input as Input2,
-  Select as Select2
+  Select as Select2,
+  DatePicker as DatePicker2
 } from "antd";
 import dayjs2 from "dayjs";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
@@ -1266,11 +1267,11 @@ function Table(props) {
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
             item.onFilter = (value, row) => {
-              if (value === null && isNil2(row[item.id]))
+              if (!value || isNil2(value))
                 return true;
-              if (!row[item.id] || !value)
+              if (isNil2(row[item.id]))
                 return false;
-              return row[item.id].toLowerCase().includes(value.toLowerCase());
+              return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
             };
           if (item.filterDropdown === false || item.filterDropdown)
             break;
@@ -1302,7 +1303,7 @@ function Table(props) {
                 return true;
               if (!row[item.id] || !row[item.id].length || !value)
                 return false;
-              return row[item.id].some((v) => v.toLowerCase().includes(value.toLowerCase()));
+              return row[item.id].some((v) => v.trim().toLowerCase().includes(value.trim().toLowerCase()));
             };
           if (item.filterDropdown === false || item.filterDropdown)
             break;
@@ -1332,8 +1333,10 @@ function Table(props) {
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (!item.onFilter)
             item.onFilter = (value, row) => {
-              if (value === null && isNil2(row[item.id]))
+              if (value === null)
                 return true;
+              if (isNil2(row[item.id]))
+                return false;
               return value == row[item.id];
             };
           if (item.filterDropdown === false || item.filterDropdown)
@@ -1463,8 +1466,6 @@ function Table(props) {
         case "date":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value), "date");
           if (!item.sorter)
             item.sorter = (a, b, order) => {
               if (isNil2(a[item.id]))
@@ -1473,12 +1474,28 @@ function Table(props) {
                 return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
+          if (!item.filterDropdown)
+            item.filterDropdown = ({
+              setSelectedKeys,
+              confirm
+            }) => /* @__PURE__ */ jsx14(DatePicker2.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
+              }
+            });
+          if (!item.onFilter)
+            item.onFilter = (value, row) => {
+              if (isNil2(value[0]))
+                return true;
+              if (isNil2(row[item.id]))
+                return false;
+              return dayjs2(row[item.id]) >= dayjs2(value[0]) && dayjs2(row[item.id]) <= dayjs2(value[1]);
+            };
           break;
         case "time":
           if (!item.render)
             item.render = (value) => processValue(item, value);
-          if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           if (!item.sorter)
             item.sorter = (a, b, order) => {
               if (isNil2(a[item.id]))
@@ -1487,6 +1504,24 @@ function Table(props) {
                 return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
+          if (!item.filterDropdown)
+            item.filterDropdown = ({
+              setSelectedKeys,
+              confirm
+            }) => /* @__PURE__ */ jsx14(DatePicker2.RangePicker, {
+              onChange: (dates) => {
+                setSelectedKeys(dates && dates[0] && dates[1] ? [[dates[0].startOf("day").toISOString(), dates[1].endOf("day").toISOString()]] : []);
+                confirm();
+              }
+            });
+          if (!item.onFilter)
+            item.onFilter = (value, row) => {
+              if (isNil2(value[0]))
+                return true;
+              if (isNil2(row[item.id]))
+                return false;
+              return dayjs2(row[item.id]) >= dayjs2(value[0]) && dayjs2(row[item.id]) <= dayjs2(value[1]);
+            };
           break;
         case "object":
           if (!item.render)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.3-beta.63",
+  "version": "0.0.3-beta.65",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",