Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a4cb3c628e | ||
|
|
8492da8a13 | ||
|
|
98d7c64a56 | ||
|
|
25f121e5ed | ||
|
|
4c8797c99c | ||
|
|
1155aa285d | ||
|
|
239bbb8263 | ||
|
|
e6b9330108 | ||
|
|
935b767c2e | ||
|
|
8acf3295b5 | ||
|
|
48c3a12fa0 | ||
|
|
a1dea514b7 | ||
|
|
d4788439cb | ||
|
|
0a60ad354c | ||
|
|
c565a20344 | ||
|
|
735ee88f0b | ||
|
|
9405ce2cc0 | ||
|
|
115277d88a | ||
|
|
6925c11dbd | ||
|
|
984d835892 | ||
|
|
23353a4960 | ||
|
|
955bcda032 | ||
|
|
81ad5d7a2c | ||
|
|
dada7980ec |
@@ -998,7 +998,6 @@ class Reader {
|
||||
classResult = classDisabled;
|
||||
break;
|
||||
case 'refresh':
|
||||
case 'recentBooks':
|
||||
if (!this.mostRecentBookReactive)
|
||||
classResult = classDisabled;
|
||||
break;
|
||||
@@ -1108,6 +1107,7 @@ class Reader {
|
||||
wasOpened = (wasOpened ? _.cloneDeep(wasOpened) : {});
|
||||
|
||||
wasOpened = Object.assign(wasOpened, {
|
||||
url: (opts.url !== undefined ? opts.url : wasOpened.url),
|
||||
path: (opts.path !== undefined ? opts.path : wasOpened.path),
|
||||
bookPos: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos),
|
||||
bookPosSeen: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen),
|
||||
|
||||
@@ -7,6 +7,20 @@
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<template #buttons>
|
||||
<div
|
||||
class="row justify-center items-center"
|
||||
:class="{'header-button': !archive, 'header-button-pressed': archive}"
|
||||
@mousedown.stop @click="archiveToggle"
|
||||
>
|
||||
<q-icon class="q-mr-xs" name="la la-archive" size="20px" />
|
||||
<span style="font-size: 90%">Архив</span>
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ (archive ? 'Скрыть архивные' : 'Показать архивные') }}
|
||||
</q-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<a ref="download" style="display: none;" target="_blank"></a>
|
||||
|
||||
<div id="vs-container" ref="vsContainer" class="recent-books-scroll col">
|
||||
@@ -86,7 +100,7 @@
|
||||
@virtual-scroll="onScroll"
|
||||
>
|
||||
<div class="table-row row" :class="{even: index % 2 > 0, 'active-book': item.active, 'active-parent-book': item.activeParent}">
|
||||
<div v-show="item.inGroup" class="row-part column justify-center items-center" style="width: 40px; border-right: 1px solid #cccccc">
|
||||
<div v-show="item.inGroup" class="row-part column justify-center items-center" style="width: 40px">
|
||||
<q-icon name="la la-code-branch" size="24px" style="color: green" />
|
||||
</div>
|
||||
|
||||
@@ -100,58 +114,86 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row-part column items-stretch clickable break-word" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
|
||||
<div class="row" style="font-size: 80%">
|
||||
<div class="row justify-center row-info-top" style="width: 30px">
|
||||
{{ item.num }}
|
||||
</div>
|
||||
<div class="row justify-center row-info-top" style="width: 130px">
|
||||
Читался: {{ item.touchTime }}
|
||||
</div>
|
||||
<div class="row justify-center row-info-top" style="width: 138px">
|
||||
Загружен: {{ item.loadTime }}
|
||||
</div>
|
||||
<div class="row justify-center row-info-top" style="width: 1px">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col q-mt-xs" :style="{ 'width': (340 - 40*(+item.inGroup)) + 'px' }">
|
||||
<div class="text-green-10" style="font-size: 105%">
|
||||
<div class="row-part column items-stretch clickable break-word" @click="loadBook(item)">
|
||||
<div
|
||||
class="col" style="border: 1px solid #cccccc; border-bottom: 0; padding: 4px; line-height: 140%;"
|
||||
:style="{ 'width': (380 - 40*(+item.inGroup)) + 'px' }"
|
||||
>
|
||||
<div class="text-green-10" style="font-size: 80%">
|
||||
{{ item.desc.author }}
|
||||
</div>
|
||||
<div>{{ item.desc.title }}</div>
|
||||
<!--div>{{ item.path }}</div-->
|
||||
<div style="font-size: 75%">
|
||||
{{ item.desc.title }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-mt-xs" style="font-size: 80%">
|
||||
<div class="row justify-center row-info-bottom" style="width: 60px">
|
||||
<div class="row" style="font-size: 10px">
|
||||
<div class="row justify-center items-center row-info-top" style="width: 60px">
|
||||
{{ item.desc.textLen }}
|
||||
</div>
|
||||
<div class="row justify-center row-info-bottom" style="width: 60px">
|
||||
|
||||
<div class="row items-center row-info-top" :style="`width: ${(260 - 40*(+item.inGroup))}px; padding: 1px`">
|
||||
<div class="read-bar" :style="`width: ${100*item.readPart}%`"></div>
|
||||
</div>
|
||||
|
||||
<div class="row justify-center items-center row-info-top" style="width: 59px">
|
||||
{{ item.desc.perc }}
|
||||
</div>
|
||||
<div class="row justify-center row-info-bottom" style="width: 1px">
|
||||
<div class="row-info-top" style="width: 1px">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="read-bar" :style="`width: ${(340 - 40*(+item.inGroup))*item.readPart}px`"></div>
|
||||
</div>
|
||||
|
||||
<div class="row-part column justify-center" style="width: 80px; font-size: 75%">
|
||||
<div>
|
||||
<a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br><br>
|
||||
<a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
|
||||
<div class="row" style="font-size: 10px" :style="{ 'width': (380 - 40*(+item.inGroup)) + 'px' }">
|
||||
<div class="row justify-center items-center row-info-bottom" style="width: 30px">
|
||||
{{ item.num }}
|
||||
</div>
|
||||
<div class="col row">
|
||||
<div class="row justify-center items-center row-info-bottom time-info" style="width: 50%">
|
||||
Загружен: {{ item.loadTime }}
|
||||
</div>
|
||||
<div class="row justify-center items-center row-info-bottom time-info" style="width: 50%">
|
||||
Читался: {{ item.touchTime }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-info-bottom" style="width: 1px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row-part column justify-center">
|
||||
<q-btn
|
||||
dense
|
||||
style="width: 30px; height: 30px; padding: 7px 0 7px 0; margin-left: 4px"
|
||||
<div
|
||||
class="row-part column"
|
||||
style="width: 90px;"
|
||||
>
|
||||
<div
|
||||
class="col column justify-center"
|
||||
style="font-size: 75%; padding-left: 6px; border: 1px solid #cccccc; border-left: 0;"
|
||||
>
|
||||
<div :style="`margin-top: ${(archive ? 20 : 0)}px`">
|
||||
<a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br><br>
|
||||
<a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="del-button self-end row justify-center items-center clickable"
|
||||
@click="handleDel(item.key)"
|
||||
>
|
||||
<q-icon class="la la-times" size="14px" />
|
||||
</q-btn>
|
||||
<q-icon class="la la-times" size="12px" />
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ (archive ? 'Удалить окончательно' : 'Перенести в архив') }}
|
||||
</q-tooltip>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-show="archive"
|
||||
class="restore-button self-start row justify-center items-center clickable"
|
||||
@click="handleRestore(item.key)"
|
||||
>
|
||||
<q-icon class="la la-arrow-left" size="14px" />
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
Восстановить из архива
|
||||
</q-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-virtual-scroll>
|
||||
@@ -196,6 +238,7 @@ class RecentBooksPage {
|
||||
tableData = [];
|
||||
sortMethod = '';
|
||||
showSameBook = false;
|
||||
archive = false;
|
||||
|
||||
created() {
|
||||
this.commit = this.$store.commit;
|
||||
@@ -247,7 +290,7 @@ class RecentBooksPage {
|
||||
|
||||
//подготовка полей
|
||||
for (const book of sorted) {
|
||||
if (book.deleted)
|
||||
if ((!this.archive && book.deleted) || (this.archive && book.deleted != 1))
|
||||
continue;
|
||||
|
||||
let d = new Date();
|
||||
@@ -274,6 +317,11 @@ class RecentBooksPage {
|
||||
const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
|
||||
|
||||
result.push({
|
||||
key: book.key,
|
||||
url: book.url,
|
||||
path: book.path,
|
||||
deleted: book.deleted,
|
||||
|
||||
touchTime,
|
||||
loadTime,
|
||||
desc: {
|
||||
@@ -283,10 +331,7 @@ class RecentBooksPage {
|
||||
textLen,
|
||||
},
|
||||
readPart,
|
||||
url: book.url,
|
||||
path: book.path,
|
||||
fullTitle: bt.fullTitle,
|
||||
key: book.key,
|
||||
sameBookKey: book.sameBookKey,
|
||||
active: (activeBook.key == book.key),
|
||||
activeParent: false,
|
||||
@@ -390,6 +435,8 @@ class RecentBooksPage {
|
||||
//.....
|
||||
|
||||
this.tableData = result;
|
||||
|
||||
this.$refs.virtualScroll.refresh();
|
||||
} finally {
|
||||
this.lock.ret();
|
||||
}
|
||||
@@ -403,7 +450,8 @@ class RecentBooksPage {
|
||||
wordEnding(num, type = 0) {
|
||||
const endings = [
|
||||
['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],
|
||||
['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й']
|
||||
['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],
|
||||
['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о']
|
||||
];
|
||||
const deci = num % 100;
|
||||
if (deci > 10 && deci < 20) {
|
||||
@@ -415,7 +463,7 @@ class RecentBooksPage {
|
||||
|
||||
get header() {
|
||||
const len = (this.tableData ? this.tableData.length : 0);
|
||||
return `${(this.search ? 'Найдено' : 'Всего')} ${len} файл${this.wordEnding(len)}`;
|
||||
return `${(this.search ? `Найден${this.wordEnding(len, 2)}` : 'Всего')} ${len} файл${this.wordEnding(len)}${this.archive ? ' в архиве' : ''}`;
|
||||
}
|
||||
|
||||
async downloadBook(fb2path, fullTitle) {
|
||||
@@ -441,15 +489,30 @@ class RecentBooksPage {
|
||||
}
|
||||
|
||||
async handleDel(key) {
|
||||
await bookManager.delRecentBook({key});
|
||||
//this.updateTableData();//обновление уже происходит Reader.bookManagerEvent
|
||||
|
||||
if (!bookManager.mostRecentBook())
|
||||
this.close();
|
||||
if (!this.archive) {
|
||||
await bookManager.delRecentBook({key});
|
||||
this.$root.notify.info('Перенесено в архив');
|
||||
} else {
|
||||
if (await this.$root.stdDialog.confirm('Подтвердите удаление из архива:', ' ')) {
|
||||
await bookManager.delRecentBook({key}, 2);
|
||||
this.$root.notify.info('Удалено безвозвратно');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
loadBook(row) {
|
||||
this.$emit('load-book', {url: row.url, path: row.path});
|
||||
async handleRestore(key) {
|
||||
await bookManager.restoreRecentBook({key});
|
||||
this.$root.notify.info('Восстановлено из архива');
|
||||
}
|
||||
|
||||
async loadBook(item) {
|
||||
//чтобы не обновлять лишний раз updateTableData
|
||||
this.inited = false;
|
||||
|
||||
if (item.deleted)
|
||||
await this.handleRestore(item.key);
|
||||
|
||||
this.$emit('load-book', {url: item.url, path: item.path});
|
||||
this.close();
|
||||
}
|
||||
|
||||
@@ -565,6 +628,11 @@ class RecentBooksPage {
|
||||
];
|
||||
}
|
||||
|
||||
archiveToggle() {
|
||||
this.archive = !this.archive;
|
||||
this.updateTableData();
|
||||
}
|
||||
|
||||
close() {
|
||||
this.$emit('recent-books-close');
|
||||
}
|
||||
@@ -599,11 +667,10 @@ export default vueComponent(RecentBooksPage);
|
||||
|
||||
.table-row {
|
||||
min-height: 80px;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
}
|
||||
|
||||
.row-part {
|
||||
padding: 4px 4px 4px 4px;
|
||||
padding: 4px 0px 4px 0px;
|
||||
}
|
||||
|
||||
.clickable {
|
||||
@@ -611,18 +678,11 @@ export default vueComponent(RecentBooksPage);
|
||||
}
|
||||
|
||||
.break-word {
|
||||
line-height: 180%;
|
||||
overflow-wrap: break-word;
|
||||
word-wrap: break-word;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.read-bar {
|
||||
height: 3px;
|
||||
background-color: #aaaaaa;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.even {
|
||||
background-color: #f2f2f2;
|
||||
}
|
||||
@@ -643,18 +703,6 @@ export default vueComponent(RecentBooksPage);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
.row-info-top {
|
||||
line-height: 110%;
|
||||
border-left: 1px solid #cccccc;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
}
|
||||
|
||||
.row-info-bottom {
|
||||
line-height: 110%;
|
||||
border: 1px solid #cccccc;
|
||||
border-right: 0;
|
||||
}
|
||||
|
||||
.tool-button {
|
||||
min-width: 30px;
|
||||
width: 30px;
|
||||
@@ -663,4 +711,78 @@ export default vueComponent(RecentBooksPage);
|
||||
margin: 10px 6px 0px 3px;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.row-info-bottom {
|
||||
line-height: 110%;
|
||||
border-left: 1px solid #cccccc;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.row-info-top {
|
||||
line-height: 110%;
|
||||
border: 1px solid #cccccc;
|
||||
border-right: 0;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.time-info, .row-info-top {
|
||||
color: #888888;
|
||||
}
|
||||
|
||||
.read-bar {
|
||||
height: 4px;
|
||||
background-color: #bbbbbb;
|
||||
}
|
||||
|
||||
.del-button {
|
||||
width: 25px;
|
||||
height: 20px;
|
||||
position: absolute;
|
||||
border-left: 1px solid #cccccc;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
border-radius: 0 0 0 10px;
|
||||
margin: 1px;
|
||||
}
|
||||
|
||||
.del-button:hover {
|
||||
color: white;
|
||||
background-color: #FF3030;
|
||||
}
|
||||
|
||||
.restore-button {
|
||||
width: 25px;
|
||||
height: 20px;
|
||||
position: absolute;
|
||||
border-right: 1px solid #cccccc;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
border-radius: 0 0 10px 0;
|
||||
margin: 1px;
|
||||
}
|
||||
|
||||
.restore-button:hover {
|
||||
color: white;
|
||||
background-color: #00bb00;
|
||||
}
|
||||
|
||||
.header-button, .header-button-pressed {
|
||||
width: 80px;
|
||||
height: 30px;
|
||||
cursor: pointer;
|
||||
color: #555555;
|
||||
}
|
||||
|
||||
.header-button:hover {
|
||||
color: white;
|
||||
background-color: #39902F;
|
||||
}
|
||||
|
||||
.header-button-pressed {
|
||||
color: black;
|
||||
background-color: yellow;
|
||||
}
|
||||
|
||||
.header-button-pressed:hover {
|
||||
color: black;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -3,6 +3,8 @@ import sax from '../../../../server/core/sax';
|
||||
import * as utils from '../../../share/utils';
|
||||
|
||||
const maxImageLineCount = 100;
|
||||
const maxParaLength = 10000;
|
||||
const maxParaTextLength = 10000;
|
||||
|
||||
// defaults
|
||||
const defaultSettings = {
|
||||
@@ -226,13 +228,26 @@ export default class BookParser {
|
||||
paraOffset += len;
|
||||
};
|
||||
|
||||
const growParagraph = (text, len) => {
|
||||
const growParagraph = (text, len, textRaw) => {
|
||||
//начальный параграф
|
||||
if (paraIndex < 0) {
|
||||
newParagraph();
|
||||
growParagraph(text, len);
|
||||
return;
|
||||
}
|
||||
|
||||
//ограничение на размер куска текста в параграфе
|
||||
if (textRaw && textRaw.length > maxParaTextLength) {
|
||||
while (textRaw.length > 0) {
|
||||
const textPart = textRaw.substring(0, maxParaTextLength);
|
||||
textRaw = textRaw.substring(maxParaTextLength);
|
||||
|
||||
newParagraph();
|
||||
growParagraph(textPart, textPart.length);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (inSubtitle) {
|
||||
curSubtitle.title += text;
|
||||
} else if (inTitle) {
|
||||
@@ -240,6 +255,14 @@ export default class BookParser {
|
||||
}
|
||||
|
||||
const p = para[paraIndex];
|
||||
|
||||
//ограничение на размер параграфа
|
||||
if (p.length > maxParaLength) {
|
||||
newParagraph();
|
||||
growParagraph(text, len);
|
||||
return;
|
||||
}
|
||||
|
||||
p.length += len;
|
||||
p.text += text;
|
||||
paraOffset += len;
|
||||
@@ -536,7 +559,7 @@ export default class BookParser {
|
||||
tClose += (center ? '</center>' : '');
|
||||
|
||||
if (text != ' ')
|
||||
growParagraph(`${tOpen}${text}${tClose}`, text.length);
|
||||
growParagraph(`${tOpen}${text}${tClose}`, text.length, text);
|
||||
else
|
||||
growParagraph(' ', 1);
|
||||
}
|
||||
|
||||
@@ -433,9 +433,9 @@ class BookManager {
|
||||
return this.recent[value.key];
|
||||
}
|
||||
|
||||
async delRecentBook(value) {
|
||||
async delRecentBook(value, delFlag = 1) {
|
||||
const item = this.recent[value.key];
|
||||
item.deleted = 1;
|
||||
item.deleted = delFlag;
|
||||
|
||||
if (this.recentLastKey == value.key) {
|
||||
await this.recentSetLastKey(null);
|
||||
@@ -445,6 +445,13 @@ class BookManager {
|
||||
this.emit('recent-deleted', value.key);
|
||||
}
|
||||
|
||||
async restoreRecentBook(value) {
|
||||
const item = this.recent[value.key];
|
||||
item.deleted = 0;
|
||||
|
||||
await this.recentSetItem(item);
|
||||
}
|
||||
|
||||
async cleanRecentBooks() {
|
||||
const sorted = this.getSortedRecent();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user