Browse Source

Pull request #3050: 无jira 解决合并冲突

Merge in VISUAL/fineui from ~TREECAT/fineui:master to master

* commit '4222a4460a6f6edc7c2dae89f999c39218e0aa5c':
  同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
  BI-113579 可配置
  BI-112711 fix:单选按钮的选中视觉不对
es6
treecat-罗群 2 years ago
parent
commit
c57c30a7b2
  1. 2
      src/base/single/input/radio/radio.js
  2. 3
      src/widget/multiselect/multiselect.loader.js
  3. 1
      src/widget/multiselectlist/multiselectlist.insert.js
  4. 1
      src/widget/multiselectlist/multiselectlist.js

2
src/base/single/input/radio/radio.js

@ -12,7 +12,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: 16, width: 16,
height: 16, height: 16,
iconWidth: 16, iconWidth: 16,
iconHeight: 16, iconHeight: 16
}, },
render: function () { render: function () {

3
src/widget/multiselect/multiselect.loader.js

@ -20,6 +20,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
itemFormatter: BI.emptyFn, itemFormatter: BI.emptyFn,
onLoaded: BI.emptyFn, onLoaded: BI.emptyFn,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
isDefaultInit: false,
}); });
}, },
@ -45,7 +46,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
onLoaded: opts.onLoaded, onLoaded: opts.onLoaded,
el: { el: {
type: "bi.multi_select_inner_loader", type: "bi.multi_select_inner_loader",
isDefaultInit: false, isDefaultInit: opts.isDefaultInit,
} }
}, opts.el), }, opts.el),
itemsCreator: function (op, callback) { itemsCreator: function (op, callback) {

1
src/widget/multiselectlist/multiselectlist.insert.js

@ -34,6 +34,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},
isDefaultInit: true,
value: o.value value: o.value
}); });
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {

1
src/widget/multiselectlist/multiselectlist.js

@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
logic: { logic: {
dynamic: false dynamic: false
}, },
isDefaultInit: true,
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {} el: {}
}); });

Loading…
Cancel
Save