From 69abbe32c462ec045a6eda509d9d4092d8e11ec7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 18 六月 2023 22:06:12 +0800
Subject: [PATCH] 2023-06-18

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |  103 +++------------------------------------------------
 1 files changed, 6 insertions(+), 97 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 2c4b340..f49846b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -748,8 +748,10 @@
     let _params = []
 
     if ( btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce' ) {
-      let param = {
-        func: btn.innerFunc || ''
+      let param = {}
+
+      if (btn.innerFunc) {
+        param.func = btn.innerFunc
       }
 
       if (this.props.BID) {
@@ -762,9 +764,7 @@
         let ids = data.map(d => { return d[setting.primaryKey] || ''})
         ids = ids.filter(Boolean)
         primaryId = ids.join(',')
-      }
 
-      if (setting.primaryKey) {
         param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
       }
 
@@ -823,93 +823,6 @@
           param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
           param.secretkey = Utils.encrypt(param.LTextOut, param.timestamp)
           param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-        }
-
-        if (retmsg) {
-          param.$callbacksql = this.getSysDeclareSql(btn, formdata, cell, columns, primaryId, this.props.BID)
-        }
-
-        return param
-      })
-    }
-
-    return _params
-  }
-
-  getLineParam = (data, formdata, retmsg) => {
-    const { setting, btn, columns } = this.props
-    let _params = []
-
-    if (btn.Ot === 'notRequired') {
-      if (retmsg) {
-        let param = {
-          $callbacksql: this.getSysDeclareSql(btn, formdata, data[0], columns, '', this.props.BID)
-        }
-        
-        _params.push(param)
-      } else {
-        _params.push({})
-      }
-    } else if ( btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce' ) {
-      let param = {}
-
-      if (this.props.BID) {
-        param.BID = this.props.BID
-      }
-      
-      let primaryId = ''
-
-      if ((btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') && setting.primaryKey) {
-        let ids = data.map(d => { return d[setting.primaryKey] || ''})
-        ids = ids.filter(Boolean)
-        primaryId = ids.join(',')
-      }
-
-      if (setting.primaryKey) {
-        param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
-      }
-
-      if (btn.OpenType === 'pop' || btn.OpenType === 'formSubmit' || btn.OpenType === 'form') { // 琛ㄥ崟
-        formdata.forEach(_data => {
-          param[_data.key] = _data.value
-        })
-      }
-
-      if (retmsg) {
-        param.$callbacksql = this.getSysDeclareSql(btn, formdata, data[0], columns, primaryId, this.props.BID)
-      }
-
-      _params.push(param)
-    } else if (btn.Ot === 'required') {
-      _params = data.map((cell, index) => {
-        let param = {}
-
-        if (this.props.BID) {
-          param.BID = this.props.BID
-        }
-
-        let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
-
-        if (btn.OpenType === 'pop') { // 琛ㄥ崟
-          if (index !== 0) {
-            let _cell = {}
-            Object.keys(cell).forEach(key => {
-              _cell[key.toLowerCase()] = cell[key]
-            })
-            formdata = formdata.map(_data => {
-              if (_data.readin && _cell.hasOwnProperty(_data.key.toLowerCase())) {
-                _data.value = _cell[_data.key.toLowerCase()]
-              }
-              return _data
-            })
-          }
-
-          formdata.forEach(_data => {
-            param[_data.key] = _data.value
-          })
-        }
-        if (setting.primaryKey) {
-          param[setting.primaryKey] = primaryId
         }
 
         if (retmsg) {
@@ -1247,10 +1160,8 @@
           item.script_type = 'Y'
           return item
         })
-      } else if (btn.procMode === 'inner') {
-        _params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
       } else {
-        _params = this.getLineParam(data, formdata, btn.callbackType === 'script')
+        _params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
       }
 
       if (_params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
@@ -1270,10 +1181,8 @@
           item.script_type = 'Y'
           return item
         })
-      } else if (btn.procMode === 'inner') {
-        params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
       } else {
-        params = this.getLineParam(data, formdata, btn.callbackType === 'script')
+        params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
       }
 
       if (params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {

--
Gitblit v1.8.0