@kdcloudjs/table 1.2.2-canary.6 → 1.2.2-canary.8

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.2-canary.5
+ *   @kdcloudjs/table v1.2.2-canary.7
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -3200,7 +3200,7 @@ var Z = {
   scrollItem: 30,
   loadingIndicator: 40
 };
-var GlobalStyle = Object(styled_components__WEBPACK_IMPORTED_MODULE_4__["createGlobalStyle"])(_templateObject || (_templateObject = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  .", "{\n    position: absolute;\n    top:0;\n    left:0;\n    z-index: 9999;\n    pointer-events:none;\n    user-select: none;\n\n    display:flex;\n    opacity: 0.9;\n    align-items:center;\n    min-width:80px;\n    padding: 0px 8px;\n    border: 1px solid #d9d9d9;\n    box-shadow: 0px 6px 16px 3px rgba(0,0,0,0.08);\n    border-radius: 2px;\n    background: #fff;\n\n    .", "{\n      font-size:12px;\n      overflow:hidden;\n      text-overflow: ellipsis;\n      white-space:nowrap;\n    }\n    \n  }\n\n  .", "{\n    position: absolute;\n    top:0;\n    left:0;\n    z-index: 9998;\n    pointer-events:none;\n    user-select: none;\n    height: 2px;\n    background: var(--primary-color);\n  }\n  .", ":before{\n    content: \" \";\n    position: absolute;\n    width: 8px;\n    height: 8px;\n    top:-4px;\n    border: 2px solid var(--primary-color);\n    border-radius: 50%;\n    background:#fff;\n  }\n"])), Classes.rowDragElement, Classes.rowDragElementLabel, Classes.rowDragLine, Classes.treeTableRowDragLine);
+var GlobalStyle = Object(styled_components__WEBPACK_IMPORTED_MODULE_4__["createGlobalStyle"])(_templateObject || (_templateObject = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  .", "{\n    position: absolute;\n    top:0;\n    left:0;\n    z-index: 9999;\n    pointer-events:none;\n    user-select: none;\n\n    display:flex;\n    opacity: 0.9;\n    align-items:center;\n    min-width:80px;\n    padding: 0px 8px;\n    border: 1px solid #d9d9d9;\n    box-shadow: 0px 6px 16px 3px rgba(0,0,0,0.08);\n    border-radius: 2px;\n    background: #fff;\n    max-height:48px;\n\n    .", "{\n      font-size:12px;\n      overflow:hidden;\n      text-overflow: ellipsis;\n      white-space:nowrap;\n    }\n    \n  }\n\n  .", "{\n    position: absolute;\n    top:0;\n    left:0;\n    z-index: 9998;\n    pointer-events:none;\n    user-select: none;\n    height: 2px;\n    background: var(--primary-color);\n  }\n  .", ":before{\n    content: \" \";\n    position: absolute;\n    width: 8px;\n    height: 8px;\n    top:-4px;\n    border: 2px solid var(--primary-color);\n    border-radius: 50%;\n    background:#fff;\n  }\n"])), Classes.rowDragElement, Classes.rowDragElementLabel, Classes.rowDragLine, Classes.treeTableRowDragLine);
 var outerBorderStyleMixin = Object(styled_components__WEBPACK_IMPORTED_MODULE_4__["css"])(_templateObject2 || (_templateObject2 = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  border-top: 1px solid #cccccc;\n  border-right: 1px solid #cccccc;\n  border-bottom: 1px solid #cccccc;\n  border-left: 1px solid #cccccc;\n\n  td.", ",\n  th.", " {\n    border-left: none;\n  }\n  td.", ",\n  th.", " {\n    border-right: none;\n  }\n\n  thead tr.", " th,\n  tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tfoot tr.", " td {\n    border-bottom: none;\n  }\n  &:not(.has-footer) tbody tr.", " td {\n    border-bottom: none;\n  }\n  td.", ":not(.", "){\n    border-left: var(---cell-border-vertical);\n  }\n  td.", ":not(.", "){\n    border-right: var(---cell-border-vertical);\n  }\n"])), Classes.first, Classes.first, Classes.last, Classes.last, Classes.first, Classes.first, Classes.last, Classes.last, Classes.rowSpan, Classes.first, Classes.rowSpan, Classes.last);
 var defaultCSSVariables = {
   '--row-height': '48px',
@@ -8968,7 +8968,7 @@ function rowDrag(opt) {
         timeoutId = setTimeout(function () {
           intervalId = setInterval(function () {
             tableBody.scrollTop += moveOffset;
-          }, 100);
+          }, 50);
         }, 500);
       };
       var handleDragStart = function handleDragStart(mouseDownEvent) {
@@ -9012,6 +9012,15 @@ function rowDrag(opt) {
               setDragElementIcon(dragElement, 'move');
               if (dropTarget.isTable) {
                 showDragLine(dragLine);
+                var getTreeModeOptions = dropTarget.tableParams.getTreeModeOptions;
+                var treeModeOptions = getTreeModeOptions();
+                var isTreeTable = !!treeModeOptions;
+                // 判断拖拽进入的表格是否是树形表格，控制指示线样式
+                if (isTreeTable) {
+                  dragLine.classList.add(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].treeTableRowDragLine);
+                } else {
+                  dragLine.classList.remove(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].treeTableRowDragLine);
+                }
               }
               var _dragEvent = createDropTargetEvent(dropTarget, mouseMoveEvent, startDataItem, currentDropZone);
               dropTarget.onDragEnter(_dragEvent);
@@ -9046,8 +9055,10 @@ function rowDrag(opt) {
               var dragItem = getDragRowItem(mouseMoveEvent.target, dropTarget.getContainer(), dataSource);
               if (!dragItem) return;
               var row = dragItem.row;
-              var rowKey = row[treeMetaKey].rowKey;
-              if (!isExpanded(rowKey)) {
+              var _row$treeMetaKey = row[treeMetaKey],
+                rowKey = _row$treeMetaKey.rowKey,
+                isLeaf = _row$treeMetaKey.isLeaf;
+              if (!isLeaf && !isExpanded(rowKey)) {
                 onExpand(rowKey);
                 expandRowCallBackList.push(function () {
                   return onCollapse(rowKey);
@@ -9062,6 +9073,9 @@ function rowDrag(opt) {
         }
       };
       var handleDragStop = function handleDragStop(mouseUpEvent) {
+        if (!isValidDrag) {
+          return;
+        }
         removeElement(dragElement);
         removeElement(dragLine);
         artTable.classList.remove(classnames__WEBPACK_IMPORTED_MODULE_11___default()(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].rowDragging));
@@ -9069,10 +9083,6 @@ function rowDrag(opt) {
         clearTimeout(timeoutId);
         clearInterval(intervalId);
         clearTimeout(expandRowTimeoutId);
-        while (expandRowCallBackList.length > 0) {
-          var callback = expandRowCallBackList.pop();
-          callback();
-        }
         var rowDropZones = rowDragApi.getRowDropZone();
         rowDropZones.forEach(function (dropzone) {
           var container = dropzone.getContainer();
@@ -9086,6 +9096,10 @@ function rowDrag(opt) {
           var dragEvent = createDropTargetEvent(dropTarget, mouseUpEvent, startDataItem, currentDropZone);
           dropTarget.onDragStop(dragEvent);
         }
+        while (expandRowCallBackList.length > 0) {
+          var callback = expandRowCallBackList.pop();
+          callback();
+        }
       };
       var mousemove$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_9__["fromEvent"])(window, 'mousemove');
       var mouseup$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_9__["fromEvent"])(window, 'mouseup');
@@ -9468,11 +9482,11 @@ var getLinePosition = function getLinePosition(_ref2) {
     var _getElementSize3 = _getElementSize(cell),
       paddingLeft = _getElementSize3.paddingLeft;
     var expandCellRect = cell.getBoundingClientRect();
-    var _row$treeMetaKey = row[treeMetaKey],
-      rowKey = _row$treeMetaKey.rowKey,
-      depth = _row$treeMetaKey.depth,
-      isLeaf = _row$treeMetaKey.isLeaf,
-      expanded = _row$treeMetaKey.expanded;
+    var _row$treeMetaKey2 = row[treeMetaKey],
+      rowKey = _row$treeMetaKey2.rowKey,
+      depth = _row$treeMetaKey2.depth,
+      isLeaf = _row$treeMetaKey2.isLeaf,
+      expanded = _row$treeMetaKey2.expanded;
     var addWidth = isLeaf ? iconWidth + iconGap : 0;
     var indent = iconIndent + depth * indentSize + addWidth;
     var x = expandCellRect.x,