vxe-table 3.13.12 → 3.13.14

package/es/table/src/cell.js

@@ -256,7 +256,7 @@ function renderCellHandle(h, params) {
         case 'html':
             return treeNode ? Cell.renderTreeHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
     }
-    if (editConfig && editRender) {
+    if (isEnableConf(editConfig) && editRender) {
         return editOpts.mode === 'cell' ? (treeNode ? Cell.renderTreeCellEdit(h, params) : Cell.renderCellEdit(h, params)) : (treeNode ? Cell.renderTreeRowEdit(h, params) : Cell.renderRowEdit(h, params));
     }
     return treeNode ? Cell.renderTreeCell(h, params) : Cell.renderDefaultCell(h, params);

package/es/table/src/columnInfo.js

@@ -23,9 +23,6 @@ export class ColumnInfo {
             if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
                 warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
             }
-            if (_vm.cellRender && _vm.editRender) {
-                warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
-            }
             if (_vm.type === 'expand') {
                 const { treeConfig } = tableProps;
                 if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {

package/es/table/src/header.js

@@ -13,7 +13,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     const tableInternalData = $xeTable;
     const { fixedType } = props;
     const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
-    const { currentColumn, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
+    const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
     const { scrollXStore } = tableInternalData;
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -82,8 +82,10 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
         if (!isGroup) {
-            if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-                isVNPreEmptyStatus = true;
+            if (!dragCol || dragCol.id !== colid) {
+                if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                    isVNPreEmptyStatus = true;
+                }
             }
         }
         const tcStyle = {};

package/es/table/src/methods.js

@@ -191,7 +191,7 @@ function cacheColumnMap($xeTable) {
     let hasFixed;
     const handleFunc = (column, index, items, path, parentColumn) => {
         const { id: colid, field, fixed, type, treeNode } = column;
-        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 };
+        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         if (field) {
             if (fullColumnFieldData[field]) {
                 errLog('vxe.error.colRepet', ['field', field]);

package/es/table/src/table.js

@@ -630,6 +630,12 @@ export default {
                 mini: 36
             },
             scrollVMLoading: false,
+            scrollYHeight: 0,
+            scrollYTop: 0,
+            isScrollYBig: false,
+            scrollXLeft: 0,
+            scrollXWidth: 0,
+            isScrollXBig: false,
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.12";
+export const version = "3.13.14";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.13.12"}`;
+const version = `table v${"3.13.14"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.12";
+const version = "3.13.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.12"}`;
+const log_version = `table v${"3.13.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3865,9 +3865,6 @@ class ColumnInfo {
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
         warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
       }
-      if (_vm.cellRender && _vm.editRender) {
-        warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
-      }
       if (_vm.type === 'expand') {
         const {
           treeConfig
@@ -4902,7 +4899,7 @@ function renderCellHandle(h, params) {
     case 'html':
       return treeNode ? Cell.renderTreeHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
   }
-  if (editConfig && editRender) {
+  if (isEnableConf(editConfig) && editRender) {
     return editOpts.mode === 'cell' ? treeNode ? Cell.renderTreeCellEdit(h, params) : Cell.renderCellEdit(h, params) : treeNode ? Cell.renderTreeRowEdit(h, params) : Cell.renderRowEdit(h, params);
   }
   return treeNode ? Cell.renderTreeCell(h, params) : Cell.renderDefaultCell(h, params);
@@ -6341,7 +6338,8 @@ function cacheColumnMap($xeTable) {
       index,
       items,
       parent: parentColumn || null,
-      width: 0
+      width: 0,
+      oLeft: 0
     };
     if (field) {
       if (fullColumnFieldData[field]) {
@@ -16546,6 +16544,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   } = tableProps;
   const {
     tableData,
+    dragRow,
     overflowX,
     currentColumn,
     scrollXLoad,
@@ -16763,10 +16762,12 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-    isVNPreEmptyStatus = true;
-  } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-    isVNPreEmptyStatus = true;
+  if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      isVNPreEmptyStatus = true;
+    } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      isVNPreEmptyStatus = true;
+    }
   }
   const tcStyle = {};
   if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
@@ -17409,6 +17410,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   } = tableProps;
   const {
     currentColumn,
+    dragCol,
     scrollXLoad,
     scrollYLoad,
     overflowX
@@ -17509,8 +17511,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
     if (!isGroup) {
-      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-        isVNPreEmptyStatus = true;
+      if (!dragCol || dragCol.id !== colid) {
+        if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+          isVNPreEmptyStatus = true;
+        }
       }
     }
     const tcStyle = {};
@@ -26848,6 +26852,12 @@ function renderBody(h, $xeTable) {
         mini: 36
       },
       scrollVMLoading: false,
+      scrollYHeight: 0,
+      scrollYTop: 0,
+      isScrollYBig: false,
+      scrollXLeft: 0,
+      scrollXWidth: 0,
+      isScrollXBig: false,
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,