From 046b9a36f072881b6021ee939fc01cb1c68f32f2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 9 May 2017 17:44:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/case.js | 2 -- docs/case.js | 2 -- src/case/trigger/trigger.text.select.js | 2 -- 3 files changed, 6 deletions(-) diff --git a/bi/case.js b/bi/case.js index 3c9e1d261..01db5616b 100644 --- a/bi/case.js +++ b/bi/case.js @@ -11346,10 +11346,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }); if (result.length > 0) { - this.trigger.element.removeClass("bi-water-mark"); this.trigger.setText(result.join(",")); } else { - this.trigger.element.addClass("bi-water-mark"); this.trigger.setText(o.text); } }, diff --git a/docs/case.js b/docs/case.js index 3c9e1d261..01db5616b 100644 --- a/docs/case.js +++ b/docs/case.js @@ -11346,10 +11346,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }); if (result.length > 0) { - this.trigger.element.removeClass("bi-water-mark"); this.trigger.setText(result.join(",")); } else { - this.trigger.element.addClass("bi-water-mark"); this.trigger.setText(o.text); } }, diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 6f4c2f90b..5f66a31ab 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -40,10 +40,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }); if (result.length > 0) { - this.trigger.element.removeClass("bi-water-mark"); this.trigger.setText(result.join(",")); } else { - this.trigger.element.addClass("bi-water-mark"); this.trigger.setText(o.text); } }, From 0b67143d9193e69c5733d34c48cb5efa0818ab4e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 10 May 2017 09:22:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?setVisible=E7=9A=84display=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/core.js | 4 ++-- docs/core.js | 4 ++-- src/core/widget.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bi/core.js b/bi/core.js index 744231b76..618a27626 100644 --- a/bi/core.js +++ b/bi/core.js @@ -4512,11 +4512,11 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); }, diff --git a/docs/core.js b/docs/core.js index 429e62f8f..aeb3c209a 100644 --- a/docs/core.js +++ b/docs/core.js @@ -14507,11 +14507,11 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); }, diff --git a/src/core/widget.js b/src/core/widget.js index 2cd8c3b52..2805ce98b 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -208,11 +208,11 @@ BI.Widget = BI.inherit(BI.OB, { setVisible: function (visible) { if (visible === true) { this.options.invisible = false; - this.element.show(); + this.element.css("display", ""); this._mount(); } else if (visible === false) { this.options.invisible = true; - this.element.hide(); + this.element.css("display", "none"); } this.fireEvent(BI.Events.VIEW, visible); },