diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts index 587b1f428..af9e9b0b1 100644 --- a/app/src/mobile/util/keyboardToolbar.ts +++ b/app/src/mobile/util/keyboardToolbar.ts @@ -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"); diff --git a/kernel/av/filter.go b/kernel/av/filter.go index 68c8a2add..52d185f81 100644 --- a/kernel/av/filter.go +++ b/kernel/av/filter.go @@ -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())