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.esm.js CHANGED
@@ -18719,10 +18719,13 @@ const FormulaUtils = {
18719
18719
  funCallback: (spread, sheet, retData) => {
18720
18720
  //如果传递的参数小于3个,则返回空字符串
18721
18721
  if (retData.allCellVals.length < 3) {
18722
- return '';
18722
+ return '/';
18723
18723
  }
18724
18724
  if (!FormulaUtils.commFun.isNumber(retData.allCellVals[2])) {
18725
- return '';
18725
+ return '/';
18726
+ }
18727
+ if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
18728
+ return '/';
18726
18729
  }
18727
18730
  let csfx = retData.allCellVals[0], jd = retData.allCellVals[1], htz = retData.allCellVals[2];
18728
18731
  let jd_value = jd; //角度
@@ -19160,10 +19163,13 @@ const FormulaUtils = {
19160
19163
  funCallback: (spread, sheet, retData) => {
19161
19164
  //如果传递的参数小于2个,则返回空字符串
19162
19165
  if (retData.allCellVals.length < 2) {
19163
- return '';
19166
+ return '/';
19164
19167
  }
19165
19168
  if (!FormulaUtils.commFun.isNumber(retData.allCellVals[1])) {
19166
- return '';
19169
+ return '/';
19170
+ }
19171
+ if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
19172
+ return '/';
19167
19173
  }
19168
19174
  let jzm = retData.allCellVals[0], htz = Number(retData.allCellVals[1]);
19169
19175
  let jzmxzz; //输出的浇筑面修正值
@@ -20861,6 +20867,14 @@ const FormulaUtils = {
20861
20867
  if (retData.allCellVals.length < 3) {
20862
20868
  return '';
20863
20869
  }
20870
+ if (retData.allCellVals[0] == null ||
20871
+ (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) ||
20872
+ retData.allCellVals[1] == null ||
20873
+ (retData.allCellVals[1]._error != undefined && retData.allCellVals[1]._error != null) ||
20874
+ retData.allCellVals[2] == null ||
20875
+ (retData.allCellVals[2]._error != undefined && retData.allCellVals[2]._error != null)) {
20876
+ return '/';
20877
+ }
20864
20878
  let jzfs = retData.allCellVals[0], xzhhtz = retData.allCellVals[1], thsd = retData.allCellVals[2];
20865
20879
  return FormulaUtilsOther.YJHTQD(FormulaUtils.commFun, jzfs, xzhhtz, thsd);
20866
20880
  },