rapid-spreadjs 1.0.33 → 1.0.35

package/dist/index.esm.js

@@ -614,7 +614,7 @@ const BusinessUtils = {
             sheet.setRowHeight(totalRowCount, addRowHeight, gc.Spread.Sheets.SheetArea.viewport);
             // 获取添加这一行的区域范围
             const addRowRange = sheet.getRange(totalRowCount, 1, contentColStartIndex, contentTotalColCount, gc.Spread.Sheets.SheetArea.viewport);
-            // 设置添加这一行区域中的边框样式（最左边和最后边边框样式为粗线、中间的为细边框样式）
+            // 设置添加这一行区域中的边框样式（上下左右边框样式为粗线、中间的为细边框样式）
             addRowRange.setBorder(new gc.Spread.Sheets.LineBorder('#000', gc.Spread.Sheets.LineStyle.thin), { all: true });
             addRowRange.setBorder(new gc.Spread.Sheets.LineBorder('#000', gc.Spread.Sheets.LineStyle.medium), {
                 left: true,
@@ -18531,6 +18531,56 @@ const FormulaUtils = {
                 return tdz;
             },
         },
+        {
+            funName: 'YJSXS',
+            funDesc: '水温查表',
+            funDefaultVal: null,
+            // isContainNullUndefinedVal: true,
+            funParams: [
+                {
+                    name: '温度',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于1个，则返回空字符串
+                if (retData.allCellVals.length < 1) {
+                    return '';
+                }
+                let a = retData.allCellVals[0] + '';
+                var sw; //最后输出的值
+                var arr = new Array('15-0.002', '16-0.003', '17-0.003', '18-0.004', '19-0.004', '20-0.005', '21-0.005', '22-0.006', '23-0.006', '24-0.007', '25-0.008');
+                for (var i = 0; i < arr.length; i++) {
+                    var ret = arr[i].split('-');
+                    if (a == ret[0]) {
+                        sw = ret[1];
+                    }
+                }
+                if (a.length > 2) {
+                    var sw = a;
+                    sw = sw.substring(0, sw.indexOf('.'));
+                    var j = 0;
+                    for (var i = 0; i < arr.length; i++) {
+                        var ret = arr[i].split('-');
+                        if (sw == ret[0]) {
+                            j = i;
+                        }
+                    }
+                    if (j == arr.length - 1) {
+                        var arr1 = arr[j].split('-');
+                        var arr2 = arr[j - 1].split('-');
+                        sw = FormulaUtils.commFun.GetDataOddIncreaseEvenDecrease(FormulaUtils.commFun.InterpolationMethod_y(arr1[0], arr2[0], arr1[1], arr2[1], a), -3);
+                    }
+                    else {
+                        var arr1 = arr[j].split('-');
+                        var arr2 = arr[j + 1].split('-');
+                        sw = FormulaUtils.commFun.GetDataOddIncreaseEvenDecrease(FormulaUtils.commFun.InterpolationMethod_y(arr1[0], arr2[0], arr1[1], arr2[1], a), -3);
+                    }
+                }
+                return sw;
+            },
+        },
     ],
 };
 
@@ -18726,12 +18776,13 @@ const WorkbookUtils = {
      * @param isExcel 是否导出为Excel文件，默认为true（如果为false，则导出为PDF）
      * @param exportName 导出的文件名称，不传则为第一个Sheet的名称
      * @param regFonts 注册的字体集合，默认注册宋体和Arial字体
+     * @param contentColEndIndex 内容列结束的索引，默认为：77（用于导出PDF文件的时候，只导出内容列到索引contentColEndIndex的位置，超过contentColEndIndex索引列后续的内容其实不需要导出）
      * @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) {
         if (!spreads || spreads.length == 0) {
             return;
         }
@@ -18814,6 +18865,7 @@ const WorkbookUtils = {
             const pdfSheet = mainWorkbook.getSheet(mainWorkbook.getSheetCount() - 1);
             let printInfo = pdfSheet.printInfo();
             printInfo.margin({ top: 0, bottom: 0, left: 0, right: 0, header: 0, footer: 0 });
+            printInfo.columnEnd(contentColEndIndex);
             printInfo.showBorder(false);
             printInfo.showGridLine(false);
             printInfo.blackAndWhite(false);