From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14
---
src/tabviews/zshare/actionList/index.jsx | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index b96888c..2afdbbf 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -32,7 +32,8 @@
getexceloutparam: PropTypes.func, // 鑾峰彇excel瀵煎嚭鏁版嵁
gettableselected: PropTypes.func, // 鑾峰彇琛ㄦ牸涓暟鎹�
permRoles: PropTypes.any, // 鐢ㄦ埛鏉冮檺鍒楄〃
- triggerBtn: PropTypes.any
+ triggerBtn: PropTypes.any,
+ dataManager: PropTypes.any // 鏁版嵁鏉冮檺
}
state = {
@@ -1099,7 +1100,7 @@
if (
btn.Ot === 'notRequired' ||
btn.Ot === 'requiredSgl' ||
- (btn.Ot === 'requiredOnce' && btn.OpenType !== 'pop')
+ btn.Ot === 'requiredOnce'
) {
// 鍒涘缓鍑瘉鏃讹紝闇�瑕侀�夋嫨琛屾椂
@@ -1116,23 +1117,20 @@
func: 'sPC_TableData_InUpDe',
BID: this.props.BID
}
- let primaryId = setting.primaryKey && data[0] ? (data[0][setting.primaryKey] || '') : ''
+
+ let primaryId = ''
+
+ if (btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
+ let ids = data.map(d => { return d[setting.primaryKey] || ''})
+ ids = ids.filter(Boolean)
+ primaryId = ids.join(',')
+ }
if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') { // 鏄惁寮规鎴栫洿鎺ユ墽琛�
- let ID = ''
- if (btn.Ot === 'notRequired') {
-
- } else if (btn.Ot === 'requiredSgl') {
- ID = data[0][setting.primaryKey]
- } else if (btn.Ot === 'requiredOnce') { // id鍊兼嫾鎺�
- let ids = data.map(d => { return d[setting.primaryKey]})
- ID = ids.join(',')
- }
-
if (btn.innerFunc) { // 浣跨敤鑷畾涔夊嚱鏁�
param.func = btn.innerFunc
if (setting.primaryKey) { // 涓婚敭瀛樺湪鏃讹紝璁剧疆涓婚敭鍙傛暟
- param[setting.primaryKey] = ID
+ param[setting.primaryKey] = primaryId
}
} else if (btn.sql) {
param.ID = primaryId
@@ -1182,7 +1180,7 @@
}
_resolve()
})
- } else if (btn.Ot === 'required' || (btn.Ot === 'requiredOnce' && btn.OpenType === 'pop')) {
+ } else if (btn.Ot === 'required') {
let _formPrimaryId = ''
if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
@@ -1736,6 +1734,12 @@
if (this.props.BID) {
param.BID = this.props.BID
}
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
--
Gitblit v1.8.0