rapid-spreadjs 1.0.131 → 1.0.132

package/dist/index.cjs.js

@@ -1359,9 +1359,11 @@ const BusinessUtils = {
      * @param GC GC对象
      * @param spread 工作簿实例
      * @param dynamicLoadRangeJson 动态加载的“试验结果”JSON数组范围，格式如：[{row: 1, col: 1, rowCount: 1, colCount: 1}]
+     * @param pageDir 页面方向（1：纵向、2：横向）
+     * @param blankRowCellValue 空白行单元格值，默认为：空白
      * @returns 返回所有需要显示和隐藏的行索引结果对象，格式如：{hasValueIndex: [1, 2, 3], noValueIndex: [4, 5, 6]}，hasValueIndex代表所有显示的行索引，noValueIndex代表所有隐藏的行索引
      */
-    dynamicLoadRows: (GC, spread, dynamicLoadRangeJson) => {
+    dynamicLoadRows: (GC, spread, dynamicLoadRangeJson, pageDir = 1, blankRowCellValue = '空白') => {
         const sheet = spread.getActiveSheet();
         // 暂停绘制
         sheet.suspendPaint();
@@ -1416,16 +1418,16 @@ const BusinessUtils = {
         // 有值和没有值的行索引集合
         let hasValueRows = [], noValueRows = [];
         rowCells.forEach((rowObj, index) => {
-            if (rowObj.rows.some((x) => x.hasValue)) {
+            if (rowObj.rows.some((x) => x.hasValue) && !hasValueRows.some((x) => x == rowObj.rowSpan)) {
                 hasValueRows.push(rowObj.rowSpan);
             }
             else {
                 rowObj.rows.forEach((x) => {
                     x.cells.forEach((cell) => {
-                        noValueRows.push(cell.row);
+                        if (!noValueRows.some((x) => x == cell.row))
+                            noValueRows.push(cell.row);
                     });
                 });
-                noValueRows.push(rowObj.rowSpan);
             }
         });
         hasValueRows.forEach((rowIndex, index) => {
@@ -1438,8 +1440,74 @@ const BusinessUtils = {
             // 设置行不可见
             sheet.setRowVisible(rowIndex, false);
         });
+        /** 创建空白行单元格 */
+        const createBlackRowCell = () => {
+            // 工作表总高度
+            const sheetTotalHeight = pageDir ? 1055 : 615;
+            // 获取所有可见行的总高度
+            let allRowHeight = 0;
+            for (let i = 0; i < sheet.getRowCount(); i++) {
+                const curRowVisible = sheet.getRowVisible(i);
+                const blankRowCell = sheet.getTag(i, 1);
+                if (curRowVisible && (blankRowCell == null || blankRowCell == undefined || blankRowCell != 'BlankCell')) {
+                    allRowHeight += sheet.getRowHeight(i);
+                }
+            }
+            // 获取到最后一行动态加载区域的行索引
+            const lastRowIndex = rowCells[rowCells.length - 1].rows[rowCells[rowCells.length - 1].rows.length - 1].row;
+            // 创建空白行
+            if (allRowHeight < sheetTotalHeight) {
+                // 获取空白行单元格的标签
+                const blankRowCell = sheet.getTag(lastRowIndex + 1, 1);
+                if (!blankRowCell || blankRowCell !== 'BlankCell') {
+                    // 添加一行、合并单元格
+                    sheet.addRows(lastRowIndex + 1, 1);
+                    sheet.addSpan(lastRowIndex + 1, 1, 1, 77);
+                    // 设置添加这一行的行高
+                    sheet.setRowHeight(lastRowIndex + 1, sheetTotalHeight - allRowHeight);
+                    // 获取添加这一行的区域范围
+                    const addRowRange = sheet.getRange(lastRowIndex + 1, 1, 1, 77);
+                    // 设置边框线
+                    addRowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.thin), { all: true });
+                    addRowRange.setBorder(new GC.Spread.Sheets.LineBorder('#000', GC.Spread.Sheets.LineStyle.medium), {
+                        left: true,
+                        right: true,
+                        top: false,
+                        bottom: false,
+                    });
+                    // 设置单元格水平和垂直居中
+                    addRowRange.hAlign(GC.Spread.Sheets.HorizontalAlign.center);
+                    addRowRange.vAlign(GC.Spread.Sheets.HorizontalAlign.center);
+                    sheet.setValue(lastRowIndex + 1, 1, blankRowCellValue);
+                    sheet.setTag(lastRowIndex + 1, 1, 'BlankCell');
+                }
+                else {
+                    // 设置添加这一行的行高
+                    sheet.setRowHeight(lastRowIndex + 1, sheetTotalHeight - allRowHeight);
+                    // 显示空白行单元格
+                    sheet.setRowVisible(lastRowIndex + 1, true);
+                }
+            }
+            // 隐藏空白行单元格
+            else {
+                const blankRowCell = sheet.getTag(lastRowIndex + 1, 1);
+                // 如果空白行单元格标签存在，则隐藏
+                if (blankRowCell && blankRowCell == 'BlankCell') {
+                    sheet.setRowVisible(lastRowIndex + 1, false);
+                }
+            }
+        };
+        createBlackRowCell();
         // 恢复绘制
         sheet.resumePaint();
+        let allRowHeight = 0;
+        for (let i = 0; i < sheet.getRowCount(); i++) {
+            const curRowVisible = sheet.getRowVisible(i);
+            if (curRowVisible) {
+                allRowHeight += sheet.getRowHeight(i);
+            }
+        }
+        console.log('创建空白行单元格后的总高度：', allRowHeight);
         return { hasValueIndex: hasValueRows, noValueIndex: noValueRows };
     },
 };