Browse Source

Pull request #1507: 无JIRA任务 hack放combo而非具体combo处

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'e36b4edb3e0f1a7acd9efa4dea45081c08cba6db':
  BI-73062 删downlistcombo处的hack
  无JIRA任务 hack放combo而非具体combo处
master
windy 4 years ago
parent
commit
321420abda
  1. 2
      src/base/combination/combo.js
  2. 2
      src/widget/downlist/combo.downlist.js

2
src/base/combination/combo.js

@ -8,7 +8,7 @@
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments); var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-combo", baseCls: (conf.baseCls || "") + " bi-combo" + (BI.isIE() ? " hack" : ""),
trigger: "click", trigger: "click",
toggle: true, toggle: true,
direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft||innerRight||innerLeft direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft||innerRight||innerLeft

2
src/widget/downlist/combo.downlist.js

@ -4,7 +4,7 @@
BI.DownListCombo = BI.inherit(BI.Widget, { BI.DownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-down-list-combo" + (BI.isIE() ? " hack" : ""), baseCls: "bi-down-list-combo",
height: 24, height: 24,
items: [], items: [],
adjustLength: 0, adjustLength: 0,

Loading…
Cancel
Save