@oceanbase/ui 1.0.0-alpha.17 → 1.0.0-alpha.18

package/es/DateRanger/EditableDateTimeInput.d.ts

@@ -13,6 +13,11 @@ export interface EditableDateTimeInputProps {
     prefixCls?: string;
     disabled?: boolean;
     onClick?: () => void;
+    open?: boolean;
 }
-declare const EditableDateTimeInput: React.FC<EditableDateTimeInputProps>;
+export interface EditableDateTimeInputRef {
+    hasPastedValue: boolean;
+    confirmPastedValue: () => void;
+}
+declare const EditableDateTimeInput: React.ForwardRefExoticComponent<EditableDateTimeInputProps & React.RefAttributes<EditableDateTimeInputRef>>;
 export default EditableDateTimeInput;

package/es/DateRanger/EditableDateTimeInput.js

@@ -3,12 +3,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useMemo } from 'react';
+import React, { useMemo, useImperativeHandle, forwardRef } from 'react';
 import classNames from 'classnames';
 import { Input } from '@oceanbase/design';
 import { useSegmentedInput } from "./hooks/useSegmentedInput";
 import { jsx as _jsx } from "react/jsx-runtime";
-var EditableDateTimeInput = function EditableDateTimeInput(props) {
+var EditableDateTimeInput = /*#__PURE__*/forwardRef(function (props, ref) {
   var value = props.value,
     onChange = props.onChange,
     formatProp = props.format,
@@ -25,7 +25,9 @@ var EditableDateTimeInput = function EditableDateTimeInput(props) {
     prefixCls = _props$prefixCls === void 0 ? 'ant-picker' : _props$prefixCls,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
-    onClick = props.onClick;
+    onClick = props.onClick,
+    _props$open = props.open,
+    open = _props$open === void 0 ? false : _props$open;
 
   // 根据配置生成格式，优先使用外部传入的 format
   var format = useMemo(function () {
@@ -70,16 +72,26 @@ var EditableDateTimeInput = function EditableDateTimeInput(props) {
       baseFormat: baseFormat,
       isMoment: isMoment,
       isCn: isCn,
-      onClick: onClick
+      onClick: onClick,
+      open: open
     }),
     inputRef = _useSegmentedInput.inputRef,
     isEditing = _useSegmentedInput.isEditing,
     displayValue = _useSegmentedInput.displayValue,
     handleClick = _useSegmentedInput.handleClick,
     handleDoubleClick = _useSegmentedInput.handleDoubleClick,
-    handleKeyDown = _useSegmentedInput.handleKeyDown,
     handleBlur = _useSegmentedInput.handleBlur,
-    handlePaste = _useSegmentedInput.handlePaste;
+    handleKeyDown = _useSegmentedInput.handleKeyDown,
+    hasPastedValue = _useSegmentedInput.hasPastedValue,
+    confirmPastedValue = _useSegmentedInput.confirmPastedValue;
+
+  // 暴露方法给父组件
+  useImperativeHandle(ref, function () {
+    return {
+      hasPastedValue: hasPastedValue,
+      confirmPastedValue: confirmPastedValue
+    };
+  });
   return /*#__PURE__*/_jsx("div", {
     className: classNames("".concat(prefixCls, "-range-editable"), className, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-range-editable-focused"), isEditing), "".concat(prefixCls, "-range-editable-disabled"), disabled)),
     children: /*#__PURE__*/_jsx(Input, {
@@ -91,12 +103,10 @@ var EditableDateTimeInput = function EditableDateTimeInput(props) {
       variant: "borderless",
       onClick: handleClick,
       onDoubleClick: handleDoubleClick,
-      onKeyDown: handleKeyDown
-      // onFocus={handleFocus}
-      ,
       onBlur: handleBlur,
-      onPaste: handlePaste
+      onKeyDown: handleKeyDown
     })
   });
-};
+});
+EditableDateTimeInput.displayName = 'EditableDateTimeInput';
 export default EditableDateTimeInput;

package/es/DateRanger/Ranger.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import type { TooltipProps } from '@oceanbase/design';
 import type { RangePickerProps } from '@oceanbase/design/es/date-picker';
 import type { Dayjs } from 'dayjs';
+import 'dayjs/locale/zh-cn';
 import type { Moment } from 'moment';
 import type { RangeOption } from './typing';
 import type { Rule } from './PickerPanel';
@@ -12,7 +13,7 @@ export type RangeDateValue = {
     name: RangeName;
     range: RangeValue;
 };
-export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker' | 'value' | 'defaultValue'> {
+export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker' | 'value' | 'defaultValue' | 'variant'> {
     selects?: RangeOption[];
     defaultQuickValue?: string;
     hasRewind?: boolean;
@@ -37,6 +38,8 @@ export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker
     value?: RangeValue;
     defaultValue?: RangeValue;
     size?: 'small' | 'large' | 'middle';
+    /** 边框变体，默认实线，可配置为 dashed 虚线 */
+    variant?: 'dashed';
     tooltipProps?: TooltipProps;
     autoAdjustOverflow?: boolean;
     overlayClassName?: string;

package/es/DateRanger/Ranger.js

@@ -1,5 +1,5 @@
 "use client";
-var _excluded = ["selects", "value", "defaultValue", "defaultQuickValue", "hasRewind", "hasPlay", "hasSync", "hasForward", "hasZoomOut", "hasTagInPicker", "pastOnly", "simpleMode", "hideYear", "hideSecond", "autoCalcRange", "history", "onChange", "disabledDate", "locale", "size", "stickRangeName", "tooltipProps", "isMoment", "rules", "tip", "autoAdjustOverflow", "overlayClassName", "overlayStyle", "getPopupContainer"];
+var _excluded = ["selects", "value", "defaultValue", "defaultQuickValue", "hasRewind", "hasPlay", "hasSync", "hasForward", "hasZoomOut", "hasTagInPicker", "pastOnly", "simpleMode", "hideYear", "hideSecond", "autoCalcRange", "history", "onChange", "disabledDate", "locale", "size", "stickRangeName", "variant", "tooltipProps", "isMoment", "rules", "tip", "autoAdjustOverflow", "overlayClassName", "overlayStyle", "getPopupContainer"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -22,6 +22,7 @@ import React, { useContext, useEffect, useRef, useState, useImperativeHandle, us
 import { Button, ConfigProvider, Divider, Dropdown, Flex, Menu, Radio, Space, Tooltip, message, theme } from '@oceanbase/design';
 import { LeftOutlined, RightOutlined, ZoomOutOutlined, SyncOutlined, ArrowLeftOutlined, CopyOutlined, DeleteOutlined } from '@oceanbase/icons';
 import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
 import { findIndex, isEqual as _isEqual, isNil, noop, omit } from 'lodash';
 import moment from 'moment';
 import classNames from 'classnames';
@@ -80,6 +81,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     size = props.size,
     _props$stickRangeName = props.stickRangeName,
     stickRangeName = _props$stickRangeName === void 0 ? false : _props$stickRangeName,
+    variant = props.variant,
     tooltipProps = props.tooltipProps,
     isMomentProps = props.isMoment,
     rules = props.rules,
@@ -133,6 +135,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var rangeRef = useRef(null);
   var popRef = useRef(null);
   var labelRef = useRef(null);
+  var editableInputRef = useRef(null);
 
   // 没有 selects 时，回退到普通 RangePicker, 当前时间选项为自定义时，应该显示 RangePicker
   var _useState13 = useState(rangeName !== CUSTOMIZE),
@@ -317,7 +320,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return diffMs > differenceMs;
   }) : selects[rangeNameIndex + 1];
   return wrapSSR( /*#__PURE__*/_jsxs(Space, {
-    className: classNames(rest.className, _defineProperty(_defineProperty(_defineProperty({}, prefix, true), "".concat(prefix, "-show-range"), true), "".concat(prefix, "-back-radio-focused"), backRadioFocused)),
+    className: classNames(rest.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, prefix, true), "".concat(prefix, "-show-range"), true), "".concat(prefix, "-dashed"), variant === 'dashed'), "".concat(prefix, "-back-radio-focused"), backRadioFocused)),
     style: rest.style,
     children: [/*#__PURE__*/_jsxs(Space, {
       size: 0,
@@ -452,12 +455,22 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
                 rules: rules,
                 hideSecond: hideSecond,
                 onOk: function onOk(vList) {
-                  setIsPlay(false);
-                  handleNameChange(CUSTOMIZE);
-                  rangeChange(vList.map(function (v) {
-                    return isMoment ? moment(v) : dayjs(v);
-                  }));
-                  closeTooltip();
+                  var _editableInputRef$cur;
+                  // 如果有粘贴值，优先使用粘贴值
+                  if ((_editableInputRef$cur = editableInputRef.current) !== null && _editableInputRef$cur !== void 0 && _editableInputRef$cur.hasPastedValue) {
+                    editableInputRef.current.confirmPastedValue();
+                    setIsPlay(false);
+                    handleNameChange(CUSTOMIZE);
+                    closeTooltip();
+                  } else {
+                    // 否则使用面板中的值
+                    setIsPlay(false);
+                    handleNameChange(CUSTOMIZE);
+                    rangeChange(vList.map(function (v) {
+                      return isMoment ? moment(v) : dayjs(v);
+                    }));
+                    closeTooltip();
+                  }
                 },
                 onCancel: function onCancel() {
                   closeTooltip();
@@ -521,6 +534,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
           ref: rangeRef,
           className: "".concat(prefix, "-editable-wrapper"),
           children: /*#__PURE__*/_jsx(EditableDateTimeInput, _objectSpread({
+            ref: editableInputRef,
             prefixCls: prefixCls,
             value: innerValue,
             onChange: function onChange(newValue) {
@@ -530,11 +544,13 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
             hideSecond: hideSecond,
             isMoment: isMoment,
             isCn: isCn,
+            format: (rest === null || rest === void 0 ? void 0 : rest.format) || YEAR_DATE_TIME_SECOND_FORMAT_CN,
+            open: open,
             onClick: function onClick() {
               setOpen(true);
               setTooltipOpen(true);
             }
-          }, omit(rest, 'value', 'onChange', 'style', 'className', 'onClick', 'format', 'disabled')))
+          }, omit(rest, 'value', 'onChange', 'style', 'className', 'onClick', 'disabled', 'format')))
         })]
       }), /*#__PURE__*/_jsxs(Radio.Group, {
         value: isPlay ? 'play' : '',

package/es/DateRanger/hooks/index.d.ts

@@ -1,2 +1,2 @@
 export { useSegmentedInput } from './useSegmentedInput';
-export type { Segment, SegmentType, RangeType, UseSegmentedInputOptions, UseSegmentedInputReturn, } from './useSegmentedInput';
+export type { UseSegmentedInputOptions, UseSegmentedInputReturn } from './useSegmentedInput';

package/es/DateRanger/hooks/useSegmentedInput.d.ts

@@ -1,19 +1,9 @@
 /// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import type { Moment } from 'moment';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-cn';
 import type { InputRef } from '@oceanbase/design';
-export type SegmentType = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
-export type RangeType = 'start' | 'end';
-export interface Segment {
-    type: SegmentType;
-    range: RangeType;
-    start: number;
-    end: number;
-    value: string;
-    min: number;
-    max: number;
-    padLength: number;
-}
 export interface UseSegmentedInputOptions {
     value?: [Dayjs | Moment | null, Dayjs | Moment | null];
     onChange?: (value: [Dayjs | Moment, Dayjs | Moment]) => void;
@@ -22,18 +12,20 @@ export interface UseSegmentedInputOptions {
     isMoment?: boolean;
     isCn?: boolean;
     onClick?: () => void;
+    locale?: string;
+    open?: boolean;
 }
 export interface UseSegmentedInputReturn {
     inputRef: React.RefObject<InputRef>;
     isEditing: boolean;
     displayValue: string;
-    currentSegment: Segment | null;
-    allSegments: Segment[];
     handleClick: (e: React.MouseEvent<HTMLInputElement>) => void;
     handleDoubleClick: (e: React.MouseEvent<HTMLInputElement>) => void;
-    handleKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => void;
     handleBlur: (e: React.FocusEvent<HTMLInputElement>) => void;
-    handlePaste: (e: React.ClipboardEvent<HTMLInputElement>) => void;
+    handleKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+    confirmPastedValue: () => void;
+    hasPastedValue: boolean;
+    getPastedValue: () => [Dayjs | Moment, Dayjs | Moment] | null;
 }
 export declare const useSegmentedInput: (options: UseSegmentedInputOptions) => UseSegmentedInputReturn;
 export default useSegmentedInput;