rapid-spreadjs 1.0.151 → 1.0.153

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 (10) hide show
  1. package/dist/index.cjs.js +141 -65
  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 +141 -65
  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/dist/utils/sheet.d.ts +2 -1
  10. package/package.json +1 -1
package/dist/index.cjs.js CHANGED
@@ -574,8 +574,9 @@ const SheetUtils = {
574
574
  col: 0
575
575
  }]
576
576
  * @param isAutoSize 是否自适应单元格大小（默认为：true）
577
+ * @param isRange 是否为范围选择（默认为：false，如果设置为true，则显示的格式为2026-05-06至2026-05-08【如果选择的范围内只有1天，则显示的格式为2026-05-06】）
577
578
  */
578
- setSheetCellDate: (GC, sheet, cells, isAutoSize = true) => {
579
+ setSheetCellDate: (GC, sheet, cells, isAutoSize = true, isRange = false) => {
579
580
  cells.forEach((item, index) => {
580
581
  // 先获取单元格样式，否则设置控件后样式会丢失
581
582
  let cellStyle = sheet.getStyle(item.row, item.col);
@@ -596,11 +597,13 @@ const SheetUtils = {
596
597
  type: GC.Spread.Sheets.DropDownType.dateTimePicker,
597
598
  option: {
598
599
  showTime: false,
599
- showDateRange: false,
600
+ showDateRange: isRange,
600
601
  },
601
602
  },
602
603
  ];
603
- cellStyle.formatter = item.dateFormat;
604
+ cellStyle.formatter = !isRange
605
+ ? item.dateFormat
606
+ : '=IF(ISBLANK(@), "", IF(TEXT(@.start, "yyyy-mm-dd")=TEXT(@.end, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd")&"至"&TEXT(@.end, "yyyy-mm-dd")))';
604
607
  // 是否缩小以适应
605
608
  cellStyle.shrinkToFit = isAutoSize;
606
609
  // 设置单元格样式
@@ -16279,24 +16282,25 @@ const FormulaUtils = {
16279
16282
  // console.log(retData);
16280
16283
  // console.log(jsyq);
16281
16284
  // console.log(syjglist);
16282
- let kk = '合格';
16283
- if (jsyq == symbol || jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效') || syjglist.length == 0) {
16284
- return symbol;
16285
+ var kk = '合格';
16286
+ if (jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效')) {
16287
+ return '/';
16285
16288
  }
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];
16289
+ for (var i = 0; i < syjglist.length; i++) {
16290
+ var k1 = syjglist[i];
16291
+ var k2 = jsyq;
16292
+ if (k2.indexOf('<') != -1 || k2.indexOf('>') != -1 || k2.indexOf('＜') != -1 || k2.indexOf('＞') != -1) {
16293
+ k2 = k2.replace('＜', '<');
16294
+ k2 = k2.replace('＞', '>');
16295
+ if (k2.indexOf(',') != -1) {
16296
+ var r1;
16297
+ var r2;
16298
+ if (k2.indexOf(',') != -1) {
16299
+ r1 = k2.split(',')[0];
16300
+ r2 = k2.split(',')[1];
16297
16301
  if (r1.indexOf('>') != -1 || r1.indexOf('<') != -1) {
16298
- r1 = jsyq.split(',')[0].replace('>', '');
16299
- r2 = jsyq.split(',')[1].replace('<', '');
16302
+ r1 = k2.split(',')[0].replace('>', '');
16303
+ r2 = k2.split(',')[1].replace('<', '');
16300
16304
  }
16301
16305
  if (k1 * 1 > r1 * 1 && k1 < r2 * 1) {
16302
16306
  kk = '合格';
@@ -16306,20 +16310,56 @@ const FormulaUtils = {
16306
16310
  }
16307
16311
  }
16308
16312
  }
16313
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16314
+ if (k2.indexOf('>') != -1) {
16315
+ var r1 = k2.replace('>', '');
16316
+ var t1 = r1.split(':');
16317
+ var h1 = parseInt(t1[0], 10);
16318
+ var m1 = parseInt(t1[1], 10);
16319
+ var t2 = k1.split(':');
16320
+ var h2 = parseInt(t2[0], 10);
16321
+ var m2 = parseInt(t2[1], 10);
16322
+ k2 = h1 * 3600 + m1 * 60;
16323
+ k1 = h2 * 3600 + m2 * 60;
16324
+ if (k1 * 1 > k2 * 1) {
16325
+ kk = '合格';
16326
+ }
16327
+ else {
16328
+ kk = '不合格';
16329
+ }
16330
+ }
16331
+ else {
16332
+ var r1 = k2.replace('<', '');
16333
+ var t1 = r1.split(':');
16334
+ var h1 = parseInt(t1[0], 10);
16335
+ var m1 = parseInt(t1[1], 10);
16336
+ var t2 = k1.split(':');
16337
+ var h2 = parseInt(t2[0], 10);
16338
+ var m2 = parseInt(t2[1], 10);
16339
+ k2 = h1 * 3600 + m1 * 60;
16340
+ k1 = h2 * 3600 + m2 * 60;
16341
+ if (k1 * 1 < k2 * 1) {
16342
+ kk = '合格';
16343
+ }
16344
+ else {
16345
+ kk = '不合格';
16346
+ }
16347
+ }
16348
+ }
16309
16349
  else {
16310
- kk = eval(k1 + jsyq) ? '合格' : '不合格';
16350
+ kk = eval(k1 + k2) ? '合格' : '不合格';
16311
16351
  }
16312
16352
  }
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];
16353
+ else if (k2.indexOf('≥') != -1 || k2.indexOf('不小于') != -1 || k2.indexOf('≮') != -1) {
16354
+ if (k2.indexOf(',') != -1) {
16355
+ var r1;
16356
+ var r2;
16357
+ if (k2.indexOf(',') != -1) {
16358
+ r1 = k2.split(',')[0];
16359
+ r2 = k2.split(',')[1];
16320
16360
  if (r1.indexOf('≥') != -1 || r1.indexOf('≤') != -1) {
16321
- r1 = jsyq.split(',')[0].replace('≥', '');
16322
- r2 = jsyq.split(',')[1].replace('≤', '');
16361
+ r1 = k2.split(',')[0].replace('≥', '');
16362
+ r2 = k2.split(',')[1].replace('≤', '');
16323
16363
  }
16324
16364
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
16325
16365
  kk = '合格';
@@ -16329,9 +16369,26 @@ const FormulaUtils = {
16329
16369
  }
16330
16370
  }
16331
16371
  }
16372
+ else if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16373
+ var r1 = k2.replace('≥', '');
16374
+ var t1 = r1.split(':');
16375
+ var h1 = parseInt(t1[0], 10);
16376
+ var m1 = parseInt(t1[1], 10);
16377
+ var t2 = k1.split(':');
16378
+ var h2 = parseInt(t2[0], 10);
16379
+ var m2 = parseInt(t2[1], 10);
16380
+ k2 = h1 * 3600 + m1 * 60;
16381
+ k1 = h2 * 3600 + m2 * 60;
16382
+ if (k1 * 1 >= k2 * 1) {
16383
+ kk = '合格';
16384
+ }
16385
+ else {
16386
+ kk = '不合格';
16387
+ }
16388
+ }
16332
16389
  else {
16333
- let num = jsyq.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16334
- if (FormulaUtils.commFun.isNumber(k1)) {
16390
+ var num = k2.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
16391
+ if (IsNumber(k1)) {
16335
16392
  if (k1 > num || k1 == num) {
16336
16393
  kk = '合格';
16337
16394
  }
@@ -16341,7 +16398,7 @@ const FormulaUtils = {
16341
16398
  }
16342
16399
  else {
16343
16400
  if (k1.indexOf('大于') != -1) {
16344
- if (k1.replace('大于', '') == jsyq.replace('≮', '')) {
16401
+ if (k1.replace('大于', '') == k2.replace('≮', '')) {
16345
16402
  kk = '合格';
16346
16403
  }
16347
16404
  else {
@@ -16362,17 +16419,36 @@ const FormulaUtils = {
16362
16419
  }
16363
16420
  }
16364
16421
  }
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 = '合格';
16422
+ else if (k2.indexOf('≤') != -1 || k2.indexOf('不大于') != -1 || k2.indexOf('≯') != -1) {
16423
+ var num = k2.replace('≤', '').replace('不大于', '').replace('≯', '') * 1;
16424
+ if (k2.indexOf(':') != -1 || k1.indexOf(':') != -1) {
16425
+ var r1 = k2.replace('≤', '');
16426
+ var t1 = r1.split(':');
16427
+ var h1 = parseInt(t1[0], 10);
16428
+ var m1 = parseInt(t1[1], 10);
16429
+ var t2 = k1.split(':');
16430
+ var h2 = parseInt(t2[0], 10);
16431
+ var m2 = parseInt(t2[1], 10);
16432
+ k2 = h1 * 3600 + m1 * 60;
16433
+ k1 = h2 * 3600 + m2 * 60;
16434
+ if (k1 * 1 <= k2 * 1) {
16435
+ kk = '合格';
16436
+ }
16437
+ else {
16438
+ kk = '不合格';
16439
+ }
16369
16440
  }
16370
16441
  else {
16371
- kk = '不合格';
16442
+ if (k1 < num || k1 == num) {
16443
+ kk = '合格';
16444
+ }
16445
+ else {
16446
+ kk = '不合格';
16447
+ }
16372
16448
  }
16373
16449
  }
16374
- else if (jsyq.indexOf('≠') != -1) {
16375
- let num = jsyq.replace('≠', '') * 1;
16450
+ else if (k2.indexOf('≠') != -1) {
16451
+ var num = k2.replace('≠', '') * 1;
16376
16452
  if (k1 != num) {
16377
16453
  kk = '合格';
16378
16454
  }
@@ -16380,17 +16456,17 @@ const FormulaUtils = {
16380
16456
  kk = '不合格';
16381
16457
  }
16382
16458
  }
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];
16459
+ else if (k2.indexOf('~') != -1 || k2.indexOf(',') != -1 || k2.indexOf('～') != -1) {
16460
+ var r1;
16461
+ var r2;
16462
+ if (k2.indexOf('～') != -1) {
16463
+ r1 = k2.split('～')[0];
16464
+ r2 = k2.split('～')[1];
16389
16465
  }
16390
- else if (jsyq.indexOf('~') != -1) {
16391
- if (jsyq.split('~')[0].indexOf('+') != -1) {
16392
- r1 = jsyq.split('~')[1];
16393
- r2 = jsyq.split('~')[0];
16466
+ else if (k2.indexOf('~') != -1) {
16467
+ if (k2.split('~')[0].indexOf('+') != -1) {
16468
+ r1 = k2.split('~')[1];
16469
+ r2 = k2.split('~')[0];
16394
16470
  if (k1.toString().indexOf('+') != -1) {
16395
16471
  if (k1 * 1 <= r2) {
16396
16472
  kk = '合格';
@@ -16409,14 +16485,14 @@ const FormulaUtils = {
16409
16485
  }
16410
16486
  }
16411
16487
  else {
16412
- r1 = jsyq.split('~')[0];
16413
- r2 = jsyq.split('~')[1];
16488
+ r1 = k2.split('~')[0];
16489
+ r2 = k2.split('~')[1];
16414
16490
  }
16415
16491
  }
16416
- else if (jsyq.indexOf(',') != -1) {
16417
- if (jsyq.split(',')[0].indexOf('+') != -1) {
16418
- r1 = jsyq.split(',')[1];
16419
- r2 = jsyq.split(',')[0];
16492
+ else if (k2.indexOf(',') != -1) {
16493
+ if (k2.split(',')[0].indexOf('+') != -1) {
16494
+ r1 = k2.split(',')[1];
16495
+ r2 = k2.split(',')[0];
16420
16496
  if (k1.toString().indexOf('+') != -1) {
16421
16497
  if (k1 * 1 <= r2) {
16422
16498
  kk = '合格';
@@ -16435,8 +16511,8 @@ const FormulaUtils = {
16435
16511
  }
16436
16512
  }
16437
16513
  else {
16438
- r1 = jsyq.split(',')[0];
16439
- r2 = jsyq.split(',')[1];
16514
+ r1 = k2.split(',')[0];
16515
+ r2 = k2.split(',')[1];
16440
16516
  }
16441
16517
  }
16442
16518
  if (k1 * 1 >= r1 * 1 && k1 <= r2 * 1) {
@@ -16446,11 +16522,11 @@ const FormulaUtils = {
16446
16522
  kk = '不合格';
16447
16523
  }
16448
16524
  }
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;
16525
+ else if (k2.indexOf('±') != -1) {
16526
+ var r1 = k2.split('±')[0];
16527
+ var r2 = k2.split('±')[1];
16528
+ var min = r1 * 1 - r2 * 1;
16529
+ var max = r1 * 1 + r2 * 1;
16454
16530
  if (k1 >= min && k1 <= max) {
16455
16531
  kk = '合格';
16456
16532
  }
@@ -16459,9 +16535,9 @@ const FormulaUtils = {
16459
16535
  }
16460
16536
  }
16461
16537
  else {
16462
- if (FormulaUtils.commFun.isNumber(jsyq))
16463
- jsyq = jsyq * 1;
16464
- if (k1 >= jsyq) {
16538
+ if (IsNumber(k2))
16539
+ k2 = k2 * 1;
16540
+ if (k1 >= k2) {
16465
16541
  kk = '合格';
16466
16542
  }
16467
16543
  else {