fix: remove this.isIn

CHANGELOG.md

@@ -1,31 +1,3 @@
-## [2.1.56](https://github.com/tinper-bee/bee-tree/compare/v2.1.55...v2.1.56) (2021-04-30)
-
-
-### Bug Fixes
-
-* 拖拽样式修改 ([cd492b9](https://github.com/tinper-bee/bee-tree/commit/cd492b9fee9e37449271dbf7ce924e03b819dda6))
-
-
-
-## [2.1.55](https://github.com/tinper-bee/bee-tree/compare/v2.1.54...v2.1.55) (2021-04-07)
-
-
-### Bug Fixes
-
-* add mouse events ([864e286](https://github.com/tinper-bee/bee-tree/commit/864e286202440d2f417273e12e495a90362d08c8))
-
-
-
-## [2.1.54](https://github.com/tinper-bee/bee-tree/compare/v2.1.52...v2.1.54) (2021-04-07)
-
-
-### Bug Fixes
-
-* add compare function in sort ([b25ff2a](https://github.com/tinper-bee/bee-tree/commit/b25ff2a98e4916463e0ac44351eb73636f0f7543))
-* remove this.isIn ([e79d90a](https://github.com/tinper-bee/bee-tree/commit/e79d90ac2767a2248f029a8e21b6fa36a196940a))
-
-
-
 ## [2.1.53](https://github.com/tinper-bee/bee-tree/compare/v2.1.48...v2.1.53) (2021-03-29)
 
 

dist/demo.css

@@ -94,30 +94,28 @@
     opacity: 0.8;
     position: relative; }
   .u-tree li.drag-over-gap-top > a[draggable] {
-    border-top: 22x #108ee9 solid;
+    border-top: 2px #108ee9 solid;
-    position: relative;
+    position: relative; }
-    border-radius: 0; }
     .u-tree li.drag-over-gap-top > a[draggable]::before {
       position: absolute;
       top: -6px;
-      left: -8px;
+      left: -7px;
       content: ' ';
-      width: 10px;
+      width: 8px;
-      height: 10px;
+      height: 8px;
       border: 2px solid #108ee9;
       border-radius: 99px;
       opacity: 1; }
   .u-tree li.drag-over-gap-bottom > a[draggable] {
     border-bottom: 2px #108ee9 solid;
-    position: relative;
+    position: relative; }
-    border-radius: 0; }
     .u-tree li.drag-over-gap-bottom > a[draggable]::before {
       position: absolute;
-      bottom: -6px;
+      bottom: -5px;
-      left: -8px;
+      left: -6px;
       content: ' ';
-      width: 10px;
+      width: 8px;
-      height: 10px;
+      height: 8px;
       border: 2px solid #108ee9;
       border-radius: 99px;
       opacity: 1; }

dist/demo.js

@@ -40584,7 +40584,7 @@
 	    var targetDom = e.target;
 	
 	    // 如果当前tree节点不包括上一个焦点节点会触发此方法
-	    if (this.tree == targetDom && !this.tree.contains(e.relatedTarget)) {
+	    if (this.tree == targetDom && !this.isIn && !this.tree.contains(e.relatedTarget)) {
 	      var _props4 = this.props,
 	          onFocus = _props4.onFocus,
 	          children = _props4.children;
@@ -40618,14 +40618,13 @@
 	  };
 	
 	  Tree.prototype.onUlMouseEnter = function onUlMouseEnter(e) {
-	    // this.isIn = true;
+	    this.isIn = true;
 	    // console.log('onUlMouseEnter----isIn-----',this.isIn);
 	  };
 	
 	  Tree.prototype.onUlMouseLeave = function onUlMouseLeave(e) {
-	    // this.isIn = false;
+	    this.isIn = false;
 	    // console.log('onUlMouseLeave----isIn-----',this.isIn);
-	
 	  };
 	
 	  Tree.prototype.getFilterExpandedKeys = function getFilterExpandedKeys(props, expandKeyProp, expandAll) {
@@ -41045,7 +41044,7 @@
 	    _this8.hasCalculateRowHeight = true;
 	    var rowHeight = treenodes.getBoundingClientRect().height;
 	    _this8.store.setState({
-	      rowHeight: rowHeight || 24
+	      rowHeight: rowHeight
 	    });
 	  };
 	
@@ -41993,9 +41992,7 @@
 	    }
 	    levelObj[posLen].push(item);
 	  });
-	  var levelArr = Object.keys(levelObj).sort(function (a, b) {
+	  var levelArr = Object.keys(levelObj).sort();
-	    return +a > +b;
-	  });
 	
 	  var _loop = function _loop(i) {
 	    if (levelArr[i + 1]) {

package-lock.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-tree",
- "version": "2.1.56",
+ "version": "2.1.53",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bee-tree",
-  "version": "2.1.56",
+  "version": "2.1.54-beta",
   "version-yonui": "2.1.27-yonui.0",
   "description": "Tree ui component for react",
   "keywords": [

src/Tree.js

@@ -786,13 +786,10 @@ onExpand(treeNode,keyType) {
 
 
   onUlMouseEnter(e){
-    // this.isIn = true;
+    // console.log('onUlMouseEnter----isIn-----');
-    // console.log('onUlMouseEnter----isIn-----',this.isIn);
   }
   onUlMouseLeave(e){
-    // this.isIn = false;
+    // console.log('onUlMouseLeave----isIn-----');
-    // console.log('onUlMouseLeave----isIn-----',this.isIn);
-
   }
 
   getFilterExpandedKeys(props, expandKeyProp, expandAll) {

src/Tree.scss

@@ -140,14 +140,13 @@ $treePrefixCls : "u-tree";
   li.drag-over-gap-top > a[draggable] {
     border-top: 2px #108ee9 solid;
     position: relative;
-    border-radius: 0;
     &::before {
       position: absolute;
       top: -6px;
-      left: -8px;
+      left: -7px;
       content: ' ';
-      width: 10px;
+      width: 8px;
-      height: 10px;
+      height: 8px;
       border: 2px solid #108ee9;
       border-radius: 99px;
       opacity: 1;
@@ -156,14 +155,13 @@ $treePrefixCls : "u-tree";
   li.drag-over-gap-bottom > a[draggable] {
     border-bottom: 2px #108ee9 solid;
     position: relative;
-    border-radius: 0;
     &::before {
       position: absolute;
-      bottom: -6px;
+      bottom: -5px;
-      left: -8px;
+      left: -6px;
       content: ' ';
-      width: 10px;
+      width: 8px;
-      height: 10px;
+      height: 8px;
       border: 2px solid #108ee9;
       border-radius: 99px;
       opacity: 1;