rapid-spreadjs 1.0.40 → 1.0.41

package/dist/index.esm.js

@@ -657,6 +657,15 @@ const BusinessUtils = {
         sheet.suspendPaint();
         // 设置工作表行数为0
         sheet.setRowCount(0);
+        /**
+         * 设置单元格字体和大小
+         * @param row
+         * @param col
+         */
+        const setFontSizeFamily = (row, col) => {
+            sheet.getCell(row, col).fontFamily('宋体');
+            sheet.getCell(row, col).fontSize('9pt');
+        };
         for (let i = 0; i < testObjectAttrsChunk.length; i++) {
             const rowAttrArr = testObjectAttrsChunk[i];
             // 获取总行数
@@ -683,6 +692,8 @@ const BusinessUtils = {
             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);
+            setFontSizeFamily(totalRowCount, contentColStartIndex);
+            setFontSizeFamily(totalRowCount, contentColStartIndex + titleCellColumnCount);
             // 合并第二个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 1) {
                 const colIndexTitle = contentColStartIndex + titleCellColumnCount + titleCellValColumnCount;
@@ -691,6 +702,8 @@ const BusinessUtils = {
                 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);
+                setFontSizeFamily(totalRowCount, colIndexTitle);
+                setFontSizeFamily(totalRowCount, colIndexValue);
             }
             // 合并第三个属性的标题列和值列，同时设置对应单元格的内容
             if (rowAttrArr.length > 2) {
@@ -700,6 +713,8 @@ const BusinessUtils = {
                 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);
+                setFontSizeFamily(totalRowCount, colIndexTitle);
+                setFontSizeFamily(totalRowCount, colIndexValue);
             }
         }
         // 恢复绘制
@@ -18673,6 +18688,105 @@ const FormulaUtils = {
                 return czl;
             },
         },
+        {
+            funName: 'YJLHL',
+            funDesc: '沥青蜡含量',
+            funDefaultVal: null,
+            // isContainNullUndefinedVal: true,
+            funParams: [
+                {
+                    name: '析出蜡质量1',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '析出蜡质量2',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '析出蜡质量3',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '蜡含量1',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '蜡含量2',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '蜡含量3',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于6个，则返回空字符串
+                if (retData.allCellVals.length < 6) {
+                    return '';
+                }
+                var xArr = [retData.allCellVals[0], retData.allCellVals[1], retData.allCellVals[2]]; //析出蜡质量数组
+                var rArr = [retData.allCellVals[3], retData.allCellVals[4], retData.allCellVals[5]]; //蜡含量数组
+                var jg;
+                var MIN = 0.065;
+                var MAX = 0.085;
+                var ok = xArr.map((v) => +v >= MIN && +v <= MAX); //判定是否符合条件
+                var idx = ok.map((v, i) => (v ? i : -1)).filter((i) => i >= 0); //符合条件个数
+                if (idx.length === 0) {
+                    // msg = '三个值均不满足条件，请重新进行试验！';
+                    return '重新试验';
+                }
+                var vals = idx.map((i) => +rArr[i]); //符合条件的蜡质量对应的蜡含量
+                var avg = vals.reduce((a, b) => a + b) / vals.length; //计算蜡含量平均值
+                jg = FormulaUtils.commFun.GetDataOddIncreaseEvenDecrease(avg, -1);
+                return jg;
+            },
+        },
+        {
+            funName: 'YJNFX',
+            funDesc: '沥青黏附性',
+            funDefaultVal: null,
+            // isContainNullUndefinedVal: true,
+            funParams: [
+                {
+                    name: '沥青膜剥落情况',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于1个，则返回空字符串
+                if (retData.allCellVals.length < 1) {
+                    return '';
+                }
+                let lqmblqk = retData.allCellVals[0];
+                var pddj; //最后输出的值
+                if (lqmblqk == '沥青膜裹覆率接近100%') {
+                    pddj = '5';
+                }
+                else if (lqmblqk == '沥青膜少部剥落，厚度不均，沥青膜裹覆率不小于90%') {
+                    pddj = '4';
+                }
+                else if (lqmblqk == '沥青膜局部明显剥落，沥青膜裹覆率为75%~90%') {
+                    pddj = '3';
+                }
+                else if (lqmblqk == '沥青膜大部分剥落，沥青膜裹覆率为25%~75%') {
+                    pddj = '2';
+                }
+                else if (lqmblqk == '沥青膜几乎完全剥落，沥青膜裹覆率小于25%') {
+                    pddj = '1';
+                }
+                else {
+                    pddj = '/';
+                }
+                return pddj;
+            },
+        },
     ],
 };
 
@@ -18757,8 +18871,8 @@ const WorkbookUtils = {
             // 设置打印区域，这里是固定的，在业务应用中需要根据实际情况修改打印区域
             printInfo.rowStart(0);
             printInfo.rowEnd(sheet.getRowCount()); //printInfo.rowEnd(41);
-            printInfo.columnStart(0);
-            printInfo.columnEnd(76);
+            printInfo.columnStart(1);
+            printInfo.columnEnd(77);
             // 设置SpreadJS自身的边距为合适的距离
             printInfo.margin({
                 /**
@@ -18869,12 +18983,13 @@ const WorkbookUtils = {
      * @param exportName 导出的文件名称，不传则为第一个Sheet的名称
      * @param regFonts 注册的字体集合，默认注册宋体和Arial字体
      * @param contentColEndIndex 内容列结束的索引，默认为：77（用于导出PDF文件的时候，只导出内容列到索引contentColEndIndex的位置，超过contentColEndIndex索引列后续的内容其实不需要导出）
+     * @param isHb 是否是横表，默认为false（横表的时候，设置导出PDF的缩放比例为1，否则为1.06）
      * @returns 合并后的工作簿实例
      */
     mergeWorkbooksToExcelOrPdf: (GC_1, spreads_1, ...args_1) => __awaiter(void 0, [GC_1, spreads_1, ...args_1], void 0, function* (GC, spreads, isExcel = true, exportName, regFonts = [
         { name: '宋体', type: 'normal', url: '/spreadJsFonts/simsun.ttf' },
         { name: 'Arial', type: 'normal', url: '/spreadJsFonts/arial.ttf' },
-    ], contentColEndIndex = 77) {
+    ], contentColEndIndex = 77, isHb = false) {
         if (!spreads || spreads.length == 0) {
             return;
         }
@@ -18963,7 +19078,7 @@ const WorkbookUtils = {
             printInfo.blackAndWhite(false);
             printInfo.showRowHeader(GC.Spread.Sheets.Print.PrintVisibilityType.hide);
             printInfo.showColumnHeader(GC.Spread.Sheets.Print.PrintVisibilityType.hide);
-            printInfo.zoomFactor(1.06); //1.06
+            printInfo.zoomFactor(isHb ? 1 : 1.06);
         }
         // 恢复绘制
         mainWorkbook.resumePaint();