From 8a717c6b8f54a45ff013b8e68599aad2918cc88c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 17:35:49 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
index 9f92dd0..fdd7f52 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
@@ -139,6 +139,10 @@
let radio = setting.searchRatio || 6
let labelwidth = setting.searchLwidth !== undefined ? setting.searchLwidth : 33.3
let advanceType = setting.advanceType || 'modal'
+ let style = {}
+ if (setting.borderRadius) {
+ style.borderRadius = setting.borderRadius
+ }
return (
<div ref={drop} className="ant-row">
@@ -170,8 +174,8 @@
</div>
} trigger="hover">
<div className="ant-col ant-form-item-control-wrapper">
- <Button type="primary">鎼滅储</Button>
- <Button style={{ marginLeft: 8 }}>閲嶇疆</Button>
+ <Button style={style} type="primary">鎼滅储</Button>
+ <Button style={{ marginLeft: 8, ...style }}>閲嶇疆</Button>
<div style={{position: 'absolute', top: 0, bottom: 0, left: 0, right: 0}}></div>
</div>
</Popover>
--
Gitblit v1.8.0