@kdcloudjs/table 1.2.2-canary.7 → 1.2.2-canary.9

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.2-canary.6
+ *   @kdcloudjs/table v1.2.2-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -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);
@@ -9471,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,
@@ -10471,6 +10482,7 @@ function treeMode() {
     var ctx = pipeline.ctx;
     var primaryKey = pipeline.ensurePrimaryKey('treeMode');
     var openKeys = (_ref = (_ref2 = (_opts$openKeys = opts.openKeys) !== null && _opts$openKeys !== void 0 ? _opts$openKeys : pipeline.getStateAtKey(stateKey)) !== null && _ref2 !== void 0 ? _ref2 : opts.defaultOpenKeys) !== null && _ref !== void 0 ? _ref : [];
+    var curSort = pipeline.getStateAtKey('sort');
     var openKeySet = new Set(openKeys);
     var onChangeOpenKeys = function onChangeOpenKeys(nextKeys, key, action) {
       var _opts$onChangeOpenKey;
@@ -10521,10 +10533,11 @@ function treeMode() {
     var Icon = opts.icon;
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
     function processDataSource(input) {
-      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys') && curSort === pipeline.getFeatureOptions('lastSort')) {
         return pipeline.getFeatureOptions('lastTreeMode');
       }
-      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey) || openKeys);
+      pipeline.setFeatureOptions('lastOpenKeys', openKeys);
+      pipeline.setFeatureOptions('lastSort', curSort);
       var result = [];
       dfs(input, 0);
       function dfs(nodes, depth) {