rapid-spreadjs 1.0.147 → 1.0.149

package/dist/index.esm.js

@@ -810,7 +810,7 @@ const BusinessUtils = {
      * @param contentColStartIndex 表格内容列起始索引，默认为：1
      * @param contentTotalColCount 表格内容列总数，默认为：77
      * @param addRowHeight 添加的表格行高，默认为：24（单位为像素）
-     * @returns 返回生成的检测对象属性行数
+     * @returns 返回生成的检测对象属性行对象
      */
     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) {
@@ -844,7 +844,7 @@ const BusinessUtils = {
          */
         const setFontSizeFamily = (row, col, isValueCell = false) => {
             const cellObj = sheet.getCell(row, col);
-            cellObj.fontFamily('宋体').fontSize('9pt').cellPadding(`0 0 0 ${valuePaddingLeft}`);
+            cellObj.fontFamily('宋体').fontSize('9pt').fontStyle('normail').cellPadding(`0 0 0 ${valuePaddingLeft}`);
             // 值单元格的时候，居左显示
             if (isValueCell) {
                 cellObj.hAlign(valueAlign == 'left'
@@ -882,9 +882,19 @@ const BusinessUtils = {
             sheet.addSpan(totalRowCount, contentColStartIndex, 1, titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
             sheet.addSpan(totalRowCount, contentColStartIndex + titleCellColumnCount, 1, rowAttrArr.length > 1 ? titleCellValColumnCount : contentTotalColCount - titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
             sheet.setValue(totalRowCount, contentColStartIndex, rowAttrArr[0].title);
-            sheet.setValue(totalRowCount, contentColStartIndex + titleCellColumnCount, rowAttrArr[0].value);
+            sheet.setValue(totalRowCount, contentColStartIndex + titleCellColumnCount, rowAttrArr[0].blindDisplayStatus != null && rowAttrArr[0].blindDisplayStatus != undefined && rowAttrArr[0].blindDisplayStatus == false
+                ? '此处隐藏'
+                : rowAttrArr[0].value);
             setFontSizeFamily(totalRowCount, contentColStartIndex);
             setFontSizeFamily(totalRowCount, contentColStartIndex + titleCellColumnCount, true);
+            // 设置“此处隐藏”单元格的字体样式
+            if (rowAttrArr[0].blindDisplayStatus != null && rowAttrArr[0].blindDisplayStatus != undefined && rowAttrArr[0].blindDisplayStatus == false) {
+                sheet
+                    .getCell(totalRowCount, contentColStartIndex + titleCellColumnCount)
+                    .fontFamily('宋体')
+                    .fontSize('12px')
+                    .fontStyle('italic');
+            }
             // 合并第二个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 1) {
                 const colIndexTitle = contentColStartIndex + titleCellColumnCount + titleCellValColumnCount;
@@ -892,9 +902,15 @@ const BusinessUtils = {
                 sheet.addSpan(totalRowCount, colIndexTitle, 1, titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
                 sheet.addSpan(totalRowCount, colIndexValue, 1, titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0), gc.Spread.Sheets.SheetArea.viewport);
                 sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[1].title);
-                sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].value);
+                sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].blindDisplayStatus != null && rowAttrArr[1].blindDisplayStatus != undefined && rowAttrArr[1].blindDisplayStatus == false
+                    ? '此处隐藏'
+                    : rowAttrArr[1].value);
                 setFontSizeFamily(totalRowCount, colIndexTitle);
                 setFontSizeFamily(totalRowCount, colIndexValue, true);
+                // 设置“此处隐藏”单元格的字体样式
+                if (rowAttrArr[1].blindDisplayStatus != null && rowAttrArr[1].blindDisplayStatus != undefined && rowAttrArr[1].blindDisplayStatus == false) {
+                    sheet.getCell(totalRowCount, colIndexValue).fontFamily('宋体').fontSize('12px').fontStyle('italic');
+                }
             }
             // 合并第三个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 2) {
@@ -903,14 +919,20 @@ const BusinessUtils = {
                 sheet.addSpan(totalRowCount, colIndexTitle, 1, titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
                 sheet.addSpan(totalRowCount, colIndexValue, 1, titleCellValColumnCount + 1, gc.Spread.Sheets.SheetArea.viewport);
                 sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[2].title);
-                sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[2].value);
+                sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[2].blindDisplayStatus != null && rowAttrArr[2].blindDisplayStatus != undefined && rowAttrArr[2].blindDisplayStatus == false
+                    ? '此处隐藏'
+                    : rowAttrArr[2].value);
                 setFontSizeFamily(totalRowCount, colIndexTitle);
                 setFontSizeFamily(totalRowCount, colIndexValue, true);
+                // 设置“此处隐藏”单元格的字体样式
+                if (rowAttrArr[2].blindDisplayStatus != null && rowAttrArr[2].blindDisplayStatus != undefined && rowAttrArr[2].blindDisplayStatus == false) {
+                    sheet.getCell(totalRowCount, colIndexValue).fontFamily('宋体').fontSize('12px').fontStyle('italic');
+                }
             }
         }
         // 恢复绘制
         sheet.resumePaint();
-        return testObjectAttrsChunk.length;
+        return testObjectAttrsChunk;
     },
     /**
      * 获取检测对象属性值集合
@@ -23240,7 +23262,7 @@ const FormulaUtils = {
                     if (thsd == '0.0') {
                         for (var j = 0; j < arr1.length; j++) {
                             var a1 = arr1[j].split('-');
-                            if (schtz === a1[0]) {
+                            if (schtz == a1[0]) {
                                 qdhsz = a1[1];
                             }
                         }