From 38461043e01df6990495b9ecbb63b68af0553268 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Fri, 29 Mar 2019 01:20:38 +0000 Subject: [server] disable sequelize logging; [webapp] group module reload on open; loadinbar bug fix --- webapp/src/components/GroupModule.vue | 10 +++++++--- webapp/src/components/LoadingBar.vue | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/GroupModule.vue b/webapp/src/components/GroupModule.vue index 36d6fcb..4630824 100644 --- a/webapp/src/components/GroupModule.vue +++ b/webapp/src/components/GroupModule.vue @@ -93,9 +93,13 @@ export default { } }, created () { - this.$store.dispatch('groups/loadConfigs') - this.$store.dispatch('groups/loadLists') - if (this.tabChain.length === 0) this.$store.dispatch('groups/loadGroup', { id: 0, tabIndex: 0 }) + if (this.tabChain.length === 0) { + this.$store.dispatch('groups/loadGroup', { id: 0, tabIndex: 0 }) + this.$store.dispatch('groups/loadConfigs') + this.$store.dispatch('groups/loadLists') + } else { + this.reload() + } if (this.$route.params.id !== '0') this.loadItem(this.$route.name, this.$route.params.id) this.$router.replace({ name: 'GroupModule.' + this.tabChain[this.activeTab].tabType, diff --git a/webapp/src/components/LoadingBar.vue b/webapp/src/components/LoadingBar.vue index 32495ef..342b638 100644 --- a/webapp/src/components/LoadingBar.vue +++ b/webapp/src/components/LoadingBar.vue @@ -37,15 +37,18 @@ export default { } }, watch: { - loading (value) { - clearTimeout(this.loadingTimeout) - if (value) { - this.loadingValue = 0 - this.loadingBar = true - this.loadingTimeout = setTimeout(this.increaseLoadingValue, 10) - } else { - this.loadingValue = 100 - this.loadingTimeout = setTimeout(() => { this.loadingBar = false }, 500) + loading: { + immediate: true, + handler (value) { + clearTimeout(this.loadingTimeout) + if (value) { + this.loadingValue = 0 + this.loadingBar = true + this.loadingTimeout = setTimeout(this.increaseLoadingValue, 10) + } else { + this.loadingValue = 100 + this.loadingTimeout = setTimeout(() => { this.loadingBar = false }, 500) + } } } }, -- cgit v1.2.3-55-g7522