rapid-spreadjs 1.0.154 → 1.0.156

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 +40 -34
  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 +40 -34
  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.esm.js CHANGED
@@ -822,7 +822,7 @@ const BusinessUtils = {
822
822
  // 标题单元格列数量（纵表为12列，横表待定）
823
823
  const titleCellColumnCount = isVertical ? 12 : 10;
824
824
  // 标题对应的值单元格列数量（纵表：第一个值单元格为26、第二个值单元格为27，纵表待定）
825
- const titleCellValColumnCount = isVertical ? 26 : 15;
825
+ const titleCellValColumnCount = isVertical ? 26 : testObjectAttrs.length == 2 ? 28 : 15;
826
826
  // 一行中检测对象属性的个数（纵表为2个，横表为3个）
827
827
  const rowTestObjectCount = isVertical ? 2 : 3;
828
828
  // 将测试对象属性数据进行分块
@@ -903,7 +903,11 @@ const BusinessUtils = {
903
903
  const colIndexTitle = contentColStartIndex + titleCellColumnCount + titleCellValColumnCount;
904
904
  const colIndexValue = colIndexTitle + titleCellColumnCount;
905
905
  sheet.addSpan(totalRowCount, colIndexTitle, 1, titleCellColumnCount, gc.Spread.Sheets.SheetArea.viewport);
906
- sheet.addSpan(totalRowCount, colIndexValue, 1, titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0), gc.Spread.Sheets.SheetArea.viewport);
906
+ sheet.addSpan(totalRowCount, colIndexValue, 1,
907
+ // titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0),
908
+ testObjectAttrs.length == 2
909
+ ? titleCellValColumnCount + 1
910
+ : titleCellValColumnCount + 1 + (!isVertical && rowAttrArr.length == 2 ? titleCellColumnCount + titleCellValColumnCount + 1 : 0), gc.Spread.Sheets.SheetArea.viewport);
907
911
  sheet.setValue(totalRowCount, colIndexTitle, rowAttrArr[1].title);
908
912
  sheet.setValue(totalRowCount, colIndexValue, rowAttrArr[1].blindDisplayStatus != null && rowAttrArr[1].blindDisplayStatus != undefined && rowAttrArr[1].blindDisplayStatus == true
909
913
  ? '此处隐藏'
@@ -16267,13 +16271,15 @@ const FormulaUtils = {
16267
16271
  for (var i = 0; i < syjglist.length; i++) {
16268
16272
  var k1 = syjglist[i];
16269
16273
  var k2 = jsyq;
16270
- if (k2.indexOf('<') != -1 || k2.indexOf('>') != -1 || k2.indexOf('＜') != -1 || k2.indexOf('＞') != -1) {
16274
+ var k1Str = String(k1);
16275
+ var k2Str = String(k2);
16276
+ if (k2Str.indexOf('<') != -1 || k2Str.indexOf('>') != -1 || k2Str.indexOf('＜') != -1 || k2Str.indexOf('＞') != -1) {
16271
16277
  k2 = k2.replace('＜', '<');
16272
16278
  k2 = k2.replace('＞', '>');
16273
- if (k2.indexOf(',') != -1) {
16279
+ if (k2Str.indexOf(',') != -1) {
16274
16280
  var r1;
16275
16281
  var r2;
16276
- if (k2.indexOf(',') != -1) {
16282
+ if (k2Str.indexOf(',') != -1) {
16277
16283
  r1 = k2.split(',')[0];
16278
16284
  r2 = k2.split(',')[1];
16279
16285
  if (r1.indexOf('>') != -1 || r1.indexOf('<') != -1) {
@@ -16288,13 +16294,13 @@ const FormulaUtils = {
16288
16294
  }
16289
16295
  }
16290
16296
  }
16291
- else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16292
- if (k2.indexOf('>') != -1) {
16297
+ else if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16298
+ if (k2Str.indexOf('>') != -1) {
16293
16299
  var r1 = k2.replace('>', '');
16294
16300
  var t1 = r1.split(':');
16295
16301
  var h1 = parseInt(t1[0], 10);
16296
16302
  var m1 = parseInt(t1[1], 10);
16297
- var t2 = k1.split(':');
16303
+ var t2 = k1Str.split(':');
16298
16304
  var h2 = parseInt(t2[0], 10);
16299
16305
  var m2 = parseInt(t2[1], 10);
16300
16306
  k2 = h1 * 3600 + m1 * 60;
@@ -16311,7 +16317,7 @@ const FormulaUtils = {
16311
16317
  var t1 = r1.split(':');
16312
16318
  var h1 = parseInt(t1[0], 10);
16313
16319
  var m1 = parseInt(t1[1], 10);
16314
- var t2 = k1.split(':');
16320
+ var t2 = k1Str.split(':');
16315
16321
  var h2 = parseInt(t2[0], 10);
16316
16322
  var m2 = parseInt(t2[1], 10);
16317
16323
  k2 = h1 * 3600 + m1 * 60;
@@ -16328,11 +16334,11 @@ const FormulaUtils = {
16328
16334
  kk = eval(k1 + k2) ? '合格' : '不合格';
16329
16335
  }
16330
16336
  }
16331
- else if (k2.indexOf('≥') != -1 || k2.indexOf('不小于') != -1 || k2.indexOf('≮') != -1) {
16332
- if (k2.indexOf(',') != -1) {
16337
+ else if (k2Str.indexOf('≥') != -1 || k2Str.indexOf('不小于') != -1 || k2Str.indexOf('≮') != -1) {
16338
+ if (k2Str.indexOf(',') != -1) {
16333
16339
  var r1;
16334
16340
  var r2;
16335
- if (k2.indexOf(',') != -1) {
16341
+ if (k2Str.indexOf(',') != -1) {
16336
16342
  r1 = k2.split(',')[0];
16337
16343
  r2 = k2.split(',')[1];
16338
16344
  if (r1.indexOf('≥') != -1 || r1.indexOf('≤') != -1) {
@@ -16347,12 +16353,12 @@ const FormulaUtils = {
16347
16353
  }
16348
16354
  }
16349
16355
  }
16350
- else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16356
+ else if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16351
16357
  var r1 = k2.replace('≥', '');
16352
16358
  var t1 = r1.split(':');
16353
16359
  var h1 = parseInt(t1[0], 10);
16354
16360
  var m1 = parseInt(t1[1], 10);
16355
- var t2 = k1.split(':');
16361
+ var t2 = k1Str.split(':');
16356
16362
  var h2 = parseInt(t2[0], 10);
16357
16363
  var m2 = parseInt(t2[1], 10);
16358
16364
  k2 = h1 * 3600 + m1 * 60;
@@ -16366,7 +16372,7 @@ const FormulaUtils = {
16366
16372
  }
16367
16373
  else {
16368
16374
  var num = k2.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16369
- if (IsNumber(k1)) {
16375
+ if (FormulaUtils.commFun.isNumber(k1)) {
16370
16376
  if (k1 > num || k1 == num) {
16371
16377
  kk = '合格';
16372
16378
  }
@@ -16375,7 +16381,7 @@ const FormulaUtils = {
16375
16381
  }
16376
16382
  }
16377
16383
  else {
16378
- if (k1.indexOf('大于') != -1) {
16384
+ if (k1Str.indexOf('大于') != -1) {
16379
16385
  if (k1.replace('大于', '') == k2.replace('≮', '')) {
16380
16386
  kk = '合格';
16381
16387
  }
@@ -16383,11 +16389,11 @@ const FormulaUtils = {
16383
16389
  kk = '不合格';
16384
16390
  }
16385
16391
  }
16386
- else if (k1.indexOf('不足') != -1) {
16392
+ else if (k1Str.indexOf('不足') != -1) {
16387
16393
  kk = '不合格';
16388
16394
  }
16389
- else if (k1.indexOf('+') != -1) {
16390
- if (k1.replace('+', '') >= num) {
16395
+ else if (k1Str.indexOf('+') != -1) {
16396
+ if (k1Str.replace('+', '') >= num) {
16391
16397
  kk = '合格';
16392
16398
  }
16393
16399
  else {
@@ -16397,14 +16403,14 @@ const FormulaUtils = {
16397
16403
  }
16398
16404
  }
16399
16405
  }
16400
- else if (k2.indexOf('≤') != -1 || k2.indexOf('不大于') != -1 || k2.indexOf('≯') != -1) {
16406
+ else if (k2Str.indexOf('≤') != -1 || k2Str.indexOf('不大于') != -1 || k2Str.indexOf('≯') != -1) {
16401
16407
  var num = k2.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16402
- if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16408
+ if (k2Str.indexOf(':') != -1 || k1Str.indexOf(':') != -1) {
16403
16409
  var r1 = k2.replace('≤', '');
16404
16410
  var t1 = r1.split(':');
16405
16411
  var h1 = parseInt(t1[0], 10);
16406
16412
  var m1 = parseInt(t1[1], 10);
16407
- var t2 = k1.split(':');
16413
+ var t2 = k1Str.split(':');
16408
16414
  var h2 = parseInt(t2[0], 10);
16409
16415
  var m2 = parseInt(t2[1], 10);
16410
16416
  k2 = h1 * 3600 + m1 * 60;
@@ -16425,7 +16431,7 @@ const FormulaUtils = {
16425
16431
  }
16426
16432
  }
16427
16433
  }
16428
- else if (k2.indexOf('≠') != -1) {
16434
+ else if (k2Str.indexOf('≠') != -1) {
16429
16435
  var num = k2.replace('≠', '') * 1;
16430
16436
  if (k1 != num) {
16431
16437
  kk = '合格';
@@ -16434,18 +16440,18 @@ const FormulaUtils = {
16434
16440
  kk = '不合格';
16435
16441
  }
16436
16442
  }
16437
- else if (k2.indexOf('~') != -1 || k2.indexOf(',') != -1 || k2.indexOf('～') != -1) {
16443
+ else if (k2Str.indexOf('~') != -1 || k2Str.indexOf(',') != -1 || k2Str.indexOf('～') != -1) {
16438
16444
  var r1;
16439
16445
  var r2;
16440
- if (k2.indexOf('～') != -1) {
16446
+ if (k2Str.indexOf('～') != -1) {
16441
16447
  r1 = k2.split('～')[0];
16442
16448
  r2 = k2.split('～')[1];
16443
16449
  }
16444
- else if (k2.indexOf('~') != -1) {
16450
+ else if (k2Str.indexOf('~') != -1) {
16445
16451
  if (k2.split('~')[0].indexOf('+') != -1) {
16446
16452
  r1 = k2.split('~')[1];
16447
16453
  r2 = k2.split('~')[0];
16448
- if (k1.toString().indexOf('+') != -1) {
16454
+ if (k1Str.toString().indexOf('+') != -1) {
16449
16455
  if (k1 * 1 <= r2) {
16450
16456
  kk = '合格';
16451
16457
  }
@@ -16453,7 +16459,7 @@ const FormulaUtils = {
16453
16459
  kk = '不合格';
16454
16460
  }
16455
16461
  }
16456
- else if (k1.indexOf('-') != -1) {
16462
+ else if (k1Str.indexOf('-') != -1) {
16457
16463
  if (k1 * 1 >= r1) {
16458
16464
  kk = '合格';
16459
16465
  }
@@ -16467,11 +16473,11 @@ const FormulaUtils = {
16467
16473
  r2 = k2.split('~')[1];
16468
16474
  }
16469
16475
  }
16470
- else if (k2.indexOf(',') != -1) {
16471
- if (k2.split(',')[0].indexOf('+') != -1) {
16476
+ else if (k2Str.indexOf(',') != -1) {
16477
+ if (k2Str.split(',')[0].indexOf('+') != -1) {
16472
16478
  r1 = k2.split(',')[1];
16473
16479
  r2 = k2.split(',')[0];
16474
- if (k1.toString().indexOf('+') != -1) {
16480
+ if (k1Str.toString().indexOf('+') != -1) {
16475
16481
  if (k1 * 1 <= r2) {
16476
16482
  kk = '合格';
16477
16483
  }
@@ -16479,7 +16485,7 @@ const FormulaUtils = {
16479
16485
  kk = '不合格';
16480
16486
  }
16481
16487
  }
16482
- else if (k1.toString().indexOf('-') != -1) {
16488
+ else if (k1Str.toString().indexOf('-') != -1) {
16483
16489
  if (k1 * 1 >= r1) {
16484
16490
  kk = '合格';
16485
16491
  }
@@ -16500,7 +16506,7 @@ const FormulaUtils = {
16500
16506
  kk = '不合格';
16501
16507
  }
16502
16508
  }
16503
- else if (k2.indexOf('±') != -1) {
16509
+ else if (k2Str.indexOf('±') != -1) {
16504
16510
  var r1 = k2.split('±')[0];
16505
16511
  var r2 = k2.split('±')[1];
16506
16512
  var min = r1 * 1 - r2 * 1;
@@ -16513,7 +16519,7 @@ const FormulaUtils = {
16513
16519
  }
16514
16520
  }
16515
16521
  else {
16516
- if (IsNumber(k2))
16522
+ if (FormulaUtils.commFun.isNumber(k2))
16517
16523
  k2 = k2 * 1;
16518
16524
  if (k1 >= k2) {
16519
16525
  kk = '合格';