From 6dfb3f6db95588245028a25205860f134539aee7 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 20:10:43 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                             |  7 ++++++-
 .../Search/BookInfoDialog/BookInfoDialog.vue          | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index dc81796..8e46141 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -133,8 +133,13 @@ body, html, #app {
     animation: rotating 2s linear infinite;
 }
 
+.q-dialog__inner--minimized {
+    padding: 10px !important;
+}
+
 .q-dialog__inner--minimized > div {
-    max-width: 800px;
+    max-height: 100% !important;
+    max-width: 800px !important;
 }
 
 @keyframes rotating { 
diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index f5f08fa..34e96a7 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -17,7 +17,7 @@
             </div>
 
             <div class="row q-mt-sm no-wrap">
-                <div class="column justify-center" style="height: 300px; width: 200px;">
+                <div class="column justify-center" style="height: 300px; width: 200px; min-width: 100px">
                     <img v-if="coverSrc" :src="coverSrc" class="fit row justify-center items-center" style="object-fit: contain" @error="coverSrc = ''" />
                     <div v-if="!coverSrc" class="fit row justify-center items-center text-grey-5" style="border: 1px solid #ccc; font-size: 300%">
                         <i>{{ book.ext }}</i>
@@ -81,6 +81,7 @@ import vueComponent from '../../vueComponent.js';
 import Dialog from '../../share/Dialog.vue';
 import Fb2Parser from '../../../../server/core/fb2/Fb2Parser';
 import * as utils from '../../../share/utils';
+import _ from 'lodash';
 
 const componentOptions = {
     components: {
@@ -169,7 +170,6 @@ class BookInfoDialog {
                 {name: 'author', label: 'Автор(ы)'},
                 {name: 'title', label: 'Название'},
                 {name: 'series', label: 'Серия'},
-                {name: 'serno', label: 'Номер в серии'},
                 {name: 'genre', label: 'Жанр'},
                 {name: 'librate', label: 'Оценка'},
                 {name: 'lang', label: 'Язык книги'},
@@ -190,7 +190,7 @@ class BookInfoDialog {
             if (nodePath == 'titleInfo/author')
                 return value.split(',').join(', ');
 
-            if ((nodePath == 'titleInfo/serno' || nodePath == 'titleInfo/librate') && !value)
+            if (nodePath == 'titleInfo/librate' && !value)
                 return null;
 
             if (typeof(value) === 'string') {
@@ -201,6 +201,9 @@ class BookInfoDialog {
         };
 
         let result = [];
+        const book = _.cloneDeep(this.book);
+        book.series = [book.series, book.serno].filter(v => v).join(' #');
+
         for (const item of mapping) {
             const itemOut = {name: item.name, label: item.label, value: []};
 
@@ -208,7 +211,7 @@ class BookInfoDialog {
                 const subItemOut = {
                     name: subItem.name,
                     label: subItem.label,
-                    value: valueToString(this.book[subItem.name], `${item.name}/${subItem.name}`)
+                    value: valueToString(book[subItem.name], `${item.name}/${subItem.name}`)
                 };
                 if (subItemOut.value)
                     itemOut.value.push(subItemOut);