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-08-20 02:48:50 +07:00
parent 40d6b9c807
commit 507c2a0bbd
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@
<div class="q-mx-xs" /> <div class="q-mx-xs" />
<div class="row items-center q-mt-xs"> <div class="row items-center q-mt-xs">
<div v-show="queryFound > 0"> <div v-show="queryFound > 0">
Найдено {{ totalFound }} авторов {{ foundAuthorsMessage }}
</div> </div>
<div v-show="queryFound == 0"> <div v-show="queryFound == 0">
Ничего не найдено Ничего не найдено
@@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div v-show="totalPages > 1" class="row justify-center items-center q-ml-md q-my-xs" style="font-size: 120%"> <div v-if="totalPages > 1" class="row justify-center items-center q-ml-md q-my-xs" style="font-size: 120%">
<div class="q-mr-xs"> <div class="q-mr-xs">
Страница Страница
</div> </div>
@@ -87,14 +87,17 @@
из {{ totalPages }} из {{ totalPages }}
</div> </div>
</div> </div>
<div v-else class="q-my-sm" />
<!-- Формирование списка ------------------------------------------------------------------------>
<div v-for="item in tableData" :key="item.key" style="border-bottom: 1px solid #aaaaaa"> <div v-for="item in tableData" :key="item.key" style="border-bottom: 1px solid #aaaaaa">
<div class="q-my-sm q-ml-md" style="font-size: 120%"> <div v-if="item.type == 'author'" class="q-my-sm q-ml-md clickable" style="font-size: 120%" @click="authorClick(item.value)">
{{ item.value }} {{ item.key }} {{ item.name }}
</div> </div>
</div> </div>
<!-- Формирование списка конец ------------------------------------------------------------------>
<div v-show="totalPages > 1" class="row justify-center items-center q-ml-md q-my-xs" style="font-size: 120%"> <div v-if="totalPages > 1" class="row justify-center items-center q-ml-md q-my-xs" style="font-size: 120%">
<div class="q-mr-xs"> <div class="q-mr-xs">
Страница Страница
</div> </div>
@@ -105,6 +108,7 @@
из {{ totalPages }} из {{ totalPages }}
</div> </div>
</div> </div>
<div v-else class="q-my-sm" />
</div> </div>
</div> </div>
</template> </template>
@@ -255,18 +259,26 @@ class Search {
this.lastScrollTop = curScrollTop; this.lastScrollTop = curScrollTop;
} }
get foundAuthorsMessage() {
return `Найден${utils.wordEnding(this.totalFound, 2)} ${this.totalFound} автор${utils.wordEnding(this.totalFound)}`;
}
updatePageCount() { updatePageCount() {
this.totalPages = Math.floor(this.totalFound/this.limit); this.totalPages = Math.ceil(this.totalFound/this.limit);
this.totalPages = (this.totalPages < 1 ? 1 : this.totalPages); this.totalPages = (this.totalPages < 1 ? 1 : this.totalPages);
if (this.page > this.totalPages) if (this.page > this.totalPages)
this.page = 1; this.page = 1;
} }
authorClick(authorName) {
this.author = `=${authorName}`;
}
async updateTableData() { async updateTableData() {
let result = []; let result = [];
for (const rec of this.searchResult.author) { for (const rec of this.searchResult.author) {
result.push({key: rec.id, value: `${rec.id} ${rec.author.replace(/,/g, ', ')}`}); result.push({key: rec.id, type: 'author', value: rec.author, name: rec.author.replace(/,/g, ', ')});
} }
this.tableData = result; this.tableData = result;

14
client/share/utils.js
View File

@@ -28,3 +28,17 @@ export function keyEventToCode(event) {
return result.join('+'); return result.join('+');
} }
export function wordEnding(num, type = 0) {
const endings = [
['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],
['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],
['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
['ий', 'ие', 'ия', 'ия', 'ия', 'ий', 'ий', 'ий', 'ий', 'ий']
];
const deci = num % 100;
if (deci > 10 && deci < 20) {
return endings[type][0];
} else {
return endings[type][num % 10];
}
}