@kdcloudjs/table 1.2.0-canary.10 → 1.2.0-canary.11

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.9
+ *   @kdcloudjs/table v1.2.0-canary.10
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -5164,7 +5164,9 @@ function getColumnWidthSum(pipeline) {
 }
 
 function getTableRemainingWidth(pipeline) {
-  var tableWidth = pipeline.getStateAtKey(tableWidthKey);
+  var _pipeline$ref$current, _pipeline$ref$current2;
+
+  var tableWidth = ((_pipeline$ref$current = pipeline.ref.current.domHelper) === null || _pipeline$ref$current === void 0 ? void 0 : (_pipeline$ref$current2 = _pipeline$ref$current.tableBody) === null || _pipeline$ref$current2 === void 0 ? void 0 : _pipeline$ref$current2.clientWidth) || pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
   var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
   return remainingWidth > 0 ? remainingWidth : 0;
@@ -5851,9 +5853,14 @@ function columnDrag() {
                 var onColumnDragStopped = opts.onColumnDragStopped; // 拖拽结束返回列顺序
 
                 if (onColumnDragStopped) {
+                  var isRowDragColumn = function isRowDragColumn(code) {
+                    var rowDragColumnKey = pipeline.getFeatureOptions('rowDragColumnKey');
+                    return code === rowDragColumnKey;
+                  };
+
                   var newColumns = sortColumns(columns, cloumnsSortData).filter(function (_ref) {
                     var code = _ref.code;
-                    return code !== _autoFill__WEBPACK_IMPORTED_MODULE_11__["FILL_COLUMN_CODE"];
+                    return code !== _autoFill__WEBPACK_IMPORTED_MODULE_11__["FILL_COLUMN_CODE"] && !isRowDragColumn(code);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
                   onColumnDragStopped(columnMoved, newColumns);
@@ -9423,6 +9430,7 @@ function rowDrag(opt) {
     };
 
     var updateScrollPosition = function updateScrollPosition(mouseMoveEvent) {
+      if (opt !== null && opt !== void 0 && opt.suppressScrollMove) return;
       var clientY = mouseMoveEvent.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
       var top = tableBodyClientRect.top,
@@ -9519,6 +9527,7 @@ function rowDrag(opt) {
     };
 
     var rowDragColumn = (opt === null || opt === void 0 ? void 0 : opt.rowDragColumn) || defaultRowDragColumn;
+    pipeline.setFeatureOptions('rowDragColumnKey', rowDragColumn.code);
     var nextColumns = pipeline.getColumns().slice();
     nextColumns.unshift(rowDragColumn);
     pipeline.columns(nextColumns);