search_text_value_combo的popup不出滚动条&不收起

7 years ago · 1af6f9bda9
10 changed files with 75 additions and 8 deletions
--- 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 {

 }
--- 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 {

 }
--- 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();
--- 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();
--- 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 {

 }
--- 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();
--- 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();
--- 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;
+}
--- a/src/css/base/combo/combo.searchtextvalue.css
+++ b/src/css/base/combo/combo.searchtextvalue.css
@ -0,0 +1,3 @@
+.bi-search-text-value-combo .trigger-icon-button {
+  font-size: 16px;
+}
--- a/src/less/base/combo/combo.searchtextvalue.less
+++ 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;
+  }
+}