@kdcloudjs/table 1.2.0-canary.16 → 1.2.0-canary.17

package/es/table/base/helpers/TableDOMUtils.js

@@ -94,7 +94,9 @@ export var TableDOMHelper = /*#__PURE__*/function () {
 
     var stickyScrollSelector = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = ".".concat(Classes.artTable, " + .")).call(_context3, Classes.horizontalStickyScrollContainer, " .")).call(_context2, Classes.stickyScroll);
 
-    this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
+    var stickyScrolls = artTableWrapper.querySelectorAll(stickyScrollSelector);
+    this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
+
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(Classes.stickyScrollItem));
   }
 

package/es/table/base/table.js

@@ -252,10 +252,10 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
         //   }
         this.hasScrollY = true;
       } else {
-        stickyScroll.style.paddingRight = "".concat(stickyScrollHeight, "px"); //   this.setState({
+        // stickyScroll.style.paddingRight = `${stickyScrollHeight}px`
+        //   this.setState({
         //     hasScrollY: false
         //   })
-
         this.hasScrollY = false;
       }
 

package/es/table/pipeline/features/rowDrag.js

@@ -119,15 +119,32 @@ export function rowDrag(opt) {
       var tableWidth = tableBody.clientWidth;
       var startRowRects = startRowInfo.cell.getBoundingClientRect(); // 光标位置距离初始拖拽行的偏移量
 
-      var startOffset = mouseDownEvent.clientY - startRowRects.y;
+      var startOffset = mouseDownEvent.clientY - startRowRects.top;
       var dragElement = createDragElement(startRowRects, tableWidth, rowHeight); // 可拖拽的范围
 
       var dragRange = getDragRange(tableBody, {
         startOffset: startOffset,
-        rowHeight: startRowRects.height
+        rowHeight: rowHeight
       });
+      var mousePosition = {
+        x: mouseDownEvent.clientX,
+        y: mouseDownEvent.clientY
+      };
       var mousemove$ = fromEvent(window, 'mousemove');
       var mouseup$ = fromEvent(window, 'mouseup');
+
+      var scrollCallback = function scrollCallback(event) {
+        // 在当前表格内滚动不处理
+        if (event.target === tableBody) return;
+        dragRange = getDragRange(tableBody, {
+          startOffset: startOffset,
+          rowHeight: rowHeight
+        });
+        var isOutOfRange = isOutOfDragRange(mousePosition, dragRange);
+        updateCurSorStyle(isOutOfRange);
+      };
+
+      document.addEventListener('scroll', scrollCallback, true);
       var rowDrag$ = mousemove$.pipe(map(function (mouseMoveEvent) {
         var clientX = mouseMoveEvent.clientX,
             clientY = mouseMoveEvent.clientY;
@@ -139,12 +156,16 @@ export function rowDrag(opt) {
 
         var targetRowRects = endRowInfo.cell.getBoundingClientRect(); // 判断拖拽插入的位置，拖拽框上边框位于目标行之上则向上插入，否则向下插入
 
-        var isMoveToTop = clientY - startOffset < targetRowRects.y;
+        var isMoveToTop = clientY - startOffset < targetRowRects.top;
         dragPosition = isMoveToTop ? 'top' : 'bottom';
         isOutOfRange = isOutOfDragRange({
           x: clientX,
           y: clientY
         }, dragRange);
+        mousePosition = {
+          x: clientX,
+          y: clientY
+        };
         updateScrollPosition(mouseMoveEvent); // 拖拽到底时让滚动条可以滚动
 
         updateDragElementPosition(dragElement, dragRange, {
@@ -178,6 +199,7 @@ export function rowDrag(opt) {
           handleDragEnd(dragEndEvent, isOutOfRange);
           removeDragElement(dragElement);
           removeCurSorStyle();
+          document.removeEventListener('scroll', scrollCallback, true);
         }
       });
     };
@@ -291,13 +313,13 @@ function getDragRange(tableBody, _ref4) {
   var tableBodyClientRect = tableBody.getBoundingClientRect();
   var height = tableBodyClientRect.height,
       width = tableBodyClientRect.width,
-      x = tableBodyClientRect.x,
-      y = tableBodyClientRect.y;
+      top = tableBodyClientRect.top,
+      left = tableBodyClientRect.left;
   return {
-    minX: x,
-    maxX: x + width,
-    minY: y - rowHeight + startOffset,
-    maxY: y + height + startOffset
+    minX: left,
+    maxX: left + width,
+    minY: top - rowHeight + startOffset,
+    maxY: top + height + startOffset
   };
 }
 

package/lib/table/base/helpers/TableDOMUtils.js

@@ -107,7 +107,9 @@ var TableDOMHelper = /*#__PURE__*/function () {
     this.tableFooter = this.artTable.querySelector(".".concat(_styles.Classes.tableFooter));
     this.tableFooterMain = this.artTable.querySelector(".".concat(_styles.Classes.tableFooterMain));
     var stickyScrollSelector = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = ".".concat(_styles.Classes.artTable, " + .")).call(_context3, _styles.Classes.horizontalStickyScrollContainer, " .")).call(_context2, _styles.Classes.stickyScroll);
-    this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
+    var stickyScrolls = artTableWrapper.querySelectorAll(stickyScrollSelector);
+    this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
+
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles.Classes.stickyScrollItem));
   }
 

package/lib/table/base/table.js

@@ -303,10 +303,10 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         //   }
         this.hasScrollY = true;
       } else {
-        stickyScroll.style.paddingRight = "".concat(stickyScrollHeight, "px"); //   this.setState({
+        // stickyScroll.style.paddingRight = `${stickyScrollHeight}px`
+        //   this.setState({
         //     hasScrollY: false
         //   })
-
         this.hasScrollY = false;
       }
 

package/lib/table/pipeline/features/rowDrag.js

@@ -143,15 +143,32 @@ function rowDrag(opt) {
       var tableWidth = tableBody.clientWidth;
       var startRowRects = startRowInfo.cell.getBoundingClientRect(); // 光标位置距离初始拖拽行的偏移量
 
-      var startOffset = mouseDownEvent.clientY - startRowRects.y;
+      var startOffset = mouseDownEvent.clientY - startRowRects.top;
       var dragElement = createDragElement(startRowRects, tableWidth, rowHeight); // 可拖拽的范围
 
       var dragRange = getDragRange(tableBody, {
         startOffset: startOffset,
-        rowHeight: startRowRects.height
+        rowHeight: rowHeight
       });
+      var mousePosition = {
+        x: mouseDownEvent.clientX,
+        y: mouseDownEvent.clientY
+      };
       var mousemove$ = (0, _rxjs.fromEvent)(window, 'mousemove');
       var mouseup$ = (0, _rxjs.fromEvent)(window, 'mouseup');
+
+      var scrollCallback = function scrollCallback(event) {
+        // 在当前表格内滚动不处理
+        if (event.target === tableBody) return;
+        dragRange = getDragRange(tableBody, {
+          startOffset: startOffset,
+          rowHeight: rowHeight
+        });
+        var isOutOfRange = isOutOfDragRange(mousePosition, dragRange);
+        updateCurSorStyle(isOutOfRange);
+      };
+
+      document.addEventListener('scroll', scrollCallback, true);
       var rowDrag$ = mousemove$.pipe((0, _mapInstanceProperty(_operators))(function (mouseMoveEvent) {
         var clientX = mouseMoveEvent.clientX,
             clientY = mouseMoveEvent.clientY;
@@ -163,12 +180,16 @@ function rowDrag(opt) {
 
         var targetRowRects = endRowInfo.cell.getBoundingClientRect(); // 判断拖拽插入的位置，拖拽框上边框位于目标行之上则向上插入，否则向下插入
 
-        var isMoveToTop = clientY - startOffset < targetRowRects.y;
+        var isMoveToTop = clientY - startOffset < targetRowRects.top;
         dragPosition = isMoveToTop ? 'top' : 'bottom';
         isOutOfRange = isOutOfDragRange({
           x: clientX,
           y: clientY
         }, dragRange);
+        mousePosition = {
+          x: clientX,
+          y: clientY
+        };
         updateScrollPosition(mouseMoveEvent); // 拖拽到底时让滚动条可以滚动
 
         updateDragElementPosition(dragElement, dragRange, {
@@ -202,6 +223,7 @@ function rowDrag(opt) {
           handleDragEnd(dragEndEvent, isOutOfRange);
           removeDragElement(dragElement);
           removeCurSorStyle();
+          document.removeEventListener('scroll', scrollCallback, true);
         }
       });
     };
@@ -313,13 +335,13 @@ function getDragRange(tableBody, _ref4) {
   var tableBodyClientRect = tableBody.getBoundingClientRect();
   var height = tableBodyClientRect.height,
       width = tableBodyClientRect.width,
-      x = tableBodyClientRect.x,
-      y = tableBodyClientRect.y;
+      top = tableBodyClientRect.top,
+      left = tableBodyClientRect.left;
   return {
-    minX: x,
-    maxX: x + width,
-    minY: y - rowHeight + startOffset,
-    maxY: y + height + startOffset
+    minX: left,
+    maxX: left + width,
+    minY: top - rowHeight + startOffset,
+    maxY: top + height + startOffset
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.2.0-canary.16",
+  "version": "1.2.0-canary.17",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [