Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

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) => {

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

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 => {

dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue

@@ -119,16 +119,14 @@
         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
-          }, 800)
+          this.$refs.popover.spinnerLoading = false
         }).catch(e => {
           this.$message.error(e.msg || '')
-          this.$refs.popup.spinnerLoading = false
+          this.$refs.popover.spinnerLoading = false
         })
       },
       _generateToken () {