Browse Source

Правка багов

Book Pauk 6 years ago
parent
commit
be8a66ac39

+ 11 - 3
client/components/Reader/HistoryPage/HistoryPage.vue

@@ -36,11 +36,18 @@
                     <el-table-column
                     <el-table-column
                         >
                         >
                         <template slot="header" slot-scope="scope"><!-- eslint-disable-line vue/no-unused-vars -->
                         <template slot="header" slot-scope="scope"><!-- eslint-disable-line vue/no-unused-vars -->
-                            <el-input
-                                v-model="search"
+                            <!--el-input ref="input"
+                                :value="search" @input="search = $event"
                                 size="mini"
                                 size="mini"
                                 style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 10px"
                                 style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 10px"
-                                placeholder="Найти"/>
+                                placeholder="Найти"/-->
+                                <div class="el-input el-input--mini">
+                                    <input class="el-input__inner"
+                                        placeholder="Найти"
+                                        style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 20px; padding: 0 10px 0 10px"
+                                        :value="search" @input="search = $event.target.value"
+                                    />
+                                </div>
                         </template>
                         </template>
 
 
                         <el-table-column
                         <el-table-column
@@ -146,6 +153,7 @@ class HistoryPage extends Vue {
         return result.filter(item => {
         return result.filter(item => {
             return !search ||
             return !search ||
                 item.touchTime.includes(search) ||
                 item.touchTime.includes(search) ||
+                item.touchDate.includes(search) ||
                 item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
                 item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
                 item.desc.author.toLowerCase().includes(search.toLowerCase())
                 item.desc.author.toLowerCase().includes(search.toLowerCase())
         });
         });

+ 3 - 3
client/components/Reader/Reader.vue

@@ -375,12 +375,12 @@ class Reader extends Vue {
     keyHook(event) {
     keyHook(event) {
         if (this.$root.rootRoute == '/reader') {
         if (this.$root.rootRoute == '/reader') {
             let handled = false;
             let handled = false;
-            if (this.$refs.page && this.$refs.page.keyHook)
-                handled = this.$refs.page.keyHook(event);
-
             if (this.historyActive)
             if (this.historyActive)
                 handled = this.$refs.historyPage.keyHook(event);
                 handled = this.$refs.historyPage.keyHook(event);
 
 
+            if (!handled && this.$refs.page && this.$refs.page.keyHook)
+                handled = this.$refs.page.keyHook(event);
+
             if (!handled && event.type == 'keydown') {
             if (!handled && event.type == 'keydown') {
                 switch (event.code) {
                 switch (event.code) {
                     case 'Escape':
                     case 'Escape':