From 2da5195cb29f8f3fe8046ba4fd489adafe31e58f Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 6 May 2017 14:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/base.js | 2 +- bi/core.css | 10 ++++++++++ bi/widget.js | 2 +- docs/base.js | 2 +- docs/core.css | 10 ++++++++++ docs/widget.js | 2 +- src/base/single/button/button.basic.js | 2 +- src/css/core/utils/common.css | 10 ++++++++++ src/less/core/utils/common.less | 12 ++++++++++++ src/widget/arrangement/arrangement.block.js | 2 +- 10 files changed, 48 insertions(+), 6 deletions(-) diff --git a/bi/base.js b/bi/base.js index 7827d11bc8..534178084d 100644 --- a/bi/base.js +++ b/bi/base.js @@ -599,7 +599,7 @@ BI.BasicButton = BI.inherit(BI.Single, { stopPropagation: false, selected: false, once: false, //点击一次选中有效,再点无效 - forceSelected: false, //点击即选中， 选中了就不会被取消 + forceSelected: false, //点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发 forceNotSelected: false, //无论怎么点击都不会被选中 disableSelected: false, //使能选中 diff --git a/bi/core.css b/bi/core.css index 1de3c19fcf..c1006d617b 100644 --- a/bi/core.css +++ b/bi/core.css @@ -3063,6 +3063,16 @@ i { .bi-theme-dark .bi-resizer { background: #ffffff; } +.bi-mask { + color: #ffffff; + background-color: rgba(26, 26, 26, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a); +} +.bi-theme-dark .bi-mask { + color: #242640; + background-color: rgba(255, 255, 255, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff); +} .bi-z-index-mask { color: #ffffff; background-color: rgba(26, 26, 26, 0.5); diff --git a/bi/widget.js b/bi/widget.js index 00e7312a4e..c3e05ff996 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -945,7 +945,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block bi-resizer" + baseCls: "bi-arrangement-block bi-mask" }); }, diff --git a/docs/base.js b/docs/base.js index 7827d11bc8..534178084d 100644 --- a/docs/base.js +++ b/docs/base.js @@ -599,7 +599,7 @@ BI.BasicButton = BI.inherit(BI.Single, { stopPropagation: false, selected: false, once: false, //点击一次选中有效,再点无效 - forceSelected: false, //点击即选中， 选中了就不会被取消 + forceSelected: false, //点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发 forceNotSelected: false, //无论怎么点击都不会被选中 disableSelected: false, //使能选中 diff --git a/docs/core.css b/docs/core.css index 1de3c19fcf..c1006d617b 100644 --- a/docs/core.css +++ b/docs/core.css @@ -3063,6 +3063,16 @@ i { .bi-theme-dark .bi-resizer { background: #ffffff; } +.bi-mask { + color: #ffffff; + background-color: rgba(26, 26, 26, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a); +} +.bi-theme-dark .bi-mask { + color: #242640; + background-color: rgba(255, 255, 255, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff); +} .bi-z-index-mask { color: #ffffff; background-color: rgba(26, 26, 26, 0.5); diff --git a/docs/widget.js b/docs/widget.js index 00e7312a4e..c3e05ff996 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -945,7 +945,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block bi-resizer" + baseCls: "bi-arrangement-block bi-mask" }); }, diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js index 30526e9731..19aa8075d6 100644 --- a/src/base/single/button/button.basic.js +++ b/src/base/single/button/button.basic.js @@ -16,7 +16,7 @@ BI.BasicButton = BI.inherit(BI.Single, { stopPropagation: false, selected: false, once: false, //点击一次选中有效,再点无效 - forceSelected: false, //点击即选中， 选中了就不会被取消 + forceSelected: false, //点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发 forceNotSelected: false, //无论怎么点击都不会被选中 disableSelected: false, //使能选中 diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index e370a07fb0..9094a18132 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -110,6 +110,16 @@ .bi-theme-dark .bi-resizer { background: #ffffff; } +.bi-mask { + color: #ffffff; + background-color: rgba(26, 26, 26, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#331a1a1a,endColorstr=#331a1a1a); +} +.bi-theme-dark .bi-mask { + color: #242640; + background-color: rgba(255, 255, 255, 0.2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff); +} .bi-z-index-mask { color: #ffffff; background-color: rgba(26, 26, 26, 0.5); diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index e02726723f..4402ddab22 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -157,6 +157,18 @@ } } +.bi-mask { + color: @color-bi-background-default; + .background-color(@color-bi-background-black, 20%); +} + +.bi-theme-dark { + .bi-mask { + color: @color-bi-background-default-theme-dark; + .background-color(@color-bi-background-default, 20%); + } +} + .bi-z-index-mask { color: @color-bi-background-default; .background-color(@color-bi-background-black, 50%); diff --git a/src/widget/arrangement/arrangement.block.js b/src/widget/arrangement/arrangement.block.js index f2e9833709..fc6a43d822 100644 --- a/src/widget/arrangement/arrangement.block.js +++ b/src/widget/arrangement/arrangement.block.js @@ -9,7 +9,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block bi-resizer" + baseCls: "bi-arrangement-block bi-mask" }); },