vxe-table 4.11.12 → 4.11.14

package/es/table/src/cell.js

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

package/es/table/src/columnInfo.js

@@ -22,9 +22,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;
                 const { computeTreeOpts } = $xeTable.getComputeMaps();

package/es/table/src/header.js

@@ -35,7 +35,7 @@ export default defineComponent({
         const renderRows = (isGroup, isOptimizeMode, cols, $rowIndex) => {
             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 = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
@@ -103,8 +103,10 @@ export default defineComponent({
                 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/table.js

@@ -250,6 +250,12 @@ export default defineComponent({
                 mini: 36
             },
             scrollVMLoading: false,
+            scrollYHeight: 0,
+            scrollYTop: 0,
+            isScrollYBig: false,
+            scrollXLeft: 0,
+            scrollXWidth: 0,
+            isScrollXBig: false,
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,
@@ -1159,7 +1165,7 @@ export default defineComponent({
             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/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.11.12";
+export const version = "4.11.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${"4.11.12"}`;
+const version = `table v${"4.11.14"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.12";
+const version = "4.11.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.12"}`;
+const log_version = `table v${"4.11.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3537,9 +3537,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
@@ -4874,7 +4871,7 @@ function renderCellHandle(params) {
     case 'html':
       return treeNode ? Cell.renderTreeHTMLCell(params) : Cell.renderHTMLCell(params);
   }
-  if (editConfig && editRender) {
+  if (isEnableConf(editConfig) && editRender) {
     return editOpts.mode === 'cell' ? treeNode ? Cell.renderTreeCellEdit(params) : Cell.renderCellEdit(params) : treeNode ? Cell.renderTreeRowEdit(params) : Cell.renderRowEdit(params);
   }
   return treeNode ? Cell.renderTreeCell(params) : Cell.renderDefaultCell(params);
@@ -6207,6 +6204,7 @@ const renderType = 'body';
       } = tableProps;
       const {
         tableData,
+        dragRow,
         overflowX,
         currentColumn,
         scrollXLoad,
@@ -6425,10 +6423,12 @@ const renderType = 'body';
       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) {
@@ -7057,6 +7057,7 @@ const header_renderType = 'header';
       } = tableProps;
       const {
         currentColumn,
+        dragCol,
         scrollXLoad,
         scrollYLoad,
         overflowX
@@ -7156,8 +7157,10 @@ const header_renderType = 'header';
         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 = {};
@@ -10492,6 +10495,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         mini: 36
       },
       scrollVMLoading: false,
+      scrollYHeight: 0,
+      scrollYTop: 0,
+      isScrollYBig: false,
+      scrollXLeft: 0,
+      scrollXWidth: 0,
+      isScrollXBig: false,
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
@@ -11551,7 +11560,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           index,
           items,
           parent: parentColumn || null,
-          width: 0
+          width: 0,
+          oLeft: 0
         };
         if (field) {
           if (fullColumnFieldData[field]) {