From db731b1d8b3ed1fcce588307b8bd5eccc4f805b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 五月 2024 11:30:39 +0800
Subject: [PATCH] 2024-05-08
---
src/templates/zshare/verifycard/index.jsx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 6cebcac..ee82600 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -649,12 +649,13 @@
_verify.scripts = _verify.scripts || []
_verify.cbScripts = _verify.cbScripts || []
- if (window.GLOB.process) {
+ if (window.GLOB.process && card.intertype !== 'inner') {
_verify.workFlow = _verify.workFlow || 'false'
_verify.flowType = _verify.flowType || (card.sqlType === 'insert' ? 'start' : 'approval')
_verify.flowSql = _verify.flowSql || 'true'
} else {
delete _verify.workFlow
+ delete _verify.flowRemark
delete _verify.flowType
delete _verify.flowSql
}
@@ -1562,7 +1563,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.workFlow === 'true' && verify.flowSql === 'true') && verify.scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝蹇呴』璁剧疆鑷畾涔夎剼鏈紒',
@@ -1778,6 +1779,7 @@
btn={this.props.card}
initsql={this.state.initsql}
workFlow={verify.workFlow}
+ flowRemark={verify.flowRemark}
flowType={verify.flowType}
flowSql={verify.flowSql}
customScripts={verify.scripts}
@@ -1794,6 +1796,7 @@
btn={this.props.card}
initsql={this.state.initsql}
workFlow={verify.workFlow}
+ flowRemark={verify.flowRemark}
flowType={verify.flowType}
flowSql={verify.flowSql}
customScripts={verify.scripts}
--
Gitblit v1.8.0