Мелкие доработки

This commit is contained in:
Book Pauk
2022-10-31 20:53:29 +07:00
parent 8982b3eaf0
commit 548f18430d
2 changed files with 15 additions and 2 deletions

View File

@@ -408,6 +408,7 @@ class Search {
}; };
searchDate = ''; searchDate = '';
prevManualDate = '';
//settings //settings
showCounts = true; showCounts = true;
@@ -977,6 +978,10 @@ class Search {
updateSearchDate(toLocal) { updateSearchDate(toLocal) {
if (toLocal) { if (toLocal) {
let local = this.search.date || ''; let local = this.search.date || '';
if (this.isManualDate(local) || !local)
this.prevManualDate = local;
if (this.isManualDate(local)) if (this.isManualDate(local))
local = 'manual'; local = 'manual';
@@ -1004,8 +1009,9 @@ class Search {
dateSelectItemClick(itemValue) { dateSelectItemClick(itemValue) {
if (itemValue == 'manual') { if (itemValue == 'manual') {
if (!this.isManualDate(this.search.date)) { if (!this.isManualDate(this.search.date)) {
this.search.date = ''; this.search.date = this.prevManualDate;
this.searchDate = ''; if (!this.search.date)
this.searchDate = '';
} }
this.selectDateDialogVisible = true this.selectDateDialogVisible = true
} }

View File

@@ -96,7 +96,14 @@ class SelectDateDialog {
this.to = this.splitDate.to; this.to = this.splitDate.to;
} }
isManualDate(date) {
return date && utils.isDigit(date[0]) && utils.isDigit(date[1]);
}
get splitDate() { get splitDate() {
if (!this.isManualDate(this.date))
return {from: '', to: ''};
const [from = '', to = ''] = (this.date || '').split(','); const [from = '', to = ''] = (this.date || '').split(',');
return {from, to}; return {from, to};
} }