eoss-ui 0.3.97 → 0.4.14

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 (102) hide show
  1. package/lib/button-group.js +98 -15
  2. package/lib/button.js +100 -17
  3. package/lib/ca-login.js +326 -0
  4. package/lib/card.js +2 -2
  5. package/lib/cascader.js +2 -2
  6. package/lib/checkbox-group.js +104 -18
  7. package/lib/clients.js +2 -2
  8. package/lib/data-table-form.js +104 -21
  9. package/lib/data-table.js +228 -35
  10. package/lib/date-picker.js +100 -17
  11. package/lib/dialog.js +101 -17
  12. package/lib/enterprise.js +2 -2
  13. package/lib/eoss-ui.common.js +480 -122
  14. package/lib/error-page.js +2 -2
  15. package/lib/flow-group.js +100 -17
  16. package/lib/flow-list.js +98 -15
  17. package/lib/flow.js +98 -15
  18. package/lib/form.js +112 -26
  19. package/lib/handle-user.js +100 -17
  20. package/lib/handler.js +100 -17
  21. package/lib/index.js +1 -1
  22. package/lib/input-number.js +100 -17
  23. package/lib/input.js +100 -17
  24. package/lib/label.js +2 -2
  25. package/lib/login.js +126 -27
  26. package/lib/main.js +98 -15
  27. package/lib/mainComp.js +98 -15
  28. package/lib/menu.js +2 -2
  29. package/lib/nav.js +100 -17
  30. package/lib/notify.js +2 -2
  31. package/lib/page.js +100 -17
  32. package/lib/pagination.js +2 -2
  33. package/lib/player.js +100 -17
  34. package/lib/qr-code.js +107 -24
  35. package/lib/radio-group.js +106 -20
  36. package/lib/select-ganged.js +104 -18
  37. package/lib/select.js +114 -25
  38. package/lib/selector-panel.js +109 -23
  39. package/lib/selector.js +106 -20
  40. package/lib/sizer.js +100 -17
  41. package/lib/steps.js +100 -17
  42. package/lib/switch.js +100 -17
  43. package/lib/table-form.js +107 -24
  44. package/lib/tabs-panel.js +2 -2
  45. package/lib/tabs.js +100 -17
  46. package/lib/theme-chalk/base.css +1 -1
  47. package/lib/theme-chalk/ca-login.css +1 -0
  48. package/lib/theme-chalk/fonts/iconfont.ttf +0 -0
  49. package/lib/theme-chalk/fonts/iconfont.woff +0 -0
  50. package/lib/theme-chalk/icon.css +1 -1
  51. package/lib/theme-chalk/index.css +1 -1
  52. package/lib/theme-chalk/main.css +1 -1
  53. package/lib/theme-chalk/menu.css +1 -1
  54. package/lib/theme-chalk/sizer.css +1 -1
  55. package/lib/theme-chalk/upload.css +1 -1
  56. package/lib/tips.js +110 -22
  57. package/lib/toolbar.js +2 -2
  58. package/lib/tree-group.js +100 -17
  59. package/lib/tree.js +100 -17
  60. package/lib/upload.js +98 -15
  61. package/lib/utils/util.js +98 -15
  62. package/lib/wujie.js +100 -17
  63. package/lib/wxlogin.js +100 -17
  64. package/package.json +2 -2
  65. package/packages/ca-login/index.js +5 -0
  66. package/packages/ca-login/src/main.vue +62 -0
  67. package/packages/checkbox-group/index.js +3 -3
  68. package/packages/checkbox-group/src/main.vue +4 -1
  69. package/packages/data-table/src/column.vue +110 -28
  70. package/packages/data-table/src/main.vue +2 -1
  71. package/packages/data-table-form/src/table.vue +1 -1
  72. package/packages/form/src/main.vue +17 -7
  73. package/packages/login/src/main.vue +40 -13
  74. package/packages/radio-group/index.js +3 -3
  75. package/packages/radio-group/src/main.vue +4 -1
  76. package/packages/select/src/main.vue +7 -1
  77. package/packages/select-ganged/src/main.vue +4 -1
  78. package/packages/selector/src/main.vue +4 -1
  79. package/packages/selector-panel/src/selection.vue +4 -1
  80. package/packages/theme-chalk/lib/base.css +1 -1
  81. package/packages/theme-chalk/lib/ca-login.css +1 -0
  82. package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
  83. package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
  84. package/packages/theme-chalk/lib/icon.css +1 -1
  85. package/packages/theme-chalk/lib/index.css +1 -1
  86. package/packages/theme-chalk/lib/main.css +1 -1
  87. package/packages/theme-chalk/lib/menu.css +1 -1
  88. package/packages/theme-chalk/lib/sizer.css +1 -1
  89. package/packages/theme-chalk/lib/upload.css +1 -1
  90. package/packages/theme-chalk/src/ca-login.scss +4 -0
  91. package/packages/theme-chalk/src/fonts/iconfont.ttf +0 -0
  92. package/packages/theme-chalk/src/fonts/iconfont.woff +0 -0
  93. package/packages/theme-chalk/src/icon.scss +8 -0
  94. package/packages/theme-chalk/src/index.scss +1 -0
  95. package/packages/tips/src/main.vue +5 -2
  96. package/src/index.js +4 -1
  97. package/src/utils/util.js +108 -36
  98. package/lib/theme-chalk/radio.css +0 -1
  99. package/packages/radio/index.js +0 -5
  100. package/packages/radio/src/main.vue +0 -259
  101. package/packages/theme-chalk/lib/radio.css +0 -1
  102. package/packages/theme-chalk/src/radio.scss +0 -3
package/lib/data-table.js CHANGED
@@ -533,7 +533,7 @@ var esEncode = function esEncode(value) {
533
533
  **/
534
534
  var esDecode = function esDecode(value) {
535
535
  var kleng = publicKey.length;
536
- var result;
536
+ var result = void 0;
537
537
  var cat1 = void 0;
538
538
  var cat2 = void 0;
539
539
  var cat3 = void 0;
@@ -638,11 +638,13 @@ var exportXls = function exportXls(_ref6) {
638
638
  _ref6$data = _ref6.data,
639
639
  data = _ref6$data === undefined ? [] : _ref6$data,
640
640
  name = _ref6.name,
641
- numbers = _ref6.numbers;
641
+ numbers = _ref6.numbers,
642
+ option = _ref6.option;
642
643
 
643
644
  var tbody = '';
644
645
  var aligns = [];
645
646
  var fields = [];
647
+ var keys = {};
646
648
  var others = {};
647
649
  var alink = document.createElement('a');
648
650
  for (var i = 0; i < thead.length; i++) {
@@ -652,12 +654,15 @@ var exportXls = function exportXls(_ref6) {
652
654
  }
653
655
  var tr = thead[i];
654
656
  var col = 0;
655
- for (var _x = 0; _x < tr.length; _x++) {
656
- var td = tr[_x];
657
+ for (var x = 0; x < tr.length; x++) {
658
+ var td = tr[x];
657
659
  if (td.property) {
658
- if (col === _x) {
660
+ if (col === x) {
659
661
  fields.push(td.property);
660
662
  aligns.push(td.align);
663
+ if (td.labelKey && td.valueKey) {
664
+ keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
665
+ }
661
666
  } else {
662
667
  others[String(col)] = [td.property, td.align];
663
668
  }
@@ -675,12 +680,72 @@ var exportXls = function exportXls(_ref6) {
675
680
  fields.splice(_i2, 0, others[_i2][0]);
676
681
  aligns.splice(_i2, 0, others[_i2][1]);
677
682
  }
678
- for (var _i3 = 0; _i3 < data.length; _i3++) {
683
+
684
+ var _loop = function _loop(_i3) {
679
685
  tbody += '<tr>';
680
- for (var x in fields) {
681
- tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
686
+
687
+ var _loop2 = function _loop2(_x) {
688
+ var field = '';
689
+ var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
690
+ var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
691
+ if (option[fields[_x]]) {
692
+ if (Array.isArray(data[_i3][fields[_x]])) {
693
+ field = [];
694
+ data[_i3][fields[_x]].forEach(function (ele) {
695
+ option[fields[_x]].forEach(function (item) {
696
+ // eslint-disable-next-line eqeqeq
697
+ if (item[valueKey] == ele) {
698
+ field.push(item[labelKey]);
699
+ return;
700
+ }
701
+ });
702
+ });
703
+ field = field.join(' ');
704
+ } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
705
+ field = [];
706
+ data[_i3][fields[_x]].split(',').forEach(function (ele) {
707
+ option[fields[_x]].forEach(function (item) {
708
+ // eslint-disable-next-line eqeqeq
709
+ if (item[valueKey] == ele) {
710
+ field.push(item[labelKey]);
711
+ return;
712
+ }
713
+ });
714
+ });
715
+ field = field.join(' ');
716
+ } else {
717
+ option[fields[_x]].forEach(function (item) {
718
+ // eslint-disable-next-line eqeqeq
719
+ if (item[valueKey] == data[_i3][fields[_x]]) {
720
+ field = item[labelKey];
721
+ return;
722
+ }
723
+ });
724
+ }
725
+ } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
726
+ if (Array.isArray(data[_i3][fields[_x]])) {
727
+ data[_i3][fields[_x]].forEach(function (item) {
728
+ field = [];
729
+ field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
730
+ });
731
+ field = field.join(' ');
732
+ } else {
733
+ field = data[_i3][fields[_x]][labelKey];
734
+ }
735
+ } else {
736
+ field = data[_i3][fields[_x]];
737
+ }
738
+ tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
739
+ };
740
+
741
+ for (var _x in fields) {
742
+ _loop2(_x);
682
743
  }
683
744
  tbody += '</tr>';
745
+ };
746
+
747
+ for (var _i3 = 0; _i3 < data.length; _i3++) {
748
+ _loop(_i3);
684
749
  }
685
750
  if (!name) {
686
751
  name = 'table_' + new Date().getTime();
@@ -1382,7 +1447,8 @@ var isLogged = function isLogged(_ref8) {
1382
1447
  var to = _ref8.to,
1383
1448
  from = _ref8.from,
1384
1449
  next = _ref8.next,
1385
- exclude = _ref8.exclude,
1450
+ _ref8$exclude = _ref8.exclude,
1451
+ exclude = _ref8$exclude === undefined ? [] : _ref8$exclude,
1386
1452
  open = _ref8.open,
1387
1453
  cookie = _ref8.cookie,
1388
1454
  loginPage = _ref8.loginPage,
@@ -1428,10 +1494,27 @@ var isLogged = function isLogged(_ref8) {
1428
1494
  break;
1429
1495
  case 3:
1430
1496
  var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
1431
- if (open) {
1432
- win.open(href);
1497
+ if (to.query.openType) {
1498
+ switch (to.query.openType) {
1499
+ case 'self':
1500
+ win.location.href = href;
1501
+ break;
1502
+ case 'blank':
1503
+ win.open(href);
1504
+ break;
1505
+ case 'top':
1506
+ win.top.location.href = href;
1507
+ break;
1508
+ case 'parent':
1509
+ win.parent.location.href = href;
1510
+ break;
1511
+ }
1433
1512
  } else {
1434
- win.top.location.href = href;
1513
+ if (open) {
1514
+ win.open(href);
1515
+ } else {
1516
+ win.top.location.href = href;
1517
+ }
1435
1518
  }
1436
1519
  break;
1437
1520
  }
@@ -1443,9 +1526,9 @@ var isLogged = function isLogged(_ref8) {
1443
1526
  }
1444
1527
  }
1445
1528
  }).catch(function (e) {});
1446
- } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
1447
- if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
1448
- window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
1529
+ } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
1530
+ if (redirect && (to.path === '/main' || to.path === '/login')) {
1531
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1449
1532
  } else {
1450
1533
  next();
1451
1534
  }
@@ -2645,8 +2728,8 @@ module.exports = require("vue");
2645
2728
  // ESM COMPAT FLAG
2646
2729
  __webpack_require__.r(__webpack_exports__);
2647
2730
 
2648
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=97c4c582&
2649
- var mainvue_type_template_id_97c4c582_render = function () {
2731
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
2732
+ var mainvue_type_template_id_154b78e2_render = function () {
2650
2733
  var _vm = this
2651
2734
  var _h = _vm.$createElement
2652
2735
  var _c = _vm._self._c || _h
@@ -2979,10 +3062,10 @@ var mainvue_type_template_id_97c4c582_render = function () {
2979
3062
  )
2980
3063
  }
2981
3064
  var staticRenderFns = []
2982
- mainvue_type_template_id_97c4c582_render._withStripped = true
3065
+ mainvue_type_template_id_154b78e2_render._withStripped = true
2983
3066
 
2984
3067
 
2985
- // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=97c4c582&
3068
+ // CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
2986
3069
 
2987
3070
  // EXTERNAL MODULE: ./src/config/api.js
2988
3071
  var api = __webpack_require__(1);
@@ -3035,8 +3118,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
3035
3118
 
3036
3119
  // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
3037
3120
 
3038
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=702a5c98&
3039
- var columnvue_type_template_id_702a5c98_render = function () {
3121
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
3122
+ var columnvue_type_template_id_1f31fcc6_render = function () {
3040
3123
  var _vm = this
3041
3124
  var _h = _vm.$createElement
3042
3125
  var _c = _vm._self._c || _h
@@ -3053,6 +3136,8 @@ var columnvue_type_template_id_702a5c98_render = function () {
3053
3136
  attrs: {
3054
3137
  "filter-icon": _vm.filterIcon,
3055
3138
  label: _vm.item.title || _vm.item.label,
3139
+ "label-key": _vm.item.labelKey,
3140
+ "value-key": _vm.item.valueKey,
3056
3141
  prop: _vm.item.field || _vm.item.prop,
3057
3142
  fixed: _vm.item.fixed,
3058
3143
  sortable: _vm.item.sortable || _vm.item.sort,
@@ -3152,6 +3237,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3152
3237
  item: _vm.item,
3153
3238
  event: event,
3154
3239
  data: scope.row,
3240
+ scope: scope,
3155
3241
  })
3156
3242
  },
3157
3243
  focus: function (event) {
@@ -3159,6 +3245,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3159
3245
  item: _vm.item,
3160
3246
  event: event,
3161
3247
  data: scope.row,
3248
+ scope: scope,
3162
3249
  })
3163
3250
  },
3164
3251
  change: function (value) {
@@ -3169,6 +3256,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3169
3256
  _vm.item.prop,
3170
3257
  value: value,
3171
3258
  data: scope.row,
3259
+ scope: scope,
3172
3260
  })
3173
3261
  },
3174
3262
  },
@@ -3217,6 +3305,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3217
3305
  item: _vm.item,
3218
3306
  event: event,
3219
3307
  data: scope.row,
3308
+ scope: scope,
3220
3309
  })
3221
3310
  },
3222
3311
  focus: function (event) {
@@ -3224,6 +3313,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3224
3313
  item: _vm.item,
3225
3314
  event: event,
3226
3315
  data: scope.row,
3316
+ scope: scope,
3227
3317
  })
3228
3318
  },
3229
3319
  change: function (value) {
@@ -3234,6 +3324,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3234
3324
  _vm.item.prop,
3235
3325
  value: value,
3236
3326
  data: scope.row,
3327
+ scope: scope,
3237
3328
  })
3238
3329
  },
3239
3330
  },
@@ -3496,6 +3587,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3496
3587
  item: _vm.item,
3497
3588
  event: event,
3498
3589
  data: scope.row,
3590
+ scope: scope,
3499
3591
  })
3500
3592
  },
3501
3593
  focus: function (event) {
@@ -3503,6 +3595,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3503
3595
  item: _vm.item,
3504
3596
  event: event,
3505
3597
  data: scope.row,
3598
+ scope: scope,
3506
3599
  })
3507
3600
  },
3508
3601
  change: function (value) {
@@ -3513,6 +3606,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3513
3606
  _vm.item.prop,
3514
3607
  value: value,
3515
3608
  data: scope.row,
3609
+ scope: scope,
3516
3610
  })
3517
3611
  },
3518
3612
  },
@@ -3549,6 +3643,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3549
3643
  item: _vm.item,
3550
3644
  event: event,
3551
3645
  data: scope.row,
3646
+ scope: scope,
3552
3647
  })
3553
3648
  },
3554
3649
  focus: function (event) {
@@ -3556,6 +3651,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3556
3651
  item: _vm.item,
3557
3652
  event: event,
3558
3653
  data: scope.row,
3654
+ scope: scope,
3559
3655
  })
3560
3656
  },
3561
3657
  change: function (value) {
@@ -3566,6 +3662,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3566
3662
  _vm.item.prop,
3567
3663
  value: value,
3568
3664
  data: scope.row,
3665
+ scope: scope,
3569
3666
  })
3570
3667
  },
3571
3668
  },
@@ -3672,6 +3769,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3672
3769
  item: _vm.item,
3673
3770
  event: event,
3674
3771
  data: scope.row,
3772
+ scope: scope,
3675
3773
  })
3676
3774
  },
3677
3775
  focus: function (
@@ -3681,6 +3779,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3681
3779
  item: _vm.item,
3682
3780
  event: event,
3683
3781
  data: scope.row,
3782
+ scope: scope,
3684
3783
  })
3685
3784
  },
3686
3785
  change: [
@@ -3707,6 +3806,8 @@ var columnvue_type_template_id_702a5c98_render = function () {
3707
3806
  value:
3708
3807
  value,
3709
3808
  data: scope.row,
3809
+ scope:
3810
+ scope,
3710
3811
  }
3711
3812
  )
3712
3813
  },
@@ -3757,6 +3858,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3757
3858
  item: _vm.item,
3758
3859
  event: event,
3759
3860
  data: scope.row,
3861
+ scope: scope,
3760
3862
  })
3761
3863
  },
3762
3864
  focus: function (
@@ -3766,6 +3868,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3766
3868
  item: _vm.item,
3767
3869
  event: event,
3768
3870
  data: scope.row,
3871
+ scope: scope,
3769
3872
  })
3770
3873
  },
3771
3874
  change: [
@@ -3792,6 +3895,8 @@ var columnvue_type_template_id_702a5c98_render = function () {
3792
3895
  value:
3793
3896
  value,
3794
3897
  data: scope.row,
3898
+ scope:
3899
+ scope,
3795
3900
  }
3796
3901
  )
3797
3902
  },
@@ -3817,6 +3922,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3817
3922
  item: _vm.item,
3818
3923
  event: event,
3819
3924
  data: scope.row,
3925
+ scope: scope,
3820
3926
  })
3821
3927
  },
3822
3928
  focus: function (event) {
@@ -3824,6 +3930,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3824
3930
  item: _vm.item,
3825
3931
  event: event,
3826
3932
  data: scope.row,
3933
+ scope: scope,
3827
3934
  })
3828
3935
  },
3829
3936
  change: function (value) {
@@ -3834,6 +3941,7 @@ var columnvue_type_template_id_702a5c98_render = function () {
3834
3941
  _vm.item.prop,
3835
3942
  value: value,
3836
3943
  data: scope.row,
3944
+ scope: scope,
3837
3945
  })
3838
3946
  },
3839
3947
  },
@@ -3905,6 +4013,8 @@ var columnvue_type_template_id_702a5c98_render = function () {
3905
4013
  attrs: {
3906
4014
  "filter-icon": _vm.filterIcon,
3907
4015
  label: _vm.item.title || _vm.item.label,
4016
+ "label-key": _vm.item.labelKey,
4017
+ "value-key": _vm.item.valueKey,
3908
4018
  prop: _vm.item.field || _vm.item.prop,
3909
4019
  fixed: _vm.item.fixed,
3910
4020
  sortable: _vm.item.sortable || _vm.item.sort,
@@ -3969,11 +4079,11 @@ var columnvue_type_template_id_702a5c98_render = function () {
3969
4079
  2
3970
4080
  )
3971
4081
  }
3972
- var columnvue_type_template_id_702a5c98_staticRenderFns = []
3973
- columnvue_type_template_id_702a5c98_render._withStripped = true
4082
+ var columnvue_type_template_id_1f31fcc6_staticRenderFns = []
4083
+ columnvue_type_template_id_1f31fcc6_render._withStripped = true
3974
4084
 
3975
4085
 
3976
- // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=702a5c98&
4086
+ // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
3977
4087
 
3978
4088
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
3979
4089
  var regenerator_ = __webpack_require__(9);
@@ -4468,6 +4578,79 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
4468
4578
  //
4469
4579
  //
4470
4580
  //
4581
+ //
4582
+ //
4583
+ //
4584
+ //
4585
+ //
4586
+ //
4587
+ //
4588
+ //
4589
+ //
4590
+ //
4591
+ //
4592
+ //
4593
+ //
4594
+ //
4595
+ //
4596
+ //
4597
+ //
4598
+ //
4599
+ //
4600
+ //
4601
+ //
4602
+ //
4603
+ //
4604
+ //
4605
+ //
4606
+ //
4607
+ //
4608
+ //
4609
+ //
4610
+ //
4611
+ //
4612
+ //
4613
+ //
4614
+ //
4615
+ //
4616
+ //
4617
+ //
4618
+ //
4619
+ //
4620
+ //
4621
+ //
4622
+ //
4623
+ //
4624
+ //
4625
+ //
4626
+ //
4627
+ //
4628
+ //
4629
+ //
4630
+ //
4631
+ //
4632
+ //
4633
+ //
4634
+ //
4635
+ //
4636
+ //
4637
+ //
4638
+ //
4639
+ //
4640
+ //
4641
+ //
4642
+ //
4643
+ //
4644
+ //
4645
+ //
4646
+ //
4647
+ //
4648
+ //
4649
+ //
4650
+ //
4651
+ //
4652
+ //
4653
+ //
4471
4654
 
4472
4655
 
4473
4656
 
@@ -4668,8 +4851,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
4668
4851
  var data = col.data ? col.data : col.optionData ? rows[col.optionData] : this.optionDatas[field];
4669
4852
  if (util["a" /* default */].isObject(rows[field])) {
4670
4853
  return rows[field][col.labelKey] || rows[field]['name'] || rows[field]['label'] || rows[field]['shortName'];
4671
- }
4672
- if (Array.isArray(rows[field])) {
4854
+ } else if (Array.isArray(rows[field])) {
4673
4855
  var vals = rows[field].map(function (item) {
4674
4856
  if (util["a" /* default */].isObject(item)) {
4675
4857
  return item[col.labelKey] || item['name'] || item['label'] || item['shortName'];
@@ -4681,12 +4863,22 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
4681
4863
  }
4682
4864
  });
4683
4865
  return vals.join(col.symbol ? col.symbol : '-');
4866
+ } else {
4867
+ if (col.valueToString || col['value-to-string']) {
4868
+ var _vals = rows[field].split(',').map(function (item) {
4869
+ if (data && data.length && util["a" /* default */].isObject(data[0])) {
4870
+ return _this2.getLabel(data, item, col);
4871
+ }
4872
+ return item;
4873
+ });
4874
+ return _vals.join(col.symbol ? col.symbol : '-');
4875
+ } else {
4876
+ if (data && data.length && util["a" /* default */].isObject(data[0])) {
4877
+ return this.getLabel(data, rows[field], col);
4878
+ }
4879
+ return rows[field];
4880
+ }
4684
4881
  }
4685
-
4686
- if (data && data.length && util["a" /* default */].isObject(data[0])) {
4687
- return this.getLabel(data, rows[field], col);
4688
- }
4689
- return rows[field];
4690
4882
  },
4691
4883
  getLabel: function getLabel(obj, val, col) {
4692
4884
  for (var i = 0; i < obj.length; i++) {
@@ -4793,8 +4985,8 @@ var componentNormalizer = __webpack_require__(2);
4793
4985
 
4794
4986
  var component = Object(componentNormalizer["a" /* default */])(
4795
4987
  src_columnvue_type_script_lang_js_,
4796
- columnvue_type_template_id_702a5c98_render,
4797
- columnvue_type_template_id_702a5c98_staticRenderFns,
4988
+ columnvue_type_template_id_1f31fcc6_render,
4989
+ columnvue_type_template_id_1f31fcc6_staticRenderFns,
4798
4990
  false,
4799
4991
  null,
4800
4992
  null,
@@ -6124,7 +6316,8 @@ var mainvue_type_script_lang_js_components;
6124
6316
  util["a" /* default */].exportXls({
6125
6317
  thead: thead,
6126
6318
  data: this.datas,
6127
- name: this.fileName
6319
+ name: this.fileName,
6320
+ option: this.optionDatas
6128
6321
  });
6129
6322
  }
6130
6323
  this.$emit('btnClick', res, this.datas, thead, rows);
@@ -6292,7 +6485,7 @@ var mainvue_type_script_lang_js_components;
6292
6485
 
6293
6486
  var main_component = Object(componentNormalizer["a" /* default */])(
6294
6487
  src_mainvue_type_script_lang_js_,
6295
- mainvue_type_template_id_97c4c582_render,
6488
+ mainvue_type_template_id_154b78e2_render,
6296
6489
  staticRenderFns,
6297
6490
  false,
6298
6491
  null,