@zgfe/business-lib 1.2.51-ljy.7 → 1.2.51-ljy.9

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

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

package/es/datePickerOld/index.js

@@ -38,6 +38,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
     dateTypeList = _ref.dateTypeList,
     onChange = _ref.onChange,
     selectRange = _ref.selectRange,
+    selectRangeUnit = _ref.selectRangeUnit,
     timeRangeOpen = _ref.timeRangeOpen;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -214,6 +215,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
       setOpen: setOpen,
       setLabel: setLabel,
       selectRange: selectRange,
+      selectRangeUnit: selectRangeUnit,
       timeRangeOpen: timeRangeOpen,
       currentType: currentType.value,
       relative: relative

package/es/datePickerOld/popoverContent.d.ts

@@ -8,6 +8,7 @@ interface PopoverContent {
     currentType?: DatePickerTypes.Unit;
     relative?: any[];
     setLabel?: any;
+    selectRangeUnit?: 'days' | 'weeks' | 'months' | 'quarter';
 }
 declare const _default: (props: PopoverContent) => React.JSX.Element;
 export default _default;

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.7",
+    "version": "1.2.51-ljy.9",
     "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": "18998205fbc745e5c8f52a20e1af8012f411adb9",
+    "gitHead": "049c7dd858307a98cd0b9c3e9afde6eee7332767",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }