Merge branch 'hotfix/0.1.6'

This commit is contained in:
Book Pauk
2019-02-14 19:00:02 +07:00
2 changed files with 25 additions and 6 deletions

View File

@@ -115,7 +115,7 @@
<el-input-number v-model="lineInterval" :min="0" :max="200"></el-input-number> <el-input-number v-model="lineInterval" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="Параграф"> <el-form-item label="Параграф">
<el-input-number v-model="p" :min="0" :max="1000"></el-input-number> <el-input-number v-model="p" :min="0" :max="2000"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="Отступ"> <el-form-item label="Отступ">
<el-col :span="11"> <el-col :span="11">
@@ -123,7 +123,7 @@
<template slot="content"> <template slot="content">
Слева/справа Слева/справа
</template> </template>
<el-input-number v-model="indentLR" :min="0" :max="500"></el-input-number> <el-input-number v-model="indentLR" :min="0" :max="2000"></el-input-number>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
@@ -134,7 +134,7 @@
<template slot="content"> <template slot="content">
Сверху/снизу Сверху/снизу
</template> </template>
<el-input-number v-model="indentTB" :min="0" :max="500"></el-input-number> <el-input-number v-model="indentTB" :min="0" :max="2000"></el-input-number>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
</el-form-item> </el-form-item>
@@ -287,9 +287,11 @@
<el-checkbox v-model="copyFullText">Загружать весь текст</el-checkbox> <el-checkbox v-model="copyFullText">Загружать весь текст</el-checkbox>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane>
<!--------------------------------------------------------------------------->
<el-tab-pane label="Сброс">
<el-button @click="setDefaults">Установить по-умолчанию</el-button>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -405,6 +407,23 @@ class SettingsPage extends Vue {
this.$emit('settings-toggle'); this.$emit('settings-toggle');
} }
async setDefaults() {
try {
if (await this.$confirm('Подтвердите установку настроек по-умолчанию', '', {
confirmButtonText: 'OK',
cancelButtonText: 'Отмена',
type: 'warning'
})) {
this.form = Object.assign({}, rstore.settingDefaults);
for (let prop in rstore.settingDefaults) {
this[prop] = this.form[prop];
}
}
} catch (e) {
//
}
}
keyHook(event) { keyHook(event) {
if (event.type == 'keydown' && event.code == 'Escape') { if (event.type == 'keydown' && event.code == 'Escape') {
this.close(); this.close();

View File

@@ -1,6 +1,6 @@
{ {
"name": "Liberama", "name": "Liberama",
"version": "0.1.5", "version": "0.1.6",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },