Эх сурвалжийг харах

Мелкие поправки

Book Pauk 5 жил өмнө
parent
commit
755c6b92da

+ 1 - 4
client/components/Reader/HistoryPage/HistoryPage.vue

@@ -123,7 +123,6 @@ class HistoryPage extends Vue {
     loading = false;
     loading = false;
     search = null;
     search = null;
     tableData = [];
     tableData = [];
-    key = 0;
 
 
     created() {
     created() {
     }
     }
@@ -164,13 +163,12 @@ class HistoryPage extends Vue {
     }
     }
 
 
     rowKey(row) {
     rowKey(row) {
-        return row.rowKey;
+        return row.key;
     }
     }
 
 
     async updateTableData(limit) {
     async updateTableData(limit) {
         while (this.updating) await utils.sleep(100);
         while (this.updating) await utils.sleep(100);
         this.updating = true;
         this.updating = true;
-        this.key++;
         let result = [];
         let result = [];
 
 
         this.loading = !!limit;
         this.loading = !!limit;
@@ -232,7 +230,6 @@ class HistoryPage extends Vue {
                 url: book.url,
                 url: book.url,
                 path: book.path,
                 path: book.path,
                 key: book.key,
                 key: book.key,
-                rowKey: book.key + this.key.toString(),
             });
             });
             if (result.length >= 100)
             if (result.length >= 100)
                 break;
                 break;

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

@@ -73,7 +73,7 @@
             <SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage>
             <SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage>
             <HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage>
             <HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage>
             <ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
             <ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
-            <!--ServerStorage v-show="hidden" ref="serverStorage"></ServerStorage-->
+            <ServerStorage v-show="hidden" ref="serverStorage"></ServerStorage>
 
 
             <el-dialog
             <el-dialog
                 title="Что нового:"
                 title="Что нового:"
@@ -110,7 +110,7 @@ import HistoryPage from './HistoryPage/HistoryPage.vue';
 import SettingsPage from './SettingsPage/SettingsPage.vue';
 import SettingsPage from './SettingsPage/SettingsPage.vue';
 import HelpPage from './HelpPage/HelpPage.vue';
 import HelpPage from './HelpPage/HelpPage.vue';
 import ClickMapPage from './ClickMapPage/ClickMapPage.vue';
 import ClickMapPage from './ClickMapPage/ClickMapPage.vue';
-//import ServerStorage from './ServerStorage/ServerStorage.vue';
+import ServerStorage from './ServerStorage/ServerStorage.vue';
 
 
 import bookManager from './share/bookManager';
 import bookManager from './share/bookManager';
 import readerApi from '../../api/reader';
 import readerApi from '../../api/reader';
@@ -130,7 +130,7 @@ export default @Component({
         SettingsPage,
         SettingsPage,
         HelpPage,
         HelpPage,
         ClickMapPage,
         ClickMapPage,
-        //ServerStorage,
+        ServerStorage,
     },
     },
     watch: {
     watch: {
         bookPos: function(newValue) {
         bookPos: function(newValue) {