From 1af6f9bda98a742cbed04b68e5d8ee80434fd8c4 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 6 Feb 2018 11:46:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?search=5Ftext=5Fvalue=5Fcombo=E7=9A=84popup?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=BB=9A=E5=8A=A8=E6=9D=A1&=E4=B8=8D?= =?UTF-8?q?=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/base.css | 7 +++++++ dist/bundle.css | 7 +++++++ dist/bundle.js | 12 ++++++++++-- dist/case.js | 12 ++++++++++-- dist/fineui.css | 7 +++++++ dist/fineui.js | 12 ++++++++++-- .../searchtextvaluecombo/combo.searchtextvalue.js | 12 ++++++++++-- src/css/base/combo/combo.css | 4 ++++ src/css/base/combo/combo.searchtextvalue.css | 3 +++ src/less/base/combo/combo.searchtextvalue.less | 7 +++++++ 10 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 src/css/base/combo/combo.searchtextvalue.css create mode 100644 src/less/base/combo/combo.searchtextvalue.less diff --git a/dist/base.css b/dist/base.css index ccfa3153f7..dec3466011 100644 --- a/dist/base.css +++ b/dist/base.css @@ -146,6 +146,13 @@ display: block !important; visibility: visible !important; } + +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} .bi-bubble-popup-view { } diff --git a/dist/bundle.css b/dist/bundle.css index 0c160c48e6..e5a8e42de7 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2193,6 +2193,13 @@ textarea { display: block !important; visibility: visible !important; } + +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} .bi-bubble-popup-view { } diff --git a/dist/bundle.js b/dist/bundle.js index 023f7c2dc0..54bb33a4fc 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -68303,14 +68303,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { } }] }, - maxHeight: 300 + maxHeight: 302 }, listeners: [{ eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: function(){ self.trigger.stopEditing(); } - }] + }], + hideChecker: function (e) { + return self.triggerBtn.element.find(e.target).length === 0; + } }, left: 0, right: 0, @@ -68319,7 +68322,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { }, { el: { type: "bi.trigger_icon_button", + cls: "trigger-icon-button", + ref: function () { + self.triggerBtn = this; + }, width: o.height, + height: o.height, handler: function () { if (self.combo.isViewVisible()) { self.combo.hideView(); diff --git a/dist/case.js b/dist/case.js index 9267e7fd07..df8b34f2b3 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5671,14 +5671,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { } }] }, - maxHeight: 300 + maxHeight: 302 }, listeners: [{ eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: function(){ self.trigger.stopEditing(); } - }] + }], + hideChecker: function (e) { + return self.triggerBtn.element.find(e.target).length === 0; + } }, left: 0, right: 0, @@ -5687,7 +5690,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { }, { el: { type: "bi.trigger_icon_button", + cls: "trigger-icon-button", + ref: function () { + self.triggerBtn = this; + }, width: o.height, + height: o.height, handler: function () { if (self.combo.isViewVisible()) { self.combo.hideView(); diff --git a/dist/fineui.css b/dist/fineui.css index 5828b38672..a55128c0e9 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2193,6 +2193,13 @@ textarea { display: block !important; visibility: visible !important; } + +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} .bi-bubble-popup-view { } diff --git a/dist/fineui.js b/dist/fineui.js index bfe756c78e..5349f333ab 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -70067,14 +70067,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { } }] }, - maxHeight: 300 + maxHeight: 302 }, listeners: [{ eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: function(){ self.trigger.stopEditing(); } - }] + }], + hideChecker: function (e) { + return self.triggerBtn.element.find(e.target).length === 0; + } }, left: 0, right: 0, @@ -70083,7 +70086,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { }, { el: { type: "bi.trigger_icon_button", + cls: "trigger-icon-button", + ref: function () { + self.triggerBtn = this; + }, width: o.height, + height: o.height, handler: function () { if (self.combo.isViewVisible()) { self.combo.hideView(); diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index 370adb5f56..1f6e870343 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -59,14 +59,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { } }] }, - maxHeight: 300 + maxHeight: 302 }, listeners: [{ eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: function(){ self.trigger.stopEditing(); } - }] + }], + hideChecker: function (e) { + return self.triggerBtn.element.find(e.target).length === 0; + } }, left: 0, right: 0, @@ -75,7 +78,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { }, { el: { type: "bi.trigger_icon_button", + cls: "trigger-icon-button", + ref: function () { + self.triggerBtn = this; + }, width: o.height, + height: o.height, handler: function () { if (self.combo.isViewVisible()) { self.combo.hideView(); diff --git a/src/css/base/combo/combo.css b/src/css/base/combo/combo.css index 724c014d75..20b5289b81 100644 --- a/src/css/base/combo/combo.css +++ b/src/css/base/combo/combo.css @@ -38,3 +38,7 @@ display: block !important; visibility: visible !important; } + +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} diff --git a/src/css/base/combo/combo.searchtextvalue.css b/src/css/base/combo/combo.searchtextvalue.css new file mode 100644 index 0000000000..d9aafd4d22 --- /dev/null +++ b/src/css/base/combo/combo.searchtextvalue.css @@ -0,0 +1,3 @@ +.bi-search-text-value-combo .trigger-icon-button { + font-size: 16px; +} diff --git a/src/less/base/combo/combo.searchtextvalue.less b/src/less/base/combo/combo.searchtextvalue.less new file mode 100644 index 0000000000..ea3a8835b7 --- /dev/null +++ b/src/less/base/combo/combo.searchtextvalue.less @@ -0,0 +1,7 @@ +@import "../../index"; + +.bi-search-text-value-combo{ + & .trigger-icon-button{ + font-size: 16px; + } +} \ No newline at end of file From f8512319075c4deb34da8b727397f09f46ec1bb2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 6 Feb 2018 11:51:23 +0800 Subject: [PATCH 2/2] update --- demo/js/case/combo/demo.search_text_value_combo.js | 1 + dist/demo.js | 1 + 2 files changed, 2 insertions(+) diff --git a/demo/js/case/combo/demo.search_text_value_combo.js b/demo/js/case/combo/demo.search_text_value_combo.js index 6b50234d7c..2746033a24 100644 --- a/demo/js/case/combo/demo.search_text_value_combo.js +++ b/demo/js/case/combo/demo.search_text_value_combo.js @@ -60,6 +60,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, { }] }, { type: "bi.button", + text: "setValue(3)", width: 90, height: 25, handler: function () { diff --git a/dist/demo.js b/dist/demo.js index 9510d8d51a..8de0e12eb7 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -2017,6 +2017,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, { }] }, { type: "bi.button", + text: "setValue(3)", width: 90, height: 25, handler: function () {