From 1aa5654a0b51bb82948fff8bed77b166f25f11ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/markcomponent/index.jsx | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index f198d58..927c936 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -36,15 +36,8 @@
uniqueFunc: (data, item) => {
let index = data.findIndex(mark => mark.uuid !== item.uuid && mark.contrastValue === item.contrastValue && mark.match === item.match && mark.field.join('') === item.field.join(''))
- if (index > -1) {
- notification.warning({
- top: 92,
- message: '姝ゆ爣璁板凡瀛樺湪锛�',
- duration: 5
- })
- return false
- }
- return true
+ if (index > -1) return '姝ゆ爣璁板凡瀛樺湪锛�'
+ return ''
},
inputType: 'cascader',
options: [],
@@ -112,7 +105,7 @@
options: [],
render: text => {
let sign = {
- 'font': '鏂囧瓧',
+ 'font': '瀛椾綋棰滆壊',
'background': '鑳屾櫙',
'underline': '涓嬪垝绾�',
'line-through': '涓垝绾�',
@@ -267,7 +260,7 @@
let signs = [
{
value: 'font',
- label: '鏂囧瓧'
+ label: '瀛椾綋棰滆壊'
},
{
value: 'background',
@@ -324,6 +317,11 @@
signs.pop()
signs.pop()
signs.pop()
+ } else if (type === 'icon') {
+ signs = [{
+ value: 'font',
+ label: '瀛椾綋棰滆壊'
+ }]
} else if (type === 'slider') {
markColumns = markColumns.filter(col => {
col.width = '20%'
@@ -399,12 +397,12 @@
})
this.props.onSubmit(marks)
} else {
- const _this = this
+ const that = this
confirm({
title: '瀛樺湪鏈繚瀛樻爣璁帮紝纭畾蹇界暐鍚楋紵',
onOk() {
- _this.setState({ visible: false })
- _this.props.onSubmit(marks)
+ that.setState({ visible: false })
+ that.props.onSubmit(marks)
},
onCancel() {}
})
@@ -414,11 +412,16 @@
render() {
const { marks, markColumns, visible, options, signs } = this.state
+ let className = ''
+ if (this.props.type === 'line' && this.props.marks.length) {
+ className = 'mk-line-marks'
+ }
+
return (
- <div style={{display: 'inline-block'}}>
+ <div style={{display: 'inline-block'}} className={className}>
<AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} />
<Modal
- wrapClassName="model-table-column-mark-modal"
+ wrapClassName="mark-modal-wrap"
title="鏍囪璁剧疆"
visible={visible}
width={'75vw'}
@@ -430,7 +433,7 @@
>
<MarkForm field={this.props.field} signs={signs} columns={options} markChange={this.markChange}/>
<Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浠庝笂鍒颁笅锛屽尮閰嶇涓�涓鍚堟潯浠剁殑鏍囪銆�</Col>
- <EditTable actions={['edit', 'move', 'del']} data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/>
+ <EditTable actions={['edit', 'move', 'del', 'copy']} type="marks" data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/>
</Modal>
</div>
)
--
Gitblit v1.8.0