rapid-spreadjs 1.0.152 → 1.0.154

package/dist/index.cjs.js

@@ -574,8 +574,9 @@ const SheetUtils = {
               col: 0
           }]
        * @param isAutoSize 是否自适应单元格大小（默认为：true）
+       * @param isRange 是否为范围选择（默认为：false，如果设置为true，则显示的格式为2026-05-06至2026-05-08【如果选择的范围内只有1天，则显示的格式为2026-05-06】）
        */
-    setSheetCellDate: (GC, sheet, cells, isAutoSize = true) => {
+    setSheetCellDate: (GC, sheet, cells, isAutoSize = true, isRange = false) => {
         cells.forEach((item, index) => {
             // 先获取单元格样式，否则设置控件后样式会丢失
             let cellStyle = sheet.getStyle(item.row, item.col);
@@ -596,11 +597,13 @@ const SheetUtils = {
                     type: GC.Spread.Sheets.DropDownType.dateTimePicker,
                     option: {
                         showTime: false,
-                        showDateRange: false,
+                        showDateRange: isRange,
                     },
                 },
             ];
-            cellStyle.formatter = item.dateFormat;
+            cellStyle.formatter = !isRange
+                ? item.dateFormat
+                : '=IF(ISBLANK(@), "", IF(TEXT(@.start, "yyyy-mm-dd")=TEXT(@.end, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd")&"至"&TEXT(@.end, "yyyy-mm-dd")))';
             // 是否缩小以适应
             cellStyle.shrinkToFit = isAutoSize;
             // 设置单元格样式
@@ -18738,10 +18741,13 @@ const FormulaUtils = {
             funCallback: (spread, sheet, retData) => {
                 //如果传递的参数小于3个，则返回空字符串
                 if (retData.allCellVals.length < 3) {
-                    return '';
+                    return '/';
                 }
                 if (!FormulaUtils.commFun.isNumber(retData.allCellVals[2])) {
-                    return '';
+                    return '/';
+                }
+                if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
+                    return '/';
                 }
                 let csfx = retData.allCellVals[0], jd = retData.allCellVals[1], htz = retData.allCellVals[2];
                 let jd_value = jd; //角度
@@ -19179,10 +19185,13 @@ const FormulaUtils = {
             funCallback: (spread, sheet, retData) => {
                 //如果传递的参数小于2个，则返回空字符串
                 if (retData.allCellVals.length < 2) {
-                    return '';
+                    return '/';
                 }
                 if (!FormulaUtils.commFun.isNumber(retData.allCellVals[1])) {
-                    return '';
+                    return '/';
+                }
+                if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
+                    return '/';
                 }
                 let jzm = retData.allCellVals[0], htz = Number(retData.allCellVals[1]);
                 let jzmxzz; //输出的浇筑面修正值
@@ -20880,6 +20889,14 @@ const FormulaUtils = {
                 if (retData.allCellVals.length < 3) {
                     return '';
                 }
+                if (retData.allCellVals[0] == null ||
+                    (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) ||
+                    retData.allCellVals[1] == null ||
+                    (retData.allCellVals[1]._error != undefined && retData.allCellVals[1]._error != null) ||
+                    retData.allCellVals[2] == null ||
+                    (retData.allCellVals[2]._error != undefined && retData.allCellVals[2]._error != null)) {
+                    return '/';
+                }
                 let jzfs = retData.allCellVals[0], xzhhtz = retData.allCellVals[1], thsd = retData.allCellVals[2];
                 return FormulaUtilsOther.YJHTQD(FormulaUtils.commFun, jzfs, xzhhtz, thsd);
             },