vxe-table 3.16.0-beta.9 → 3.16.1

package/es/table/module/edit/mixin.js

@@ -127,7 +127,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             // 刷新单元格合并
             mergeBodyList.forEach((mergeItem) => {
                 const { row: mergeRowIndex } = mergeItem;
-                if (mergeRowIndex > 0) {
+                if (mergeRowIndex >= 0) {
                     mergeItem.row = mergeRowIndex + newRecords.length;
                 }
             });
@@ -156,13 +156,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     afterFullData.push(item);
                     tableFullData.push(item);
                 });
-                // 刷新单元格合并
-                mergeBodyList.forEach((mergeItem) => {
-                    const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
-                    if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                        mergeItem.rowspan = mergeRowspan + newRecords.length;
-                    }
-                });
             }
         }
         else {
@@ -250,10 +243,10 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                 // 刷新单元格合并
                 mergeBodyList.forEach((mergeItem) => {
                     const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
-                    if (mergeRowIndex > afIndex) {
+                    if (mergeRowIndex >= afIndex) {
                         mergeItem.row = mergeRowIndex + newRecords.length;
                     }
-                    else if (mergeRowIndex + mergeRowspan > afIndex) {
+                    else if (isInsertNextRow ? (mergeRowIndex + mergeRowspan >= afIndex) : (mergeRowIndex + mergeRowspan > afIndex)) {
                         mergeItem.rowspan = mergeRowspan + newRecords.length;
                     }
                 });

package/es/table/src/cell.js

@@ -166,14 +166,14 @@ function getRenderDefaultColumnTitle(h, column, content) {
 }
 function renderTitleContent(h, params, content) {
     const { $table, column } = params;
-    const { showHeaderOverflow } = column;
     const tableProps = $table;
     const tableReactData = $table;
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
     const { isRowGroupStatus } = tableReactData;
+    const { showHeaderOverflow } = column;
     const tooltipOpts = $table.computeTooltipOpts;
     const showAllTip = tooltipOpts.showAll;
-    const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+    const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
     const ons = {};
@@ -202,7 +202,10 @@ function renderTitleContent(h, params, content) {
     }
     const titleVN = getRenderDefaultColumnTitle(h, column, content);
     return [
-        h('span', Object.assign({ class: 'vxe-cell--title' }, ons), isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
+        h('span', {
+            class: 'vxe-cell--title',
+            on: ons
+        }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
             ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
             : [
                 titleVN

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.16.0-beta.9";
+const version = "3.16.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.0-beta.9"}`;
+const log_version = `table v${"3.16.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3687,9 +3687,6 @@ function renderTitleContent(h, params, content) {
     $table,
     column
   } = params;
-  const {
-    showHeaderOverflow
-  } = column;
   const tableProps = $table;
   const tableReactData = $table;
   const {
@@ -3698,9 +3695,12 @@ function renderTitleContent(h, params, content) {
   const {
     isRowGroupStatus
   } = tableReactData;
+  const {
+    showHeaderOverflow
+  } = column;
   const tooltipOpts = $table.computeTooltipOpts;
   const showAllTip = tooltipOpts.showAll;
-  const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+  const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
   const ons = {};
@@ -3729,7 +3729,7 @@ function renderTitleContent(h, params, content) {
   const titleVN = getRenderDefaultColumnTitle(h, column, content);
   return [h('span', {
     class: 'vxe-cell--title',
-    ...ons
+    on: ons
   }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : [titleVN])];
 }
 function getFooterContent(h, params) {
@@ -23185,7 +23185,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         const {
           row: mergeRowIndex
         } = mergeItem;
-        if (mergeRowIndex > 0) {
+        if (mergeRowIndex >= 0) {
           mergeItem.row = mergeRowIndex + newRecords.length;
         }
       });
@@ -23226,16 +23226,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           afterFullData.push(item);
           tableFullData.push(item);
         });
-        // 刷新单元格合并
-        mergeBodyList.forEach(mergeItem => {
-          const {
-            row: mergeRowIndex,
-            rowspan: mergeRowspan
-          } = mergeItem;
-          if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-            mergeItem.rowspan = mergeRowspan + newRecords.length;
-          }
-        });
       }
     } else {
       // 如果为虚拟树
@@ -23341,9 +23331,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             row: mergeRowIndex,
             rowspan: mergeRowspan
           } = mergeItem;
-          if (mergeRowIndex > afIndex) {
+          if (mergeRowIndex >= afIndex) {
             mergeItem.row = mergeRowIndex + newRecords.length;
-          } else if (mergeRowIndex + mergeRowspan > afIndex) {
+          } else if (isInsertNextRow ? mergeRowIndex + mergeRowspan >= afIndex : mergeRowIndex + mergeRowspan > afIndex) {
             mergeItem.rowspan = mergeRowspan + newRecords.length;
           }
         });