rapid-spreadjs 1.0.158 → 1.0.160

package/dist/index.esm.js

@@ -813,7 +813,7 @@ const BusinessUtils = {
      * @param contentColStartIndex 表格内容列起始索引，默认为：1
      * @param contentTotalColCount 表格内容列总数，默认为：77
      * @param addRowHeight 添加的表格行高，默认为：24（单位为像素）
-     * @returns 返回生成的检测对象属性行对象
+     * @returns 返回生成的检测对象属性行单元格数组和行对象数组，格式如：{ allRowCells: [[{row:0,col:0}]], attrObjs: [[{fieldName:"attr1",title:"属性1",value:"值1"}]] }
      */
     createTestObjectAttrsCells: (gc, sheet, testObjectAttrs, addRowIndex = 0, deleteRowsCount = 0, isVertical = true, valueAlign = 'left', valuePaddingLeft = 0, contentColStartIndex = 1, contentTotalColCount = 77, addRowHeight = 24) => {
         if (!testObjectAttrs || testObjectAttrs.length === 0) {
@@ -859,7 +859,10 @@ const BusinessUtils = {
                             : gc.Spread.Sheets.HorizontalAlign.left);
             }
         };
+        // 返回所有单元格的二维数组
+        let allRowCells = [];
         for (let i = 0; i < testObjectAttrsChunk.length; i++) {
+            let curRowCells = [];
             const rowAttrArr = testObjectAttrsChunk[i];
             // 获取总行数
             const totalRowCount = addRowIndex + i; //sheet.getRowCount();
@@ -888,6 +891,8 @@ const BusinessUtils = {
             sheet.setValue(totalRowCount, contentColStartIndex + titleCellColumnCount, rowAttrArr[0].blindDisplayStatus != null && rowAttrArr[0].blindDisplayStatus != undefined && rowAttrArr[0].blindDisplayStatus == true
                 ? '此处隐藏'
                 : rowAttrArr[0].value);
+            curRowCells.push({ row: totalRowCount, col: contentColStartIndex });
+            curRowCells.push({ row: totalRowCount, col: contentColStartIndex + titleCellColumnCount });
             setFontSizeFamily(totalRowCount, contentColStartIndex);
             setFontSizeFamily(totalRowCount, contentColStartIndex + titleCellColumnCount, true);
             // 设置“此处隐藏”单元格的字体样式
@@ -912,6 +917,8 @@ const BusinessUtils = {
                 sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].blindDisplayStatus != null && rowAttrArr[1].blindDisplayStatus != undefined && rowAttrArr[1].blindDisplayStatus == true
                     ? '此处隐藏'
                     : rowAttrArr[1].value);
+                curRowCells.push({ row: totalRowCount, col: colIndexTitle });
+                curRowCells.push({ row: totalRowCount, col: colIndexValue });
                 setFontSizeFamily(totalRowCount, colIndexTitle);
                 setFontSizeFamily(totalRowCount, colIndexValue, true);
                 // 设置“此处隐藏”单元格的字体样式
@@ -929,6 +936,8 @@ const BusinessUtils = {
                 sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[2].blindDisplayStatus != null && rowAttrArr[2].blindDisplayStatus != undefined && rowAttrArr[2].blindDisplayStatus == true
                     ? '此处隐藏'
                     : rowAttrArr[2].value);
+                curRowCells.push({ row: totalRowCount, col: colIndexTitle });
+                curRowCells.push({ row: totalRowCount, col: colIndexValue });
                 setFontSizeFamily(totalRowCount, colIndexTitle);
                 setFontSizeFamily(totalRowCount, colIndexValue, true);
                 // 设置“此处隐藏”单元格的字体样式
@@ -936,10 +945,15 @@ const BusinessUtils = {
                     sheet.getCell(totalRowCount, colIndexValue).fontFamily('宋体').fontSize('12px').fontStyle('italic');
                 }
             }
+            // 将当前行的所有单元格添加到allRowCells数组中
+            allRowCells.push(curRowCells);
         }
         // 恢复绘制
         sheet.resumePaint();
-        return testObjectAttrsChunk;
+        return {
+            allRowCells: allRowCells,
+            attrObjs: testObjectAttrsChunk,
+        };
     },
     /**
      * 获取检测对象属性值集合
@@ -21503,11 +21517,15 @@ const FormulaUtils = {
                 retData.allCellValsEw.forEach((item) => {
                     if (Array.isArray(item)) {
                         item.forEach((itemSon) => {
-                            retVals.push(itemSon);
+                            if (itemSon != '/' && !(itemSon._error != undefined && itemSon._error != null)) {
+                                retVals.push(itemSon);
+                            }
                         });
                     }
                     else {
-                        retVals.push(item);
+                        if (item != '/' && !(item._error != undefined && item._error != null)) {
+                            retVals.push(item);
+                        }
                     }
                 });
                 let tmp_xy = retVals;