From e6a10ced1ed8db39486dc0a1795191c701ef3224 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 十二月 2021 18:11:35 +0800
Subject: [PATCH] 2021-12-20
---
src/menu/components/share/markcomponent/index.jsx | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 2a736fe..fa36e99 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -82,15 +82,17 @@
options: [],
render: text => {
let sign = {
- 'font': '鏂囧瓧棰滆壊',
+ 'font': '鏂囧瓧',
'background': '鑳屾櫙',
'underline': '涓嬪垝绾�',
'line-through': '涓垝绾�',
- 'icon': '鍥炬爣'
+ 'icon': '鍥炬爣',
+ 'iconfront': '鍥炬爣',
+ 'iconback': '鍥炬爣',
}
return (
- <div>{sign[text[0]]} {text[3] ? <Icon type={text[3]} /> : null}</div>
+ <div>{sign[text[0]]} {text[2] ? <Icon type={text[text.length - 1]} /> : null}</div>
)
}
}
@@ -199,16 +201,6 @@
})
},
{
- value: 'trademark',
- label: '鍝佺墝鍜屾爣璇�',
- children: minkeIconSystem.trademark.map(cell => {
- return {
- value: cell,
- label: (<Icon type={cell} />)
- }
- })
- },
- {
value: 'normal',
label: '缃戠珯閫氱敤鍥炬爣',
children: minkeIconSystem.normal.map(cell => {
@@ -222,7 +214,7 @@
let signs = [
{
value: 'font',
- label: '鏂囧瓧棰滆壊'
+ label: '鏂囧瓧'
},
{
value: 'background',
@@ -237,20 +229,14 @@
label: '涓垝绾�'
},
{
- value: 'icon',
- label: '鍥炬爣',
- children: [
- {
- value: 'front',
- label: '鍐呭鍓�',
- children: icons
- },
- {
- value: 'back',
- label: '鍐呭鍚�',
- children: icons
- }
- ]
+ value: 'iconfront',
+ label: '鍥炬爣锛堝墠锛�',
+ children: icons
+ },
+ {
+ value: 'iconback',
+ label: '鍥炬爣锛堝悗锛�',
+ children: icons
}
]
@@ -264,9 +250,17 @@
signs = []
}
+ let _marks = marks ? fromJS(marks).toJS() : []
+ _marks = _marks.map(item => {
+ if (item.signType && item.signType[0] === 'icon') {
+ item.signType = [item.signType[0] + item.signType[1], item.signType[2], item.signType[3]]
+ }
+ return item
+ })
+
this.setState({
visible: true,
- marks: marks ? fromJS(marks).toJS() : [],
+ marks: _marks,
markColumns: markColumns.map(col => {
if (col.dataIndex === 'field') {
col.options = options
--
Gitblit v1.8.0