Merge pull request #1986 from WeBankPartners/bug_fix

Bug fix

wecube-portal/src/pages/implementation/batch-execution.vue

@@ -1245,7 +1245,6 @@ export default {
       return Current
     },
     async executeAgain () {
-      this.btnLoading = true
       const inputParameterDefinitions = this.activeExecuteHistory.plugin.pluginParams.map(p => {
         const inputParameterValue =
           p.mappingType === 'constant' ? (p.dataType === 'number' ? Number(p.bindValue) : p.bindValue) : null
@@ -1261,12 +1260,13 @@ export default {
         desc: this.$t('bc_exect_tip'),
         duration: 1
       })
+      this.btnLoading = true
       const { status, data } = await batchExecution(requestBody)
+      this.btnLoading = false
       // this.seletedRows = []
       if (status === 'OK') {
         this.setPluginParamsModal = false
         this.operaModal = false
-        this.btnLoading = false
         this.executeResult = data
         this.filterBusinessKeySet = []
         for (const key in data) {

wecube-portal/src/pages/implementation/workflow-execution.vue

@@ -116,7 +116,7 @@
         <Button type="info" @click="workFlowActionHandler('skip')" :loading="btnLoading" style="margin-left: 20px">{{
           $t('skip')
         }}</Button>
-        <Button type="info" @click="workFlowActionHandler('showlog')" :loading="btnLoading" style="margin-left: 20px">{{
+        <Button type="info" @click="workFlowActionHandler('showlog')" style="margin-left: 20px">{{
           $t('show_log')
         }}</Button>
       </div>
@@ -772,7 +772,6 @@ export default {
       this.bindFlowEvent()
     },
     async excutionFlow () {
-      this.btnLoading = true
       // 区分已存在的flowInstance执行 和 新建的执行
       if (this.isEnqueryPage) {
         this.processInstance()
@@ -808,9 +807,10 @@ export default {
             }
           })
         }
+        this.btnLoading = true
         let { status, data } = await createFlowInstance(payload)
+        this.btnLoading = false
         if (status === 'OK') {
-          this.btnLoading = false
           this.getProcessInstances(true, data)
           this.isExecuteActive = false
           this.showExcution = false
@@ -862,7 +862,6 @@ export default {
       this.flowGraphMouseenterHandler(e.target.parentNode.getAttribute('id'))
     },
     async workFlowActionHandler (type) {
-      this.btnLoading = true
       const found = this.flowData.flowNodes.find(_ => _.nodeId === this.currentFailedNodeID)
       if (!found) {
         return
@@ -875,9 +874,10 @@ export default {
           nodeInstId: found.id,
           procInstId: found.procInstId
         }
+        this.btnLoading = true
         const { status } = await retryProcessInstance(payload)
+        this.btnLoading = false
         if (status === 'OK') {
-          this.btnLoading = false
           this.$Notice.success({
             title: 'Success',
             desc: (type === 'retry' ? 'Retry' : 'Skip') + ' action is proceed successfully'