From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 221db3c..7a60231 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -635,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>
@@ -682,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" />
@@ -697,7 +697,7 @@
<Radio value="false">闅愯棌</Radio>
</Radio.Group>)}
</Form.Item>
- </Col>
+ </Col> */}
{tableType !== '' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="褰撴寜閽墽琛屽畬鎴愬苟杩斿洖涓婚敭鍊兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇銆傛敞锛氬湪鍚敤鏃犱汉鍊煎畧鍔熻兘鏃舵棤鏁堛��">
@@ -727,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" />
@@ -738,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="鍙屽嚮琛ㄦ牸涓锛岃Е鍙戠殑鎸夐挳銆�">
--
Gitblit v1.8.0