From 2404d8a1bed5509432652f11aba6a1efa04aa160 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 18 九月 2020 19:24:26 +0800 Subject: [PATCH] 2020-09-18 --- src/templates/sharecomponent/columncomponent/index.jsx | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx index 30538c5..42e2e79 100644 --- a/src/templates/sharecomponent/columncomponent/index.jsx +++ b/src/templates/sharecomponent/columncomponent/index.jsx @@ -229,6 +229,7 @@ this.columnFormRef.handleConfirm().then(res => { let fieldrepet = false // 瀛楁閲嶅 let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅 + let rowspanLabel = '' // 宸插瓨鍦ㄧ殑琛屽悎骞跺瓧娈� _columnlist = _columnlist.filter(item => !item.origin || item.uuid === res.uuid) // 鍘婚櫎鍒濆鍒� @@ -238,6 +239,8 @@ fieldrepet = true } else if (item.label === res.label) { labelrepet = true + } else if (res.rowspan === 'true' && item.rowspan === 'true') { + rowspanLabel = item.label } } @@ -262,6 +265,13 @@ duration: 5 }) return + } else if (rowspanLabel) { + notification.warning({ + top: 92, + message: `宸插瓨鍦ㄨ鍚堝苟瀛楁銆�${rowspanLabel}銆�!`, + duration: 5 + }) + return } if (!card.focus && (card.type !== res.type || (res.field && card.field !== res.field))) { -- Gitblit v1.8.0