From 5827d7a24674e591e26e1bbaf61eede7d43990e4 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 12 Oct 2022 18:02:32 +0700 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20SettingsPage=20(=D0=B2=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/SettingsPage/ResetTab.inc | 3 -- .../Reader/SettingsPage/ResetTab/ResetTab.vue | 41 +++++++++++++++++++ .../Reader/SettingsPage/SettingsPage.vue | 22 ++++++---- 3 files changed, 55 insertions(+), 11 deletions(-) delete mode 100644 client/components/Reader/SettingsPage/ResetTab.inc create mode 100644 client/components/Reader/SettingsPage/ResetTab/ResetTab.vue diff --git a/client/components/Reader/SettingsPage/ResetTab.inc b/client/components/Reader/SettingsPage/ResetTab.inc deleted file mode 100644 index 0bf64635..00000000 --- a/client/components/Reader/SettingsPage/ResetTab.inc +++ /dev/null @@ -1,3 +0,0 @@ -
- Установить по умолчанию -
diff --git a/client/components/Reader/SettingsPage/ResetTab/ResetTab.vue b/client/components/Reader/SettingsPage/ResetTab/ResetTab.vue new file mode 100644 index 00000000..97828948 --- /dev/null +++ b/client/components/Reader/SettingsPage/ResetTab/ResetTab.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index f3f0d61e..19b2ec2d 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -94,10 +94,8 @@ - - + + @@ -127,6 +125,7 @@ import PageMoveTab from './PageMoveTab/PageMoveTab.vue'; import ConvertTab from './ConvertTab/ConvertTab.vue'; import UpdateTab from './UpdateTab/UpdateTab.vue'; import OthersTab from './OthersTab/OthersTab.vue'; +import ResetTab from './ResetTab/ResetTab.vue'; const hex = /^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$/; @@ -141,6 +140,7 @@ const componentOptions = { ConvertTab, UpdateTab, OthersTab, + ResetTab, }, watch: { settings: function() { @@ -390,16 +390,22 @@ class SettingsPage { async setDefaults() { try { if (await this.$root.stdDialog.confirm('Подтвердите установку настроек по умолчанию:', ' ')) { - this.form = Object.assign({}, rstore.settingDefaults); - for (let prop in rstore.settingDefaults) { - this[prop] = this.form[prop]; - } + this.form = _.cloneDeep(rstore.settingDefaults); } } catch (e) { // } } + tabEvent(event) { + if (!event || !event.action) + return; + + switch (event.action) { + case 'set-defaults': this.setDefaults(); break; + } + } + loadWallpaperFileClick() { this.$refs.file.click(); }