vxe-table 3.12.0-beta.0 → 3.12.0-beta.10

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0-beta.0";
+const version = "3.12.0-beta.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2632,7 +2632,20 @@ var es_array_push = __webpack_require__(4114);
 
 const reClsMap = {};
 const browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
-const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+let tpImgEl;
+function initTpImg() {
+  if (!tpImgEl) {
+    tpImgEl = new Image();
+    tpImgEl.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+  }
+  return tpImgEl;
+}
+function getTpImg() {
+  if (!tpImgEl) {
+    return initTpImg();
+  }
+  return tpImgEl;
+}
 function getPropClass(property, params) {
   return property ? XEUtils.isFunction(property) ? property(params) : property : '';
 }
@@ -2795,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.0"}`;
+const log_version = `table v${"3.12.0-beta.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3041,14 +3054,19 @@ const lineOffsetSizes = {
   small: 2,
   medium: 1
 };
-function restoreScrollLocation(_vm, scrollLeft, scrollTop) {
-  return _vm.clearScroll().then(() => {
+function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
+  const internalData = $xeTable;
+  return $xeTable.clearScroll().then(() => {
     if (scrollLeft || scrollTop) {
       // 重置最后滚动状态
-      _vm.lastScrollLeft = 0;
-      _vm.lastScrollTop = 0;
+      internalData.lastScrollLeft = 0;
+      internalData.lastScrollTop = 0;
+      internalData.inVirtualScroll = false;
+      internalData.inBodyScroll = false;
+      internalData.inFooterScroll = false;
+      internalData.bodyScrollType = '';
       // 还原滚动状态
-      return _vm.scrollTo(scrollLeft, scrollTop);
+      return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
   });
 }
@@ -4983,14 +5001,12 @@ function handleReserveRow(_vm, reserveRowMap) {
   });
   return reserveList;
 }
-function handleVirtualXVisible(_vm) {
+function handleVirtualXVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     visibleColumn
-  } = _vm;
-  const {
-    tableBody
-  } = $refs;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   if (tableBodyElem) {
     const {
@@ -5032,8 +5048,8 @@ const computeRowHeight = $xeTable => {
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
-  const rowHeightMaps = $xeTable.rowHeightMaps;
-  let rowHeight = 0;
+  const rowHeightMaps = $xeTable.computeRowHeightMaps;
+  let rowHeight = 24;
   if (showOverflow) {
     if (tableBodyElem) {
       const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -5053,13 +5069,13 @@ const computeRowHeight = $xeTable => {
   return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     scrollYStore,
     afterFullData,
     fullAllDataRowIdData
-  } = $xeTable;
-  const tableBody = $refs.tableBody;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const {
     rowHeight
@@ -5076,11 +5092,11 @@ function handleVirtualYVisible($xeTable) {
     for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
       const row = afterFullData[rIndex];
       const rowid = getRowid($xeTable, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (!rest) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
         break;
       }
-      offsetTop += rest.height || rowHeight;
+      offsetTop += rowRest.height || rowHeight;
       if (toVisibleIndex === -1 && scrollTop < offsetTop) {
         toVisibleIndex = rIndex;
       }
@@ -5309,6 +5325,22 @@ function getOrderField(_vm, column) {
     return cellValue;
   };
 }
+function clearDragStatus($xeTable) {
+  const reactData = $xeTable;
+  const {
+    dragRow,
+    dragCol
+  } = reactData;
+  if (dragRow || dragCol) {
+    clearColDropOrigin($xeTable);
+    clearRowDropOrigin($xeTable);
+    hideDropTip($xeTable);
+    reactData.dragRow = null;
+    reactData.dragCol = null;
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
+  }
+}
 function clearRowDropOrigin($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -5751,7 +5783,6 @@ const Methods = {
     editStore.removeList = [];
     editStore.removeMaps = {};
     const sYLoad = this.updateScrollYStatus(fullData);
-    this.scrollYLoad = sYLoad;
     this.isDragRowMove = false;
     // 全量数据
     this.tableFullData = fullData;
@@ -8094,7 +8125,7 @@ const Methods = {
       internalData.rceTimeout = setTimeout(() => {
         internalData.rceTimeout = undefined;
         resolve(handleRecalculateLayout($xeTable, !!reFull));
-      }, 20);
+      }, 15);
     });
   },
   calcCellWidth() {
@@ -11041,14 +11072,16 @@ const Methods = {
       $xeTable.closeMenu();
     }
   },
+  triggerCellMouseupEvent() {
+    const $xeTable = this;
+    clearDragStatus($xeTable);
+  },
   /**
    * 行拖拽
    */
   handleRowDragDragstartEvent(evnt) {
     if (evnt.dataTransfer) {
-      const img = new Image();
-      img.src = tpImg;
-      evnt.dataTransfer.setDragImage(img, 0, 0);
+      evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
     }
   },
   handleRowDragDragendEvent(evnt) {
@@ -11335,23 +11368,24 @@ const Methods = {
   },
   handleCellDragMouseupEvent() {
     const $xeTable = this;
-    const reactData = $xeTable;
-    clearRowDropOrigin($xeTable);
-    hideDropTip($xeTable);
-    reactData.dragRow = null;
-    reactData.dragCol = null;
-    reactData.isDragRowMove = false;
+    clearDragStatus($xeTable);
   },
   /**
    * 列拖拽
    */
   handleHeaderCellDragDragstartEvent(evnt) {
     if (evnt.dataTransfer) {
-      const img = new Image();
-      img.src = tpImg;
-      evnt.dataTransfer.setDragImage(img, 0, 0);
+      evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
     }
   },
+  handleColDragSwapColumn() {
+    const $xeTable = this;
+    $xeTable.handleUpdateColumn();
+    $xeTable.parseColumns(false).then(() => {
+      $xeTable.updateCellAreas();
+      $xeTable.saveCustomStore('update:sort');
+    });
+  },
   handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
@@ -11508,11 +11542,7 @@ const Methods = {
             }
           }, evnt);
           if (isSyncColumn) {
-            $xeTable.handleUpdateColumn();
-            $xeTable.parseColumns(false).then(() => {
-              $xeTable.updateCellAreas();
-              return $xeTable.saveCustomStore('update:sort');
-            });
+            $xeTable.handleColDragSwapColumn();
           }
         }).catch(() => {});
       }
@@ -12983,15 +13013,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollTop
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
@@ -13025,15 +13058,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollLeft
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableBody = $xeTable.$refs.tableBody;
     const leftBody = $xeTable.$refs.leftBody;
@@ -13185,7 +13221,6 @@ const Methods = {
     const {
       showOverflow
     } = props;
-    // this.tableColumn = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
@@ -13251,7 +13286,6 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
-    // this.tableData = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableData();
       calcCellHeight($xeTable);
@@ -13329,6 +13363,7 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       $refs
     } = this;
@@ -13344,6 +13379,7 @@ const Methods = {
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
+    internalData.intoRunScroll = true;
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
       if (xHandleEl) {
@@ -13365,7 +13401,14 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+      return new Promise(resolve => {
+        setTimeout(() => {
+          $xeTable.$nextTick(() => {
+            internalData.intoRunScroll = false;
+            resolve();
+          });
+        });
+      });
     }
     return this.$nextTick();
   },
@@ -13430,20 +13473,18 @@ const Methods = {
    */
   clearScroll() {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXStore,
       scrollYStore
-    } = $xeTable;
-    const {
-      tableBody,
-      tableHeader,
-      leftBody,
-      rightBody,
-      tableFooter
-    } = $refs;
-    const tableBodyElem = tableBody ? tableBody.$el : null;
+    } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
+    const tableHeader = $xeTable.$refs.tableHeader;
+    const tableFooter = $xeTable.$refs.tableFooter;
+    const leftBody = $xeTable.$refs.leftBody;
+    const rightBody = $xeTable.$refs.rightBody;
     const leftBodyElem = leftBody ? leftBody.$el : null;
+    const tableBodyElem = tableBody ? tableBody.$el : null;
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
@@ -13798,7 +13839,7 @@ function renderLine(h, _vm, $xetable, params) {
 /**
  * 渲染列
  */
-function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
   const {
     $listeners: tableListeners,
     fullAllDataRowIdData,
@@ -13836,15 +13877,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     mouseOpts,
     areaOpts,
     validErrorMaps
-  } = $xetable;
-  const rowDragOpts = $xetable.computeRowDragOpts;
+  } = $xeTable;
+  const rowDragOpts = $xeTable.computeRowDragOpts;
   const {
     disabledMethod: dragDisabledMethod
   } = rowDragOpts;
   const {
     selectCellToRow
   } = areaOpts;
-  const cellOpts = $xetable.computeCellOpts;
+  const cellOpts = $xeTable.computeCellOpts;
   const {
     type,
     cellRender,
@@ -13872,8 +13913,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : '';
   const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
   const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
-  const columnIndex = $xetable.getColumnIndex(column);
-  const _columnIndex = $xetable.getVTColumnIndex(column);
+  const columnIndex = $xeTable.getColumnIndex(column);
+  const _columnIndex = $xeTable.getVTColumnIndex(column);
   const isEdit = isEnableConf(editRender);
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
   const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
@@ -13895,8 +13936,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const bindMouseleave = tableListeners['cell-mouseleave'];
   const triggerDblclick = editRender && editConfig && editOpts.trigger === 'dblclick';
   const params = {
-    $table: $xetable,
-    $grid: $xetable.$xegrid,
+    $table: $xeTable,
+    $grid: $xeTable.$xegrid,
     isEdit: false,
     seq,
     rowid,
@@ -13916,28 +13957,28 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     data: tableData,
     items
   };
-  let isColDragCell = false;
+  let isRowDragCell = false;
   let isDisabledDrag = false;
   if (rowOpts.drag) {
-    isColDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
+    isRowDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
   }
-  if (isColDragCell) {
+  if (isRowDragCell) {
     isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
   }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
-      if (isVMScrollProcess($xetable)) {
+      if (isVMScrollProcess($xeTable)) {
         return;
       }
       if (showTitle) {
         updateCellTitle(evnt.currentTarget, column);
       } else if (showTooltip || showAllTip) {
         // 如果配置了显示 tooltip
-        $xetable.triggerBodyTooltipEvent(evnt, params);
+        $xeTable.triggerBodyTooltipEvent(evnt, params);
       }
       if (bindMouseenter) {
-        $xetable.emitEvent('cell-mouseenter', Object.assign({
+        $xeTable.emitEvent('cell-mouseenter', Object.assign({
           cell: evnt.currentTarget
         }, params), evnt);
       }
@@ -13946,35 +13987,39 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = evnt => {
-      if (isVMScrollProcess($xetable)) {
+      if (isVMScrollProcess($xeTable)) {
         return;
       }
       if (showTooltip || showAllTip) {
-        $xetable.handleTargetLeaveEvent(evnt);
+        $xeTable.handleTargetLeaveEvent(evnt);
       }
       if (bindMouseleave) {
-        $xetable.emitEvent('cell-mouseleave', Object.assign({
+        $xeTable.emitEvent('cell-mouseleave', Object.assign({
           cell: evnt.currentTarget
         }, params), evnt);
       }
     };
   }
   // 按下事件处理
-  if (isColDragCell || checkboxOpts.range || mouseConfig) {
+  if (isRowDragCell || checkboxOpts.range || mouseConfig) {
     tdOns.mousedown = evnt => {
-      $xetable.triggerCellMousedownEvent(evnt, params);
+      $xeTable.triggerCellMousedownEvent(evnt, params);
     };
   }
+  // 拖拽列事件
+  if (isRowDragCell) {
+    tdOns.mouseup = $xeTable.triggerCellMouseupEvent;
+  }
   // 点击事件处理
   if (rowOpts.isCurrent || highlightCurrentRow || tableListeners['cell-click'] || editRender && editConfig || expandOpts.trigger === 'row' || expandOpts.trigger === 'cell' || radioOpts.trigger === 'row' || column.type === 'radio' && radioOpts.trigger === 'cell' || checkboxOpts.trigger === 'row' || column.type === 'checkbox' && checkboxOpts.trigger === 'cell' || treeOpts.trigger === 'row' || column.treeNode && treeOpts.trigger === 'cell') {
     tdOns.click = evnt => {
-      $xetable.triggerCellClickEvent(evnt, params);
+      $xeTable.triggerCellClickEvent(evnt, params);
     };
   }
   // 双击事件处理
   if (triggerDblclick || tableListeners['cell-dblclick']) {
     tdOns.dblclick = evnt => {
-      $xetable.triggerCellDblclickEvent(evnt, params);
+      $xeTable.triggerCellDblclickEvent(evnt, params);
     };
   }
   // 合并行或列
@@ -14019,7 +14064,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }
   // 如果编辑列开启显示状态
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-    isDirty = $xetable.isUpdateByRow(row, column.field);
+    isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const tdVNs = [];
   if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -14035,7 +14080,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, $xetable, params), h('div', {
+    tdVNs.push(...renderLine(h, _vm, $xeTable, params), h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
@@ -14045,7 +14090,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
       },
       attrs: {
-        title: showTitle ? $xetable.getCellLabel(row, column) : null
+        title: showTitle ? $xeTable.getCellLabel(row, column) : null
       }
     }, column.renderCell(h, params)));
     if (showValidTip && errorValidItem) {
@@ -14063,7 +14108,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         } : null
       }, [h('div', {
         class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
-      }, [validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
+      }, [validSlot ? $xeTable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
       }, errorValidItem.content)]])]));
     }
@@ -14095,7 +14140,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       'col--ellipsis': hasEllipsis,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
-      'is--drag-cell': isColDragCell,
+      'is--drag-cell': isRowDragCell,
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
       'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
@@ -14383,6 +14428,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       mouseConfig
     } = tableProps;
     const {
+      isGroup,
       tableData,
       scrollXLoad,
       scrollYLoad,
@@ -14439,7 +14485,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         }
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15075,7 +15121,7 @@ function renderHeads(h, _vm, headerGroups) {
       }
       renderHeaderList = [renderColumnList];
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15595,6 +15641,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       fullColumnIdData
     } = tableInternalData;
     const {
+      isGroup,
       scrollXLoad,
       scrollYLoad,
       scrollbarWidth,
@@ -15615,7 +15662,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         renderColumnList = visibleColumn;
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -16053,12 +16100,14 @@ function panel_hideDropTip(_vm) {
   }
 }
 const renderDragTip = (h, _vm) => {
-  const {
-    dragCol
-  } = _vm;
+  const $xeTable = _vm.$xeTable;
+  const dragCol = $xeTable.dragColumnRef;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   return h('div', {}, [h('div', {
     ref: 'refDragLineElem',
-    class: 'vxe-table-custom-popup--drag-line'
+    class: ['vxe-table-custom-popup--drag-line', {
+      'is--guides': columnDragOpts.showGuidesStatus
+    }]
   }), h('div', {
     ref: 'refDragTipElem',
     class: 'vxe-table-custom-popup--drag-tip'
@@ -16597,7 +16646,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }), immediate ? h(VxeUIButtonComponent, {
         props: {
-          content: customOpts.resetButtonText || panel_getI18n('vxe.custom.customClose')
+          content: customOpts.resetButtonText || panel_getI18n('vxe.table.customClose')
         },
         on: {
           click: _vm.cancelCloseEvent
@@ -16950,9 +16999,7 @@ const renderPopupPanel = (h, _vm) => {
     },
     sortDragstartEvent(evnt) {
       if (evnt.dataTransfer) {
-        const img = new Image();
-        img.src = tpImg;
-        evnt.dataTransfer.setDragImage(img, 0, 0);
+        evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
       }
     },
     sortDragendEvent(evnt) {
@@ -17134,11 +17181,7 @@ const renderPopupPanel = (h, _vm) => {
             }, evnt);
             if (immediate) {
               reactData.customColumnList = collectColumn.slice(0);
-              $xeTable.refreshColumn(true).then(() => {
-                $xeTable.updateCellAreas();
-                $xeTable.handleCustom();
-                $xeTable.saveCustomStore('update:sort');
-              });
+              $xeTable.handleColDragSwapColumn();
             }
           }).catch(() => {});
         }
@@ -19264,7 +19307,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           throw new Error(errLog('vxe.error.unableInsert'));
         }
         afterFullData.splice(afIndex, 0, ...newRecords);
-        tableFullData.splice($xeTable.findRowIndexOf(tableFullData, targetRow), 0, ...newRecords);
+        const tfIndex = $xeTable.findRowIndexOf(tableFullData, targetRow);
+        if (tfIndex > -1) {
+          tableFullData.splice(tfIndex + (isInsertNextRow ? 1 : 0), 0, ...newRecords);
+        } else {
+          tableFullData.push(...newRecords);
+        }
         // 刷新单元格合并
         mergeList.forEach(mergeItem => {
           const {
@@ -22523,7 +22571,6 @@ function validErrorRuleValue(rule, val) {
       const {
         editRules,
         afterFullData,
-        visibleColumn,
         treeConfig,
         treeOpts
       } = this;
@@ -22638,11 +22685,7 @@ function validErrorRuleValue(rule, val) {
             } else {
               const row = firstErrParams.row;
               const column = firstErrParams.column;
-              const rowIndex = afterFullData.indexOf(row);
-              const columnIndex = visibleColumn.indexOf(column);
-              const targetRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
-              const targetColumn = columnIndex > 0 ? visibleColumn[columnIndex - 1] : column;
-              this.scrollToRow(targetRow, targetColumn).then(posAndFinish);
+              this.scrollToRow(row, column).then(posAndFinish);
             }
           });
         });
@@ -23272,6 +23315,7 @@ function validErrorRuleValue(rule, val) {
 
 
 
+
 
 
 const {
@@ -24399,6 +24443,12 @@ function handleUupdateResize(_vm) {
   mounted() {
     const $xeTable = this;
     const props = $xeTable;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const rowOpts = $xeTable.computeRowOpts;
+    const customOpts = $xeTable.computeCustomOpts;
+    if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
+      initTpImg();
+    }
     if (true) {
       const {
         $listeners