Merge pull request #769 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '7ce0e1c96f05448cb271872a8031a855829389d0':
  update
  无JIRA任务 title跟随问题

dist/base.js

@@ -401,6 +401,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -408,29 +419,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -439,9 +461,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

dist/bundle.ie.js

@@ -35484,6 +35484,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -35491,29 +35502,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -35522,9 +35544,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

dist/bundle.js

@@ -35888,6 +35888,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -35895,29 +35906,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -35926,9 +35948,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

dist/demo.js

@@ -6126,7 +6126,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-absolute"
+    },
+    render: function () {
+        return {
+            type: "bi.inline_vertical_adapt",
+            items: [{
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 200
+            }, {
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 100
+            }]
+        };
+    }
+});
+BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

dist/fineui.ie.js

@@ -35726,6 +35726,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -35733,29 +35744,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -35764,9 +35786,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

dist/fineui.js

@@ -36130,6 +36130,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -36137,29 +36148,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -36168,9 +36190,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

dist/fineui_without_jquery_polyfill.js

@@ -24640,6 +24640,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -24647,29 +24658,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -24678,9 +24700,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())

src/base/single/single.js

@@ -59,6 +59,17 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _clearTimeOut: function() {
+        if (BI.isNotNull(this.showTimeout)) {
+            clearTimeout(this.showTimeout);
+            this.showTimeout = null;
+        }
+        if (BI.isNotNull(this.hideTimeout)) {
+            clearTimeout(this.hideTimeout);
+            this.showTimeout = null;
+        }
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
@@ -66,29 +77,40 @@ BI.Single = BI.inherit(BI.Widget, {
             this.element.on("mouseenter.title" + this.getName(), function (e) {
                 self._e = e;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 200);
                 } else if (self.getTipType() === "success" || self.isEnabled()) {
-                    self.timeout = BI.delay(function () {
+                    self.showTimeout = BI.delay(function () {
                         self._showToolTip(self._e || e, opt);
                     }, 500);
                 }
             });
             this.element.on("mousemove.title" + this.getName(), function (e) {
                 self._e = e;
-                if (!self.element.__isMouseInBounds__(e)) {
+                if (BI.isNotNull(self.showTimeout)) {
-                    if (BI.isNotNull(self.timeout)) {
+                    clearTimeout(self.showTimeout);
-                        clearTimeout(self.timeout);
+                    self.showTimeout = null;
                 }
+                if(BI.isNull(self.hideTimeout)) {
+                    self.hideTimeout = BI.delay(function () {
                         self._hideTooltip();
+                    }, 500);
+                }
+
+                self.showTimeout = BI.delay(function () {
+                    if (BI.isNotNull(self.hideTimeout)) {
+                        clearTimeout(self.hideTimeout);
+                        self.hideTimeout = null;
                     }
+                    self._showToolTip(self._e || e, opt);
+                }, 500);
+
+
             });
-            this.element.on("mouseleave.title" + this.getName(), function () {
+            this.element.on("mouseleave.title" + this.getName(), function (e) {
                 self._e = null;
-                if (BI.isNotNull(self.timeout)) {
+                self._clearTimeOut();
-                    clearTimeout(self.timeout);
-                }
                 self._hideTooltip();
             });
             this._hoverBinded = true;
@@ -97,9 +119,7 @@ BI.Single = BI.inherit(BI.Widget, {
 
     disabledHover: function () {
         // 取消hover事件
-        if (BI.isNotNull(this.timeout)) {
+        this._clearTimeOut();
-            clearTimeout(this.timeout);
-        }
         this._hideTooltip();
         this.element.unbind("mouseenter.title" + this.getName())
             .unbind("mousemove.title" + this.getName())