@ucloud-fe/react-components 1.4.5 → 1.4.6

package/lib/components/DatePicker/usePicker.js

@@ -49,7 +49,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var formatInput = function formatInput(v, allFormat) {
+var formatInput = function formatInput(v, allFormat, precision) {
   (0, _newArrowCheck2.default)(this, _this);
   if (v == '') return null;
   var l = allFormat.length;
@@ -62,7 +62,7 @@ var formatInput = function formatInput(v, allFormat) {
     var d = (0, _moment.default)(v, format, true);
 
     if (d.isValid()) {
-      return d;
+      return precision ? d.startOf(precision) : d;
     }
   }
 
@@ -154,6 +154,15 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
       allFormat = _useMemo4[1],
       timeMode = _useMemo4[2];
 
+  var precision = (0, _react.useMemo)(function () {
+    (0, _newArrowCheck2.default)(this, _this2);
+    if (mode === 'month') return 'month';
+    if (!(timeMode !== null && timeMode !== void 0 && timeMode.length)) return 'date';
+    if (timeMode.indexOf('ss') >= 0) return 'second';
+    if (timeMode.indexOf('mm') >= 0) return 'minute';
+    if (timeMode.indexOf('HH') >= 0) return 'hour';
+    return 'date';
+  }.bind(this), [mode, timeMode]);
   var d = (0, _react.useMemo)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
     return new Date();
@@ -223,7 +232,7 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     var currentValue;
 
     if (useInputValue) {
-      var inputDValue = formatInput(inputValue, allFormat);
+      var inputDValue = formatInput(inputValue, allFormat, precision);
       if (inputDValue === false) return locale.inputErrorTip;
       currentValue = inputDValue;
     } else {
@@ -237,13 +246,13 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     }
 
     return true;
-  }.bind(this), [allFormat, calValue, inputValue, locale.dateErrorTip, locale.inputErrorTip, locale.nullableErrorTip, nullable, rules, useInputValue, value]);
+  }.bind(this), [allFormat, calValue, inputValue, locale.dateErrorTip, locale.inputErrorTip, locale.nullableErrorTip, nullable, precision, rules, useInputValue, value]);
   var handleInputChange = (0, _react.useCallback)(function (e) {
     (0, _newArrowCheck2.default)(this, _this2);
     if (!visible) setVisible(true);
     var v = e.target.value;
     setInputValue(v);
-    var d = formatInput(v, allFormat);
+    var d = formatInput(v, allFormat, precision);
 
     if (d) {
       setCalValue(d);
@@ -253,7 +262,7 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
     }
 
     setUseInputValue(true);
-  }.bind(this), [allFormat, calValue, visible]);
+  }.bind(this), [allFormat, calValue, precision, visible]);
   var clear = (0, _react.useCallback)(function () {
     (0, _newArrowCheck2.default)(this, _this2);
     setInputValue('');
@@ -289,6 +298,7 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
   var handleCalendarChange = (0, _react.useCallback)(function (v) {
     (0, _newArrowCheck2.default)(this, _this2);
     v = (0, _utils.getValidDate)(v, rules);
+    v = (0, _utils.setPrecision)(v, precision);
     setCalValue((0, _moment.default)(+v));
     setInputValue(formatDate((0, _moment.default)(+v), format));
     setUseInputValue(false);
@@ -297,7 +307,7 @@ var usePicker = function usePicker(props, displayToFormatAndTimeMode, mode, onCl
       onChange && onChange((0, _moment.default)(+v));
       setVisible(false);
     }
-  }.bind(this), [clickConfirm, format, onChange, rules]);
+  }.bind(this), [clickConfirm, format, onChange, precision, rules]);
   var handleInputFocus = (0, _react.useCallback)(function () {
     var _this3 = this;
 

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

@@ -2,12 +2,13 @@ import { Moment } from 'moment';
 import { TDate } from '@z-r/calendar';
 import { isDateDisabled, getValidDate } from '../../components/Calendar/utils';
 declare type Range = [TDate | void | null, TDate | void | null];
-declare type Precision = 'second' | 'minute' | 'hour' | 'date' | 'month' | 'year';
+export declare type Precision = 'second' | 'minute' | 'hour' | 'date' | 'month' | 'year';
 export interface Rules {
     range?: Range;
     custom?: (date: Moment, value?: Moment | null) => boolean;
 }
 export declare const formatToShort: (format: string) => string;
+export declare const setPrecision: (v: TDate, precision?: Precision | undefined) => TDate;
 declare const isRangeDateValid: (value: [TDate | null, TDate | null], rules: {
     range?: Range | undefined;
     maxRange?: any;

package/lib/components/DatePicker/utils.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "getValidDate", {
     return _utils.getValidDate;
   }
 });
-exports.isRangeDateValid = exports.isDateValid = exports.formatToShort = void 0;
+exports.isRangeDateValid = exports.isDateValid = exports.setPrecision = exports.formatToShort = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -36,6 +36,18 @@ var formatToShort = function formatToShort(format) {
 
 exports.formatToShort = formatToShort;
 
+var setPrecision = function setPrecision(v, precision) {
+  (0, _newArrowCheck2.default)(this, _this);
+
+  if (precision) {
+    v = (0, _moment.default)(+v).startOf(precision);
+  }
+
+  return v;
+}.bind(void 0);
+
+exports.setPrecision = setPrecision;
+
 var isRangeDateValid = function isRangeDateValid(value, rules, precision) {
   (0, _newArrowCheck2.default)(this, _this);
 

package/package.json

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