rapid-spreadjs 1.0.78 → 1.0.80

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
@@ -5179,7 +5179,8 @@ const EChartsUtilsAll = {
5179
5179
  sheet.setValue(chartExtJson.jxhslSnShScfc.row, chartExtJson.jxhslSnShScfc.col, '/');
5180
5180
  }
5181
5181
  else {
5182
- sheet.setValue(chartExtJson.jxhslSnShScfc.row, chartExtJson.jxhslSnShScfc.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X+${EChartsUtilsComm.getRound(gsS.jj, 0.0001)}`);
5182
+ const curXVal = EChartsUtilsComm.getRound(gsS.jj, 0.0001);
5183
+ sheet.setValue(chartExtJson.jxhslSnShScfc.row, chartExtJson.jxhslSnShScfc.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X${curXVal >= 0 ? '+' : ''}${curXVal}`);
5183
5184
  }
5184
5185
  }
5185
5186
  }
@@ -8224,7 +8225,8 @@ const EChartsUtilsAll = {
8224
8225
  sheet.setValue(chartExtJson.yhmhlBzHgx.row, chartExtJson.yhmhlBzHgx.col, '/');
8225
8226
  }
8226
8227
  else {
8227
- sheet.setValue(chartExtJson.yhmhlBzHgx.row, chartExtJson.yhmhlBzHgx.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X+${EChartsUtilsComm.getRound(gsS.jj, 0.0001)}`);
8228
+ const curXVal = EChartsUtilsComm.getRound(gsS.jj, 0.0001);
8229
+ sheet.setValue(chartExtJson.yhmhlBzHgx.row, chartExtJson.yhmhlBzHgx.col, `Y=${EChartsUtilsComm.getRound(gsS.xl, 0.0001)}X${curXVal >= 0 ? '+' : ''}${curXVal}`);
8228
8230
  }
8229
8231
  }
8230
8232
  }
@@ -19852,7 +19854,7 @@ const FormulaUtils = {
19852
19854
  return '/';
19853
19855
  }
19854
19856
  // 验证operator参数的有效性
19855
- const validOperators = ['>', '<', '>=', '<=', '=', '±'];
19857
+ const validOperators = ['>', '>', '<', '<', '>=', '≥', '≧', '<=', '≤', '≦', '=', '=', '±'];
19856
19858
  if (!validOperators.includes(operator)) {
19857
19859
  return '/';
19858
19860
  }
@@ -19872,6 +19874,7 @@ const FormulaUtils = {
19872
19874
  }
19873
19875
  switch (operator) {
19874
19876
  case '>':
19877
+ case '>':
19875
19878
  if (isSingleValue1) {
19876
19879
  conditionMet = num1 > num2;
19877
19880
  }
@@ -19880,6 +19883,7 @@ const FormulaUtils = {
19880
19883
  }
19881
19884
  break;
19882
19885
  case '<':
19886
+ case '<':
19883
19887
  if (isSingleValue1) {
19884
19888
  conditionMet = num1 < num2;
19885
19889
  }
@@ -19888,6 +19892,8 @@ const FormulaUtils = {
19888
19892
  }
19889
19893
  break;
19890
19894
  case '>=':
19895
+ case '≥':
19896
+ case '≧':
19891
19897
  if (isSingleValue1) {
19892
19898
  conditionMet = num1 >= num2;
19893
19899
  }
@@ -19896,6 +19902,8 @@ const FormulaUtils = {
19896
19902
  }
19897
19903
  break;
19898
19904
  case '<=':
19905
+ case '≤':
19906
+ case '≦':
19899
19907
  if (isSingleValue1) {
19900
19908
  conditionMet = num1 <= num2;
19901
19909
  }
@@ -19904,6 +19912,7 @@ const FormulaUtils = {
19904
19912
  }
19905
19913
  break;
19906
19914
  case '=':
19915
+ case '=':
19907
19916
  if (isSingleValue1) {
19908
19917
  conditionMet = num1 === num2;
19909
19918
  }