From dceab3b38fe588d142383d99117257e685ab0d27 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十月 2024 11:04:28 +0800
Subject: [PATCH] 2024-10-30
---
src/menu/datasource/index.jsx | 11 ++++++++---
src/menu/components/card/cardcellcomponent/index.jsx | 10 ++++++++++
src/menu/components/search/main-search/dragsearch/card.jsx | 2 +-
src/menu/components/share/actioncomponent/index.jsx | 10 ++++++++++
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index d6fa1a5..89008dd 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -600,6 +600,16 @@
const { elements, card } = this.state
this.verifyRef.handleConfirm().then(res => {
+ res.customverifys && res.customverifys.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+ res.scripts && res.scripts.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+ res.cbScripts && res.cbScripts.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+
let _elements = elements.map(cell => {
if (cell.uuid === card.uuid) {
cell.verify = res
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index 72462e7..03f5b65 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/dragsearch/card.jsx
@@ -146,7 +146,7 @@
</div>
} trigger="hover">
<div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + card.type + (card.advanced === 'true' ? ' advanced' : '') + (card.query === 'false' ? ' no-query' : '')} style={{ opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
+ <div ref={node => drag(drop(node))} onDoubleClick={() => editCard(id)}>
<Form.Item
labelCol={{style: {width: labelwidth + '%'}}}
wrapperCol={{style: {width: (100 - labelwidth) + '%'}}}
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index e565fa3..e71e10d 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -530,6 +530,16 @@
let _actionlist = fromJS(this.state.actionlist).toJS()
_actionlist = _actionlist.filter(item => !item.origin || item.uuid === card.uuid)
+ res.customverifys && res.customverifys.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+ res.scripts && res.scripts.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+ res.cbScripts && res.cbScripts.forEach(item => {
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+ })
+
_actionlist = _actionlist.map(item => {
if (item.uuid === card.uuid) {
item.verify = res
diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx
index f264a81..dd54aa7 100644
--- a/src/menu/datasource/index.jsx
+++ b/src/menu/datasource/index.jsx
@@ -245,15 +245,20 @@
// })
// }
- if (res.setting.interType === 'system' && res.setting.dataresource && res.setting.execute !== 'false' && sFields) {
- if (new RegExp(`@(${sFields})@`, 'ig').test(res.setting.dataresource)) {
- maxScript = 1000
+ if (res.setting.interType === 'system' && res.setting.dataresource && res.setting.execute !== 'false') {
+ res.setting.dataresource = res.setting.dataresource.replace(/\t+|\v+/g, ' ')
+ if (sFields) {
+ if (new RegExp(`@(${sFields})@`, 'ig').test(res.setting.dataresource)) {
+ maxScript = 1000
+ }
}
}
res.scripts.forEach(item => {
if (item.status === 'false') return
+ item.sql = item.sql.replace(/\t+|\v+/g, ' ')
+
if (/exec\s/ig.test(item.sql)) {
useExec = true
maxScript = 1000
--
Gitblit v1.8.0