From 4bf4a73a4a0f047b8c1a8fded181e51c258ba33a Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 31 Mar 2017 14:41:28 +0800 Subject: [PATCH 1/2] add --- bi/core.js | 7 +++++-- dist/core.js | 7 +++++-- src/core/controller/controller.floatbox.js | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bi/core.js b/bi/core.js index e47cc4482..8bc0d4a39 100644 --- a/bi/core.js +++ b/bi/core.js @@ -15623,6 +15623,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { this.floatManager = {}; this.floatLayer = {}; this.floatContainer = {}; + this.floatOpened = {}; this.zindex = BI.zIndex_floatbox; this.zindexMap = {}; }, @@ -15687,7 +15688,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (!this.floatContainer[name].isVisible()) { + if (!this.floatOpened[name]) { + this.floatOpened[name] = true; var container = this.floatContainer[name]; container.element.css("zIndex", this.zindex++); this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]); @@ -15718,7 +15720,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (this.floatContainer[name].isVisible()) { + if (this.floatOpened[name]) { + delete this.floatOpened[name]; this.floatContainer[name].invisible(); this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]); } diff --git a/dist/core.js b/dist/core.js index 9c8a9f4bf..534d267bf 100644 --- a/dist/core.js +++ b/dist/core.js @@ -20696,6 +20696,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { this.floatManager = {}; this.floatLayer = {}; this.floatContainer = {}; + this.floatOpened = {}; this.zindex = BI.zIndex_floatbox; this.zindexMap = {}; }, @@ -20760,7 +20761,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (!this.floatContainer[name].isVisible()) { + if (!this.floatOpened[name]) { + this.floatOpened[name] = true; var container = this.floatContainer[name]; container.element.css("zIndex", this.zindex++); this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]); @@ -20791,7 +20793,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (this.floatContainer[name].isVisible()) { + if (this.floatOpened[name]) { + delete this.floatOpened[name]; this.floatContainer[name].invisible(); this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]); } diff --git a/src/core/controller/controller.floatbox.js b/src/core/controller/controller.floatbox.js index b06e9723b..e700f34f3 100644 --- a/src/core/controller/controller.floatbox.js +++ b/src/core/controller/controller.floatbox.js @@ -18,6 +18,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { this.floatManager = {}; this.floatLayer = {}; this.floatContainer = {}; + this.floatOpened = {}; this.zindex = BI.zIndex_floatbox; this.zindexMap = {}; }, @@ -82,7 +83,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (!this.floatContainer[name].isVisible()) { + if (!this.floatOpened[name]) { + this.floatOpened[name] = true; var container = this.floatContainer[name]; container.element.css("zIndex", this.zindex++); this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]); @@ -113,7 +115,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, { if (!this._check(name)) { return this; } - if (this.floatContainer[name].isVisible()) { + if (this.floatOpened[name]) { + delete this.floatOpened[name]; this.floatContainer[name].invisible(); this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]); } From a55b35103893aabebfe4d849728c9a2ba0d3beac Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Sat, 1 Apr 2017 10:55:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/widget.css | 5 ++--- dist/widget.css | 5 ++--- .../finetuningnumbereditor/finetuning.number.editor.css | 5 ++--- .../finetuningnumbereditor/finetuning.number.editor.less | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bi/widget.css b/bi/widget.css index 39a07dbd6..8b7bfd0aa 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -233,13 +233,12 @@ } .bi-fine-tuning-number-editor .top-button { border-left: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-fine-tuning-number-editor .bottom-button { + border-top: 1px solid #d4dadd; border-left: 1px solid #d4dadd; } -.bi-fine-tuning-number-editor .split-line { - background-color: #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/dist/widget.css b/dist/widget.css index 39a07dbd6..8b7bfd0aa 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -233,13 +233,12 @@ } .bi-fine-tuning-number-editor .top-button { border-left: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-fine-tuning-number-editor .bottom-button { + border-top: 1px solid #d4dadd; border-left: 1px solid #d4dadd; } -.bi-fine-tuning-number-editor .split-line { - background-color: #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css index 69e34450a..3c5b52c4d 100644 --- a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css +++ b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css @@ -9,10 +9,9 @@ } .bi-fine-tuning-number-editor .top-button { border-left: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-fine-tuning-number-editor .bottom-button { + border-top: 1px solid #d4dadd; border-left: 1px solid #d4dadd; } -.bi-fine-tuning-number-editor .split-line { - background-color: #d4dadd; -} diff --git a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less index 3074def16..4cb593f27 100644 --- a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less +++ b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less @@ -5,11 +5,10 @@ .border-radius(2px); & .top-button { border-left: 1px solid @border-color-normal; + border-bottom: 1px solid @border-color-normal; } & .bottom-button { + border-top: 1px solid @border-color-normal; border-left: 1px solid @border-color-normal; } - & .split-line{ - background-color: @border-color-normal; - } } \ No newline at end of file