iov-design 2.15.74 → 2.15.75

package/lib/iov-design.common.js

@@ -17656,19 +17656,6 @@ main.directive = directive;
   render: function render(h) {
     var _this2 = this;
 
-    var content = this.$slots.content || this.content;
-
-    // 如果没有 tooltip 内容，直接返回默认插槽元素，不渲染 popper
-    if (!content) {
-      var _firstElement = this.getFirstElement();
-      if (!_firstElement) return null;
-
-      var _data = _firstElement.data = _firstElement.data || {};
-      _data.staticClass = this.addTooltipClass(_data.staticClass);
-
-      return _firstElement;
-    }
-
     if (this.popperVM) {
       this.popperVM.node = h(
         'transition',
@@ -17703,7 +17690,13 @@ main.directive = directive;
             }],
 
             'class': ['el-tooltip__popper', 'is-' + this.effect, this.popperClass] },
-          [this.$slots.content || this.content]
+          [h(
+            'el-scrollbar',
+            {
+              attrs: { 'wrap-style': 'max-height: 168px;' }
+            },
+            [this.$slots.content || this.content]
+          )]
         )]
       );
     }
@@ -17757,6 +17750,16 @@ main.directive = directive;
       } else {
         Object(dom_["removeClass"])(this.referenceElm, 'focusing');
       }
+    },
+    content: function content(val) {
+      // 如果内容变为空，立即隐藏 tooltip
+      if (!val) {
+        this.showPopper = false;
+        clearTimeout(this.timeout);
+        if (this.timeoutPending) {
+          clearTimeout(this.timeoutPending);
+        }
+      }
     }
   },
   methods: {
@@ -17789,7 +17792,10 @@ main.directive = directive;
     handleShowPopper: function handleShowPopper() {
       var _this4 = this;
 
-      if (!this.expectedState || this.manual) return;
+      // 检查内容是否为空
+      var hasContent = this.content || this.$slots.content && this.$slots.content.length > 0;
+      if (!hasContent || !this.expectedState || this.manual) return;
+
       clearTimeout(this.timeout);
       this.timeout = setTimeout(function () {
         _this4.showPopper = true;
@@ -35859,7 +35865,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.74',
+  version: '2.15.75',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,