From 0c86e5e2eaf907dfcb63aea13e6efac3ccc52cce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2020 11:06:20 +0800
Subject: [PATCH] 2020-02-25
---
src/tabviews/tableshare/actionList/index.jsx | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/tableshare/actionList/index.jsx b/src/tabviews/tableshare/actionList/index.jsx
index d8e49b4..8d12a45 100644
--- a/src/tabviews/tableshare/actionList/index.jsx
+++ b/src/tabviews/tableshare/actionList/index.jsx
@@ -247,7 +247,14 @@
})
} else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
- param.ID = Utils.getguid()
+ primaryId = ''
+ if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
+ let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
+ if (_form) {
+ primaryId = _form.value
+ }
+ }
+ param.ID = primaryId || Utils.getguid()
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)
@@ -268,6 +275,14 @@
_resolve()
})
} else if (btn.Ot === 'required' || (btn.Ot === 'requiredOnce' && btn.OpenType === 'pop')) {
+ let _formPrimaryId = ''
+ if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
+ let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
+ if (_form) {
+ _formPrimaryId = _form.value
+ }
+ }
+
let _params = data.map((cell, index) => {
let param = {
func: 'sPC_TableData_InUpDe',
@@ -303,6 +318,11 @@
if (setting.primaryKey) {
param[setting.primaryKey] = primaryId
}
+ } else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
+ param.ID = _formPrimaryId || Utils.getguid()
+ 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)
} else if (btn.sql) {
if (index !== 0) {
formdata = formdata.map(_data => {
--
Gitblit v1.8.0