From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/components/share/markcomponent/index.jsx | 71 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 2a736fe..1da2ecd 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -1,16 +1,18 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Icon, Modal, Col } from 'antd'
+import { Modal, Col } from 'antd'
+import { AntDesignOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
import MarkForm from './markform'
-import './index.scss'
+import MkIcon from '@/components/mk-icon'
import { minkeIconSystem } from '@/utils/option.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import '@/assets/css/table.scss'
+import './index.scss'
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
const { confirm } = Modal
@@ -82,15 +84,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] ? <MkIcon type={text[text.length - 1]} /> : null}</div>
)
}
}
@@ -164,7 +168,7 @@
children: minkeIconSystem.direction.map(cell => {
return {
value: cell,
- label: (<Icon type={cell} />)
+ label: (<MkIcon type={cell} />)
}
})
},
@@ -174,7 +178,7 @@
children: minkeIconSystem.hint.map(cell => {
return {
value: cell,
- label: (<Icon type={cell} />)
+ label: (<MkIcon type={cell} />)
}
})
},
@@ -184,7 +188,7 @@
children: minkeIconSystem.edit.map(cell => {
return {
value: cell,
- label: (<Icon type={cell} />)
+ label: (<MkIcon type={cell} />)
}
})
},
@@ -194,17 +198,7 @@
children: minkeIconSystem.data.map(cell => {
return {
value: cell,
- label: (<Icon type={cell} />)
- }
- })
- },
- {
- value: 'trademark',
- label: '鍝佺墝鍜屾爣璇�',
- children: minkeIconSystem.trademark.map(cell => {
- return {
- value: cell,
- label: (<Icon type={cell} />)
+ label: (<MkIcon type={cell} />)
}
})
},
@@ -214,7 +208,7 @@
children: minkeIconSystem.normal.map(cell => {
return {
value: cell,
- label: (<Icon type={cell} />)
+ label: (<MkIcon type={cell} />)
}
})
}
@@ -222,7 +216,7 @@
let signs = [
{
value: 'font',
- label: '鏂囧瓧棰滆壊'
+ label: '鏂囧瓧'
},
{
value: 'background',
@@ -237,24 +231,19 @@
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
}
]
if (type === 'line' || type === 'sequence') {
+ signs.pop()
signs.pop()
} else if (type === 'slider') {
markColumns = markColumns.filter(col => {
@@ -264,9 +253,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
@@ -332,7 +329,7 @@
return (
<div style={{display: 'inline-block'}}>
- <Icon className="profile" title="鏍囪" type="ant-design" onClick={this.resetMark} />
+ <AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} />
<Modal
wrapClassName="model-table-column-mark-modal"
title={'鏍囪璁剧疆'}
--
Gitblit v1.8.0