deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки разметки

Browse Source
This commit is contained in:
Book Pauk
2022-10-27 18:48:02 +07:00
parent 529095e014
commit c33fc407d2
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/Search/AuthorList/AuthorList.vue
View File

@@ -152,7 +152,7 @@ class AuthorList extends BaseList {
} }
get foundCountMessage() { 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) { isFoundSeriesBook(seriesItem, seriesBook) {

25
client/components/Search/Search.vue
View File

@@ -113,22 +113,20 @@
</div> </div>
<div class="row items-center q-ml-lg q-mt-sm"> <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" /> <PageScroller v-show="pageCount > 1" ref="pageScroller1" v-model="search.page" :page-count="pageCount" />
</div> </div>
<div class="row items-center"> <div v-show="list.totalFound > 0" class="row items-center">
<div v-show="list.queryFound > 0" class="q-pl-sm"> {{ foundCountMessage }}
{{ foundCountMessage }}
</div>
</div> </div>
</div> </div>
<!-- Формирование списка ------------------------------------------------------------------------> <!-- Формирование списка ------------------------------------------------------------------------>
<div v-if="selectedListComponent"> <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" /> <component :is="selectedListComponent" ref="list" :list="list" :search="search" :genre-map="genreMap" @list-event="listEvent" />
<div><hr></div> <div class="separator" />
</div> </div>
<!-- Формирование списка конец ------------------------------------------------------------------> <!-- Формирование списка конец ------------------------------------------------------------------>
@@ -271,7 +269,10 @@ const componentOptions = {
if (this.prevList.totalFound != newValue.totalFound) { if (this.prevList.totalFound != newValue.totalFound) {
this.updatePageCount(); 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); this.prevList = _.cloneDeep(newValue);
@@ -281,7 +282,7 @@ const componentOptions = {
selectedList(newValue) { selectedList(newValue) {
this.selectedListComponent = (route2component[newValue] ? route2component[newValue].component : null); this.selectedListComponent = (route2component[newValue] ? route2component[newValue].component : null);
this.pageCount = 1; this.pageCount = 1;
this.foundCountMessage = ''; this.list.totalFound = 0;
if (this.getListRoute() != newValue) { if (this.getListRoute() != newValue) {
this.updateRouteQueryFromSearch(); this.updateRouteQueryFromSearch();
@@ -853,7 +854,7 @@ export default vueComponent(Search);
} }
.tool-panel { .tool-panel {
border-bottom: 1px solid black; border-bottom: 1px solid #bbb;
} }
.header { .header {
@@ -869,4 +870,8 @@ export default vueComponent(Search);
cursor: pointer; cursor: pointer;
} }
.separator {
border-bottom: 2px solid #ddd;
margin: 5px 0 5px 0;
}
</style> </style>

2
client/components/Search/SeriesList/SeriesList.vue
View File

@@ -117,7 +117,7 @@ import _ from 'lodash';
class SeriesList extends BaseList { class SeriesList extends BaseList {
get foundCountMessage() { 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) { isFoundSeriesBook(seriesItem, seriesBook) {

2
client/components/Search/TitleList/TitleList.vue
View File

@@ -43,7 +43,7 @@ import _ from 'lodash';
class TitleList extends BaseList { class TitleList extends BaseList {
get foundCountMessage() { 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() { async updateTableData() {