rapid-spreadjs 1.0.170 → 1.0.171

package/dist/index.cjs.js

@@ -1469,7 +1469,7 @@ const BusinessUtils = {
                 }
             }
             let rowObjs = { row: parseInt(rowIndexKey), rows: curRowIndexs, cells: cellItems, hasValue: curRowHasValue };
-            if (seqColSpanObj && !rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
+            if (!rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
                 let rowIndexs = [];
                 const seqColSpanRowSpan = sheet.getSpans({ row: seqColSpanObj.row, col: 1, rowCount: 1, colCount: 1 })[0];
                 for (let i = 0; i < seqColSpanRowSpan.rowCount; i++) {
@@ -1482,10 +1482,8 @@ const BusinessUtils = {
                 });
             }
             else {
-                if (seqColSpanObj) {
-                    let curRow = rowCells.find((x) => x.rowSpan == seqColSpanObj.row);
-                    curRow.rows.push(rowObjs);
-                }
+                let curRow = rowCells.find((x) => x.rowSpan == seqColSpanObj.row);
+                curRow.rows.push(rowObjs);
             }
         });
         // 有值和没有值的行索引集合
@@ -1543,6 +1541,27 @@ const BusinessUtils = {
             // 设置行不可见
             sheet.setRowVisible(rowIndex, false);
         });
+        // // 处理单元格边框线的问题
+        // const allRowIndex = orderByJson(unionJson(hasValueRows, noValueRows));
+        // const rowRange = sheet.getRange(allRowIndex[0], 1, allRowIndex.length, 77);
+        // rowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.thin), { all: true });
+        // rowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.medium), {
+        //   left: true,
+        //   right: true,
+        //   top: false,
+        //   bottom: false,
+        // });
+        // 没有启用动态加载行的时候，将所有的行都显示出来
+        if (!isEnable) {
+            hasValueRows.forEach((rowIndex, index) => {
+                // 设置行可见
+                sheet.setRowVisible(rowIndex, true);
+            });
+            noValueRows.forEach((rowIndex) => {
+                // 设置行可见
+                sheet.setRowVisible(rowIndex, true);
+            });
+        }
         /** 创建空白行单元格 */
         const createBlackRowCell = () => {
             // 工作表总高度
@@ -1627,27 +1646,6 @@ const BusinessUtils = {
             }
         };
         createBlackRowCell();
-        // // 处理单元格边框线的问题
-        // const allRowIndex = orderByJson(unionJson(hasValueRows, noValueRows));
-        // const rowRange = sheet.getRange(allRowIndex[0], 1, allRowIndex.length, 77);
-        // rowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.thin), { all: true });
-        // rowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.medium), {
-        //   left: true,
-        //   right: true,
-        //   top: false,
-        //   bottom: false,
-        // });
-        // 没有启用动态加载行的时候，将所有的行都显示出来
-        if (!isEnable) {
-            hasValueRows.forEach((rowIndex, index) => {
-                // 设置行可见
-                sheet.setRowVisible(rowIndex, true);
-            });
-            noValueRows.forEach((rowIndex) => {
-                // 设置行可见
-                sheet.setRowVisible(rowIndex, true);
-            });
-        }
         // 恢复绘制
         sheet.resumePaint();
         // 执行绘制完成后的回调函数