@ucloud-fe/react-components 1.4.4 → 1.4.5

package/lib/components/DatePicker/Range.js

@@ -250,16 +250,21 @@ var Range = function Range(_ref2) {
     var rangeDateValidResult = (0, _utils.isRangeDateValid)(newValue, rules, precision);
     setRangeError(undefined);
 
-    if (isClear) {// noop
+    if (isClear) {
+      var _actionRefS$current, _actionRefE$current;
+
+      onChange(newValue);
+      (_actionRefS$current = actionRefS.current) === null || _actionRefS$current === void 0 ? void 0 : _actionRefS$current.hide();
+      (_actionRefE$current = actionRefE.current) === null || _actionRefE$current === void 0 ? void 0 : _actionRefE$current.hide();
     } else if (rangeDateValidResult !== true) {
       var _inputRefE$current;
 
       (_inputRefE$current = inputRefE.current) === null || _inputRefE$current === void 0 ? void 0 : _inputRefE$current.focus();
 
       if (rangeDateValidResult === 'startGreaterThanEnd') {
-        var _actionRefE$current;
+        var _actionRefE$current2;
 
-        (_actionRefE$current = actionRefE.current) === null || _actionRefE$current === void 0 ? void 0 : _actionRefE$current.clear();
+        (_actionRefE$current2 = actionRefE.current) === null || _actionRefE$current2 === void 0 ? void 0 : _actionRefE$current2.clear();
       } else {
         setRangeError(locale[rangeDateValidResult + 'Tip']);
       }
@@ -285,16 +290,21 @@ var Range = function Range(_ref2) {
     var rangeDateValidResult = (0, _utils.isRangeDateValid)(newValue, rules, precision);
     setRangeError(undefined);
 
-    if (isClear) {// noop
+    if (isClear) {
+      var _actionRefS$current2, _actionRefE$current3;
+
+      onChange(newValue);
+      (_actionRefS$current2 = actionRefS.current) === null || _actionRefS$current2 === void 0 ? void 0 : _actionRefS$current2.hide();
+      (_actionRefE$current3 = actionRefE.current) === null || _actionRefE$current3 === void 0 ? void 0 : _actionRefE$current3.hide();
     } else if (rangeDateValidResult !== true) {
       var _inputRefS$current;
 
       (_inputRefS$current = inputRefS.current) === null || _inputRefS$current === void 0 ? void 0 : _inputRefS$current.focus();
 
       if (rangeDateValidResult === 'startGreaterThanEnd') {
-        var _actionRefS$current;
+        var _actionRefS$current3;
 
-        (_actionRefS$current = actionRefS.current) === null || _actionRefS$current === void 0 ? void 0 : _actionRefS$current.clear();
+        (_actionRefS$current3 = actionRefS.current) === null || _actionRefS$current3 === void 0 ? void 0 : _actionRefS$current3.clear();
       } else {
         setRangeError(locale[rangeDateValidResult + 'Tip']);
       }

package/lib/components/DatePicker/usePicker.js

@@ -259,7 +259,11 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     setInputValue('');
     setCalValue(null);
   }.bind(this), []);
-  var handleConfirm = (0, _react.useCallback)(function (v, dontChangeVisible) {
+  var hide = (0, _react.useCallback)(function () {
+    (0, _newArrowCheck2.default)(this, _this2);
+    setVisible(false);
+  }.bind(this), []);
+  var handleConfirm = (0, _react.useCallback)(function (v) {
     (0, _newArrowCheck2.default)(this, _this2);
     var currentValue = v !== undefined ? v : calValue;
 
@@ -270,17 +274,18 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     }
 
     onChange && onChange(currentValue ? (0, _moment.default)(+currentValue) : null);
-
-    if (!dontChangeVisible) {
-      setVisible(false);
-    }
+    setVisible(false);
   }.bind(this), [calValue, nullable, onChange, rules, value]);
   var handleInputClear = (0, _react.useCallback)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
     clear(); // 不走 onChange，区分两种操作
 
-    onClear === null || onClear === void 0 ? void 0 : onClear();
-  }.bind(this), [clear, onClear]);
+    if (onClear) {
+      onClear();
+    } else {
+      handleConfirm(null);
+    }
+  }.bind(this), [clear, handleConfirm, onClear]);
   var handleCalendarChange = (0, _react.useCallback)(function (v) {
     (0, _newArrowCheck2.default)(this, _this2);
     v = (0, _utils.getValidDate)(v, rules);
@@ -400,7 +405,8 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     error: typeof error === 'string' ? error : null,
     active: visible
   }, {
-    clear: clear
+    clear: clear,
+    hide: hide
   }];
 }.bind(void 0);
 

package/lib/components/DatePicker/useRangePicker.d.ts

@@ -2,6 +2,7 @@ import { ReactNode, MutableRefObject } from 'react';
 import { DatePickerProps } from './DatePicker';
 export declare type RangeActionRef = {
     clear: () => void;
+    hide: () => void;
 };
 export declare type RangePickerRef = {
     focus: () => void;

package/lib/components/DatePicker/useRangePicker.js

@@ -76,9 +76,10 @@ var useRangePicker = function useRangePicker(_ref) {
   (0, _react.useImperativeHandle)(actionRef, function () {
     (0, _newArrowCheck2.default)(this, _this2);
     return {
-      clear: actions.clear
+      clear: actions.clear,
+      hide: actions.hide
     };
-  }.bind(this), [actions.clear]);
+  }.bind(this), [actions.clear, actions.hide]);
   return [// inputProps
   _objectSpread(_objectSpread({}, inputProps), {}, {
     customStyle: inputCustomStyle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucloud-fe/react-components",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "title": "UCloud react components",
   "description": "UCloud react components",
   "keywords": [