From d3e3e32f62955e7ac7983bde70924daaacab5dc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 九月 2020 13:33:37 +0800
Subject: [PATCH] 2020-09-08
---
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
similarity index 94%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
index 705111e..ef1f4cc 100644
--- a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
@@ -20,7 +20,7 @@
}
state = {
- interType: this.props.setting.interType || 'inner',
+ interType: this.props.setting.interType || 'system',
}
handleConfirm = () => {
@@ -30,7 +30,7 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
// 鏁版嵁婧愬墠绔獙璇�
- if (values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' && !values.dataresource) {
+ if (values.interType === 'system' && values.execute !== 'false' && !values.dataresource) {
notification.warning({
top: 92,
message: '璇峰～鍐欏唴閮ㄥ嚱鏁版垨鏁版嵁婧愶紒',
@@ -38,7 +38,7 @@
})
reject()
return
- } else if (values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' && values.dataresource) {
+ } else if (values.interType === 'system' && values.execute !== 'false' && values.dataresource) {
let _quot = values.dataresource.match(/'{1}/g)
let _lparen = values.dataresource.match(/\({1}/g)
let _rparen = values.dataresource.match(/\){1}/g)
@@ -88,7 +88,7 @@
// 鏁版嵁婧愪繚瀛�
if (
- values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' &&
+ values.interType === 'system' && values.execute !== 'false' &&
/[^\s]+\s+[^\s]+/ig.test(values.dataresource) && setting.dataresource !== values.dataresource
) {
let param = {
@@ -181,6 +181,7 @@
]
})(
<Radio.Group onChange={(e) => {this.onRadioChange(e, 'interType')}}>
+ <Radio value="system">绯荤粺</Radio>
<Radio value="inner">鍐呴儴</Radio>
<Radio value="outer">澶栭儴</Radio>
</Radio.Group>)}
@@ -222,7 +223,7 @@
})(<Input placeholder={''} autoComplete="off" />)}
</Form.Item>
</Col> : null}
- {interType === 'inner' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
+ {interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item labelCol={{xs: { span: 24 }, sm: { span: 2 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 22 }} } label={
<Tooltip placement="topLeft" title={'浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\''}>
<Icon type="question-circle" />
@@ -234,7 +235,7 @@
})(<CodeMirror />)}
</Form.Item>
</Col> : null}
- {interType === 'inner' ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
<Icon type="question-circle" />
@@ -265,7 +266,7 @@
)}
</Form.Item>
</Col> */}
- {interType === 'inner' ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label="榛樿sql">
{getFieldDecorator('execute', {
initialValue: setting.execute || 'true'
--
Gitblit v1.8.0