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

解决冲突时多提交了一些代码。删掉

es6
Zhenfei.Li 6 years ago
parent
264baf812d
commit
1dacd25e5a
4 changed files with 130 additions and 185 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. 32
      demo/js/core/abstract/demo.button_group.js
  2. 66
      demo/js/core/abstract/demo.custom_tree.js
  3. 20
      demo/js/core/popup/demo.layer.js
  4. 29
      demo/js/core/popup/demo.popup_view.js

32
demo/js/core/abstract/demo.button_group.js
Unescape View File

@ -11,24 +11,12 @@ Demo.Func = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
ref = _ref; ref = _ref;
}, },
behaviors: { chooseType: BI.ButtonGroup.CHOOSE_TYPE_NONE,
highlight: function () {
return true;
}
},
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function (value) {
var content = "传递的参数为：" + value + " getValue方法得到的值为：" + this.getValue();
BI.Msg.alert("", content);
}
}],
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.vtape", type: "bi.vtape",
height: 300 height: 200
}] }]
}], }],
items: [{ items: [{
@ -40,19 +28,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.button", type: "bi.button",
value: "button1" text: "1"
},
height: 50
}, {
el: {
type: "bi.button",
value: "button2"
},
height: 50
}, {
el: {
type: "bi.button",
value: "button3"
} }
}] }]
}, { }, {
@ -68,7 +44,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.button", type: "bi.button",
value: "2" text: "2"
}, },
height: 50 height: 50
}, { }, {

66
demo/js/core/abstract/demo.custom_tree.js
Unescape View File

@ -28,12 +28,7 @@ Demo.Func = BI.inherit(BI.Widget, {
hgap: 30 hgap: 30
}] }]
}, },
items: BI.deepClone(TREEITEMS), items: BI.deepClone(TREEITEMS)
expander: {
el: {},
popup: {type: "bi.custom_tree"},
trigger: "hover"
}
}); });
return this.tree; return this.tree;
}, },
@ -63,7 +58,8 @@ Demo.Func = BI.inherit(BI.Widget, {
}]); }]);
} else { } else {
if (op.node.id == 1) { if (op.node.id == 1) {
callback([{ callback([
{
id: 11, id: 11,
pId: 1, pId: 1,
type: "bi.plus_group_node", type: "bi.plus_group_node",
@ -71,49 +67,49 @@ Demo.Func = BI.inherit(BI.Widget, {
value: 11, value: 11,
height: 25, height: 25,
isParent: true isParent: true
}, { },
{
id: 12, id: 12,
pId: 1, pId: 1,
type: "bi.single_select_item", type: "bi.single_select_item",
text: "test12", text: "test12",
value: 12, value: 12,
height: 35 height: 35
}, { },
{
id: 13, id: 13,
pId: 1, pId: 1,
type: "bi.single_select_item", type: "bi.single_select_item",
text: "test13", text: "test13",
value: 13, value: 13,
height: 35 height: 35
}, { },
{
id: 14, id: 14,
pId: 1, pId: 1,
type: "bi.single_select_item", type: "bi.single_select_item",
text: "test14", text: "test14",
value: 14, value: 14,
height: 35 height: 35
}, { },
{
id: 15, id: 15,
pId: 1, pId: 1,
type: "bi.single_select_item", type: "bi.single_select_item",
text: "test15", text: "test15",
value: 15, value: 15,
height: 35 height: 35
}, { },
{
id: 16, id: 16,
pId: 1, pId: 1,
type: "bi.single_select_item", type: "bi.single_select_item",
text: "test16", text: "test16",
value: 16, value: 16,
height: 35 height: 35
}, { },
id: 17, {id: 17, pId: 1, type: "bi.single_select_item", text: "test17", value: 17, height: 35}
pId: 1, ]);
type: "bi.single_select_item",
text: "test17",
value: 17,
height: 35
}]);
} else if (op.node.id == 2) { } else if (op.node.id == 2) {
callback([{ callback([{
id: 21, id: 21,
@ -122,7 +118,8 @@ Demo.Func = BI.inherit(BI.Widget, {
text: "test21", text: "test21",
value: 21, value: 21,
height: 35 height: 35
}, { },
{
id: 22, id: 22,
pId: 2, pId: 2,
type: "bi.single_select_item", type: "bi.single_select_item",
@ -154,12 +151,6 @@ Demo.Func = BI.inherit(BI.Widget, {
vgap: 0 vgap: 0
}] }]
} }
},
expander: {
el: {},
popup: {type: "bi.custom_tree"},
trigger: "click",
direction: "bottom"
} }
}); });
return this.asyncTree; return this.asyncTree;
@ -177,9 +168,11 @@ Demo.Func = BI.inherit(BI.Widget, {
row: 0, row: 0,
el: { el: {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [
{
el: this._createDefaultTree() el: this._createDefaultTree()
}, { },
{
el: { el: {
type: "bi.center", type: "bi.center",
hgap: 10, hgap: 10,
@ -202,20 +195,24 @@ Demo.Func = BI.inherit(BI.Widget, {
}] }]
}, },
height: 30 height: 30
}] }
]
} }
}, { }, {
column: 1, column: 1,
row: 0, row: 0,
el: { el: {
type: "bi.vtape", type: "bi.vtape",
items: [{ items: [
{
type: "bi.label", type: "bi.label",
text: "异步加载数据", text: "异步加载数据",
height: 30 height: 30
}, { },
{
el: this._createAsyncTree() el: this._createAsyncTree()
}, { },
{
el: { el: {
type: "bi.center", type: "bi.center",
hgap: 10, hgap: 10,
@ -238,7 +235,8 @@ Demo.Func = BI.inherit(BI.Widget, {
}] }]
}, },
height: 30 height: 30
}] }
]
} }
}] }]
}); });

20
demo/js/core/popup/demo.layer.js
Unescape View File

@ -18,16 +18,16 @@ Demo.Func = BI.inherit(BI.Widget, {
BI.Layers.create(id1, self, { BI.Layers.create(id1, self, {
//偏移量 //偏移量
offset: { offset: {
left: 20, left: 10,
right: 20, right: 10,
top: 20, top: 10,
bottom: 20 bottom: 10
}, },
type: "bi.center_adapt", type: "bi.center_adapt",
cls: "bi-card", cls: "bi-card",
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: "点击隐藏", text: "点击关闭",
handler: function () { handler: function () {
BI.Layers.hide(id1); BI.Layers.hide(id1);
} }
@ -43,16 +43,16 @@ Demo.Func = BI.inherit(BI.Widget, {
BI.Layers.make(id2, self, { BI.Layers.make(id2, self, {
//偏移量 //偏移量
offset: { offset: {
left: 20, left: 10,
right: 20, right: 10,
top: 20, top: 10,
bottom: 20 bottom: 10
}, },
type: "bi.center_adapt", type: "bi.center_adapt",
cls: "bi-card", cls: "bi-card",
items: [{ items: [{
type: "bi.button", type: "bi.button",
text: "点击移除", text: "点击关闭",
handler: function () { handler: function () {
BI.Layers.remove(id2); BI.Layers.remove(id2);
} }

29
demo/js/core/popup/demo.popup_view.js
Unescape View File

@ -23,35 +23,6 @@ Demo.Func = BI.inherit(BI.Widget, {
}, },
popup: { popup: {
type: "bi.popup_view", type: "bi.popup_view",
ref: function (_ref) {
self.popupView = _ref;
},
tabs: [{
type: "bi.text_button",
value: "tab1",
cls: "bi-border",
handler: function () {
BI.Msg.alert("", "点击tab1");
}
}, {
type: "bi.text_button",
value: "tab2",
cls: "bi-border",
handler: function () {
BI.Msg.alert("", "点击tab2");
}
}],
logic: {
dynamic: true
},
tools: true,
buttons: [{
type: "bi.text_button",
value: "getValue",
handler: function () {
BI.Msg.alert("getValue", JSON.stringify(self.popupView.getValue()));
}
}],
el: { el: {
type: "bi.button_group", type: "bi.button_group",
layouts: [{ layouts: [{

Write Preview
Loading…
Cancel
Save