Ver código fonte

Переход на Vue 3, в процессе

Book Pauk 3 anos atrás
pai
commit
00cb2dc274

+ 1 - 1
client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue

@@ -1,6 +1,6 @@
 <template>
     <Window ref="window" width="600px" height="95%" @close="close">
-        <template slot="header">
+        <template #header>
             Настроить закладки
         </template>
 

+ 6 - 6
client/components/ExternalLibs/ExternalLibs.vue

@@ -1,10 +1,10 @@
 <template>
     <Window ref="window" margin="2px" @close="close">
-        <template slot="header">
+        <template #header>
             {{ header }}
         </template>
 
-        <template slot="buttons">
+        <template #buttons>
             <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="fullScreenToggle">
                 <q-icon :name="(fullScreenActive ? 'la la-compress-arrows-alt': 'la la-expand-arrows-alt')" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">На весь экран</q-tooltip>
@@ -103,7 +103,7 @@
             </div>
 
             <Dialog ref="dialogAddBookmark" v-model="addBookmarkVisible">
-                <template slot="header">
+                <template #header>
                     <div class="row items-center">
                         <q-icon class="q-mr-sm" name="la la-bookmark" size="28px"></q-icon>
                         <div v-if="addBookmarkMode == 'edit'">
@@ -139,7 +139,7 @@
                     </q-input>
                 </div>
 
-                <template slot="footer">
+                <template #footer>
                     <q-btn v-close-popup class="q-px-md q-ml-sm" dense no-caps>
                         Отмена
                     </q-btn>
@@ -150,7 +150,7 @@
             </Dialog>
 
             <Dialog ref="options" v-model="optionsVisible">
-                <template slot="header">
+                <template #header>
                     <div class="row items-center">
                         <q-icon class="q-mr-sm" name="la la-cog" size="28px"></q-icon>
                         Опции
@@ -163,7 +163,7 @@
                     <q-checkbox v-model="openInFrameOnAdd" size="36px" label="Активировать новую закладку после добавления" />
                 </div>
 
-                <template slot="footer">
+                <template #footer>
                     <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="optionsVisible = false">
                         OK
                     </q-btn>

+ 1 - 1
client/components/Reader/ContentsPage/ContentsPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window ref="window" width="600px" @close="close">
-        <template slot="header">
+        <template #header>
             Оглавление/закладки
         </template>
 

+ 1 - 1
client/components/Reader/CopyTextPage/CopyTextPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window @close="close">
-        <template slot="header">
+        <template #header>
             Скопировать текст
         </template>
 

+ 1 - 1
client/components/Reader/HelpPage/HelpPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window @close="close">
-        <template slot="header">
+        <template #header>
             Справка
         </template>
 

+ 1 - 1
client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue

@@ -20,7 +20,7 @@
 
 <script>
 //-----------------------------------------------------------------------------
-import vueComponent from '../../vueComponent.js';
+import vueComponent from '../../../vueComponent.js';
 
 import {versionHistory} from '../../versionHistory';
 

+ 1 - 1
client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window @close="close">
-        <template slot="header">
+        <template #header>
             <span style="position: relative; top: -3px">
                 Вставьте текст и нажмите
                 <span class="clickable text-primary" style="font-size: 150%; position: relative; top: 1px" @click="loadBuffer">загрузить</span>

+ 2 - 2
client/components/Reader/ReaderDialogs/ReaderDialogs.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <Dialog ref="dialog1" v-model="whatsNewVisible">
-            <template slot="header">
+            <template #header>
                 Что нового:
             </template>
 
@@ -14,7 +14,7 @@
         </Dialog>
 
         <Dialog ref="dialog2" v-model="donationVisible">
-            <template slot="header">
+            <template #header>
                 Здравствуйте, уважаемые читатели!
             </template>
 

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

@@ -1,6 +1,6 @@
 <template>
     <Window ref="window" width="600px" @close="close">
-        <template slot="header">
+        <template #header>
             <span v-show="!loading">{{ header }}</span>
             <span v-if="loading"><q-spinner class="q-mr-sm" color="lime-12" size="20px" :thickness="7" />
                 Список загружается

+ 1 - 1
client/components/Reader/SearchPage/SearchPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window ref="window" height="125px" max-width="600px" :top-shift="-50" @close="close">
-        <template slot="header">
+        <template #header>
             {{ header }}
         </template>
 

+ 1 - 1
client/components/Reader/SetPositionPage/SetPositionPage.vue

@@ -1,6 +1,6 @@
 <template>
     <Window ref="window" height="140px" max-width="600px" :top-shift="-50" @close="close">
-        <template slot="header">
+        <template #header>
             Установить позицию
         </template>
 

+ 6 - 6
client/components/Reader/SettingsPage/SettingsPage.vue

@@ -1,6 +1,6 @@
-<template lang="includer">
+<template>
     <Window ref="window" height="95%" width="600px" @close="close">
-        <template slot="header">
+        <template #header>
             Настройки
         </template>
 
@@ -8,8 +8,9 @@
             <div class="full-height">
                 <q-tabs
                     ref="tabs"
-                    class="bg-grey-3 text-black"
                     v-model="selectedTab"
+                    class="bg-grey-3 text-black"
+                    
                     left-icon="la la-caret-up"
                     right-icon="la la-caret-down"
                     active-color="white"
@@ -20,7 +21,7 @@
                     stretch
                     inline-label
                 >
-                    <div v-show="tabsScrollable" class="q-pt-lg"/>
+                    <div v-show="tabsScrollable" class="q-pt-lg" />
                     <q-tab class="tab" name="profiles" icon="la la-users" label="Профили" />
                     <q-tab class="tab" name="view" icon="la la-eye" label="Вид" />
                     <q-tab class="tab" name="buttons" icon="la la-grip-horizontal" label="Кнопки" />
@@ -29,7 +30,7 @@
                     <q-tab class="tab" name="convert" icon="la la-magic" label="Конвертир." />
                     <q-tab class="tab" name="others" icon="la la-list-ul" label="Прочее" />
                     <q-tab class="tab" name="reset" icon="la la-broom" label="Сброс" />
-                    <div v-show="tabsScrollable" class="q-pt-lg"/>
+                    <div v-show="tabsScrollable" class="q-pt-lg" />
                 </q-tabs>
             </div>
 
@@ -67,7 +68,6 @@
                     @@include('./include/ResetTab.inc');
                 </div>
             </div>
-
         </div>
     </Window>
 </template>

+ 2 - 2
client/router.js

@@ -10,7 +10,7 @@ const History = () => import('./components/CardIndex/History/History.vue');
 //немедленная загрузка
 //import Reader from './components/Reader/Reader.vue';
 const Reader = () => import('./components/Reader/Reader.vue');
-//const ExternalLibs = () => import('./components/ExternalLibs/ExternalLibs.vue');
+const ExternalLibs = () => import('./components/ExternalLibs/ExternalLibs.vue');
 
 const Income = () => import('./components/Income/Income.vue');
 const Sources = () => import('./components/Sources/Sources.vue');
@@ -29,7 +29,7 @@ const myRoutes = [
     ['/cardindex~history', History],
 
     ['/reader', Reader],
-    //['/external-libs', ExternalLibs],
+    ['/external-libs', ExternalLibs],
     ['/income', Income],
     ['/sources', Sources],
     ['/settings', Settings],