@zgfe/business-lib 1.2.51-ljy.11 → 1.2.51-ljy.14

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/datePicker.js

@@ -17,6 +17,12 @@ import { isTodayInRange } from './utils';
 import _ from 'lodash';
 var RangePicker = DatePicker.RangePicker;
 var BizDateBeyondRange = false;
+var DateSingleMap = {
+  day: 1,
+  week: 7,
+  month: 30,
+  quarter: 91
+};
 var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var selectRange = _ref.selectRange,
     selectRangeUnit = _ref.selectRangeUnit,
@@ -110,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, {
@@ -135,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 ? 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, currentType)) : 12)) {
         BizDateBeyondRange = true;
         return;
       }

package/es/datePickerOld/demo/index.js

@@ -8,7 +8,6 @@ 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-05-01',
@@ -34,8 +33,7 @@ export default (function () {
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
     key: "".concat(includeToday, "--2"),
     value: time,
-    dateTypeList: [DatePickerTypes.Unit.day],
-    selectRange: 30,
+    selectRange: 360,
     selectRangeUnit: "days",
     onChange: handleChange
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));

package/es/datePickerOld/index.js

@@ -231,7 +231,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, currentType.value == DatePickerTypes.Unit.hour ? label : relative ? label : (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end))), /*#__PURE__*/React.createElement(IconFont, {
     type: "xiangxia",
     size: 14
   })))));

package/es/datePickerOld/shortcut.js

@@ -13,8 +13,8 @@ import { Button, InputNumber } from 'antd';
 var DateOptionMap = {
   day: '天',
   week: '周',
-  month: '月',
-  quarter: '季度'
+  month: '个月',
+  quarter: '个季度'
 };
 var DateMaxMap = {
   day: 365,
@@ -50,10 +50,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);
@@ -94,6 +92,8 @@ 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]);
+      setLabel === null || setLabel === void 0 ? void 0 : setLabel('最近' + numbers + Reflect.get(DateOptionMap, currentType));
       setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
     }
   }, "\u786E\u8BA4")));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.11",
+    "version": "1.2.51-ljy.14",
     "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": "4813d64e8bc4e12bd8bd5e02bae1274d7e75b426",
+    "gitHead": "d0bd8ad9b723ad086adea8d1dbe6687846678d9a",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }