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.cjs.js
CHANGED
|
@@ -4780,7 +4780,7 @@ const EChartsUtilsAll = {
|
|
|
4780
4780
|
{
|
|
4781
4781
|
xAxis: xMin,
|
|
4782
4782
|
yAxis: 0,
|
|
4783
|
-
symbolOffset: [0,
|
|
4783
|
+
symbolOffset: [0, 55],
|
|
4784
4784
|
label: {
|
|
4785
4785
|
show: true,
|
|
4786
4786
|
color: '#000',
|
|
@@ -4794,7 +4794,7 @@ const EChartsUtilsAll = {
|
|
|
4794
4794
|
{
|
|
4795
4795
|
xAxis: xMax,
|
|
4796
4796
|
yAxis: 0,
|
|
4797
|
-
symbolOffset: [0,
|
|
4797
|
+
symbolOffset: [0, 55],
|
|
4798
4798
|
label: {
|
|
4799
4799
|
show: true,
|
|
4800
4800
|
color: '#000',
|
|
@@ -4826,7 +4826,7 @@ const EChartsUtilsAll = {
|
|
|
4826
4826
|
pointData.push({
|
|
4827
4827
|
xAxis: avg,
|
|
4828
4828
|
yAxis: 0,
|
|
4829
|
-
symbolOffset: [0,
|
|
4829
|
+
symbolOffset: [0, 55],
|
|
4830
4830
|
label: {
|
|
4831
4831
|
show: true,
|
|
4832
4832
|
color: '#000',
|
|
@@ -4892,8 +4892,8 @@ const EChartsUtilsAll = {
|
|
|
4892
4892
|
{
|
|
4893
4893
|
show: true,
|
|
4894
4894
|
text: xName,
|
|
4895
|
-
left: '
|
|
4896
|
-
bottom:
|
|
4895
|
+
left: '50px',
|
|
4896
|
+
bottom: '-5px',
|
|
4897
4897
|
textStyle: {
|
|
4898
4898
|
fontSize: 12,
|
|
4899
4899
|
fontWeight: 'normal',
|
|
@@ -16267,6 +16267,10 @@ const FormulaUtils = {
|
|
|
16267
16267
|
let symbol = '/';
|
|
16268
16268
|
//如果传递的参数小于2个，则返回符号
|
|
16269
16269
|
if (retData.allCellVals.length < 2) {
|
|
16270
|
+
if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
|
|
16271
|
+
sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
|
|
16272
|
+
return symbol;
|
|
16273
|
+
}
|
|
16270
16274
|
return symbol;
|
|
16271
16275
|
}
|
|
16272
16276
|
if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
|
|
@@ -16283,11 +16287,21 @@ const FormulaUtils = {
|
|
|
16283
16287
|
}
|
|
16284
16288
|
}
|
|
16285
16289
|
});
|
|
16290
|
+
if (syjglist.length == 0) {
|
|
16291
|
+
if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
|
|
16292
|
+
sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
|
|
16293
|
+
return symbol;
|
|
16294
|
+
}
|
|
16295
|
+
}
|
|
16286
16296
|
// console.log(retData);
|
|
16287
16297
|
// console.log(jsyq);
|
|
16288
16298
|
// console.log(syjglist);
|
|
16289
16299
|
var kk = '合格';
|
|
16290
|
-
if (jsyq == '/' ||
|
|
16300
|
+
if (jsyq == '/' ||
|
|
16301
|
+
jsyq == '' ||
|
|
16302
|
+
syjglist.some((item) => item == '无效') ||
|
|
16303
|
+
syjglist.length === 0 ||
|
|
16304
|
+
(syjglist.length === 1 && (syjglist[0] === '/' || syjglist[0] === ''))) {
|
|
16291
16305
|
return '/';
|
|
16292
16306
|
}
|
|
16293
16307
|
for (var i = 0; i < syjglist.length; i++) {
|