iov-design 2.15.74 → 2.15.76

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/alert.js +2 -2
  2. package/lib/aside.js +2 -2
  3. package/lib/autocomplete.js +2 -2
  4. package/lib/avatar.js +2 -2
  5. package/lib/backtop.js +2 -2
  6. package/lib/badge.js +2 -2
  7. package/lib/breadcrumb-item.js +2 -2
  8. package/lib/breadcrumb.js +2 -2
  9. package/lib/button-group.js +2 -2
  10. package/lib/button.js +2 -2
  11. package/lib/calendar.js +2 -2
  12. package/lib/card.js +2 -2
  13. package/lib/carousel-item.js +2 -2
  14. package/lib/carousel.js +2 -2
  15. package/lib/cascader-panel.js +4 -4
  16. package/lib/cascader.js +4 -4
  17. package/lib/checkbox-button.js +2 -2
  18. package/lib/checkbox-group.js +2 -2
  19. package/lib/checkbox.js +2 -2
  20. package/lib/col.js +2 -2
  21. package/lib/collapse-item.js +2 -2
  22. package/lib/collapse.js +2 -2
  23. package/lib/color-picker.js +2 -2
  24. package/lib/container.js +2 -2
  25. package/lib/date-picker.js +3 -2
  26. package/lib/descriptions-item.js +2 -2
  27. package/lib/descriptions.js +2 -2
  28. package/lib/dialog.js +2 -2
  29. package/lib/divider.js +2 -2
  30. package/lib/drawer.js +2 -2
  31. package/lib/dropdown-item.js +2 -2
  32. package/lib/dropdown-menu.js +2 -2
  33. package/lib/dropdown.js +2 -2
  34. package/lib/empty.js +2 -2
  35. package/lib/footer.js +2 -2
  36. package/lib/form-item.js +4 -4
  37. package/lib/form.js +2 -2
  38. package/lib/header.js +2 -2
  39. package/lib/icon.js +2 -2
  40. package/lib/image.js +2 -2
  41. package/lib/index.js +1 -1
  42. package/lib/infinite-scroll.js +2 -2
  43. package/lib/input-number.js +2 -2
  44. package/lib/input.js +2 -2
  45. package/lib/iov-design.common.js +58 -52
  46. package/lib/link.js +2 -2
  47. package/lib/loading.js +2 -2
  48. package/lib/main.js +2 -2
  49. package/lib/menu-item-group.js +2 -2
  50. package/lib/menu-item.js +2 -2
  51. package/lib/menu.js +2 -2
  52. package/lib/message-box.js +11 -11
  53. package/lib/message.js +2 -2
  54. package/lib/notification.js +2 -2
  55. package/lib/option-group.js +2 -2
  56. package/lib/option.js +2 -2
  57. package/lib/page-header.js +2 -2
  58. package/lib/pagination.js +6 -6
  59. package/lib/popconfirm.js +4 -4
  60. package/lib/popover.js +2 -2
  61. package/lib/progress.js +2 -2
  62. package/lib/radio-button.js +2 -2
  63. package/lib/radio-group.js +2 -2
  64. package/lib/radio.js +2 -2
  65. package/lib/rate.js +2 -2
  66. package/lib/result.js +2 -2
  67. package/lib/row.js +2 -2
  68. package/lib/scrollbar.js +2 -2
  69. package/lib/select.js +2 -2
  70. package/lib/skeleton-item.js +2 -2
  71. package/lib/skeleton.js +2 -2
  72. package/lib/slider.js +4 -4
  73. package/lib/spinner.js +2 -2
  74. package/lib/statistic.js +2 -2
  75. package/lib/step.js +2 -2
  76. package/lib/steps.js +2 -2
  77. package/lib/submenu.js +2 -2
  78. package/lib/switch.js +2 -2
  79. package/lib/tab-pane.js +2 -2
  80. package/lib/table-column.js +2 -2
  81. package/lib/table.js +9 -8
  82. package/lib/tabs.js +2 -2
  83. package/lib/tag.js +2 -2
  84. package/lib/theme-chalk/index.css +1 -1
  85. package/lib/theme-chalk/slider.css +1 -1
  86. package/lib/theme-chalk/table.css +1 -1
  87. package/lib/theme-chalk/tooltip.css +1 -1
  88. package/lib/time-picker.js +2 -2
  89. package/lib/time-select.js +2 -2
  90. package/lib/timeline-item.js +2 -2
  91. package/lib/timeline.js +2 -2
  92. package/lib/tooltip.js +23 -17
  93. package/lib/transfer.js +2 -2
  94. package/lib/tree.js +2 -2
  95. package/lib/upload.js +16 -15
  96. package/lib/utils/file-icon.js +14 -0
  97. package/package.json +1 -1
  98. package/packages/theme-chalk/src/tooltip.scss +3 -0
  99. package/packages/tooltip/src/main.js +17 -15
  100. package/packages/upload/src/utils.js +1 -11
  101. package/src/index.js +1 -1
  102. package/src/utils/file-icon.js +11 -0
@@ -76,19 +76,6 @@ export default {
76
76
  },
77
77
 
78
78
  render(h) {
79
- const content = this.$slots.content || this.content;
80
-
81
- // 如果没有 tooltip 内容,直接返回默认插槽元素,不渲染 popper
82
- if (!content) {
83
- const firstElement = this.getFirstElement();
84
- if (!firstElement) return null;
85
-
86
- const data = firstElement.data = firstElement.data || {};
87
- data.staticClass = this.addTooltipClass(data.staticClass);
88
-
89
- return firstElement;
90
- }
91
-
92
79
  if (this.popperVM) {
93
80
  this.popperVM.node = (
94
81
  <transition
@@ -105,7 +92,9 @@ export default {
105
92
  class={
106
93
  ['el-tooltip__popper', 'is-' + this.effect, this.popperClass]
107
94
  }>
108
- { this.$slots.content || this.content }
95
+ <el-scrollbar wrap-style="max-height: 168px;">
96
+ { this.$slots.content || this.content }
97
+ </el-scrollbar>
109
98
  </div>
110
99
  </transition>);
111
100
  }
@@ -157,6 +146,16 @@ export default {
157
146
  } else {
158
147
  removeClass(this.referenceElm, 'focusing');
159
148
  }
149
+ },
150
+ content(val) {
151
+ // 如果内容变为空,立即隐藏 tooltip
152
+ if (!val) {
153
+ this.showPopper = false;
154
+ clearTimeout(this.timeout);
155
+ if (this.timeoutPending) {
156
+ clearTimeout(this.timeoutPending);
157
+ }
158
+ }
160
159
  }
161
160
  },
162
161
  methods: {
@@ -190,7 +189,10 @@ export default {
190
189
  },
191
190
 
192
191
  handleShowPopper() {
193
- if (!this.expectedState || this.manual) return;
192
+ // 检查内容是否为空
193
+ const hasContent = this.content || (this.$slots.content && this.$slots.content.length > 0);
194
+ if (!hasContent || !this.expectedState || this.manual) return;
195
+
194
196
  clearTimeout(this.timeout);
195
197
  this.timeout = setTimeout(() => {
196
198
  this.showPopper = true;
@@ -1,14 +1,4 @@
1
- const ICON_MAP = {
2
- img: '//obs-helf.cucloud.cn/prod-common-public/iov-design/img.png', // require('./assets/img.png'),
3
- pdf: '//obs-helf.cucloud.cn/prod-common-public/iov-design/pdf.png', // require('./assets/pdf.png'),
4
- excel: '//obs-helf.cucloud.cn/prod-common-public/iov-design/excel.png', // require('./assets/excel.png'),
5
- zip: '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
6
- rar: '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
7
- '7z': '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
8
- ppt: '//obs-helf.cucloud.cn/prod-common-public/iov-design/ppt.png', // require('./assets/ppt.png'),
9
- word: '//obs-helf.cucloud.cn/prod-common-public/iov-design/word.png', // require('./assets/word.png'),
10
- default: '//obs-helf.cucloud.cn/prod-common-public/iov-design/file.png' // require('./assets/file.png')
11
- };
1
+ import ICON_MAP from 'iov-design/src/utils/file-icon';
12
2
 
13
3
  export function iconStyle(fileName) {
14
4
  if (!fileName) return;
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.74',
215
+ version: '2.15.76',
216
216
  locale: locale.use,
217
217
  i18n: locale.i18n,
218
218
  install,
@@ -0,0 +1,11 @@
1
+ export default {
2
+ img: '//obs-helf.cucloud.cn/prod-common-public/iov-design/img.png', // require('./assets/img.png'),
3
+ pdf: '//obs-helf.cucloud.cn/prod-common-public/iov-design/pdf.png', // require('./assets/pdf.png'),
4
+ excel: '//obs-helf.cucloud.cn/prod-common-public/iov-design/excel.png', // require('./assets/excel.png'),
5
+ zip: '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
6
+ rar: '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
7
+ '7z': '//obs-helf.cucloud.cn/prod-common-public/iov-design/zip.png', // require('./assets/zip.png'),
8
+ ppt: '//obs-helf.cucloud.cn/prod-common-public/iov-design/ppt.png', // require('./assets/ppt.png'),
9
+ word: '//obs-helf.cucloud.cn/prod-common-public/iov-design/word.png', // require('./assets/word.png'),
10
+ default: '//obs-helf.cucloud.cn/prod-common-public/iov-design/file.png' // require('./assets/file.png')
11
+ };