From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/modalconfig/checkCard/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/templates/modalconfig/checkCard/index.jsx b/src/templates/modalconfig/checkCard/index.jsx
index 0813fd3..1bc351c 100644
--- a/src/templates/modalconfig/checkCard/index.jsx
+++ b/src/templates/modalconfig/checkCard/index.jsx
@@ -15,7 +15,7 @@
}
getCards = () => {
- const { display, width, options, fields, ratio, picratio, backgroundColor } = this.props.config
+ const { display, width, options, fields, ratio, picratio, backgroundColor, field, labelShow } = this.props.config
let _options = []
let _fields = fields || []
@@ -86,7 +86,7 @@
return <Col span={width}>
<div className="card-cell no-margin-bottom" style={style}>
<div className="bg-mask" style={_style}></div>
- <span style={{color: '#000000', fontSize: '14px', height: '21px'}}>绀轰緥</span>
+ <span style={{color: '#000000', fontSize: '14px', height: '21px'}}>绀轰緥 {labelShow === 'false' ? field : ''}</span>
</div>
</Col>
}
--
Gitblit v1.8.0