vxe-table 4.10.3 → 4.10.4

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.3";
+const version = "4.10.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3558,7 +3558,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.3"}`;
+const log_version = `table v${"4.10.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4347,6 +4347,9 @@ function rowToVisible($xeTable, row) {
     scrollYStore,
     fullAllDataRowIdData
   } = internalData;
+  const {
+    rowHeight
+  } = scrollYStore;
   const tableBody = refTableBody.value;
   const {
     leftList,
@@ -4380,19 +4383,19 @@ function rowToVisible($xeTable, row) {
       // 如果是虚拟渲染滚动
       if (scrollYLoad) {
         if (showOverflow) {
-          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * scrollYStore.rowHeight);
+          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * rowHeight);
         }
         let scrollTop = 0;
-        const rest = fullAllDataRowIdData[rowid];
-        const rHeight = rest ? rest.height : 0;
+        const rowRest = fullAllDataRowIdData[rowid];
+        const rHeight = rowRest ? rowRest.height || rowHeight : rowHeight;
         for (let i = 0; i < afterFullData.length; i++) {
           const currRow = afterFullData[i];
           const currRowid = getRowid($xeTable, currRow);
           if (currRow === row || currRowid === rowid) {
             break;
           }
-          const rest = fullAllDataRowIdData[currRowid];
-          scrollTop += rest ? rest.height : 0;
+          const rowRest = fullAllDataRowIdData[currRowid];
+          scrollTop += rowRest ? rowRest.height || rowHeight : rowHeight;
         }
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - offsetFixedLeft - 1);
@@ -4572,9 +4575,17 @@ function renderTitleSuffixIcon(params) {
 }
 function renderCellDragIcon(params) {
   const {
-    $table
+    $table,
+    column
   } = params;
+  const {
+    context
+  } = $table;
+  const tableSlots = context.slots;
   const tableProps = $table.props;
+  const {
+    slots
+  } = column;
   const {
     dragConfig
   } = tableProps;
@@ -4589,6 +4600,7 @@ function renderCellDragIcon(params) {
   } = rowDragOpts;
   const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
   const isDisabled = rDisabledMethod && rDisabledMethod(params);
+  const rowDragIconSlot = (slots ? slots.rowDragIcon || slots['row-drag-icon'] : null) || tableSlots.rowDragIcon || tableSlots['row-drag-icon'];
   const ons = {};
   if (trigger !== 'cell') {
     ons.onMousedown = evnt => {
@@ -4604,7 +4616,7 @@ function renderCellDragIcon(params) {
       'is--disabled': isDisabled
     }],
     ...ons
-  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+  }, rowDragIconSlot ? $table.callSlot(rowDragIconSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
     class: icon || (dragConfig ? dragConfig.rowIcon : '') || cell_getIcon().TABLE_DRAG_ROW
   })]);
 }
@@ -4652,6 +4664,13 @@ function renderHeaderCellDragIcon(params) {
     $table,
     column
   } = params;
+  const {
+    context
+  } = $table;
+  const tableSlots = context.slots;
+  const {
+    slots
+  } = column;
   const {
     computeColumnOpts,
     computeColumnDragOpts
@@ -4670,6 +4689,7 @@ function renderHeaderCellDragIcon(params) {
   if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
     if (!column.fixed && (isPeerDrag || isCrossDrag || !column.parentId)) {
       const isDisabled = disabledMethod && disabledMethod(params);
+      const columnDragIconSlot = (slots ? slots.columnDragIcon || slots['column-drag-icon'] : null) || tableSlots.columnDragIcon || tableSlots['column-drag-icon'];
       const ons = {};
       if (trigger !== 'cell') {
         ons.onMousedown = evnt => {
@@ -4685,7 +4705,7 @@ function renderHeaderCellDragIcon(params) {
           'is--disabled': isDisabled
         }],
         ...ons
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      }, columnDragIconSlot ? $table.callSlot(columnDragIconSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: icon || cell_getIcon().TABLE_DRAG_COLUMN
       })]);
     }
@@ -11331,10 +11351,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const row = afterFullData[rIndex];
             const rowid = getRowid($xeTable, row);
             const rowRest = fullAllDataRowIdData[rowid];
-            if (!rowRest) {
-              break;
-            }
-            offsetTop += rowRest.height || rowHeight;
+            offsetTop += rowRest ? rowRest.height || rowHeight : rowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
               toVisibleIndex = rIndex;
             }
@@ -16372,6 +16389,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * @param {ColumnInfo} fieldOrColumn 列配置
        */
       scrollToRow(row, fieldOrColumn) {
+        const {
+          showOverflow
+        } = props;
+        const {
+          scrollYLoad,
+          scrollXLoad
+        } = reactData;
         const rest = [];
         if (row) {
           if (props.treeConfig) {
@@ -16383,7 +16407,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (fieldOrColumn) {
           rest.push(handleScrollToRowColumn(fieldOrColumn, row));
         }
-        return Promise.all(rest);
+        return Promise.all(rest).then(() => {
+          if (row) {
+            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+              calcCellHeight();
+              calcCellWidth();
+            }
+            return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+          }
+        });
       },
       /**
        * 如果有滚动条，则滚动到对应的列