From 95ccc1acc6d8ede1c839493e7aecc9c97fd34c8c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 九月 2021 15:55:39 +0800
Subject: [PATCH] 2021-09-24

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 5c5818a..9b690c8 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -314,6 +314,9 @@
           param.$callbacksql = callbacksql
         } else {
           param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+          if (btn.output) {
+            param.key_back_type = 'Y'
+          }
         }
 
         if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -356,7 +359,7 @@
             param.$callbacksql = callbacksql
           } else {
             param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
-            if (btn.OpenType === 'formSubmit' && btn.output) {
+            if (btn.output) {
               param.key_back_type = 'Y'
             }
           }
@@ -391,6 +394,9 @@
             param.$callbacksql = callbacksql
           } else {
             param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+            if (btn.output) {
+              param.key_back_type = 'Y'
+            }
           }
           
           if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -457,6 +463,9 @@
             param.$callbacksql = callbacksql
           } else {
             param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions, Utils.getAllSearchOptions) // 鏁版嵁婧�
+            if (btn.output) {
+              param.key_back_type = 'Y'
+            }
           }
           
           if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -490,6 +499,9 @@
               param.$callbacksql = callbacksql
             } else {
               param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+              if (btn.output) {
+                param.key_back_type = 'Y'
+              }
             }
             
             if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -513,6 +525,9 @@
               param.$callbacksql = callbacksql
             } else {
               param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+              if (btn.output) {
+                param.key_back_type = 'Y'
+              }
             }
             
             if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -668,14 +683,39 @@
       }
 
       if (params.length <= 20) {
-        let deffers = params.map(param => {
+        let deffers = params.map((param, i) => {
           return new Promise(resolve => {
-            Api.genericInterface(param).then(res => {
-              resolve(res)
-            }, () => {
-              this.updateStatus('over')
-              _resolve()
-            })
+            setTimeout(() => {
+              let _param = null
+              if (btn.preFunc) {
+                _param = fromJS(param).toJS()
+                param.func = btn.preFunc
+              }
+              Api.genericInterface(param).then(res => {
+                if (btn.preFunc && res.status && res.ErrCode !== '-1') {
+                  _param = {..._param, ...res}
+
+                  delete _param.status
+                  delete _param.ErrCode
+                  delete _param.ErrMesg
+                  delete _param.message
+
+                  Api.genericInterface(_param).then(result => {
+                    if (!result.status) {
+                      notification.warning({
+                        top: 92,
+                        message: result.message,
+                        duration: 5
+                      })
+                    }
+                  })
+                }
+                resolve(res)
+              }, () => {
+                this.updateStatus('over')
+                _resolve()
+              })
+            }, 20 * i)
           })
         })
         Promise.all(deffers).then(result => {
@@ -1111,8 +1151,33 @@
       loadingNumber: params.length || ''
     })
 
+    let _param = null
+
+    if (btn.preFunc) {
+      _param = fromJS(param).toJS()
+      param.func = btn.preFunc
+    }
+
     Api.genericInterface(param).then(res => {
       if (res.status) {
+        if (btn.preFunc && res.ErrCode !== '-1') {
+          _param = {..._param, ...res}
+  
+          delete _param.status
+          delete _param.ErrCode
+          delete _param.ErrMesg
+          delete _param.message
+  
+          Api.genericInterface(_param).then(result => {
+            if (!result.status) {
+              notification.warning({
+                top: 92,
+                message: result.message,
+                duration: 5
+              })
+            }
+          })
+        }
         if (params.length === 0) {
           this.execSuccess(res)
           _resolve()
@@ -1713,7 +1778,7 @@
       result.push({
         key: item.field,
         readonly: item.readonly === 'true',
-        readin: _readin,
+        readin: item.readin !== 'false' && item.readin !== 'top',
         fieldlen: _fieldlen,
         writein: item.writein !== 'false',
         type: _type,

--
Gitblit v1.8.0