rapid-spreadjs 1.0.159 → 1.0.161

package/dist/index.cjs.js

@@ -835,7 +835,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) {
@@ -881,7 +881,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();
@@ -910,6 +913,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);
             // 设置“此处隐藏”单元格的字体样式
@@ -934,6 +939,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);
                 // 设置“此处隐藏”单元格的字体样式
@@ -951,6 +958,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);
                 // 设置“此处隐藏”单元格的字体样式
@@ -958,10 +967,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,
+        };
     },
     /**
      * 获取检测对象属性值集合
@@ -16267,10 +16281,10 @@ const FormulaUtils = {
                 let symbol = '/';
                 //如果传递的参数小于2个，则返回符号
                 if (retData.allCellVals.length < 2) {
-                    if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
-                        sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
-                        return symbol;
-                    }
+                    // if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
+                    //   sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
+                    //   return symbol;
+                    // }
                     return symbol;
                 }
                 if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
@@ -16287,12 +16301,12 @@ const FormulaUtils = {
                         }
                     }
                 });
-                if (syjglist.length == 0) {
-                    if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
-                        sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
-                        return symbol;
-                    }
-                }
+                // if (syjglist.length == 0) {
+                //   if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
+                //     sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
+                //     return symbol;
+                //   }
+                // }
                 // console.log(retData);
                 // console.log(jsyq);
                 // console.log(syjglist);