From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/menu/components/share/markcomponent/index.jsx | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index c188601..246f2ea 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Col } from 'antd'
+import { Modal, Col, notification } from 'antd'
import { AntDesignOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
@@ -32,6 +32,20 @@
dataIndex: 'field',
width: '16%',
editable: true,
+ unique: true,
+ 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
+ },
inputType: 'cascader',
options: [],
rules: [{
@@ -118,18 +132,24 @@
markChange = (values) => {
let _marks = fromJS(this.state.marks).toJS()
- if (values.uuid) {
- _marks = _marks.map(item => {
- if (item.uuid === values.uuid) {
- return values
- } else {
- return item
- }
+ let has = false
+ _marks.forEach(mark => {
+ if (mark.contrastValue === values.contrastValue && mark.match === values.match && mark.field.join('') === values.field.join('')) {
+ has = true
+ }
+ })
+
+ if (has) {
+ notification.warning({
+ top: 92,
+ message: '姝ゆ爣璁板凡瀛樺湪锛�',
+ duration: 5
})
- } else {
- values.uuid = Utils.getuuid()
- _marks.push(values)
+ return
}
+
+ values.uuid = Utils.getuuid()
+ _marks.push(values)
this.setState({
marks: _marks
@@ -319,6 +339,11 @@
item.fontColor = ''
}
}
+
+ if (item.contrastValue) {
+ item.contrastValue = item.contrastValue.replace(/\t+|\v+|\s+/g, '')
+ }
+
if (val && item.contrastValue === val) {
save = true
}
--
Gitblit v1.8.0