@zgfe/business-lib 1.2.51-ljy.18 → 1.2.51-ljy.20

package/es/datePickerOld/demo/index.js

@@ -8,6 +8,7 @@ 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-01',
@@ -36,6 +37,7 @@ export default (function () {
     key: "".concat(includeToday, "--2"),
     value: time,
     defaultValue: time,
+    dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
     selectRange: 365,
     selectRangeUnit: "days",
     onChange: handleChange

package/es/datePickerOld/index.js

@@ -199,6 +199,9 @@ 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"),

package/es/datePickerOld/popoverContent.js

@@ -9,6 +9,7 @@ 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,
@@ -18,7 +19,7 @@ export default (function (props) {
   var ref = useRef();
   return /*#__PURE__*/React.createElement(Tabs, {
     defaultActiveKey: relative ? '1' : '2'
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }, currentType != DatePickerTypes.Unit.custom && /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u6700\u8FD1",
     key: "1"
   }, /*#__PURE__*/React.createElement(PickerShortcut, {

package/es/datePickerOld/shortcut.js

@@ -10,7 +10,6 @@ import { classPrefix } from '.';
 import DatePickerContext from './context';
 import { DateMaxMap, DateOptionMap, DateSingleMap, getDateRange, getTypeList } from './utils';
 import { Button, InputNumber } from 'antd';
-import moment from 'moment';
 var PickerShortcut = function PickerShortcut(_ref) {
   var selectRange = _ref.selectRange;
   var _useContext = useContext(DatePickerContext),
@@ -52,7 +51,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
         setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
       }
     }, item.value);
-  })), ![DatePickerTypes.Unit.hour, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter].includes(currentType) && /*#__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")
@@ -70,13 +69,11 @@ 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;
-      var date = getDateRange(currentType, numbers, includeToday);
-      if (currentType == DatePickerTypes.Unit.week) {
-        var dateWeek = moment().isoWeekday();
-        date.begin = moment(date.begin).add(dateWeek - 1, 'day').format('YYYY-MM-DD');
+      if (!numbers) {
+        return;
       }
-      setDateRange(date);
+      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);
     }

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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.18",
+    "version": "1.2.51-ljy.20",
     "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": "e7f9115c1fff25e956066e68762c0871f6dfb18f",
+    "gitHead": "03e247c313adc0f6a0ebbdb8dd28d2f6bc319aca",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }