ds-web-all 1.0.1-beta.93 → 1.0.1-beta.94
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -49,7 +49,8 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
49
49
|
style = _ref$style === void 0 ? {} : _ref$style,
|
|
50
50
|
className = _ref.className,
|
|
51
51
|
_ref$allowClear = _ref.allowClear,
|
|
52
|
-
allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear
|
|
52
|
+
allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
|
|
53
|
+
_disabledDate = _ref.disabledDate;
|
|
53
54
|
var _useRefState = (0, _useRefState3.default)(value ? value.map(function (el) {
|
|
54
55
|
return el ? (0, _moment.default)(el) : el;
|
|
55
56
|
}) : value),
|
|
@@ -112,8 +113,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
112
113
|
}, [value]);
|
|
113
114
|
(0, _react.useEffect)(function () {
|
|
114
115
|
if (!open.first && !open.second) {
|
|
116
|
+
var _rangeValueRef$curren;
|
|
115
117
|
selectedNum.current = 0;
|
|
116
|
-
if ((rangeValueRef.current || []).every(function (el) {
|
|
118
|
+
if (((_rangeValueRef$curren = rangeValueRef.current) === null || _rangeValueRef$curren === void 0 ? void 0 : _rangeValueRef$curren.length) > 0 && (rangeValueRef.current || []).every(function (el) {
|
|
117
119
|
return !!el;
|
|
118
120
|
})) {
|
|
119
121
|
onChange(rangeValueRef.current ? rangeValueRef.current.map(function (el) {
|
|
@@ -178,6 +180,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
178
180
|
});
|
|
179
181
|
},
|
|
180
182
|
onFocus: function onFocus() {
|
|
183
|
+
if (!open.first && !open.second) {
|
|
184
|
+
setRangeValue(null);
|
|
185
|
+
}
|
|
181
186
|
setOpen(function (old) {
|
|
182
187
|
return old.first === true ? old : _objectSpread(_objectSpread({}, old), {}, {
|
|
183
188
|
first: true
|
|
@@ -185,7 +190,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
185
190
|
});
|
|
186
191
|
},
|
|
187
192
|
disabledDate: function disabledDate(date) {
|
|
188
|
-
return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
|
|
193
|
+
return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'start') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
|
|
189
194
|
},
|
|
190
195
|
renderExtraFooter: renderExtraFooter
|
|
191
196
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -210,6 +215,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
210
215
|
});
|
|
211
216
|
},
|
|
212
217
|
onFocus: function onFocus() {
|
|
218
|
+
if (!open.first && !open.second) {
|
|
219
|
+
setRangeValue(null);
|
|
220
|
+
}
|
|
213
221
|
setOpen(function (old) {
|
|
214
222
|
return old.second === true ? old : _objectSpread(_objectSpread({}, old), {}, {
|
|
215
223
|
second: true
|
|
@@ -217,7 +225,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
|
|
|
217
225
|
});
|
|
218
226
|
},
|
|
219
227
|
disabledDate: function disabledDate(date) {
|
|
220
|
-
return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
|
|
228
|
+
return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'end') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
|
|
221
229
|
},
|
|
222
230
|
renderExtraFooter: renderExtraFooter
|
|
223
231
|
}), allowClear && (value || []).some(function (el) {
|