Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

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

master
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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      demo/js/core/abstract/demo.button_group.js
  2. 234
      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 = _ref;
},
behaviors: {
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);
}
}],
chooseType: BI.ButtonGroup.CHOOSE_TYPE_NONE,
layouts: [{
type: "bi.vertical",
items: [{
type: "bi.vtape",
height: 300
height: 200
}]
}],
items: [{
@ -40,19 +28,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, {
el: {
type: "bi.button",
value: "button1"
},
height: 50
}, {
el: {
type: "bi.button",
value: "button2"
},
height: 50
}, {
el: {
type: "bi.button",
value: "button3"
text: "1"
}
}]
}, {
@ -68,7 +44,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, {
el: {
type: "bi.button",
value: "2"
text: "2"
},
height: 50
}, {

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

@ -28,12 +28,7 @@ Demo.Func = BI.inherit(BI.Widget, {
hgap: 30
}]
},
items: BI.deepClone(TREEITEMS),
expander: {
el: {},
popup: {type: "bi.custom_tree"},
trigger: "hover"
}
items: BI.deepClone(TREEITEMS)
});
return this.tree;
},
@ -63,57 +58,58 @@ Demo.Func = BI.inherit(BI.Widget, {
}]);
} else {
if (op.node.id == 1) {
callback([{
id: 11,
pId: 1,
type: "bi.plus_group_node",
text: "test11",
value: 11,
height: 25,
isParent: true
}, {
id: 12,
pId: 1,
type: "bi.single_select_item",
text: "test12",
value: 12,
height: 35
}, {
id: 13,
pId: 1,
type: "bi.single_select_item",
text: "test13",
value: 13,
height: 35
}, {
id: 14,
pId: 1,
type: "bi.single_select_item",
text: "test14",
value: 14,
height: 35
}, {
id: 15,
pId: 1,
type: "bi.single_select_item",
text: "test15",
value: 15,
height: 35
}, {
id: 16,
pId: 1,
type: "bi.single_select_item",
text: "test16",
value: 16,
height: 35
}, {
id: 17,
pId: 1,
type: "bi.single_select_item",
text: "test17",
value: 17,
height: 35
}]);
callback([
{
id: 11,
pId: 1,
type: "bi.plus_group_node",
text: "test11",
value: 11,
height: 25,
isParent: true
},
{
id: 12,
pId: 1,
type: "bi.single_select_item",
text: "test12",
value: 12,
height: 35
},
{
id: 13,
pId: 1,
type: "bi.single_select_item",
text: "test13",
value: 13,
height: 35
},
{
id: 14,
pId: 1,
type: "bi.single_select_item",
text: "test14",
value: 14,
height: 35
},
{
id: 15,
pId: 1,
type: "bi.single_select_item",
text: "test15",
value: 15,
height: 35
},
{
id: 16,
pId: 1,
type: "bi.single_select_item",
text: "test16",
value: 16,
height: 35
},
{id: 17, pId: 1, type: "bi.single_select_item", text: "test17", value: 17, height: 35}
]);
} else if (op.node.id == 2) {
callback([{
id: 21,
@ -122,7 +118,8 @@ Demo.Func = BI.inherit(BI.Widget, {
text: "test21",
value: 21,
height: 35
}, {
},
{
id: 22,
pId: 2,
type: "bi.single_select_item",
@ -154,12 +151,6 @@ Demo.Func = BI.inherit(BI.Widget, {
vgap: 0
}]
}
},
expander: {
el: {},
popup: {type: "bi.custom_tree"},
trigger: "click",
direction: "bottom"
}
});
return this.asyncTree;
@ -177,68 +168,75 @@ Demo.Func = BI.inherit(BI.Widget, {
row: 0,
el: {
type: "bi.vtape",
items: [{
el: this._createDefaultTree()
}, {
el: {
type: "bi.center",
hgap: 10,
items: [{
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getValue",
height: 30,
handler: function () {
BI.Msg.alert("", JSON.stringify(self.tree.getValue()));
}
}, {
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getNodeByValue(第一级目录1)",
height: 30,
handler: function () {
BI.Msg.alert("", "节点名称为: " + self.tree.getNodeByValue("第一级目录1").getValue());
}
}]
items: [
{
el: this._createDefaultTree()
},
height: 30
}]
{
el: {
type: "bi.center",
hgap: 10,
items: [{
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getValue",
height: 30,
handler: function () {
BI.Msg.alert("", JSON.stringify(self.tree.getValue()));
}
}, {
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getNodeByValue(第一级目录1)",
height: 30,
handler: function () {
BI.Msg.alert("", "节点名称为: " + self.tree.getNodeByValue("第一级目录1").getValue());
}
}]
},
height: 30
}
]
}
}, {
column: 1,
row: 0,
el: {
type: "bi.vtape",
items: [{
type: "bi.label",
text: "异步加载数据",
height: 30
}, {
el: this._createAsyncTree()
}, {
el: {
type: "bi.center",
hgap: 10,
items: [{
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getValue",
height: 30,
handler: function () {
BI.Msg.alert("", JSON.stringify(self.asyncTree.getValue()));
}
}, {
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getNodeById(11)",
height: 30,
handler: function () {
BI.Msg.alert("", "节点名称为: " + (self.asyncTree.getNodeById(11) && self.asyncTree.getNodeById(11).getText()));
}
}]
items: [
{
type: "bi.label",
text: "异步加载数据",
height: 30
},
height: 30
}]
{
el: this._createAsyncTree()
},
{
el: {
type: "bi.center",
hgap: 10,
items: [{
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getValue",
height: 30,
handler: function () {
BI.Msg.alert("", JSON.stringify(self.asyncTree.getValue()));
}
}, {
type: "bi.text_button",
cls: "mvc-button layout-bg2",
text: "getNodeById(11)",
height: 30,
handler: function () {
BI.Msg.alert("", "节点名称为: " + (self.asyncTree.getNodeById(11) && self.asyncTree.getNodeById(11).getText()));
}
}]
},
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, {
//偏移量
offset: {
left: 20,
right: 20,
top: 20,
bottom: 20
left: 10,
right: 10,
top: 10,
bottom: 10
},
type: "bi.center_adapt",
cls: "bi-card",
items: [{
type: "bi.button",
text: "点击隐藏",
text: "点击关闭",
handler: function () {
BI.Layers.hide(id1);
}
@ -43,16 +43,16 @@ Demo.Func = BI.inherit(BI.Widget, {
BI.Layers.make(id2, self, {
//偏移量
offset: {
left: 20,
right: 20,
top: 20,
bottom: 20
left: 10,
right: 10,
top: 10,
bottom: 10
},
type: "bi.center_adapt",
cls: "bi-card",
items: [{
type: "bi.button",
text: "点击移除",
text: "点击关闭",
handler: function () {
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: {
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: {
type: "bi.button_group",
layouts: [{

Write Preview
Loading…
Cancel
Save