Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fui

es6
windy 7 years ago
parent
commit
f5a9f694d0
  1. 2
      demo/config.js
  2. 70
      demo/js/chart/demo.axis_chart.js
  3. 12
      demo/js/config/addons.js
  4. 0
      demo/js/config/chart.js
  5. 2
      dist/bundle.min.css
  6. 44
      dist/bundle.min.js
  7. 87
      dist/demo.js
  8. 2
      dist/fineui.min.css
  9. 50
      dist/fineui.min.js

2
demo/config.js

@ -1,4 +1,4 @@
Demo.CONFIG = Demo.CORE_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG).concat(Demo.COMPONENT_CONFIG).concat(Demo.FIX_CONFIG).concat(Demo.ADDONS_CONFIG).concat(Demo.CATEGORY_CONFIG); Demo.CONFIG = Demo.CORE_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG).concat(Demo.COMPONENT_CONFIG).concat(Demo.FIX_CONFIG).concat(Demo.CATEGORY_CONFIG);
Demo.CONSTANTS = { Demo.CONSTANTS = {
SIMPLE_ITEMS: BI.map("柳州市城贸金属材料有限责任公司 柳州市建福房屋租赁有限公司 柳州市迅昌数码办公设备有限责任公司 柳州市河海贸易有限责任公司 柳州市花篮制衣厂 柳州市兴溪物资有限公司 柳州市针织总厂 柳州市衡管物资有限公司 柳州市琪成机电设备有限公司 柳州市松林工程机械修理厂".match(/[^\s]+/g), function (i, v) { SIMPLE_ITEMS: BI.map("柳州市城贸金属材料有限责任公司 柳州市建福房屋租赁有限公司 柳州市迅昌数码办公设备有限责任公司 柳州市河海贸易有限责任公司 柳州市花篮制衣厂 柳州市兴溪物资有限公司 柳州市针织总厂 柳州市衡管物资有限公司 柳州市琪成机电设备有限公司 柳州市松林工程机械修理厂".match(/[^\s]+/g), function (i, v) {

70
demo/js/chart/demo.axis_chart.js

@ -1,70 +0,0 @@
Demo.Func = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-func"
},
render: function () {
var self = this;
return {
type: "bi.tab",
ref: function () {
self.tab = this;
},
single: true,
cardCreator: function (v) {
return {
type: v
};
}
};
},
mounted: function () {
var self = this;
var items = [[{
data: [
{x: "孙林", y: 789},
{x: "金士鹏", y: 156},
{x: "张珊", y: 289},
{x: "孙阳", y: 562},
{x: "袁成洁", y: 546},
{x: "张颖", y: 218},
{x: "王伟", y: 541},
{x: "张武", y: 219},
{x: "韩文", y: 345}
],
name: "测试1",
stack: 1
}, {
data: [
{x: "孙林", y: 789},
{x: "金士鹏", y: 156},
{x: "张珊", y: 289},
{x: "孙阳", y: 562},
{x: "袁成洁", y: 546},
{x: "张颖", y: 218},
{x: "王伟", y: 541},
{x: "张武", y: 219},
{x: "韩文", y: 345}
],
name: "测试2",
stack: 1
}]];
var types = ["bi.axis_chart", "bi.line_chart", "bi.bar_chart"];
var index = 0;
this.tab.setSelect(types[index]);
this.tab.populate(BI.deepClone(items));
this.interval = setInterval(function () {
index++;
if (index >= types.length) {
index = 0;
}
self.tab.setSelect(types[index]);
self.tab.populate(BI.deepClone(items));
}, 2000);
},
destroyed: function () {
clearInterval(this.interval);
}
});
BI.shortcut("demo.axis_chart", Demo.Func);

12
demo/js/config/addons.js

@ -1,12 +0,0 @@
Demo.ADDONS_CONFIG = [{
id: 1000,
text: "addons"
}, {
pId: 1000,
id: 1001,
text: "拓展图表控件"
}, {
pId: 1001,
text: "柱状图",
value: "demo.axis_chart"
}];

0
demo/js/config/chart.js

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

87
dist/demo.js vendored

@ -4794,77 +4794,7 @@ BI.shortcut("demo.sort_tree", Demo.SortTree);Demo.Center = BI.inherit(BI.Widget,
this.tab.setSelect(v); this.tab.setSelect(v);
} }
}); });
BI.shortcut("demo.center", Demo.Center);Demo.Func = BI.inherit(BI.Widget, { BI.shortcut("demo.center", Demo.Center);Demo.TreeValueChooser = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-func"
},
render: function () {
var self = this;
return {
type: "bi.tab",
ref: function () {
self.tab = this;
},
single: true,
cardCreator: function (v) {
return {
type: v
};
}
};
},
mounted: function () {
var self = this;
var items = [[{
data: [
{x: "孙林", y: 789},
{x: "金士鹏", y: 156},
{x: "张珊", y: 289},
{x: "孙阳", y: 562},
{x: "袁成洁", y: 546},
{x: "张颖", y: 218},
{x: "王伟", y: 541},
{x: "张武", y: 219},
{x: "韩文", y: 345}
],
name: "测试1",
stack: 1
}, {
data: [
{x: "孙林", y: 789},
{x: "金士鹏", y: 156},
{x: "张珊", y: 289},
{x: "孙阳", y: 562},
{x: "袁成洁", y: 546},
{x: "张颖", y: 218},
{x: "王伟", y: 541},
{x: "张武", y: 219},
{x: "韩文", y: 345}
],
name: "测试2",
stack: 1
}]];
var types = ["bi.axis_chart", "bi.line_chart", "bi.bar_chart"];
var index = 0;
this.tab.setSelect(types[index]);
this.tab.populate(BI.deepClone(items));
this.interval = setInterval(function () {
index++;
if (index >= types.length) {
index = 0;
}
self.tab.setSelect(types[index]);
self.tab.populate(BI.deepClone(items));
}, 2000);
},
destroyed: function () {
clearInterval(this.interval);
}
});
BI.shortcut("demo.axis_chart", Demo.Func);
Demo.TreeValueChooser = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "demo-tree-value-chooser-combo" baseCls: "demo-tree-value-chooser-combo"
}, },
@ -4936,18 +4866,7 @@ BI.shortcut("demo.value_chooser_combo", Demo.ValueChooserCombo);Demo.ValueChoose
}; };
} }
}); });
BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.ADDONS_CONFIG = [{ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG = [{
id: 1000,
text: "addons"
}, {
pId: 1000,
id: 1001,
text: "拓展图表控件"
}, {
pId: 1001,
text: "柱状图",
value: "demo.axis_chart"
}];Demo.BASE_CONFIG = [{
id: 2, id: 2,
text: "基础控件", text: "基础控件",
open: false open: false
@ -14185,7 +14104,7 @@ Demo.YearQuarterCombo = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("demo.year_quarter_combo", Demo.YearQuarterCombo);Demo.CONFIG = Demo.CORE_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG).concat(Demo.COMPONENT_CONFIG).concat(Demo.FIX_CONFIG).concat(Demo.ADDONS_CONFIG).concat(Demo.CATEGORY_CONFIG); BI.shortcut("demo.year_quarter_combo", Demo.YearQuarterCombo);Demo.CONFIG = Demo.CORE_CONFIG.concat(Demo.BASE_CONFIG).concat(Demo.CASE_CONFIG).concat(Demo.WIDGET_CONFIG).concat(Demo.COMPONENT_CONFIG).concat(Demo.FIX_CONFIG).concat(Demo.CATEGORY_CONFIG);
Demo.CONSTANTS = { Demo.CONSTANTS = {
SIMPLE_ITEMS: BI.map("柳州市城贸金属材料有限责任公司 柳州市建福房屋租赁有限公司 柳州市迅昌数码办公设备有限责任公司 柳州市河海贸易有限责任公司 柳州市花篮制衣厂 柳州市兴溪物资有限公司 柳州市针织总厂 柳州市衡管物资有限公司 柳州市琪成机电设备有限公司 柳州市松林工程机械修理厂".match(/[^\s]+/g), function (i, v) { SIMPLE_ITEMS: BI.map("柳州市城贸金属材料有限责任公司 柳州市建福房屋租赁有限公司 柳州市迅昌数码办公设备有限责任公司 柳州市河海贸易有限责任公司 柳州市花篮制衣厂 柳州市兴溪物资有限公司 柳州市针织总厂 柳州市衡管物资有限公司 柳州市琪成机电设备有限公司 柳州市松林工程机械修理厂".match(/[^\s]+/g), function (i, v) {

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

50
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save