kz-ui-base 1.0.63 → 1.0.64

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.
@@ -427,74 +427,128 @@
427
427
  <span v-if="column.displayType == 'Upload'">
428
428
  <!-- {{ getFileNickName(scope.row[scope.column.property]) }} -->
429
429
  </span>
430
- <a
431
- style="color: #1890ff"
432
- v-if="
430
+ <a
431
+ style="color: #1890ff"
432
+ v-if="
433
433
  column.setting &&
434
434
  column.setting.canClick &&
435
435
  column.setting.canClick === 'canClick'
436
436
  "
437
- @click="statusClick(scope)"
438
- >
439
- {{ scope.row[column.property] }}
440
- </a>
441
- <span
442
- v-else-if="column.displayType == 'DatePicker'"
443
- :class="setCellClass(scope)"
444
- >
437
+ @click="statusClick(scope)"
438
+ >
439
+ {{ scope.row[column.property] }}
440
+ </a>
441
+ <el-tag
442
+ v-else-if="
443
+ column.setting &&
444
+ column.setting.canClick === 'canClickHasStyle' &&
445
+ column.setting.eltag &&
446
+ column.setting.dictType &&
447
+ eltag(scope.row[column.property])
448
+ "
449
+ style="cursor: pointer;"
450
+ size="small"
451
+ @click.native="statusClick(scope)"
452
+ :type="eltag(scope.row[column.property])"
453
+ disable-transitions
454
+ >
455
+ {{
456
+ tableDisplayFormat(
457
+ scope.row,
458
+ column,
459
+ scope.row[column.property]
460
+ )
461
+ }}
462
+ </el-tag>
463
+ <span
464
+ v-else-if="column.displayType == 'DatePicker'"
465
+ :class="setCellClass(scope)"
466
+ >
445
467
  {{
446
- dateFormat(
447
- scope.row,
448
- column,
449
- scope.row[column.property],
450
- scope.row[column.property]
451
- )
452
- }}
468
+ dateFormat(
469
+ scope.row,
470
+ column,
471
+ scope.row[column.property],
472
+ scope.row[column.property]
473
+ )
474
+ }}
453
475
  </span>
454
- <span
455
- v-else-if="
476
+ <span
477
+ v-else-if="
456
478
  column.setting &&
457
479
  column.setting.type &&
458
480
  column.setting.type === 'bool'
459
481
  "
460
- >
482
+ >
461
483
  {{
462
- String(scope.row[column.property]) === "1" ? "是" : ""
463
- }}
484
+ String(scope.row[column.property]) === "1" ? "是" : ""
485
+ }}
464
486
  {{
465
- String(scope.row[column.property]) === "0" ? "否" : ""
466
- }}
487
+ String(scope.row[column.property]) === "0" ? "否" : ""
488
+ }}
467
489
  </span>
468
- <span
469
- v-else-if="
490
+ <el-tag
491
+ v-else-if="
492
+ column.setting &&
493
+ column.setting.type &&
494
+ column.setting.type === 'boolNormal' &&
495
+ column.setting.eltag &&
496
+ eltag(scope.row[column.property])
497
+ "
498
+ size="small"
499
+ :type="eltag(scope.row[column.property])"
500
+ disable-transitions
501
+ >
502
+ {{
503
+ String(scope.row[column.property]) === "1"
504
+ ? column.setting.val1
505
+ : ""
506
+ }}
507
+ {{
508
+ String(scope.row[column.property]) === "0"
509
+ ? column.setting.val2
510
+ : ""
511
+ }}
512
+ {{
513
+ String(scope.row[column.property]) === "2"
514
+ ? column.setting.val3
515
+ : ""
516
+ }}
517
+ </el-tag>
518
+ <span
519
+ v-else-if="
470
520
  column.setting &&
471
521
  column.setting.type &&
472
522
  column.setting.type === 'boolNormal'
473
523
  "
474
- >
524
+ >
475
525
  {{
476
- String(scope.row[column.property]) === "1"
477
- ? column.setting.val1
478
- : ""
479
- }}
526
+ String(scope.row[column.property]) === "1"
527
+ ? column.setting.val1
528
+ : ""
529
+ }}
480
530
  {{
481
- String(scope.row[column.property]) === "0"
482
- ? column.setting.val2
483
- : ""
484
- }}
485
- {{
486
- String(scope.row[column.property]) === "2"
487
- ? column.setting.val3
488
- : ""
489
- }}
531
+ String(scope.row[column.property]) === "0"
532
+ ? column.setting.val2
533
+ : ""
534
+ }}
535
+ {{
536
+ String(scope.row[column.property]) === "2"
537
+ ? column.setting.val3
538
+ : ""
539
+ }}
490
540
  </span>
491
541
  <el-tag
492
542
  v-else-if="
493
543
  column.setting &&
494
- (column.setting.dictType && column.setting.eltag && eltag(scope.row[column.property]))
544
+ column.setting.dictType &&
545
+ column.setting.eltag &&
546
+ eltag(scope.row[column.property])
495
547
  "
548
+ size="small"
496
549
  :type="eltag(scope.row[column.property])"
497
- disable-transitions>
550
+ disable-transitions
551
+ >
498
552
  {{
499
553
  tableDisplayFormat(
500
554
  scope.row,
@@ -503,10 +557,50 @@
503
557
  )
504
558
  }}
505
559
  </el-tag>
506
- <span v-else-if="
560
+ <el-tag
561
+ v-else-if="
507
562
  column.setting &&
508
- (column.setting.dictType && column.setting.eltag)
509
- ">
563
+ column.setting.urlFormat &&
564
+ column.setting.eltag &&
565
+ eltag(scope.row[column.property])
566
+ "
567
+ size="small"
568
+ :type="eltag(scope.row[column.property])"
569
+ disable-transitions
570
+ >
571
+ {{
572
+ tableDisplayFormatByUrl(
573
+ scope.row,
574
+ column,
575
+ scope.row[column.property]
576
+ )
577
+ }}
578
+ </el-tag>
579
+ <el-tag
580
+ v-else-if="
581
+ column.setting &&
582
+ column.setting.eltag &&
583
+ eltag(scope.row[column.property])
584
+ "
585
+ size="small"
586
+ :type="eltag(scope.row[column.property])"
587
+ disable-transitions
588
+ >
589
+ {{
590
+ tableDisplayFormat(
591
+ scope.row,
592
+ column,
593
+ scope.row[column.property]
594
+ )
595
+ }}
596
+ </el-tag>
597
+ <span
598
+ v-else-if="
599
+ column.setting &&
600
+ column.setting.dictType &&
601
+ column.setting.eltag
602
+ "
603
+ >
510
604
  {{
511
605
  tableDisplayFormat(
512
606
  scope.row,
@@ -515,32 +609,32 @@
515
609
  )
516
610
  }}
517
611
  </span>
518
- <span
519
- v-else-if="
612
+ <span
613
+ v-else-if="
520
614
  column.setting &&
521
615
  (column.setting.type || column.setting.dictType)
522
616
  "
523
- >
617
+ >
524
618
  {{
525
- tableDisplayFormat(
526
- scope.row,
527
- column,
528
- scope.row[column.property]
529
- )
530
- }}
619
+ tableDisplayFormat(
620
+ scope.row,
621
+ column,
622
+ scope.row[column.property]
623
+ )
624
+ }}
531
625
  </span>
532
- <span
533
- v-else-if="column.setting && column.setting.urlFormat"
534
- >
626
+ <span
627
+ v-else-if="column.setting && column.setting.urlFormat"
628
+ >
535
629
  {{
536
- tableDisplayFormatByUrl(
537
- scope.row,
538
- column,
539
- scope.row[column.property]
540
- )
541
- }}
630
+ tableDisplayFormatByUrl(
631
+ scope.row,
632
+ column,
633
+ scope.row[column.property]
634
+ )
635
+ }}
542
636
  </span>
543
- <span v-else-if="column.htmlFormat">
637
+ <span v-else-if="column.htmlFormat">
544
638
  <span
545
639
  v-html="
546
640
  evalFunction(
@@ -552,17 +646,17 @@
552
646
  "
553
647
  ></span>
554
648
  </span>
555
- <span v-else-if="column.format">
649
+ <span v-else-if="column.format">
556
650
  {{
557
- evalFunction(
558
- column.format,
559
- scope.row,
560
- column,
561
- scope.row[column.property]
562
- )
563
- }}
651
+ evalFunction(
652
+ column.format,
653
+ scope.row,
654
+ column,
655
+ scope.row[column.property]
656
+ )
657
+ }}
564
658
  </span>
565
- <span v-else-if="column.click">
659
+ <span v-else-if="column.click">
566
660
  <el-link
567
661
  type="primary"
568
662
  @click="
@@ -585,48 +679,48 @@
585
679
  }}
586
680
  </span>
587
681
  <span v-else>{{
588
- scope.row[scope.column.property]
589
- }}</span>
682
+ scope.row[scope.column.property]
683
+ }}</span>
590
684
  </el-link>
591
685
  </span>
592
- <KZ_DropDownList
593
- v-else-if="
686
+ <KZ_DropDownList
687
+ v-else-if="
594
688
  column.displayType == 'DropDownList' &&
595
689
  column.setting.displayMode == 'form'
596
690
  "
597
- :column="column"
598
- :entity="scope.row"
599
- :value="scope.row[column.property]"
600
- :setting.sync="column.setting"
601
- @change="onChangeEvent"
602
- >
603
- </KZ_DropDownList>
604
- <el-switch
605
- v-else-if="
691
+ :column="column"
692
+ :entity="scope.row"
693
+ :value="scope.row[column.property]"
694
+ :setting.sync="column.setting"
695
+ @change="onChangeEvent"
696
+ >
697
+ </KZ_DropDownList>
698
+ <el-switch
699
+ v-else-if="
606
700
  column.displayType == 'Switch' &&
607
701
  column.setting &&
608
702
  column.setting.valType &&
609
703
  column.setting.valType === 'number'
610
704
  "
611
- v-model="scope.row[column.property]"
612
- :disabled="true"
613
- @change="onChangeEvent"
614
- active-color="#13ce66"
615
- inactive-color="#ff4949"
616
- active-value="1"
617
- inactive-value="0"
618
- >
619
- </el-switch>
620
- <el-switch
621
- v-else-if="column.displayType == 'Switch'"
622
- v-model="scope.row[column.property]"
623
- :disabled="true"
624
- @change="onChangeEvent"
625
- active-color="#13ce66"
626
- inactive-color="#ff4949"
627
- >
628
- </el-switch>
629
- <span v-else>
705
+ v-model="scope.row[column.property]"
706
+ :disabled="true"
707
+ @change="onChangeEvent"
708
+ active-color="#13ce66"
709
+ inactive-color="#ff4949"
710
+ active-value="1"
711
+ inactive-value="0"
712
+ >
713
+ </el-switch>
714
+ <el-switch
715
+ v-else-if="column.displayType == 'Switch'"
716
+ v-model="scope.row[column.property]"
717
+ :disabled="true"
718
+ @change="onChangeEvent"
719
+ active-color="#13ce66"
720
+ inactive-color="#ff4949"
721
+ >
722
+ </el-switch>
723
+ <span v-else>
630
724
  {{ scope.row[scope.column.property] }}
631
725
  </span>
632
726
  </template>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kz-ui-base",
3
- "version": "1.0.63",
3
+ "version": "1.0.64",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {