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.esm.js CHANGED
@@ -16257,24 +16257,25 @@ const FormulaUtils = {
16257
16257
  // console.log(retData);
16258
16258
  // console.log(jsyq);
16259
16259
  // console.log(syjglist);
16260
- let kk = '合格';
16261
- if (jsyq == symbol || jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效') || syjglist.length == 0) {
16262
- return symbol;
16260
+ var kk = '合格';
16261
+ if (jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效')) {
16262
+ return '/';
16263
16263
  }
16264
- for (let i = 0; i < syjglist.length; i++) {
16265
- let k1 = syjglist[i];
16266
- if (jsyq.indexOf('<') != -1 || jsyq.indexOf('>') != -1 || jsyq.indexOf('＜') != -1 || jsyq.indexOf('＞') != -1) {
16267
- jsyq = jsyq.replace('＜', '<');
16268
- jsyq = jsyq.replace('＞', '>');
16269
- if (jsyq.indexOf(',') != -1) {
16270
- let r1;
16271
- let r2;
16272
- if (jsyq.indexOf(',') != -1) {
16273
- r1 = jsyq.split(',')[0];
16274
- r2 = jsyq.split(',')[1];
16264
+ for (var i = 0; i < syjglist.length; i++) {
16265
+ var k1 = syjglist[i];
16266
+ var k2 = jsyq;
16267
+ if (k2.indexOf('<') != -1 || k2.indexOf('>') != -1 || k2.indexOf('＜') != -1 || k2.indexOf('＞') != -1) {
16268
+ k2 = k2.replace('＜', '<');
16269
+ k2 = k2.replace('＞', '>');
16270
+ if (k2.indexOf(',') != -1) {
16271
+ var r1;
16272
+ var r2;
16273
+ if (k2.indexOf(',') != -1) {
16274
+ r1 = k2.split(',')[0];
16275
+ r2 = k2.split(',')[1];
16275
16276
  if (r1.indexOf('>') != -1 || r1.indexOf('<') != -1) {
16276
- r1 = jsyq.split(',')[0].replace('>', '');
16277
- r2 = jsyq.split(',')[1].replace('<', '');
16277
+ r1 = k2.split(',')[0].replace('>', '');
16278
+ r2 = k2.split(',')[1].replace('<', '');
16278
16279
  }
16279
16280
  if (k1 * 1 > r1 * 1 && k1 < r2 * 1) {
16280
16281
  kk = '合格';
@@ -16284,20 +16285,56 @@ const FormulaUtils = {
16284
16285
  }
16285
16286
  }
16286
16287
  }
16288
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16289
+ if (k2.indexOf('>') != -1) {
16290
+ var r1 = k2.replace('>', '');
16291
+ var t1 = r1.split(':');
16292
+ var h1 = parseInt(t1[0], 10);
16293
+ var m1 = parseInt(t1[1], 10);
16294
+ var t2 = k1.split(':');
16295
+ var h2 = parseInt(t2[0], 10);
16296
+ var m2 = parseInt(t2[1], 10);
16297
+ k2 = h1 * 3600 + m1 * 60;
16298
+ k1 = h2 * 3600 + m2 * 60;
16299
+ if (k1 * 1 > k2 * 1) {
16300
+ kk = '合格';
16301
+ }
16302
+ else {
16303
+ kk = '不合格';
16304
+ }
16305
+ }
16306
+ else {
16307
+ var r1 = k2.replace('<', '');
16308
+ var t1 = r1.split(':');
16309
+ var h1 = parseInt(t1[0], 10);
16310
+ var m1 = parseInt(t1[1], 10);
16311
+ var t2 = k1.split(':');
16312
+ var h2 = parseInt(t2[0], 10);
16313
+ var m2 = parseInt(t2[1], 10);
16314
+ k2 = h1 * 3600 + m1 * 60;
16315
+ k1 = h2 * 3600 + m2 * 60;
16316
+ if (k1 * 1 < k2 * 1) {
16317
+ kk = '合格';
16318
+ }
16319
+ else {
16320
+ kk = '不合格';
16321
+ }
16322
+ }
16323
+ }
16287
16324
  else {
16288
- kk = eval(k1 + jsyq) ? '合格' : '不合格';
16325
+ kk = eval(k1 + k2) ? '合格' : '不合格';
16289
16326
  }
16290
16327
  }
16291
- else if (jsyq.indexOf('≥') != -1 || jsyq.indexOf('不小于') != -1 || jsyq.indexOf('≮') != -1) {
16292
- if (jsyq.indexOf(',') != -1) {
16293
- let r1;
16294
- let r2;
16295
- if (jsyq.indexOf(',') != -1) {
16296
- r1 = jsyq.split(',')[0];
16297
- r2 = jsyq.split(',')[1];
16328
+ else if (k2.indexOf('≥') != -1 || k2.indexOf('不小于') != -1 || k2.indexOf('≮') != -1) {
16329
+ if (k2.indexOf(',') != -1) {
16330
+ var r1;
16331
+ var r2;
16332
+ if (k2.indexOf(',') != -1) {
16333
+ r1 = k2.split(',')[0];
16334
+ r2 = k2.split(',')[1];
16298
16335
  if (r1.indexOf('≥') != -1 || r1.indexOf('≤') != -1) {
16299
- r1 = jsyq.split(',')[0].replace('≥', '');
16300
- r2 = jsyq.split(',')[1].replace('≤', '');
16336
+ r1 = k2.split(',')[0].replace('≥', '');
16337
+ r2 = k2.split(',')[1].replace('≤', '');
16301
16338
  }
16302
16339
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
16303
16340
  kk = '合格';
@@ -16307,9 +16344,26 @@ const FormulaUtils = {
16307
16344
  }
16308
16345
  }
16309
16346
  }
16347
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16348
+ var r1 = k2.replace('≥', '');
16349
+ var t1 = r1.split(':');
16350
+ var h1 = parseInt(t1[0], 10);
16351
+ var m1 = parseInt(t1[1], 10);
16352
+ var t2 = k1.split(':');
16353
+ var h2 = parseInt(t2[0], 10);
16354
+ var m2 = parseInt(t2[1], 10);
16355
+ k2 = h1 * 3600 + m1 * 60;
16356
+ k1 = h2 * 3600 + m2 * 60;
16357
+ if (k1 * 1 >= k2 * 1) {
16358
+ kk = '合格';
16359
+ }
16360
+ else {
16361
+ kk = '不合格';
16362
+ }
16363
+ }
16310
16364
  else {
16311
- let num = jsyq.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16312
- if (FormulaUtils.commFun.isNumber(k1)) {
16365
+ var num = k2.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16366
+ if (IsNumber(k1)) {
16313
16367
  if (k1 > num || k1 == num) {
16314
16368
  kk = '合格';
16315
16369
  }
@@ -16319,7 +16373,7 @@ const FormulaUtils = {
16319
16373
  }
16320
16374
  else {
16321
16375
  if (k1.indexOf('大于') != -1) {
16322
- if (k1.replace('大于', '') == jsyq.replace('≮', '')) {
16376
+ if (k1.replace('大于', '') == k2.replace('≮', '')) {
16323
16377
  kk = '合格';
16324
16378
  }
16325
16379
  else {
@@ -16340,17 +16394,36 @@ const FormulaUtils = {
16340
16394
  }
16341
16395
  }
16342
16396
  }
16343
- else if (jsyq.indexOf('≤') != -1 || jsyq.indexOf('不大于') != -1 || jsyq.indexOf('≯') != -1) {
16344
- let num = jsyq.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16345
- if (k1 < num || k1 == num) {
16346
- kk = '合格';
16397
+ else if (k2.indexOf('≤') != -1 || k2.indexOf('不大于') != -1 || k2.indexOf('≯') != -1) {
16398
+ var num = k2.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16399
+ if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16400
+ var r1 = k2.replace('≤', '');
16401
+ var t1 = r1.split(':');
16402
+ var h1 = parseInt(t1[0], 10);
16403
+ var m1 = parseInt(t1[1], 10);
16404
+ var t2 = k1.split(':');
16405
+ var h2 = parseInt(t2[0], 10);
16406
+ var m2 = parseInt(t2[1], 10);
16407
+ k2 = h1 * 3600 + m1 * 60;
16408
+ k1 = h2 * 3600 + m2 * 60;
16409
+ if (k1 * 1 <= k2 * 1) {
16410
+ kk = '合格';
16411
+ }
16412
+ else {
16413
+ kk = '不合格';
16414
+ }
16347
16415
  }
16348
16416
  else {
16349
- kk = '不合格';
16417
+ if (k1 < num || k1 == num) {
16418
+ kk = '合格';
16419
+ }
16420
+ else {
16421
+ kk = '不合格';
16422
+ }
16350
16423
  }
16351
16424
  }
16352
- else if (jsyq.indexOf('≠') != -1) {
16353
- let num = jsyq.replace('≠', '') * 1;
16425
+ else if (k2.indexOf('≠') != -1) {
16426
+ var num = k2.replace('≠', '') * 1;
16354
16427
  if (k1 != num) {
16355
16428
  kk = '合格';
16356
16429
  }
@@ -16358,17 +16431,17 @@ const FormulaUtils = {
16358
16431
  kk = '不合格';
16359
16432
  }
16360
16433
  }
16361
- else if (jsyq.indexOf('~') != -1 || jsyq.indexOf(',') != -1 || jsyq.indexOf('～') != -1) {
16362
- let r1;
16363
- let r2;
16364
- if (jsyq.indexOf('～') != -1) {
16365
- r1 = jsyq.split('～')[0];
16366
- r2 = jsyq.split('～')[1];
16434
+ else if (k2.indexOf('~') != -1 || k2.indexOf(',') != -1 || k2.indexOf('～') != -1) {
16435
+ var r1;
16436
+ var r2;
16437
+ if (k2.indexOf('～') != -1) {
16438
+ r1 = k2.split('～')[0];
16439
+ r2 = k2.split('～')[1];
16367
16440
  }
16368
- else if (jsyq.indexOf('~') != -1) {
16369
- if (jsyq.split('~')[0].indexOf('+') != -1) {
16370
- r1 = jsyq.split('~')[1];
16371
- r2 = jsyq.split('~')[0];
16441
+ else if (k2.indexOf('~') != -1) {
16442
+ if (k2.split('~')[0].indexOf('+') != -1) {
16443
+ r1 = k2.split('~')[1];
16444
+ r2 = k2.split('~')[0];
16372
16445
  if (k1.toString().indexOf('+') != -1) {
16373
16446
  if (k1 * 1 <= r2) {
16374
16447
  kk = '合格';
@@ -16387,14 +16460,14 @@ const FormulaUtils = {
16387
16460
  }
16388
16461
  }
16389
16462
  else {
16390
- r1 = jsyq.split('~')[0];
16391
- r2 = jsyq.split('~')[1];
16463
+ r1 = k2.split('~')[0];
16464
+ r2 = k2.split('~')[1];
16392
16465
  }
16393
16466
  }
16394
- else if (jsyq.indexOf(',') != -1) {
16395
- if (jsyq.split(',')[0].indexOf('+') != -1) {
16396
- r1 = jsyq.split(',')[1];
16397
- r2 = jsyq.split(',')[0];
16467
+ else if (k2.indexOf(',') != -1) {
16468
+ if (k2.split(',')[0].indexOf('+') != -1) {
16469
+ r1 = k2.split(',')[1];
16470
+ r2 = k2.split(',')[0];
16398
16471
  if (k1.toString().indexOf('+') != -1) {
16399
16472
  if (k1 * 1 <= r2) {
16400
16473
  kk = '合格';
@@ -16413,8 +16486,8 @@ const FormulaUtils = {
16413
16486
  }
16414
16487
  }
16415
16488
  else {
16416
- r1 = jsyq.split(',')[0];
16417
- r2 = jsyq.split(',')[1];
16489
+ r1 = k2.split(',')[0];
16490
+ r2 = k2.split(',')[1];
16418
16491
  }
16419
16492
  }
16420
16493
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
@@ -16424,11 +16497,11 @@ const FormulaUtils = {
16424
16497
  kk = '不合格';
16425
16498
  }
16426
16499
  }
16427
- else if (jsyq.indexOf('±') != -1) {
16428
- let r1 = jsyq.split('±')[0];
16429
- let r2 = jsyq.split('±')[1];
16430
- let min = r1 * 1 - r2 * 1;
16431
- let max = r1 * 1 + r2 * 1;
16500
+ else if (k2.indexOf('±') != -1) {
16501
+ var r1 = k2.split('±')[0];
16502
+ var r2 = k2.split('±')[1];
16503
+ var min = r1 * 1 - r2 * 1;
16504
+ var max = r1 * 1 + r2 * 1;
16432
16505
  if (k1 >= min && k1 <= max) {
16433
16506
  kk = '合格';
16434
16507
  }
@@ -16437,9 +16510,9 @@ const FormulaUtils = {
16437
16510
  }
16438
16511
  }
16439
16512
  else {
16440
- if (FormulaUtils.commFun.isNumber(jsyq))
16441
- jsyq = jsyq * 1;
16442
- if (k1 >= jsyq) {
16513
+ if (IsNumber(k2))
16514
+ k2 = k2 * 1;
16515
+ if (k1 >= k2) {
16443
16516
  kk = '合格';
16444
16517
  }
16445
16518
  else {