From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/templates/zshare/verifycard/index.jsx | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index a3a388e..5e448f2 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -556,6 +556,21 @@
_verify.scripts = _verify.scripts || []
_verify.cbScripts = _verify.cbScripts || []
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(m => {
+ let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
+ _verify.customverifys.forEach(item => {
+ item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ })
+ _verify.scripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ })
+ _verify.cbScripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ })
+ })
+ }
+
this.setState({
verify: _verify
})
@@ -860,7 +875,7 @@
_columns = fromJS(columns).toJS()
let hasbid = false
_columns = _columns.filter(col => {
- if (col.field.toLowerCase() === 'bid') {
+ if (col.field && col.field.toLowerCase() === 'bid') {
hasbid = true
}
@@ -926,8 +941,8 @@
},
{
obj_name: 'noteCodes',
- arr_field: 'templatecode,describe',
- LText: window.btoa(window.encodeURIComponent(`select templatecode,'['+SignName+']'+describe as describe from (select * from bd_msn_sms_temp where deleted=0 and TypeDesc='QX' and status=20 ) t inner join (select openid from susers where uid=@userid@) u on t.openid =t.openid`))
+ arr_field: 'templatecode,describe,id',
+ LText: window.btoa(window.encodeURIComponent(`select t.id,templatecode,'['+SignName+']'+describe as describe from (select * from bd_msn_sms_temp where deleted=0 and TypeDesc='QX' and status=20 ) t inner join (select openid from susers where uid=@userid@) u on t.openid =t.openid`))
},
{
obj_name: 'scripts',
@@ -967,7 +982,8 @@
notes: res.noteCodes.map(item => {
return {
name: item.describe,
- value: item.templatecode
+ value: item.templatecode,
+ id: item.id
}
}),
systemScripts: res.scripts.map(item => {
@@ -1092,11 +1108,11 @@
this.setState({ verify })
}
- onNoteCodeChange = (val) => {
+ onNoteCodeChange = (val, option) => {
const { verify } = this.state
this.setState({
- verify: {...verify, noteCode: val}
+ verify: {...verify, noteCode: val, noteId: option.props.id}
})
}
@@ -1301,7 +1317,7 @@
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
- if (card.sqlType !== 'custom' && verify.default === 'false' && verify.scripts.length === 0) {
+ if ((card.sqlType === 'custom' || verify.default === 'false') && verify.scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝蹇呴』璁剧疆鑷畾涔夎剼鏈紒',
@@ -1334,6 +1350,21 @@
verify.noteEnable = 'false'
} else if (verify.noteEnable !== 'true' && verify.noteCode) {
verify.noteCode = ''
+ }
+
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(m => {
+ let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig')
+ verify.customverifys.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ })
+ verify.scripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ })
+ verify.cbScripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ })
+ })
}
if (msg) {
@@ -1452,7 +1483,7 @@
<Form.Item label="鐭俊妯℃澘">
<Select value={verify.noteCode} onSelect={this.onNoteCodeChange}>
{notes.map(option =>
- <Select.Option key={option.value} value={option.value}>
+ <Select.Option key={option.value} id={option.id} value={option.value}>
{option.name}
</Select.Option>
)}
--
Gitblit v1.8.0