vxe-table 3.13.14 → 3.14.0-beta.0

package/es/table/module/custom/panel.js

@@ -1067,12 +1067,13 @@ export default {
             if (prevDragCol && dragCol) {
                 // 判断是否有拖动
                 if (prevDragCol !== dragCol) {
-                    const oldColumn = dragCol;
+                    const dragColumn = dragCol;
                     const newColumn = prevDragCol;
                     Promise.resolve(dragEndMethod
                         ? dragEndMethod({
-                            oldColumn,
+                            oldColumn: dragColumn,
                             newColumn,
+                            dragColumn,
                             dragPos: prevDragPos,
                             dragToChild: !!prevDragToChild,
                             offsetIndex: dragOffsetIndex
@@ -1084,13 +1085,13 @@ export default {
                         let oafIndex = -1;
                         let nafIndex = -1;
                         const oldAllMaps = {};
-                        XEUtils.eachTree([oldColumn], column => {
+                        XEUtils.eachTree([dragColumn], column => {
                             oldAllMaps[column.id] = column;
                         });
                         let isSelfToChildStatus = false;
                         // 只有实时拖拽支持跨层级
                         if (immediate) {
-                            if (oldColumn.parentId && newColumn.parentId) {
+                            if (dragColumn.parentId && newColumn.parentId) {
                                 // 子到子
                                 if (!isCrossDrag) {
                                     return;
@@ -1108,7 +1109,7 @@ export default {
                                     }
                                 }
                             }
-                            else if (oldColumn.parentId) {
+                            else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
                                     return;
@@ -1135,17 +1136,17 @@ export default {
                             else {
                                 // 根到根
                             }
-                            const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === oldColumn.id);
+                            const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id);
                             // 改变层级
                             if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                                 if (oldewMatchRest) {
                                     const { items: oCols, index: oIndex } = oldewMatchRest;
-                                    const childList = oldColumn.children || [];
+                                    const childList = dragColumn.children || [];
                                     childList.forEach(column => {
-                                        column.parentId = oldColumn.parentId;
+                                        column.parentId = dragColumn.parentId;
                                     });
                                     oCols.splice(oIndex, 1, ...childList);
-                                    oldColumn.children = [];
+                                    dragColumn.children = [];
                                 }
                             }
                             else {
@@ -1162,12 +1163,12 @@ export default {
                                 const { items: nCols, index: nIndex, parent: nParent } = newMatchRest;
                                 // 转子级
                                 if ((isCrossDrag && isToChildDrag) && prevDragToChild) {
-                                    oldColumn.parentId = newColumn.id;
-                                    newColumn.children = (newColumn.children || []).concat([oldColumn]);
+                                    dragColumn.parentId = newColumn.id;
+                                    newColumn.children = (newColumn.children || []).concat([dragColumn]);
                                 }
                                 else {
-                                    oldColumn.parentId = newColumn.parentId;
-                                    nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
+                                    dragColumn.parentId = newColumn.parentId;
+                                    nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
                                 }
                                 if (!nParent) {
                                     nafIndex = nIndex;
@@ -1181,10 +1182,10 @@ export default {
                             });
                         }
                         else {
-                            oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === oldColumn.id);
+                            oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === dragColumn.id);
                             customColumnList.splice(oafIndex, 1);
                             nafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === newColumn.id);
-                            customColumnList.splice(nafIndex + dragOffsetIndex, 0, oldColumn);
+                            customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
                         }
                         reactData.isDragColMove = true;
                         if (mouseConfig) {
@@ -1197,8 +1198,9 @@ export default {
                             }
                         }
                         $xeTable.dispatchEvent('column-dragend', {
-                            oldColumn,
+                            oldColumn: dragColumn,
                             newColumn,
+                            dragColumn,
                             dragPos: prevDragPos,
                             offsetIndex: dragOffsetIndex,
                             _index: {

package/es/table/module/edit/mixin.js

@@ -854,7 +854,9 @@ export default {
             let isPos = false;
             if (fieldOrColumn) {
                 isPos = true;
-                column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                if (fieldOrColumn !== true) {
+                    column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                }
             }
             return handleEditCell($xeTable, row, column, isPos);
         },

package/es/table/src/cell.js

@@ -81,12 +81,13 @@ function renderCellBaseVNs(h, params, content) {
     const { treeConfig, dragConfig } = tableProps;
     const rowOpts = $table.computeRowOpts;
     const rowDragOpts = $table.computeRowDragOpts;
+    const treeOpts = $table.computeTreeOpts;
     const { showIcon, isPeerDrag, isCrossDrag, visibleMethod } = rowDragOpts;
     const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
     const vns = XEUtils.isArray(content) ? content : [content];
     if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
         if (treeConfig) {
-            if (isPeerDrag || isCrossDrag || !level) {
+            if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
                 vns.unshift(renderCellDragIcon(h, params));
             }
         }