rapid-spreadjs 1.0.151 → 1.0.152

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 +135 -62
  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 +135 -62
  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
@@ -16279,24 +16279,25 @@ const FormulaUtils = {
16279
16279
  // console.log(retData);
16280
16280
  // console.log(jsyq);
16281
16281
  // console.log(syjglist);
16282
- let kk = '合格';
16283
- if (jsyq == symbol || jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效') || syjglist.length == 0) {
16284
- return symbol;
16282
+ var kk = '合格';
16283
+ if (jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效')) {
16284
+ return '/';
16285
16285
  }
16286
- for (let i = 0; i < syjglist.length; i++) {
16287
- let k1 = syjglist[i];
16288
- if (jsyq.indexOf('<') != -1 || jsyq.indexOf('>') != -1 || jsyq.indexOf('＜') != -1 || jsyq.indexOf('＞') != -1) {
16289
- jsyq = jsyq.replace('＜', '<');
16290
- jsyq = jsyq.replace('＞', '>');
16291
- if (jsyq.indexOf(',') != -1) {
16292
- let r1;
16293
- let r2;
16294
- if (jsyq.indexOf(',') != -1) {
16295
- r1 = jsyq.split(',')[0];
16296
- r2 = jsyq.split(',')[1];
16286
+ for (var i = 0; i < syjglist.length; i++) {
16287
+ var k1 = syjglist[i];
16288
+ var k2 = jsyq;
16289
+ if (k2.indexOf('<') != -1 || k2.indexOf('>') != -1 || k2.indexOf('＜') != -1 || k2.indexOf('＞') != -1) {
16290
+ k2 = k2.replace('＜', '<');
16291
+ k2 = k2.replace('＞', '>');
16292
+ if (k2.indexOf(',') != -1) {
16293
+ var r1;
16294
+ var r2;
16295
+ if (k2.indexOf(',') != -1) {
16296
+ r1 = k2.split(',')[0];
16297
+ r2 = k2.split(',')[1];
16297
16298
  if (r1.indexOf('>') != -1 || r1.indexOf('<') != -1) {
16298
- r1 = jsyq.split(',')[0].replace('>', '');
16299
- r2 = jsyq.split(',')[1].replace('<', '');
16299
+ r1 = k2.split(',')[0].replace('>', '');
16300
+ r2 = k2.split(',')[1].replace('<', '');
16300
16301
  }
16301
16302
  if (k1 * 1 > r1 * 1 && k1 < r2 * 1) {
16302
16303
  kk = '合格';
@@ -16306,20 +16307,56 @@ const FormulaUtils = {
16306
16307
  }
16307
16308
  }
16308
16309
  }
16310
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16311
+ if (k2.indexOf('>') != -1) {
16312
+ var r1 = k2.replace('>', '');
16313
+ var t1 = r1.split(':');
16314
+ var h1 = parseInt(t1[0], 10);
16315
+ var m1 = parseInt(t1[1], 10);
16316
+ var t2 = k1.split(':');
16317
+ var h2 = parseInt(t2[0], 10);
16318
+ var m2 = parseInt(t2[1], 10);
16319
+ k2 = h1 * 3600 + m1 * 60;
16320
+ k1 = h2 * 3600 + m2 * 60;
16321
+ if (k1 * 1 > k2 * 1) {
16322
+ kk = '合格';
16323
+ }
16324
+ else {
16325
+ kk = '不合格';
16326
+ }
16327
+ }
16328
+ else {
16329
+ var r1 = k2.replace('<', '');
16330
+ var t1 = r1.split(':');
16331
+ var h1 = parseInt(t1[0], 10);
16332
+ var m1 = parseInt(t1[1], 10);
16333
+ var t2 = k1.split(':');
16334
+ var h2 = parseInt(t2[0], 10);
16335
+ var m2 = parseInt(t2[1], 10);
16336
+ k2 = h1 * 3600 + m1 * 60;
16337
+ k1 = h2 * 3600 + m2 * 60;
16338
+ if (k1 * 1 < k2 * 1) {
16339
+ kk = '合格';
16340
+ }
16341
+ else {
16342
+ kk = '不合格';
16343
+ }
16344
+ }
16345
+ }
16309
16346
  else {
16310
- kk = eval(k1 + jsyq) ? '合格' : '不合格';
16347
+ kk = eval(k1 + k2) ? '合格' : '不合格';
16311
16348
  }
16312
16349
  }
16313
- else if (jsyq.indexOf('≥') != -1 || jsyq.indexOf('不小于') != -1 || jsyq.indexOf('≮') != -1) {
16314
- if (jsyq.indexOf(',') != -1) {
16315
- let r1;
16316
- let r2;
16317
- if (jsyq.indexOf(',') != -1) {
16318
- r1 = jsyq.split(',')[0];
16319
- r2 = jsyq.split(',')[1];
16350
+ else if (k2.indexOf('≥') != -1 || k2.indexOf('不小于') != -1 || k2.indexOf('≮') != -1) {
16351
+ if (k2.indexOf(',') != -1) {
16352
+ var r1;
16353
+ var r2;
16354
+ if (k2.indexOf(',') != -1) {
16355
+ r1 = k2.split(',')[0];
16356
+ r2 = k2.split(',')[1];
16320
16357
  if (r1.indexOf('≥') != -1 || r1.indexOf('≤') != -1) {
16321
- r1 = jsyq.split(',')[0].replace('≥', '');
16322
- r2 = jsyq.split(',')[1].replace('≤', '');
16358
+ r1 = k2.split(',')[0].replace('≥', '');
16359
+ r2 = k2.split(',')[1].replace('≤', '');
16323
16360
  }
16324
16361
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
16325
16362
  kk = '合格';
@@ -16329,9 +16366,26 @@ const FormulaUtils = {
16329
16366
  }
16330
16367
  }
16331
16368
  }
16369
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16370
+ var r1 = k2.replace('≥', '');
16371
+ var t1 = r1.split(':');
16372
+ var h1 = parseInt(t1[0], 10);
16373
+ var m1 = parseInt(t1[1], 10);
16374
+ var t2 = k1.split(':');
16375
+ var h2 = parseInt(t2[0], 10);
16376
+ var m2 = parseInt(t2[1], 10);
16377
+ k2 = h1 * 3600 + m1 * 60;
16378
+ k1 = h2 * 3600 + m2 * 60;
16379
+ if (k1 * 1 >= k2 * 1) {
16380
+ kk = '合格';
16381
+ }
16382
+ else {
16383
+ kk = '不合格';
16384
+ }
16385
+ }
16332
16386
  else {
16333
- let num = jsyq.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16334
- if (FormulaUtils.commFun.isNumber(k1)) {
16387
+ var num = k2.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16388
+ if (IsNumber(k1)) {
16335
16389
  if (k1 > num || k1 == num) {
16336
16390
  kk = '合格';
16337
16391
  }
@@ -16341,7 +16395,7 @@ const FormulaUtils = {
16341
16395
  }
16342
16396
  else {
16343
16397
  if (k1.indexOf('大于') != -1) {
16344
- if (k1.replace('大于', '') == jsyq.replace('≮', '')) {
16398
+ if (k1.replace('大于', '') == k2.replace('≮', '')) {
16345
16399
  kk = '合格';
16346
16400
  }
16347
16401
  else {
@@ -16362,17 +16416,36 @@ const FormulaUtils = {
16362
16416
  }
16363
16417
  }
16364
16418
  }
16365
- else if (jsyq.indexOf('≤') != -1 || jsyq.indexOf('不大于') != -1 || jsyq.indexOf('≯') != -1) {
16366
- let num = jsyq.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16367
- if (k1 < num || k1 == num) {
16368
- kk = '合格';
16419
+ else if (k2.indexOf('≤') != -1 || k2.indexOf('不大于') != -1 || k2.indexOf('≯') != -1) {
16420
+ var num = k2.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16421
+ if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16422
+ var r1 = k2.replace('≤', '');
16423
+ var t1 = r1.split(':');
16424
+ var h1 = parseInt(t1[0], 10);
16425
+ var m1 = parseInt(t1[1], 10);
16426
+ var t2 = k1.split(':');
16427
+ var h2 = parseInt(t2[0], 10);
16428
+ var m2 = parseInt(t2[1], 10);
16429
+ k2 = h1 * 3600 + m1 * 60;
16430
+ k1 = h2 * 3600 + m2 * 60;
16431
+ if (k1 * 1 <= k2 * 1) {
16432
+ kk = '合格';
16433
+ }
16434
+ else {
16435
+ kk = '不合格';
16436
+ }
16369
16437
  }
16370
16438
  else {
16371
- kk = '不合格';
16439
+ if (k1 < num || k1 == num) {
16440
+ kk = '合格';
16441
+ }
16442
+ else {
16443
+ kk = '不合格';
16444
+ }
16372
16445
  }
16373
16446
  }
16374
- else if (jsyq.indexOf('≠') != -1) {
16375
- let num = jsyq.replace('≠', '') * 1;
16447
+ else if (k2.indexOf('≠') != -1) {
16448
+ var num = k2.replace('≠', '') * 1;
16376
16449
  if (k1 != num) {
16377
16450
  kk = '合格';
16378
16451
  }
@@ -16380,17 +16453,17 @@ const FormulaUtils = {
16380
16453
  kk = '不合格';
16381
16454
  }
16382
16455
  }
16383
- else if (jsyq.indexOf('~') != -1 || jsyq.indexOf(',') != -1 || jsyq.indexOf('～') != -1) {
16384
- let r1;
16385
- let r2;
16386
- if (jsyq.indexOf('～') != -1) {
16387
- r1 = jsyq.split('～')[0];
16388
- r2 = jsyq.split('～')[1];
16456
+ else if (k2.indexOf('~') != -1 || k2.indexOf(',') != -1 || k2.indexOf('～') != -1) {
16457
+ var r1;
16458
+ var r2;
16459
+ if (k2.indexOf('～') != -1) {
16460
+ r1 = k2.split('～')[0];
16461
+ r2 = k2.split('～')[1];
16389
16462
  }
16390
- else if (jsyq.indexOf('~') != -1) {
16391
- if (jsyq.split('~')[0].indexOf('+') != -1) {
16392
- r1 = jsyq.split('~')[1];
16393
- r2 = jsyq.split('~')[0];
16463
+ else if (k2.indexOf('~') != -1) {
16464
+ if (k2.split('~')[0].indexOf('+') != -1) {
16465
+ r1 = k2.split('~')[1];
16466
+ r2 = k2.split('~')[0];
16394
16467
  if (k1.toString().indexOf('+') != -1) {
16395
16468
  if (k1 * 1 <= r2) {
16396
16469
  kk = '合格';
@@ -16409,14 +16482,14 @@ const FormulaUtils = {
16409
16482
  }
16410
16483
  }
16411
16484
  else {
16412
- r1 = jsyq.split('~')[0];
16413
- r2 = jsyq.split('~')[1];
16485
+ r1 = k2.split('~')[0];
16486
+ r2 = k2.split('~')[1];
16414
16487
  }
16415
16488
  }
16416
- else if (jsyq.indexOf(',') != -1) {
16417
- if (jsyq.split(',')[0].indexOf('+') != -1) {
16418
- r1 = jsyq.split(',')[1];
16419
- r2 = jsyq.split(',')[0];
16489
+ else if (k2.indexOf(',') != -1) {
16490
+ if (k2.split(',')[0].indexOf('+') != -1) {
16491
+ r1 = k2.split(',')[1];
16492
+ r2 = k2.split(',')[0];
16420
16493
  if (k1.toString().indexOf('+') != -1) {
16421
16494
  if (k1 * 1 <= r2) {
16422
16495
  kk = '合格';
@@ -16435,8 +16508,8 @@ const FormulaUtils = {
16435
16508
  }
16436
16509
  }
16437
16510
  else {
16438
- r1 = jsyq.split(',')[0];
16439
- r2 = jsyq.split(',')[1];
16511
+ r1 = k2.split(',')[0];
16512
+ r2 = k2.split(',')[1];
16440
16513
  }
16441
16514
  }
16442
16515
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
@@ -16446,11 +16519,11 @@ const FormulaUtils = {
16446
16519
  kk = '不合格';
16447
16520
  }
16448
16521
  }
16449
- else if (jsyq.indexOf('±') != -1) {
16450
- let r1 = jsyq.split('±')[0];
16451
- let r2 = jsyq.split('±')[1];
16452
- let min = r1 * 1 - r2 * 1;
16453
- let max = r1 * 1 + r2 * 1;
16522
+ else if (k2.indexOf('±') != -1) {
16523
+ var r1 = k2.split('±')[0];
16524
+ var r2 = k2.split('±')[1];
16525
+ var min = r1 * 1 - r2 * 1;
16526
+ var max = r1 * 1 + r2 * 1;
16454
16527
  if (k1 >= min && k1 <= max) {
16455
16528
  kk = '合格';
16456
16529
  }
@@ -16459,9 +16532,9 @@ const FormulaUtils = {
16459
16532
  }
16460
16533
  }
16461
16534
  else {
16462
- if (FormulaUtils.commFun.isNumber(jsyq))
16463
- jsyq = jsyq * 1;
16464
- if (k1 >= jsyq) {
16535
+ if (IsNumber(k2))
16536
+ k2 = k2 * 1;
16537
+ if (k1 >= k2) {
16465
16538
  kk = '合格';
16466
16539
  }
16467
16540
  else {