@zgfe/business-lib 1.2.19 → 1.2.20

package/es/datePicker/datePicker.js

@@ -13,6 +13,8 @@ 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 _ from 'lodash';
 var RangePicker = DatePicker.RangePicker;
 var BizDateBeyondRange = false;
 var BizDate = function BizDate(_ref) {
@@ -104,7 +106,11 @@ var BizDate = function BizDate(_ref) {
       }
     },
     onChange: function onChange(value) {
-      if (value && value.length === 2 && moment(value[1].format('YYYY-MM-DD')).diff(moment(value[0].format('YYYY-MM-DD')), selectRangeUnit || 'months') + 1 > (selectRange ? selectRange : 12)) {
+      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)) {
         BizDateBeyondRange = true;
         return;
       }

package/es/datePicker/demo/day.js

@@ -39,10 +39,10 @@ export default (function () {
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
     mode: "simple",
     onChange: handleChange,
-    includeToday: includeToday,
+    includeToday: true,
     value: time,
     defaultValue: time,
-    selectRange: 2,
-    selectRangeUnit: 'days'
+    selectRange: 1,
+    selectRangeUnit: 'weeks'
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
 });

package/es/datePicker/utils.d.ts

@@ -1,5 +1,7 @@
+import moment from 'moment';
 import { DatePickerTypes } from './types';
 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;

package/es/datePicker/utils.js

@@ -32,4 +32,10 @@ export var getDateRange = function getDateRange(type, count, includeToday) {
     begin: moment(res.startDate).format('YYYY-MM-DD'),
     end: moment(res.endDate).format('YYYY-MM-DD')
   };
+};
+export var isTodayInRange = function isTodayInRange(_startDate, _endDate) {
+  var startDate = _startDate.format('x');
+  var endDate = moment(_endDate).add(1, 'days').format('x');
+  var dateToCheck = moment(new Date()).format('x');
+  return dateToCheck >= startDate && dateToCheck <= endDate;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.19",
+  "version": "1.2.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": "67889cfce811f97b0115547fdf59ae02caf1bcaa",
+  "gitHead": "a9f3f73cc4152e63735bc0ab5115033e6be8b21d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }