@kdcloudjs/table 1.1.3-canary.8 → 1.1.3-canary.9

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.3-canary.7
+ *   @kdcloudjs/table v1.1.3-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.3-canary.7
+ *   @kdcloudjs/table v1.1.3-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -5275,6 +5275,8 @@ function columnDrag() {
             var currentTarget = e.currentTarget;
             var rect = e.currentTarget.parentElement.getClientRects()[0];
             var startX = rect.left;
+            var mouseDownClientX = e.clientX;
+            var mouseDownClientY = e.clientY;
             var moveData = [];
             var allColumns = Object(_utils__WEBPACK_IMPORTED_MODULE_10__["collectNodes"])(columns);
             var tableBodyClientRect = tableBody.getBoundingClientRect();
@@ -5294,8 +5296,6 @@ function columnDrag() {
               }
             };
 
-            var stopClickPropagationFlag = false;
-
             function handleMouseMove(e) {
               var client = {
                 clientX: e.clientX,
@@ -5309,12 +5309,6 @@ function columnDrag() {
               if (e.clientX - leftPosition < 20) {
                 return;
               } else {
-                // 阻止列头点击事件，防止拖动后触发列头过滤事件
-                if (stopClickPropagationFlag === false) {
-                  stopClickPropagationFlag = true;
-                  currentTarget.addEventListener('click', stopClickPropagation);
-                }
-
                 e.stopPropagation();
               }
 
@@ -5434,11 +5428,15 @@ function columnDrag() {
               e.stopPropagation();
               document.body.removeEventListener('mousemove', handleMouseMove);
               document.body.removeEventListener('mouseup', handleMouseUp);
-              window.removeEventListener('selectstart', disableSelect);
+              window.removeEventListener('selectstart', disableSelect); // 阻止列头点击事件，防止拖动后触发列头过滤事件
+
+              if (_isMoveWhenClicking(mouseDownClientX, mouseDownClientY, e.clientX, e.clientY)) {
+                currentTarget.addEventListener('click', stopClickPropagation);
+              }
+
               window.requestAnimationFrame(function () {
                 // 取消阻止列头点击事件
                 currentTarget.removeEventListener('click', stopClickPropagation);
-                stopClickPropagationFlag = false;
                 currentTarget = null;
 
                 var _moveData = moveData,
@@ -5556,6 +5554,17 @@ function moveAllChildren(cols, cloumnsTranslateData, width, isMinus) {
   });
 }
 
+function _isMoveWhenClicking(mouseDownClientX, mouseDownClientY, mouseUpClientX, mouseUpClientY) {
+  var xDiff = mouseUpClientX - mouseDownClientX;
+  var yDiff = mouseUpClientY - mouseDownClientY; // 鼠标点按和松开的偏移量大于5px，认为存在移动
+
+  if (Math.sqrt(xDiff * xDiff + yDiff * yDiff) > 5) {
+    return true;
+  }
+
+  return false;
+}
+
 /***/ }),
 
 /***/ "./components/table/pipeline/features/columnFilter.tsx":