diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 19c2c4bf58..2e51c0842e 100644 Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg index 8541cc1d46..adf22db06c 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -20,6 +20,18 @@ Created by iconfont /> + + + + + + + + + + + + @@ -359,7 +371,7 @@ Created by iconfont - + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index d1a7b4f8b1..216b4a9cbd 100644 Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff index e4088c07ba..89c0b964df 100644 Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2 index 28f2930702..ddacc15129 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/src/base/single/single.js b/src/base/single/single.js index 15504359fe..a4c9c46b0b 100644 --- a/src/base/single/single.js +++ b/src/base/single/single.js @@ -96,7 +96,7 @@ BI.Single = BI.inherit(BI.Widget, { clearTimeout(self.showTimeout); self.showTimeout = null; } - if(BI.isNull(self.hideTimeout)) { + if (BI.isNull(self.hideTimeout)) { self.hideTimeout = BI.delay(function () { if (BI.isNotNull(self.hideTimeout)) { self._hideTooltip(); @@ -176,7 +176,7 @@ BI.Single = BI.inherit(BI.Widget, { getTitle: function () { var title = this.options.title; - if(BI.isFunction(title)) { + if (BI.isFunction(title)) { return title(); } return title; @@ -184,7 +184,7 @@ BI.Single = BI.inherit(BI.Widget, { getWarningTitle: function () { var title = this.options.warningTitle; - if(BI.isFunction(title)) { + if (BI.isFunction(title)) { return title(); } return title; @@ -200,12 +200,11 @@ BI.Single = BI.inherit(BI.Widget, { return this.options.value; }, - _unMount: function () { - BI.Single.superclass._unMount.apply(this, arguments); - if(BI.isNotNull(this.showTimeout)) { + destroyed: function () { + if (BI.isNotNull(this.showTimeout)) { clearTimeout(this.showTimeout); this.showTimeout = null; } BI.Tooltips.remove(this.getName()); - } + }, }); \ No newline at end of file diff --git a/src/core/widget.js b/src/core/widget.js index df65ba7fdc..78d5e76468 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -486,6 +486,7 @@ destroy: function () { this.__d(); this.element.destroy(); + this.fireEvent(BI.Events.UNMOUNT); this.fireEvent(BI.Events.DESTROY); this._purgeRef(); this.purgeListeners(); diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 810293c4b6..3440bd3058 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -3,6 +3,10 @@ /**********BI.BIListView*************/ .bi-popup-view { position: fixed !important; + // -ms-device-fixed >= IE11 + // 与fixed表现形式一致,区别在于浏览器缩放的时候,-ms-device-fixed的元素不受其影响,而fixed的元素受其影响 + // 最重要的是-ms-device-fixed解决了IE11下的残影问题 + position: -ms-device-fixed !important; overflow-y: visible !important; overflow-x: visible !important; overflow: visible !important; @@ -42,10 +46,4 @@ & .list-view-shadow { .box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80)); } -} - -.hack { - .bi-popup-view { - position: -ms-page !important; - } } \ No newline at end of file diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 2ff6e6e60e..1eae029b3c 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -9,6 +9,7 @@ @font-size-15: 15px; @font-size-16: 16px; @font-size-18: 18px; +@font-size-20: 20px; @font-size-22: 22px; @font-size-24: 24px; @font-size-30: 30px;