@ucloud-fe/react-components 1.2.18 → 1.3.1

package/lib/components/DatePicker/RangePicker.js

@@ -58,7 +58,8 @@ 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 RangePickerWithoutMemo = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var _this2 = this;
+  var _this2 = this,
+      _timeProps$mode;
 
   (0, _newArrowCheck2.default)(this, _this);
   var prefix = _ref.prefix,
@@ -70,8 +71,9 @@ var RangePickerWithoutMemo = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
       error = _ref.error,
       footerTip = _ref.footerTip,
       pickProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var isMonth = type === 'month';
 
-  var _usePicker = (0, _usePicker3.default)(_objectSpread({}, pickProps), type === 'month' ? _Month.displayToFormatAndTimeMode : _DatePicker.displayToFormatAndTimeMode, type),
+  var _usePicker = (0, _usePicker3.default)(_objectSpread({}, pickProps), isMonth ? _Month.displayToFormatAndTimeMode : _DatePicker.displayToFormatAndTimeMode, type),
       _usePicker2 = (0, _slicedToArray2.default)(_usePicker, 8),
       inputProps = _usePicker2[0],
       popoverProps = _usePicker2[2],
@@ -102,12 +104,17 @@ var RangePickerWithoutMemo = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     onActiveChange(active);
   }.bind(this), [active, onActiveChange]);
   var popoverConfigProps = (0, _usePopoverConfig.default)();
-  var CalendarComp = type === 'month' ? _Calendar.default.Month : _Calendar.default;
+  var hasTime = !!((_timeProps$mode = timeProps.mode) !== null && _timeProps$mode !== void 0 && _timeProps$mode.length);
+  var CalendarComp = isMonth ? _Calendar.default.Month : _Calendar.default;
   return readonly ? /*#__PURE__*/_react.default.createElement("span", {
     className: _style.readonlyInputCls
-  }, inputProps.value) : /*#__PURE__*/_react.default.createElement(_Popover.default, (0, _extends2.default)({
+  }, inputProps.value) : /*#__PURE__*/_react.default.createElement(_style.RangeInputWrap, {
+    isMonth: isMonth,
+    hasTime: hasTime,
+    hasPrefix: prefix
+  }, /*#__PURE__*/_react.default.createElement(_Popover.default, (0, _extends2.default)({
     popup: /*#__PURE__*/_react.default.createElement(_style.SPopup, popupProps, /*#__PURE__*/_react.default.createElement(CalendarComp, (0, _extends2.default)({}, calendarProps, {
-      sidebar: type === 'month' ? null : timeProps.mode.length ? /*#__PURE__*/_react.default.createElement(_Time.default, timeProps) : null
+      sidebar: isMonth ? null : hasTime ? /*#__PURE__*/_react.default.createElement(_Time.default, timeProps) : null
     })), pickerError && /*#__PURE__*/_react.default.createElement(_Notice.default, {
       styleType: "error",
       closable: false
@@ -120,16 +127,17 @@ var RangePickerWithoutMemo = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
       tip: footerTip
     })))
   }, popoverConfigProps, popoverProps), /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({}, inputProps, {
-    prefix: prefix ? /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
-      type: "calendar"
-    }) : null,
     customStyle: {
       border: 'none',
       boxShadow: 'none',
       background: 'none'
     },
-    ref: inputRef
-  })));
+    ref: inputRef,
+    block: true,
+    prefix: prefix ? /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
+      type: "calendar"
+    }) : null
+  }))));
 }.bind(void 0));
 
 var _default = /*#__PURE__*/(0, _react.memo)(RangePickerWithoutMemo);

package/lib/components/DatePicker/style/index.d.ts

@@ -1,17 +1,15 @@
 /// <reference types="react" />
 import { Theme, Size } from '../../../style';
 export declare const prefixCls: string;
-export declare const pickerPrefixCls: string;
-export declare const monthPickerPrefixCls: string;
-export declare const dataWrapCls: string;
 export declare const dateSeparatorCls: string;
 export declare const shortcutCls: string;
 export declare const footerCls: string;
 export declare const tipCls: string;
 export declare const readonlyInputCls: string;
 export declare const PickerContainer: import("react").ForwardRefExoticComponent<{
-    disabled: boolean;
-    isMonth: boolean;
+    disabled?: boolean | undefined;
+    isMonth?: boolean | undefined;
+    hasTime?: boolean | undefined;
 } & import("react").HTMLAttributes<HTMLDivElement> & {
     theme?: Theme | undefined;
 } & import("react").RefAttributes<HTMLDivElement>>;
@@ -32,6 +30,13 @@ export declare const RangeContainer: import("react").ForwardRefExoticComponent<{
 } & import("react").HTMLAttributes<HTMLElement> & {
     theme?: Theme | undefined;
 } & import("react").RefAttributes<HTMLElement>>;
+export declare const RangeInputWrap: import("react").ForwardRefExoticComponent<{
+    isMonth?: boolean | undefined;
+    hasTime?: boolean | undefined;
+    hasPrefix?: boolean | undefined;
+} & import("react").HTMLAttributes<HTMLElement> & {
+    theme?: Theme | undefined;
+} & import("react").RefAttributes<HTMLElement>>;
 export declare const RangeSelect: import("@emotion/styled-base").StyledComponent<import("../../Select/Select").SelectProps & Omit<import("react").HTMLAttributes<HTMLDivElement>, keyof import("../../Select/Select").SelectProps>, Pick<import("../../Select/Select").SelectProps & Omit<import("react").HTMLAttributes<HTMLDivElement>, keyof import("../../Select/Select").SelectProps>, "className" | "defaultChecked" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "css" | keyof import("../../Select/Select").SelectProps>, object>;
 export declare const RangeDateSeparator: import("react").ForwardRefExoticComponent<import("react").HTMLAttributes<HTMLElement> & {
     theme?: Theme | undefined;