@kdcloudjs/table 1.2.2-canary.7 → 1.2.2-canary.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/@kdcloudjs/table.css +1 -1
- package/dist/@kdcloudjs/table.js +19 -8
- package/dist/@kdcloudjs/table.js.map +1 -1
- package/dist/@kdcloudjs/table.min.css +1 -1
- package/dist/@kdcloudjs/table.min.js +5 -5
- package/dist/@kdcloudjs/table.min.js.map +1 -1
- package/es/table/pipeline/features/rowDrag.js +18 -7
- package/lib/table/pipeline/features/rowDrag.js +18 -7
- package/package.json +1 -1
|
@@ -228,6 +228,15 @@ export function rowDrag(opt) {
|
|
|
228
228
|
setDragElementIcon(dragElement, 'move');
|
|
229
229
|
if (dropTarget.isTable) {
|
|
230
230
|
showDragLine(dragLine);
|
|
231
|
+
var getTreeModeOptions = dropTarget.tableParams.getTreeModeOptions;
|
|
232
|
+
var treeModeOptions = getTreeModeOptions();
|
|
233
|
+
var isTreeTable = !!treeModeOptions;
|
|
234
|
+
// 判断拖拽进入的表格是否是树形表格，控制指示线样式
|
|
235
|
+
if (isTreeTable) {
|
|
236
|
+
dragLine.classList.add(Classes.treeTableRowDragLine);
|
|
237
|
+
} else {
|
|
238
|
+
dragLine.classList.remove(Classes.treeTableRowDragLine);
|
|
239
|
+
}
|
|
231
240
|
}
|
|
232
241
|
var _dragEvent = createDropTargetEvent(dropTarget, mouseMoveEvent, startDataItem, currentDropZone);
|
|
233
242
|
dropTarget.onDragEnter(_dragEvent);
|
|
@@ -260,8 +269,10 @@ export function rowDrag(opt) {
|
|
|
260
269
|
var dragItem = getDragRowItem(mouseMoveEvent.target, dropTarget.getContainer(), dataSource);
|
|
261
270
|
if (!dragItem) return;
|
|
262
271
|
var row = dragItem.row;
|
|
263
|
-
var
|
|
264
|
-
|
|
272
|
+
var _row$treeMetaKey = row[treeMetaKey],
|
|
273
|
+
rowKey = _row$treeMetaKey.rowKey,
|
|
274
|
+
isLeaf = _row$treeMetaKey.isLeaf;
|
|
275
|
+
if (!isLeaf && !isExpanded(rowKey)) {
|
|
265
276
|
onExpand(rowKey);
|
|
266
277
|
expandRowCallBackList.push(function () {
|
|
267
278
|
return onCollapse(rowKey);
|
|
@@ -689,11 +700,11 @@ var getLinePosition = function getLinePosition(_ref2) {
|
|
|
689
700
|
var _getElementSize3 = _getElementSize(cell),
|
|
690
701
|
paddingLeft = _getElementSize3.paddingLeft;
|
|
691
702
|
var expandCellRect = cell.getBoundingClientRect();
|
|
692
|
-
var _row$
|
|
693
|
-
rowKey = _row$
|
|
694
|
-
depth = _row$
|
|
695
|
-
isLeaf = _row$
|
|
696
|
-
expanded = _row$
|
|
703
|
+
var _row$treeMetaKey2 = row[treeMetaKey],
|
|
704
|
+
rowKey = _row$treeMetaKey2.rowKey,
|
|
705
|
+
depth = _row$treeMetaKey2.depth,
|
|
706
|
+
isLeaf = _row$treeMetaKey2.isLeaf,
|
|
707
|
+
expanded = _row$treeMetaKey2.expanded;
|
|
697
708
|
var addWidth = isLeaf ? iconWidth + iconGap : 0;
|
|
698
709
|
var indent = iconIndent + depth * indentSize + addWidth;
|
|
699
710
|
var x = expandCellRect.x,
|
|
@@ -239,6 +239,15 @@ function rowDrag(opt) {
|
|
|
239
239
|
setDragElementIcon(dragElement, 'move');
|
|
240
240
|
if (dropTarget.isTable) {
|
|
241
241
|
showDragLine(dragLine);
|
|
242
|
+
var getTreeModeOptions = dropTarget.tableParams.getTreeModeOptions;
|
|
243
|
+
var treeModeOptions = getTreeModeOptions();
|
|
244
|
+
var isTreeTable = !!treeModeOptions;
|
|
245
|
+
// 判断拖拽进入的表格是否是树形表格，控制指示线样式
|
|
246
|
+
if (isTreeTable) {
|
|
247
|
+
dragLine.classList.add(_styles.Classes.treeTableRowDragLine);
|
|
248
|
+
} else {
|
|
249
|
+
dragLine.classList.remove(_styles.Classes.treeTableRowDragLine);
|
|
250
|
+
}
|
|
242
251
|
}
|
|
243
252
|
var _dragEvent = createDropTargetEvent(dropTarget, mouseMoveEvent, startDataItem, currentDropZone);
|
|
244
253
|
dropTarget.onDragEnter(_dragEvent);
|
|
@@ -271,8 +280,10 @@ function rowDrag(opt) {
|
|
|
271
280
|
var dragItem = getDragRowItem(mouseMoveEvent.target, dropTarget.getContainer(), dataSource);
|
|
272
281
|
if (!dragItem) return;
|
|
273
282
|
var row = dragItem.row;
|
|
274
|
-
var
|
|
275
|
-
|
|
283
|
+
var _row$treeMetaKey = row[treeMetaKey],
|
|
284
|
+
rowKey = _row$treeMetaKey.rowKey,
|
|
285
|
+
isLeaf = _row$treeMetaKey.isLeaf;
|
|
286
|
+
if (!isLeaf && !isExpanded(rowKey)) {
|
|
276
287
|
onExpand(rowKey);
|
|
277
288
|
expandRowCallBackList.push(function () {
|
|
278
289
|
return onCollapse(rowKey);
|
|
@@ -700,11 +711,11 @@ var getLinePosition = function getLinePosition(_ref2) {
|
|
|
700
711
|
var _getElementSize3 = _getElementSize(cell),
|
|
701
712
|
paddingLeft = _getElementSize3.paddingLeft;
|
|
702
713
|
var expandCellRect = cell.getBoundingClientRect();
|
|
703
|
-
var _row$
|
|
704
|
-
rowKey = _row$
|
|
705
|
-
depth = _row$
|
|
706
|
-
isLeaf = _row$
|
|
707
|
-
expanded = _row$
|
|
714
|
+
var _row$treeMetaKey2 = row[treeMetaKey],
|
|
715
|
+
rowKey = _row$treeMetaKey2.rowKey,
|
|
716
|
+
depth = _row$treeMetaKey2.depth,
|
|
717
|
+
isLeaf = _row$treeMetaKey2.isLeaf,
|
|
718
|
+
expanded = _row$treeMetaKey2.expanded;
|
|
708
719
|
var addWidth = isLeaf ? iconWidth + iconGap : 0;
|
|
709
720
|
var indent = iconIndent + depth * indentSize + addWidth;
|
|
710
721
|
var x = expandCellRect.x,
|