From 7c1ba217b7c6647fbf14a6cf99bc39c5c760872e Mon Sep 17 00:00:00 2001 From: CzBiX Date: Thu, 11 Mar 2021 04:53:05 +0800 Subject: [PATCH] Fix code error --- .../dialogs/settingsDialog/DownloadSettings.vue | 7 ++++--- .../dialogs/settingsDialog/PreferenceRow.vue | 10 ++++------ .../dialogs/settingsDialog/SettingsDialog.vue | 14 +++++++++----- .../dialogs/settingsDialog/WebUISettings.vue | 6 ++++-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/components/dialogs/settingsDialog/DownloadSettings.vue b/src/components/dialogs/settingsDialog/DownloadSettings.vue index 4df5d51..b8cd2fc 100644 --- a/src/components/dialogs/settingsDialog/DownloadSettings.vue +++ b/src/components/dialogs/settingsDialog/DownloadSettings.vue @@ -124,7 +124,8 @@ import Vue from 'vue' import {Preferences} from '@/types' import {Component} from 'vue-property-decorator' import {mapActions, mapGetters} from 'vuex' -import PreferenceRow from './PreferenceRow' +import PreferenceRow from './PreferenceRow.vue' +import { tr } from '@/locale' @Component({ components: { @@ -143,8 +144,8 @@ import PreferenceRow from './PreferenceRow' }) export default class DownloadSettings extends Vue { preferences!: Preferences - torrentAction = [this.$t('preferences.switch_torrent_mode_to_manual'), this.$t('preferences.move_affected_torrent')] - torrentMode = [this.$t('preferences.auto_mode'), this.$t('preferences.manual_mode')] + torrentAction = [tr('preferences.switch_torrent_mode_to_manual'), tr('preferences.move_affected_torrent')] + torrentMode = [tr('preferences.auto_mode'), tr('preferences.manual_mode')] updatePreferencesRequest!: (_: any) => void diff --git a/src/components/dialogs/settingsDialog/PreferenceRow.vue b/src/components/dialogs/settingsDialog/PreferenceRow.vue index 31b1c6c..04f6728 100644 --- a/src/components/dialogs/settingsDialog/PreferenceRow.vue +++ b/src/components/dialogs/settingsDialog/PreferenceRow.vue @@ -19,14 +19,12 @@ diff --git a/src/components/dialogs/settingsDialog/SettingsDialog.vue b/src/components/dialogs/settingsDialog/SettingsDialog.vue index 25f57e2..be941dc 100644 --- a/src/components/dialogs/settingsDialog/SettingsDialog.vue +++ b/src/components/dialogs/settingsDialog/SettingsDialog.vue @@ -5,6 +5,7 @@ @input="$emit('input', $event)" scrollable persistent + fullscreen > @@ -63,6 +64,7 @@ import {mapGetters} from 'vuex' import {Preferences} from '@/types' import WebUISettings from '@/components/dialogs/settingsDialog/WebUISettings.vue' import {Config} from '@/store/config' +import { timeout } from '@/utils' @Component({ components: { @@ -72,7 +74,7 @@ import {Config} from '@/store/config' }, computed: { ...mapGetters({ - config: ['config'], + config: 'config', preferences: 'allPreferences', }), }, @@ -81,17 +83,19 @@ import {Config} from '@/store/config' export default class SettingsDialog extends Vue { @Prop(Boolean) readonly value!: boolean - preference!: Preferences + preferences!: Preferences config!: Config + preferenceUpdated = false - tabList = ['downloads', 'speed', 'webui', 'bittorrent', 'connection'] + tabList = ['downloads', 'speed', 'webui'] tab = 'speed' @Watch('preferences') @Watch('config') - onPreferenceUpdate() { + async onPreferenceUpdate() { this.preferenceUpdated = true - setTimeout(() => this.preferenceUpdated = false, 3000) + await timeout(3000) + this.preferenceUpdated = false } @Emit('input') diff --git a/src/components/dialogs/settingsDialog/WebUISettings.vue b/src/components/dialogs/settingsDialog/WebUISettings.vue index 002edeb..fb6c20c 100644 --- a/src/components/dialogs/settingsDialog/WebUISettings.vue +++ b/src/components/dialogs/settingsDialog/WebUISettings.vue @@ -137,13 +137,14 @@ import {Preferences} from '@/types' import {Component} from 'vue-property-decorator' import {mapActions, mapGetters, mapMutations} from 'vuex' import {Config} from '@/store/config' +import { ConfigPayload } from '@/store/types'; import PreferenceRow from '@/components/dialogs/settingsDialog/PreferenceRow.vue' @Component({ components: {PreferenceRow}, computed: { ...mapGetters({ - config: ['config'], + config: 'config', preferences: 'allPreferences', }), }, @@ -160,13 +161,14 @@ export default class WebUISettings extends Vue { preferences!: Preferences config!: Config + updateConfig!: (_: ConfigPayload) => void updatePreferencesRequest!: (_: any) => void changeSettings(property: string, value: string | boolean) { this.updatePreferencesRequest({[property]: value}) } - private updateTitleSpeedConfig(event: boolean) { + updateTitleSpeedConfig(event: boolean) { this.updateConfig({ key: 'displaySpeedInTitle', value: event,