rapid-spreadjs 1.0.156 → 1.0.158
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 +20 -6
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.cjs.min.js +1 -1
- package/dist/index.cjs.min.js.map +1 -1
- package/dist/index.esm.js +20 -6
- package/dist/index.esm.js.map +1 -1
- package/dist/index.esm.min.js +1 -1
- package/dist/index.esm.min.js.map +1 -1
- package/dist/utils/echarts-all.d.ts +1 -1
- package/package.json +1 -1
package/dist/index.esm.js
CHANGED
|
@@ -4758,7 +4758,7 @@ const EChartsUtilsAll = {
|
|
|
4758
4758
|
{
|
|
4759
4759
|
xAxis: xMin,
|
|
4760
4760
|
yAxis: 0,
|
|
4761
|
-
symbolOffset: [0,
|
|
4761
|
+
symbolOffset: [0, 55],
|
|
4762
4762
|
label: {
|
|
4763
4763
|
show: true,
|
|
4764
4764
|
color: '#000',
|
|
@@ -4772,7 +4772,7 @@ const EChartsUtilsAll = {
|
|
|
4772
4772
|
{
|
|
4773
4773
|
xAxis: xMax,
|
|
4774
4774
|
yAxis: 0,
|
|
4775
|
-
symbolOffset: [0,
|
|
4775
|
+
symbolOffset: [0, 55],
|
|
4776
4776
|
label: {
|
|
4777
4777
|
show: true,
|
|
4778
4778
|
color: '#000',
|
|
@@ -4804,7 +4804,7 @@ const EChartsUtilsAll = {
|
|
|
4804
4804
|
pointData.push({
|
|
4805
4805
|
xAxis: avg,
|
|
4806
4806
|
yAxis: 0,
|
|
4807
|
-
symbolOffset: [0,
|
|
4807
|
+
symbolOffset: [0, 55],
|
|
4808
4808
|
label: {
|
|
4809
4809
|
show: true,
|
|
4810
4810
|
color: '#000',
|
|
@@ -4870,8 +4870,8 @@ const EChartsUtilsAll = {
|
|
|
4870
4870
|
{
|
|
4871
4871
|
show: true,
|
|
4872
4872
|
text: xName,
|
|
4873
|
-
left: '
|
|
4874
|
-
bottom:
|
|
4873
|
+
left: '50px',
|
|
4874
|
+
bottom: '-5px',
|
|
4875
4875
|
textStyle: {
|
|
4876
4876
|
fontSize: 12,
|
|
4877
4877
|
fontWeight: 'normal',
|
|
@@ -16245,6 +16245,10 @@ const FormulaUtils = {
|
|
|
16245
16245
|
let symbol = '/';
|
|
16246
16246
|
//如果传递的参数小于2个，则返回符号
|
|
16247
16247
|
if (retData.allCellVals.length < 2) {
|
|
16248
|
+
if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
|
|
16249
|
+
sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
|
|
16250
|
+
return symbol;
|
|
16251
|
+
}
|
|
16248
16252
|
return symbol;
|
|
16249
16253
|
}
|
|
16250
16254
|
if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
|
|
@@ -16261,11 +16265,21 @@ const FormulaUtils = {
|
|
|
16261
16265
|
}
|
|
16262
16266
|
}
|
|
16263
16267
|
});
|
|
16268
|
+
if (syjglist.length == 0) {
|
|
16269
|
+
if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
|
|
16270
|
+
sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
|
|
16271
|
+
return symbol;
|
|
16272
|
+
}
|
|
16273
|
+
}
|
|
16264
16274
|
// console.log(retData);
|
|
16265
16275
|
// console.log(jsyq);
|
|
16266
16276
|
// console.log(syjglist);
|
|
16267
16277
|
var kk = '合格';
|
|
16268
|
-
if (jsyq == '/' ||
|
|
16278
|
+
if (jsyq == '/' ||
|
|
16279
|
+
jsyq == '' ||
|
|
16280
|
+
syjglist.some((item) => item == '无效') ||
|
|
16281
|
+
syjglist.length === 0 ||
|
|
16282
|
+
(syjglist.length === 1 && (syjglist[0] === '/' || syjglist[0] === ''))) {
|
|
16269
16283
|
return '/';
|
|
16270
16284
|
}
|
|
16271
16285
|
for (var i = 0; i < syjglist.length; i++) {
|