listpage-next 0.0.131 → 0.0.132

package/dist/components/AsyncSelect/index.d.ts

@@ -1,10 +1,10 @@
-import { SelectProps } from "antd";
-import { PaginationData } from "../../http-client";
+import { SelectProps } from 'antd';
+import { PaginationData } from '../../http-client';
 type BaseOption = {
     label: string;
     value: string;
 };
-export type AsyncSelectProps<Data extends BaseOption> = Omit<SelectProps, 'options'> & {
+export type AsyncSelectProps<Data extends BaseOption = any> = Omit<SelectProps, 'options'> & {
     request: (parmas: {
         current: number;
         pageSize: number;

package/dist/components/DataTable/utils/render.js

@@ -40,10 +40,16 @@ function textRender(value, props) {
     });
 }
 function timeRender(value, props) {
-    const time = value ? dayjs(value).format(props?.format) : '-';
-    return /*#__PURE__*/ jsx("span", {
-        children: time
-    });
+    try {
+        const time = value ? dayjs(value).format(props?.format) : '-';
+        return /*#__PURE__*/ jsx("span", {
+            children: time
+        });
+    } catch  {
+        return /*#__PURE__*/ jsx("span", {
+            children: "-"
+        });
+    }
 }
 function tagRender(value, props) {
     return /*#__PURE__*/ jsx(Tag, {

package/dist/components/FilterGroup/components/FilterForm/index.d.ts

@@ -1,11 +1,12 @@
 import { ReactElement, ReactNode } from 'react';
 import { FormItemProps } from 'antd';
-import { ComponentType } from '../../typings';
-export interface FilterFormOption {
+import { ComponentProps, ComponentType } from '../../typings';
+export interface FilterFormOption<Type extends ComponentType = any> {
     name: string;
     label?: ReactNode;
-    component?: ComponentType | ReactElement;
+    component?: Type | ReactElement;
     colSpan?: number;
+    props?: ComponentProps<Type>;
     formItemProps?: Omit<FormItemProps, 'children'>;
 }
 export interface FilterFormProps<FormValue = any> {

package/dist/components/FilterGroup/components/FilterForm/index.js

@@ -8,14 +8,14 @@ import { getComponent } from "../../utils/getComponent.js";
 import { cleanUpFormValues } from "../../utils/format.js";
 const FilterForm = ({ options, initialValues, onSubmit, onReset, labelInline })=>{
     const formRef = useRef(null);
-    const items = useMemo(()=>(options ?? []).map(({ colSpan, component, label, ...props })=>{
-            const renderComponent = getComponent(component);
+    const items = useMemo(()=>(options ?? []).map(({ colSpan, component, label, props, ...formItemProps })=>{
+            const renderComponent = getComponent(component, props);
             return {
-                key: props.name,
+                key: formItemProps.name,
                 node: /*#__PURE__*/ jsx(FilterItem, {
                     labelInline: labelInline,
                     label: label,
-                    formItemProps: props,
+                    formItemProps: formItemProps,
                     children: renderComponent
                 }),
                 colSpan: colSpan || 2

package/dist/components/FilterGroup/typings/component.d.ts

@@ -1 +1,12 @@
-export type ComponentType = 'input' | 'select';
+import { InputProps, SelectProps } from 'antd';
+import { RangePickerProps } from 'antd/es/date-picker';
+import { AsyncSelectProps } from '../../AsyncSelect';
+export type ComponentType = 'input' | 'select' | 'async-select' | 'daterange';
+export type InputComponentProps = InputProps;
+export type SelectComponentProps = SelectProps;
+export type AsyncSelectComponentProps = AsyncSelectProps;
+export type DateRangeComponentProps = {
+    value: [string, string];
+    onChange: (value: [string | null, string | null]) => void;
+} & Omit<RangePickerProps, 'value' | 'onChange'>;
+export type ComponentProps<ComponentType> = ComponentType extends 'input' ? InputComponentProps : ComponentType extends 'async-select' ? AsyncSelectComponentProps : ComponentType extends 'select' ? SelectComponentProps : ComponentType extends 'daterange' ? DateRangeComponentProps : unknown;

package/dist/components/FilterGroup/utils/getComponent.d.ts

@@ -1,3 +1,3 @@
 import { ReactElement } from 'react';
 import { ComponentType } from '../typings/component';
-export declare const getComponent: (component?: ReactElement | ComponentType) => import("react/jsx-runtime").JSX.Element;
+export declare const getComponent: (component?: ReactElement | ComponentType, props?: any) => import("react/jsx-runtime").JSX.Element;

package/dist/components/FilterGroup/utils/getComponent.js

@@ -1,16 +1,40 @@
 import { jsx } from "react/jsx-runtime";
-import { Input, Select } from "antd";
-const EnhancedInput = (props)=>/*#__PURE__*/ jsx(Input, {
+import dayjs from "dayjs";
+import { DatePicker, Input, Select } from "antd";
+import { useMemo } from "react";
+import { AsyncSelect } from "../../AsyncSelect/index.js";
+const EnhancedRangePicker = (props)=>{
+    const { value, onChange } = props;
+    const realValue = useMemo(()=>(value ?? []).map((i)=>{
+            if (i) return dayjs(i);
+        }), [
+        value
+    ]);
+    return /*#__PURE__*/ jsx(DatePicker.RangePicker, {
         ...props,
-        onChange: (e)=>props.onChange?.(e.target.value)
+        value: realValue,
+        onChange: (_, dates)=>{
+            onChange?.(dates);
+        }
     });
-const getComponent = (component)=>{
+};
+const getComponent = (component, props = {})=>{
     if ('string' == typeof component) {
         const type = component;
-        if ('input' === type) return /*#__PURE__*/ jsx(EnhancedInput, {});
-        if ('select' === type) return /*#__PURE__*/ jsx(Select, {});
+        if ('input' === type) return /*#__PURE__*/ jsx(Input, {
+            ...props
+        });
+        if ('select' === type) return /*#__PURE__*/ jsx(Select, {
+            ...props
+        });
+        if ('async-select' === type) return /*#__PURE__*/ jsx(AsyncSelect, {
+            ...props
+        });
+        if ('daterange' === type) return /*#__PURE__*/ jsx(EnhancedRangePicker, {
+            ...props
+        });
     }
     if (component) return component;
-    return /*#__PURE__*/ jsx(EnhancedInput, {});
+    return /*#__PURE__*/ jsx(Input, {});
 };
 export { getComponent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.131",
+  "version": "0.0.132",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",