ods-component-lib 1.18.253 → 1.18.255

package/dist/index.modern.js

@@ -55755,8 +55755,8 @@ var OdsMergeCellDataGridHelper = /*#__PURE__*/function () {
             var prevMergedCells = mergedCells.filter(function (item) {
               return item.FieldName === _this._mergeDataFields[fieldIndex - 1];
             });
-            if (mergedCellValue === currentCellValue && prevMergedCells.some(function (item) {
-              return item.StartRowIndex === newStartIndex && item.EndRowIndex === rowIndex;
+            if (!prevMergedCells.some(function (item) {
+              return item.StartRowIndex <= newStartIndex && item.EndRowIndex >= newEndIndex;
             })) {
               return {
                 status: false
@@ -55789,7 +55789,7 @@ var OdsMergeCellDataGridHelper = /*#__PURE__*/function () {
         var mergeFieldName = _this._mergeDataFields[fieldIndex];
         var startIndex = 0,
           endIndex = 0,
-          mergedCellValue = "";
+          mergedCellValue = void 0;
         for (var rowIndex = 0; rowIndex < _this._dataSource.length; rowIndex++) {
           var currentCellValue = _this._dataSource[rowIndex][mergeFieldName];
           if (rowIndex + 1 < _this._dataSource.length) {
@@ -55799,23 +55799,23 @@ var OdsMergeCellDataGridHelper = /*#__PURE__*/function () {
               startIndex = conditionResult.startIndex;
               endIndex = conditionResult.endIndex;
               mergedCellValue = currentCellValue;
-            } else if (mergedCellValue !== "") {
+            } else if (mergedCellValue !== undefined) {
               mergedCells.push({
                 FieldName: mergeFieldName,
                 StartRowIndex: startIndex,
                 EndRowIndex: endIndex
               });
-              mergedCellValue = "";
+              mergedCellValue = undefined;
               startIndex = rowIndex + 1;
               endIndex = rowIndex + 1;
             }
-          } else if (mergedCellValue !== "") {
+          } else if (mergedCellValue !== undefined) {
             mergedCells.push({
               FieldName: mergeFieldName,
               StartRowIndex: startIndex,
               EndRowIndex: endIndex
             });
-            mergedCellValue = "";
+            mergedCellValue = undefined;
             startIndex = rowIndex + 1;
             endIndex = rowIndex + 1;
           }
@@ -56538,7 +56538,7 @@ var getStaticColumnWidth = function getStaticColumnWidth(props) {
 };
 var findMaxDataLength = function findMaxDataLength(data, dataField) {
   var dataLengthList = data.map(function (item) {
-    return item[dataField].length;
+    return item[dataField] === null || item[dataField] === undefined ? 0 : item[dataField].length;
   });
   return Math.max.apply(Math, dataLengthList);
 };