From 9a9650c758bd84bef0739aa8949627af666bb1c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 31 七月 2020 10:07:42 +0800
Subject: [PATCH] 2020-07-31
---
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index 8b4f1e3..07d195f 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -40,12 +40,25 @@
const { columns } = this.props
let item = columns.filter(col => col.field === record.field)[0]
+ let _type = 'background '
+ if (record.signType === 'icon' || record.signType === 'font') {
+ _type = 'font '
+ }
+
this.setState({
originField: item || '',
editItem: record,
contrastType: record.contrastType || '',
signType: record.signType || '',
- selectIcon: record.icon || ''
+ selectIcon: record.icon || '',
+ options: this.state.options.map(option => {
+ option.children = option.children.map(cell => {
+ cell.label = <div className={_type + cell.value}>{record.icon ? <Icon type={record.icon} /> : cell.value}</div>
+
+ return cell
+ })
+ return option
+ })
}, () => {
let fieldvalue = {}
Object.keys(record).forEach(key => {
@@ -351,7 +364,7 @@
<Cascader
options={options}
placeholder=""
- displayRender={(label, selectedOptions) => selectedOptions[0] ? selectedOptions[0].label + ' / ' + selectedOptions[1].value : ''}
+ displayRender={(label, selectedOptions) => selectedOptions[0] ? selectedOptions[0].label + (selectedOptions[1] ? ' / ' + selectedOptions[1].value : '') : ''}
getPopupContainer={() => document.getElementById('model-mark-form-box')}
/>
)}
--
Gitblit v1.8.0