From 580ff2415d27c1f17397fad5a125434f97fe8bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cjonyshi=E2=80=9D?= <jonyshi@126.com>
Date: Sat, 1 Dec 2018 13:45:28 +0800
Subject: [PATCH] =?UTF-8?q?table=20theader=20=E4=BA=A4=E6=8D=A2=E5=88=97?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/dragColumn.js | 78 +++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/lib/dragColumn.js b/src/lib/dragColumn.js
index a2b86fa..1586e0b 100644
--- a/src/lib/dragColumn.js
+++ b/src/lib/dragColumn.js
@@ -33,43 +33,65 @@ export default function dragColumn(Table) {
     }
 
 
-    onDragStart=(event,data)=>{
-      if(this.props.onDragStart){
-        this.props.onDragStart(event,data)
-      }
-    }
+    // onDragStart=(event,data)=>{
+    //   if(this.props.onDragStart){
+    //     this.props.onDragStart(event,data)
+    //   }
+    // }
 
-    onDragOver=(event,data)=>{
-      if(this.props.onDragOver){
-       this.props.onDragOver(event,data)
-      }
-    }
+    // onDragOver=(event,data)=>{
+    //   if(this.props.onDragOver){
+    //    this.props.onDragOver(event,data)
+    //   }
+    // }
 
-    onDragEnter=(event,data)=>{
-      if(data.key == "checkbox")return;
-      const {columns:_columns} = this.state;
-      let columns = [];
-      Object.assign(columns,_columns);
-      columns.forEach((da)=>da.drgHover = false)
-      let current = columns.find((da)=>da.key == data.key);
-      if(current.fixed)return;
-      current.drgHover = true;
-      this.setState({
-        columns
-      });
-      if(this.props.onDragEnter){
-        this.props.onDragEnter(event,data);
-      }
-    }
+    // onDragEnter=(event,data)=>{
+    //   console.log('--------onDragEnter------------',data);
+
+    //   if(data.key == "checkbox")return;
+    //   const {columns:_columns} = this.state;
+    //   let columns = [];
+    //   Object.assign(columns,_columns);
+    //   columns.forEach((da)=>da.drgHover = false)
+    //   let current = columns.find((da)=>da.key == data.key);
+    //   if(current.fixed)return;
+    //   current.drgHover = true;
+    //   this.setState({
+    //     columns
+    //   });
+    //   if(this.props.onDragEnter){
+    //     this.props.onDragEnter(event,data);
+    //   }
+    // }
 
     onDrop=(event,data)=>{
+      let {dragSource,dragTarg} = data;
+      let {columns} = this.state;
+      let dragSourceColum =  columns.find((da,i)=>da.key == dragSource.key);
+      let dragTargColum = columns.find((da,i)=>da.key == dragTarg.key);
+
+      for (let index = 0; index < columns.length; index++) {
+        const da = columns[index];
+        if(da.key === dragSource.key){
+          columns[index] = dragTargColum;
+        }
+        if(da.key === dragTarg.key){
+          columns[index] = dragSourceColum;
+        }
+      }
+      this.setState({
+        columns:JSON.parse(JSON.stringify(columns))
+      });
+    }
+
+    onDrop_bak=(event,data)=>{
       if(data.key == "checkbox")return;
       let {columns} = this.state;
       const id = event.dataTransfer.getData("Text");
       let objIndex =  columns.findIndex((_da,i)=>_da.key == id);
       let targetIndex = columns.findIndex((_da,i)=>_da.key == data.key);
-      if(columns[objIndex].fixed)return;//固定列不让拖拽
-      if(columns[targetIndex].fixed)return;//固定列不让拖拽
+      // if(columns[objIndex].fixed)return;//固定列不让拖拽
+      // if(columns[targetIndex].fixed)return;//固定列不让拖拽
       columns.forEach((da,i)=>{
         da.drgHover = false;
         if(da.key == id){//obj