iov-design 2.15.24 → 2.15.26

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 (156) hide show
  1. package/lib/0.7d92a25b.png +0 -0
  2. package/lib/1.196ad096.png +0 -0
  3. package/lib/2.904013cc.png +0 -0
  4. package/lib/4.93f6f3d7.png +0 -0
  5. package/lib/5.f35784ee.png +0 -0
  6. package/lib/6.1aa4ea30.png +0 -0
  7. package/lib/7.e69e68f0.png +0 -0
  8. package/lib/8.016d5815.png +0 -0
  9. package/lib/9.b1293c6e.png +0 -0
  10. package/lib/alert.js +2 -2
  11. package/lib/aside.js +2 -2
  12. package/lib/autocomplete.js +2 -2
  13. package/lib/avatar.js +2 -2
  14. package/lib/backtop.js +2 -2
  15. package/lib/breadcrumb-item.js +2 -2
  16. package/lib/breadcrumb.js +2 -2
  17. package/lib/button-group.js +2 -2
  18. package/lib/button.js +2 -2
  19. package/lib/calendar.js +2 -2
  20. package/lib/card.js +2 -2
  21. package/lib/carousel-item.js +2 -2
  22. package/lib/carousel.js +2 -2
  23. package/lib/cascader-panel.js +6 -6
  24. package/lib/cascader.js +129 -116
  25. package/lib/checkbox-button.js +2 -2
  26. package/lib/checkbox-group.js +9 -9
  27. package/lib/checkbox.js +2 -2
  28. package/lib/col.js +2 -2
  29. package/lib/collapse-item.js +23 -23
  30. package/lib/collapse.js +2 -2
  31. package/lib/color-picker.js +9 -9
  32. package/lib/container.js +2 -2
  33. package/lib/date-picker.js +69 -89
  34. package/lib/descriptions-item.js +2 -2
  35. package/lib/descriptions.js +2 -2
  36. package/lib/dialog.js +16 -16
  37. package/lib/divider.js +2 -2
  38. package/lib/drawer.js +9 -9
  39. package/lib/dropdown-item.js +9 -9
  40. package/lib/dropdown-menu.js +2 -2
  41. package/lib/dropdown.js +9 -9
  42. package/lib/empty.js +115 -416
  43. package/lib/footer.js +2 -2
  44. package/lib/form-item.js +4 -4
  45. package/lib/form.js +2 -2
  46. package/lib/header.js +2 -2
  47. package/lib/icon.js +2 -2
  48. package/lib/image.js +2 -2
  49. package/lib/index.js +1 -1
  50. package/lib/infinite-scroll.js +2 -2
  51. package/lib/input-number.js +2 -2
  52. package/lib/input.js +9 -9
  53. package/lib/iov-design.common.js +205 -480
  54. package/lib/link.js +2 -2
  55. package/lib/loading.js +4 -4
  56. package/lib/locale/lang/zh-CN.js +2 -2
  57. package/lib/main.js +2 -2
  58. package/lib/menu-item-group.js +2 -2
  59. package/lib/menu-item.js +2 -2
  60. package/lib/menu.js +2 -2
  61. package/lib/message-box.js +4 -4
  62. package/lib/message.js +2 -2
  63. package/lib/notification.js +2 -2
  64. package/lib/option-group.js +9 -9
  65. package/lib/option.js +2 -2
  66. package/lib/page-header.js +2 -2
  67. package/lib/pagination.js +6 -6
  68. package/lib/popconfirm.js +4 -4
  69. package/lib/popover.js +2 -2
  70. package/lib/progress.js +2 -2
  71. package/lib/radio-button.js +2 -2
  72. package/lib/radio-group.js +2 -2
  73. package/lib/radio.js +2 -2
  74. package/lib/rate.js +2 -2
  75. package/lib/result.js +2 -2
  76. package/lib/row.js +2 -2
  77. package/lib/scrollbar.js +4 -4
  78. package/lib/select.js +35 -32
  79. package/lib/skeleton-item.js +2 -2
  80. package/lib/skeleton.js +2 -2
  81. package/lib/slider.js +4 -4
  82. package/lib/spinner.js +2 -2
  83. package/lib/static/0.7d92a25.png +0 -0
  84. package/lib/static/1.196ad09.png +0 -0
  85. package/lib/static/2.904013c.png +0 -0
  86. package/lib/static/4.93f6f3d.png +0 -0
  87. package/lib/static/5.f35784e.png +0 -0
  88. package/lib/static/6.1aa4ea3.png +0 -0
  89. package/lib/static/7.e69e68f.png +0 -0
  90. package/lib/static/8.016d581.png +0 -0
  91. package/lib/static/9.b1293c6.png +0 -0
  92. package/lib/statistic.js +2 -2
  93. package/lib/step.js +2 -2
  94. package/lib/steps.js +2 -2
  95. package/lib/submenu.js +2 -2
  96. package/lib/switch.js +16 -16
  97. package/lib/tab-pane.js +2 -2
  98. package/lib/table-column.js +2 -2
  99. package/lib/table.js +59 -20
  100. package/lib/tabs.js +2 -2
  101. package/lib/tag.js +2 -2
  102. package/lib/theme-chalk/autocomplete.css +1 -1
  103. package/lib/theme-chalk/button.css +1 -1
  104. package/lib/theme-chalk/calendar.css +1 -1
  105. package/lib/theme-chalk/cascader-panel.css +1 -1
  106. package/lib/theme-chalk/cascader.css +1 -1
  107. package/lib/theme-chalk/date-picker.css +1 -1
  108. package/lib/theme-chalk/dropdown.css +1 -1
  109. package/lib/theme-chalk/empty.css +1 -1
  110. package/lib/theme-chalk/index.css +1 -1
  111. package/lib/theme-chalk/input-number.css +1 -1
  112. package/lib/theme-chalk/input.css +1 -1
  113. package/lib/theme-chalk/message-box.css +1 -1
  114. package/lib/theme-chalk/pagination.css +1 -1
  115. package/lib/theme-chalk/radio.css +1 -1
  116. package/lib/theme-chalk/select.css +1 -1
  117. package/lib/theme-chalk/slider.css +1 -1
  118. package/lib/theme-chalk/table.css +1 -1
  119. package/lib/theme-chalk/time-picker.css +1 -1
  120. package/lib/theme-chalk/transfer.css +1 -1
  121. package/lib/time-picker.js +2 -2
  122. package/lib/time-select.js +2 -2
  123. package/lib/timeline-item.js +2 -2
  124. package/lib/timeline.js +2 -2
  125. package/lib/tooltip.js +2 -2
  126. package/lib/transfer.js +4 -4
  127. package/lib/tree.js +2 -2
  128. package/lib/umd/locale/zh-CN.js +2 -2
  129. package/lib/upload.js +11 -11
  130. package/package.json +1 -1
  131. package/packages/cascader/src/cascader.vue +20 -9
  132. package/packages/empty/src/img/0.png +0 -0
  133. package/packages/empty/src/img/1.png +0 -0
  134. package/packages/empty/src/img/2.png +0 -0
  135. package/packages/empty/src/img/3.png +0 -0
  136. package/packages/empty/src/img/4.png +0 -0
  137. package/packages/empty/src/img/5.png +0 -0
  138. package/packages/empty/src/img/6.png +0 -0
  139. package/packages/empty/src/img/7.png +0 -0
  140. package/packages/empty/src/img/8.png +0 -0
  141. package/packages/empty/src/img/9.png +0 -0
  142. package/packages/empty/src/index.vue +27 -5
  143. package/packages/select/src/select.vue +16 -24
  144. package/packages/table/src/table.vue +16 -6
  145. package/packages/theme-chalk/src/button.scss +5 -5
  146. package/packages/theme-chalk/src/cascader.scss +20 -0
  147. package/packages/theme-chalk/src/common/var.scss +3 -3
  148. package/packages/theme-chalk/src/empty.scss +4 -10
  149. package/packages/theme-chalk/src/input.scss +8 -5
  150. package/packages/theme-chalk/src/mixins/_button.scss +5 -5
  151. package/packages/theme-chalk/src/radio.scss +5 -0
  152. package/packages/theme-chalk/src/select.scss +21 -20
  153. package/packages/theme-chalk/src/table.scss +25 -6
  154. package/src/index.js +1 -1
  155. package/src/locale/lang/zh-CN.js +2 -2
  156. package/packages/empty/src/img-empty.vue +0 -132
@@ -129,9 +129,7 @@
129
129
  </el-scrollbar>
130
130
  <template v-if="emptyText && (!allowCreate || loading || (allowCreate && options.length === 0 ))">
131
131
  <slot name="empty" v-if="$slots.empty"></slot>
132
- <p class="el-select-dropdown__empty" v-else>
133
- {{ emptyText }}
134
- </p>
132
+ <el-empty v-else :description="emptyText" :type="0" image-size="60"></el-empty>
135
133
  </template>
136
134
  </el-select-menu>
137
135
  </transition>
@@ -147,6 +145,7 @@
147
145
  import ElOption from './option.vue';
148
146
  import ElTag from 'iov-design/packages/tag';
149
147
  import ElScrollbar from 'iov-design/packages/scrollbar';
148
+ import ElEmpty from 'iov-design/packages/empty';
150
149
  import debounce from 'throttle-debounce/debounce';
151
150
  import Clickoutside from 'iov-design/src/utils/clickoutside';
152
151
  import { addResizeListener, removeResizeListener } from 'iov-design/src/utils/resize-event';
@@ -237,10 +236,9 @@
237
236
 
238
237
  collapseTagSize() {
239
238
  const sizeMap = {
240
- '': 'medium',
241
- large: 'medium',
242
- medium: 'small',
243
- small: 'mini',
239
+ large: '',
240
+ medium: 'medium',
241
+ small: 'small',
244
242
  mini: 'mini'
245
243
  };
246
244
  return sizeMap[this.selectSize];
@@ -255,7 +253,8 @@
255
253
  ElSelectMenu,
256
254
  ElOption,
257
255
  ElTag,
258
- ElScrollbar
256
+ ElScrollbar,
257
+ ElEmpty
259
258
  },
260
259
 
261
260
  directives: { Clickoutside },
@@ -653,13 +652,11 @@
653
652
  resetTagsLeft() {
654
653
  this.$nextTick(() => {
655
654
  const prefixLabel = this.$el.querySelector('.el-input-group__prefix-label');
656
- if (prefixLabel) {
657
- const style = prefixLabel && window.getComputedStyle(prefixLabel);
658
- const width = +(style.width.replace(/px/, ''));
659
- const paddingLeft = +(style.paddingLeft.replace(/px/, ''));
660
- const paddingRight = +(style.paddingRight.replace(/px/, ''));
661
- this.tagsLeft = (width + paddingLeft + paddingRight) + 'px';
662
- }
655
+ const prefix = this.$el.querySelector('.el-input__prefix');
656
+ const inputInner = this.$el.querySelector('.el-input__inner');
657
+ const prefixLabelWidth = prefixLabel && Math.round(prefixLabel.getBoundingClientRect().width) || 0;
658
+ const inputPaddingLeft = prefixLabel || prefix ? Math.round(window.getComputedStyle(inputInner).paddingLeft.replace(/px/, '')) : 0;
659
+ this.tagsLeft = (prefixLabelWidth + inputPaddingLeft) + 'px';
663
660
  });
664
661
  },
665
662
 
@@ -673,18 +670,13 @@
673
670
  if (this.collapseTags && !this.filterable) return;
674
671
  this.$nextTick(() => {
675
672
  if (!this.$refs.reference) return;
676
- let inputChildNodes = this.$refs.reference.$el.childNodes;
677
- // 兼容input组件多加了一层el-input-group__inner
678
- Array.from(inputChildNodes).find(child => {
679
- if (child && child.classList && child.classList.contains('el-input-group__inner')) {
680
- inputChildNodes = child;
681
- }
682
- });
683
- // let input = [].filter.call(inputChildNodes, item => item.tagName === 'INPUT')[0];
673
+ const inputInner = this.$el.querySelector('.el-input__inner');
674
+ const groupPrefix = this.$el.querySelector('.el-input-group--prefix');
675
+ const input = groupPrefix || inputInner;
684
676
  const tags = this.$refs.tags;
685
677
  const tagsHeight = tags ? Math.round(tags.getBoundingClientRect().height) : 0;
686
678
  const sizeInMap = this.initialInputHeight || 36;
687
- inputChildNodes.style.height = this.selected.length === 0
679
+ input.style.height = this.selected.length === 0
688
680
  ? sizeInMap + 'px'
689
681
  : Math.max(
690
682
  tags ? (tagsHeight + (tagsHeight > sizeInMap ? 6 : 0)) : 0,
@@ -51,9 +51,11 @@
51
51
  class="el-table__empty-block"
52
52
  ref="emptyBlock"
53
53
  :style="emptyBlockStyle">
54
- <span class="el-table__empty-text" >
55
- <slot name="empty">{{ emptyText || t('el.table.emptyText') }}</slot>
56
- </span>
54
+ <div class="el-table__empty-text" >
55
+ <slot name="empty">
56
+ <el-empty ref="emptyText" @loaded="onEmptyText" :description="emptyText || t('el.table.emptyText')" :type="1" :image-size="['medium','small','mini'].includes(size) ? 86 : 108"></el-empty>
57
+ </slot>
58
+ </div>
57
59
  </div>
58
60
  <div
59
61
  v-if="$slots.append"
@@ -215,6 +217,7 @@
215
217
 
216
218
  <script type="text/babel">
217
219
  import ElCheckbox from 'iov-design/packages/checkbox';
220
+ import ElEmpty from 'iov-design/packages/empty';
218
221
  import { debounce, throttle } from 'throttle-debounce';
219
222
  import { addResizeListener, removeResizeListener } from 'iov-design/src/utils/resize-event';
220
223
  import Mousewheel from 'iov-design/src/directives/mousewheel';
@@ -346,7 +349,8 @@
346
349
  TableHeader,
347
350
  TableFooter,
348
351
  TableBody,
349
- ElCheckbox
352
+ ElCheckbox,
353
+ ElEmpty
350
354
  },
351
355
 
352
356
  methods: {
@@ -500,6 +504,10 @@
500
504
 
501
505
  toggleAllSelection() {
502
506
  this.store.commit('toggleAllSelection');
507
+ },
508
+
509
+ onEmptyText() {
510
+ this.emptyTextHeight = this.$refs.emptyText.$el.offsetHeight;
503
511
  }
504
512
 
505
513
  },
@@ -587,7 +595,7 @@
587
595
 
588
596
  emptyBlockStyle() {
589
597
  if (this.data && this.data.length) return null;
590
- let height = '100%';
598
+ let height = this.emptyTextHeight + 'px';
591
599
  if (this.layout.appendHeight) {
592
600
  height = `calc(100% - ${this.layout.appendHeight}px)`;
593
601
  }
@@ -708,7 +716,9 @@
708
716
  },
709
717
  // 是否拥有多级表头
710
718
  isGroup: false,
711
- scrollPosition: 'left'
719
+ scrollPosition: 'left',
720
+ // 暂无数据高度
721
+ emptyTextHeight: 0
712
722
  };
713
723
  }
714
724
  };
@@ -135,7 +135,7 @@
135
135
  @include m(primary) {
136
136
  @include button-variant($--button-primary-font-color, $--button-primary-background-color, $--button-primary-background-color-hover, $--button-primary-background-color-active, $--button-primary-background-color-disabled);
137
137
  @include when(plain) {
138
- @include button-plain($--color-primary-6, $--color-primary-1, $--color-primary-5, $--color-primary-1, $--color-primary-7, $--color-primary-1, $--color-primary-3, $--color-white)
138
+ @include button-plain($--color-primary-6, $--color-primary-1, $--color-primary-3, $--color-primary-5, $--color-primary-1, $--color-primary-5, $--color-primary-7, $--color-primary-1, $--color-primary-7, $--color-primary-3, $--color-primary-1, $--color-primary-2)
139
139
  }
140
140
  @include when(dashed) {
141
141
  @include button-dashed($--color-primary-6, $--color-primary-1, $--color-primary-5, $--color-primary-1, $--color-primary-7, $--color-primary-1, $--color-primary-3, $--color-white)
@@ -147,7 +147,7 @@
147
147
  @include m(success) {
148
148
  @include button-variant($--button-success-font-color, $--button-success-background-color, $--button-success-background-color-hover, $--button-success-background-color-active, $--button-success-background-color-disabled);
149
149
  @include when(plain) {
150
- @include button-plain($--color-success-6, $--color-success-1, $--color-success-5, $--color-success-1, $--color-success-7, $--color-success-1, $--color-success-3, $--color-white)
150
+ @include button-plain($--color-success-6, $--color-success-1, $--color-success-3, $--color-success-5, $--color-success-1, $--color-success-5, $--color-success-7, $--color-success-1, $--color-success-7, $--color-success-3, $--color-success-1, $--color-success-2)
151
151
  }
152
152
  @include when(dashed) {
153
153
  @include button-dashed($--color-success-6, $--color-success-1, $--color-success-5, $--color-success-1, $--color-success-7, $--color-success-1, $--color-success-3, $--color-white)
@@ -159,7 +159,7 @@
159
159
  @include m(warning) {
160
160
  @include button-variant($--button-warning-font-color, $--button-warning-background-color, $--button-warning-background-color-hover, $--button-warning-background-color-active, $--button-warning-background-color-disabled);
161
161
  @include when(plain) {
162
- @include button-plain($--color-warning-6, $--color-warning-1, $--color-warning-5, $--color-warning-1, $--color-warning-7, $--color-warning-1, $--color-warning-3, $--color-white)
162
+ @include button-plain($--color-warning-6, $--color-warning-1, $--color-warning-3, $--color-warning-5, $--color-warning-1, $--color-warning-5, $--color-warning-7, $--color-warning-1, $--color-warning-7, $--color-warning-3, $--color-warning-1, $--color-warning-2)
163
163
  }
164
164
  @include when(dashed) {
165
165
  @include button-dashed($--color-warning-6, $--color-warning-1, $--color-warning-5, $--color-warning-1, $--color-warning-7, $--color-warning-1, $--color-warning-3, $--color-white)
@@ -171,7 +171,7 @@
171
171
  @include m(danger) {
172
172
  @include button-variant($--button-danger-font-color, $--button-danger-background-color, $--button-danger-background-color-hover, $--button-danger-background-color-active, $--button-danger-background-color-disabled);
173
173
  @include when(plain) {
174
- @include button-plain($--color-danger-6, $--color-danger-1, $--color-danger-5, $--color-danger-1, $--color-danger-7, $--color-danger-1, $--color-danger-3, $--color-white)
174
+ @include button-plain($--color-danger-6, $--color-danger-1, $--color-danger-3, $--color-danger-5, $--color-danger-1, $--color-danger-5, $--color-danger-7, $--color-danger-1, $--color-danger-7, $--color-danger-3, $--color-danger-1, $--color-danger-2)
175
175
  }
176
176
  @include when(dashed) {
177
177
  @include button-dashed($--color-danger-6, $--color-danger-1, $--color-danger-5, $--color-danger-1, $--color-danger-7, $--color-danger-1, $--color-danger-3, $--color-white)
@@ -183,7 +183,7 @@
183
183
  @include m(info) {
184
184
  @include button-variant($--button-info-font-color, $--button-info-background-color, $--button-info-background-color-hover, $--button-info-background-color-active, $--button-info-background-color-disabled);
185
185
  @include when(plain) {
186
- @include button-plain($--color-fill-6, $--color-fill-1, $--color-fill-5, $--color-fill-1, $--color-fill-7, $--color-fill-1, $--color-fill-3, $--color-white)
186
+ @include button-plain($--color-fill-6, $--color-fill-1, $--color-fill-3, $--color-fill-5, $--color-fill-1, $--color-fill-5, $--color-fill-7, $--color-fill-1, $--color-fill-7, $--color-fill-3, $--color-fill-1, $--color-fill-2)
187
187
  }
188
188
  @include when(dashed) {
189
189
  @include button-dashed($--color-fill-6, $--color-fill-1, $--color-fill-5, $--color-fill-1, $--color-fill-7, $--color-fill-1, $--color-fill-3, $--color-white)
@@ -55,19 +55,36 @@
55
55
  }
56
56
  }
57
57
 
58
+ .el-tag {
59
+ height: $--input-height - 8px;
60
+ line-height: $--input-height - 8px;
61
+ }
62
+
58
63
  @include m(medium) {
59
64
  font-size: $--input-medium-font-size;
60
65
  line-height: $--input-medium-height;
66
+ .el-tag--medium {
67
+ height: $--input-medium-height - 8px;
68
+ line-height: $--input-medium-height - 8px;
69
+ }
61
70
  }
62
71
 
63
72
  @include m(small) {
64
73
  font-size: $--input-small-font-size;
65
74
  line-height: $--input-small-height;
75
+ .el-tag--small {
76
+ height: $--input-small-height - 8px;
77
+ line-height: $--input-small-height - 8px;
78
+ }
66
79
  }
67
80
 
68
81
  @include m(mini) {
69
82
  font-size: $--input-mini-font-size;
70
83
  line-height: $--input-mini-height;
84
+ .el-tag--mini {
85
+ height: $--input-mini-height - 8px;
86
+ line-height: $--input-mini-height - 8px;
87
+ }
71
88
  }
72
89
 
73
90
  @include when(disabled) {
@@ -100,6 +117,8 @@
100
117
  line-height: normal;
101
118
  text-align: left;
102
119
  box-sizing: border-box;
120
+ z-index: 3;
121
+ pointer-events: none;
103
122
 
104
123
  .el-tag {
105
124
  display: inline-flex;
@@ -108,6 +127,7 @@
108
127
  margin: 2px 0 2px 6px;
109
128
  text-overflow: ellipsis;
110
129
  color: $--color-text-6;
130
+ pointer-events: auto;
111
131
 
112
132
  &.is-disabled {
113
133
  color: $--color-text-3;
@@ -854,10 +854,10 @@ $--avatar-small-size: 28px !default;
854
854
 
855
855
  /* Empty
856
856
  -------------------------- */
857
- $--empty-padding: 40px 0 !default;
857
+ $--empty-padding: 12px 0 16px !default;
858
858
  $--empty-image-width: 160px !default;
859
- $--empty-description-margin-top: 20px !default;
860
- $--empty-bottom-margin-top: 20px !default;
859
+ $--empty-description-margin-top: 0 !default;
860
+ $--empty-bottom-margin-top: 16px !default;
861
861
 
862
862
  /* Descriptions
863
863
  -------------------------- */
@@ -20,22 +20,16 @@
20
20
  vertical-align: top;
21
21
  object-fit: contain;
22
22
  }
23
-
24
- svg {
25
- fill: $--svg-monochrome-grey;
26
- width: 100%;
27
- height: 100%;
28
- vertical-align: top;
29
- }
30
23
  }
31
24
 
32
25
  @include e(description) {
33
26
  margin-top: $--empty-description-margin-top;
34
27
 
35
- p {
28
+ .description-text {
36
29
  margin: 0;
37
- font-size: $--font-size-base;
38
- color: $--color-text-secondary;
30
+ padding: 0;
31
+ font-size: 12px;
32
+ color: $--color-text-2;
39
33
  }
40
34
  }
41
35
 
@@ -157,7 +157,13 @@
157
157
  box-shadow: $--input-box-shadow;
158
158
  }
159
159
  }
160
-
160
+ @include e((prefix, suffix)) {
161
+ .el-input__icon {
162
+ line-height: $--input-height - 2px;
163
+ display: flex;
164
+ align-items: center;
165
+ }
166
+ }
161
167
  @include e(suffix) {
162
168
  padding-left: 8px;
163
169
  position: absolute;
@@ -434,9 +440,6 @@
434
440
  &.is-disabled {
435
441
  background-color: $--input-disabled-fill;
436
442
  }
437
- .el-input__icon {
438
- line-height: $--input-height - 2px;
439
- }
440
443
  .el-input__inner,
441
444
  &:focus {
442
445
  margin: 0 auto;
@@ -455,7 +458,7 @@
455
458
  }
456
459
  }
457
460
  @include e((prefix-label, suffix-label)) {
458
- color: $--color-text-3;
461
+ color: $--color-text-4;
459
462
  position: relative;
460
463
  padding: 0 0 0 12px;
461
464
  white-space: nowrap;
@@ -1,19 +1,19 @@
1
1
  @import "../common/var";
2
- @mixin button-plain($color, $background-color, $color-hover, $background-color-hover, $color-active, $background-color-active, $color-disabled, $background-color-disabled) {
2
+ @mixin button-plain($color, $background-color, $border-color, $color-hover, $background-color-hover, $border-color-hover, $color-active, $background-color-active, $border-color-active, $color-disabled, $background-color-disabled, $border-color-disabled) {
3
3
  background: $background-color;
4
- border-color: $color;
4
+ border-color: $border-color;
5
5
  color: $color;
6
6
 
7
7
  &:hover {
8
8
  background: $background-color-hover;
9
- border-color: $color-hover;
9
+ border-color: $border-color-hover;
10
10
  color: $color-hover;
11
11
  }
12
12
 
13
13
  &:active,
14
14
  &.is-active {
15
15
  background: $background-color-active;
16
- border-color: $color-active;
16
+ border-color: $border-color-active;
17
17
  color: $color-active;
18
18
  outline: none;
19
19
  }
@@ -24,7 +24,7 @@
24
24
  &:focus,
25
25
  &:active {
26
26
  background-color: $background-color-disabled;
27
- border-color: $color-disabled;
27
+ border-color: $border-color-disabled;
28
28
  color: $color-disabled;
29
29
  }
30
30
  }
@@ -149,6 +149,11 @@
149
149
  line-height: $--radio-bordered-height;
150
150
  transition: background-color ease .3s;
151
151
 
152
+ &:hover {
153
+ color: $--color-primary-5;
154
+ background: $--color-primary-2;
155
+ }
156
+
152
157
  &.is-checked {
153
158
  background: $--color-primary-2;
154
159
  .el-radio__label {
@@ -38,7 +38,7 @@
38
38
  }
39
39
  & .el-select__caret {
40
40
  padding-right: 0;
41
- color: $--select-input-color;
41
+ color: $--color-fill-5;
42
42
  font-size: $--select-icon-size;
43
43
  transition: transform .3s;
44
44
  transform: rotateZ(180deg);
@@ -144,23 +144,6 @@
144
144
  text-overflow: ellipsis;
145
145
  }
146
146
 
147
- @include m(large) {
148
- .el-tag--medium {
149
- height: 28px;
150
- }
151
- }
152
- @include m(medium) {
153
- .el-tag--small {
154
- height: 24px;
155
- }
156
- }
157
- @include m(mini) {
158
- .el-tag--mini {
159
- height: 18px;
160
- }
161
- }
162
-
163
-
164
147
  &.is-disabled {
165
148
  .el-tag {
166
149
  &.el-tag--info {
@@ -178,13 +161,31 @@
178
161
  max-width: 100%;
179
162
  align-items: center;
180
163
  pointer-events: auto;
164
+ height: $--input-height - 8px;
165
+ line-height: $--input-height - 8px;
181
166
  &.el-tag--info {
182
167
  background: $--color-fill-2;
183
168
  color: $--color-text-6;
184
169
  border: 0 none;
185
170
  }
186
- &.el-tag--medium {
187
- height: 28px;
171
+ }
172
+
173
+ @include m(medium) {
174
+ .el-tag--medium {
175
+ height: $--input-medium-height - 8px;
176
+ line-height: $--input-medium-height - 8px;
177
+ }
178
+ }
179
+ @include m(small) {
180
+ .el-tag--small {
181
+ height: $--input-small-height - 8px;
182
+ line-height: $--input-small-height - 8px;
183
+ }
184
+ }
185
+ @include m(mini) {
186
+ .el-tag--mini {
187
+ height: $--input-mini-height - 8px;
188
+ line-height: $--input-mini-height - 8px;
188
189
  }
189
190
  }
190
191
  }
@@ -18,7 +18,6 @@
18
18
 
19
19
  // 数据为空
20
20
  @include e(empty-block) {
21
- min-height: 60px;
22
21
  text-align: center;
23
22
  width: 100%;
24
23
  display: flex;
@@ -29,9 +28,12 @@
29
28
  @include e(empty-text) {
30
29
  // min-height doesn't work in IE10 and IE11 https://github.com/philipwalton/flexbugs#3-min-height-on-a-flex-container-wont-apply-to-its-flex-items
31
30
  // set empty text line height up to contrainer min-height as workaround.
32
- line-height: 60px;
33
31
  width: 50%;
34
- color: $--color-text-secondary;
32
+ color: $--color-text-2;
33
+ position: absolute;
34
+ left: 50%;
35
+ transform: translateX(-50%);
36
+ pointer-events: none;
35
37
  }
36
38
 
37
39
  // 展开行
@@ -321,12 +323,26 @@
321
323
  .el-table__cell {
322
324
  border-right: 0 none;
323
325
  }
326
+ .el-table__row {
327
+ &:last-child {
328
+ td {
329
+ border-bottom: 0 none;
330
+ }
331
+ }
332
+ }
324
333
  }
325
334
 
326
335
  @include m(hidden) {
327
336
  visibility: hidden;
328
337
  }
329
338
 
339
+ &:hover {
340
+ .el-table__fixed,
341
+ .el-table__fixed-right {
342
+ // 滚动条在有固定列上无法选中的问题
343
+ pointer-events: none;
344
+ }
345
+ }
330
346
  @include e((fixed, fixed-right)) {
331
347
  position: absolute;
332
348
  top: 0;
@@ -334,6 +350,9 @@
334
350
  overflow-x: hidden;
335
351
  overflow-y: hidden;
336
352
  box-shadow: $--table-fixed-box-shadow;
353
+ .cell {
354
+ pointer-events: auto;
355
+ }
337
356
 
338
357
  &::before {
339
358
  content: '';
@@ -341,8 +360,8 @@
341
360
  left: 0;
342
361
  bottom: 0;
343
362
  width: 100%;
344
- height: 1px;
345
- background-color: $--border-color-lighter;
363
+ // height: 1px;
364
+ // background-color: $--border-color-lighter;
346
365
  z-index: 4;
347
366
  }
348
367
  }
@@ -430,7 +449,7 @@
430
449
 
431
450
  @include e(body-wrapper) {
432
451
  overflow: hidden;
433
- position: relative;
452
+ position: initial;
434
453
 
435
454
  @include when(scrolling-none) {
436
455
  ~ .el-table__fixed,
package/src/index.js CHANGED
@@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
212
212
  }
213
213
 
214
214
  export default {
215
- version: '2.15.24',
215
+ version: '2.15.26',
216
216
  locale: locale.use,
217
217
  i18n: locale.i18n,
218
218
  install,
@@ -61,7 +61,7 @@ export default {
61
61
  select: {
62
62
  loading: '加载中',
63
63
  noMatch: '无匹配数据',
64
- noData: '无数据',
64
+ noData: '暂无数据',
65
65
  placeholder: '请选择'
66
66
  },
67
67
  cascader: {
@@ -100,7 +100,7 @@ export default {
100
100
  },
101
101
  transfer: {
102
102
  noMatch: '无匹配数据',
103
- noData: '无数据',
103
+ noData: '暂无数据',
104
104
  titles: ['列表 1', '列表 2'],
105
105
  filterPlaceholder: '请输入搜索内容',
106
106
  noCheckedFormat: '共 {total} 项',
@@ -1,132 +0,0 @@
1
- <template>
2
- <svg
3
- viewBox="0 0 79 86"
4
- version="1.1"
5
- xmlns="http://www.w3.org/2000/svg"
6
- xmlns:xlink="http://www.w3.org/1999/xlink"
7
- >
8
- <defs>
9
- <linearGradient
10
- :id="`linearGradient-1-${id}`"
11
- x1="38.8503086%"
12
- y1="0%"
13
- x2="61.1496914%"
14
- y2="100%"
15
- >
16
- <stop stop-color="#FCFCFD" offset="0%" />
17
- <stop stop-color="#EEEFF3" offset="100%" />
18
- </linearGradient>
19
- <linearGradient
20
- :id="`linearGradient-2-${id}`"
21
- x1="0%"
22
- y1="9.5%"
23
- x2="100%"
24
- y2="90.5%"
25
- >
26
- <stop stop-color="#FCFCFD" offset="0%" />
27
- <stop stop-color="#E9EBEF" offset="100%" />
28
- </linearGradient>
29
- <rect
30
- :id="`path-3-${id}`"
31
- x="0"
32
- y="0"
33
- width="17"
34
- height="36"
35
- />
36
- </defs>
37
- <g
38
- id="Illustrations"
39
- stroke="none"
40
- stroke-width="1"
41
- fill="none"
42
- fill-rule="evenodd"
43
- >
44
- <g id="B-type" transform="translate(-1268.000000, -535.000000)">
45
- <g id="Group-2" transform="translate(1268.000000, 535.000000)">
46
- <path
47
- id="Oval-Copy-2"
48
- d="M39.5,86 C61.3152476,86 79,83.9106622 79,81.3333333 C79,78.7560045 57.3152476,78 35.5,78 C13.6847524,78 0,78.7560045 0,81.3333333 C0,83.9106622 17.6847524,86 39.5,86 Z"
49
- fill="#F7F8FC"
50
- />
51
- <polygon
52
- id="Rectangle-Copy-14"
53
- fill="#E5E7E9"
54
- transform="translate(27.500000, 51.500000) scale(1, -1) translate(-27.500000, -51.500000) "
55
- points="13 58 53 58 42 45 2 45"
56
- />
57
- <g
58
- id="Group-Copy"
59
- transform="translate(34.500000, 31.500000) scale(-1, 1) rotate(-25.000000) translate(-34.500000, -31.500000) translate(7.000000, 10.000000)"
60
- >
61
- <polygon
62
- id="Rectangle-Copy-10"
63
- fill="#E5E7E9"
64
- transform="translate(11.500000, 5.000000) scale(1, -1) translate(-11.500000, -5.000000) "
65
- points="2.84078316e-14 3 18 3 23 7 5 7"
66
- />
67
- <polygon id="Rectangle-Copy-11" fill="#EDEEF2" points="-3.69149156e-15 7 38 7 38 43 -3.69149156e-15 43" />
68
- <rect
69
- id="Rectangle-Copy-12"
70
- :fill="`url(#linearGradient-1-${id})`"
71
- transform="translate(46.500000, 25.000000) scale(-1, 1) translate(-46.500000, -25.000000) "
72
- x="38"
73
- y="7"
74
- width="17"
75
- height="36"
76
- />
77
- <polygon
78
- id="Rectangle-Copy-13"
79
- fill="#F8F9FB"
80
- transform="translate(39.500000, 3.500000) scale(-1, 1) translate(-39.500000, -3.500000) "
81
- points="24 7 41 7 55 -3.63806207e-12 38 -3.63806207e-12"
82
- />
83
- </g>
84
- <rect
85
- id="Rectangle-Copy-15"
86
- :fill="`url(#linearGradient-2-${id})`"
87
- x="13"
88
- y="45"
89
- width="40"
90
- height="36"
91
- />
92
- <g id="Rectangle-Copy-17" transform="translate(53.000000, 45.000000)">
93
- <mask :id="`mask-4-${id}`" fill="white">
94
- <use :xlink:href="`#path-3-${id}`" />
95
- </mask>
96
- <use
97
- id="Mask"
98
- fill="#E0E3E9"
99
- transform="translate(8.500000, 18.000000) scale(-1, 1) translate(-8.500000, -18.000000) "
100
- :xlink:href="`#path-3-${id}`"
101
- />
102
- <polygon
103
- id="Rectangle-Copy"
104
- fill="#D5D7DE"
105
- :mask="`url(#mask-4-${id})`"
106
- transform="translate(12.000000, 9.000000) scale(-1, 1) translate(-12.000000, -9.000000) "
107
- points="7 0 24 0 20 18 -1.70530257e-13 16"
108
- />
109
- </g>
110
- <polygon
111
- id="Rectangle-Copy-18"
112
- fill="#F8F9FB"
113
- transform="translate(66.000000, 51.500000) scale(-1, 1) translate(-66.000000, -51.500000) "
114
- points="62 45 79 45 70 58 53 58"
115
- />
116
- </g>
117
- </g>
118
- </g>
119
- </svg>
120
- </template>
121
-
122
- <script>
123
- let id = 0;
124
- export default {
125
- name: 'ImgEmpty',
126
- data() {
127
- return {
128
- id: ++id
129
- };
130
- }
131
- };
132
- </script>