From 0c86e5e2eaf907dfcb63aea13e6efac3ccc52cce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2020 11:06:20 +0800
Subject: [PATCH] 2020-02-25

---
 src/templates/tableshare/verifycardexcelin/columnform/index.jsx |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
index 3fc28f9..defe917 100644
--- a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
+++ b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
@@ -7,7 +7,7 @@
 class UniqueForm extends Component {
   static propTpyes = {
     dict: PropTypes.object,         // 瀛楀吀椤�
-    range: PropTypes.any,           // 瀛楀吀椤�
+    columns: PropTypes.array,       // 鍒楀悕闆嗗悎
     columnChange: PropTypes.func    // 淇敼鍑芥暟
   }
 
@@ -68,6 +68,7 @@
 
 
   handleConfirm = () => {
+    // const { columns } = this.props
     // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
@@ -81,10 +82,21 @@
           values.limit = ''
         }
 
+        // let _col = columns.filter(col => col.uuid !== values.uuid && col.Column === values.Column)
+        // if (_col.length > 0) {
+        //   notification.warning({
+        //     top: 92,
+        //     message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
+        //     duration: 10
+        //   })
+        //   return
+        // }
+
         this.props.columnChange(values)
         this.setState({
           editItem: null,
-          locked: false
+          locked: false,
+          type: 'Nvarchar(50)'
         })
         this.props.form.setFieldsValue({
           Column: '',

--
Gitblit v1.8.0