Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-07 16:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2026-02-06 10:38:05 +08:00
commit 5ea807a6db
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/mobile/util/keyboardToolbar.ts
View file

@ -609,12 +609,12 @@ export const initKeyboardToolbar = () => {
if (type === "done") {
if (toolbarElement.clientHeight > 100) {
hideKeyboardToolbarUtil();
focusByRange(range);
if (window.JSAndroid && window.JSAndroid.showKeyboard) {
window.JSAndroid.showKeyboard();
} else if (window.JSHarmony && window.JSHarmony.showKeyboard) {
window.JSHarmony.showKeyboard();
}
setTimeout(() => focusByRange(range), 256);
} else {
activeBlur();
}
@ -696,7 +696,12 @@ export const initKeyboardToolbar = () => {
} else if (type === "add") {
if (buttonElement.classList.contains("protyle-toolbar__item--current")) {
hideKeyboardToolbarUtil();
focusByRange(range);
if (window.JSAndroid && window.JSAndroid.showKeyboard) {
window.JSAndroid.showKeyboard();
} else if (window.JSHarmony && window.JSHarmony.showKeyboard) {
window.JSHarmony.showKeyboard();
}
setTimeout(() => focusByRange(range), 256);
} else {
(document.activeElement as HTMLElement)?.blur();
buttonElement.classList.add("protyle-toolbar__item--current");

8
kernel/av/filter.go
View file

@ -956,10 +956,10 @@ func calcRelativeTimeRegion(count int, unit RelativeDateUnit, direction Relative
// 结束时间：今天的 23:59:59.999999999
end = time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 999999999, now.Location())
case RelativeDateDirectionAfter:
// 开始时间：今天的 23:59:59.999999999
start = time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 999999999, now.Location())
// 结束时间：开始时间加上 count 天
end = start.AddDate(0, 0, count)
// 开始时间：今天的 0 点加上 count 天
start = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).AddDate(0, 0, count)
// 结束时间：开始时间的 23:59:59.999999999
end = time.Date(start.Year(), start.Month(), start.Day(), 23, 59, 59, 999999999, now.Location())
}
case RelativeDateUnitWeek:
weekday := int(now.Weekday())