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

package/es/datePickerOld/datePicker.js

@@ -13,16 +13,10 @@ 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 { DateSingleMap, 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,

package/es/datePickerOld/demo/index.js

@@ -34,12 +34,11 @@ export default (function () {
     defaultChecked: includeToday,
     onChange: setIncludeToday
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
-    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",
+    selectRange: 1,
+    selectRangeUnit: "months",
     onChange: handleChange
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));
 });

package/es/datePickerOld/popoverContent.js

@@ -15,7 +15,8 @@ export default (function (props) {
     setDateRange = props.setDateRange,
     setOpen = props.setOpen,
     currentType = props.currentType,
-    relative = props.relative;
+    relative = props.relative,
+    selectRangeUnit = props.selectRangeUnit;
   var ref = useRef();
   return /*#__PURE__*/React.createElement(Tabs, {
     defaultActiveKey: relative ? '1' : '2'
@@ -24,7 +25,7 @@ export default (function (props) {
     key: "1"
   }, /*#__PURE__*/React.createElement(PickerShortcut, {
     selectRange: selectRange,
-    currentType: currentType
+    selectRangeUnit: selectRangeUnit
   })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u81EA\u5B9A\u4E49",
     key: "2"

package/es/datePickerOld/shortcut.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
-import { DatePickerTypes } from './types';
 declare const PickerShortcut: React.FC<{
     selectRange?: number;
-    currentType?: DatePickerTypes.Unit;
+    selectRangeUnit?: string;
 }>;
 export default PickerShortcut;

package/es/datePickerOld/shortcut.js

@@ -11,7 +11,8 @@ import DatePickerContext from './context';
 import { DateMaxMap, DateOptionMap, DateSingleMap, getDateRange, getTypeList } from './utils';
 import { Button, InputNumber } from 'antd';
 var PickerShortcut = function PickerShortcut(_ref) {
-  var selectRange = _ref.selectRange;
+  var selectRange = _ref.selectRange,
+    selectRangeUnit = _ref.selectRangeUnit;
   var _useContext = useContext(DatePickerContext),
     currentType = _useContext.currentType,
     includeToday = _useContext.includeToday,
@@ -35,7 +36,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
       setNumbers(relative[0]);
     }
   }, [currentType, includeToday]);
-  var max = selectRange ? Math.floor(selectRange / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
+  var max = selectRange && selectRangeUnit ? Math.floor(selectRange * Reflect.get(DateSingleMap, selectRangeUnit) / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-shortcut")
   }, /*#__PURE__*/React.createElement("div", {

package/es/datePickerOld/utils.d.ts

@@ -20,7 +20,11 @@ export declare const DateMaxMap: {
 };
 export declare const DateSingleMap: {
     day: number;
+    days: number;
     week: number;
+    weeks: number;
     month: number;
+    months: number;
     quarter: number;
+    quarters: number;
 };

package/es/datePickerOld/utils.js

@@ -129,7 +129,11 @@ export var DateMaxMap = {
 };
 export var DateSingleMap = {
   day: 1,
+  days: 1,
   week: 7,
+  weeks: 7,
   month: 30,
-  quarter: 120
+  months: 30,
+  quarter: 91,
+  quarters: 91
 };

package/package.json

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