Merge remote-tracking branch 'origin/master'

# Conflicts:
#	demo/index.js
#	dist/demo.js
#	dist/demo.js.map
#	package.json

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="2.1.11"></a>
+## [2.1.11](https://github.com/tinper-bee/bee-table/compare/v2.1.10...v2.1.11) (2019-08-05)
+
+
+
+<a name="2.1.10"></a>
+## [2.1.10](https://github.com/tinper-bee/bee-table/compare/v2.1.9...v2.1.10) (2019-08-03)
+
+
+
+<a name="2.1.9"></a>
+## [2.1.9](https://github.com/tinper-bee/bee-table/compare/v2.1.8...v2.1.9) (2019-08-01)
+
+
+
 <a name="2.1.8"></a>
 ## [2.1.8](https://github.com/tinper-bee/bee-table/compare/v2.1.6...v2.1.8) (2019-07-26)
 

build/TableHeader.js

@@ -81,7 +81,7 @@ var TableHeader = function (_Component) {
           lastShowIndex = _this$props.lastShowIndex;
       // let currentElement = this.getOnLineObject(targetEvent);
 
-      var currentElement = _this.getTargetToTh(targetEvent);
+      var currentElement = _this.getTargetToType(targetEvent);
       if (!currentElement) return;
       var type = currentElement.getAttribute('data-type');
       if (!_this.props.dragborder && !_this.props.draggable) return;
@@ -130,6 +130,14 @@ var TableHeader = function (_Component) {
       return tableWidth - offWidth;
     };
 
+    _this.getTargetToType = function (targetEvent) {
+      var tag = targetEvent;
+      if (targetEvent && !targetEvent.getAttribute("data-type")) {
+        tag = _this.getTargetToType(targetEvent.parentElement);
+      }
+      return tag;
+    };
+
     _this.getTargetToTh = function (targetEvent) {
       var th = targetEvent;
       if (targetEvent.nodeName.toUpperCase() != "TH") {
@@ -632,6 +640,12 @@ var TableHeader = function (_Component) {
   */
 
 
+  /**
+   * 根据当前节点查找到有data-type类型的容器返回。
+   * @memberof TableHeader
+   */
+
+
   /**
    * 判断当前的target 是否是 th，如果不是，直接递归查找。
    * @memberof TableHeader

dist/demo.js

@@ -40515,7 +40515,7 @@
 	          lastShowIndex = _this$props.lastShowIndex;
 	      // let currentElement = this.getOnLineObject(targetEvent);
 	
-	      var currentElement = _this.getTargetToTh(targetEvent);
+	      var currentElement = _this.getTargetToType(targetEvent);
 	      if (!currentElement) return;
 	      var type = currentElement.getAttribute('data-type');
 	      if (!_this.props.dragborder && !_this.props.draggable) return;
@@ -40564,6 +40564,14 @@
 	      return tableWidth - offWidth;
 	    };
 	
+	    _this.getTargetToType = function (targetEvent) {
+	      var tag = targetEvent;
+	      if (targetEvent && !targetEvent.getAttribute("data-type")) {
+	        tag = _this.getTargetToType(targetEvent.parentElement);
+	      }
+	      return tag;
+	    };
+	
 	    _this.getTargetToTh = function (targetEvent) {
 	      var th = targetEvent;
 	      if (targetEvent.nodeName.toUpperCase() != "TH") {
@@ -41066,6 +41074,12 @@
 	  */
 	
 	
+	  /**
+	   * 根据当前节点查找到有data-type类型的容器返回。
+	   * @memberof TableHeader
+	   */
+	
+	
 	  /**
 	   * 判断当前的target 是否是 th，如果不是，直接递归查找。
 	   * @memberof TableHeader

package.json

@@ -1,14 +1,12 @@
 {
  "name": "bee-table",
-  "version": "2.2.0-alpha.0",
+ "version": "2.1.11",
  "description": "Table ui component for react",
  "keywords": [
   "react",
   "react-component",
   "bee-table",
-    "iuap-design",
-    "tinper-bee",
-    "Table"
+  "iuap-design"
   ],
   "engines": {
     "node": ">=6.0.0"

src/TableHeader.js

@@ -198,7 +198,7 @@ class TableHeader extends Component {
     targetEvent = Event.getTarget(event);
     const { clsPrefix, contentTable,lastShowIndex } = this.props;
     // let currentElement = this.getOnLineObject(targetEvent);
-    let currentElement = this.getTargetToTh(targetEvent);
+    let currentElement = this.getTargetToType(targetEvent);
     if(!currentElement)return;
     let type = currentElement.getAttribute('data-type');
     if(!this.props.dragborder && !this.props.draggable)return;
@@ -246,6 +246,19 @@ class TableHeader extends Component {
     return (tableWidth-offWidth);
   }
  
+  /**
+   * 根据当前节点查找到有data-type类型的容器返回。
+   * @memberof TableHeader
+   */
+  getTargetToType = (targetEvent) => {
+    let tag = targetEvent;
+    if(targetEvent && !targetEvent.getAttribute("data-type")){
+      tag = this.getTargetToType(targetEvent.parentElement);
+    }
+    return tag;
+  }
+
+  
   /**
    * 判断当前的target 是否是 th，如果不是，直接递归查找。
    * @memberof TableHeader