From f45b2ad61211cf2821cdaab07676c7906c96410a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 七月 2023 18:23:56 +0800
Subject: [PATCH] 2023-07-05
---
src/menu/datasource/verifycard/index.jsx | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index a8e1e0f..2fe9dae 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -64,6 +64,7 @@
inputType: 'input',
editable: true,
unique: true,
+ strict: true,
copy: true,
rules: [{
pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
@@ -212,7 +213,8 @@
median: _setting,
searches: search,
defaultSearch: _search,
- searchKey: ''
+ searchKey: '',
+ debugId: _setting.debugId || ''
})
this.getsysScript()
@@ -655,6 +657,7 @@
}
sqlverify = (resolve, reject, change = false, testScripts) => {
+ const { config } = this.props
const { columns, setting, scripts, searches, defaultSearch, debugId } = this.state
let _scripts = scripts.filter(item => item.status !== 'false')
@@ -679,7 +682,7 @@
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, timestamp)
+ let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, config.type, '2023-04-20 15:29:37')
let _debugId = md5(r.sql)
@@ -722,8 +725,9 @@
if (sumParam) {
Api.genericInterface(sumParam).then(res => {
if (res.status) {
- this.setState({debugId: _debugId})
- resolve()
+ this.setState({debugId: _debugId}, () => {
+ resolve()
+ })
} else {
reject()
Modal.error({
@@ -732,8 +736,9 @@
}
})
} else {
- this.setState({debugId: _debugId})
- resolve()
+ this.setState({debugId: _debugId}, () => {
+ resolve()
+ })
}
} else {
reject()
@@ -903,7 +908,7 @@
let n = []
columns.forEach(col => {
- m.push(`${col.field}(${col.label})`)
+ m.push(`${col.field} ${col.datatype}`)
n.push(col.field)
})
@@ -924,7 +929,7 @@
let n = []
subColumns.forEach(col => {
- m.push(`${col.field}(${col.label})`)
+ m.push(`${col.field} ${col.datatype}`)
n.push(col.field)
})
@@ -1023,6 +1028,7 @@
this.setState({visible: true, script: null, scriptValue: ''})
}}/> : null}
<CustomScriptsForm
+ type={config.type}
setting={setting}
searches={searches}
defaultsql={defaultsql}
--
Gitblit v1.8.0