vxe-table 4.14.0-beta.9 → 4.14.1

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

@@ -131,7 +131,7 @@ hooks.add('tableEditModule', {
                     // 刷新单元格合并
                     mergeBodyList.forEach((mergeItem) => {
                         const { row: mergeRowIndex } = mergeItem;
-                        if (mergeRowIndex > 0) {
+                        if (mergeRowIndex >= 0) {
                             mergeItem.row = mergeRowIndex + newRecords.length;
                         }
                     });
@@ -160,13 +160,6 @@ hooks.add('tableEditModule', {
                             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 {
@@ -254,10 +247,10 @@ hooks.add('tableEditModule', {
                         // 刷新单元格合并
                         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

@@ -167,7 +167,7 @@ function renderTitleContent(params, content) {
     const { showHeaderOverflow } = column;
     const tooltipOpts = computeTooltipOpts.value;
     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 = {};

package/es/ui/index.js

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

package/lib/index.common.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-var VxeTableExport = _interopRequireWildcard(require("./components"));
-Object.keys(VxeTableExport).forEach(function (key) {
+var VxeUITableExport = _interopRequireWildcard(require("./components"));
+Object.keys(VxeUITableExport).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === VxeTableExport[key]) return;
+  if (key in exports && exports[key] === VxeUITableExport[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return VxeTableExport[key];
+      return VxeUITableExport[key];
     }
   });
 });
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var _default = exports.default = VxeTableExport;
+var _default = exports.default = VxeUITableExport;

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.14.0-beta.9";
+const version = "4.14.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3628,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.14.0-beta.9"}`;
+const log_version = `table v${"4.14.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4948,7 +4948,7 @@ function renderTitleContent(params, content) {
   } = column;
   const tooltipOpts = computeTooltipOpts.value;
   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 = {};
@@ -15394,7 +15394,7 @@ edit_hook_hooks.add('tableEditModule', {
             const {
               row: mergeRowIndex
             } = mergeItem;
-            if (mergeRowIndex > 0) {
+            if (mergeRowIndex >= 0) {
               mergeItem.row = mergeRowIndex + newRecords.length;
             }
           });
@@ -15435,16 +15435,6 @@ edit_hook_hooks.add('tableEditModule', {
               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 {
           // 如果为虚拟树
@@ -15550,9 +15540,9 @@ edit_hook_hooks.add('tableEditModule', {
                 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;
               }
             });