From 669d7cc31eb3728ad09bfb7ce6e615f5c571c14e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 一月 2020 15:58:39 +0800
Subject: [PATCH] 2020-01-08
---
src/tabviews/tableshare/actionList/index.jsx | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/tableshare/actionList/index.jsx b/src/tabviews/tableshare/actionList/index.jsx
index 0b85658..0c22ac1 100644
--- a/src/tabviews/tableshare/actionList/index.jsx
+++ b/src/tabviews/tableshare/actionList/index.jsx
@@ -131,18 +131,31 @@
return
}
+ // 鎵ц鏂瑰紡涓哄琛屾嫾鎺ワ紝涓旀墦寮�鏂瑰紡涓鸿〃鍗曟椂锛屼細杞负寰幆鍙戦�佽姹�
+ // 鎵撳紑鏂瑰紡涓烘ā鎬佹锛屼娇鐢ㄥ唴閮ㄥ嚱鏁版坊鍔�
if (
btn.Ot === 'notRequired' ||
btn.Ot === 'requiredSgl' ||
(btn.Ot === 'requiredOnce' && btn.OpenType !== 'pop') ||
(btn.OpenType === 'pop' && !btn.innerFunc && btn.sql && btn.sqlType === 'insert')
) {
+
+ // 鍒涘缓鍑瘉鏃讹紝闇�瑕侀�夋嫨琛屾椂
+ if (data.length === 0 && !btn.innerFunc && btn.verify && btn.verify.voucher && btn.verify.voucher.enabled) {
+ notification.warning({
+ top: 92,
+ message: '浣跨敤鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒',
+ duration: 10
+ })
+ return
+ }
+
let param = { // 绯荤粺瀛樺偍杩囩▼
func: 'sPC_TableData_InUpDe',
BID: this.props.BID
}
- if (setting.primaryKey) {
+ if (setting.primaryKey) { // 涓婚敭鍊奸璁撅紝浠庤〃鏍兼暟鎹涓�椤归�夊彇
param[setting.primaryKey] = (data[0] && data[0][setting.primaryKey]) || ''
}
@@ -152,7 +165,7 @@
} else if (btn.Ot === 'requiredSgl') {
ID = data[0][setting.primaryKey]
- } else if (btn.Ot === 'requiredOnce') {
+ } else if (btn.Ot === 'requiredOnce') { // id鍊兼嫾鎺�
let ids = data.map(d => { return d[setting.primaryKey]})
ID = ids.join(',')
}
@@ -161,10 +174,10 @@
param[setting.primaryKey] = ID
}
- if (btn.innerFunc) {
+ if (btn.innerFunc) { // 浣跨敤鑷畾涔夊嚱鏁�
param.func = btn.innerFunc
} else if (btn.sql) {
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param[setting.primaryKey])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param[setting.primaryKey], data[0])) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -176,16 +189,16 @@
param[_data.key] = _data.value
})
- } else if (btn.sql && btn.sqlType === 'insert') {
+ } else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
if (setting.primaryKey) {
param[setting.primaryKey] = Utils.getguid()
}
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey], data[0])) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
} else if (btn.sql) {
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey], data[0])) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -216,7 +229,7 @@
if (btn.innerFunc) {
param.func = btn.innerFunc
} else if (btn.sql) {
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param[setting.primaryKey])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param[setting.primaryKey], cell)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -232,7 +245,7 @@
if (setting.primaryKey) {
param[setting.primaryKey] = cell[setting.primaryKey]
}
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey])) // 鏁版嵁婧�
+ param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param[setting.primaryKey], cell)) // 鏁版嵁婧�
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -666,6 +679,14 @@
const { configMap, execAction } = this.state
let subfields = []
+ if (execAction.setting.display === 'prompt') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず锛屼笉璇锋眰涓嬫媺鑿滃崟淇℃伅
+ this.setState({
+ btnloading: false
+ })
+ this.modelconfirm()
+ return
+ }
+
if (execAction.groups.length > 0) {
execAction.groups.forEach(group => {
group.sublist.forEach(field => {
@@ -788,6 +809,37 @@
})
}
+ modelconfirm = () => {
+ const { execAction, tabledata } = this.state
+ let _this = this
+ let _fields = []
+ if (execAction.groups.length > 0) {
+ execAction.groups.forEach(group => {
+ _fields = [..._fields, ...group.sublist]
+ })
+ } else {
+ _fields = execAction.fields
+ }
+ let result = _fields.map(item => {
+ return {
+ key: item.field,
+ readonly: item.readonly === 'true',
+ type: item.type,
+ value: item.initval
+ }
+ })
+
+ confirm({
+ title: this.props.dict['main.action.confirm.tip'],
+ onOk() {
+ return new Promise(resolve => {
+ _this.execSubmit(execAction, tabledata, resolve, result)
+ })
+ },
+ onCancel() {}
+ })
+ }
+
/**
* @description 鏄剧ず妯℃�佹
*/
--
Gitblit v1.8.0