summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorUdo Walter2019-03-29 02:20:38 +0100
committerUdo Walter2019-03-29 02:20:38 +0100
commit38461043e01df6990495b9ecbb63b68af0553268 (patch)
tree96f78ce3d63da6043bce7d4eba9a1b12599434e6 /webapp
parent[webapp] fix disabled animation causing bug (diff)
downloadbas-38461043e01df6990495b9ecbb63b68af0553268.tar.gz
bas-38461043e01df6990495b9ecbb63b68af0553268.tar.xz
bas-38461043e01df6990495b9ecbb63b68af0553268.zip
[server] disable sequelize logging; [webapp] group module reload on open; loadinbar bug fix
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/GroupModule.vue10
-rw-r--r--webapp/src/components/LoadingBar.vue21
2 files changed, 19 insertions, 12 deletions
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)
+ }
}
}
},