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

This commit is contained in:
Book Pauk
2021-10-29 12:56:28 +07:00
parent ed46e91432
commit 00cb2dc274
13 changed files with 25 additions and 25 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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