@zgfe/business-lib 1.2.51-ljy.13 → 1.2.51-ljy.16

package/es/datePickerOld/context.d.ts

@@ -8,7 +8,6 @@ export interface DatePickerContextProps {
     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.js

@@ -116,7 +116,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     open: true,
     onChange: function onChange(date) {
       if (date) {
-        setValue(moment(date));
+        setValue(moment(date, 'YYYY-MM-DD'));
       }
     }
   }) : /*#__PURE__*/React.createElement(RangePicker, {
@@ -141,7 +141,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       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 ? Math.floor(selectRange / Reflect.get(DateSingleMap, currentType)) : 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;
       }

package/es/datePickerOld/demo/index.js

@@ -10,8 +10,10 @@ import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Divider, Space, Switch } from 'antd';
 export default (function () {
   var _useState = useState({
-      begin: '2024-05-01',
-      end: '2024-08-06'
+      begin: '2024-07-01',
+      end: '2024-08-09',
+      relative: [5, 0],
+      unit: 'week'
     }),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -33,7 +35,8 @@ export default (function () {
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
     key: "".concat(includeToday, "--2"),
     value: time,
-    selectRange: 30,
+    defaultValue: time,
+    selectRange: 365,
     selectRangeUnit: "days",
     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';
@@ -66,10 +66,6 @@ var BizDatePicker = function BizDatePicker(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     open = _useState14[0],
     setOpen = _useState14[1];
-  var _useState15 = useState('最近1个月'),
-    _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,20 +81,6 @@ 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, includeToday);
     var begin = initValue.begin,
@@ -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
@@ -164,8 +168,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
       currentType: currentType.value,
       relative: relative,
       setRelative: setRelative,
-      setOpen: setOpen,
-      setLabel: setLabel
+      setOpen: setOpen
     }
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
@@ -179,27 +182,22 @@ var BizDatePicker = function BizDatePicker(_ref) {
       if (type.value === 'hour') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
         setRelative([1, 1]);
-        setLabel('昨天');
       }
       if (type.value === 'day') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
         setRelative([7, includeToday ? 0 : 1]);
-        setLabel('最近7天');
       }
       if (type.value === 'week') {
         setDateRange(getDateRange(DatePickerTypes.Unit.week, 4, includeToday));
         setRelative([4, includeToday ? 0 : 1]);
-        setLabel('最近4周');
       }
       if (type.value === 'month') {
         setDateRange(getDateRange(DatePickerTypes.Unit.month, 1, includeToday));
         setRelative([1, includeToday ? 0 : 1]);
-        setLabel('最近1个月');
       }
       if (type.value === 'quarter') {
         setDateRange(getDateRange(DatePickerTypes.Unit.quarter, 1, includeToday));
         setRelative([1, includeToday ? 0 : 1]);
-        setLabel('最近1个季度');
       }
     }
   }), /*#__PURE__*/React.createElement(Popover, {
@@ -211,7 +209,6 @@ var BizDatePicker = function BizDatePicker(_ref) {
     content: /*#__PURE__*/React.createElement(PopoverContent, {
       setDateRange: setDateRange,
       setOpen: setOpen,
-      setLabel: setLabel,
       selectRange: selectRange,
       selectRangeUnit: selectRangeUnit,
       timeRangeOpen: timeRangeOpen,
@@ -231,7 +228,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "rili-2",
     size: 14
-  }), /*#__PURE__*/React.createElement("span", null, 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
   })))));

package/es/datePickerOld/popoverContent.d.ts

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

package/es/datePickerOld/popoverContent.js

@@ -9,14 +9,12 @@ 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,
-    relative = props.relative,
-    setLabel = props.setLabel;
+    relative = props.relative;
   var ref = useRef();
   return /*#__PURE__*/React.createElement(Tabs, {
     defaultActiveKey: relative ? '1' : '2'
@@ -44,9 +42,6 @@ export default (function (props) {
         var _ref$current;
         var dateValue = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getDateValue();
         if (dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin) {
-          if (currentType == DatePickerTypes.Unit.hour) {
-            setLabel(dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin);
-          }
           setDateRange(dateValue);
         }
         setOpen(false);

package/es/datePickerOld/shortcut.js

@@ -8,26 +8,8 @@ import React, { useContext, useEffect, useState } from 'react';
 import { DatePickerTypes } from './types';
 import { classPrefix } from '.';
 import DatePickerContext from './context';
-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 DateMaxMap = {
-  day: 365,
-  week: 52,
-  month: 12,
-  quarter: 4
-};
-var DateSingleMap = {
-  day: 1,
-  week: 7,
-  month: 30,
-  quarter: 120
-};
 var PickerShortcut = function PickerShortcut(_ref) {
   var selectRange = _ref.selectRange;
   var _useContext = useContext(DatePickerContext),
@@ -36,7 +18,6 @@ var PickerShortcut = function PickerShortcut(_ref) {
     relative = _useContext.relative,
     setDateRange = _useContext.setDateRange,
     setRelative = _useContext.setRelative,
-    setLabel = _useContext.setLabel,
     setOpen = _useContext.setOpen;
   var list = getTypeList(currentType, includeToday);
   var _useState = useState(),
@@ -50,10 +31,8 @@ var PickerShortcut = function PickerShortcut(_ref) {
   useEffect(function () {
     list = getTypeList(currentType, includeToday);
     if (relative) {
-      var temp = list.find(function (item) {
-        return item.count == relative[0];
-      });
-      setActive(temp === null || temp === void 0 ? void 0 : temp.count);
+      setActive(relative[0]);
+      setNumbers(relative[0]);
     }
   }, [currentType, includeToday]);
   var max = selectRange ? Math.floor(selectRange / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
@@ -67,14 +46,12 @@ var PickerShortcut = function PickerShortcut(_ref) {
       className: "".concat(classPrefix, "-item ").concat(active === item.count ? 'active' : ''),
       onClick: function onClick() {
         setActive(item.count);
-        var str = (currentType != DatePickerTypes.Unit.hour ? '最近' : '') + (item === null || item === void 0 ? void 0 : item.value);
-        setLabel === null || setLabel === void 0 ? void 0 : setLabel(str);
         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.month, DatePickerTypes.Unit.quarter].includes(currentType) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative-content")
@@ -94,6 +71,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
     onClick: function onClick() {
       if (!setDateRange) return;
       setDateRange(getDateRange(currentType, numbers, includeToday));
+      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/utils.d.ts

@@ -6,3 +6,21 @@ export declare const getDateRange: (type: DatePickerTypes.Unit, count: number, i
 };
 export declare const isTodayInRange: (_startDate: moment.Moment, _endDate: moment.Moment) => boolean;
 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;
+    week: number;
+    month: number;
+    quarter: number;
+};

package/es/datePickerOld/utils.js

@@ -120,4 +120,22 @@ export var getTypeList = function getTypeList(currentType, includeToday) {
     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,
+  week: 7,
+  month: 30,
+  quarter: 120
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.13",
+    "version": "1.2.51-ljy.16",
     "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": "b784e41c49a818e87fb69460e11b6f90983f7605",
+    "gitHead": "3eb04f662719d4ee4627fbd08d7f6f30b7c26809",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }