From 655ac8aef54bc134c1420c19975023182a10cae4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 十二月 2020 19:25:27 +0800
Subject: [PATCH] 2020-12-08
---
src/templates/sharecomponent/columncomponent/index.jsx | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index edcba01..6376773 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -172,18 +172,12 @@
if (modaltype === 'columns' || modaltype === 'colspan') {
this.columnFormRef.handleConfirm().then(res => {
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
- let rowspanLabel = '' // 宸插瓨鍦ㄧ殑琛屽悎骞跺瓧娈�
_columnlist = _columnlist.filter(item => !item.origin || item.uuid === res.uuid) // 鍘婚櫎鍒濆鍒�
_columnlist = _columnlist.map(item => {
if (item.uuid !== res.uuid && res.field && item.field) {
if (item.field === res.field) {
fieldrepet = true
- } else if (item.label === res.label) {
- labelrepet = true
- } else if (res.rowspan === 'true' && item.rowspan === 'true') {
- rowspanLabel = item.label
}
}
@@ -198,20 +192,6 @@
notification.warning({
top: 92,
message: this.state.dict['model.field.exist'] + ' !',
- duration: 5
- })
- return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
- duration: 5
- })
- return
- } else if (rowspanLabel) {
- notification.warning({
- top: 92,
- message: `宸插瓨鍦ㄨ鍚堝苟瀛楁銆�${rowspanLabel}銆�!`,
duration: 5
})
return
--
Gitblit v1.8.0