@nutui/nutui-react 2.3.12-beta.0 → 2.3.12
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.
- package/CHANGELOG.md +18 -0
- package/dist/esm/ActionSheet.js +30 -76
- package/dist/esm/Address.js +80 -171
- package/dist/esm/Animate.js +21 -49
- package/dist/esm/AnimatingNumbers.js +47 -120
- package/dist/esm/Audio.js +88 -159
- package/dist/esm/Avatar.js +44 -91
- package/dist/esm/AvatarCropper.js +149 -268
- package/dist/esm/AvatarGroup.js +13 -44
- package/dist/esm/BackTop.js +34 -75
- package/dist/esm/Barrage.js +49 -83
- package/dist/esm/Calendar.js +27 -119
- package/dist/esm/CalendarCard.js +180 -291
- package/dist/esm/CalendarItem.js +253 -314
- package/dist/esm/Card.js +38 -72
- package/dist/esm/Cell.js +27 -62
- package/dist/esm/CellGroup.js +16 -45
- package/dist/esm/CheckboxGroup.js +49 -85
- package/dist/esm/CircleProgress.js +42 -93
- package/dist/esm/Col.js +17 -48
- package/dist/esm/Collapse.js +18 -49
- package/dist/esm/ConfigProvider.js +3 -2
- package/dist/esm/CountDown.js +62 -101
- package/dist/esm/DatePicker.js +87 -127
- package/dist/esm/Dialog.js +116 -196
- package/dist/esm/Divider.js +16 -36
- package/dist/esm/Drag.js +32 -76
- package/dist/esm/Elevator.js +93 -133
- package/dist/esm/Ellipsis.js +71 -92
- package/dist/esm/Empty.js +31 -70
- package/dist/esm/FixedNav.js +32 -81
- package/dist/esm/Form.js +28 -61
- package/dist/esm/Grid.js +27 -51
- package/dist/esm/Image.js +47 -102
- package/dist/esm/ImagePreview.js +82 -135
- package/dist/esm/InfiniteLoading.js +77 -159
- package/dist/esm/Input.js +57 -125
- package/dist/esm/InputNumber.js +66 -96
- package/dist/esm/Layout.js +4 -28
- package/dist/esm/Loading.js +13 -40
- package/dist/esm/Menu.js +51 -105
- package/dist/esm/NavBar.js +46 -85
- package/dist/esm/NoticeBar.js +153 -226
- package/dist/esm/Notify.js +87 -178
- package/dist/esm/NumberKeyboard.js +84 -150
- package/dist/esm/Pagination.js +58 -97
- package/dist/esm/Picker.js +215 -276
- package/dist/esm/Popover.js +111 -159
- package/dist/esm/Price.js +23 -60
- package/dist/esm/Progress.js +47 -77
- package/dist/esm/PullToRefresh.js +94 -201
- package/dist/esm/RadioGroup.js +23 -53
- package/dist/esm/Range.js +113 -177
- package/dist/esm/Rate.js +48 -95
- package/dist/esm/Row.js +19 -43
- package/dist/esm/SearchBar.js +52 -119
- package/dist/esm/ShortPassword.js +58 -106
- package/dist/esm/SideNavBar.js +34 -59
- package/dist/esm/SideNavBarItem.js +7 -36
- package/dist/esm/Signature.js +49 -84
- package/dist/esm/Skeleton.js +31 -68
- package/dist/esm/Space.js +7 -34
- package/dist/esm/Step.js +35 -64
- package/dist/esm/Steps.js +16 -40
- package/dist/esm/Sticky.js +64 -108
- package/dist/esm/SubSideNavBar.js +42 -71
- package/dist/esm/Swipe.js +79 -143
- package/dist/esm/Swiper.js +136 -183
- package/dist/esm/SwiperItem.js +13 -38
- package/dist/esm/Switch.js +20 -53
- package/dist/esm/TabPane.js +6 -30
- package/dist/esm/Tabbar.js +29 -59
- package/dist/esm/Table.js +92 -141
- package/dist/esm/Tag.js +30 -74
- package/dist/esm/TextArea.js +37 -82
- package/dist/esm/TimeDetail.js +20 -58
- package/dist/esm/TimeSelect.js +57 -95
- package/dist/esm/Toast.js +110 -197
- package/dist/esm/Tour.js +88 -132
- package/dist/esm/TrendArrow.js +32 -74
- package/dist/esm/Uploader.js +226 -346
- package/dist/esm/UserContext.js +1 -1
- package/dist/esm/Video.js +34 -67
- package/dist/esm/VirtualList.js +127 -160
- package/dist/esm/WaterMark.js +24 -68
- package/dist/esm/badge2.js +23 -53
- package/dist/esm/button2.js +30 -63
- package/dist/esm/can-use-dom.js +1 -1
- package/dist/esm/cascader2.js +307 -536
- package/dist/esm/checkbox2.js +59 -96
- package/dist/esm/collapseitem2.js +48 -86
- package/dist/esm/configprovider2.js +43 -1003
- package/dist/esm/context.js +1 -1
- package/dist/esm/context2.js +1 -1
- package/dist/esm/context3.js +1 -1
- package/dist/esm/context4.js +1 -1
- package/dist/esm/context5.js +8 -8
- package/dist/esm/date.js +88 -66
- package/dist/esm/formitem2.js +236 -1510
- package/dist/esm/get-scroll-parent.js +8 -10
- package/dist/esm/griditem2.js +34 -52
- package/dist/esm/index.js +5 -12
- package/dist/esm/indicator2.js +13 -42
- package/dist/esm/menuitem2.js +81 -124
- package/dist/esm/overlay2.js +39 -78
- package/dist/esm/pad-zero.js +3 -4
- package/dist/esm/popup2.js +79 -124
- package/dist/esm/px-check.js +2 -2
- package/dist/esm/radio2.js +48 -79
- package/dist/esm/raf.js +5 -3
- package/dist/esm/render.js +17 -54
- package/dist/esm/safearea2.js +3 -5
- package/dist/esm/supports-passive.js +3 -3
- package/dist/esm/tabbaritem2.js +42 -58
- package/dist/esm/tabs2.js +82 -120
- package/dist/esm/tslib.es6.js +47 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo1.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo2.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo3.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo4.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo5.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo6.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo7.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo8.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/h5/demo9.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo1.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo10.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo2.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo3.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo4.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo5.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo6.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo7.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo8.d.ts +3 -0
- package/dist/esm/types/src/packages/button/demos/taro/demo9.d.ts +3 -0
- package/dist/esm/types/src/packages/configprovider/configprovider.d.ts +1 -0
- package/dist/esm/types/src/packages/configprovider/configprovider.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/configprovider/index.d.ts +2 -2
- package/dist/esm/types/src/packages/configprovider/index.taro.d.ts +2 -2
- package/dist/esm/types/src/packages/inputnumber/inputnumber.taro.d.ts +2 -0
- package/dist/esm/typings.js +1 -1
- package/dist/esm/use-click-away.js +9 -13
- package/dist/esm/use-client-rect.js +4 -4
- package/dist/esm/use-props-value.js +10 -15
- package/dist/esm/use-refs.js +5 -7
- package/dist/esm/use-touch.js +16 -20
- package/dist/locales/base.js +1 -1
- package/dist/locales/en-US.js +1 -1
- package/dist/locales/id-ID.js +1 -1
- package/dist/locales/tr-TR.js +1 -1
- package/dist/locales/zh-CN.js +1 -1
- package/dist/locales/zh-TW.js +1 -1
- package/dist/locales/zh-UG.js +1 -1
- package/dist/nutui.react.es.js +242 -284
- package/dist/nutui.react.umd.js +239 -281
- package/dist/style.mjs +1 -1
- package/dist/styles/variables-jmapp.scss +4 -0
- package/dist/types/packages/button/demos/h5/demo1.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo2.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo3.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo4.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo5.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo6.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo7.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo8.d.ts +3 -0
- package/dist/types/packages/button/demos/h5/demo9.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo1.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo10.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo2.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo3.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo4.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo5.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo6.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo7.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo8.d.ts +3 -0
- package/dist/types/packages/button/demos/taro/demo9.d.ts +3 -0
- package/dist/types/packages/configprovider/configprovider.d.ts +1 -0
- package/dist/types/packages/configprovider/configprovider.taro.d.ts +1 -0
- package/dist/types/packages/configprovider/index.d.ts +2 -2
- package/dist/types/packages/configprovider/index.taro.d.ts +2 -2
- package/dist/types/packages/empty/empty.d.ts +15 -3
- package/dist/types/packages/inputnumber/inputnumber.taro.d.ts +2 -0
- package/dist/types/packages/rate/rate.d.ts +1 -1
- package/package.json +5 -1
package/dist/esm/context.js
CHANGED
package/dist/esm/context2.js
CHANGED
package/dist/esm/context3.js
CHANGED
package/dist/esm/context4.js
CHANGED
package/dist/esm/context5.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { createContext } from "react";
|
|
2
|
-
|
|
2
|
+
const handleClick = (e) => {
|
|
3
3
|
e.stopPropagation();
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
const isIcon = e.target.className.includes("arrow-icon");
|
|
5
|
+
const isTitle = e.target.className.includes("-title") || isIcon;
|
|
6
|
+
const currentClass = e.currentTarget.className;
|
|
7
|
+
const isShow = currentClass.includes("sidenavbar-show");
|
|
8
|
+
const arrowIcon = e.currentTarget.querySelector(".arrow-icon");
|
|
9
|
+
const iconClass = arrowIcon.className;
|
|
10
10
|
if (isTitle) {
|
|
11
11
|
e.currentTarget.className = isShow ? currentClass.replace("sidenavbar-show", "sidenavbar-hide") : currentClass.replace("sidenavbar-hide", "sidenavbar-show");
|
|
12
12
|
arrowIcon.className = isShow ? iconClass.replace("arrow-down", "arrow-up") : iconClass.replace("arrow-up", "arrow-down");
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
|
-
|
|
15
|
+
const OffsetContext = createContext(20);
|
|
16
16
|
export {
|
|
17
17
|
OffsetContext as O,
|
|
18
18
|
handleClick as h
|
package/dist/esm/date.js
CHANGED
|
@@ -1,29 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
var Utils = {
|
|
1
|
+
const Utils = {
|
|
3
2
|
/**
|
|
4
3
|
* 是否为闫年
|
|
5
4
|
* @return {Boolse} true|false
|
|
6
5
|
*/
|
|
7
|
-
isLeapYear
|
|
6
|
+
isLeapYear(y) {
|
|
8
7
|
return y % 4 === 0 && y % 100 !== 0 || y % 400 === 0;
|
|
9
8
|
},
|
|
10
9
|
/**
|
|
11
10
|
* 返回星期数
|
|
12
11
|
* @return {String}
|
|
13
12
|
*/
|
|
14
|
-
getWhatDay
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
getWhatDay(year, month, day) {
|
|
14
|
+
const date = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
|
|
15
|
+
const index = date.getDay();
|
|
16
|
+
const dayNames = [
|
|
17
|
+
"星期日",
|
|
18
|
+
"星期一",
|
|
19
|
+
"星期二",
|
|
20
|
+
"星期三",
|
|
21
|
+
"星期四",
|
|
22
|
+
"星期五",
|
|
23
|
+
"星期六"
|
|
24
|
+
];
|
|
18
25
|
return dayNames[index];
|
|
19
26
|
},
|
|
20
27
|
/**
|
|
21
28
|
* 返回上一个月在当前面板中的天数
|
|
22
29
|
* @return {Number}
|
|
23
30
|
*/
|
|
24
|
-
getMonthPreDay
|
|
25
|
-
|
|
26
|
-
|
|
31
|
+
getMonthPreDay(year, month) {
|
|
32
|
+
const date = /* @__PURE__ */ new Date(`${year}/${month}/01`);
|
|
33
|
+
let day = date.getDay();
|
|
27
34
|
if (day === 0) {
|
|
28
35
|
day = 7;
|
|
29
36
|
}
|
|
@@ -33,17 +40,31 @@ var Utils = {
|
|
|
33
40
|
* 返回月份天数
|
|
34
41
|
* @return {Number}
|
|
35
42
|
*/
|
|
36
|
-
getMonthDays
|
|
43
|
+
getMonthDays(year, month) {
|
|
37
44
|
if (/^0/.test(month)) {
|
|
38
45
|
month = month.split("")[1];
|
|
39
46
|
}
|
|
40
|
-
return [
|
|
47
|
+
return [
|
|
48
|
+
0,
|
|
49
|
+
31,
|
|
50
|
+
this.isLeapYear(Number(year)) ? 29 : 28,
|
|
51
|
+
31,
|
|
52
|
+
30,
|
|
53
|
+
31,
|
|
54
|
+
30,
|
|
55
|
+
31,
|
|
56
|
+
31,
|
|
57
|
+
30,
|
|
58
|
+
31,
|
|
59
|
+
30,
|
|
60
|
+
31
|
|
61
|
+
][month];
|
|
41
62
|
},
|
|
42
63
|
/**
|
|
43
64
|
* 补齐数字位数
|
|
44
65
|
* @return {string}
|
|
45
66
|
*/
|
|
46
|
-
getNumTwoBit
|
|
67
|
+
getNumTwoBit(n) {
|
|
47
68
|
n = Number(n);
|
|
48
69
|
return (n > 9 ? "" : "0") + n;
|
|
49
70
|
},
|
|
@@ -51,11 +72,11 @@ var Utils = {
|
|
|
51
72
|
* 日期对象转成字符串
|
|
52
73
|
* @return {string}
|
|
53
74
|
*/
|
|
54
|
-
date2Str
|
|
75
|
+
date2Str(date, split) {
|
|
55
76
|
split = split || "-";
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
77
|
+
const y = date.getFullYear();
|
|
78
|
+
const m = this.getNumTwoBit(date.getMonth() + 1);
|
|
79
|
+
const d = this.getNumTwoBit(date.getDate());
|
|
59
80
|
return [y, m, d].join(split);
|
|
60
81
|
},
|
|
61
82
|
/**
|
|
@@ -63,10 +84,10 @@ var Utils = {
|
|
|
63
84
|
* @param {Number} 0返回今天的日期、1返回明天的日期,2返回后天得日期,依次类推
|
|
64
85
|
* @return {string} '2014-12-31'
|
|
65
86
|
*/
|
|
66
|
-
getDay
|
|
87
|
+
getDay(i) {
|
|
67
88
|
i = i || 0;
|
|
68
|
-
|
|
69
|
-
|
|
89
|
+
let date = /* @__PURE__ */ new Date();
|
|
90
|
+
const diff = i * (1e3 * 60 * 60 * 24);
|
|
70
91
|
date = new Date(date.getTime() + diff);
|
|
71
92
|
return this.date2Str(date);
|
|
72
93
|
},
|
|
@@ -74,9 +95,9 @@ var Utils = {
|
|
|
74
95
|
* 时间比较
|
|
75
96
|
* @return {Boolean}
|
|
76
97
|
*/
|
|
77
|
-
compareDate
|
|
78
|
-
|
|
79
|
-
|
|
98
|
+
compareDate(date1, date2) {
|
|
99
|
+
const startTime = new Date(date1.replace("-", "/").replace("-", "/"));
|
|
100
|
+
const endTime = new Date(date2.replace("-", "/").replace("-", "/"));
|
|
80
101
|
if (startTime >= endTime) {
|
|
81
102
|
return false;
|
|
82
103
|
}
|
|
@@ -86,63 +107,60 @@ var Utils = {
|
|
|
86
107
|
* 时间是否相等
|
|
87
108
|
* @return {Boolean}
|
|
88
109
|
*/
|
|
89
|
-
isEqual
|
|
90
|
-
|
|
91
|
-
|
|
110
|
+
isEqual(date1, date2) {
|
|
111
|
+
const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
|
|
112
|
+
const endTime = new Date(date2.replace(/-/g, "/")).getTime();
|
|
92
113
|
if (startTime === endTime) {
|
|
93
114
|
return true;
|
|
94
115
|
}
|
|
95
116
|
return false;
|
|
96
117
|
},
|
|
97
|
-
getMonthWeek
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
var remainder = 6 - w;
|
|
118
|
+
getMonthWeek(year, month, date, firstDayOfWeek = 0) {
|
|
119
|
+
const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
|
|
120
|
+
let w = dateNow.getDay();
|
|
121
|
+
const d = dateNow.getDate();
|
|
122
|
+
let remainder = 6 - w;
|
|
103
123
|
if (firstDayOfWeek !== 0) {
|
|
104
124
|
w = w === 0 ? 7 : w;
|
|
105
125
|
remainder = 7 - w;
|
|
106
126
|
}
|
|
107
127
|
return Math.ceil((d + remainder) / 7);
|
|
108
128
|
},
|
|
109
|
-
getYearWeek
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
var dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 864e5);
|
|
129
|
+
getYearWeek(year, month, date, firstDayOfWeek = 0) {
|
|
130
|
+
const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
|
|
131
|
+
const dateFirst = new Date(Number(year), 0, 1);
|
|
132
|
+
const dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 864e5);
|
|
114
133
|
return Math.ceil((dataNumber + (dateFirst.getDay() + 1 - 1)) / 7);
|
|
115
134
|
},
|
|
116
|
-
getWeekDate
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
var day = dateNow.getDay();
|
|
135
|
+
getWeekDate(year, month, date, firstDayOfWeek = 0) {
|
|
136
|
+
const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date));
|
|
137
|
+
const nowTime = dateNow.getTime();
|
|
138
|
+
let day = dateNow.getDay();
|
|
121
139
|
if (firstDayOfWeek === 0) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
140
|
+
const oneDayTime2 = 24 * 60 * 60 * 1e3;
|
|
141
|
+
const SundayTime2 = nowTime - day * oneDayTime2;
|
|
142
|
+
const SaturdayTime = nowTime + (6 - day) * oneDayTime2;
|
|
143
|
+
const sunday2 = this.date2Str(new Date(SundayTime2));
|
|
144
|
+
const saturday = this.date2Str(new Date(SaturdayTime));
|
|
127
145
|
return [sunday2, saturday];
|
|
128
146
|
}
|
|
129
147
|
day = day === 0 ? 7 : day;
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
148
|
+
const oneDayTime = 24 * 60 * 60 * 1e3;
|
|
149
|
+
const MondayTime = nowTime - (day - 1) * oneDayTime;
|
|
150
|
+
const SundayTime = nowTime + (7 - day) * oneDayTime;
|
|
151
|
+
const monday = this.date2Str(new Date(MondayTime));
|
|
152
|
+
const sunday = this.date2Str(new Date(SundayTime));
|
|
135
153
|
return [monday, sunday];
|
|
136
154
|
},
|
|
137
|
-
formatResultDate
|
|
138
|
-
|
|
155
|
+
formatResultDate(date) {
|
|
156
|
+
const days = [...date.split("-")];
|
|
139
157
|
days[2] = Utils.getNumTwoBit(Number(days[2]));
|
|
140
|
-
days[3] =
|
|
158
|
+
days[3] = `${days[0]}-${days[1]}-${days[2]}`;
|
|
141
159
|
days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
|
|
142
160
|
return days;
|
|
143
161
|
}
|
|
144
162
|
};
|
|
145
|
-
|
|
163
|
+
const getCurrMonthData = (type, year, month) => {
|
|
146
164
|
switch (type) {
|
|
147
165
|
case "prev":
|
|
148
166
|
month === 1 && (year -= 1);
|
|
@@ -153,14 +171,18 @@ var getCurrMonthData = function getCurrMonthData2(type, year, month) {
|
|
|
153
171
|
month = month === 12 ? 1 : ++month;
|
|
154
172
|
break;
|
|
155
173
|
}
|
|
156
|
-
return [
|
|
174
|
+
return [
|
|
175
|
+
year,
|
|
176
|
+
Utils.getNumTwoBit(month),
|
|
177
|
+
Utils.getMonthDays(String(year), String(month))
|
|
178
|
+
];
|
|
157
179
|
};
|
|
158
|
-
|
|
159
|
-
|
|
180
|
+
const getDaysStatus = (type, year, month) => {
|
|
181
|
+
let days = Utils.getMonthDays(`${year}`, `${month}`);
|
|
160
182
|
if (type === "prev" && days >= 7) {
|
|
161
183
|
days -= 7;
|
|
162
184
|
}
|
|
163
|
-
return Array.from(Array(days),
|
|
185
|
+
return Array.from(Array(days), (v, k) => {
|
|
164
186
|
return {
|
|
165
187
|
day: k + 1,
|
|
166
188
|
type,
|
|
@@ -169,20 +191,20 @@ var getDaysStatus = function getDaysStatus2(type, year, month) {
|
|
|
169
191
|
};
|
|
170
192
|
});
|
|
171
193
|
};
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
194
|
+
const getPreMonthDates = (type, year, month, firstDayOfWeek) => {
|
|
195
|
+
let preMonth = +month - 1;
|
|
196
|
+
let preYear = year;
|
|
175
197
|
if (preMonth <= 0) {
|
|
176
198
|
preMonth = 12;
|
|
177
199
|
preYear += 1;
|
|
178
200
|
}
|
|
179
|
-
|
|
201
|
+
let days = Utils.getMonthPreDay(+year, +month);
|
|
180
202
|
days -= firstDayOfWeek;
|
|
181
203
|
if (type === "prev" && days >= 7) {
|
|
182
204
|
days -= 7;
|
|
183
205
|
}
|
|
184
|
-
|
|
185
|
-
|
|
206
|
+
const preDates = Utils.getMonthDays(`${preYear}`, `${preMonth}`);
|
|
207
|
+
const months = Array.from(Array(preDates), (v, k) => {
|
|
186
208
|
return {
|
|
187
209
|
day: k + 1,
|
|
188
210
|
type,
|