From caeedb709671e9fa81195d096ec62b9ccadbfa82 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 六月 2023 14:26:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/modalconfig/checkCard/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/templates/modalconfig/checkCard/index.jsx b/src/templates/modalconfig/checkCard/index.jsx
index 558e172..0813fd3 100644
--- a/src/templates/modalconfig/checkCard/index.jsx
+++ b/src/templates/modalconfig/checkCard/index.jsx
@@ -25,7 +25,7 @@
}
let cls = ''
- if (_options.length * width <= 24 && this.state.appType !== 'mob') {
+ if (_options.length * width <= 24) {
cls = 'no-margin-bottom'
}
if (display === 'picture') {
@@ -104,8 +104,10 @@
}
render() {
+ const { config } = this.props
+
return (
- <div className="check-card-edit-box" style={{marginTop: '5px'}}>
+ <div className={'check-card-edit-box border-' + (config.border || 'show')} style={{marginTop: '5px'}}>
<Row gutter={12}>{this.getCards()}</Row>
</div>
)
--
Gitblit v1.8.0