@zgfe/business-lib 1.1.41-attribution.7 → 1.1.41-attribution.8
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.
|
@@ -4,6 +4,7 @@ declare const BizDate: React.FC<{
|
|
|
4
4
|
type: 'hour' | 'day' | 'week' | 'month';
|
|
5
5
|
value?: DatePickerTypes.Range;
|
|
6
6
|
includeToday?: boolean;
|
|
7
|
+
selectRange?: number;
|
|
7
8
|
dateCount?: DatePickerTypes.ListOption;
|
|
8
9
|
onChange?: (val: DatePickerTypes.Range, isComeIn?: boolean) => void;
|
|
9
10
|
}>;
|
|
@@ -13,7 +13,8 @@ import locale from 'antd/es/date-picker/locale/zh_CN';
|
|
|
13
13
|
import { getDateRange } from './utils';
|
|
14
14
|
var RangePicker = DatePicker.RangePicker;
|
|
15
15
|
var BizDate = function BizDate(props) {
|
|
16
|
-
var includeToday = props.includeToday
|
|
16
|
+
var includeToday = props.includeToday,
|
|
17
|
+
selectRange = props.selectRange;
|
|
17
18
|
var initValue = {
|
|
18
19
|
begin: moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD'),
|
|
19
20
|
end: moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD')
|
|
@@ -34,9 +35,17 @@ var BizDate = function BizDate(props) {
|
|
|
34
35
|
}, [props.dateCount]);
|
|
35
36
|
var disabledDate = function disabledDate(current) {
|
|
36
37
|
if (includeToday) {
|
|
37
|
-
|
|
38
|
+
if (selectRange) {
|
|
39
|
+
return current && (current > moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin).add(selectRange - 1, 'day') || current > moment().endOf('day'));
|
|
40
|
+
} else {
|
|
41
|
+
return current && current > moment().endOf('day');
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (selectRange) {
|
|
45
|
+
return current && (current > moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin).add(selectRange - 1, 'day') || current > moment().subtract(1, 'days').endOf('day'));
|
|
46
|
+
} else {
|
|
47
|
+
return current && current > moment().subtract(1, 'days').endOf('day');
|
|
38
48
|
}
|
|
39
|
-
return current && current > moment().subtract(1, 'days').endOf('day');
|
|
40
49
|
};
|
|
41
50
|
var onChangeDate = function onChangeDate() {
|
|
42
51
|
var range = {
|
|
@@ -45,6 +45,7 @@ export default (function () {
|
|
|
45
45
|
onChange: handleChange,
|
|
46
46
|
includeToday: includeToday,
|
|
47
47
|
value: time,
|
|
48
|
-
defaultValue: time
|
|
48
|
+
defaultValue: time,
|
|
49
|
+
selectRange: 365
|
|
49
50
|
}), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
|
|
50
51
|
});
|
package/es/datePicker/index.js
CHANGED
|
@@ -121,7 +121,8 @@ var BizDatePicker = function BizDatePicker(props) {
|
|
|
121
121
|
dateCount: currentTime,
|
|
122
122
|
value: dateRange,
|
|
123
123
|
includeToday: props.includeToday,
|
|
124
|
-
onChange: onChangeRange
|
|
124
|
+
onChange: onChangeRange,
|
|
125
|
+
selectRange: props.selectRange
|
|
125
126
|
})));
|
|
126
127
|
};
|
|
127
128
|
BizDatePicker.defaultProps = {
|
package/es/datePicker/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.1.41-attribution.
|
|
3
|
+
"version": "1.1.41-attribution.8",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"react": "^16.12.0 || ^17.0.0",
|
|
61
61
|
"yorkie": "^2.0.0"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "7da15ccacbb2472e890e78ec34c07d2d74764a4b"
|
|
64
64
|
}
|