Глобальный рефакторинг SettingsPage (начало), избавление от includer

build/includer.js

@@ -1,31 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-
-//пример в коде:
-//  @@include('./test/testFile.inc');
-
-function includeRecursive(self, parentFile, source, depth) {
-    depth = (depth ? depth : 0);
-    if (depth > 50)
-        throw new Error('includer: stack too big');
-    const lines = source.split('\n');
-    let result = [];
-    for (const line of lines) {
-        const trimmed = line.trim();
-        const m = trimmed.match(/^@@[\s]*?include[\s]*?\(['"](.*)['"]\)/);
-        if (m) {
-            const includedFile = path.resolve(path.dirname(parentFile), m[1]);
-            self.addDependency(includedFile);
-
-            const fileContent = fs.readFileSync(includedFile, 'utf8');
-            result = result.concat(includeRecursive(self, includedFile, fileContent, depth + 1));
-        } else {
-            result.push(line);
-        }
-    }
-    return result;
-}
-
-exports.default = function includer(source) {
-    return includeRecursive(this, this.resourcePath, source).join('\n');
-}

build/webpack.base.config.js

@@ -30,10 +30,6 @@ module.exports = {
                     }
                 }*/
             },
-            {
-                resourceQuery: /^\?vue/,
-                use: path.resolve(__dirname, 'includer.js')
-            },
             {
                 test: /\.js$/,
                 loader: 'babel-loader',

client/components/Reader/SettingsPage/SettingsPage.vue

@@ -39,11 +39,11 @@
 
             <div class="col fit">
                 <!-- Профили --------------------------------------------------------------------->
-                <div v-if="selectedTab == 'profiles'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'profiles'" class="fit tab-panel">
                     @@include('./ProfilesTab.inc');
-                </div>
+                </div-->
                 <!-- Вид ------------------------------------------------------------------------->                    
-                <div v-if="selectedTab == 'view'" class="fit column">
+                <!--div v-if="selectedTab == 'view'" class="fit column">
                     <q-tabs
                         v-model="selectedViewTab"
                         active-color="black"
@@ -83,35 +83,35 @@
                             @@include('./ViewTab/Status.inc');
                         </div>
                     </div>
-                </div>
+                </div-->
                 <!-- Кнопки ---------------------------------------------------------------------->
                 <div v-if="selectedTab == 'toolbar'" class="fit tab-panel">
-                    @@include('./ToolBarTab.inc');
+                    <ToolBarTab :form="form" />
                 </div>
                 <!-- Управление ------------------------------------------------------------------>
-                <div v-if="selectedTab == 'keys'" class="fit column">
+                <!--div v-if="selectedTab == 'keys'" class="fit column">
                     @@include('./KeysTab.inc');
-                </div>
+                </div-->
                 <!-- Листание -------------------------------------------------------------------->
-                <div v-if="selectedTab == 'pagemove'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'pagemove'" class="fit tab-panel">
                     @@include('./PageMoveTab.inc');
-                </div>
+                </div-->
                 <!-- Конвертирование ------------------------------------------------------------->
-                <div v-if="selectedTab == 'convert'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'convert'" class="fit tab-panel">
                     @@include('./ConvertTab.inc');
-                </div>
+                </div-->
                 <!-- Обновление ------------------------------------------------------------------>
-                <div v-if="selectedTab == 'update'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'update'" class="fit tab-panel">
                     @@include('./UpdateTab.inc');
-                </div>
+                </div-->
                 <!-- Прочее ---------------------------------------------------------------------->
-                <div v-if="selectedTab == 'others'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'others'" class="fit tab-panel">
                     @@include('./OthersTab.inc');
-                </div>
+                </div-->
                 <!-- Сброс ----------------------------------------------------------------------->
-                <div v-if="selectedTab == 'reset'" class="fit tab-panel">
+                <!--div v-if="selectedTab == 'reset'" class="fit tab-panel">
                     @@include('./ResetTab.inc');
-                </div>
+                </div-->
             </div>
         </div>
     </Window>
@@ -119,11 +119,11 @@
 
 <script>
 //-----------------------------------------------------------------------------
-import { ref, watch } from 'vue';
 import vueComponent from '../../vueComponent.js';
 
 import _ from 'lodash';
 
+//stuff
 import * as utils from '../../../share/utils';
 import * as cryptoUtils from '../../../share/cryptoUtils';
 import Window from '../../share/Window.vue';
@@ -135,6 +135,9 @@ import readerApi from '../../../api/reader';
 import rstore from '../../../store/modules/reader';
 import defPalette from './defPalette';
 
+//pages
+import ToolBarTab from './ToolBarTab/ToolBarTab.vue';
+
 const hex = /^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$/;
 
 const componentOptions = {
@@ -142,19 +145,22 @@ const componentOptions = {
         Window,
         NumInput,
         UserHotKeys,
-    },
+        //pages
-    data: function() {
+        ToolBarTab,
-        return Object.assign({}, rstore.settingDefaults);
     },
     watch: {
         settings: function() {
             this.settingsChanged();
         },
-        form: function(newValue) {
+        form: {
+            handler(newValue) {
                 if (this.inited) {
+console.log('save settings');                    
                     this.commit('reader/setSettings', _.cloneDeep(newValue));
                 }
             },
+            deep: true,
+        },
         fontBold: function(newValue) {
             this.fontWeight = (newValue ? 'bold' : '');
         },
@@ -217,6 +223,8 @@ const componentOptions = {
 class SettingsPage {
     _options = componentOptions;
 
+    form = {};
+
     selectedTab = 'profiles';
     selectedViewTab = 'mode';
     selectedKeysTab = 'mouse';
@@ -227,34 +235,17 @@ class SettingsPage {
     textColorFiltered = '';
     bgColorFiltered = '';
     dualDivColorFiltered = '';
+    statusBarColorFiltered = '';
 
     webFonts = [];
     fonts = [];
 
     serverStorageKeyVisible = false;
-    toolButtons = [];
-    rstore = {};
-
-    setup() {
-        const settingsProps = { form: ref({}) };
-
-        for (let prop in rstore.settingDefaults) {
-            settingsProps[prop] = ref(_.cloneDeep(rstore.settingDefaults[prop]));
-            watch(settingsProps[prop], (newValue) => {
-                settingsProps.form.value = Object.assign({}, settingsProps.form.value, {[prop]: newValue});
-            }, {deep: true});
-        }
-
-        return settingsProps;
-    }
 
     created() {
         this.commit = this.$store.commit;
         this.reader = this.$store.state.reader;
 
-        this.form = {};
-        this.rstore = rstore;
-        this.toolButtons = rstore.toolButtons;
         this.settingsChanged();
     }
 
@@ -276,22 +267,20 @@ class SettingsPage {
         if (_.isEqual(this.form, this.settings))
             return;
 
-        this.form = Object.assign({}, this.settings);
+        this.form = _.cloneDeep(this.settings);
-        for (const prop in rstore.settingDefaults) {
+        const form = this.form;
-            this[prop] = _.cloneDeep(this.form[prop]);
-        }
 
-        this.fontBold = (this.fontWeight == 'bold');
+        this.fontBold = (form.fontWeight == 'bold');
-        this.fontItalic = (this.fontStyle == 'italic');
+        this.fontItalic = (form.fontStyle == 'italic');
 
         this.fonts = rstore.fonts;
         this.webFonts = rstore.webFonts;
-        const font = (this.webFontName ? this.webFontName : this.fontName);
+        const font = (form.webFontName ? form.webFontName : form.fontName);
-        this.vertShift = this.fontShifts[font] || 0;
+        this.vertShift = form.fontShifts[font] || 0;
-        this.textColorFiltered = this.textColor;
+        this.textColorFiltered = form.textColor;
-        this.bgColorFiltered = this.backgroundColor;
+        this.bgColorFiltered = form.backgroundColor;
-        this.dualDivColorFiltered = this.dualDivColor;
+        this.dualDivColorFiltered = form.dualDivColor;
-        this.statusBarColorFiltered = this.statusBarColor;
+        this.statusBarColorFiltered = form.statusBarColor;
     }
 
     get mode() {
@@ -730,20 +719,6 @@ export default vueComponent(SettingsPage);
     padding: 0 10px 15px 10px;
 }
 
-.part-header {
-    border-top: 2px solid #bbbbbb;
-    font-weight: bold;
-    font-size: 110%;
-    margin-top: 15px;
-    margin-bottom: 5px;
-}
-
-.item {
-    width: 100%;
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
 .label-1, .label-3, .label-7 {
     width: 75px;
 }
@@ -756,15 +731,6 @@ export default vueComponent(SettingsPage);
     width: 100px;
 }
 
-.label-1, .label-2, .label-3, .label-4, .label-5, .label-6, .label-7 {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    text-align: right;
-    margin-right: 10px;
-    overflow: hidden;
-}
-
 .text {
     font-size: 90%;
     line-height: 130%;
@@ -795,3 +761,29 @@ export default vueComponent(SettingsPage);
     width: 150px;
 }
 </style>
+
+<style>
+.sets-part-header {
+    border-top: 2px solid #bbbbbb;
+    font-weight: bold;
+    font-size: 110%;
+    margin-top: 15px;
+    margin-bottom: 5px;
+}
+
+.sets-label {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: right;
+    margin-right: 10px;
+    overflow: hidden;
+}
+
+.sets-item {
+    width: 100%;
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+</style>

client/components/Reader/SettingsPage/ToolBarTab/ToolBarTab.vue

@@ -0,0 +1,67 @@
+<template>
+    <div>
+        <div class="sets-part-header">
+            Отображение
+        </div>
+
+        <div class="item row no-wrap">
+            <div class="sets-label label"></div>
+            <q-checkbox v-model="form.toolBarHideOnScroll" size="xs" label="Скрывать/показывать панель при прокрутке">
+                <q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
+                    Скрывать/показывть панель при прокрутке текста вперед/назад
+                </q-tooltip>
+            </q-checkbox>
+        </div>
+
+        <div class="sets-part-header">
+            Показывать кнопки
+        </div>
+
+        <div v-for="item in rstore.toolButtons" :key="item.name">
+            <div v-show="item.name != 'libs' || mode == 'liberama.top'" class="sets-item row no-wrap">
+                <div class="sets-label label"></div>
+                <q-checkbox v-model="form.showToolButton[item.name]" size="xs" :label="rstore.readerActions[item.name]" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../../vueComponent.js';
+
+import rstore from '../../../../store/modules/reader';
+
+const componentOptions = {
+    watch: {
+    },
+};
+class ToolBarTab {
+    _options = componentOptions;
+    _props = {
+        form: Object,
+    };
+
+    rstore = rstore;
+
+    created() {
+    }
+
+    mounted() {
+    }
+
+    get mode() {
+        return this.$store.state.config.mode;
+    }    
+}
+
+export default vueComponent(ToolBarTab);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+.label {
+    width: 75px;
+}
+
+</style>