From 51300929449aeaf9ada78d6192a16851ee6c6874 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 8 May 2017 14:16:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BAbubblecombo=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/case.js | 4 ++++ docs/case.js | 4 ++++ src/case/combo/bubblecombo/combo.bubble.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/bi/case.js b/bi/case.js index e8cc8687ba..8da7cb1221 100644 --- a/bi/case.js +++ b/bi/case.js @@ -3592,6 +3592,10 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { showView: function () { this.combo && this.combo.showView(); + }, + + hasView: function () { + return BI.isNotNull(this.combo.getView()); } }); diff --git a/docs/case.js b/docs/case.js index e8cc8687ba..8da7cb1221 100644 --- a/docs/case.js +++ b/docs/case.js @@ -3592,6 +3592,10 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { showView: function () { this.combo && this.combo.showView(); + }, + + hasView: function () { + return BI.isNotNull(this.combo.getView()); } }); diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index 5b257f17c4..da44540987 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -193,6 +193,10 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { showView: function () { this.combo && this.combo.showView(); + }, + + hasView: function () { + return BI.isNotNull(this.combo.getView()); } }); From adc2d5892d638615120e893471176998d232c2d5 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 8 May 2017 16:15:25 +0800 Subject: [PATCH 2/2] update --- bi/widget.css | 8 ++++++++ docs/widget.css | 8 ++++++++ src/css/widget/previewtable/previewtable.css | 8 ++++++++ src/less/widget/previewtable/previewtable.less | 1 + 4 files changed, 25 insertions(+) diff --git a/bi/widget.css b/bi/widget.css index 9f860380bb..ee9212fb34 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -397,6 +397,14 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ +.bi-preview-table { + -webkit-user-select: initial; + -khtml-user-select: initial; + -moz-user-select: initial; + -ms-user-select: initial; + -o-user-select: initial; + user-select: initial; +} .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { background-color: #eff1f4; diff --git a/docs/widget.css b/docs/widget.css index 9f860380bb..ee9212fb34 100644 --- a/docs/widget.css +++ b/docs/widget.css @@ -397,6 +397,14 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ +.bi-preview-table { + -webkit-user-select: initial; + -khtml-user-select: initial; + -moz-user-select: initial; + -ms-user-select: initial; + -o-user-select: initial; + user-select: initial; +} .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { background-color: #eff1f4; diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css index 3a12fc3762..676a963ad6 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -1,6 +1,14 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ +.bi-preview-table { + -webkit-user-select: initial; + -khtml-user-select: initial; + -moz-user-select: initial; + -ms-user-select: initial; + -o-user-select: initial; + user-select: initial; +} .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { background-color: #eff1f4; diff --git a/src/less/widget/previewtable/previewtable.less b/src/less/widget/previewtable/previewtable.less index a793088044..b5a5fdee50 100644 --- a/src/less/widget/previewtable/previewtable.less +++ b/src/less/widget/previewtable/previewtable.less @@ -1,6 +1,7 @@ @import "../../bibase"; .bi-preview-table { + .user-select(initial); & > div > table, & > div > div > div > table { & > thead > tr.odd { background-color: @color-bi-background-normal;