@faasjs/ant-design 0.0.3-beta.47 → 0.0.3-beta.49

package/dist/index.d.ts

@@ -4,8 +4,7 @@ import { Dayjs } from 'dayjs';
 import { FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, DatePickerProps, TimePickerProps, FormInstance, DescriptionsProps, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1, DrawerProps as DrawerProps$1, FormProps as FormProps$1, ButtonProps, ModalProps as ModalProps$1 } from 'antd';
 export { Drawer, Modal } from 'antd';
 import { RuleObject } from 'rc-field-form/lib/interface';
-import { FaasDataWrapperProps as FaasDataWrapperProps$1 } from '@faasjs/react';
-export { FaasDataInjection } from '@faasjs/react';
+import { FaasDataInjection as FaasDataInjection$1, FaasDataWrapperProps as FaasDataWrapperProps$1 } from '@faasjs/react';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
 import * as antd_es_form_context from 'antd/es/form/context';
 import * as antd_es_form_ErrorList from 'antd/es/form/ErrorList';
@@ -152,12 +151,25 @@ type LoadingProps = {
  */
 declare function Loading(props: LoadingProps): JSX.Element;
 
+type FaasDataInjection<T = any> = Partial<FaasDataInjection$1<T>>;
 interface FaasDataWrapperProps<T = any> extends FaasDataWrapperProps$1<T> {
     loadingProps?: LoadingProps;
     loading?: JSX.Element;
 }
 /**
  * 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>
+ * }
+ * ```
  */
 declare function FaasDataWrapper<T = any>(props: FaasDataWrapperProps<T>): JSX.Element;
 
@@ -499,4 +511,4 @@ interface TitleProps {
  */
 declare function Title(props: TitleProps): JSX.Element;
 
-export { BaseItemProps, BaseOption, Blank, BlankProps, ConfigContext, ConfigProvider, ConfigProviderProps, Description, DescriptionItemContentProps, DescriptionItemProps, DescriptionProps, DrawerProps, ErrorBoundary, ErrorBoundaryProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, ExtendTypes, FaasDataWrapper, FaasDataWrapperProps, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, FormSubmitProps, Link, LinkProps, Loading, LoadingProps, ModalProps, PageNotFound, Routes, RoutesProps, Table, TableItemProps, TableProps, Title, TitleProps, UnionFaasItemElement, UnionFaasItemInjection, UnionFaasItemProps, UnionFaasItemRender, UnionScene, setDrawerProps, setModalProps, transferOptions, transferValue, useConfigContext, useDrawer, useModal };
+export { BaseItemProps, BaseOption, Blank, BlankProps, ConfigContext, ConfigProvider, ConfigProviderProps, Description, DescriptionItemContentProps, DescriptionItemProps, DescriptionProps, DrawerProps, ErrorBoundary, ErrorBoundaryProps, ExtendDescriptionItemProps, ExtendDescriptionTypeProps, ExtendFormItemProps, ExtendFormTypeProps, ExtendTableItemProps, ExtendTableTypeProps, ExtendTypes, FaasDataInjection, FaasDataWrapper, FaasDataWrapperProps, FaasItemProps, FaasItemType, FaasItemTypeValue, Form, FormItem, FormItemProps, FormProps, FormSubmitProps, Link, LinkProps, Loading, LoadingProps, ModalProps, PageNotFound, Routes, RoutesProps, Table, TableItemProps, TableProps, Title, TitleProps, UnionFaasItemElement, UnionFaasItemInjection, UnionFaasItemProps, UnionFaasItemRender, UnionScene, setDrawerProps, setModalProps, transferOptions, transferValue, useConfigContext, useDrawer, useModal };

package/dist/index.js

@@ -1367,9 +1367,15 @@ function Table(props) {
           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));
+            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) => (0, import_dayjs2.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if ((0, import_lodash_es6.isNil)(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if ((0, import_lodash_es6.isNil)(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "time":
           if (!item.render)
@@ -1377,7 +1383,13 @@ function Table(props) {
           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) => (0, import_dayjs2.default)(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if ((0, import_lodash_es6.isNil)(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if ((0, import_lodash_es6.isNil)(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "object":
           if (!item.render)

package/dist/index.mjs

@@ -1367,9 +1367,15 @@ function Table(props) {
           if (!item.render)
             item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
+            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value), "date");
           if (!item.sorter)
-            item.sorter = (a, b) => dayjs2(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if (isNil2(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if (isNil2(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "time":
           if (!item.render)
@@ -1377,7 +1383,13 @@ function Table(props) {
           if (!item.onFilter)
             item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           if (!item.sorter)
-            item.sorter = (a, b) => dayjs2(a[item.id]).isBefore(b[item.id]) ? -1 : 1;
+            item.sorter = (a, b, order) => {
+              if (isNil2(a[item.id]))
+                return order === "ascend" ? 1 : -1;
+              if (isNil2(b[item.id]))
+                return order === "ascend" ? -1 : 1;
+              return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
+            };
           break;
         case "object":
           if (!item.render)

package/package.json

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