From c7073635e30304c192f9c07c875cad13501157ee Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 21 Aug 2022 18:44:06 +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=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue | 78 +++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 21 deletions(-)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index b0931b7..2c34b9e 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -82,13 +82,13 @@
             <div v-else class="q-my-sm" />
 
             <!-- Формирование списка ------------------------------------------------------------------------>
-            <div v-for="item in tableData" :key="item.key" :class="{'odd-author': item.num % 2}" style="font-size: 120%">
-                <div class="row items-center q-ml-md q-my-sm no-wrap">
+            <div v-for="item in tableData" :key="item.key" class="column" :class="{'odd-author': item.num % 2}" style="font-size: 120%">
+                <div class="row items-center q-ml-md q-my-xs no-wrap">
                     <div class="clickable q-mr-sm q-pa-xs">
-                        <div v-if="!isExpanded(item.author)" @click="expandAuthor(item.author, true)">
+                        <div v-if="!isExpanded(item)" @click="expandAuthor(item, true)">
                             <q-icon name="la la-plus-square" size="24px" />
                         </div>
-                        <div v-else @click="expandAuthor(item.author, false)">
+                        <div v-else @click="expandAuthor(item, false)">
                             <q-icon name="la la-minus-square" size="24px" />
                         </div>
                     </div>
@@ -97,6 +97,10 @@
                         {{ item.name }}
                     </div>
                 </div>
+
+                <div v-if="isExpanded(item) && item.books">
+                    {{ item.books[0] }}
+                </div>
             </div>
             <!-- Формирование списка конец ------------------------------------------------------------------>
 
@@ -111,6 +115,7 @@
 <script>
 //-----------------------------------------------------------------------------
 import vueComponent from '../vueComponent.js';
+const { reactive } = require('@vue/reactivity');
 
 import PageScroller from './PageScroller/PageScroller.vue';
 import * as utils from '../../share/utils';
@@ -154,13 +159,10 @@ const componentOptions = {
         totalFound() {
             this.updatePageCount();
         },
-        expanded: {
-            deep: true,
-            handler(newValue) {
-                const newSettings = _.cloneDeep(this.settings);
-                newSettings.expanded = _.cloneDeep(newValue);
-                this.commit('setSettings', newSettings);
-            },
+        expanded(newValue) {
+            const newSettings = _.cloneDeep(this.settings);
+            newSettings.expanded = _.cloneDeep(newValue);
+            this.commit('setSettings', newSettings);
         },
     },
 };
@@ -303,38 +305,72 @@ class Search {
         this.author = `=${author}`;
     }
 
-    isExpanded(author) {
-        return this.expanded.indexOf(author) >= 0;
+    isExpanded(item) {
+        return this.expanded.indexOf(item.author) >= 0;
     }
 
-    expandAuthor(author, expand = true) {
+    expandAuthor(item, expand = true) {
+        const expanded = _.cloneDeep(this.expanded);
+        const author = item.author;
+
         if (expand) {
-            if (this.expanded.indexOf(author) < 0)
-                this.expanded.push(author);
+            if (expanded.indexOf(author) < 0) {
+                expanded.push(author);
+
+                this.getBooks(item);
+
+                if (expanded.length > 100) {
+                    expanded.shift();
+                }
+
+                this.expanded = expanded;
+            }
         } else {
-            const i = this.expanded.indexOf(author);
-            if (i >= 0)
-                this.expanded.splice(i, 1);            
+            const i = expanded.indexOf(author);
+            if (i >= 0) {
+                expanded.splice(i, 1);
+                this.expanded = expanded;
+            }
         }
     }
 
+    async loadBooks() {
+    }
+
+    async getBooks(item) {
+        if (item.books)
+            return;
+        
+        await utils.sleep(1000);
+        item.books = [{name: 'book1'}];
+    }
+
     async updateTableData() {
         let result = [];
 
         const authors = this.searchResult.author;
         if (authors.length == 1) {
-            this.expandAuthor(authors[0].author);
+            this.expandAuthor(authors[0]);
         }
 
+        const expandedSet = new Set(this.expanded);
+
         let num = 0;
         for (const rec of authors) {
-            result.push({
+            const item = reactive({
                 key: rec.id,
                 num,
                 author: rec.author,
                 name: rec.author.replace(/,/g, ', '),
+                book: false,
             });
             num++;
+
+            if (expandedSet.has(item.author)) {
+                this.getBooks(item);//no await
+            }
+
+            result.push(item);
         }
 
         this.tableData = result;