From 56d13288ffef22305a1c9c7af167eb1e29e2d16e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 20 Feb 2019 18:04:05 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=B0,=20=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/TextPage/DrawHelper.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/components/Reader/TextPage/DrawHelper.js b/client/components/Reader/TextPage/DrawHelper.js index c15107e9..9e5504a2 100644 --- a/client/components/Reader/TextPage/DrawHelper.js +++ b/client/components/Reader/TextPage/DrawHelper.js @@ -45,11 +45,12 @@ export default class DrawHelper { last: Boolean, parts: array of { style: {bold: Boolean, italic: Boolean, center: Boolean}, - image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, resize: Boolean, paraIndex: Number}, + image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number}, text: String, } }*/ let sel = new Set(); + //поиск if (i == 0 && this.searching) { let pureText = ''; for (const part of line.parts) { @@ -73,6 +74,7 @@ export default class DrawHelper { let lineText = ''; let center = false; let j = 0; + //формируем строку for (const part of line.parts) { let tOpen = (part.style.bold ? '' : ''); tOpen += (part.style.italic ? '' : ''); @@ -88,12 +90,15 @@ export default class DrawHelper { } else text = part.text; + if (text.trim() == '') + text = `${text}`; + lineText += `${tOpen}${text}${tClose}`; center = center || part.style.center; //избражения - //image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, resize: Boolean, paraIndex: Number}, + //image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number}, const img = part.image; if (img && img.id && !img.inline && !imageDrawn.has(img.paraIndex)) { if (img.local) { @@ -122,6 +127,7 @@ export default class DrawHelper { const centerStyle = (center ? `text-align: center; text-align-last: center; width: ${this.w}px` : '') if (line.first && !center) lineText = `${lineText}`; + if (line.last || center) lineText = `${lineText}`;