From d203cba988fe7c3b21b74a18bcedb10ea3fbedc6 Mon Sep 17 00:00:00 2001 From: zhuangchong Date: Mon, 25 Jan 2021 13:03:48 +0800 Subject: [PATCH 1/3] fix ui createToken submit error. --- .../home/pages/user/pages/token/_source/createToken.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue index cab540188e..0a5e28f4f7 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue @@ -119,16 +119,16 @@ if (this.item) { param.id = this.item.id } - this.$refs.popup.spinnerLoading = true + this.$refs.popover.spinnerLoading = true this.store.dispatch(`user/${this.item ? 'updateToken' : 'createToken'}`, param).then(res => { this.$emit('onUpdate') this.$message.success(res.msg) setTimeout(() => { - this.$refs.popup.spinnerLoading = false + this.$refs.popover.spinnerLoading = false }, 800) }).catch(e => { this.$message.error(e.msg || '') - this.$refs.popup.spinnerLoading = false + this.$refs.popover.spinnerLoading = false }) }, _generateToken () { From be61e250d0dd50d3a09d26049a507b5f20522e11 Mon Sep 17 00:00:00 2001 From: zhuangchong Date: Mon, 25 Jan 2021 14:04:03 +0800 Subject: [PATCH 2/3] remove setTimeout function. --- .../home/pages/security/pages/queue/_source/createQueue.vue | 4 +--- .../pages/security/pages/tenement/_source/createTenement.vue | 4 +--- .../home/pages/security/pages/users/_source/createUser.vue | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue index 4fa8e5cf7c..f3a6155795 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue @@ -88,9 +88,7 @@ let $then = (res) => { this.$emit('onUpdate') this.$message.success(res.msg) - setTimeout(() => { - this.$refs.popover.spinnerLoading = false - }, 800) + this.$refs.popover.spinnerLoading = false } let $catch = (e) => { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue index 551baca1db..3bc83a0284 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue @@ -144,9 +144,7 @@ this.store.dispatch(`security/${this.item ? 'updateQueue' : 'createQueue'}`, param).then(res => { this.$emit('onUpdate') this.$message.success(res.msg) - setTimeout(() => { - this.$refs.popover.spinnerLoading = false - }, 800) + this.$refs.popover.spinnerLoading = false }).catch(e => { this.$message.error(e.msg || '') this.$refs.popover.spinnerLoading = false diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 138bb2c064..1ff5550f9b 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -268,9 +268,7 @@ } this.store.dispatch(`security/${this.item ? 'updateUser' : 'createUser'}`, param).then(res => { - setTimeout(() => { - this.$refs.popover.spinnerLoading = false - }, 800) + this.$refs.popover.spinnerLoading = false this.$emit('onUpdate', param) this.$message.success(res.msg) }).catch(e => { From 281e1be82fdc43aad6e2c7c5601a91ce86f81d8e Mon Sep 17 00:00:00 2001 From: zhuangchong Date: Mon, 25 Jan 2021 14:06:32 +0800 Subject: [PATCH 3/3] remove setTimeout function. --- .../conf/home/pages/user/pages/token/_source/createToken.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue index 0a5e28f4f7..cf66e76456 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue @@ -123,9 +123,7 @@ this.store.dispatch(`user/${this.item ? 'updateToken' : 'createToken'}`, param).then(res => { this.$emit('onUpdate') this.$message.success(res.msg) - setTimeout(() => { - this.$refs.popover.spinnerLoading = false - }, 800) + this.$refs.popover.spinnerLoading = false }).catch(e => { this.$message.error(e.msg || '') this.$refs.popover.spinnerLoading = false