From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/verupmanage/actionList/index.jsx |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/tabviews/verupmanage/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx
index 23dd7ef..41c9e8b 100644
--- a/src/tabviews/verupmanage/actionList/index.jsx
+++ b/src/tabviews/verupmanage/actionList/index.jsx
@@ -37,7 +37,7 @@
     execAction: null,
     loadingUuid: '',
     configMap: {},
-    loadingNumber: ''
+    loadingNumber: '',
   }
 
   refreshdata = (item, type) => {
@@ -341,6 +341,11 @@
             _resolve()
           })
         } else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
+          if (btn.progress === 'progressbar') {
+            this.setState({
+              loadingTotal: _params.length
+            })
+          }
           this.innerLoopRequest(_params, btn, _resolve)
         }
       }
@@ -399,8 +404,14 @@
         })
       }
 
+      if (_params.length > 1 && btn.progress === 'progressbar') {
+        this.setState({
+          loadingTotal: _params.length
+        })
+      }
+
       // 寰幆璋冪敤澶栭儴鎺ュ彛锛堝寘鎷唴閮ㄥ強鍥炶皟鍑芥暟锛�
-      this.outerLoopRequest(_params, btn, _resolve, _params.length > 20)
+      this.outerLoopRequest(_params, btn, _resolve)
     }
   }
 
@@ -413,7 +424,7 @@
     let param = params.shift()
 
     this.setState({
-      loadingNumber: params.length || ''
+      loadingNumber: params.length
     })
 
     Api.genericInterface(param).then(res => {
@@ -434,7 +445,7 @@
   /**
    * @description 澶栭儴璇锋眰寰幆鎵ц
    */
-  outerLoopRequest = (params, btn, _resolve, widthNumber) => {
+  outerLoopRequest = (params, btn, _resolve) => {
     if (!params && params.length === 0) return
 
     let param = params.shift()
@@ -442,11 +453,9 @@
     let _localParam = null
     let errRes = null
 
-    if (widthNumber) {
-      this.setState({
-        loadingNumber: params.length || ''
-      })
-    }
+    this.setState({
+      loadingNumber: params.length
+    })
 
     new Promise(resolve => {
       // 鍐呴儴璇锋眰
@@ -535,7 +544,7 @@
             this.execSuccess(btn, response)
             _resolve()
           } else {
-            this.outerLoopRequest(params, btn, _resolve, widthNumber)
+            this.outerLoopRequest(params, btn, _resolve)
           }
         } else {
           this.execError(response, btn)
@@ -555,7 +564,7 @@
           this.execSuccess(btn, res)
           _resolve()
         } else {
-          this.outerLoopRequest(params, btn, _resolve, widthNumber)
+          this.outerLoopRequest(params, btn, _resolve)
         }
       } else {
         this.execError(res, btn)
@@ -569,7 +578,7 @@
           this.execSuccess(btn, res)
           _resolve()
         } else {
-          this.outerLoopRequest(params, btn, _resolve, widthNumber)
+          this.outerLoopRequest(params, btn, _resolve)
         }
       } else {
         this.execError(errRes || res, btn)
@@ -775,7 +784,6 @@
         destroyOnClose
       >
         <MutilForm
-          menuType="HS"
           dict={this.props.dict}
           action={execAction}
           inputSubmit={this.handleOk}
@@ -795,7 +803,7 @@
       <div className="verup-button-list verup-toolbar-button">
         {this.props.actions.map((item, index) => {
           let label = item.label
-          if (loadingUuid === item.uuid && loadingNumber !== '') {
+          if (loadingUuid === item.uuid && loadingNumber) {
             label = label + '(' + loadingNumber + ')'
           }
           return (

--
Gitblit v1.8.0