@zgfe/business-lib 1.2.51-ljy.22 → 1.2.51-ljy.25

package/es/datePickerOld/datePicker.js

@@ -13,7 +13,7 @@ import { DatePickerTypes } from './types';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import DatePickerContext from './context';
 import BizGlobalDataContext from '../context';
-import { DateSingleMap, isTodayInRange } from './utils';
+import { isTodayInRange } from './utils';
 import _ from 'lodash';
 var RangePicker = DatePicker.RangePicker;
 var BizDateBeyondRange = false;
@@ -135,7 +135,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, selectRangeUnit)) : 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 ? selectRange : 12)) {
         BizDateBeyondRange = true;
         return;
       }

package/es/datePickerOld/demo/customType.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { BizDatePicker } from '@zgfe/business-lib';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
-import { Divider, Switch } from 'antd';
+import { Switch } from 'antd';
 export default (function () {
   var _useState = useState({
       begin: '2022-05-03',
@@ -27,16 +27,10 @@ export default (function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
     defaultChecked: includeToday,
     onChange: setIncludeToday
-  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
-    onChange: handleChange,
-    dateTypeList: ['week', 'month', 'quarter', 'custom'],
-    includeToday: includeToday,
-    defaultValue: time
-  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizDatePicker, {
+  })), /*#__PURE__*/React.createElement(BizDatePicker, {
     onChange: handleChange,
     dateTypeList: ['week', 'month', 'quarter'],
-    timeRangeOpen: 14,
-    selectRange: 400,
+    selectRange: 365,
     selectRangeUnit: 'days',
     includeToday: includeToday,
     defaultValue: time

package/es/datePickerOld/demo/index.js

@@ -9,6 +9,7 @@ import React, { useState } from 'react';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Divider, Space, Switch } from 'antd';
 import { DatePickerTypes } from '../types';
+import moment from 'moment';
 export default (function () {
   var _useState = useState({
       begin: '2024-07-01',
@@ -24,19 +25,43 @@ export default (function () {
     includeToday = _useState4[0],
     setIncludeToday = _useState4[1];
   var handleChange = function handleChange(data) {
-    setTime(function () {
-      return data;
-    });
+    setTime(data);
   };
+  console.log(moment().subtract(360, 'days').format('YYYY-MM-DD'));
+  function calculateTimeUnits(selectRange, selectRangeUnit, currentType) {
+    var duration = moment.duration(1, currentType);
+    switch (selectRangeUnit) {
+      case 'days':
+        duration.add(selectRange, 'days');
+        break;
+      case 'weeks':
+        duration.add(selectRange, 'weeks');
+        break;
+      case 'months':
+        duration.add(selectRange, 'months');
+        break;
+      case 'quarter':
+        duration.add(selectRange * 3, 'months');
+        break;
+      default:
+        break;
+    }
+    var result = duration.get(currentType);
+    return result;
+  }
+  console.log(calculateTimeUnits(365, 'days', 'weeks'));
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, {
     direction: "vertical"
   }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
     defaultChecked: includeToday,
     onChange: setIncludeToday
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
+    includeToday: includeToday,
     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
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));
 });

package/es/datePickerOld/shortcut.js

@@ -34,6 +34,10 @@ var PickerShortcut = function PickerShortcut(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     numbers = _useState4[0],
     setNumbers = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isError = _useState6[0],
+    setIsError = _useState6[1];
   useEffect(function () {
     list = getTypeList(currentType, includeToday);
     if (relative) {
@@ -46,10 +50,21 @@ var PickerShortcut = function PickerShortcut(_ref) {
     if (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) {
       _timeRangeOpen = typeof (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === 'boolean' ? (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) ? 200 : 12 : envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen;
     }
-    var count = (_timeRangeOpen > selectRange ? selectRange : _timeRangeOpen) || 12;
-    var endDate = moment();
-    var startDate = moment().subtract(count, selectRangeUnit || 'months');
-    var max = endDate.diff(startDate, currentType + 's' || 'months');
+    _timeRangeOpen = moment.duration(_timeRangeOpen, 'months').asDays();
+    var selectRangeCount = moment.duration(selectRange, selectRangeUnit).asDays();
+    var count = selectRange ? _timeRangeOpen > selectRangeCount ? selectRangeCount : _timeRangeOpen : _timeRangeOpen;
+    var max = moment.duration(count, 'days').asDays();
+    var duration = moment.duration(count, 'days');
+    switch (currentType) {
+      case 'week':
+        max = Math.round(duration.asWeeks());
+        break;
+      case 'month':
+        max = Math.round(duration.asMonths());
+        break;
+      default:
+        break;
+    }
     return max;
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -72,6 +87,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative-content")
   }, /*#__PURE__*/React.createElement("span", null, "\u8FD1"), /*#__PURE__*/React.createElement(InputNumber, {
+    className: isError ? "".concat(classPrefix, "-input-error") : '',
     min: 1,
     max: getMax(),
     controls: false,
@@ -81,11 +97,17 @@ var PickerShortcut = function PickerShortcut(_ref) {
     value: numbers,
     onChange: function onChange(value) {
       return setNumbers(value);
+    },
+    onBlur: function onBlur() {
+      if (numbers) {
+        setIsError(false);
+      }
     }
   }), /*#__PURE__*/React.createElement("span", null, Reflect.get(DateOptionMap, currentType))), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       if (!numbers) {
+        setIsError(true);
         return;
       }
       var date = getDateRange(currentType, numbers, includeToday);

package/es/datePickerOld/styles/index.less

@@ -137,6 +137,19 @@
         box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
       }
     }
+
+    &-error {
+      position: relative;
+      border: 1px solid var(--io-Error-E-, #fb5547) !important;
+
+      &::after {
+        position: absolute;
+        width: 67px;
+        color: red;
+        font-size: 12px;
+        content: '请输入内容';
+      }
+    }
   }
 
   &-panel {

package/es/datePickerOld/utils.js

@@ -16,11 +16,11 @@ function getAbsoluteDate(unit, count, maxDate) {
       break;
     case DatePickerTypes.Unit.month:
       res.endDate = maxDate;
-      res.startDate = moment(maxDate).subtract(count, 'months').toDate();
+      res.startDate = moment(maxDate).subtract(count, 'months').add(1, 'days').toDate();
       break;
     case DatePickerTypes.Unit.quarter:
       res.endDate = maxDate;
-      res.startDate = moment(maxDate).subtract(count, 'quarters').toDate();
+      res.startDate = moment(maxDate).subtract(count, 'quarters').add(1, 'days').toDate();
       break;
   }
   return res;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.22",
+    "version": "1.2.51-ljy.25",
     "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": "78e7644335c8e81938249bd0256a06e26a03b5dc",
+    "gitHead": "994b542b22fd4b9d51a83dbebd7962140971c8d8",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }