rapid-spreadjs 1.0.153 → 1.0.154

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs.js CHANGED
@@ -18741,10 +18741,13 @@ const FormulaUtils = {
18741
18741
  funCallback: (spread, sheet, retData) => {
18742
18742
  //如果传递的参数小于3个,则返回空字符串
18743
18743
  if (retData.allCellVals.length < 3) {
18744
- return '';
18744
+ return '/';
18745
18745
  }
18746
18746
  if (!FormulaUtils.commFun.isNumber(retData.allCellVals[2])) {
18747
- return '';
18747
+ return '/';
18748
+ }
18749
+ if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
18750
+ return '/';
18748
18751
  }
18749
18752
  let csfx = retData.allCellVals[0], jd = retData.allCellVals[1], htz = retData.allCellVals[2];
18750
18753
  let jd_value = jd; //角度
@@ -19182,10 +19185,13 @@ const FormulaUtils = {
19182
19185
  funCallback: (spread, sheet, retData) => {
19183
19186
  //如果传递的参数小于2个,则返回空字符串
19184
19187
  if (retData.allCellVals.length < 2) {
19185
- return '';
19188
+ return '/';
19186
19189
  }
19187
19190
  if (!FormulaUtils.commFun.isNumber(retData.allCellVals[1])) {
19188
- return '';
19191
+ return '/';
19192
+ }
19193
+ if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
19194
+ return '/';
19189
19195
  }
19190
19196
  let jzm = retData.allCellVals[0], htz = Number(retData.allCellVals[1]);
19191
19197
  let jzmxzz; //输出的浇筑面修正值
@@ -20883,6 +20889,14 @@ const FormulaUtils = {
20883
20889
  if (retData.allCellVals.length < 3) {
20884
20890
  return '';
20885
20891
  }
20892
+ if (retData.allCellVals[0] == null ||
20893
+ (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) ||
20894
+ retData.allCellVals[1] == null ||
20895
+ (retData.allCellVals[1]._error != undefined && retData.allCellVals[1]._error != null) ||
20896
+ retData.allCellVals[2] == null ||
20897
+ (retData.allCellVals[2]._error != undefined && retData.allCellVals[2]._error != null)) {
20898
+ return '/';
20899
+ }
20886
20900
  let jzfs = retData.allCellVals[0], xzhhtz = retData.allCellVals[1], thsd = retData.allCellVals[2];
20887
20901
  return FormulaUtilsOther.YJHTQD(FormulaUtils.commFun, jzfs, xzhhtz, thsd);
20888
20902
  },