Browse Source

BI-54505 refactor:解决冲突

master
Guyi 5 years ago
parent
commit
7ecce13022
  1. 5
      src/case/button/treeitem/item.icon.treeleaf.js
  2. 4
      src/case/button/treeitem/item.multilayer.icon.treeleaf.js

5
src/case/button/treeitem/item.icon.treeleaf.js

@ -40,7 +40,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 16,
width: 24,
el: icon
}, {
el: this.text
@ -48,8 +48,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items,
hgap: 5
items: items
}))));
},

4
src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@ -42,7 +42,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.count(0, o.layer, function () {
items.push({
type: "bi.layout",
width: 15,
width: 24,
height: o.height
});
});
@ -50,7 +50,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 15),
columnSize: BI.makeArray(o.layer, 24),
items: [items]
});
},

Loading…
Cancel
Save