From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/templates/sharecomponent/columncomponent/markcolumn/index.jsx | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
index 3d09f4f..d6c58f2 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/index.jsx
@@ -1,18 +1,18 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Table, Popconfirm, Icon } from 'antd'
+import { Table, Popconfirm } from 'antd'
+import { EditOutlined, DeleteOutlined, ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
-
import MarkForm from './markform'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
import '@/assets/css/table.scss'
class MarkColumn extends Component {
static propTpyes = {
columns: PropTypes.array, // 鏄剧ず鍒�
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object,
}
@@ -87,11 +87,14 @@
_outerclass = 'font ' + record.color[1]
} else if (record.signType === 'background') {
_outerclass = 'background ' + record.color[1]
+ } else if (record.signType === 'card') {
+ _outerclass = 'background ' + record.color[1]
+ content = '鏁堟灉鍦ㄥ崱鐗囦腑鍙'
} else if (record.signType === 'icon') {
if (record.position === 'front') {
- content = <div><Icon className={'font ' + record.color[1]} type={record.icon} /> {content} </div>
+ content = <div><MkIcon className={'font ' + record.color[1]} type={record.icon} /> {content} </div>
} else {
- content = <div> {content} <Icon className={'font ' + record.color[1]} type={record.icon} /> </div>
+ content = <div> {content} <MkIcon className={'font ' + record.color[1]} type={record.icon} /> </div>
}
}
@@ -110,16 +113,14 @@
render: (text, record) =>
(
<div>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><ArrowUpOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><ArrowDownOutlined /></span>
<Popconfirm
- title={this.props.dict['header.form.query.delete']}
- okText={this.props.dict['model.confirm']}
- cancelText={this.props.dict['header.cancel']}
+ overlayClassName="popover-confirm"
onConfirm={() => this.handleDelete(record)
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>
)
@@ -217,7 +218,6 @@
return (
<div id="mark-column-box-modal" className="">
<MarkForm
- dict={this.props.dict}
card={card}
columns={columns}
markChange={this.markChange}
--
Gitblit v1.8.0