From 74f42024805abe7850dbeeb03dae48a0d9ef0b79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2020 13:10:17 +0800
Subject: [PATCH] 2020-02-05
---
src/tabviews/tableshare/actionList/index.jsx | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/tableshare/actionList/index.jsx b/src/tabviews/tableshare/actionList/index.jsx
index 6c52337..d624e27 100644
--- a/src/tabviews/tableshare/actionList/index.jsx
+++ b/src/tabviews/tableshare/actionList/index.jsx
@@ -11,15 +11,16 @@
class MainAction extends Component {
static propTpyes = {
- BID: PropTypes.string,
- BData: PropTypes.any,
- Tab: PropTypes.any,
- type: PropTypes.string,
- MenuID: PropTypes.string,
- actions: PropTypes.array, // 鎼滅储鏉′欢鍒楄〃
- dict: PropTypes.object, // 瀛楀吀椤�
- setting: PropTypes.any,
- triggerPopview: PropTypes.func
+ BID: PropTypes.string, // 涓昏〃ID
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
+ Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
+ type: PropTypes.string, // 鍒ゆ柇褰撳墠涓轰富琛紙main锛夈�佸瓙琛紙sub锛夈�佸瓙琛ㄦ爣绛撅紙subtab锛�
+ MenuID: PropTypes.string, // 鑿滃崟ID
+ actions: PropTypes.array, // 鎸夐挳缁�
+ logcolumns: PropTypes.array, // 鏃ュ織涓樉绀哄垪
+ dict: PropTypes.object, // 瀛楀吀椤�
+ setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
+ triggerPopview: PropTypes.func // 寮圭獥鏍囩椤佃Е鍙�
}
state = {
@@ -143,7 +144,7 @@
* @description 鎸夐挳鎻愪氦鎵ц
*/
execSubmit = (btn, data, _resolve, formdata) => {
- const { setting } = this.props
+ const { setting, logcolumns } = this.props
if (btn.intertype === 'inner') {
// 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鍐呴儴鍑芥暟鍜屾暟鎹簮涓嶅彲鍚屾椂涓虹┖, 浣跨敤绯荤粺鍑芥暟鏃讹紝绫诲瀷涓嶅彲涓虹┖
@@ -196,7 +197,7 @@
}
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, data[0])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, data[0], logcolumns)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -214,12 +215,12 @@
} else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
param.ID = Utils.getguid()
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -251,7 +252,7 @@
}
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, cell)) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, cell, logcolumns)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -269,7 +270,7 @@
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, cell)) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
--
Gitblit v1.8.0