@zgfe/business-lib 1.2.51-ljy.2 → 1.2.51-ljy.21

package/es/datePicker/demo/index.js

@@ -41,6 +41,8 @@ export default (function () {
     key: "".concat(includeToday, "--2"),
     onChange: handleChange,
     includeToday: includeToday,
-    defaultValue: time
+    defaultValue: time,
+    selectRange: 365,
+    selectRangeUnit: "days"
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));
 });

package/es/datePickerOld/context.d.ts

@@ -4,12 +4,10 @@ export interface DatePickerContextProps {
     dateRange?: DatePickerTypes.Range;
     setDateRange?: (range: DatePickerTypes.Range) => void;
     includeToday?: boolean;
-    mode?: DatePickerTypes.Props['mode'];
     currentType?: DatePickerTypes.Unit;
     relative?: [number, number];
     setRelative?: (relative?: [number, number]) => void;
     setOpen?: Dispatch<SetStateAction<boolean>>;
-    setLabel?: Dispatch<SetStateAction<string>>;
 }
 declare const DatePickerContext: import("react").Context<DatePickerContextProps>;
 export default DatePickerContext;

package/es/datePickerOld/datePicker.d.ts

@@ -3,6 +3,5 @@ declare const BizDate: React.ForwardRefExoticComponent<{
     selectRange?: number | undefined;
     timeRangeOpen?: number | undefined;
     selectRangeUnit?: "quarter" | "months" | "weeks" | "days" | undefined;
-    onOpenChange?: ((data: boolean) => void) | undefined;
 } & React.RefAttributes<any>>;
 export default BizDate;

package/es/datePickerOld/datePicker.js

@@ -13,14 +13,13 @@ import { DatePickerTypes } from './types';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import DatePickerContext from './context';
 import BizGlobalDataContext from '../context';
-import { isTodayInRange } from './utils';
+import { DateSingleMap, isTodayInRange } from './utils';
 import _ from 'lodash';
 var RangePicker = DatePicker.RangePicker;
 var BizDateBeyondRange = false;
 var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var selectRange = _ref.selectRange,
     selectRangeUnit = _ref.selectRangeUnit,
-    _onOpenChange = _ref.onOpenChange,
     timeRangeOpen = _ref.timeRangeOpen;
   var _useContext = useContext(DatePickerContext),
     includeToday = _useContext.includeToday,
@@ -39,7 +38,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var min = moment(max).subtract(_timeRangeOpen, 'month');
     return current > max || current < min;
   }
-  var _useState = useState(),
+  var _useState = useState(currentType === DatePickerTypes.Unit.hour ? moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD') : [moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD'), moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.end, 'YYYY-MM-DD')]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
@@ -68,8 +67,20 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   useImperativeHandle(ref, function () {
     return {
       getDateValue: function getDateValue() {
+        var _value$, _value$2;
         if (setRelative) setRelative(undefined);
-        return value;
+        if (BizDateBeyondRange) {
+          message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 12).concat(selectRangeUnitText));
+          BizDateBeyondRange = false;
+          return false;
+        }
+        return Array.isArray(value) ? {
+          begin: (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format('YYYY-MM-DD'),
+          end: (_value$2 = value[1]) === null || _value$2 === void 0 ? void 0 : _value$2.format('YYYY-MM-DD')
+        } : {
+          begin: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD'),
+          end: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD')
+        };
       }
     };
   });
@@ -81,7 +92,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, currentType === DatePickerTypes.Unit.hour ? /*#__PURE__*/React.createElement(DatePicker, {
-    value: moment(dateRange.begin, 'YYYY-MM-DD'),
+    value: value,
     allowClear: false,
     inputReadOnly: true,
     popupClassName: "".concat(classPrefix, "-drop"),
@@ -99,14 +110,11 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     open: true,
     onChange: function onChange(date) {
       if (date) {
-        setValue({
-          begin: date.format('YYYY-MM-DD'),
-          end: date.format('YYYY-MM-DD')
-        });
+        setValue(moment(date, 'YYYY-MM-DD'));
       }
     }
   }) : /*#__PURE__*/React.createElement(RangePicker, {
-    value: [moment(dateRange.begin, 'YYYY-MM-DD'), moment(dateRange.end, 'YYYY-MM-DD')],
+    value: value,
     allowClear: false,
     popupClassName: "".concat(classPrefix, "-drop"),
     inputReadOnly: true,
@@ -122,28 +130,18 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     getPopupContainer: function getPopupContainer(trigger) {
       return trigger.parentNode;
     },
-    onOpenChange: function onOpenChange(open) {
-      if (BizDateBeyondRange) {
-        message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 12).concat(selectRangeUnitText));
-        BizDateBeyondRange = false;
-      }
-      _onOpenChange && _onOpenChange(open);
-    },
     onChange: function onChange(value) {
       var subtractDays = 0;
       if (includeToday && value && value.length === 2 && isTodayInRange(value[0], value[1])) {
         subtractDays = 1;
       }
-      if (value && value.length === 2 && moment(_.cloneDeep(value[1]).subtract(subtractDays, 'days').format('YYYY-MM-DD')).diff(moment(value[0].format('YYYY-MM-DD')), selectRangeUnit || 'months') >= (selectRange ? selectRange : 12)) {
+      if (value && value.length === 2 && moment(_.cloneDeep(value[1]).subtract(subtractDays, 'days').format('YYYY-MM-DD')).diff(moment(value[0].format('YYYY-MM-DD')), selectRangeUnit || 'months') >= (selectRange ? Math.floor(selectRange / Reflect.get(DateSingleMap, selectRangeUnit)) : 12)) {
         BizDateBeyondRange = true;
         return;
       }
       if (value && value.length === 2) {
         BizDateBeyondRange = false;
-        setValue({
-          begin: value[0].format('YYYY-MM-DD'),
-          end: value[1].format('YYYY-MM-DD')
-        });
+        setValue([moment(value[0], 'YYYY-MM-DD'), moment(value[1], 'YYYY-MM-DD')]);
       }
     }
   }));

package/es/datePickerOld/demo/day.js

@@ -37,7 +37,6 @@ export default (function () {
     defaultChecked: includeToday,
     onChange: setIncludeToday
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
-    mode: "simple",
     onChange: handleChange,
     includeToday: true,
     value: time,

package/es/datePickerOld/demo/index.js

@@ -8,11 +8,12 @@ import { BizDatePickerOld } from '@zgfe/business-lib';
 import React, { useState } from 'react';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Divider, Space, Switch } from 'antd';
+import { DatePickerTypes } from '../types';
 export default (function () {
   var _useState = useState({
-      begin: '2024-07-11',
-      end: '2024-08-05',
-      relative: [4, 1],
+      begin: '2024-07-01',
+      end: '2024-08-09',
+      relative: [5, 0],
       unit: 'week'
     }),
     _useState2 = _slicedToArray(_useState, 2),
@@ -33,9 +34,11 @@ export default (function () {
     defaultChecked: includeToday,
     onChange: setIncludeToday
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
-    key: "".concat(includeToday, "--2"),
-    onChange: handleChange,
-    includeToday: includeToday,
-    defaultValue: time
+    value: time,
+    defaultValue: time,
+    dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
+    selectRange: 1,
+    selectRangeUnit: "months",
+    onChange: handleChange
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));
 });

package/es/datePickerOld/index.js

@@ -17,7 +17,7 @@ import './styles/index.less';
 import { Popover, Skeleton } from 'antd';
 import DatePickerContext from './context';
 import _ from 'lodash';
-import { getDateRange, getTypeList } from './utils';
+import { DateOptionMap, getDateRange, getTypeList } from './utils';
 import PopoverContent from './popoverContent';
 import IconFont from '../icon/iconFont';
 import moment from 'moment';
@@ -34,10 +34,10 @@ var BizDatePicker = function BizDatePicker(_ref) {
   var defaultValue = _ref.defaultValue,
     value = _ref.value,
     includeToday = _ref.includeToday,
-    mode = _ref.mode,
     dateTypeList = _ref.dateTypeList,
     onChange = _ref.onChange,
     selectRange = _ref.selectRange,
+    selectRangeUnit = _ref.selectRangeUnit,
     timeRangeOpen = _ref.timeRangeOpen;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,10 +66,6 @@ var BizDatePicker = function BizDatePicker(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     open = _useState14[0],
     setOpen = _useState14[1];
-  var _useState15 = useState('个月'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    label = _useState16[0],
-    setLabel = _useState16[1];
   function init(initValue) {
     setReady(false);
     var list = dateTypeList === null || dateTypeList === void 0 ? void 0 : dateTypeList.map(function (type) {
@@ -85,22 +81,8 @@ var BizDatePicker = function BizDatePicker(_ref) {
     setCurrentType(currentType);
     if (initValue === null || initValue === void 0 ? void 0 : initValue.relative) {
       setRelative(initValue.relative);
-      switch (currentType === null || currentType === void 0 ? void 0 : currentType.value) {
-        case 'day':
-          setLabel(initValue.relative[0] + '天');
-          break;
-        case 'week':
-          setLabel(initValue.relative[0] + '周');
-          break;
-        case 'month':
-          setLabel(initValue.relative[0] + '个月');
-          break;
-        case 'quarter':
-          setLabel(initValue.relative[0] + '个季度');
-          break;
-      }
     }
-    var typeList = getTypeList(currentType === null || currentType === void 0 ? void 0 : currentType.value, mode, includeToday);
+    var typeList = getTypeList(currentType === null || currentType === void 0 ? void 0 : currentType.value, includeToday);
     var begin = initValue.begin,
       end = initValue.end;
     var item = typeList.find(function (item) {
@@ -147,6 +129,28 @@ var BizDatePicker = function BizDatePicker(_ref) {
       }, 100);
     });
   }, [dateRange, currentType, relative, ready]);
+  var renderLabel = function renderLabel() {
+    var typeList = getTypeList(currentType === null || currentType === void 0 ? void 0 : currentType.value, includeToday);
+    if (relative) {
+      var type = typeList.find(function (item) {
+        return item.count == relative[0];
+      });
+      if (type) {
+        if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
+          return type.value;
+        }
+        return '最近' + type.value;
+      } else {
+        return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
+      }
+    } else {
+      if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
+        return dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin;
+      } else {
+        return (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end);
+      }
+    }
+  };
   if (!typeList.length || !currentType || !ready) {
     return /*#__PURE__*/React.createElement("div", {
       className: classPrefix
@@ -159,16 +163,14 @@ var BizDatePicker = function BizDatePicker(_ref) {
   }, /*#__PURE__*/React.createElement(DatePickerContext.Provider, {
     value: {
       includeToday: includeToday,
-      mode: mode,
       dateRange: dateRange,
       setDateRange: setDateRange,
       currentType: currentType.value,
       relative: relative,
       setRelative: setRelative,
-      setOpen: setOpen,
-      setLabel: setLabel
+      setOpen: setOpen
     }
-  }, mode == 'general' && /*#__PURE__*/React.createElement(BizSelect, {
+  }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
     theme: "secondary",
     keyField: "value",
@@ -177,11 +179,9 @@ var BizDatePicker = function BizDatePicker(_ref) {
     options: typeList,
     onChange: function onChange(type) {
       setCurrentType(type);
-      if (type.value === 'custom') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
-      }
       if (type.value === 'hour') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+        setRelative([1, 1]);
       }
       if (type.value === 'day') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
@@ -199,18 +199,24 @@ var BizDatePicker = function BizDatePicker(_ref) {
         setDateRange(getDateRange(DatePickerTypes.Unit.quarter, 1, includeToday));
         setRelative([1, includeToday ? 0 : 1]);
       }
+      if (type.value == 'custom') {
+        setRelative(undefined);
+      }
     }
   }), /*#__PURE__*/React.createElement(Popover, {
     overlayClassName: "".concat(classPrefix, "-input-popover"),
     open: open,
     placement: "bottomLeft",
     trigger: "click",
+    destroyTooltipOnHide: true,
     content: /*#__PURE__*/React.createElement(PopoverContent, {
       setDateRange: setDateRange,
       setOpen: setOpen,
       selectRange: selectRange,
+      selectRangeUnit: selectRangeUnit,
       timeRangeOpen: timeRangeOpen,
-      currentType: currentType.value
+      currentType: currentType.value,
+      relative: relative
     }),
     onOpenChange: function onOpenChange() {
       return setOpen(!open);
@@ -225,14 +231,13 @@ var BizDatePicker = function BizDatePicker(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "rili-2",
     size: 14
-  }), /*#__PURE__*/React.createElement("span", null, currentType.value == DatePickerTypes.Unit.hour ? label ? label : dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin : relative ? '最近' + label : (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end))), /*#__PURE__*/React.createElement(IconFont, {
+  }), /*#__PURE__*/React.createElement("span", null, renderLabel())), /*#__PURE__*/React.createElement(IconFont, {
     type: "xiangxia",
     size: 14
   })))));
 };
 BizDatePicker.defaultProps = {
   includeToday: true,
-  mode: 'general',
   dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month]
 };
 export default BizDatePicker;

package/es/datePickerOld/popoverContent.d.ts

@@ -6,6 +6,8 @@ interface PopoverContent {
     timeRangeOpen?: number;
     selectRange?: number;
     currentType?: DatePickerTypes.Unit;
+    relative?: any[];
+    selectRangeUnit?: 'days' | 'weeks' | 'months' | 'quarter';
 }
 declare const _default: (props: PopoverContent) => React.JSX.Element;
 export default _default;

package/es/datePickerOld/popoverContent.js

@@ -9,20 +9,23 @@ import React, { useRef } from 'react';
 import PickerShortcut from './shortcut';
 import BizDate from './datePicker';
 import { classPrefix } from '.';
+import { DatePickerTypes } from './types';
 export default (function (props) {
   var selectRange = props.selectRange,
     setDateRange = props.setDateRange,
     setOpen = props.setOpen,
-    currentType = props.currentType;
+    currentType = props.currentType,
+    relative = props.relative,
+    selectRangeUnit = props.selectRangeUnit;
   var ref = useRef();
   return /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: "1"
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    defaultActiveKey: relative ? '1' : '2'
+  }, currentType != DatePickerTypes.Unit.custom && /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u6700\u8FD1",
     key: "1"
   }, /*#__PURE__*/React.createElement(PickerShortcut, {
     selectRange: selectRange,
-    currentType: currentType
+    selectRangeUnit: selectRangeUnit
   })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u81EA\u5B9A\u4E49",
     key: "2"
@@ -40,7 +43,9 @@ export default (function (props) {
       if (ref.current) {
         var _ref$current;
         var dateValue = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getDateValue();
-        setDateRange(dateValue);
+        if (dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin) {
+          setDateRange(dateValue);
+        }
         setOpen(false);
       }
     }

package/es/datePickerOld/shortcut.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
-import { DatePickerTypes } from './types';
 declare const PickerShortcut: React.FC<{
     selectRange?: number;
-    currentType?: DatePickerTypes.Unit;
+    selectRangeUnit?: string;
 }>;
 export default PickerShortcut;

package/es/datePickerOld/shortcut.js

@@ -8,29 +8,20 @@ import React, { useContext, useEffect, useState } from 'react';
 import { DatePickerTypes } from './types';
 import { classPrefix } from '.';
 import DatePickerContext from './context';
-import moment from 'moment';
-import { getDateRange, getTypeList } from './utils';
+import { DateMaxMap, DateOptionMap, DateSingleMap, getDateRange, getTypeList } from './utils';
 import { Button, InputNumber } from 'antd';
-var DateOptionMap = {
-  day: '天',
-  week: '周',
-  month: '月',
-  quarter: '季度'
-};
 var PickerShortcut = function PickerShortcut(_ref) {
-  var selectRange = _ref.selectRange;
+  var selectRange = _ref.selectRange,
+    selectRangeUnit = _ref.selectRangeUnit;
   var _useContext = useContext(DatePickerContext),
     currentType = _useContext.currentType,
-    mode = _useContext.mode,
     includeToday = _useContext.includeToday,
-    dateRange = _useContext.dateRange,
     relative = _useContext.relative,
     setDateRange = _useContext.setDateRange,
     setRelative = _useContext.setRelative,
-    setLabel = _useContext.setLabel,
     setOpen = _useContext.setOpen;
-  var list = getTypeList(currentType, mode, includeToday);
-  var _useState = useState(list[0].count),
+  var list = getTypeList(currentType, includeToday);
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     active = _useState2[0],
     setActive = _useState2[1];
@@ -39,68 +30,35 @@ var PickerShortcut = function PickerShortcut(_ref) {
     numbers = _useState4[0],
     setNumbers = _useState4[1];
   useEffect(function () {
-    list = getTypeList(currentType, mode, includeToday);
-    if (!relative && !dateRange) {
-      var _active = list[0];
-      setActive(_active === null || _active === void 0 ? void 0 : _active.count);
-      setLabel === null || setLabel === void 0 ? void 0 : setLabel(_active === null || _active === void 0 ? void 0 : _active.value);
-      if (_active && setRelative) {
-        setRelative([_active === null || _active === void 0 ? void 0 : _active.count, includeToday ? 0 : 1]);
-      }
-    }
-  }, [currentType, mode, includeToday]);
-  useEffect(function () {
-    if (!dateRange || !dateRange.begin || !dateRange.end) return;
-    var begin = dateRange.begin,
-      end = dateRange.end;
-    var item = list.find(function (item) {
-      var match = getDateRange(currentType, item.count, includeToday);
-      return moment(begin).isSame(match.begin) && moment(end).isSame(match.end);
-    });
-    setActive(item === null || item === void 0 ? void 0 : item.count);
-    setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
-    if (relative && (!item || item.count !== relative[0]) && setRelative) {
-      setRelative(undefined);
+    list = getTypeList(currentType, includeToday);
+    if (relative) {
+      setActive(relative[0]);
+      setNumbers(relative[0]);
     }
-  }, [dateRange]);
-  useEffect(function () {
-    if (active === undefined || !setDateRange) return;
-    setDateRange(getDateRange(currentType, active, includeToday));
-    setNumbers(active);
-  }, [active]);
-  useEffect(function () {
-    if (!relative || !setDateRange) return;
-    var _relative = _slicedToArray(relative, 1),
-      count = _relative[0];
-    var item = list.find(function (item) {
-      return item.count === count;
-    });
-    setActive(item === null || item === void 0 ? void 0 : item.count);
-    setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
-    setDateRange(getDateRange(currentType, count, includeToday));
-  }, [relative]);
+  }, [currentType, includeToday]);
+  var max = selectRange && selectRangeUnit ? Math.floor(selectRange * Reflect.get(DateSingleMap, selectRangeUnit) / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-shortcut")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
-  }, mode !== 'superSimple' && /*#__PURE__*/React.createElement(React.Fragment, null, list.map(function (item, index) {
+  }, list.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "".concat(classPrefix, "-item ").concat(active === item.count ? 'active' : ''),
       onClick: function onClick() {
         setActive(item.count);
-        setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
         if (setRelative) setRelative([item.count, includeToday ? 0 : 1]);
+        setDateRange === null || setDateRange === void 0 ? void 0 : setDateRange(getDateRange(currentType, item.count, includeToday));
         setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
       }
     }, item.value);
-  }))), currentType !== DatePickerTypes.Unit.hour && /*#__PURE__*/React.createElement("div", {
+  })), ![DatePickerTypes.Unit.hour, DatePickerTypes.Unit.quarter].includes(currentType) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative-content")
   }, /*#__PURE__*/React.createElement("span", null, "\u8FD1"), /*#__PURE__*/React.createElement(InputNumber, {
     min: 1,
-    max: currentType == DatePickerTypes.Unit.month ? selectRange || 12 : selectRange || 365,
+    max: max,
     controls: false,
     style: {
       width: '58px'
@@ -112,8 +70,12 @@ var PickerShortcut = function PickerShortcut(_ref) {
   }), /*#__PURE__*/React.createElement("span", null, Reflect.get(DateOptionMap, currentType))), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
-      if (!setDateRange) return;
-      setDateRange(getDateRange(currentType, numbers, includeToday));
+      if (!numbers) {
+        return;
+      }
+      var date = getDateRange(currentType, numbers, includeToday);
+      setDateRange === null || setDateRange === void 0 ? void 0 : setDateRange(date);
+      setRelative === null || setRelative === void 0 ? void 0 : setRelative([numbers, includeToday ? 0 : 1]);
       setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
     }
   }, "\u786E\u8BA4")));

package/es/datePickerOld/types.d.ts

@@ -24,7 +24,6 @@ export declare namespace DatePickerTypes {
         selectRangeUnit?: 'days' | 'weeks' | 'months' | 'quarter';
         onChange?: (data: Value) => void;
         onOpenChange?: (data: boolean) => void;
-        mode?: 'general' | 'simple' | 'superSimple';
         dateTypeList?: Unit[];
     }
     interface Option {

package/es/datePickerOld/utils.d.ts

@@ -1,9 +1,30 @@
 import moment from 'moment';
 import { DatePickerTypes } from './types';
-import { DatePickerContextProps } from './context';
 export declare const getDateRange: (type: DatePickerTypes.Unit, count: number, includeToday: boolean) => {
     begin: string;
     end: string;
 };
 export declare const isTodayInRange: (_startDate: moment.Moment, _endDate: moment.Moment) => boolean;
-export declare const getTypeList: (currentType: DatePickerTypes.Unit, mode: DatePickerContextProps['mode'], includeToday: boolean) => DatePickerTypes.ListOption[];
+export declare const getTypeList: (currentType: DatePickerTypes.Unit, includeToday: boolean) => DatePickerTypes.ListOption[];
+export declare const DateOptionMap: {
+    day: string;
+    week: string;
+    month: string;
+    quarter: string;
+};
+export declare const DateMaxMap: {
+    day: number;
+    week: number;
+    month: number;
+    quarter: number;
+};
+export declare const DateSingleMap: {
+    day: number;
+    days: number;
+    week: number;
+    weeks: number;
+    month: number;
+    months: number;
+    quarter: number;
+    quarters: number;
+};

package/es/datePickerOld/utils.js

@@ -2,7 +2,6 @@ import moment from 'moment';
 import { DatePickerTypes } from './types';
 function getAbsoluteDate(unit, count, maxDate) {
   var res = {};
-  var dayTime = 24 * 60 * 60 * 1000;
   switch (unit) {
     case DatePickerTypes.Unit.hour:
       res.endDate = res.startDate = moment().subtract(count, 'days').toDate();
@@ -13,20 +12,15 @@ function getAbsoluteDate(unit, count, maxDate) {
       break;
     case DatePickerTypes.Unit.week:
       res.endDate = maxDate;
-      var firstOfWeek = new Date(maxDate.getTime() - (maxDate.getDay() - 1) * dayTime);
-      res.startDate = new Date(firstOfWeek.getTime() - count * 7 * dayTime);
+      res.startDate = moment(maxDate).subtract(count, 'weeks').toDate();
       break;
     case DatePickerTypes.Unit.month:
       res.endDate = maxDate;
-      var firstOfMonth = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
-      firstOfMonth.setMonth(firstOfMonth.getMonth() - count);
-      res.startDate = new Date(firstOfMonth);
+      res.startDate = moment(maxDate).subtract(count, 'months').toDate();
       break;
     case DatePickerTypes.Unit.quarter:
       res.endDate = maxDate;
-      var firstOfQuarter = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
-      firstOfQuarter.setMonth(firstOfQuarter.getMonth() - firstOfQuarter.getMonth() % 3 - 3 * (count - 1));
-      res.startDate = new Date(firstOfQuarter);
+      res.startDate = moment(maxDate).subtract(count, 'quarters').toDate();
       break;
   }
   return res;
@@ -45,7 +39,7 @@ export var isTodayInRange = function isTodayInRange(_startDate, _endDate) {
   var dateToCheck = moment(new Date()).format('x');
   return dateToCheck >= startDate && dateToCheck <= endDate;
 };
-export var getTypeList = function getTypeList(currentType, mode, includeToday) {
+export var getTypeList = function getTypeList(currentType, includeToday) {
   var _shortcuts$find;
   var shortcuts = [{
     label: '按小时',
@@ -61,12 +55,6 @@ export var getTypeList = function getTypeList(currentType, mode, includeToday) {
     label: '按天',
     value: DatePickerTypes.Unit.day,
     children: [{
-      value: '今天',
-      count: 0
-    }, {
-      value: '昨天',
-      count: 1
-    }, {
       value: '7天',
       count: 7
     }, {
@@ -120,10 +108,32 @@ export var getTypeList = function getTypeList(currentType, mode, includeToday) {
     return item.value === currentType;
   })) === null || _shortcuts$find === void 0 ? void 0 : _shortcuts$find.children) || []).filter(function (item) {
     if (currentType === 'day') {
-      if ((mode === 'general' || !includeToday) && (item.count === 0 || item.count === 1)) return false;
+      if (!includeToday && (item.count === 0 || item.count === 1)) return false;
       return true;
     }
     return true;
   });
   return list;
+};
+export var DateOptionMap = {
+  day: '天',
+  week: '周',
+  month: '个月',
+  quarter: '个季度'
+};
+export var DateMaxMap = {
+  day: 365,
+  week: 52,
+  month: 12,
+  quarter: 4
+};
+export var DateSingleMap = {
+  day: 1,
+  days: 1,
+  week: 7,
+  weeks: 7,
+  month: 30,
+  months: 30,
+  quarter: 91,
+  quarters: 91
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.2",
+    "version": "1.2.51-ljy.21",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "4ec2943a33bb54f7b6035e846dea5cc65dc4e275",
+    "gitHead": "f173c31214c9d396af612eb15313565f7f46e3dd",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }