@nutui/nutui-react-taro 3.0.14 → 3.0.15
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 +19 -0
- package/dist/cjs/packages/button/style/button.scss +3 -0
- package/dist/cjs/packages/button/style/style.css +3 -3
- package/dist/cjs/packages/button/style/style.harmony.css +12 -0
- package/dist/cjs/packages/button/style-jmapp/button.scss +3 -0
- package/dist/cjs/packages/button/style-jmapp/style.css +3 -3
- package/dist/cjs/packages/button/style-jrkf/button.scss +3 -0
- package/dist/cjs/packages/button/style-jrkf/style.css +3 -3
- package/dist/cjs/packages/calendarcard/calendarcard.js +10 -4
- package/dist/cjs/packages/configprovider/types.d.ts +1 -1
- package/dist/cjs/packages/datepicker/utils.js +22 -37
- package/dist/cjs/packages/dialog/dialog.js +2 -7
- package/dist/cjs/packages/formitem/formitem.js +2 -2
- package/dist/cjs/packages/formitem/style/formitem.scss +14 -15
- package/dist/cjs/packages/formitem/style/style.css +9 -11
- package/dist/cjs/packages/formitem/style/style.harmony.css +8 -10
- package/dist/cjs/packages/formitem/style-jmapp/formitem.scss +14 -15
- package/dist/cjs/packages/formitem/style-jmapp/style.css +8 -10
- package/dist/cjs/packages/formitem/style-jrkf/formitem.scss +14 -15
- package/dist/cjs/packages/formitem/style-jrkf/style.css +8 -10
- package/dist/cjs/packages/noticebar/noticebar.js +1 -1
- package/dist/cjs/packages/overlay/style/overlay.scss +0 -1
- package/dist/cjs/packages/overlay/style/style.css +0 -1
- package/dist/cjs/packages/overlay/style/style.harmony.css +0 -1
- package/dist/cjs/packages/overlay/style-jmapp/overlay.scss +0 -1
- package/dist/cjs/packages/overlay/style-jmapp/style.css +0 -1
- package/dist/cjs/packages/overlay/style-jrkf/overlay.scss +0 -1
- package/dist/cjs/packages/overlay/style-jrkf/style.css +0 -1
- package/dist/cjs/packages/pickerview/pickerroller.js +9 -1
- package/dist/cjs/types/spec/calendarcard/base.d.ts +1 -0
- package/dist/cjs/types/spec/datepicker/base.d.ts +1 -1
- package/dist/es/packages/button/style/button.scss +3 -0
- package/dist/es/packages/button/style/style.css +3 -3
- package/dist/es/packages/button/style/style.harmony.css +12 -0
- package/dist/es/packages/button/style-jmapp/button.scss +3 -0
- package/dist/es/packages/button/style-jmapp/style.css +3 -3
- package/dist/es/packages/button/style-jrkf/button.scss +3 -0
- package/dist/es/packages/button/style-jrkf/style.css +3 -3
- package/dist/es/packages/calendarcard/calendarcard.js +11 -5
- package/dist/es/packages/configprovider/types.d.ts +1 -1
- package/dist/es/packages/datepicker/utils.js +22 -37
- package/dist/es/packages/dialog/dialog.js +2 -7
- package/dist/es/packages/formitem/formitem.js +2 -2
- package/dist/es/packages/formitem/style/formitem.scss +14 -15
- package/dist/es/packages/formitem/style/style.css +9 -11
- package/dist/es/packages/formitem/style/style.harmony.css +8 -10
- package/dist/es/packages/formitem/style-jmapp/formitem.scss +14 -15
- package/dist/es/packages/formitem/style-jmapp/style.css +8 -10
- package/dist/es/packages/formitem/style-jrkf/formitem.scss +14 -15
- package/dist/es/packages/formitem/style-jrkf/style.css +8 -10
- package/dist/es/packages/noticebar/noticebar.js +1 -1
- package/dist/es/packages/overlay/style/overlay.scss +0 -1
- package/dist/es/packages/overlay/style/style.css +0 -1
- package/dist/es/packages/overlay/style/style.harmony.css +0 -1
- package/dist/es/packages/overlay/style-jmapp/overlay.scss +0 -1
- package/dist/es/packages/overlay/style-jmapp/style.css +0 -1
- package/dist/es/packages/overlay/style-jrkf/overlay.scss +0 -1
- package/dist/es/packages/overlay/style-jrkf/style.css +0 -1
- package/dist/es/packages/pickerview/pickerroller.js +9 -1
- package/dist/es/types/spec/calendarcard/base.d.ts +4 -0
- package/dist/es/types/spec/datepicker/base.d.ts +1 -1
- package/dist/nutui.react.umd.js +46 -51
- package/dist/style-jmapp.css +1 -1
- package/dist/style-jmapp.scss +36 -36
- package/dist/style-jrkf.css +1 -1
- package/dist/style-jrkf.scss +37 -37
- package/dist/style.css +1 -1
- package/dist/style.scss +39 -39
- package/dist/styles/variables.scss +1 -2
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
.nut-form-item-label {
|
|
14
14
|
display: flex;
|
|
15
15
|
flex-direction: row;
|
|
16
|
-
font-size:
|
|
16
|
+
font-size: 12px;
|
|
17
17
|
font-weight: normal;
|
|
18
18
|
width: 90px;
|
|
19
19
|
margin-right: 10px;
|
|
@@ -22,13 +22,18 @@
|
|
|
22
22
|
text-align: left;
|
|
23
23
|
line-height: unset;
|
|
24
24
|
}
|
|
25
|
-
.nut-form-item-label-required {
|
|
25
|
+
.nut-form-item-label-left-required {
|
|
26
26
|
color: #ff0f23;
|
|
27
27
|
margin-right: 4px;
|
|
28
|
-
display: block;
|
|
29
28
|
position: absolute;
|
|
30
29
|
left: -10px;
|
|
31
30
|
}
|
|
31
|
+
.nut-form-item-label-right-required {
|
|
32
|
+
color: #ff0f23;
|
|
33
|
+
margin-left: 4px;
|
|
34
|
+
position: absolute;
|
|
35
|
+
right: -10px;
|
|
36
|
+
}
|
|
32
37
|
.nut-form-item .nut-form-item-labeltxt {
|
|
33
38
|
position: relative;
|
|
34
39
|
font-size: 12px;
|
|
@@ -129,13 +134,6 @@
|
|
|
129
134
|
white-space: nowrap;
|
|
130
135
|
}
|
|
131
136
|
|
|
132
|
-
.nut-form-item-label-left-required {
|
|
133
|
-
display: block;
|
|
134
|
-
line-height: 1.5;
|
|
135
|
-
position: absolute;
|
|
136
|
-
left: 0.1em;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
137
|
.nut-form-item-top {
|
|
140
138
|
flex-direction: column;
|
|
141
139
|
align-items: flex-start;
|
|
@@ -18,19 +18,25 @@
|
|
|
18
18
|
word-wrap: break-word;
|
|
19
19
|
text-align: $form-item-label-text-align;
|
|
20
20
|
line-height: unset;
|
|
21
|
-
}
|
|
22
21
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
22
|
+
&-left-required {
|
|
23
|
+
color: $form-item-required-color;
|
|
24
|
+
margin-right: $form-item-required-margin-right;
|
|
25
|
+
position: absolute;
|
|
26
|
+
left: -10px;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
&-right-required {
|
|
30
|
+
color: $form-item-required-color;
|
|
31
|
+
margin-left: $form-item-required-margin-right;
|
|
32
|
+
position: absolute;
|
|
33
|
+
right: -10px;
|
|
34
|
+
}
|
|
29
35
|
}
|
|
30
36
|
|
|
31
37
|
.nut-form-item-labeltxt {
|
|
32
38
|
position: relative;
|
|
33
|
-
font-size:
|
|
39
|
+
font-size: $form-item-label-font-size;
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
&-body {
|
|
@@ -136,13 +142,6 @@
|
|
|
136
142
|
white-space: nowrap;
|
|
137
143
|
}
|
|
138
144
|
|
|
139
|
-
.nut-form-item-label-left-required {
|
|
140
|
-
display: block;
|
|
141
|
-
line-height: 1.5;
|
|
142
|
-
position: absolute;
|
|
143
|
-
left: 0.1em;
|
|
144
|
-
}
|
|
145
|
-
|
|
146
145
|
.nut-form-item-top {
|
|
147
146
|
flex-direction: column;
|
|
148
147
|
align-items: flex-start;
|
|
@@ -22,16 +22,21 @@
|
|
|
22
22
|
text-align: var(--nutui-form-item-label-text-align, left);
|
|
23
23
|
line-height: unset;
|
|
24
24
|
}
|
|
25
|
-
.nut-form-item-label-required {
|
|
25
|
+
.nut-form-item-label-left-required {
|
|
26
26
|
color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
|
|
27
27
|
margin-right: var(--nutui-form-item-required-margin-right, 4px);
|
|
28
|
-
display: block;
|
|
29
28
|
position: absolute;
|
|
30
29
|
left: -10px;
|
|
31
30
|
}
|
|
31
|
+
.nut-form-item-label-right-required {
|
|
32
|
+
color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
|
|
33
|
+
margin-left: var(--nutui-form-item-required-margin-right, 4px);
|
|
34
|
+
position: absolute;
|
|
35
|
+
right: -10px;
|
|
36
|
+
}
|
|
32
37
|
.nut-form-item .nut-form-item-labeltxt {
|
|
33
38
|
position: relative;
|
|
34
|
-
font-size:
|
|
39
|
+
font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
|
|
35
40
|
}
|
|
36
41
|
.nut-form-item-body {
|
|
37
42
|
flex: 1;
|
|
@@ -121,13 +126,6 @@
|
|
|
121
126
|
white-space: nowrap;
|
|
122
127
|
}
|
|
123
128
|
|
|
124
|
-
.nut-form-item-label-left-required {
|
|
125
|
-
display: block;
|
|
126
|
-
line-height: 1.5;
|
|
127
|
-
position: absolute;
|
|
128
|
-
left: 0.1em;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
129
|
.nut-form-item-top {
|
|
132
130
|
flex-direction: column;
|
|
133
131
|
align-items: flex-start;
|
|
@@ -18,19 +18,25 @@
|
|
|
18
18
|
word-wrap: break-word;
|
|
19
19
|
text-align: $form-item-label-text-align;
|
|
20
20
|
line-height: unset;
|
|
21
|
-
}
|
|
22
21
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
22
|
+
&-left-required {
|
|
23
|
+
color: $form-item-required-color;
|
|
24
|
+
margin-right: $form-item-required-margin-right;
|
|
25
|
+
position: absolute;
|
|
26
|
+
left: -10px;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
&-right-required {
|
|
30
|
+
color: $form-item-required-color;
|
|
31
|
+
margin-left: $form-item-required-margin-right;
|
|
32
|
+
position: absolute;
|
|
33
|
+
right: -10px;
|
|
34
|
+
}
|
|
29
35
|
}
|
|
30
36
|
|
|
31
37
|
.nut-form-item-labeltxt {
|
|
32
38
|
position: relative;
|
|
33
|
-
font-size:
|
|
39
|
+
font-size: $form-item-label-font-size;
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
&-body {
|
|
@@ -136,13 +142,6 @@
|
|
|
136
142
|
white-space: nowrap;
|
|
137
143
|
}
|
|
138
144
|
|
|
139
|
-
.nut-form-item-label-left-required {
|
|
140
|
-
display: block;
|
|
141
|
-
line-height: 1.5;
|
|
142
|
-
position: absolute;
|
|
143
|
-
left: 0.1em;
|
|
144
|
-
}
|
|
145
|
-
|
|
146
145
|
.nut-form-item-top {
|
|
147
146
|
flex-direction: column;
|
|
148
147
|
align-items: flex-start;
|
|
@@ -22,16 +22,21 @@
|
|
|
22
22
|
text-align: var(--nutui-form-item-label-text-align, left);
|
|
23
23
|
line-height: unset;
|
|
24
24
|
}
|
|
25
|
-
.nut-form-item-label-required {
|
|
25
|
+
.nut-form-item-label-left-required {
|
|
26
26
|
color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
|
|
27
27
|
margin-right: var(--nutui-form-item-required-margin-right, 4px);
|
|
28
|
-
display: block;
|
|
29
28
|
position: absolute;
|
|
30
29
|
left: -10px;
|
|
31
30
|
}
|
|
31
|
+
.nut-form-item-label-right-required {
|
|
32
|
+
color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
|
|
33
|
+
margin-left: var(--nutui-form-item-required-margin-right, 4px);
|
|
34
|
+
position: absolute;
|
|
35
|
+
right: -10px;
|
|
36
|
+
}
|
|
32
37
|
.nut-form-item .nut-form-item-labeltxt {
|
|
33
38
|
position: relative;
|
|
34
|
-
font-size:
|
|
39
|
+
font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
|
|
35
40
|
}
|
|
36
41
|
.nut-form-item-body {
|
|
37
42
|
flex: 1;
|
|
@@ -121,13 +126,6 @@
|
|
|
121
126
|
white-space: nowrap;
|
|
122
127
|
}
|
|
123
128
|
|
|
124
|
-
.nut-form-item-label-left-required {
|
|
125
|
-
display: block;
|
|
126
|
-
line-height: 1.5;
|
|
127
|
-
position: absolute;
|
|
128
|
-
left: 0.1em;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
129
|
.nut-form-item-top {
|
|
132
130
|
flex-direction: column;
|
|
133
131
|
align-items: flex-start;
|
|
@@ -345,7 +345,7 @@ var NoticeBar = function NoticeBar(props) {
|
|
|
345
345
|
var val = ((rect === null || rect === void 0 ? void 0 : rect.height) || 0) - height;
|
|
346
346
|
_offset = moveOffset + Number(active === childCount - 1 && val / 2);
|
|
347
347
|
target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
|
|
348
|
-
target.style.height = "".concat(Number(height) * childCount, "px");
|
|
348
|
+
target.style.height = "".concat(Number(height) * (childCount + 1), "px");
|
|
349
349
|
target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
|
|
350
350
|
};
|
|
351
351
|
// 无缝滚动第一个元素位移控制
|
|
@@ -79,7 +79,9 @@ var InternalPickerRoller = function InternalPickerRoller(props, ref) {
|
|
|
79
79
|
var selectValue = function selectValue(move) {
|
|
80
80
|
onSelect === null || onSelect === void 0 ? void 0 : onSelect(options === null || options === void 0 ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
|
|
81
81
|
};
|
|
82
|
+
var isScroll = (0, _react.useRef)(false);
|
|
82
83
|
var handleTouchStart = function handleTouchStart(event) {
|
|
84
|
+
isScroll.current = true;
|
|
83
85
|
touch.start(event);
|
|
84
86
|
setStartY(touch.deltaY.current);
|
|
85
87
|
setStartTime(Date.now());
|
|
@@ -104,6 +106,7 @@ var InternalPickerRoller = function InternalPickerRoller(props, ref) {
|
|
|
104
106
|
} else {
|
|
105
107
|
handleMove(move, 'end');
|
|
106
108
|
}
|
|
109
|
+
isScroll.current = false;
|
|
107
110
|
setTimeout(function() {
|
|
108
111
|
touch.reset();
|
|
109
112
|
}, 0);
|
|
@@ -223,6 +226,11 @@ var InternalPickerRoller = function InternalPickerRoller(props, ref) {
|
|
|
223
226
|
handleTouchMove,
|
|
224
227
|
handleTouchEnd
|
|
225
228
|
]);
|
|
229
|
+
var onTransitionEnd = function onTransitionEnd() {
|
|
230
|
+
if (!isScroll.current) {
|
|
231
|
+
stopMomentumScroll();
|
|
232
|
+
}
|
|
233
|
+
};
|
|
226
234
|
return /*#__PURE__*/ _react.default.createElement(_components.View, {
|
|
227
235
|
className: "nut-pickerview-list",
|
|
228
236
|
ref: pickerRollerRef
|
|
@@ -235,7 +243,7 @@ var InternalPickerRoller = function InternalPickerRoller(props, ref) {
|
|
|
235
243
|
id: "".concat(classPrefix, "-").concat(uuid),
|
|
236
244
|
ref: rollerRef,
|
|
237
245
|
style: threeDimensional ? touchRollerStyle() : touchTiledStyle(),
|
|
238
|
-
onTransitionEnd:
|
|
246
|
+
onTransitionEnd: onTransitionEnd
|
|
239
247
|
}, threeDimensional && options.map(function(item, index) {
|
|
240
248
|
var _item_value;
|
|
241
249
|
var _obj;
|
|
@@ -5,7 +5,7 @@ export interface BaseDatePicker extends BaseProps {
|
|
|
5
5
|
defaultValue?: Date;
|
|
6
6
|
visible: boolean;
|
|
7
7
|
title: string;
|
|
8
|
-
type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes';
|
|
8
|
+
type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes' | '';
|
|
9
9
|
showChinese: boolean;
|
|
10
10
|
minuteStep: number;
|
|
11
11
|
startDate: Date;
|
|
@@ -286,6 +286,7 @@
|
|
|
286
286
|
color: $button-success-color;
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
+
&-disabled,
|
|
289
290
|
&-solid-disabled {
|
|
290
291
|
background: $button-success-disabled;
|
|
291
292
|
border-color: $button-success-disabled;
|
|
@@ -320,6 +321,7 @@
|
|
|
320
321
|
color: $button-info-color;
|
|
321
322
|
}
|
|
322
323
|
|
|
324
|
+
&-disabled,
|
|
323
325
|
&-solid-disabled {
|
|
324
326
|
background: $button-info-disabled;
|
|
325
327
|
border-color: $button-info-disabled;
|
|
@@ -354,6 +356,7 @@
|
|
|
354
356
|
color: $button-danger-color;
|
|
355
357
|
}
|
|
356
358
|
|
|
359
|
+
&-disabled,
|
|
357
360
|
&-solid-disabled {
|
|
358
361
|
background: $button-danger-disabled;
|
|
359
362
|
border-color: $button-danger-disabled;
|
|
@@ -239,7 +239,7 @@
|
|
|
239
239
|
.nut-button-success-children {
|
|
240
240
|
color: var(--nutui-button-success-color, #ffffff);
|
|
241
241
|
}
|
|
242
|
-
.nut-button-success-solid-disabled {
|
|
242
|
+
.nut-button-success-disabled, .nut-button-success-solid-disabled {
|
|
243
243
|
background: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
|
|
244
244
|
border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
|
|
245
245
|
}
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
.nut-button-info-children {
|
|
267
267
|
color: var(--nutui-button-info-color, #ffffff);
|
|
268
268
|
}
|
|
269
|
-
.nut-button-info-solid-disabled {
|
|
269
|
+
.nut-button-info-disabled, .nut-button-info-solid-disabled {
|
|
270
270
|
background: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
|
|
271
271
|
border-color: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
|
|
272
272
|
}
|
|
@@ -293,7 +293,7 @@
|
|
|
293
293
|
.nut-button-danger-children {
|
|
294
294
|
color: var(--nutui-button-danger-color, #ffffff);
|
|
295
295
|
}
|
|
296
|
-
.nut-button-danger-solid-disabled {
|
|
296
|
+
.nut-button-danger-disabled, .nut-button-danger-solid-disabled {
|
|
297
297
|
background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
|
|
298
298
|
border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
|
|
299
299
|
}
|
|
@@ -262,6 +262,10 @@
|
|
|
262
262
|
.nut-button-success-children {
|
|
263
263
|
color: #ffffff;
|
|
264
264
|
}
|
|
265
|
+
.nut-button-success-disabled {
|
|
266
|
+
background: #b2f0ae;
|
|
267
|
+
border-color: #b2f0ae;
|
|
268
|
+
}
|
|
265
269
|
.nut-button-success-solid-disabled {
|
|
266
270
|
background: #b2f0ae;
|
|
267
271
|
border-color: #b2f0ae;
|
|
@@ -297,6 +301,10 @@
|
|
|
297
301
|
.nut-button-info-children {
|
|
298
302
|
color: #ffffff;
|
|
299
303
|
}
|
|
304
|
+
.nut-button-info-disabled {
|
|
305
|
+
background: #89a6f8;
|
|
306
|
+
border-color: #89a6f8;
|
|
307
|
+
}
|
|
300
308
|
.nut-button-info-solid-disabled {
|
|
301
309
|
background: #89a6f8;
|
|
302
310
|
border-color: #89a6f8;
|
|
@@ -332,6 +340,10 @@
|
|
|
332
340
|
.nut-button-danger-children {
|
|
333
341
|
color: #ffffff;
|
|
334
342
|
}
|
|
343
|
+
.nut-button-danger-disabled {
|
|
344
|
+
background: #ffadbe;
|
|
345
|
+
border-color: #ffadbe;
|
|
346
|
+
}
|
|
335
347
|
.nut-button-danger-solid-disabled {
|
|
336
348
|
background: #ffadbe;
|
|
337
349
|
border-color: #ffadbe;
|
|
@@ -286,6 +286,7 @@
|
|
|
286
286
|
color: $button-success-color;
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
+
&-disabled,
|
|
289
290
|
&-solid-disabled {
|
|
290
291
|
background: $button-success-disabled;
|
|
291
292
|
border-color: $button-success-disabled;
|
|
@@ -320,6 +321,7 @@
|
|
|
320
321
|
color: $button-info-color;
|
|
321
322
|
}
|
|
322
323
|
|
|
324
|
+
&-disabled,
|
|
323
325
|
&-solid-disabled {
|
|
324
326
|
background: $button-info-disabled;
|
|
325
327
|
border-color: $button-info-disabled;
|
|
@@ -354,6 +356,7 @@
|
|
|
354
356
|
color: $button-danger-color;
|
|
355
357
|
}
|
|
356
358
|
|
|
359
|
+
&-disabled,
|
|
357
360
|
&-solid-disabled {
|
|
358
361
|
background: $button-danger-disabled;
|
|
359
362
|
border-color: $button-danger-disabled;
|
|
@@ -239,7 +239,7 @@
|
|
|
239
239
|
.nut-button-success-children {
|
|
240
240
|
color: var(--nutui-button-success-color, var(--nutui-color-text-dark));
|
|
241
241
|
}
|
|
242
|
-
.nut-button-success-solid-disabled {
|
|
242
|
+
.nut-button-success-disabled, .nut-button-success-solid-disabled {
|
|
243
243
|
background: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled));
|
|
244
244
|
border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled));
|
|
245
245
|
}
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
.nut-button-info-children {
|
|
267
267
|
color: var(--nutui-button-info-color, var(--nutui-color-text-dark));
|
|
268
268
|
}
|
|
269
|
-
.nut-button-info-solid-disabled {
|
|
269
|
+
.nut-button-info-disabled, .nut-button-info-solid-disabled {
|
|
270
270
|
background: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled));
|
|
271
271
|
border-color: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled));
|
|
272
272
|
}
|
|
@@ -293,7 +293,7 @@
|
|
|
293
293
|
.nut-button-danger-children {
|
|
294
294
|
color: var(--nutui-button-danger-color, var(--nutui-color-text-dark));
|
|
295
295
|
}
|
|
296
|
-
.nut-button-danger-solid-disabled {
|
|
296
|
+
.nut-button-danger-disabled, .nut-button-danger-solid-disabled {
|
|
297
297
|
background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled));
|
|
298
298
|
border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled));
|
|
299
299
|
}
|
|
@@ -286,6 +286,7 @@
|
|
|
286
286
|
color: $button-success-color;
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
+
&-disabled,
|
|
289
290
|
&-solid-disabled {
|
|
290
291
|
background: $button-success-disabled;
|
|
291
292
|
border-color: $button-success-disabled;
|
|
@@ -320,6 +321,7 @@
|
|
|
320
321
|
color: $button-info-color;
|
|
321
322
|
}
|
|
322
323
|
|
|
324
|
+
&-disabled,
|
|
323
325
|
&-solid-disabled {
|
|
324
326
|
background: $button-info-disabled;
|
|
325
327
|
border-color: $button-info-disabled;
|
|
@@ -354,6 +356,7 @@
|
|
|
354
356
|
color: $button-danger-color;
|
|
355
357
|
}
|
|
356
358
|
|
|
359
|
+
&-disabled,
|
|
357
360
|
&-solid-disabled {
|
|
358
361
|
background: $button-danger-disabled;
|
|
359
362
|
border-color: $button-danger-disabled;
|
|
@@ -239,7 +239,7 @@
|
|
|
239
239
|
.nut-button-success-children {
|
|
240
240
|
color: var(--nutui-button-success-color, var(--nutui-color-text-dark));
|
|
241
241
|
}
|
|
242
|
-
.nut-button-success-solid-disabled {
|
|
242
|
+
.nut-button-success-disabled, .nut-button-success-solid-disabled {
|
|
243
243
|
background: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled));
|
|
244
244
|
border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled));
|
|
245
245
|
}
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
.nut-button-info-children {
|
|
267
267
|
color: var(--nutui-button-info-color, var(--nutui-color-text-dark));
|
|
268
268
|
}
|
|
269
|
-
.nut-button-info-solid-disabled {
|
|
269
|
+
.nut-button-info-disabled, .nut-button-info-solid-disabled {
|
|
270
270
|
background: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled));
|
|
271
271
|
border-color: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled));
|
|
272
272
|
}
|
|
@@ -293,7 +293,7 @@
|
|
|
293
293
|
.nut-button-danger-children {
|
|
294
294
|
color: var(--nutui-button-danger-color, var(--nutui-color-text-dark));
|
|
295
295
|
}
|
|
296
|
-
.nut-button-danger-solid-disabled {
|
|
296
|
+
.nut-button-danger-disabled, .nut-button-danger-solid-disabled {
|
|
297
297
|
background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled));
|
|
298
298
|
border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled));
|
|
299
299
|
}
|
|
@@ -2,7 +2,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
|
2
2
|
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
3
3
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
4
4
|
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
5
|
-
import React, { useCallback, useEffect, useState } from "react";
|
|
5
|
+
import React, { useCallback, useEffect, useState, useRef } from "react";
|
|
6
6
|
import classNames from "classnames";
|
|
7
7
|
import { View } from "@tarojs/components";
|
|
8
8
|
import { ArrowLeft, ArrowRight, DoubleLeft, DoubleRight } from "./icon";
|
|
@@ -17,7 +17,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
17
17
|
var prefixCls = 'nut-calendarcard';
|
|
18
18
|
export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
|
|
19
19
|
var locale = useConfig().locale;
|
|
20
|
-
var _$_object_spread = _object_spread({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, type = _$_object_spread.type, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
|
|
20
|
+
var _$_object_spread = _object_spread({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, type = _$_object_spread.type, title = _$_object_spread.title, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
|
|
21
|
+
var onPageChangeRef = useRef(onPageChange);
|
|
21
22
|
// 当前月份信息
|
|
22
23
|
var _useState = _sliced_to_array(useState(function() {
|
|
23
24
|
var date = new Date(Date.now());
|
|
@@ -92,13 +93,18 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
|
|
|
92
93
|
firstDayOfWeek
|
|
93
94
|
]);
|
|
94
95
|
useEffect(function() {
|
|
96
|
+
onPageChangeRef.current = onPageChange;
|
|
97
|
+
}, [
|
|
98
|
+
onPageChange
|
|
99
|
+
]);
|
|
100
|
+
useEffect(function() {
|
|
101
|
+
var _onPageChangeRef_current;
|
|
95
102
|
var newDays = getDays(month);
|
|
96
103
|
setDays(newDays);
|
|
97
|
-
|
|
104
|
+
(_onPageChangeRef_current = onPageChangeRef.current) === null || _onPageChangeRef_current === void 0 ? void 0 : _onPageChangeRef_current.call(onPageChangeRef, month);
|
|
98
105
|
}, [
|
|
99
106
|
month,
|
|
100
107
|
getDays,
|
|
101
|
-
onPageChange,
|
|
102
108
|
firstDayOfWeek
|
|
103
109
|
]);
|
|
104
110
|
var isSameDay = function(day1, day2) {
|
|
@@ -387,6 +393,6 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
|
|
|
387
393
|
return days.length > 0 ? /*#__PURE__*/ React.createElement(View, {
|
|
388
394
|
className: classNames(prefixCls, className),
|
|
389
395
|
style: style
|
|
390
|
-
}, renderHeader(), renderContent()) : null;
|
|
396
|
+
}, title || renderHeader(), renderContent()) : null;
|
|
391
397
|
});
|
|
392
398
|
CalendarCard.displayName = 'NutCalendarCard';
|