From c33fc407d2b7c9099fda3502481de01054d1426f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 27 Oct 2022 18:48:02 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/AuthorList/AuthorList.vue          |  2 +-
 client/components/Search/Search.vue           | 25 +++++++++++--------
 .../Search/SeriesList/SeriesList.vue          |  2 +-
 .../components/Search/TitleList/TitleList.vue |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/client/components/Search/AuthorList/AuthorList.vue b/client/components/Search/AuthorList/AuthorList.vue
index 4fbe4ba..44378b1 100644
--- a/client/components/Search/AuthorList/AuthorList.vue
+++ b/client/components/Search/AuthorList/AuthorList.vue
@@ -152,7 +152,7 @@ class AuthorList extends BaseList {
     }
 
     get foundCountMessage() {
-        return `Всего найден${utils.wordEnding(this.list.totalFound, 2)} ${this.list.totalFound} автор${utils.wordEnding(this.list.totalFound)}`;
+        return `${this.list.totalFound} автор${utils.wordEnding(this.list.totalFound)} найден${utils.wordEnding(this.list.totalFound, 2)}`;
     }    
 
     isFoundSeriesBook(seriesItem, seriesBook) {
diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index e0b6217..94dba00 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -113,22 +113,20 @@
             </div>
 
             <div class="row items-center q-ml-lg q-mt-sm">
-                <div style="width: 400px; height: 48px">
+                <div style="width: 400px; height: 50px">
                     <PageScroller v-show="pageCount > 1" ref="pageScroller1" v-model="search.page" :page-count="pageCount" />
                 </div>
 
-                <div class="row items-center">
-                    <div v-show="list.queryFound > 0" class="q-pl-sm">
-                        {{ foundCountMessage }}
-                    </div>
+                <div v-show="list.totalFound > 0" class="row items-center">
+                    {{ foundCountMessage }}
                 </div>
             </div>
 
             <!-- Формирование списка ------------------------------------------------------------------------>
             <div v-if="selectedListComponent">
-                <div><hr></div>
+                <div class="separator" />
                 <component :is="selectedListComponent" ref="list" :list="list" :search="search" :genre-map="genreMap" @list-event="listEvent" />
-                <div><hr></div>
+                <div class="separator" />
             </div>
             <!-- Формирование списка конец ------------------------------------------------------------------>
 
@@ -271,7 +269,10 @@ const componentOptions = {
 
                 if (this.prevList.totalFound != newValue.totalFound) {
                     this.updatePageCount();
-                    this.foundCountMessage = this.$refs.list.foundCountMessage;
+                    if (this.$refs.list)
+                        this.foundCountMessage = this.$refs.list.foundCountMessage;
+                    else
+                        this.foundCountMessage = '';
                 }
 
                 this.prevList = _.cloneDeep(newValue);
@@ -281,7 +282,7 @@ const componentOptions = {
         selectedList(newValue) {
             this.selectedListComponent = (route2component[newValue] ? route2component[newValue].component : null);
             this.pageCount = 1;
-            this.foundCountMessage = '';
+            this.list.totalFound = 0;
 
             if (this.getListRoute() != newValue) {
                 this.updateRouteQueryFromSearch();
@@ -853,7 +854,7 @@ export default vueComponent(Search);
 }
 
 .tool-panel {
-    border-bottom: 1px solid black;
+    border-bottom: 1px solid #bbb;
 }
 
 .header {
@@ -869,4 +870,8 @@ export default vueComponent(Search);
     cursor: pointer;
 }
 
+.separator {
+    border-bottom: 2px solid #ddd;
+    margin: 5px 0 5px 0;
+}
 </style>
diff --git a/client/components/Search/SeriesList/SeriesList.vue b/client/components/Search/SeriesList/SeriesList.vue
index c91c09d..24b4b00 100644
--- a/client/components/Search/SeriesList/SeriesList.vue
+++ b/client/components/Search/SeriesList/SeriesList.vue
@@ -117,7 +117,7 @@ import _ from 'lodash';
 
 class SeriesList extends BaseList {
     get foundCountMessage() {
-        return `Всего найден${utils.wordEnding(this.list.totalFound, 4)} ${this.list.totalFound} сери${utils.wordEnding(this.list.totalFound, 1)}`;
+        return `${this.list.totalFound} сери${utils.wordEnding(this.list.totalFound, 1)} найден${utils.wordEnding(this.list.totalFound, 4)}`;
     }
 
     isFoundSeriesBook(seriesItem, seriesBook) {
diff --git a/client/components/Search/TitleList/TitleList.vue b/client/components/Search/TitleList/TitleList.vue
index 13d887d..05a019d 100644
--- a/client/components/Search/TitleList/TitleList.vue
+++ b/client/components/Search/TitleList/TitleList.vue
@@ -43,7 +43,7 @@ import _ from 'lodash';
 
 class TitleList extends BaseList {
     get foundCountMessage() {
-        return `Всего найден${utils.wordEnding(this.list.totalFound, 7)} ${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)}`;
+        return `${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)} найден${utils.wordEnding(this.list.totalFound, 7)}`;
     }
 
     async updateTableData() {