Исправления багов, мелкий рефакторинг

This commit is contained in:
Book Pauk
2022-10-31 21:04:36 +07:00
parent 548f18430d
commit 0e4344995c
4 changed files with 14 additions and 16 deletions

View File

@@ -971,18 +971,14 @@ class Search {
}
}
isManualDate(date) {
return date && utils.isDigit(date[0]) && utils.isDigit(date[1]);
}
updateSearchDate(toLocal) {
if (toLocal) {
let local = this.search.date || '';
if (this.isManualDate(local) || !local)
if (utils.isManualDate(local) || !local)
this.prevManualDate = local;
if (this.isManualDate(local))
if (utils.isManualDate(local))
local = 'manual';
this.searchDate = local;
@@ -995,7 +991,7 @@ class Search {
get formatSearchDate() {
const result = [];
const date = this.search.date;
if (this.isManualDate(date)) {
if (utils.isManualDate(date)) {
const [from, to] = date.split(',')
if (from)
result.push(`<div style="display: inline-block; width: 15px; text-align: right;">от</div> ${utils.sqlDateFormat(from)}`);
@@ -1008,7 +1004,7 @@ class Search {
dateSelectItemClick(itemValue) {
if (itemValue == 'manual') {
if (!this.isManualDate(this.search.date)) {
if (!utils.isManualDate(this.search.date)) {
this.search.date = this.prevManualDate;
if (!this.search.date)
this.searchDate = '';