@tidbcloud/uikit 2.0.0-beta.55.1 → 2.0.0-beta.55.2
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.
|
@@ -38,7 +38,7 @@ const DateTimePicker = ({
|
|
|
38
38
|
const [opened, { close, open }] = useDisclosure.useDisclosure(false);
|
|
39
39
|
const [currentValue, setCurrentValue] = useUncontrolled.useUncontrolled({
|
|
40
40
|
value: value ? dayjs(value) : void 0,
|
|
41
|
-
defaultValue: defaultValue ? dayjs(defaultValue) :
|
|
41
|
+
defaultValue: defaultValue ? dayjs(defaultValue) : dayjs(),
|
|
42
42
|
onChange: (v) => {
|
|
43
43
|
onChange == null ? void 0 : onChange(v.toDate());
|
|
44
44
|
}
|
|
@@ -47,20 +47,15 @@ const DateTimePicker = ({
|
|
|
47
47
|
const updateCurrentValue = ahooks.useMemoizedFn((val, from) => {
|
|
48
48
|
let next = val;
|
|
49
49
|
if ((currentValue == null ? void 0 : currentValue.unix()) === next.unix()) {
|
|
50
|
-
console.log("same");
|
|
51
50
|
return;
|
|
52
51
|
}
|
|
53
52
|
if (startDate && next.valueOf() < startDate.valueOf()) {
|
|
54
|
-
console.log("use start data", startDate);
|
|
55
53
|
next = dayjs(startDate);
|
|
56
54
|
} else if (endDate && next.valueOf() > endDate.valueOf()) {
|
|
57
|
-
console.log("use end data", endDate);
|
|
58
55
|
next = dayjs(endDate);
|
|
59
56
|
}
|
|
60
|
-
console.log("save next from", from, next.toDate());
|
|
61
57
|
setCurrentValue(next);
|
|
62
58
|
setCurrentValueChangedBy(from);
|
|
63
|
-
onChange == null ? void 0 : onChange(next.toDate());
|
|
64
59
|
setTimeout(() => {
|
|
65
60
|
setCurrentValueChangedBy(null);
|
|
66
61
|
}, 20);
|
|
@@ -83,7 +78,6 @@ const DateTimePicker = ({
|
|
|
83
78
|
});
|
|
84
79
|
const timeScrollPickerChange = ahooks.useMemoizedFn((v) => {
|
|
85
80
|
const [h, m, s] = v;
|
|
86
|
-
console.log("scroll change", v);
|
|
87
81
|
let next = currentValue;
|
|
88
82
|
next = next.utcOffset(utcOffset).hour(h).minute(m).second(s);
|
|
89
83
|
updateCurrentValue(next, "timeScroller");
|
|
@@ -36,7 +36,7 @@ const DateTimePicker = ({
|
|
|
36
36
|
const [opened, { close, open }] = useDisclosure(false);
|
|
37
37
|
const [currentValue, setCurrentValue] = useUncontrolled({
|
|
38
38
|
value: value ? dayjs(value) : void 0,
|
|
39
|
-
defaultValue: defaultValue ? dayjs(defaultValue) :
|
|
39
|
+
defaultValue: defaultValue ? dayjs(defaultValue) : dayjs(),
|
|
40
40
|
onChange: (v) => {
|
|
41
41
|
onChange == null ? void 0 : onChange(v.toDate());
|
|
42
42
|
}
|
|
@@ -45,20 +45,15 @@ const DateTimePicker = ({
|
|
|
45
45
|
const updateCurrentValue = useMemoizedFn((val, from) => {
|
|
46
46
|
let next = val;
|
|
47
47
|
if ((currentValue == null ? void 0 : currentValue.unix()) === next.unix()) {
|
|
48
|
-
console.log("same");
|
|
49
48
|
return;
|
|
50
49
|
}
|
|
51
50
|
if (startDate && next.valueOf() < startDate.valueOf()) {
|
|
52
|
-
console.log("use start data", startDate);
|
|
53
51
|
next = dayjs(startDate);
|
|
54
52
|
} else if (endDate && next.valueOf() > endDate.valueOf()) {
|
|
55
|
-
console.log("use end data", endDate);
|
|
56
53
|
next = dayjs(endDate);
|
|
57
54
|
}
|
|
58
|
-
console.log("save next from", from, next.toDate());
|
|
59
55
|
setCurrentValue(next);
|
|
60
56
|
setCurrentValueChangedBy(from);
|
|
61
|
-
onChange == null ? void 0 : onChange(next.toDate());
|
|
62
57
|
setTimeout(() => {
|
|
63
58
|
setCurrentValueChangedBy(null);
|
|
64
59
|
}, 20);
|
|
@@ -81,7 +76,6 @@ const DateTimePicker = ({
|
|
|
81
76
|
});
|
|
82
77
|
const timeScrollPickerChange = useMemoizedFn((v) => {
|
|
83
78
|
const [h, m, s] = v;
|
|
84
|
-
console.log("scroll change", v);
|
|
85
79
|
let next = currentValue;
|
|
86
80
|
next = next.utcOffset(utcOffset).hour(h).minute(m).second(s);
|
|
87
81
|
updateCurrentValue(next, "timeScroller");
|