@zgfe/business-lib 1.2.51-ljy.6 → 1.2.51-ljy.8

package/es/datePickerOld/datePicker.d.ts

@@ -3,6 +3,5 @@ declare const BizDate: React.ForwardRefExoticComponent<{
     selectRange?: number | undefined;
     timeRangeOpen?: number | undefined;
     selectRangeUnit?: "quarter" | "months" | "weeks" | "days" | undefined;
-    onOpenChange?: ((data: boolean) => void) | undefined;
 } & React.RefAttributes<any>>;
 export default BizDate;

package/es/datePickerOld/datePicker.js

@@ -20,7 +20,6 @@ var BizDateBeyondRange = false;
 var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var selectRange = _ref.selectRange,
     selectRangeUnit = _ref.selectRangeUnit,
-    _onOpenChange = _ref.onOpenChange,
     timeRangeOpen = _ref.timeRangeOpen;
   var _useContext = useContext(DatePickerContext),
     includeToday = _useContext.includeToday,
@@ -70,6 +69,11 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       getDateValue: function getDateValue() {
         var _value$, _value$2;
         if (setRelative) setRelative(undefined);
+        if (BizDateBeyondRange) {
+          message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 12).concat(selectRangeUnitText));
+          BizDateBeyondRange = false;
+          return false;
+        }
         return Array.isArray(value) ? {
           begin: (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format('YYYY-MM-DD'),
           end: (_value$2 = value[1]) === null || _value$2 === void 0 ? void 0 : _value$2.format('YYYY-MM-DD')
@@ -126,13 +130,6 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     getPopupContainer: function getPopupContainer(trigger) {
       return trigger.parentNode;
     },
-    onOpenChange: function onOpenChange(open) {
-      if (BizDateBeyondRange) {
-        message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 12).concat(selectRangeUnitText));
-        BizDateBeyondRange = false;
-      }
-      _onOpenChange && _onOpenChange(open);
-    },
     onChange: function onChange(value) {
       var subtractDays = 0;
       if (includeToday && value && value.length === 2 && isTodayInRange(value[0], value[1])) {

package/es/datePickerOld/demo/index.js

@@ -36,6 +36,7 @@ export default (function () {
     key: "".concat(includeToday, "--2"),
     onChange: handleChange,
     includeToday: includeToday,
-    defaultValue: time
+    defaultValue: time,
+    selectRange: 1
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));
 });

package/es/datePickerOld/popoverContent.js

@@ -43,10 +43,12 @@ export default (function (props) {
       if (ref.current) {
         var _ref$current;
         var dateValue = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getDateValue();
-        if (currentType == DatePickerTypes.Unit.hour) {
-          setLabel(dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin);
+        if (dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin) {
+          if (currentType == DatePickerTypes.Unit.hour) {
+            setLabel(dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin);
+          }
+          setDateRange(dateValue);
         }
-        setDateRange(dateValue);
         setOpen(false);
       }
     }

package/es/datePickerOld/shortcut.js

@@ -16,6 +16,18 @@ var DateOptionMap = {
   month: '月',
   quarter: '季度'
 };
+var DateMaxMap = {
+  day: 365,
+  week: 52,
+  month: 12,
+  quarter: 4
+};
+var DateSingleMap = {
+  day: 1,
+  week: 7,
+  month: 30,
+  quarter: 120
+};
 var PickerShortcut = function PickerShortcut(_ref) {
   var selectRange = _ref.selectRange;
   var _useContext = useContext(DatePickerContext),
@@ -45,6 +57,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
       setActive(temp === null || temp === void 0 ? void 0 : temp.count);
     }
   }, [currentType, mode, includeToday]);
+  var max = selectRange ? Math.floor(selectRange / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-shortcut")
   }, /*#__PURE__*/React.createElement("div", {
@@ -67,7 +80,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
     className: "".concat(classPrefix, "-list-relative-content")
   }, /*#__PURE__*/React.createElement("span", null, "\u8FD1"), /*#__PURE__*/React.createElement(InputNumber, {
     min: 1,
-    max: currentType == DatePickerTypes.Unit.month ? selectRange || 12 : selectRange || 365,
+    max: max,
     controls: false,
     style: {
       width: '58px'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.6",
+    "version": "1.2.51-ljy.8",
     "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": "70b132f3ca7259361cec312d9f7aca5557dd4b90",
+    "gitHead": "bc5c0668d4f97618204e522a6a40024c2172550b",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }