@hw-component/form 1.11.1 → 1.11.2

package/es/TDPicker/RangePicker.js

@@ -1,10 +1,11 @@
 // welcome to hoo hoo hoo
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx } from 'react/jsx-runtime';
 import { DatePicker } from 'antd';
 import { useGetTimeKey, useRangeValueProvider, useRangePickerTimeVal } from './hooks.js';
-import React, { useMemo } from 'react';
+import React, { useState, useMemo } from 'react';
 import { useMatchConfigProps } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
 import Index$1 from '../InputGroup/index.js';
@@ -36,6 +37,10 @@ var PickerContent = function PickerContent(_ref, ref) {
     _useMatchConfigProps$ = _useMatchConfigProps.valueRangePickerValueMap,
     valueRangePickerValueMap = _useMatchConfigProps$ === void 0 ? {} : _useMatchConfigProps$,
     dateRanges = _useMatchConfigProps.dateRanges;
+  var _useState = useState([null, null]),
+    _useState2 = _slicedToArray(_useState, 2),
+    dates = _useState2[0],
+    setDates = _useState2[1];
   var dateMapKeys = useGetTimeKey({
     valueMap: valueRangePickerValueMap,
     name: name
@@ -100,6 +105,13 @@ var PickerContent = function PickerContent(_ref, ref) {
     });
     onChange === null || onChange === void 0 || onChange(paramsProvider(subVal));
   };
+  var onOpenChange = function onOpenChange(open) {
+    if (open) {
+      setDates(timeVal);
+    } else {
+      setDates([null, null]);
+    }
+  };
   return jsx(RangePicker, _objectSpread({
     value: timeVal,
     ref: ref,
@@ -108,10 +120,13 @@ var PickerContent = function PickerContent(_ref, ref) {
     }, style),
     onChange: change,
     showTime: showTime,
-    onCalendarChange: change,
+    onCalendarChange: function onCalendarChange(val) {
+      return setDates(val);
+    },
+    onOpenChange: onOpenChange,
     ranges: defaultRanges,
     disabledDate: function disabledDate(currentDate) {
-      return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
+      return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, dates));
     }
   }, props));
 };

package/es/TDPicker/modal.d.ts

@@ -31,7 +31,7 @@ export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "
     valueMap?: DateRangePickerValueMapModal;
     ranges?: RangePickerProps["ranges"] | boolean;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
-    disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
+    disabledDate?: DisabledDateFnModal<(Moment | null)[]>;
 }
 export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
     onChange?: (time?: Moment | string | number) => void;

package/lib/TDPicker/RangePicker.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
@@ -39,6 +40,10 @@ var PickerContent = function PickerContent(_ref, ref) {
     _useMatchConfigProps$ = _useMatchConfigProps.valueRangePickerValueMap,
     valueRangePickerValueMap = _useMatchConfigProps$ === void 0 ? {} : _useMatchConfigProps$,
     dateRanges = _useMatchConfigProps.dateRanges;
+  var _useState = React.useState([null, null]),
+    _useState2 = _slicedToArray(_useState, 2),
+    dates = _useState2[0],
+    setDates = _useState2[1];
   var dateMapKeys = hooks.useGetTimeKey({
     valueMap: valueRangePickerValueMap,
     name: name
@@ -103,6 +108,13 @@ var PickerContent = function PickerContent(_ref, ref) {
     });
     onChange === null || onChange === void 0 || onChange(paramsProvider(subVal));
   };
+  var onOpenChange = function onOpenChange(open) {
+    if (open) {
+      setDates(timeVal);
+    } else {
+      setDates([null, null]);
+    }
+  };
   return jsxRuntime.jsx(RangePicker, _objectSpread({
     value: timeVal,
     ref: ref,
@@ -111,10 +123,13 @@ var PickerContent = function PickerContent(_ref, ref) {
     }, style),
     onChange: change,
     showTime: showTime,
-    onCalendarChange: change,
+    onCalendarChange: function onCalendarChange(val) {
+      return setDates(val);
+    },
+    onOpenChange: onOpenChange,
     ranges: defaultRanges,
     disabledDate: function disabledDate(currentDate) {
-      return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
+      return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, dates));
     }
   }, props));
 };

package/lib/TDPicker/modal.d.ts

@@ -31,7 +31,7 @@ export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "
     valueMap?: DateRangePickerValueMapModal;
     ranges?: RangePickerProps["ranges"] | boolean;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
-    disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
+    disabledDate?: DisabledDateFnModal<(Moment | null)[]>;
 }
 export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
     onChange?: (time?: Moment | string | number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/InputGroup/index.tsx

@@ -82,14 +82,13 @@ const Index: React.FC<HInputGroupProps> = ({
     }
     return "";
   }, [addonAfter, addonBefore]);
-
   return (
     <Input.Group compact className={`${contentClassname} ${className}`}>
       <Addon value={value} onChange={onChange} style={addonBeforeStyle}>
         {addonBefore}
       </Addon>
       <div className={`${bodyClassname} ${cuBodyClassName}`}>
-        {React.cloneElement(children as any, { value, onChange, ...props })}
+        {React.cloneElement(children as any, { value, onChange,...props})}
       </div>
       <Addon value={value} onChange={onChange} style={addonAfterStyle}>
         {addonAfter}

package/src/components/TDPicker/RangePicker.tsx

@@ -5,7 +5,7 @@ import {
   useRangePickerTimeVal,
   useRangeValueProvider,
 } from "./hooks";
-import React, { useMemo } from "react";
+import React, {useMemo, useState} from "react";
 import type { RangePickerProps } from "antd/es/date-picker";
 import { useMatchConfigProps } from "../hooks";
 import type { HItemProps } from "../Form/modal";
@@ -15,6 +15,8 @@ import InputGroup from "../InputGroup";
 
 const RangePicker = DatePicker.RangePicker as any;
 
+type RangeValue = (Moment|null) [];
+
 const PickerContent: React.ForwardRefRenderFunction<
   HRangePickerPropsRef,
   HRangePickerProps
@@ -38,6 +40,7 @@ const PickerContent: React.ForwardRefRenderFunction<
     valueRangePickerValueMap: valueMap,
     dateRanges: undefined,
   });
+  const [dates, setDates] = useState<RangeValue>([null,null]);
   const dateMapKeys = useGetTimeKey({
     valueMap: valueRangePickerValueMap,
     name,
@@ -102,6 +105,13 @@ const PickerContent: React.ForwardRefRenderFunction<
     });
     onChange?.(paramsProvider(subVal));
   };
+  const onOpenChange = (open: boolean) => {
+    if (open) {
+      setDates(timeVal);
+    } else {
+      setDates([null,null]);
+    }
+  };
   return (
     <RangePicker
       value={timeVal}
@@ -109,10 +119,11 @@ const PickerContent: React.ForwardRefRenderFunction<
       style={{ width: "100%", ...style }}
       onChange={change}
       showTime={showTime}
-      onCalendarChange={change}
+      onCalendarChange={val => setDates(val)}
+      onOpenChange={onOpenChange}
       ranges={defaultRanges as RangePickerProps["ranges"]}
       disabledDate={(currentDate) => {
-        return !!disabledDate?.(currentDate, timeVal);
+        return !!disabledDate?.(currentDate, dates);
       }}
       {...props}
     />
@@ -126,7 +137,7 @@ const HRangePicker: React.ForwardRefRenderFunction<
 > = (props, ref) => {
   return (
     <InputGroup {...props}>
-      <Content ref={ref} />
+      <Content ref={ref}/>
     </InputGroup>
   );
 };

package/src/components/TDPicker/modal.ts

@@ -38,7 +38,7 @@ export interface HRangePickerProps
   valueMap?: DateRangePickerValueMapModal;
   ranges?: RangePickerProps["ranges"] | boolean;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
-  disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
+  disabledDate?: DisabledDateFnModal<(Moment|null) []>;
 }
 
 export interface HTimePickerProps

package/src/pages/DatePicker/index.tsx

@@ -26,7 +26,8 @@ export default () => {
         />
         <HRangePicker
           value={timeVal}
-          addonBefore="你好"
+          allowEmpty={[true, false]}
+          addonBefore="你好1"
           valueMap={{ start: "start1", end: "end2" }}
           onChange={(val) => {
             console.log(val);