From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 208 +++------------------------------------------------
1 files changed, 13 insertions(+), 195 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index e80b861..5ce74b1 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -27,8 +27,6 @@
state = {
interType: 'system',
- procMode: 'script',
- requestMode: 'system',
sysInterface: 'false',
controlField: '',
tableType: '',
@@ -66,8 +64,6 @@
this.setState({
interType: setting.interType || 'system',
- procMode: setting.procMode || 'script',
- requestMode: setting.requestMode || 'system',
controlField: setting.controlField || '',
sysInterface: setting.sysInterface || 'false',
tableType: setting.tableType,
@@ -172,14 +168,6 @@
this.setState({
interType: value
})
- } else if (key === 'procMode') {
- this.setState({
- procMode: value
- })
- } else if (key === 'requestMode') {
- this.setState({
- requestMode: value
- })
} else if (key === 'sysInterface') {
this.setState({
sysInterface: value
@@ -204,7 +192,7 @@
render() {
const { setting, dict, menu, config, columns } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, funcRules, funcTooltip, procMode, requestMode, tableType, controlField, sysInterface } = this.state
+ const { interType, funcRules, funcTooltip, tableType, controlField, sysInterface } = this.state
const formItemLayout = {
labelCol: {
@@ -232,6 +220,10 @@
{
max: 50,
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
+ },
+ {
+ pattern: /^[a-zA-Z_]+$/,
+ message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
@@ -252,7 +244,6 @@
<Radio value="system">绯荤粺</Radio>
<Radio value="inner">鍐呴儴</Radio>
<Radio value="outer">澶栭儴</Radio>
- <Radio value="custom">鑷畾涔�</Radio>
</Radio.Group>)}
</Form.Item>
</Col>
@@ -286,47 +277,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="鍙傛暟澶勭悊">
- {getFieldDecorator('procMode', {
- initialValue: procMode,
- rules: [
- {
- required: true,
- message: dict['form.required.select'] + '鍙傛暟澶勭悊鏂瑰紡!'
- },
- ]
- })(
- <Radio.Group onChange={(e) => {this.onRadioChange(e, 'procMode')}}>
- <Radio value="script">鍓嶇疆鑴氭湰</Radio>
- <Radio value="inner">鍓嶇疆鍑芥暟</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' && procMode === 'inner' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title={funcTooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 鍓嶇疆鍑芥暟
- </Tooltip>
- }>
- {getFieldDecorator('prevFunc', {
- initialValue: setting.prevFunc || '',
- rules: [
- {
- required: true,
- message: dict['form.required.input'] + '鍓嶇疆鍑芥暟!'
- },
- {
- max: formRule.func.max,
- message: formRule.func.maxMessage
- },
- ...funcRules
- ]
- })(<Input placeholder={''} autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
- {interType === 'outer' || interType === 'custom' ? <Col className="mk-through-line3" span={24}>
+ {interType === 'outer' ? <Col className="mk-through-line3" span={24}>
<Form.Item label="鎺ュ彛鍦板潃">
{getFieldDecorator('interface', {
initialValue: setting.interface || (interType === 'outer' && sysInterface === 'true' ? window.GLOB.mainSystemApi : ''),
@@ -339,7 +290,7 @@
})(<TextArea rows={2} readOnly={interType === 'outer' && sysInterface === 'true'}/>)}
</Form.Item>
</Col> : null}
- {(interType === 'outer' && sysInterface !== 'true') || interType === 'custom' ? <Col className="mk-through-line3" span={24}>
+ {interType === 'outer' && sysInterface !== 'true' ? <Col className="mk-through-line3" span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎵�浣跨敤鐨勭殑鎺ュ彛鍦板潃銆�">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -351,41 +302,7 @@
})(<TextArea rows={2} />)}
</Form.Item>
</Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="璇锋眰鏂瑰紡">
- {getFieldDecorator('method', {
- initialValue: setting.method || 'post',
- rules: [
- {
- required: true,
- message: dict['form.required.select'] + '璇锋眰鏂瑰紡!'
- },
- ]
- })(
- <Radio.Group>
- <Radio value="get">GET</Radio>
- <Radio value="post">POST</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="鏁版嵁璇锋眰">
- {getFieldDecorator('requestMode', {
- initialValue: requestMode,
- rules: [
- {
- required: true,
- message: dict['form.required.select'] + '鏁版嵁璇锋眰鏂瑰紡!'
- },
- ]
- })(
- <Radio.Group onChange={(e) => {this.onRadioChange(e, 'requestMode')}}>
- <Radio value="system">绯荤粺鍑芥暟</Radio>
- <Radio value="inner">鍐呴儴鍑芥暟</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'inner' || (interType === 'custom' && requestMode === 'inner') ? <Col span={8}>
+ {interType === 'inner' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={funcTooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -424,7 +341,7 @@
})(<Input placeholder={''} autoComplete="off" />)}
</Form.Item>
</Col> : null}
- {interType === 'system' || (interType === 'custom' && requestMode === 'system') ? <Col span={24} className="mk-through-line3">
+ {interType === 'system' ? <Col span={24} className="mk-through-line3">
<Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} } label={
<Tooltip placement="topLeft" title={`浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''锛涙煡璇㈡浛鎹㈢ $select@ -> /* 鎴� ''銆� @select$ -> */ 鎴� ''锛涚粺璁℃浛鎹㈢ $sum@ -> /* 鎴� ''銆� @sum$ -> */ 鎴� ''銆俙}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -436,7 +353,7 @@
})(<CodeMirror />)}
</Form.Item>
</Col> : null}
- {interType === 'system' || (interType === 'custom' && requestMode === 'system') ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -452,7 +369,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {interType === 'system' || (interType === 'custom' && requestMode === 'system') ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label="榛樿sql">
{getFieldDecorator('default', {
initialValue: setting.default || 'true'
@@ -496,77 +413,6 @@
})(<Input placeholder={'ID asc, UID desc'} autoComplete="off" />)}
</Form.Item>
</Col>
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="鍥炶皟鏂瑰紡">
- {getFieldDecorator('callbackType', {
- initialValue: setting.callbackType || 'script'
- })(
- <Radio.Group onChange={(e) => {this.onRadioChange(e, 'callbackType')}}>
- <Radio value="default">榛樿鑴氭湰</Radio>
- <Radio value="script">鑷畾涔夎剼鏈�</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="鍥炶皟琛ㄥ悕">
- {getFieldDecorator('cbTable', {
- initialValue: setting.cbTable || '',
- rules: [
- {
- required: true,
- message: dict['form.required.input'] + '鍥炶皟琛ㄥ悕!'
- },
- {
- max: formRule.input.max,
- message: formRule.input.message
- }
- ]
- })(<Input placeholder={''} autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title={'鍚屾鎵ц锛氬閮ㄦ帴鍙ｈ皟鐢ㄦ垚鍔熷悗鍐嶈姹傛暟鎹紱寮傛鎵ц锛氬閮ㄦ帴鍙ｈ皟鐢ㄤ笌璇锋眰鏁版嵁鍚屾椂杩涜銆�'}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 鎵ц鏂瑰紡
- </Tooltip>
- }>
- {getFieldDecorator('execType', {
- initialValue: setting.execType || 'sync'
- })(
- <Radio.Group>
- <Radio value="sync">鍚屾</Radio>
- <Radio value="async">寮傛</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title={'濡傛灉鑷畾涔夋帴鍙ｄ笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�'}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 璺ㄥ煙璇锋眰
- </Tooltip>
- }>
- {getFieldDecorator('cross', {
- initialValue: setting.cross || 'true'
- })(
- <Radio.Group>
- <Radio value="true">鏀寔</Radio>
- <Radio value="false">涓嶆敮鎸�</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
- {interType === 'custom' ? <Col span={8}>
- <Form.Item label="鎵ц娆℃暟">
- {getFieldDecorator('execTime', {
- initialValue: setting.execTime || 'once'
- })(
- <Radio.Group>
- <Radio value="always">濮嬬粓</Radio>
- <Radio value="once">涓�娆�</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> : null}
<Col span={8}>
<Form.Item label="鏄惁鍒嗛〉">
{getFieldDecorator('laypage', {
@@ -600,7 +446,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {config.Template === 'CommonTable' ? <Col span={8}>
+ {/* {config.Template === 'CommonTable' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍚湁鍚堝苟鍒楁垨琛ㄦ牸鍑虹幇妯悜婊氬姩鏃朵細鏄剧ず寮傚父锛岃鎱庣敤锛�'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -615,7 +461,7 @@
<Radio value="false">{dict['model.false']}</Radio>
</Radio.Group>)}
</Form.Item>
- </Col> : null}
+ </Col> : null} */}
<Col span={8}>
<Form.Item label="杈规">
{getFieldDecorator('bordered', {
@@ -688,22 +534,6 @@
</Radio.Group>)}
</Form.Item>
</Col>
- {/* <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="鍦ㄦ悳绱㈡潯浠跺瓨鍦ㄦ椂锛屾槸鍚︽樉绀烘悳绱㈠拰閲嶇疆鎸夐挳銆�">
- <QuestionCircleOutlined className="mk-form-tip" />
- 鎼滅储鎸夐挳
- </Tooltip>
- }>
- {getFieldDecorator('show', {
- initialValue: setting.show || 'true'
- })(
- <Radio.Group>
- <Radio value="true">鏄剧ず</Radio>
- <Radio value="false">闅愯棌</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> */}
{tableType !== '' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="褰撴寜閽墽琛屽畬鎴愬苟杩斿洖涓婚敭鍊兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇銆傛敞锛氬湪鍚敤鏃犱汉鍊煎畧鍔熻兘鏃舵棤鏁堛��">
@@ -733,18 +563,6 @@
})(<InputNumber min={1} max={500} precision={0} />)}
</Form.Item>
</Col>
- {/* <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
- <QuestionCircleOutlined className="mk-form-tip" />
- 楂樼骇鎼滅储
- </Tooltip>
- }>
- {getFieldDecorator('advanceWidth', {
- initialValue: setting.advanceWidth || 1000
- })(<InputNumber min={10} max={3000} precision={0}/>)}
- </Form.Item>
- </Col> */}
<Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙屽嚮琛ㄦ牸涓锛岃Е鍙戠殑鎸夐挳銆�">
--
Gitblit v1.8.0