Browse Source

Переход на Vue 3

Book Pauk 3 years ago
parent
commit
1afe10be03
3 changed files with 16 additions and 13 deletions
  1. 4 4
      client/components/Reader/RecentBooksPage/RecentBooksPage.vue
  2. 3 2
      client/main.js
  3. 9 7
      client/quasar.js

+ 4 - 4
client/components/Reader/RecentBooksPage/RecentBooksPage.vue

@@ -11,10 +11,10 @@
 
 
         <q-table
         <q-table
             class="recent-books-table col"
             class="recent-books-table col"
-            :data="tableData"
-            :columns="columns"
+            :rows="tableData"
             row-key="key"
             row-key="key"
-            v-model:pagination="pagination"
+            :columns="columns"
+            :pagination="pagination"
             separator="cell"
             separator="cell"
             hide-bottom
             hide-bottom
             virtual-scroll
             virtual-scroll
@@ -181,13 +181,13 @@ class RecentBooksPage {
                 return;
                 return;
             this.initing = true;
             this.initing = true;
 
 
-
             if (this.firstInit) {//для отзывчивости
             if (this.firstInit) {//для отзывчивости
                 await this.updateTableData(20);
                 await this.updateTableData(20);
                 this.firstInit = false;
                 this.firstInit = false;
             }
             }
             await utils.sleep(50);
             await utils.sleep(50);
             await this.updateTableData();
             await this.updateTableData();
+
             this.initing = false;
             this.initing = false;
         })();
         })();
     }
     }

+ 3 - 2
client/main.js

@@ -2,13 +2,14 @@ import { createApp } from 'vue';
 
 
 import router from './router';
 import router from './router';
 import store from './store';
 import store from './store';
-import {Quasar, QuasarOptions} from './quasar';
+import q from './quasar';
 
 
 import App from './components/App.vue';
 import App from './components/App.vue';
 
 
 const app = createApp(App);
 const app = createApp(App);
 app.use(router);
 app.use(router);
 app.use(store);
 app.use(store);
-app.use(Quasar, QuasarOptions);
+app.use(q.quasar, q.options);
+q.init();
 
 
 app.mount('#app');
 app.mount('#app');

+ 9 - 7
client/quasar.js

@@ -80,15 +80,17 @@ const plugins = {
 };
 };
 
 
 //icons
 //icons
-//import '@quasar/extras/material-icons/material-icons.css';
-//import '@quasar/extras/material-icons-outlined/material-icons-outlined.css';
 //import '@quasar/extras/fontawesome-v5/fontawesome-v5.css';
 //import '@quasar/extras/fontawesome-v5/fontawesome-v5.css';
+//import fontawesomeV5 from 'quasar/icon-set/fontawesome-v5.js'
 
 
 import '@quasar/extras/line-awesome/line-awesome.css';
 import '@quasar/extras/line-awesome/line-awesome.css';
-
-//import fontawesomeV5 from 'quasar/icon-set/fontawesome-v5.js'
 import lineAwesome from 'quasar/icon-set/line-awesome.js'
 import lineAwesome from 'quasar/icon-set/line-awesome.js'
-Quasar.iconSet.set(lineAwesome);
 
 
-const QuasarOptions = { config, components, directives, plugins };
-export {Quasar, QuasarOptions};
+//const q: {Quasar, QuasarOptions: { config, components, directives, plugins }};
+export default {
+    quasar: Quasar,
+    options: { config, components, directives, plugins }, 
+    init: () => {
+        Quasar.iconSet.set(lineAwesome);
+}
+};