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

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

@@ -133,7 +133,9 @@ function getColumnWidthSum(pipeline) {
 }
 
 function getTableRemainingWidth(pipeline) {
-  var tableWidth = pipeline.getStateAtKey(tableWidthKey);
+  var _a, _b;
+
+  var tableWidth = ((_b = (_a = pipeline.ref.current.domHelper) === null || _a === void 0 ? void 0 : _a.tableBody) === null || _b === void 0 ? void 0 : _b.clientWidth) || pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
   var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
   return remainingWidth > 0 ? remainingWidth : 0;

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

@@ -315,9 +315,14 @@ export function columnDrag() {
                 if (onColumnDragStopped) {
                   var _context;
 
+                  var isRowDragColumn = function isRowDragColumn(code) {
+                    var rowDragColumnKey = pipeline.getFeatureOptions('rowDragColumnKey');
+                    return code === rowDragColumnKey;
+                  };
+
                   var newColumns = _filterInstanceProperty(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (_ref) {
                     var code = _ref.code;
-                    return code !== FILL_COLUMN_CODE;
+                    return code !== FILL_COLUMN_CODE && !isRowDragColumn(code);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
 

package/es/table/pipeline/features/rowDrag.d.ts

@@ -21,6 +21,8 @@ export interface RowDragFeatureOptions {
     rowDragColumn?: ArtColumn;
     /** 行高 */
     rowHeight?: number;
+    /** 拖拽过程中是否禁止滚动条滚动 */
+    suppressScrollMove?: boolean;
 }
 export declare const ROW_DRAG_COLUMN_CODE = "$_row_drag_column_&";
 export declare const rowDragKey = "rowDragKey";

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

@@ -86,6 +86,7 @@ export function rowDrag(opt) {
     };
 
     var updateScrollPosition = function updateScrollPosition(mouseMoveEvent) {
+      if (opt === null || opt === void 0 ? void 0 : opt.suppressScrollMove) return;
       var clientY = mouseMoveEvent.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
       var top = tableBodyClientRect.top,
@@ -182,6 +183,7 @@ export function rowDrag(opt) {
     };
 
     var rowDragColumn = (opt === null || opt === void 0 ? void 0 : opt.rowDragColumn) || defaultRowDragColumn;
+    pipeline.setFeatureOptions('rowDragColumnKey', rowDragColumn.code);
 
     var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
 

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

@@ -153,7 +153,9 @@ function getColumnWidthSum(pipeline) {
 }
 
 function getTableRemainingWidth(pipeline) {
-  var tableWidth = pipeline.getStateAtKey(tableWidthKey);
+  var _a, _b;
+
+  var tableWidth = ((_b = (_a = pipeline.ref.current.domHelper) === null || _a === void 0 ? void 0 : _a.tableBody) === null || _b === void 0 ? void 0 : _b.clientWidth) || pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
   var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
   return remainingWidth > 0 ? remainingWidth : 0;

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

@@ -329,9 +329,14 @@ function columnDrag() {
                 if (onColumnDragStopped) {
                   var _context;
 
+                  var isRowDragColumn = function isRowDragColumn(code) {
+                    var rowDragColumnKey = pipeline.getFeatureOptions('rowDragColumnKey');
+                    return code === rowDragColumnKey;
+                  };
+
                   var newColumns = (0, _filter.default)(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (_ref) {
                     var code = _ref.code;
-                    return code !== _autoFill.FILL_COLUMN_CODE;
+                    return code !== _autoFill.FILL_COLUMN_CODE && !isRowDragColumn(code);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
                   onColumnDragStopped(columnMoved, newColumns);

package/lib/table/pipeline/features/rowDrag.d.ts

@@ -21,6 +21,8 @@ export interface RowDragFeatureOptions {
     rowDragColumn?: ArtColumn;
     /** 行高 */
     rowHeight?: number;
+    /** 拖拽过程中是否禁止滚动条滚动 */
+    suppressScrollMove?: boolean;
 }
 export declare const ROW_DRAG_COLUMN_CODE = "$_row_drag_column_&";
 export declare const rowDragKey = "rowDragKey";

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

@@ -110,6 +110,7 @@ function rowDrag(opt) {
     };
 
     var updateScrollPosition = function updateScrollPosition(mouseMoveEvent) {
+      if (opt === null || opt === void 0 ? void 0 : opt.suppressScrollMove) return;
       var clientY = mouseMoveEvent.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
       var top = tableBodyClientRect.top,
@@ -206,6 +207,7 @@ function rowDrag(opt) {
     };
 
     var rowDragColumn = (opt === null || opt === void 0 ? void 0 : opt.rowDragColumn) || defaultRowDragColumn;
+    pipeline.setFeatureOptions('rowDragColumnKey', rowDragColumn.code);
     var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
     nextColumns.unshift(rowDragColumn);
     pipeline.columns(nextColumns);

package/package.json

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