From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 1ad7820..7a60231 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -29,6 +29,7 @@
interType: 'system',
procMode: 'script',
requestMode: 'system',
+ controlField: '',
tableType: '',
funcTooltip: '',
funcRules: []
@@ -66,6 +67,7 @@
interType: setting.interType || 'system',
procMode: setting.procMode || 'script',
requestMode: setting.requestMode || 'system',
+ controlField: setting.controlField || '',
tableType: setting.tableType,
funcTooltip: tooltip,
funcRules: rules
@@ -195,7 +197,7 @@
render() {
const { setting, dict, menu, config, columns } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, funcRules, funcTooltip, procMode, requestMode, tableType } = this.state
+ const { interType, funcRules, funcTooltip, procMode, requestMode, tableType, controlField } = this.state
const formItemLayout = {
labelCol: {
@@ -633,7 +635,7 @@
<Radio value="default">澶�</Radio>
<Radio value="middle">涓�</Radio>
<Radio value="small">灏�</Radio>
- {/* <Radio value="mini">寰�</Radio> */}
+ <Radio value="mini">杩蜂綘</Radio>
</Radio.Group>)}
</Form.Item>
</Col>
@@ -680,7 +682,7 @@
</Radio.Group>)}
</Form.Item>
</Col>
- <Col span={12}>
+ {/* <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄦ悳绱㈡潯浠跺瓨鍦ㄦ椂锛屾槸鍚︽樉绀烘悳绱㈠拰閲嶇疆鎸夐挳銆�">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -695,10 +697,10 @@
<Radio value="false">闅愯棌</Radio>
</Radio.Group>)}
</Form.Item>
- </Col>
+ </Col> */}
{tableType !== '' ? <Col span={12}>
<Form.Item label={
- <Tooltip placement="topLeft" title="鍦ㄥ惎鐢ㄦ棤浜哄�煎畧鍔熻兘鏃舵棤鏁堛��">
+ <Tooltip placement="topLeft" title="褰撴寜閽墽琛屽畬鎴愬苟杩斿洖涓婚敭鍊兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇銆傛敞锛氬湪鍚敤鏃犱汉鍊煎畧鍔熻兘鏃舵棤鏁堛��">
<QuestionCircleOutlined className="mk-form-tip" />
棣栬閫変腑
</Tooltip>
@@ -725,7 +727,7 @@
})(<InputNumber min={1} max={500} precision={0} />)}
</Form.Item>
</Col>
- <Col span={12}>
+ {/* <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -736,7 +738,7 @@
initialValue: setting.advanceWidth || 1000
})(<InputNumber min={10} max={3000} precision={0}/>)}
</Form.Item>
- </Col>
+ </Col> */}
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙屽嚮琛ㄦ牸涓锛岃Е鍙戠殑鎸夐挳銆�">
@@ -786,6 +788,38 @@
})(<InputNumber min={12} max={50} precision={0}/>)}
</Form.Item>
</Col>
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 绂佺敤瀛楁
+ </Tooltip>
+ }>
+ {getFieldDecorator('controlField', {
+ initialValue: setting.controlField || ''
+ })(
+ <Select allowClear onChange={(val) => this.setState({controlField: val})}>
+ {columns.map((option, i) =>
+ <Select.Option key={i} value={option.value}>
+ {option.text}
+ </Select.Option>
+ )}
+ </Select>
+ )}
+ </Form.Item>
+ </Col>
+ {controlField ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="褰撳瓧娈靛�间笌鎺у埗鍊肩浉绛夋椂锛岃鏁版嵁浼氱鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鎺у埗鍊�
+ </Tooltip>
+ }>
+ {getFieldDecorator('controlVal', {
+ initialValue: setting.controlVal || ''
+ })(<Input autoComplete="off" />)}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
</div>
--
Gitblit v1.8.0