rapid-spreadjs 1.0.154 → 1.0.155

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.
Files changed (9) hide show
  1. package/dist/index.cjs.js +38 -32
  2. package/dist/index.cjs.js.map +1 -1
  3. package/dist/index.cjs.min.js +1 -1
  4. package/dist/index.cjs.min.js.map +1 -1
  5. package/dist/index.esm.js +38 -32
  6. package/dist/index.esm.js.map +1 -1
  7. package/dist/index.esm.min.js +1 -1
  8. package/dist/index.esm.min.js.map +1 -1
  9. package/package.json +1 -1
package/dist/index.cjs.js CHANGED
@@ -844,7 +844,7 @@ const BusinessUtils = {
844
844
  // 标题单元格列数量（纵表为12列，横表待定）
845
845
  const titleCellColumnCount = isVertical ? 12 : 10;
846
846
  // 标题对应的值单元格列数量（纵表：第一个值单元格为26、第二个值单元格为27，纵表待定）
847
- const titleCellValColumnCount = isVertical ? 26 : 15;
847
+ const titleCellValColumnCount = isVertical ? 26 : testObjectAttrs.length == 2 ? 28 : 15;
848
848
  // 一行中检测对象属性的个数（纵表为2个，横表为3个）
849
849
  const rowTestObjectCount = isVertical ? 2 : 3;
850
850
  // 将测试对象属性数据进行分块
@@ -925,7 +925,11 @@ const BusinessUtils = {
925
925
  const colIndexTitle = contentColStartIndex + titleCellColumnCount + titleCellValColumnCount;
926
926
  const colIndexValue = colIndexTitle + titleCellColumnCount;
927
927
  sheet.addSpan(totalRowCount, colIndexTitle, 1, titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
928
- sheet.addSpan(totalRowCount, colIndexValue, 1, titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0), gc.Spread.Sheets.SheetArea.viewport);
928
+ sheet.addSpan(totalRowCount, colIndexValue, 1,
929
+ // titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0),
930
+ testObjectAttrs.length == 2
931
+ ? titleCellValColumnCount + 1
932
+ : titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0), gc.Spread.Sheets.SheetArea.viewport);
929
933
  sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[1].title);
930
934
  sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].blindDisplayStatus != null && rowAttrArr[1].blindDisplayStatus != undefined && rowAttrArr[1].blindDisplayStatus == true
931
935
  ? '此处隐藏'
@@ -16289,13 +16293,15 @@ const FormulaUtils = {
16289
16293
  for (var i = 0; i < syjglist.length; i++) {
16290
16294
  var k1 = syjglist[i];
16291
16295
  var k2 = jsyq;
16292
- if (k2.indexOf('<') != -1 || k2.indexOf('>') != -1 || k2.indexOf('＜') != -1 || k2.indexOf('＞') != -1) {
16296
+ var k1Str = String(k1);
16297
+ var k2Str = String(k2);
16298
+ if (k2Str.indexOf('<') != -1 || k2Str.indexOf('>') != -1 || k2Str.indexOf('＜') != -1 || k2Str.indexOf('＞') != -1) {
16293
16299
  k2 = k2.replace('＜', '<');
16294
16300
  k2 = k2.replace('＞', '>');
16295
- if (k2.indexOf(',') != -1) {
16301
+ if (k2Str.indexOf(',') != -1) {
16296
16302
  var r1;
16297
16303
  var r2;
16298
- if (k2.indexOf(',') != -1) {
16304
+ if (k2Str.indexOf(',') != -1) {
16299
16305
  r1 = k2.split(',')[0];
16300
16306
  r2 = k2.split(',')[1];
16301
16307
  if (r1.indexOf('>') != -1 || r1.indexOf('<') != -1) {
@@ -16310,13 +16316,13 @@ const FormulaUtils = {
16310
16316
  }
16311
16317
  }
16312
16318
  }
16313
- else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16314
- if (k2.indexOf('>') != -1) {
16319
+ else if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16320
+ if (k2Str.indexOf('>') != -1) {
16315
16321
  var r1 = k2.replace('>', '');
16316
16322
  var t1 = r1.split(':');
16317
16323
  var h1 = parseInt(t1[0], 10);
16318
16324
  var m1 = parseInt(t1[1], 10);
16319
- var t2 = k1.split(':');
16325
+ var t2 = k1Str.split(':');
16320
16326
  var h2 = parseInt(t2[0], 10);
16321
16327
  var m2 = parseInt(t2[1], 10);
16322
16328
  k2 = h1 * 3600 + m1 * 60;
@@ -16333,7 +16339,7 @@ const FormulaUtils = {
16333
16339
  var t1 = r1.split(':');
16334
16340
  var h1 = parseInt(t1[0], 10);
16335
16341
  var m1 = parseInt(t1[1], 10);
16336
- var t2 = k1.split(':');
16342
+ var t2 = k1Str.split(':');
16337
16343
  var h2 = parseInt(t2[0], 10);
16338
16344
  var m2 = parseInt(t2[1], 10);
16339
16345
  k2 = h1 * 3600 + m1 * 60;
@@ -16350,11 +16356,11 @@ const FormulaUtils = {
16350
16356
  kk = eval(k1 + k2) ? '合格' : '不合格';
16351
16357
  }
16352
16358
  }
16353
- else if (k2.indexOf('≥') != -1 || k2.indexOf('不小于') != -1 || k2.indexOf('≮') != -1) {
16354
- if (k2.indexOf(',') != -1) {
16359
+ else if (k2Str.indexOf('≥') != -1 || k2Str.indexOf('不小于') != -1 || k2Str.indexOf('≮') != -1) {
16360
+ if (k2Str.indexOf(',') != -1) {
16355
16361
  var r1;
16356
16362
  var r2;
16357
- if (k2.indexOf(',') != -1) {
16363
+ if (k2Str.indexOf(',') != -1) {
16358
16364
  r1 = k2.split(',')[0];
16359
16365
  r2 = k2.split(',')[1];
16360
16366
  if (r1.indexOf('≥') != -1 || r1.indexOf('≤') != -1) {
@@ -16369,12 +16375,12 @@ const FormulaUtils = {
16369
16375
  }
16370
16376
  }
16371
16377
  }
16372
- else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16378
+ else if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16373
16379
  var r1 = k2.replace('≥', '');
16374
16380
  var t1 = r1.split(':');
16375
16381
  var h1 = parseInt(t1[0], 10);
16376
16382
  var m1 = parseInt(t1[1], 10);
16377
- var t2 = k1.split(':');
16383
+ var t2 = k1Str.split(':');
16378
16384
  var h2 = parseInt(t2[0], 10);
16379
16385
  var m2 = parseInt(t2[1], 10);
16380
16386
  k2 = h1 * 3600 + m1 * 60;
@@ -16397,7 +16403,7 @@ const FormulaUtils = {
16397
16403
  }
16398
16404
  }
16399
16405
  else {
16400
- if (k1.indexOf('大于') != -1) {
16406
+ if (k1Str.indexOf('大于') != -1) {
16401
16407
  if (k1.replace('大于', '') == k2.replace('≮', '')) {
16402
16408
  kk = '合格';
16403
16409
  }
@@ -16405,11 +16411,11 @@ const FormulaUtils = {
16405
16411
  kk = '不合格';
16406
16412
  }
16407
16413
  }
16408
- else if (k1.indexOf('不足') != -1) {
16414
+ else if (k1Str.indexOf('不足') != -1) {
16409
16415
  kk = '不合格';
16410
16416
  }
16411
- else if (k1.indexOf('+') != -1) {
16412
- if (k1.replace('+', '') >= num) {
16417
+ else if (k1Str.indexOf('+') != -1) {
16418
+ if (k1Str.replace('+', '') >= num) {
16413
16419
  kk = '合格';
16414
16420
  }
16415
16421
  else {
@@ -16419,14 +16425,14 @@ const FormulaUtils = {
16419
16425
  }
16420
16426
  }
16421
16427
  }
16422
- else if (k2.indexOf('≤') != -1 || k2.indexOf('不大于') != -1 || k2.indexOf('≯') != -1) {
16428
+ else if (k2Str.indexOf('≤') != -1 || k2Str.indexOf('不大于') != -1 || k2Str.indexOf('≯') != -1) {
16423
16429
  var num = k2.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16424
- if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16430
+ if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16425
16431
  var r1 = k2.replace('≤', '');
16426
16432
  var t1 = r1.split(':');
16427
16433
  var h1 = parseInt(t1[0], 10);
16428
16434
  var m1 = parseInt(t1[1], 10);
16429
- var t2 = k1.split(':');
16435
+ var t2 = k1Str.split(':');
16430
16436
  var h2 = parseInt(t2[0], 10);
16431
16437
  var m2 = parseInt(t2[1], 10);
16432
16438
  k2 = h1 * 3600 + m1 * 60;
@@ -16447,7 +16453,7 @@ const FormulaUtils = {
16447
16453
  }
16448
16454
  }
16449
16455
  }
16450
- else if (k2.indexOf('≠') != -1) {
16456
+ else if (k2Str.indexOf('≠') != -1) {
16451
16457
  var num = k2.replace('≠', '') * 1;
16452
16458
  if (k1 != num) {
16453
16459
  kk = '合格';
@@ -16456,18 +16462,18 @@ const FormulaUtils = {
16456
16462
  kk = '不合格';
16457
16463
  }
16458
16464
  }
16459
- else if (k2.indexOf('~') != -1 || k2.indexOf(',') != -1 || k2.indexOf('～') != -1) {
16465
+ else if (k2Str.indexOf('~') != -1 || k2Str.indexOf(',') != -1 || k2Str.indexOf('～') != -1) {
16460
16466
  var r1;
16461
16467
  var r2;
16462
- if (k2.indexOf('～') != -1) {
16468
+ if (k2Str.indexOf('～') != -1) {
16463
16469
  r1 = k2.split('～')[0];
16464
16470
  r2 = k2.split('～')[1];
16465
16471
  }
16466
- else if (k2.indexOf('~') != -1) {
16472
+ else if (k2Str.indexOf('~') != -1) {
16467
16473
  if (k2.split('~')[0].indexOf('+') != -1) {
16468
16474
  r1 = k2.split('~')[1];
16469
16475
  r2 = k2.split('~')[0];
16470
- if (k1.toString().indexOf('+') != -1) {
16476
+ if (k1Str.toString().indexOf('+') != -1) {
16471
16477
  if (k1 * 1 <= r2) {
16472
16478
  kk = '合格';
16473
16479
  }
@@ -16475,7 +16481,7 @@ const FormulaUtils = {
16475
16481
  kk = '不合格';
16476
16482
  }
16477
16483
  }
16478
- else if (k1.indexOf('-') != -1) {
16484
+ else if (k1Str.indexOf('-') != -1) {
16479
16485
  if (k1 * 1 >= r1) {
16480
16486
  kk = '合格';
16481
16487
  }
@@ -16489,11 +16495,11 @@ const FormulaUtils = {
16489
16495
  r2 = k2.split('~')[1];
16490
16496
  }
16491
16497
  }
16492
- else if (k2.indexOf(',') != -1) {
16493
- if (k2.split(',')[0].indexOf('+') != -1) {
16498
+ else if (k2Str.indexOf(',') != -1) {
16499
+ if (k2Str.split(',')[0].indexOf('+') != -1) {
16494
16500
  r1 = k2.split(',')[1];
16495
16501
  r2 = k2.split(',')[0];
16496
- if (k1.toString().indexOf('+') != -1) {
16502
+ if (k1Str.toString().indexOf('+') != -1) {
16497
16503
  if (k1 * 1 <= r2) {
16498
16504
  kk = '合格';
16499
16505
  }
@@ -16501,7 +16507,7 @@ const FormulaUtils = {
16501
16507
  kk = '不合格';
16502
16508
  }
16503
16509
  }
16504
- else if (k1.toString().indexOf('-') != -1) {
16510
+ else if (k1Str.toString().indexOf('-') != -1) {
16505
16511
  if (k1 * 1 >= r1) {
16506
16512
  kk = '合格';
16507
16513
  }
@@ -16522,7 +16528,7 @@ const FormulaUtils = {
16522
16528
  kk = '不合格';
16523
16529
  }
16524
16530
  }
16525
- else if (k2.indexOf('±') != -1) {
16531
+ else if (k2Str.indexOf('±') != -1) {
16526
16532
  var r1 = k2.split('±')[0];
16527
16533
  var r2 = k2.split('±')[1];
16528
16534
  var min = r1 * 1 - r2 * 1;