rapid-spreadjs 1.0.124 → 1.0.126

package/dist/index.cjs.js

@@ -827,12 +827,14 @@ const BusinessUtils = {
      * @param addRowIndex 添加检测对象属性区域的起始行索引，默认为：0
      * @param deleteRowsCount 删除的行数，默认为：0
      * @param isVertical 是否为纵表，默认为：true
+     * @param valueAlign 值单元格对齐方式，默认为：left
+     * @param valuePaddingLeft 值单元格的左边距，默认为：0（单位为像素）
      * @param contentColStartIndex 表格内容列起始索引，默认为：1
      * @param contentTotalColCount 表格内容列总数，默认为：77
      * @param addRowHeight 添加的表格行高，默认为：24（单位为像素）
      * @returns 返回生成的检测对象属性行数
      */
-    createTestObjectAttrsCells: (gc, sheet, testObjectAttrs, addRowIndex = 0, deleteRowsCount = 0, isVertical = true, contentColStartIndex = 1, contentTotalColCount = 77, addRowHeight = 24) => {
+    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) {
             return;
         }
@@ -860,10 +862,21 @@ const BusinessUtils = {
          * 设置单元格字体和大小
          * @param row
          * @param col
+         * @param isValueCell 是否为值单元格，默认为：false
          */
-        const setFontSizeFamily = (row, col) => {
-            sheet.getCell(row, col).fontFamily('宋体');
-            sheet.getCell(row, col).fontSize('9pt');
+        const setFontSizeFamily = (row, col, isValueCell = false) => {
+            const cellObj = sheet.getCell(row, col);
+            cellObj.fontFamily('宋体').fontSize('9pt').cellPadding(`0 0 0 ${valuePaddingLeft}`);
+            // 值单元格的时候，居左显示
+            if (isValueCell) {
+                cellObj.hAlign(valueAlign == 'left'
+                    ? gc.Spread.Sheets.HorizontalAlign.left
+                    : valueAlign == 'center'
+                        ? gc.Spread.Sheets.HorizontalAlign.center
+                        : valueAlign == 'right'
+                            ? gc.Spread.Sheets.HorizontalAlign.right
+                            : gc.Spread.Sheets.HorizontalAlign.left);
+            }
         };
         for (let i = 0; i < testObjectAttrsChunk.length; i++) {
             const rowAttrArr = testObjectAttrsChunk[i];
@@ -881,7 +894,8 @@ const BusinessUtils = {
                 left: true,
                 right: true,
                 top: i == 0,
-                bottom: i == testObjectAttrsChunk.length - 1,
+                // bottom: i == testObjectAttrsChunk.length - 1
+                bottom: false,
             });
             // 设置单元格水平和垂直居中
             addRowRange.hAlign(gc.Spread.Sheets.HorizontalAlign.center);
@@ -892,7 +906,7 @@ const BusinessUtils = {
             sheet.setValue(totalRowCount, contentColStartIndex, rowAttrArr[0].title);
             sheet.setValue(totalRowCount, contentColStartIndex + titleCellColumnCount, rowAttrArr[0].value);
             setFontSizeFamily(totalRowCount, contentColStartIndex);
-            setFontSizeFamily(totalRowCount, contentColStartIndex + titleCellColumnCount);
+            setFontSizeFamily(totalRowCount, contentColStartIndex + titleCellColumnCount, true);
             // 合并第二个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 1) {
                 const colIndexTitle = contentColStartIndex + titleCellColumnCount + titleCellValColumnCount;
@@ -902,7 +916,7 @@ const BusinessUtils = {
                 sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[1].title);
                 sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].value);
                 setFontSizeFamily(totalRowCount, colIndexTitle);
-                setFontSizeFamily(totalRowCount, colIndexValue);
+                setFontSizeFamily(totalRowCount, colIndexValue, true);
             }
             // 合并第三个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 2) {
@@ -913,7 +927,7 @@ const BusinessUtils = {
                 sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[2].title);
                 sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[2].value);
                 setFontSizeFamily(totalRowCount, colIndexTitle);
-                setFontSizeFamily(totalRowCount, colIndexValue);
+                setFontSizeFamily(totalRowCount, colIndexValue, true);
             }
         }
         // 恢复绘制
@@ -21504,7 +21518,7 @@ const FormulaUtils = {
                 if (retData.allCellValsEw.length < 7) {
                     return '/';
                 }
-                const val1 = retData.allCellValsEw[0][0], val2 = retData.allCellValsEw[1][0], val3 = retData.allCellValsEw[2][0], val4 = retData.allCellValsEw[3][0], val5 = retData.allCellValsEw[4][0], val6 = retData.allCellValsEw[5][0], overVal = retData.allCellValsEw[6][0];
+                const val1 = retData.allCellValsEw[0][0], val2 = retData.allCellValsEw[1][0], val3 = retData.allCellValsEw[2][0], val4 = retData.allCellValsEw[3][0], val5 = retData.allCellValsEw[4][0], val6 = retData.allCellValsEw[5][0], overVal = retData.allCellValsEw[6];
                 if (typeof overVal !== 'number' || isNaN(overVal)) {
                     return '/';
                 }