@oceanbase/ui 0.4.6 → 0.4.7

package/es/Action/Group.d.ts

@@ -1,7 +1,8 @@
-import type { ButtonSize } from '@oceanbase/design/es/button';
 import React from 'react';
+import type { ButtonSize } from '@oceanbase/design/es/button';
 import type { BaseProps } from './Item';
 export interface GroupProps {
+    prefixCls?: string;
     size?: number;
     dropDownPlacement?: 'topLeft' | 'topCenter' | 'topRight' | 'bottomLeft' | 'bottomCenter' | 'bottomRight';
     children: React.ReactElement<BaseProps> | React.ReactElement<BaseProps>[];
@@ -12,5 +13,5 @@ export interface GroupProps {
     moreType?: 'button' | 'link';
     buttonSize?: ButtonSize;
 }
-declare const _default: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+declare const _default: ({ prefixCls: customizePrefixCls, size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: GroupProps) => React.JSX.Element;
 export default _default;

package/es/Action/Group.js

@@ -4,10 +4,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { Button, Dropdown, Menu, Space, Tooltip, Typography } from '@oceanbase/design';
+import React, { useContext } from 'react';
+import { Button, Dropdown, Menu, Space, Tooltip, Typography, ConfigProvider } from '@oceanbase/design';
 import { EllipsisOutlined, LoadingOutlined } from '@oceanbase/icons';
 import { isBoolean, max, omit } from 'lodash';
-import React from 'react';
+import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var getOrder = function getOrder(_ref) {
@@ -28,7 +29,8 @@ var getOrder = function getOrder(_ref) {
   return order;
 };
 export default (function (_ref2) {
-  var _ref2$size = _ref2.size,
+  var customizePrefixCls = _ref2.prefixCls,
+    _ref2$size = _ref2.size,
     size = _ref2$size === void 0 ? 3 : _ref2$size,
     children = _ref2.children,
     dropDownPlacement = _ref2.dropDownPlacement,
@@ -38,6 +40,11 @@ export default (function (_ref2) {
     moreText = _ref2.moreText,
     moreType = _ref2.moreType,
     buttonSize = _ref2.buttonSize;
+  var _useContext = useContext(ConfigProvider.ConfigContext),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('action', customizePrefixCls);
+  var _useStyle = useStyle(prefixCls),
+    wrapSSR = _useStyle.wrapSSR;
   var visibleActions = Array.isArray(children) ? children.filter(function (c) {
     if (isBoolean(c.props.visible) && shouldVisible) return c.props.visible && shouldVisible(c.key);
     if (isBoolean(c.props.visible)) return c.props.visible;else if (shouldVisible) return shouldVisible(c.key);
@@ -79,11 +86,12 @@ export default (function (_ref2) {
   if (ellipsisType === 'button') {
     moreDom = /*#__PURE__*/_jsx(Button, {
       size: buttonSize,
-      children: moreText !== null && moreText !== void 0 ? moreText : /*#__PURE__*/_jsx(EllipsisOutlined, {
+      icon: moreText ? undefined : /*#__PURE__*/_jsx(EllipsisOutlined, {
         style: {
           cursor: 'pointer'
         }
-      })
+      }),
+      children: moreText
     });
   } else {
     moreDom = /*#__PURE__*/_jsx(Typography.Link, {
@@ -94,8 +102,8 @@ export default (function (_ref2) {
       })
     });
   }
-  return /*#__PURE__*/_jsxs(Space, {
-    size: 8,
+  return wrapSSR( /*#__PURE__*/_jsxs(Space, {
+    size: ellipsisType === 'button' ? 8 : 16,
     children: [mainActions.map(function (action) {
       return /*#__PURE__*/React.cloneElement(action, _objectSpread(_objectSpread({
         // size should be covered by action props
@@ -108,6 +116,7 @@ export default (function (_ref2) {
     }), ellipsisActions.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
       placement: dropDownPlacement,
       overlay: /*#__PURE__*/_jsx(Menu, {
+        className: "".concat(prefixCls, "-more-menu"),
         children: ellipsisActions.map(function (action, index) {
           var _ref3;
           var actionKey = action.key;
@@ -124,15 +133,12 @@ export default (function (_ref2) {
                 var _action$props$onClick, _action$props;
                 var domEvent = _ref4.domEvent;
                 (_action$props$onClick = (_action$props = action.props).onClick) === null || _action$props$onClick === void 0 || _action$props$onClick.call(_action$props, domEvent);
-              },
-              style: {
-                minWidth: 120
               }
             }, omit(action.props, 'disabled')), {}, {
               disabled: actionDisabled,
               children: /*#__PURE__*/_jsxs(Tooltip, {
                 title: action.props.tooltip,
-                children: [action.props.loading && /*#__PURE__*/_jsx(LoadingOutlined, {}), " ", action.props.children]
+                children: [action.props.loading && /*#__PURE__*/_jsx(LoadingOutlined, {}), ' ', action.props.children || action]
               })
             }), (_ref3 = actionKey) !== null && _ref3 !== void 0 ? _ref3 : index.toString())
           );
@@ -140,5 +146,5 @@ export default (function (_ref2) {
       }),
       children: moreDom
     })]
-  });
+  }));
 });

package/es/Action/Item.d.ts

@@ -6,7 +6,7 @@ export interface BaseProps extends ButtonProps {
     /** 固定展示、不会被折叠 */
     fixed?: boolean;
     onClick?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void> | void;
-    children?: React.ReactElement | string;
+    children?: React.ReactElement | React.ReactNode | string;
     enableLoading?: boolean;
     tooltip?: string;
     loading?: boolean;

package/es/Action/index.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="react" />
 import { ActionButton, ActionLink } from './Item';
 export type { GroupProps as ActionGroupProps } from './Group';
 declare const _default: {
-    Group: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: import("./Group").GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+    Group: ({ prefixCls: customizePrefixCls, size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: import("./Group").GroupProps) => import("react").JSX.Element;
     Button: typeof ActionButton;
     Link: typeof ActionLink;
 };

package/es/Action/style/index.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import type { GenerateStyle } from '@oceanbase/design/es/theme';
+import type { OBToken } from '../../_util/genComponentStyleHook';
+export declare const genActionStyle: GenerateStyle<OBToken>;
+declare const _default: (prefixCls: string) => {
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    hashId: string;
+};
+export default _default;

package/es/Action/style/index.js

@@ -0,0 +1,43 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+export var genActionStyle = function genActionStyle(token) {
+  var componentCls = token.componentCls,
+    antCls = token.antCls;
+  var paddingVertical = (token.controlHeight - token.fontSize * token.lineHeight) / 2;
+  var paddingHorizontal = token.paddingSM;
+  var padding = "".concat(paddingVertical, "px ").concat(paddingHorizontal, "px");
+  var margin = "-".concat(paddingVertical, "px -").concat(paddingHorizontal, "px");
+  return _defineProperty({}, "".concat(componentCls, "-more-menu"), _defineProperty({
+    background: 'red'
+  }, "".concat(antCls, "-dropdown-menu-item"), _defineProperty(_defineProperty({}, "".concat(antCls, "-typography"), _defineProperty({
+    display: 'block',
+    margin: margin,
+    padding: "".concat(padding, " !important")
+  }, "&:not(".concat(antCls, "-typography-disabled)"), {
+    color: token.colorText
+  })), "".concat(antCls, "-btn"), _defineProperty(_defineProperty({
+    padding: padding,
+    margin: margin,
+    border: 'none',
+    display: 'block',
+    width: "calc(100% + ".concat(paddingHorizontal * 2, "px)"),
+    textAlign: 'left',
+    height: 'inherit',
+    background: 'transparent'
+  }, "&:not(:disabled):not(".concat(antCls, "-btn-disabled)"), _defineProperty({
+    color: token.colorText
+  }, "&:hover", {
+    background: 'transparent'
+  })), "".concat(antCls, "-wave"), {
+    display: 'none'
+  }))));
+};
+export default (function (prefixCls) {
+  var useStyle = genComponentStyleHook('Action', function (token) {
+    return [genActionStyle(token)];
+  });
+  return useStyle(prefixCls);
+});

package/es/DateRanger/PickerPanel.d.ts

@@ -1,18 +1,16 @@
-import type { Dayjs } from 'dayjs';
-import type { Moment } from 'moment';
-type RangeValue = [Moment, Moment] | [Dayjs, Dayjs];
+import type { RangeValue } from './Ranger';
 type ValidateTrigger = 'submit' | 'valueChange';
 type MaybeArray<T> = T | T[];
-type ErrorType = 'endDate' | 'startDate' | 'endTime' | 'startTime';
+type ErrorType = 'endDate' | 'startDate' | 'endTime' | 'startTime' | 'all';
 export type Rule = {
     message: string;
-    validate: (value: string) => MaybeArray<ErrorType>;
+    validator: (value: [string, string] | []) => MaybeArray<ErrorType> | null | undefined;
 };
 export interface PickerPanelProps {
     value?: RangeValue;
     defaultValue?: RangeValue;
     tip?: string;
-    require?: boolean;
+    required?: boolean;
     rules?: Rule[];
     validateTrigger?: ValidateTrigger;
     onCancel: () => void;

package/es/DateRanger/PickerPanel.js

@@ -20,21 +20,21 @@ import { noop } from 'lodash';
 import moment from 'moment';
 import dayjs from 'dayjs';
 import { getPrefix } from "../_util";
+import { DATE_TIME_MONTH_FORMAT, DATE_TIME_MONTH_FORMAT_CN } from "./constant";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var ALL_ERROR_TYPE_LIST = ['endDate', 'startDate', 'endTime', 'startTime'];
 var prefix = getPrefix('ranger-picker-panel');
 var prefixCls = 'ant-picker';
-var DATE_FORMAT = 'YYYY-MM-DD';
 var TIME_FORMAT = 'HH:mm:ss';
 var InternalPickerPanel = function InternalPickerPanel(props) {
-  var _props$defaultValue = props.defaultValue,
-    defaultValue = _props$defaultValue === void 0 ? [] : _props$defaultValue,
+  var defaultValue = props.defaultValue,
     isMoment = props.isMoment,
     locale = props.locale,
     tip = props.tip,
     rules = props.rules,
-    _props$require = props.require,
-    require = _props$require === void 0 ? true : _props$require,
+    _props$required = props.required,
+    required = _props$required === void 0 ? true : _props$required,
     _props$onOk = props.onOk,
     onOk = _props$onOk === void 0 ? noop : _props$onOk,
     _props$onCancel = props.onCancel,
@@ -61,6 +61,10 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     activeIndex = _React$useState6[0],
     setActiveIndex = _React$useState6[1];
+  var isEn = (locale === null || locale === void 0 ? void 0 : locale.antLocale) === 'en';
+
+  //
+  var DATE_FORMAT = isEn ? DATE_TIME_MONTH_FORMAT : DATE_TIME_MONTH_FORMAT_CN;
   var getDateInstance = useCallback(function (v, format, strict) {
     return isMoment ? moment(v, format, strict) : dayjs(v, format, strict);
   }, [isMoment]);
@@ -247,6 +251,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               style: {
                 marginBottom: 8
               },
+              rules: [{
+                required: true
+              }],
               children: /*#__PURE__*/_jsx(Input, {
                 size: "middle",
                 onBlur: function onBlur(e) {
@@ -283,6 +290,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               },
               validateStatus: errorTypeMap['startTime'],
               initialValue: defaultS || defaultTime,
+              rules: [{
+                required: true
+              }],
               children: /*#__PURE__*/_jsx(TimePicker, {
                 allowClear: false,
                 suffixIcon: null,
@@ -316,6 +326,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
                 marginBottom: 0
               },
               validateStatus: errorTypeMap['endDate'],
+              rules: [{
+                required: true
+              }],
               children: /*#__PURE__*/_jsx(Input, {
                 onBlur: function onBlur(e) {
                   var v = validateInputDate(e);
@@ -351,6 +364,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               },
               validateStatus: errorTypeMap['endTime'],
               initialValue: defaultE || defaultTime,
+              rules: [{
+                required: true
+              }],
               children: /*#__PURE__*/_jsx(TimePicker, {
                 allowClear: false,
                 suffixIcon: null,
@@ -448,30 +464,27 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               endTime = values.endTime;
             var start = "".concat(startDate, " ").concat(startTime.format(TIME_FORMAT));
             var end = "".concat(endDate, " ").concat(endTime.format(TIME_FORMAT));
-            onOk([start, end]);
-
-            // let errorList = [];
-            // let message = '';
-            // rules?.some(item => {
-            //   if (typeof item?.validator === 'function') {
-            //     const errorType = item.validator(start, end);
-            //     if (errorType) {
-            //       errorList = toArray(errorType);
-            //       message = item.message;
-            //       return true;
-            //     }
-            //   }
-            //   return false;
-            // });
-
-            // if (errorList.length > 0) {
-            //   setErrorTypeList(errorList);
-            //   setErrorMessage(message);
-            // } else {
-            //   setErrorMessage('');
-            //   setErrorTypeList([]);
-            //   onOk([start, end]);
-            // }
+            var errorList = [];
+            var message = '';
+            rules === null || rules === void 0 || rules.some(function (item) {
+              if (typeof (item === null || item === void 0 ? void 0 : item.validator) === 'function') {
+                var errorType = item.validator([start, end]);
+                if (errorType) {
+                  errorList = Array.isArray(errorType) ? errorType : [errorType];
+                  message = item.message;
+                  return true;
+                }
+              }
+              return false;
+            });
+            if (errorList.length > 0) {
+              setErrorTypeList(errorList.includes('all') ? ALL_ERROR_TYPE_LIST : errorList);
+              setErrorMessage(message);
+            } else {
+              setErrorMessage('');
+              setErrorTypeList([]);
+              onOk([start, end]);
+            }
           });
         },
         children: locale.confirm

package/es/DateRanger/Ranger.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { TooltipProps } from '@oceanbase/design';
 import type { RangePickerProps } from '@oceanbase/design/es/date-picker';
 import type { Dayjs } from 'dayjs';
@@ -6,7 +7,7 @@ import type { RangeOption } from './typing';
 import type { Rule } from './PickerPanel';
 import './index.less';
 export type RangeName = 'customize' | string;
-export type RangeValue = [Moment, Moment] | [Dayjs, Dayjs];
+export type RangeValue = [Moment, Moment] | [Dayjs, Dayjs] | [] | null;
 export type RangeDateValue = {
     name: RangeName;
     range: RangeValue;
@@ -34,7 +35,7 @@ export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker
     defaultValue?: RangeValue;
     size?: 'small' | 'large' | 'middle';
     tooltipProps?: TooltipProps;
-    locale: any;
+    locale?: any;
 }
-declare const _default: any;
+declare const _default: React.ForwardRefExoticComponent<DateRangerProps & React.RefAttributes<unknown>>;
 export default _default;

package/es/DateRanger/Ranger.js

@@ -277,7 +277,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
                   margin: '0px 4px 0px 0px'
                 }
               }), /*#__PURE__*/_jsx(InternalPickerPanel, {
-                defaultValue: innerValue
+                defaultValue: innerValue || []
                 // @ts-ignore
                 ,
                 locale: locale,
@@ -355,10 +355,10 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
           onClick: function onClick() {
             setOpen(true);
           },
-          children: /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread({
+          children: /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({
             className: classNames("".concat(prefix, "-picker")),
             style: {
-              pointerEvents: 'none',
+              // pointerEvents: 'none',
               border: 0
             },
             format: function format(v) {
@@ -376,7 +376,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
             size: size,
             suffixIcon: null
             // 透传 props 到 antd Ranger
-          }, omit(rest, 'value', 'onChange')))
+          }, omit(rest, 'value', 'onChange')), {}, {
+            open: false
+          }))
         })]
       }), /*#__PURE__*/_jsxs(Radio.Group, {
         value: isPlay ? 'play' : '',

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

@@ -1,11 +1,13 @@
 import type { RangeOption } from '../typing';
 export declare const CUSTOMIZE = "customize";
-export declare const YEAR_DATE_TIME_SECOND_FORMAT = "YYYY/MM/DD HH:mm:ss";
-export declare const YEAR_DATE_TIME_FORMAT = "YYYY/MM/DD HH:mm";
+export declare const YEAR_DATE_TIME_SECOND_FORMAT = "MM/DD/YYYY HH:mm:ss";
+export declare const YEAR_DATE_TIME_FORMAT = "MM/DD/YYYY HH:mm";
 export declare const DATE_TIME_SECOND_FORMAT = "MM/DD HH:mm:ss";
 export declare const DATE_TIME_FORMAT = "MM/DD HH:mm";
+export declare const DATE_TIME_MONTH_FORMAT = "MM/DD/YYYY";
 export declare const YEAR_DATE_TIME_SECOND_FORMAT_CN = "YYYY-MM-DD HH:mm:ss";
 export declare const YEAR_DATE_TIME_FORMAT_CN = "YYYY-MM-DD HH:mm";
+export declare const DATE_TIME_MONTH_FORMAT_CN = "YYYY-MM-DD";
 export declare const DATE_TIME_SECOND_FORMAT_CN = "MM-DD HH:mm:ss";
 export declare const DATE_TIME_FORMAT_CN = "MM-DD HH:mm";
 export declare const NEAR_1_MINUTES: RangeOption;
@@ -17,8 +19,10 @@ export declare const NEAR_1_HOURS: RangeOption;
 export declare const NEAR_2_HOURS: RangeOption;
 export declare const NEAR_3_HOURS: RangeOption;
 export declare const NEAR_6_HOURS: RangeOption;
+export declare const NEAR_12_HOURS: RangeOption;
 export declare const TODAY: RangeOption;
 export declare const YESTERDAY: RangeOption;
+export declare const LAST_1_DAY: RangeOption;
 export declare const LAST_3_DAYS: RangeOption;
 export declare const THIS_WEEK: RangeOption;
 export declare const LAST_WEEK: RangeOption;

package/es/DateRanger/constant/index.js

@@ -9,17 +9,19 @@ var DAY_UNIT = 'day';
 var WEEK_UNIT = 'week';
 var MONTH_UNIT = 'month';
 var YEAR_UNIT = 'year';
-export var YEAR_DATE_TIME_SECOND_FORMAT = 'YYYY/MM/DD HH:mm:ss';
-export var YEAR_DATE_TIME_FORMAT = 'YYYY/MM/DD HH:mm';
+export var YEAR_DATE_TIME_SECOND_FORMAT = 'MM/DD/YYYY HH:mm:ss';
+export var YEAR_DATE_TIME_FORMAT = 'MM/DD/YYYY HH:mm';
 export var DATE_TIME_SECOND_FORMAT = 'MM/DD HH:mm:ss';
 export var DATE_TIME_FORMAT = 'MM/DD HH:mm';
+export var DATE_TIME_MONTH_FORMAT = 'MM/DD/YYYY';
 export var YEAR_DATE_TIME_SECOND_FORMAT_CN = 'YYYY-MM-DD HH:mm:ss';
 export var YEAR_DATE_TIME_FORMAT_CN = 'YYYY-MM-DD HH:mm';
+export var DATE_TIME_MONTH_FORMAT_CN = 'YYYY-MM-DD';
 export var DATE_TIME_SECOND_FORMAT_CN = 'MM-DD HH:mm:ss';
 export var DATE_TIME_FORMAT_CN = 'MM-DD HH:mm';
 export var NEAR_1_MINUTES = {
   label: '近 1 分钟',
-  enLabel: 'Nearly 1 minute',
+  enLabel: 'Last 1 Minute',
   rangeLabel: '1m',
   name: 'NEAR_1_MINUTES',
   range: function range() {
@@ -29,7 +31,7 @@ export var NEAR_1_MINUTES = {
 };
 export var NEAR_5_MINUTES = {
   label: '近 5 分钟',
-  enLabel: 'Nearly 5 minutes',
+  enLabel: 'Last 5 Minutes',
   rangeLabel: '5m',
   name: 'NEAR_5_MINUTES',
   range: function range() {
@@ -39,7 +41,7 @@ export var NEAR_5_MINUTES = {
 };
 export var NEAR_10_MINUTES = {
   label: '近 10 分钟',
-  enLabel: 'Nearly 10 minutes',
+  enLabel: 'Last 10 Minutes',
   rangeLabel: '10m',
   name: 'NEAR_10_MINUTES',
   range: function range() {
@@ -49,7 +51,7 @@ export var NEAR_10_MINUTES = {
 };
 export var NEAR_20_MINUTES = {
   label: '近 20 分钟',
-  enLabel: 'Nearly 20 minutes',
+  enLabel: 'Last 20 Minutes',
   rangeLabel: '20m',
   name: 'NEAR_20_MINUTES',
   range: function range() {
@@ -59,7 +61,7 @@ export var NEAR_20_MINUTES = {
 };
 export var NEAR_30_MINUTES = {
   label: '近 30 分钟',
-  enLabel: 'Nearly 30 minutes',
+  enLabel: 'Last 30 Minutes',
   rangeLabel: '30m',
   name: 'NEAR_30_MINUTES',
   range: function range() {
@@ -69,7 +71,7 @@ export var NEAR_30_MINUTES = {
 };
 export var NEAR_1_HOURS = {
   label: '近 1 小时',
-  enLabel: 'Nearly 1 hour',
+  enLabel: 'Last 1 Hour',
   rangeLabel: '1h',
   name: 'NEAR_1_HOURS',
   range: function range() {
@@ -79,7 +81,7 @@ export var NEAR_1_HOURS = {
 };
 export var NEAR_2_HOURS = {
   label: '近 2 小时',
-  enLabel: 'Nearly 2 hours',
+  enLabel: 'Last 2 Hours',
   rangeLabel: '2h',
   name: 'NEAR_2_HOURS',
   range: function range() {
@@ -89,7 +91,7 @@ export var NEAR_2_HOURS = {
 };
 export var NEAR_3_HOURS = {
   label: '近 3 小时',
-  enLabel: 'Nearly 3 hours',
+  enLabel: 'Last 3 Hours',
   rangeLabel: '3h',
   name: 'NEAR_3_HOURS',
   range: function range() {
@@ -99,7 +101,7 @@ export var NEAR_3_HOURS = {
 };
 export var NEAR_6_HOURS = {
   label: '近 6 小时',
-  enLabel: 'Nearly 6 hours',
+  enLabel: 'Last 6 Hours',
   rangeLabel: '6h',
   name: 'NEAR_6_HOURS',
   range: function range() {
@@ -107,6 +109,16 @@ export var NEAR_6_HOURS = {
     return [current.clone().subtract(6, 'hour'), current.clone()];
   }
 };
+export var NEAR_12_HOURS = {
+  label: '近 12 小时',
+  enLabel: 'Last 12 Hours',
+  rangeLabel: '12h',
+  name: 'NEAR_12_HOURS',
+  range: function range() {
+    var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : moment();
+    return [current.clone().subtract(12, 'hour'), current.clone()];
+  }
+};
 export var TODAY = {
   label: '今天',
   enLabel: 'Today',
@@ -127,9 +139,19 @@ export var YESTERDAY = {
     return [current.clone().startOf(DAY_UNIT).add(-1, DAY_UNIT), current.clone().endOf(DAY_UNIT).add(-1, DAY_UNIT)];
   }
 };
+export var LAST_1_DAY = {
+  label: '近 1 天',
+  enLabel: 'Last 1 Day',
+  rangeLabel: '1d',
+  name: 'LAST_1_DAY',
+  range: function range() {
+    var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : moment();
+    return [current.clone().subtract(1, 'days'), current.clone()];
+  }
+};
 export var LAST_3_DAYS = {
   label: '近 3 天',
-  enLabel: 'Nearly 3 days',
+  enLabel: 'Last 3 Days',
   rangeLabel: '3d',
   name: 'LAST_3_DAYS',
   range: function range() {
@@ -207,4 +229,4 @@ export var NEXT_YEAR = {
     return [current.clone().startOf(YEAR_UNIT).add(1, YEAR_UNIT), current.clone().endOf(YEAR_UNIT).add(1, YEAR_UNIT)];
   }
 };
-export var NEAR_TIME_LIST = [NEAR_1_MINUTES, NEAR_5_MINUTES, NEAR_10_MINUTES, NEAR_20_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_2_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, LAST_3_DAYS, TODAY, YESTERDAY, THIS_WEEK, LAST_WEEK, THIS_MONTH, LAST_MONTH, THIS_YEAR, LAST_YEAR, NEXT_YEAR];
+export var NEAR_TIME_LIST = [NEAR_1_MINUTES, NEAR_5_MINUTES, NEAR_10_MINUTES, NEAR_20_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_2_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, NEAR_12_HOURS, LAST_1_DAY, LAST_3_DAYS, TODAY, YESTERDAY, THIS_WEEK, LAST_WEEK, THIS_MONTH, LAST_MONTH, THIS_YEAR, LAST_YEAR, NEXT_YEAR];

package/es/DateRanger/index.d.ts

@@ -1,3 +1,26 @@
+/// <reference types="react" />
 export * from './Ranger';
-declare const DateRanger: any;
+declare const DateRanger: import("react").ForwardRefExoticComponent<import("./Ranger").DateRangerProps & import("react").RefAttributes<unknown>> & {
+    NEAR_1_MINUTES: import("./typing").RangeOption;
+    NEAR_5_MINUTES: import("./typing").RangeOption;
+    NEAR_10_MINUTES: import("./typing").RangeOption;
+    NEAR_20_MINUTES: import("./typing").RangeOption;
+    NEAR_30_MINUTES: import("./typing").RangeOption;
+    NEAR_1_HOURS: import("./typing").RangeOption;
+    NEAR_2_HOURS: import("./typing").RangeOption;
+    NEAR_3_HOURS: import("./typing").RangeOption;
+    NEAR_6_HOURS: import("./typing").RangeOption;
+    NEAR_12_HOURS: import("./typing").RangeOption;
+    TODAY: import("./typing").RangeOption;
+    LAST_1_DAY: import("./typing").RangeOption;
+    LAST_3_DAYS: import("./typing").RangeOption;
+    YESTERDAY: import("./typing").RangeOption;
+    THIS_WEEK: import("./typing").RangeOption;
+    LAST_WEEK: import("./typing").RangeOption;
+    THIS_MONTH: import("./typing").RangeOption;
+    LAST_MONTH: import("./typing").RangeOption;
+    THIS_YEAR: import("./typing").RangeOption;
+    LAST_YEAR: import("./typing").RangeOption;
+    NEXT_YEAR: import("./typing").RangeOption;
+};
 export default DateRanger;

package/es/DateRanger/index.js

@@ -1,26 +1,27 @@
-import { LAST_3_DAYS, LAST_MONTH, LAST_WEEK, LAST_YEAR, NEAR_10_MINUTES, NEAR_1_HOURS, NEAR_1_MINUTES, NEAR_20_MINUTES, NEAR_2_HOURS, NEAR_30_MINUTES, NEAR_3_HOURS, NEAR_5_MINUTES, NEAR_6_HOURS, NEXT_YEAR, THIS_MONTH, THIS_WEEK, THIS_YEAR, TODAY, YESTERDAY } from "./constant";
+import { LAST_1_DAY, LAST_3_DAYS, LAST_MONTH, LAST_WEEK, LAST_YEAR, NEAR_10_MINUTES, NEAR_12_HOURS, NEAR_1_HOURS, NEAR_1_MINUTES, NEAR_20_MINUTES, NEAR_2_HOURS, NEAR_30_MINUTES, NEAR_3_HOURS, NEAR_5_MINUTES, NEAR_6_HOURS, NEXT_YEAR, THIS_MONTH, THIS_WEEK, THIS_YEAR, TODAY, YESTERDAY } from "./constant";
 import InternalDateRanger from "./Ranger";
 export * from "./Ranger";
-var DateRanger = InternalDateRanger;
-
-// 内置 ranges
-DateRanger.NEAR_1_MINUTES = NEAR_1_MINUTES;
-DateRanger.NEAR_5_MINUTES = NEAR_5_MINUTES;
-DateRanger.NEAR_10_MINUTES = NEAR_10_MINUTES;
-DateRanger.NEAR_20_MINUTES = NEAR_20_MINUTES;
-DateRanger.NEAR_30_MINUTES = NEAR_30_MINUTES;
-DateRanger.NEAR_1_HOURS = NEAR_1_HOURS;
-DateRanger.NEAR_2_HOURS = NEAR_2_HOURS;
-DateRanger.NEAR_3_HOURS = NEAR_3_HOURS;
-DateRanger.NEAR_6_HOURS = NEAR_6_HOURS;
-DateRanger.TODAY = TODAY;
-DateRanger.LAST_3_DAYS = LAST_3_DAYS;
-DateRanger.YESTERDAY = YESTERDAY;
-DateRanger.THIS_WEEK = THIS_WEEK;
-DateRanger.LAST_WEEK = LAST_WEEK;
-DateRanger.THIS_MONTH = THIS_MONTH;
-DateRanger.LAST_MONTH = LAST_MONTH;
-DateRanger.THIS_YEAR = THIS_YEAR;
-DateRanger.LAST_YEAR = LAST_YEAR;
-DateRanger.NEXT_YEAR = NEXT_YEAR;
+var DateRanger = Object.assign(InternalDateRanger, {
+  NEAR_1_MINUTES: NEAR_1_MINUTES,
+  NEAR_5_MINUTES: NEAR_5_MINUTES,
+  NEAR_10_MINUTES: NEAR_10_MINUTES,
+  NEAR_20_MINUTES: NEAR_20_MINUTES,
+  NEAR_30_MINUTES: NEAR_30_MINUTES,
+  NEAR_1_HOURS: NEAR_1_HOURS,
+  NEAR_2_HOURS: NEAR_2_HOURS,
+  NEAR_3_HOURS: NEAR_3_HOURS,
+  NEAR_6_HOURS: NEAR_6_HOURS,
+  NEAR_12_HOURS: NEAR_12_HOURS,
+  TODAY: TODAY,
+  LAST_1_DAY: LAST_1_DAY,
+  LAST_3_DAYS: LAST_3_DAYS,
+  YESTERDAY: YESTERDAY,
+  THIS_WEEK: THIS_WEEK,
+  LAST_WEEK: LAST_WEEK,
+  THIS_MONTH: THIS_MONTH,
+  LAST_MONTH: LAST_MONTH,
+  THIS_YEAR: THIS_YEAR,
+  LAST_YEAR: LAST_YEAR,
+  NEXT_YEAR: NEXT_YEAR
+});
 export default DateRanger;