From 3672b83182a648733ff245bd690f170d68cc80a9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 17:38:27 +0800
Subject: [PATCH] 2023-05-15
---
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index 26a4e4b..b40a192 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -101,6 +101,13 @@
duration: 5
})
return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
+ duration: 5
+ })
+ return
}
let error = Utils.verifySql(values.sql, 'customscript')
@@ -170,7 +177,8 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
-
+ param.LText = param.LText.replace(/\n/g, ' ')
+
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -189,7 +197,7 @@
this.props.scriptsChange(values)
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
} else {
this.setState({loading: false})
@@ -235,6 +243,9 @@
}
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
--
Gitblit v1.8.0