@zgfe/business-lib 1.2.51-ljy.16 → 1.2.51-ljy.17
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.
|
@@ -10,6 +10,7 @@ import { classPrefix } from '.';
|
|
|
10
10
|
import DatePickerContext from './context';
|
|
11
11
|
import { DateMaxMap, DateOptionMap, DateSingleMap, getDateRange, getTypeList } from './utils';
|
|
12
12
|
import { Button, InputNumber } from 'antd';
|
|
13
|
+
import moment from 'moment';
|
|
13
14
|
var PickerShortcut = function PickerShortcut(_ref) {
|
|
14
15
|
var selectRange = _ref.selectRange;
|
|
15
16
|
var _useContext = useContext(DatePickerContext),
|
|
@@ -70,7 +71,12 @@ var PickerShortcut = function PickerShortcut(_ref) {
|
|
|
70
71
|
type: "primary",
|
|
71
72
|
onClick: function onClick() {
|
|
72
73
|
if (!setDateRange) return;
|
|
73
|
-
|
|
74
|
+
var date = getDateRange(currentType, numbers, includeToday);
|
|
75
|
+
if (currentType == DatePickerTypes.Unit.week) {
|
|
76
|
+
var dateWeek = moment().isoWeekday();
|
|
77
|
+
date.begin = moment(date.begin).add(dateWeek, 'day').format('YYYY-MM-DD');
|
|
78
|
+
}
|
|
79
|
+
setDateRange(date);
|
|
74
80
|
setRelative === null || setRelative === void 0 ? void 0 : setRelative([numbers, includeToday ? 0 : 1]);
|
|
75
81
|
setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
|
|
76
82
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.2.51-ljy.
|
|
3
|
+
"version": "1.2.51-ljy.17",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"react": "^16.12.0 || ^17.0.0",
|
|
56
56
|
"yorkie": "^2.0.0"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "c37ecd34d7bcfd6058574bb337302cadec89937b",
|
|
59
59
|
"gitHooks": {
|
|
60
60
|
"pre-commit": "lint-staged"
|
|
61
61
|
}
|