caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #255 in FUI/fineui from ~WINDY/fui:master to master 

* commit 'f8512319075c4deb34da8b727397f09f46ec1bb2':
  update
  search_text_value_combo的popup不出滚动条&不收起
es6
guy 7 years ago
parent
df081b862a f851231907
commit
361ec1c343
12 changed files with 77 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      demo/js/case/combo/demo.search_text_value_combo.js
  2. 7
      dist/base.css
  3. 7
      dist/bundle.css
  4. 12
      dist/bundle.js
  5. 12
      dist/case.js
  6. 1
      dist/demo.js
  7. 7
      dist/fineui.css
  8. 12
      dist/fineui.js
  9. 12
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  10. 4
      src/css/base/combo/combo.css
  11. 3
      src/css/base/combo/combo.searchtextvalue.css
  12. 7
      src/less/base/combo/combo.searchtextvalue.less

1
demo/js/case/combo/demo.search_text_value_combo.js
Unescape View File

@ -60,6 +60,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
}] }]
}, { }, {
type: "bi.button", type: "bi.button",
text: "setValue(3)",
width: 90, width: 90,
height: 25, height: 25,
handler: function () { handler: function () {

7
dist/base.css vendored
Unescape View File

@ -146,6 +146,13 @@
display: block !important; display: block !important;
visibility: visible !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 { .bi-bubble-popup-view {
} }

7
dist/bundle.css vendored
Unescape View File

@ -2193,6 +2193,13 @@ textarea {
display: block !important; display: block !important;
visibility: visible !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 { .bi-bubble-popup-view {
} }

12
dist/bundle.js vendored
Unescape View File

@ -68303,14 +68303,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 300 maxHeight: 302
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){ action: function(){
self.trigger.stopEditing(); self.trigger.stopEditing();
} }
}] }],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
left: 0, left: 0,
right: 0, right: 0,
@ -68319,7 +68322,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
cls: "trigger-icon-button",
ref: function () {
self.triggerBtn = this;
},
width: o.height, width: o.height,
height: o.height,
handler: function () { handler: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); self.combo.hideView();

12
dist/case.js vendored
Unescape View File

@ -5671,14 +5671,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 300 maxHeight: 302
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){ action: function(){
self.trigger.stopEditing(); self.trigger.stopEditing();
} }
}] }],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
left: 0, left: 0,
right: 0, right: 0,
@ -5687,7 +5690,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
cls: "trigger-icon-button",
ref: function () {
self.triggerBtn = this;
},
width: o.height, width: o.height,
height: o.height,
handler: function () { handler: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); self.combo.hideView();

1
dist/demo.js vendored
Unescape View File

@ -2017,6 +2017,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
}] }]
}, { }, {
type: "bi.button", type: "bi.button",
text: "setValue(3)",
width: 90, width: 90,
height: 25, height: 25,
handler: function () { handler: function () {

7
dist/fineui.css vendored
Unescape View File

@ -2193,6 +2193,13 @@ textarea {
display: block !important; display: block !important;
visibility: visible !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 { .bi-bubble-popup-view {
} }

12
dist/fineui.js vendored
Unescape View File

@ -70067,14 +70067,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 300 maxHeight: 302
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){ action: function(){
self.trigger.stopEditing(); self.trigger.stopEditing();
} }
}] }],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
left: 0, left: 0,
right: 0, right: 0,
@ -70083,7 +70086,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
cls: "trigger-icon-button",
ref: function () {
self.triggerBtn = this;
},
width: o.height, width: o.height,
height: o.height,
handler: function () { handler: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); self.combo.hideView();

12
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -59,14 +59,17 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
} }
}] }]
}, },
maxHeight: 300 maxHeight: 302
}, },
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: function(){ action: function(){
self.trigger.stopEditing(); self.trigger.stopEditing();
} }
}] }],
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
left: 0, left: 0,
right: 0, right: 0,
@ -75,7 +78,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
cls: "trigger-icon-button",
ref: function () {
self.triggerBtn = this;
},
width: o.height, width: o.height,
height: o.height,
handler: function () { handler: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); self.combo.hideView();

4
src/css/base/combo/combo.css
Unescape View File

@ -38,3 +38,7 @@
display: block !important; display: block !important;
visibility: visible !important; visibility: visible !important;
} }
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}

3
src/css/base/combo/combo.searchtextvalue.css
Unescape View File

@ -0,0 +1,3 @@
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}

7
src/less/base/combo/combo.searchtextvalue.less
Unescape View File

@ -0,0 +1,7 @@
@import "../../index";
.bi-search-text-value-combo{
& .trigger-icon-button{
font-size: 16px;
}
}
Write Preview
Loading…
Cancel
Save