From 306eb5f035302baef95995437e2dc735110b6536 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 17:38:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/search/main-search/dragsearch/index.jsx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/index.jsx b/src/menu/components/search/main-search/dragsearch/index.jsx
index 5da648f..c290b29 100644
--- a/src/menu/components/search/main-search/dragsearch/index.jsx
+++ b/src/menu/components/search/main-search/dragsearch/index.jsx
@@ -135,6 +135,10 @@
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">
@@ -161,8 +165,8 @@
<div className="ant-row ant-form-item" style={{lineHeight: '40px', height: '55px', marginBottom: 0}}>
<div className="ant-col ant-form-item-label" style={{width: labelwidth + '%'}}></div>
<div className="ant-col ant-form-item-control-wrapper" style={{whiteSpace: 'nowrap'}}>
- <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>
</div>
--
Gitblit v1.8.0