From a7c6bffc152da5eeb780cca98fe73b7d90becf04 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十月 2024 16:22:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/index.jsx | 11 ++++-
src/api/index.js | 4 +
src/menu/components/card/cardcellcomponent/index.jsx | 10 +++++
src/utils/utils-custom.js | 22 +++++-----
src/menu/components/search/main-search/dragsearch/card.jsx | 2
src/utils/utils.js | 2
src/menu/components/share/actioncomponent/index.jsx | 10 +++++
7 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 7747b40..b18ae3e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -469,7 +469,7 @@
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
- if (reHome) {
+ if (reHome && reload !== 'home_page_id') {
MKEmitter.emit('reloadMenuView', 'home_page_id')
}
}
@@ -753,6 +753,7 @@
window.mkInfo(n)
})
}
+ delete res.mksqls
if (res.ErrCode === 'version_error') {
res.ErrCode = '-2'
MKEmitter.emit('reloadTabs')
@@ -1071,6 +1072,7 @@
window.mkInfo(n)
})
}
+ delete res.mksqls
if (!res.status) {
if (res.ErrCode === 'version_error') {
res.ErrCode = '-2'
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
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 59a8add..e34c81f 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4205,7 +4205,7 @@
if @works_begin_branch@ = 'Y'
begin
- update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
end
else
@@ -4414,7 +4414,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4714,7 +4714,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4991,7 +4991,7 @@
}
reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5296,7 +5296,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5568,7 +5568,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5852,7 +5852,7 @@
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5967,7 +5967,7 @@
// reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -6091,7 +6091,7 @@
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -6198,7 +6198,7 @@
return true
})
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
return {LText: sql, md5: md5(sql), reps}
}
@@ -6294,7 +6294,7 @@
${callback}
`
- _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 0699bca..a93c540 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2811,7 +2811,7 @@
update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
- ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'` : ''}
if @check_userids@ != ''
--
Gitblit v1.8.0