vxe-table 4.9.26 → 4.9.28

package/es/table/src/body.js

@@ -28,7 +28,7 @@ export default defineComponent({
         const xesize = inject('xesize', null);
         const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
         const { refTableBody, refTableHeader, refTableFooter, refTableLeftBody, refTableRightBody, refScrollXHandleElem, refScrollYHandleElem } = $xeTable.getRefMaps();
-        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refBodyTable = ref();
         const refBodyColgroup = ref();
@@ -125,6 +125,8 @@ export default defineComponent({
             const editOpts = computeEditOpts.value;
             const tooltipOpts = computeTooltipOpts.value;
             const rowOpts = computeRowOpts.value;
+            const rowDragOpts = computeRowDragOpts.value;
+            const { disabledMethod: dragDisabledMethod } = rowDragOpts;
             const sYOpts = computeSYOpts.value;
             const columnOpts = computeColumnOpts.value;
             const mouseOpts = computeMouseOpts.value;
@@ -180,6 +182,14 @@ export default defineComponent({
                 data: tableData,
                 items
             };
+            let isColDragCell = false;
+            let isDisabledDrag = false;
+            if (rowOpts.drag) {
+                isColDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
+            }
+            if (isColDragCell) {
+                isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+            }
             // hover 进入事件
             if (showTitle || showTooltip || showAllTip || tooltipConfig) {
                 tdOns.onMouseenter = (evnt) => {
@@ -209,7 +219,7 @@ export default defineComponent({
                 };
             }
             // 按下事件处理
-            if (checkboxOpts.range || mouseConfig) {
+            if (isColDragCell || checkboxOpts.range || mouseConfig) {
                 tdOns.onMousedown = (evnt) => {
                     $xeTable.triggerCellMousedownEvent(evnt, params);
                 };
@@ -342,6 +352,8 @@ export default defineComponent({
                         'col--edit': isEdit,
                         'col--ellipsis': hasEllipsis,
                         'fixed--hidden': fixedHiddenColumn,
+                        'is--drag-cell': isColDragCell,
+                        'is--drag-disabled': isDisabledDrag,
                         'col--dirty': isDirty,
                         'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
                         'col--valid-error': !!errorValidItem,
@@ -356,7 +368,7 @@ export default defineComponent({
         };
         const renderRows = (fixedType, tableData, tableColumn) => {
             const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, showOverflow: allColumnOverflow, editConfig, treeConfig } = tableProps;
-            const { hasFixedColumn, treeExpandedMaps, scrollYLoad, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, pendingRowList, isDragColMove } = tableReactData;
+            const { hasFixedColumn, treeExpandedMaps, scrollYLoad, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, isDragColMove } = tableReactData;
             const { fullAllDataRowIdData } = tableInternalData;
             const checkboxOpts = computeCheckboxOpts.value;
             const radioOpts = computeRadioOpts.value;
@@ -433,7 +445,7 @@ export default defineComponent({
                         'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                         'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
                         'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                        'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
+                        'row--pending': !!pendingRowMaps[rowid]
                     },
                     getPropClass(rowClassName, params)
                 ];

package/es/table/src/cell.js

@@ -44,21 +44,21 @@ function renderCellDragIcon(params) {
     const { dragConfig } = tableProps;
     const { computeRowDragOpts } = $table.getComputeMaps();
     const rowDragOpts = computeRowDragOpts.value;
-    const { icon, disabledMethod } = rowDragOpts;
+    const { icon, trigger, disabledMethod } = rowDragOpts;
     const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
     const isDisabled = rDisabledMethod && rDisabledMethod(params);
-    return h('span', {
-        key: 'dg',
-        class: ['vxe-cell--drag-handle', {
-                'is--disabled': isDisabled
-            }],
-        onMousedown(evnt) {
+    const ons = {};
+    if (trigger !== 'cell') {
+        ons.onMousedown = (evnt) => {
             if (!isDisabled) {
                 $table.handleCellDragMousedownEvent(evnt, params);
             }
-        },
-        onMouseup: $table.handleCellDragMouseupEvent
-    }, [
+        };
+        ons.onMouseup = $table.handleCellDragMouseupEvent;
+    }
+    return h('span', Object.assign({ key: 'dg', class: ['vxe-cell--drag-handle', {
+                'is--disabled': isDisabled
+            }] }, ons), [
         h('i', {
             class: icon || (dragConfig ? dragConfig.rowIcon : '') || getIcon().TABLE_DRAG_ROW
         })
@@ -92,22 +92,22 @@ function renderHeaderCellDragIcon(params) {
     const { computeColumnOpts, computeColumnDragOpts } = $table.getComputeMaps();
     const columnOpts = computeColumnOpts.value;
     const columnDragOpts = computeColumnDragOpts.value;
-    const { showIcon, icon, isCrossDrag, visibleMethod, disabledMethod } = columnDragOpts;
-    const isDisabled = disabledMethod && disabledMethod(params);
+    const { showIcon, icon, trigger, isCrossDrag, visibleMethod, disabledMethod } = columnDragOpts;
     if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
         if (!column.fixed && (isCrossDrag || !column.parentId)) {
-            return h('span', {
-                key: 'dg',
-                class: ['vxe-cell--drag-handle', {
-                        'is--disabled': isDisabled
-                    }],
-                onMousedown(evnt) {
+            const isDisabled = disabledMethod && disabledMethod(params);
+            const ons = {};
+            if (trigger !== 'cell') {
+                ons.onMousedown = (evnt) => {
                     if (!isDisabled) {
                         $table.handleHeaderCellDragMousedownEvent(evnt, params);
                     }
-                },
-                onMouseup: $table.handleHeaderCellDragMouseupEvent
-            }, [
+                };
+                ons.onMouseup = $table.handleHeaderCellDragMouseupEvent;
+            }
+            return h('span', Object.assign({ key: 'dg', class: ['vxe-cell--drag-handle', {
+                        'is--disabled': isDisabled
+                    }] }, ons), [
                 h('i', {
                     class: icon || getIcon().TABLE_DRAG_COLUMN
                 })

package/es/table/src/header.js

@@ -21,7 +21,7 @@ export default defineComponent({
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
         const { refElem: tableRefElem, refTableBody, refLeftContainer, refRightContainer, refCellResizeBar, refCellResizeTip } = $xeTable.getRefMaps();
-        const { computeColumnOpts, computeResizableOpts } = $xeTable.getComputeMaps();
+        const { computeColumnOpts, computeColumnDragOpts, computeResizableOpts } = $xeTable.getComputeMaps();
         const headerColumn = ref([]);
         const refElem = ref();
         const refHeaderTable = ref();
@@ -159,6 +159,8 @@ export default defineComponent({
             const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
             const { currentColumn, scrollXLoad, overflowX, scrollbarWidth } = tableReactData;
             const columnOpts = computeColumnOpts.value;
+            const columnDragOpts = computeColumnDragOpts.value;
+            const { disabledMethod: dragDisabledMethod } = columnDragOpts;
             return cols.map((column, $columnIndex) => {
                 const { type, showHeaderOverflow, headerAlign, align, headerClassName, editRender, cellRender } = column;
                 const colid = column.id;
@@ -176,6 +178,11 @@ export default defineComponent({
                 const columnIndex = $xeTable.getColumnIndex(column);
                 const _columnIndex = $xeTable.getVTColumnIndex(column);
                 const params = { $table: $xeTable, $grid: $xeTable.xegrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter };
+                const thAttrs = {
+                    colid,
+                    colspan: column.colSpan > 1 ? column.colSpan : null,
+                    rowspan: column.rowSpan > 1 ? column.rowSpan : null
+                };
                 const thOns = {
                     onClick: (evnt) => $xeTable.triggerHeaderCellClickEvent(evnt, params),
                     onDblclick: (evnt) => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
@@ -184,17 +191,25 @@ export default defineComponent({
                 if (scrollXLoad && !hasEllipsis) {
                     showEllipsis = hasEllipsis = true;
                 }
+                const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
+                let isDisabledDrag = false;
+                if (isColDragCell) {
+                    isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+                }
                 // 按下事件处理
-                if (mouseConfig) {
+                if (mouseConfig || isColDragCell) {
                     thOns.onMousedown = (evnt) => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
                 }
-                // 拖拽行事件
+                // 拖拽列事件
                 if (columnOpts.drag) {
                     thOns.onDragstart = $xeTable.handleHeaderCellDragDragstartEvent;
                     thOns.onDragend = $xeTable.handleHeaderCellDragDragendEvent;
                     thOns.onDragover = $xeTable.handleHeaderCellDragDragoverEvent;
+                    if (isColDragCell) {
+                        thOns.onMouseup = $xeTable.handleHeaderCellDragMouseupEvent;
+                    }
                 }
-                return h('th', Object.assign(Object.assign({ class: ['vxe-header--column', colid, {
+                return h('th', Object.assign(Object.assign(Object.assign({ class: ['vxe-header--column', colid, {
                             [`col--${headAlign}`]: headAlign,
                             [`col--${type}`]: type,
                             'col--last': $columnIndex === cols.length - 1,
@@ -205,11 +220,12 @@ export default defineComponent({
                             'is--sortable': column.sortable,
                             'col--filter': !!column.filters,
                             'is--filter-active': hasFilter,
+                            'is--drag-disabled': isDisabledDrag,
                             'col--current': currentColumn === column
                         },
                         headerClassName ? (XEUtils.isFunction(headerClassName) ? headerClassName(params) : headerClassName) : '',
                         headerCellClassName ? (XEUtils.isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName) : ''
-                    ], colid, colspan: column.colSpan > 1 ? column.colSpan : null, rowspan: column.rowSpan > 1 ? column.rowSpan : null, style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null }, thOns), { key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex }), [
+                    ], style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null }, thAttrs), thOns), { key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex }), [
                     h('div', {
                         class: ['vxe-cell', {
                                 'c--title': showTitle,

package/es/table/src/table.js

@@ -102,8 +102,6 @@ export default defineComponent({
             reColumnFlag: 0,
             // 已标记的对象集
             pendingRowMaps: {},
-            // 已标记的行
-            pendingRowList: [],
             // 初始化标识
             initStore: {
                 filter: false,
@@ -3138,16 +3136,13 @@ export default defineComponent({
              * @param {Array} datas 数据
              */
             loadData(datas) {
-                const { inited, initStatus } = internalData;
+                const { initStatus } = internalData;
                 return loadTableData(datas).then(() => {
                     internalData.inited = true;
                     internalData.initStatus = true;
                     if (!initStatus) {
                         handleLoadDefaults();
                     }
-                    if (!inited) {
-                        handleInitDefaults();
-                    }
                     return tableMethods.recalculate();
                 });
             },
@@ -3156,7 +3151,6 @@ export default defineComponent({
              * @param {Array} datas 数据
              */
             reloadData(datas) {
-                const { inited } = internalData;
                 return tableMethods.clearAll()
                     .then(() => {
                     internalData.inited = true;
@@ -3165,9 +3159,6 @@ export default defineComponent({
                 })
                     .then(() => {
                     handleLoadDefaults();
-                    if (!inited) {
-                        handleInitDefaults();
-                    }
                     return tableMethods.recalculate();
                 });
             },
@@ -4414,7 +4405,6 @@ export default defineComponent({
             },
             setPendingRow(rows, status) {
                 const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
-                const pendingList = [...reactData.pendingRowList];
                 if (rows && !XEUtils.isArray(rows)) {
                     rows = [rows];
                 }
@@ -4422,7 +4412,6 @@ export default defineComponent({
                     rows.forEach((row) => {
                         const rowid = getRowid($xeTable, row);
                         if (rowid && !pendingMaps[rowid]) {
-                            pendingList.push(row);
                             pendingMaps[rowid] = row;
                         }
                     });
@@ -4431,21 +4420,15 @@ export default defineComponent({
                     rows.forEach((row) => {
                         const rowid = getRowid($xeTable, row);
                         if (rowid && pendingMaps[rowid]) {
-                            const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-                            if (pendingIndex > -1) {
-                                pendingList.splice(pendingIndex, 1);
-                            }
                             delete pendingMaps[rowid];
                         }
                     });
                 }
                 reactData.pendingRowMaps = pendingMaps;
-                reactData.pendingRowList = pendingList;
                 return nextTick();
             },
             togglePendingRow(rows) {
                 const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
-                const pendingList = [...reactData.pendingRowList];
                 if (rows && !XEUtils.isArray(rows)) {
                     rows = [rows];
                 }
@@ -4453,20 +4436,14 @@ export default defineComponent({
                     const rowid = getRowid($xeTable, row);
                     if (rowid) {
                         if (pendingMaps[rowid]) {
-                            const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-                            if (pendingIndex > -1) {
-                                pendingList.splice(pendingIndex, 1);
-                            }
                             delete pendingMaps[rowid];
                         }
                         else {
-                            pendingList.push(row);
                             pendingMaps[rowid] = row;
                         }
                     }
                 });
                 reactData.pendingRowMaps = pendingMaps;
-                reactData.pendingRowList = pendingList;
                 return nextTick();
             },
             hasPendingByRow(row) {
@@ -4478,12 +4455,18 @@ export default defineComponent({
                 return !!pendingRowMaps[rowid];
             },
             getPendingRecords() {
-                const { pendingRowList } = reactData;
-                return pendingRowList.slice(0);
+                const { pendingRowMaps } = reactData;
+                const { fullAllDataRowIdData } = internalData;
+                const insertRecords = [];
+                XEUtils.each(pendingRowMaps, (row, rowid) => {
+                    if (fullAllDataRowIdData[rowid]) {
+                        insertRecords.push(row);
+                    }
+                });
+                return insertRecords;
             },
             clearPendingRow() {
                 reactData.pendingRowMaps = {};
-                reactData.pendingRowList = [];
                 return nextTick();
             },
             sort(sortConfs, sortOrder) {
@@ -6884,6 +6867,21 @@ export default defineComponent({
                         }
                     }
                 }
+                // 如果是双击编辑模式
+                if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
+                    if (actived.row && actived.column) {
+                        if (editOpts.mode === 'row') {
+                            if (!$xeTable.eqRow(actived.row, row)) {
+                                $xeTable.handleClearEdit(evnt);
+                            }
+                        }
+                        else if (editOpts.mode === 'cell') {
+                            if (!$xeTable.eqRow(actived.row, row) || actived.column.id !== column.id) {
+                                $xeTable.handleClearEdit(evnt);
+                            }
+                        }
+                    }
+                }
                 dispatchEvent('cell-click', params, evnt);
             },
             /**
@@ -7116,6 +7114,74 @@ export default defineComponent({
                     $xeTable.handleColumnSortEvent(evnt, column);
                 }
             },
+            /**
+             * 表头单元格按下事件
+             */
+            triggerHeaderCellMousedownEvent(evnt, params) {
+                const { mouseConfig } = props;
+                const mouseOpts = computeMouseOpts.value;
+                const columnOpts = computeColumnOpts.value;
+                const columnDragOpts = computeColumnDragOpts.value;
+                const { trigger, disabledMethod } = columnDragOpts;
+                const cell = evnt.currentTarget;
+                const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+                const triggerCheckbox = getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
+                const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
+                const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
+                let triggerDrag = false;
+                if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
+                    if (columnOpts.drag && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+                        triggerDrag = true;
+                        $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
+                    }
+                }
+                if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
+                    $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
+                }
+                $xeTable.focus();
+                if ($xeTable.closeMenu) {
+                    $xeTable.closeMenu();
+                }
+            },
+            /**
+             * 单元格按下事件
+             */
+            triggerCellMousedownEvent(evnt, params) {
+                const { column } = params;
+                const { type, treeNode } = column;
+                const isRadioType = type === 'radio';
+                const isCheckboxType = type === 'checkbox';
+                const isExpandType = type === 'expand';
+                const rowOpts = computeRowOpts.value;
+                const rowDragOpts = computeRowDragOpts.value;
+                const { trigger, disabledMethod } = rowDragOpts;
+                const cell = evnt.currentTarget;
+                params.cell = cell;
+                const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+                const triggerRadio = isRadioType && getEventTargetNode(evnt, cell, 'vxe-cell--radio').flag;
+                const triggerCheckbox = isCheckboxType && getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
+                const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+                const triggerExpandNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-table--expanded').flag;
+                let isColDragCell = false;
+                if (rowOpts.drag) {
+                    isColDragCell = trigger === 'row' || (column.dragSort && trigger === 'cell');
+                }
+                let triggerDrag = false;
+                if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
+                    if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+                        triggerDrag = true;
+                        $xeTable.handleCellDragMousedownEvent(evnt, params);
+                    }
+                }
+                if (!triggerDrag && $xeTable.handleCellMousedownEvent) {
+                    $xeTable.handleCellMousedownEvent(evnt, params);
+                }
+                $xeTable.focus();
+                $xeTable.closeFilter();
+                if ($xeTable.closeMenu) {
+                    $xeTable.closeMenu();
+                }
+            },
             /**
              * 行拖拽
              */
@@ -7330,15 +7396,15 @@ export default defineComponent({
             },
             handleCellDragMousedownEvent(evnt, params) {
                 var _a;
+                evnt.stopPropagation();
                 const { dragConfig } = props;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { dragStartMethod } = rowDragOpts;
+                const { trigger, dragStartMethod } = rowDragOpts;
                 const { row } = params;
                 const dragEl = evnt.currentTarget;
-                const tdEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+                const tdEl = trigger === 'cell' || trigger === 'row' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
                 const trEl = tdEl.parentElement;
                 const dStartMethod = dragStartMethod || (dragConfig ? dragConfig.dragStartMethod : null);
-                reactData.isDragRowMove = false;
                 clearRowDropOrigin();
                 if (dStartMethod && !dStartMethod(params)) {
                     trEl.draggable = false;
@@ -7568,11 +7634,12 @@ export default defineComponent({
             },
             handleHeaderCellDragMousedownEvent(evnt, params) {
                 var _a;
+                evnt.stopPropagation();
                 const columnDragOpts = computeColumnDragOpts.value;
-                const { dragStartMethod } = columnDragOpts;
+                const { trigger, dragStartMethod } = columnDragOpts;
                 const { column } = params;
                 const dragEl = evnt.currentTarget;
-                const thEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+                const thEl = trigger === 'cell' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
                 reactData.isDragColMove = false;
                 clearColDropOrigin();
                 if (dragStartMethod && !dragStartMethod(params)) {
@@ -7658,6 +7725,8 @@ export default defineComponent({
                     }
                     internalData.lastScrollTop = scrollTop;
                 }
+                reactData.isDragColMove = false;
+                reactData.isDragRowMove = false;
                 reactData.lastScrollTime = Date.now();
                 const evntParams = Object.assign({ scrollTop,
                     scrollLeft,
@@ -8101,6 +8170,7 @@ export default defineComponent({
             const resizableOpts = computeResizableOpts.value;
             const isArea = mouseConfig && mouseOpts.area;
             const tableStyle = computeTableStyle.value;
+            const columnDragOpts = computeColumnDragOpts.value;
             return h('div', {
                 ref: refElem,
                 class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -8117,6 +8187,7 @@ export default defineComponent({
                         'column--highlight': columnOpts.isHover || highlightHoverColumn,
                         'checkbox--range': checkboxOpts.range,
                         'column--calc': isCalcColumn,
+                        'col--drag-cell': columnOpts.drag && columnDragOpts.trigger === 'cell',
                         'is--header': showHeader,
                         'is--footer': showFooter,
                         'is--group': isGroup,
@@ -8379,7 +8450,7 @@ export default defineComponent({
             dataFlag.value++;
         });
         watch(dataFlag, () => {
-            const { inited, initStatus } = internalData;
+            const { initStatus } = internalData;
             loadTableData(props.data || []).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 internalData.inited = true;
@@ -8387,9 +8458,6 @@ export default defineComponent({
                 if (!initStatus) {
                     handleLoadDefaults();
                 }
-                if (!inited) {
-                    handleInitDefaults();
-                }
                 if (process.env.NODE_ENV === 'development') {
                     // const checkboxOpts = computeCheckboxOpts.value
                     // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')
@@ -8647,7 +8715,7 @@ export default defineComponent({
                     if (props.editRules && !$xeTable.validate) {
                         errLog('vxe.error.reqModule', ['Validator']);
                     }
-                    if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
+                    if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
                         errLog('vxe.error.reqModule', ['Keyboard']);
                     }
                     if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
@@ -8670,8 +8738,8 @@ export default defineComponent({
                         internalData.inited = true;
                         internalData.initStatus = true;
                         handleLoadDefaults();
-                        handleInitDefaults();
                     }
+                    handleInitDefaults();
                     updateStyle();
                 });
                 if (props.autoResize) {
@@ -8710,7 +8778,6 @@ export default defineComponent({
             globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
             tablePrivateMethods.preventEvent(null, 'mounted', { $table: $xeTable });
         });
-        window.aaaa = $xeTable;
         onBeforeUnmount(() => {
             if (resizeObserver) {
                 resizeObserver.disconnect();

package/es/table/style.css

@@ -2231,6 +2231,24 @@
 .vxe-table--render-default.drag--extend-range .vxe-table--fixed-right-wrapper * {
   cursor: crosshair;
 }
+.vxe-table--render-default.col--drag-cell .vxe-header--column {
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+.vxe-table--render-default.col--drag-cell .vxe-header--column:not(.is--drag-disabled) {
+  cursor: grab;
+}
+.vxe-table--render-default.col--drag-cell .vxe-header--column:not(.is--drag-disabled):active {
+  cursor: grabbing;
+}
+.vxe-table--render-default.col--drag-cell .vxe-header--column:not(.is--drag-disabled):hover {
+  color: var(--vxe-ui-font-primary-color);
+}
+.vxe-table--render-default.col--drag-cell .vxe-header--column.is--drag-disabled {
+  color: var(--vxe-ui-input-disabled-color);
+  cursor: not-allowed;
+}
 .vxe-table--render-default.column--highlight .vxe-header--column:not(.col--seq):hover {
   background-color: var(--vxe-ui-table-column-hover-background-color);
 }
@@ -2811,6 +2829,24 @@
 .vxe-table--render-default .vxe-body--row.row--drag-origin > .vxe-body--column > .vxe-cell {
   opacity: 0.5;
 }
+.vxe-table--render-default .vxe-body--column.is--drag-cell {
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+.vxe-table--render-default .vxe-body--column.is--drag-cell:not(.is--drag-disabled) {
+  cursor: grab;
+}
+.vxe-table--render-default .vxe-body--column.is--drag-cell:not(.is--drag-disabled):active {
+  cursor: grabbing;
+}
+.vxe-table--render-default .vxe-body--column.is--drag-cell:not(.is--drag-disabled):hover {
+  color: var(--vxe-ui-font-primary-color);
+}
+.vxe-table--render-default .vxe-body--column.is--drag-cell.is--drag-disabled {
+  color: var(--vxe-ui-input-disabled-color);
+  cursor: not-allowed;
+}
 .vxe-table--render-default .vxe-body--row-list-move {
   transition-property: transform;
   transition-duration: 0.35s;