Browse Source

Merge pull request #2 in FUI/fineui from ~GUY/fineui:2.0 to 2.0

* commit '851412078441c8fd1faa70aa0916d2764430a881':
  add
  add
  add
  add
  add
  init
  整理
  FineUI 2.0 init
  add
es6
guy 8 years ago
parent
commit
7bc662f009
  1. 3
      .gitignore
  2. 32
      Gruntfile.js
  3. 4
      demo.html
  4. 12
      demo/app.js
  5. 0
      demo/css/center.css
  6. 3
      demo/css/main.css
  7. 3
      demo/css/north.css
  8. 3
      demo/css/west.css
  9. 61
      demo/js/center.js
  10. 30
      demo/js/main.js
  11. 9
      demo/js/north.js
  12. 9
      demo/js/west.js
  13. 3
      demo/less/center.less
  14. 5
      demo/less/main.less
  15. 3
      demo/less/north.less
  16. 3
      demo/less/west.less
  17. 3
      demo/version.js
  18. BIN
      dist/.DS_Store
  19. 3690
      dist/base.css
  20. 35244
      dist/base.js
  21. 8
      dist/base.min.js
  22. 8399
      dist/case.js
  23. 9924
      dist/core.css
  24. 27818
      dist/core.js
  25. 1
      dist/core.min.css
  26. 12
      dist/core.min.js
  27. 56
      index.js
  28. 1
      package.json
  29. 2
      server.js
  30. 89
      src/base/chart/chart.js
  31. 16
      src/base/collection/collection.js
  32. 13
      src/base/combination/combo.js
  33. 8
      src/base/combination/expander.js
  34. 6
      src/base/combination/group.button.js
  35. 2
      src/base/combination/group.combo.js
  36. 6
      src/base/combination/loader.js
  37. 6
      src/base/combination/navigation.js
  38. 6
      src/base/combination/searcher.js
  39. 8
      src/base/combination/switcher.js
  40. 6
      src/base/combination/tab.js
  41. 2
      src/base/combination/tree.button.js
  42. 2
      src/base/el.js
  43. 2
      src/base/formula/formulaeditor.js
  44. 12
      src/base/grid/grid.js
  45. 2
      src/base/layer/layer.floatbox.js
  46. 2
      src/base/layer/layer.popup.js
  47. 4
      src/base/layer/layer.scroll.js
  48. 2
      src/base/layer/layer.searcher.js
  49. 2
      src/base/pager/pager.js
  50. 4
      src/base/pane.js
  51. 2
      src/base/single/a/a.js
  52. 2
      src/base/single/bar/bar.loading.js
  53. 2
      src/base/single/button/button.basic.js
  54. 4
      src/base/single/button/buttons/button.icon.js
  55. 4
      src/base/single/button/buttons/button.image.js
  56. 4
      src/base/single/button/buttons/button.js
  57. 2
      src/base/single/button/buttons/button.text.js
  58. 4
      src/base/single/button/listitem/blankicontexticonitem.js
  59. 2
      src/base/single/button/listitem/blankicontextitem.js
  60. 4
      src/base/single/button/listitem/icontexticonitem.js
  61. 2
      src/base/single/button/listitem/icontextitem.js
  62. 2
      src/base/single/button/listitem/texticonitem.js
  63. 2
      src/base/single/button/listitem/textitem.js
  64. 4
      src/base/single/button/node/icontexticonnode.js
  65. 2
      src/base/single/button/node/icontextnode.js
  66. 2
      src/base/single/button/node/texticonnode.js
  67. 2
      src/base/single/button/node/textnode.js
  68. 2
      src/base/single/editor/editor.code.js
  69. 2
      src/base/single/editor/editor.js
  70. 2
      src/base/single/editor/editor.multifile.js
  71. 2
      src/base/single/editor/editor.textarea.js
  72. 44
      src/base/single/label/label.js
  73. 2
      src/base/table/table.cell.js
  74. 2
      src/base/table/table.collection.cell.js
  75. 4
      src/base/table/table.collection.js
  76. 2
      src/base/table/table.grid.cell.js
  77. 4
      src/base/table/table.grid.js
  78. 4
      src/base/table/table.grid.scrollbar.js
  79. 2
      src/base/table/table.header.cell.js
  80. 4
      src/base/table/table.js
  81. 2
      src/base/table/table.resizable.cell.js
  82. 4
      src/base/table/table.resizable.js
  83. 2
      src/base/tree/1treeview.js
  84. 2
      src/base/tree/customtree.js
  85. 2
      src/case/button/icon/icon.change.js
  86. 2
      src/case/button/item.multiselect.js
  87. 2
      src/case/button/item.singleselect.icontext.js
  88. 2
      src/case/button/item.singleselect.js
  89. 2
      src/case/button/item.singleselect.radio.js
  90. 2
      src/case/button/node/node.arrow.js
  91. 2
      src/case/button/node/node.first.plus.js
  92. 2
      src/case/button/node/node.icon.arrow.js
  93. 2
      src/case/button/node/node.last.plus.js
  94. 2
      src/case/button/node/node.mid.plus.js
  95. 2
      src/case/button/node/node.multilayer.icon.arrow.js
  96. 2
      src/case/button/node/node.plus.js
  97. 2
      src/case/button/node/node.triangle.js
  98. 2
      src/case/button/treeitem/item.first.treeleaf.js
  99. 2
      src/case/button/treeitem/item.icon.treeleaf.js
  100. 2
      src/case/button/treeitem/item.last.treeleaf.js
  101. Some files were not shown because too many files have changed in this diff Show More

3
.gitignore vendored

@ -1,2 +1,5 @@
node_modules/ node_modules/
/.idea/ /.idea/
dist
demo.js
demo.css

32
Gruntfile.js

@ -58,6 +58,31 @@ module.exports = function (grunt) {
baseCss: { baseCss: {
src: ['src/css/base/**/*.css'], src: ['src/css/base/**/*.css'],
dest: 'dist/base.css' dest: 'dist/base.css'
},
demoJs: {
src: ['demo/version.js', 'demo/app.js', 'demo/js/**/*.js'],
dest: 'demo/dist/demo.js'
},
demoCss: {
src: ['demo/css/**/*.css'],
dest: 'demo/dist/demo.css'
}
},
less: {
main: {
expand: true,
cwd: 'demo/less',
src: ['**/*.less'],
dest: 'demo/css/',
ext: '.css'
},
dev: {
options: {
compress: true,
yuicompress: false
}
} }
}, },
@ -106,8 +131,8 @@ module.exports = function (grunt) {
}, },
watch: { watch: {
scripts: { scripts: {
files: ['src/**/*.js'], files: ['src/**/*.js', 'demo/**/*.js', 'demo/**/*.less'],
tasks: ['concat'], tasks: ['less', 'concat'],
options: { options: {
spanw: true, spanw: true,
interrupt: true interrupt: true
@ -118,9 +143,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.registerTask('default', ['concat', 'watch']); grunt.registerTask('default', ['less', 'concat', 'watch']);
}; };

4
index.html → demo.html

@ -8,11 +8,13 @@
href="./dist/core.css"/> href="./dist/core.css"/>
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="./dist/base.css"/> href="./dist/base.css"/>
<link rel="stylesheet" type="text/css"
href="demo/dist/demo.css"/>
<script src="./dist/core.js"></script> <script src="./dist/core.js"></script>
<script src="./dist/base.js"></script> <script src="./dist/base.js"></script>
<script src="./dist/case.js"></script> <script src="./dist/case.js"></script>
<script src="./index.js"></script> <script src="demo/dist/demo.js"></script>
</head> </head>
<body> <body>
<div id="wrapper"></div> <div id="wrapper"></div>

12
demo/app.js

@ -0,0 +1,12 @@
$(function () {
var ref;
BI.createWidget({
type: "demo.main",
ref: function (_ref) {
console.log(_ref);
ref = _ref;
},
element: '#wrapper'
});
// ref.destroy();
});

0
dist/base.min.css → demo/css/center.css

3
demo/css/main.css

@ -0,0 +1,3 @@
.demo-main .bg1 {
background-color: #178cdf;
}

3
demo/css/north.css

@ -0,0 +1,3 @@
.demo-north {
background-color: #3c8dbc;
}

3
demo/css/west.css

@ -0,0 +1,3 @@
.demo-west {
background-color: #222d32;
}

61
demo/js/center.js

@ -0,0 +1,61 @@
Demo.Center = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-center"
},
beforeCreate: function () {
console.log("beforeCreate");
},
render: function () {
return {
type: "bi.vertical",
hgap: 50,
vgap: 20,
items: [{
type: "bi.label",
text: "栅格布局",
height: 50
}, {
type: "bi.lattice",
columnSize: [0.1, 0.1, 0.3, 0.4, 0.1],
items: [{
type: "bi.label",
height: 30,
text: "Left-1",
cls: "layout-bg1 lattice-item",
hgap: 20
}, {
type: "bi.label",
height: 30,
text: "Left-2",
cls: "layout-bg2 lattice-item",
hgap: 20
}, {
type: "bi.label",
height: 30,
text: "Left-3",
cls: "layout-bg3 lattice-item",
hgap: 20
}, {
type: "bi.label",
height: 30,
text: "Left-4",
cls: "layout-bg4 lattice-item",
hgap: 20
}, {
type: "bi.label",
height: 30,
text: "Left-5",
cls: "layout-bg5 lattice-item",
hgap: 20
}]
}]
}
},
created: function () {
console.log("created");
},
mounted: function () {
console.log("mounted");
}
});
$.shortcut("demo.center", Demo.Center);

30
demo/js/main.js

@ -0,0 +1,30 @@
Demo.Main = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-main"
},
render: function () {
return {
type: "bi.border",
items: {
north: {
height: 50,
el: {
type: "demo.north"
}
},
west: {
width: 230,
el: {
type: "demo.west"
}
},
center: {
el: {
type: "demo.center",
}
}
}
}
}
});
$.shortcut("demo.main", Demo.Main);

9
demo/js/north.js

@ -0,0 +1,9 @@
Demo.North = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-north"
},
render: function () {
}
});
$.shortcut("demo.north", Demo.North);

9
demo/js/west.js

@ -0,0 +1,9 @@
Demo.West = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-west"
},
render: function () {
}
});
$.shortcut("demo.west", Demo.West);

3
demo/less/center.less

@ -0,0 +1,3 @@
.demo-center {
}

5
demo/less/main.less

@ -0,0 +1,5 @@
.demo-main {
& .bg1 {
background-color: #178cdf;
}
}

3
demo/less/north.less

@ -0,0 +1,3 @@
.demo-north{
background-color: #3c8dbc;
}

3
demo/less/west.less

@ -0,0 +1,3 @@
.demo-west {
background-color: #222d32;
}

3
demo/version.js

@ -0,0 +1,3 @@
Demo = {
version: 1.0
};

BIN
dist/.DS_Store vendored

Binary file not shown.

3690
dist/base.css vendored

File diff suppressed because it is too large Load Diff

35244
dist/base.js vendored

File diff suppressed because it is too large Load Diff

8
dist/base.min.js vendored

File diff suppressed because one or more lines are too long

8399
dist/case.js vendored

File diff suppressed because it is too large Load Diff

9924
dist/core.css vendored

File diff suppressed because it is too large Load Diff

27818
dist/core.js vendored

File diff suppressed because it is too large Load Diff

1
dist/core.min.css vendored

@ -1 +0,0 @@
body,html{height:100%}#wrapper,body{position:absolute;left:0;top:0}#wrapper,html{overflow:hidden}a,body{text-decoration:none}body,input,ol,textarea,ul{margin:0;padding:0}.b-font,i{-webkit-text-stroke-width:.2px;-moz-osx-font-smoothing:grayscale}.b-font,body,i{-moz-osx-font-smoothing:grayscale}@font-face{font-family:bi;src:url(${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.eot?#iefix) format('embedded-opentype'),url(${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.woff) format('woff'),url(${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.ttf) format('truetype'),url(${servletURL}?op=resource&resource=/com/fr/bi/web/resources/fonts/iconfont.svg#svgFontName) format('svg')}.b-font{font-family:bi;font-style:normal;-webkit-font-smoothing:antialiased}*,button,html,input,select,textarea{font-family:"Microsoft YaHei","Hiragino Sans GB W3"}*,a,body,div,html,img,li,p,span,ul{margin:0}body{width:100%;background-repeat:repeat;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;color:#1a1a1a;font:400 12px "Microsoft YaHei","Hiragino Sans GB W3";-webkit-font-smoothing:antialiased;-kthml-user-focus:normal;-moz-user-focus:normal;-moz-outline:0 none;outline:0}a,a:focus{outline:0}#wrapper{right:0;bottom:0;overflow-x:hidden;overflow-y:hidden}input,textarea{outline:0;border:1px solid #ccc}ul{list-style:disc}li{list-style-type:none}i{font-style:normal;-webkit-font-smoothing:antialiased}div::-webkit-scrollbar,textarea::-webkit-scrollbar{-webkit-appearance:none;background-color:#f4f4f4;width:6px;height:6px}div::-webkit-scrollbar-thumb,textarea::-webkit-scrollbar-thumb{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#e2e2e2}

12
dist/core.min.js vendored

File diff suppressed because one or more lines are too long

56
index.js

@ -1,56 +0,0 @@
$(function(){
var items = [], header = [], columnSize = [];
var rowCount = 100, columnCount = 100;
for (var i = 0; i < 1; i++) {
header[i] = [];
for (var j = 0; j < columnCount; j++) {
header[i][j] = {
type: "bi.label",
text: "表头" + i + "-" + j
}
columnSize[j] = 100;
}
}
for (var i = 0; i < rowCount; i++) {
items[i] = [];
for (var j = 0; j < columnCount; j++) {
items[i][j] = {
type: "bi.label",
text: (i < 3 ? 0 : i) + "-" + j
}
}
}
var table = BI.createWidget({
type: "bi.resizable_table",
el: {
type: "bi.collection_table",
},
width: 600,
height: 500,
isResizeAdapt: true,
isNeedResize: true,
isNeedMerge: true,
mergeCols: [0, 1],
mergeRule: function (col1, col2) {
return BI.isEqual(col1, col2);
},
isNeedFreeze: true,
freezeCols: [0, 1],
columnSize: columnSize,
items: items,
header: header
});
BI.createWidget({
type: "bi.absolute",
element: "#wrapper",
items: [{
el: table,
left: 10,
right: 10,
top: 10,
bottom: 10
}]
})
})

1
package.json

@ -10,6 +10,7 @@
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-cssmin": "^1.0.1",
"grunt-contrib-jshint": "^1.0.0", "grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-less": "^1.4.1",
"grunt-contrib-uglify": "^1.0.1", "grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "^1.0.0", "grunt-contrib-watch": "^1.0.0",
"open": "0.0.5" "open": "0.0.5"

2
server.js

@ -9,5 +9,5 @@ const port = 3000;
app.use(express.static("./")); app.use(express.static("./"));
app.listen(port, function() { app.listen(port, function() {
console.log("server start"); console.log("server start");
open('http://localhost:' + port + '/index.html'); open('http://localhost:' + port + '/demo.html');
}); });

89
src/base/chart/chart.js

@ -1,89 +0,0 @@
/**
* 图表控件
* @class BI.Chart
* @extends BI.Widget
*/
BI.Chart = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.Chart.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-chart"
})
},
_init: function () {
BI.Chart.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.isInit = false;
this.isSetOptions = false;
this.wants2SetData = false;
var width = 0;
var height = 0;
this._resizer = BI.debounce(function () {
if (self.element.is(":visible") && self.vanCharts) {
self.vanCharts.resize();
}
}, 30);
BI.Resizers.add(this.getName(), function (e) {
if (BI.isWindow(e.target) && self.element.is(":visible")) {
var newW = self.element.width(), newH = self.element.height();
if (newW > 0 && newH > 0 && (width !== newW || height !== newH)) {
self._resizer();
width = newW;
height = newH;
}
}
});
},
_setData: function () {
this.vanCharts && this.vanCharts.setData(this.config);
},
resize: function () {
if (this.element.is(":visible") && this.isSetOptions === true) {
this._resizer();
}
},
magnify: function () {
this.vanCharts && this.vanCharts.charts[0] && this.vanCharts.charts[0].refreshRestore();
},
populate: function (items, options) {
var self = this, o = this.options;
o.items = items;
this.config = options || {};
this.config.series = o.items;
var setOptions = function () {
self.vanCharts.setOptions(self.config);
self.isSetOptions = true;
//if (self.wants2SetData === true) {
// self._setData();
//}
};
var init = function () {
if (self.element.is(":visible")) {
self.vanCharts = VanCharts.init(self.element[0]);
BI.nextTick(setOptions);
self.isInit = true;
}
};
if (this.isInit === false) {
BI.nextTick(init);
}
if (this.element.is(":visible") && this.isSetOptions === true) {
this._setData();
this.wants2SetData = null;
} else {
this.wants2SetData = true;
}
}
});
BI.Chart.EVENT_CHANGE = "EVENT_CHANGE";
$.shortcut('bi.chart', BI.Chart);

16
src/base/collection/collection.js

@ -48,7 +48,7 @@ BI.Collection = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
scrollable: o.overflowX === true && o.overflowY === true, scrollable: o.overflowX === true && o.overflowY === true,
scrolly: o.overflowX === false && o.overflowY === true, scrolly: o.overflowX === false && o.overflowY === true,
scrollx: o.overflowX === true && o.overflowY === false, scrollx: o.overflowX === true && o.overflowY === false,
@ -58,14 +58,20 @@ BI.Collection = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData(); this._calculateSizeAndPositionData();
this._populate(); this._populate();
} }
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) { if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () { this.element.scrollTop(o.scrollTop);
self.element.scrollTop(o.scrollTop); this.element.scrollLeft(o.scrollLeft);
self.element.scrollLeft(o.scrollLeft);
});
} }
}, },
destroyed: function () {
this._debounceRelease = null;
},
_calculateSizeAndPositionData: function () { _calculateSizeAndPositionData: function () {
var o = this.options; var o = this.options;
var cellMetadata = []; var cellMetadata = [];

13
src/base/combination/combo.js

@ -4,9 +4,8 @@
*/ */
BI.Combo = BI.inherit(BI.Widget, { BI.Combo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments); return BI.extend(BI.Combo.superclass._defaultConfig.apply(this, arguments), {
return BI.extend(conf, { baseCls: "bi-combo",
baseCls: (conf.baseCls || "") + " bi-combo",
trigger: "click", trigger: "click",
toggle: true, toggle: true,
direction: "bottom", //top||bottom||left||right||top,left||top,right||bottom,left||bottom,right direction: "bottom", //top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
@ -62,7 +61,7 @@ BI.Combo = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.combo} {el: this.combo}
] ]
@ -159,7 +158,7 @@ BI.Combo = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.popupView} {el: this.popupView}
] ]
@ -357,14 +356,14 @@ BI.Combo = BI.inherit(BI.Widget, {
this._toggle(); this._toggle();
}, },
destroy: function () { destroyed: function () {
$(document).unbind("mousedown." + this.getName()) $(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName()) .unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName()) .unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName()) .unbind("mousemove." + this.getName())
.unbind("mouseleave." + this.getName()); .unbind("mouseleave." + this.getName());
this.popupView && this.popupView.destroy();
BI.Resizers.remove(this.getName()); BI.Resizers.remove(this.getName());
BI.Combo.superclass.destroy.apply(this, arguments);
} }
}); });
BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";

8
src/base/combination/expander.js

@ -56,7 +56,7 @@ BI.Expander = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.expander} {el: this.expander}
] ]
@ -156,7 +156,7 @@ BI.Expander = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.popupView} {el: this.popupView}
] ]
@ -254,8 +254,8 @@ BI.Expander = BI.inherit(BI.Widget, {
return this.popupView && this.popupView.getNodeByValue(value); return this.popupView && this.popupView.getNodeByValue(value);
}, },
destroy: function () { destroyed: function () {
BI.Expander.superclass.destroy.apply(this, arguments); this.popupView && this.popupView.destroy();
} }
}); });
BI.Expander.EVENT_EXPAND = "EVENT_EXPAND"; BI.Expander.EVENT_EXPAND = "EVENT_EXPAND";

6
src/base/combination/group.button.js

@ -176,7 +176,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
this.buttons = this._btnsCreator.apply(this, arguments); this.buttons = this._btnsCreator.apply(this, arguments);
var items = this._packageItems(items, this._packageBtns(this.buttons)); var items = this._packageItems(items, this._packageBtns(this.buttons));
this.layouts = BI.createWidget(BI.extend({element: this.element}, this._packageLayout(items))); this.layouts = BI.createWidget(BI.extend({element: this}, this._packageLayout(items)));
}, },
setEnable: function (b) { setEnable: function (b) {
@ -298,10 +298,6 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
} }
}); });
return node; return node;
},
destroy: function () {
BI.ButtonGroup.superclass.destroy.apply(this, arguments);
} }
}); });
BI.extend(BI.ButtonGroup, { BI.extend(BI.ButtonGroup, {

2
src/base/combination/group.combo.js

@ -60,7 +60,7 @@ BI.ComboGroup = BI.inherit(BI.Widget, {
}) })
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this.element, element: this,
height: o.height, height: o.height,
trigger: o.trigger, trigger: o.trigger,
direction: o.direction, direction: o.direction,

6
src/base/combination/loader.js

@ -99,7 +99,7 @@ BI.Loader = BI.inherit(BI.Widget, {
} }
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({ }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({
scrolly: true scrolly: true
}, o.logic, { }, o.logic, {
@ -252,10 +252,6 @@ BI.Loader = BI.inherit(BI.Widget, {
BI.each([this.prev, this.next], function (i, ob) { BI.each([this.prev, this.next], function (i, ob) {
ob && ob.setVisible(false); ob && ob.setVisible(false);
}); });
},
destroy: function () {
BI.Loader.superclass.destroy.apply(this, arguments);
} }
}); });
BI.Loader.EVENT_CHANGE = "EVENT_CHANGE"; BI.Loader.EVENT_CHANGE = "EVENT_CHANGE";

6
src/base/combination/navigation.js

@ -34,7 +34,7 @@ BI.Navigation = BI.inherit(BI.Widget, {
type: "bi.card" type: "bi.card"
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tab, this.layout) items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tab, this.layout)
})))); }))));
@ -127,10 +127,6 @@ BI.Navigation = BI.inherit(BI.Widget, {
empty: function(){ empty: function(){
this.layout.deleteAllCard(); this.layout.deleteAllCard();
this.cardMap = {}; this.cardMap = {};
},
destroy: function(){
BI.Navigation.superclass.destroy.apply(this, arguments);
} }
}); });
BI.Navigation.EVENT_CHANGE = "EVENT_CHANGE"; BI.Navigation.EVENT_CHANGE = "EVENT_CHANGE";

6
src/base/combination/searcher.js

@ -53,7 +53,7 @@ BI.Searcher = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
lgap: o.lgap, lgap: o.lgap,
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
@ -283,9 +283,9 @@ BI.Searcher = BI.inherit(BI.Widget, {
this.popupView && this.popupView.empty(); this.popupView && this.popupView.empty();
}, },
destroy: function () { destroyed: function () {
this.popupView && this.popupView.destroy();
BI.Maskers.remove(this.getName()); BI.Maskers.remove(this.getName());
BI.Searcher.superclass.destroy.apply(this, arguments);
} }
}); });
BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE"; BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE";

8
src/base/combination/switcher.js

@ -56,7 +56,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.switcher} {el: this.switcher}
] ]
@ -144,7 +144,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [ items: [
{el: this.popupView} {el: this.popupView}
] ]
@ -258,8 +258,8 @@ BI.Switcher = BI.inherit(BI.Widget, {
this.popupView && this.popupView.empty(); this.popupView && this.popupView.empty();
}, },
destroy: function () { destroyed: function () {
BI.Switcher.superclass.destroy.apply(this, arguments); this.popupView && this.popupView.destroy();
} }
}); });
BI.Switcher.EVENT_EXPAND = "EVENT_EXPAND"; BI.Switcher.EVENT_EXPAND = "EVENT_EXPAND";

6
src/base/combination/tab.js

@ -33,7 +33,7 @@ BI.Tab = BI.inherit(BI.Widget, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tab, this.layout) items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tab, this.layout)
})))); }))));
@ -114,9 +114,9 @@ BI.Tab = BI.inherit(BI.Widget, {
this.cardMap = {}; this.cardMap = {};
}, },
destroy: function () { destroyed: function () {
this.layout.deleteAllCard();
this.cardMap = {}; this.cardMap = {};
BI.Tab.superclass.destroy.apply(this, arguments);
} }
}); });
BI.Tab.EVENT_CHANGE = "EVENT_CHANGE"; BI.Tab.EVENT_CHANGE = "EVENT_CHANGE";

2
src/base/combination/tree.button.js

@ -286,7 +286,7 @@ BI.ButtonMap = BI.inherit(BI.ButtonTree, {
this.empty(); this.empty();
var packages = this._packageItems(items, this._packageBtns(array)); var packages = this._packageItems(items, this._packageBtns(array));
BI.createWidget(BI.extend({element: this.element}, this._packageLayout(packages))); BI.createWidget(BI.extend({element: this}, this._packageLayout(packages)));
}, },
getIndexByValue: function (value) { getIndexByValue: function (value) {

2
src/base/el.js

@ -19,7 +19,7 @@ BI.EL = BI.inherit(BI.Widget, {
this.ele = BI.createWidget(o.el); this.ele = BI.createWidget(o.el);
BI.createWidget(o.layout, { BI.createWidget(o.layout, {
type: "bi.adaptive", type: "bi.adaptive",
element: this.element, element: this,
items: [this.ele] items: [this.ele]
}); });
this.ele.on(BI.Controller.EVENT_CHANGE, function () { this.ele.on(BI.Controller.EVENT_CHANGE, function () {

2
src/base/formula/formulaeditor.js

@ -56,7 +56,7 @@
}); });
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: self.element, element: self,
items: [{ items: [{
el: self.watermark, el: self.watermark,
left: 0, left: 0,

12
src/base/grid/grid.js

@ -51,7 +51,7 @@ BI.Grid = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
scrollable: o.overflowX === true && o.overflowY === true, scrollable: o.overflowX === true && o.overflowY === true,
scrolly: o.overflowX === false && o.overflowY === true, scrolly: o.overflowX === false && o.overflowY === true,
scrollx: o.overflowX === true && o.overflowY === false, scrollx: o.overflowX === true && o.overflowY === false,
@ -60,11 +60,13 @@ BI.Grid = BI.inherit(BI.Widget, {
if (o.items.length > 0) { if (o.items.length > 0) {
this._populate(); this._populate();
} }
},
mounted: function () {
var o = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) { if (o.scrollLeft !== 0 || o.scrollTop !== 0) {
BI.nextTick(function () { this.element.scrollTop(o.scrollTop);
self.element.scrollTop(o.scrollTop); this.element.scrollLeft(o.scrollLeft);
self.element.scrollLeft(o.scrollLeft);
});
} }
}, },

2
src/base/layer/layer.floatbox.js

@ -41,7 +41,7 @@ BI.FloatBox = BI.inherit(BI.Widget, {
this._south = BI.createWidget(); this._south = BI.createWidget();
BI.createWidget({ BI.createWidget({
type: 'bi.border', type: 'bi.border',
element: this.element, element: this,
items: { items: {
'north': { 'north': {
el: { el: {

2
src/base/layer/layer.popup.js

@ -70,7 +70,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
scrolly: false, scrolly: false,
lgap: o.lgap, lgap: o.lgap,

4
src/base/layer/layer.scroll.js

@ -30,7 +30,7 @@ BI.ScrollView = BI.inherit(BI.Widget, {
}) })
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
scrolly: false, scrolly: false,
items: [this.scroll] items: [this.scroll]
}) })
@ -44,7 +44,7 @@ BI.ScrollView = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.dropdown, el: this.dropdown,
left: 0, left: 0,

2
src/base/layer/layer.searcher.js

@ -94,7 +94,7 @@ BI.SearcherView = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
items: [this.matcher, this.spliter, this.searcher] items: [this.matcher, this.spliter, this.searcher]
}); });
}, },

2
src/base/pager/pager.js

@ -183,7 +183,7 @@ BI.Pager = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({ this.button_group = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
element: this.element, element: this,
items: BI.createItems(view, { items: BI.createItems(view, {
cls: "page-item", cls: "page-item",
height: 23, height: 23,

4
src/base/pane.js

@ -32,7 +32,7 @@ BI.Pane = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this.element, element: this,
items: [this._tipText], items: [this._tipText],
bgap: 25 bgap: 25
}); });
@ -65,7 +65,7 @@ BI.Pane = BI.inherit(BI.Widget, {
this._loading.element.css("zIndex", 1); this._loading.element.css("zIndex", 1);
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this._loading, el: this._loading,
left: 0, left: 0,

2
src/base/single/a/a.js

@ -22,7 +22,7 @@ BI.A = BI.inherit(BI.Text, {
BI.A.superclass._init.apply(this, arguments); BI.A.superclass._init.apply(this, arguments);
if (o.el) { if (o.el) {
BI.createWidget(o.el, { BI.createWidget(o.el, {
element: this.element element: this
}); });
} }
} }

2
src/base/single/bar/bar.loading.js

@ -45,7 +45,7 @@ BI.LoadingBar = BI.inherit(BI.Single, {
}) })
this.cardLayout = BI.createWidget({ this.cardLayout = BI.createWidget({
type: "bi.card", type: "bi.card",
element: this.element, element: this,
items: [{ items: [{
el: loaded, el: loaded,
cardName: "loaded" cardName: "loaded"

2
src/base/single/button/button.basic.js

@ -53,7 +53,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
self.$mask.invisible(); self.$mask.invisible();
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: self.element, element: self,
items: [{ items: [{
el: self.$mask, el: self.$mask,
left: 0, left: 0,

4
src/base/single/button/buttons/button.icon.js

@ -29,12 +29,12 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
this.element.css("lineHeight", o.height + "px"); this.element.css("lineHeight", o.height + "px");
BI.createWidget({ BI.createWidget({
type: "bi.default", type: "bi.default",
element: this.element, element: this,
items: [this.icon] items: [this.icon]
}) })
} else { } else {
BI.createWidget({ BI.createWidget({
element: this.element, element: this,
type: 'bi.center_adapt', type: 'bi.center_adapt',
items: [this.icon] items: [this.icon]
}); });

4
src/base/single/button/buttons/button.image.js

@ -29,13 +29,13 @@ BI.ImageButton = BI.inherit(BI.BasicButton, {
if (BI.isNumber(o.iconWidth) || BI.isNumber(o.iconHeight)) { if (BI.isNumber(o.iconWidth) || BI.isNumber(o.iconHeight)) {
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this,
items: [this.image] items: [this.image]
}) })
} else { } else {
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
element: this.element, element: this,
items: [this.image], items: [this.image],
scrollable: false scrollable: false
}) })

4
src/base/single/button/buttons/button.js

@ -55,7 +55,7 @@
BI.createWidget({ BI.createWidget({
type: "bi.horizontal_auto", type: "bi.horizontal_auto",
cls: "button-" + o.level + " " + o.iconClass, cls: "button-" + o.level + " " + o.iconClass,
element: this.element, element: this,
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
tgap: o.tgap, tgap: o.tgap,
@ -82,7 +82,7 @@
bgap: o.bgap, bgap: o.bgap,
lgap: o.lgap, lgap: o.lgap,
rgap: o.rgap, rgap: o.rgap,
element: this.element, element: this,
text: o.text, text: o.text,
value: o.value value: o.value
}); });

2
src/base/single/button/buttons/button.text.js

@ -29,7 +29,7 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
var o = this.options; var o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textWidth: o.textWidth, textWidth: o.textWidth,

4
src/base/single/button/listitem/blankicontexticonitem.js

@ -59,7 +59,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
}) })
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: { el: {
type: "bi.center_adapt", type: "bi.center_adapt",
@ -80,7 +80,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
}) })
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", { items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.layout", type: "bi.layout",

2
src/base/single/button/listitem/blankicontextitem.js

@ -60,7 +60,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", blank, this.icon, this.text) items: BI.LogicFactory.createLogicItemsByDirection("left", blank, this.icon, this.text)
})))); }))));

4
src/base/single/button/listitem/icontexticonitem.js

@ -62,7 +62,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
}) })
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: { el: {
type: "bi.center_adapt", type: "bi.center_adapt",
@ -83,7 +83,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
}) })
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", icon1, this.text, blank) items: BI.LogicFactory.createLogicItemsByDirection("left", icon1, this.text, blank)
})))); }))));

2
src/base/single/button/listitem/icontextitem.js

@ -55,7 +55,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text) items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.icon, this.text)
})))); }))));

2
src/base/single/button/listitem/texticonitem.js

@ -56,7 +56,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", this.text, this.icon) items: BI.LogicFactory.createLogicItemsByDirection("left", this.text, this.icon)
})))); }))));

2
src/base/single/button/listitem/textitem.js

@ -25,7 +25,7 @@ BI.TextItem = BI.inherit(BI.BasicButton, {
var o = this.options; var o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textHeight: o.whiteSpace == "nowrap" ? o.height : o.textHeight, textHeight: o.whiteSpace == "nowrap" ? o.height : o.textHeight,

4
src/base/single/button/node/icontexticonnode.js

@ -60,7 +60,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
}) })
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: { el: {
type: "bi.center_adapt", type: "bi.center_adapt",
@ -81,7 +81,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
}) })
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", icon1, this.text, blank) items: BI.LogicFactory.createLogicItemsByDirection("left", icon1, this.text, blank)
})))); }))));

2
src/base/single/button/node/icontextnode.js

@ -54,7 +54,7 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
}) })
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", this.icon, this.text) items: BI.LogicFactory.createLogicItemsByDirection("left", this.icon, this.text)
})))); }))));

2
src/base/single/button/node/texticonnode.js

@ -53,7 +53,7 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", this.text, this.icon) items: BI.LogicFactory.createLogicItemsByDirection("left", this.text, this.icon)
})))); }))));

2
src/base/single/button/node/textnode.js

@ -24,7 +24,7 @@ BI.TextNode = BI.inherit(BI.NodeButton, {
var o = this.options; var o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textHeight: o.whiteSpace == "nowrap" ? o.height : o.textHeight, textHeight: o.whiteSpace == "nowrap" ? o.height : o.textHeight,

2
src/base/single/editor/editor.code.js

@ -61,7 +61,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: watermark, el: watermark,
top: 0, top: 0,

2
src/base/single/editor/editor.js

@ -93,7 +93,7 @@ BI.Editor = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: items items: items
}); });
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {

2
src/base/single/editor/editor.multifile.js

@ -50,7 +50,7 @@ BI.MultifileEditor = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: { el: {
type: "bi.adaptive", type: "bi.adaptive",

2
src/base/single/editor/editor.textarea.js

@ -24,7 +24,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
this.content.element.css({"resize": "none"}); this.content.element.css({"resize": "none"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: { el: {
type: "bi.adaptive", type: "bi.adaptive",

44
src/base/single/label/label.js

@ -59,7 +59,7 @@ BI.Label = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
@ -77,7 +77,7 @@ BI.Label = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
@ -97,7 +97,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
@ -109,7 +109,7 @@ BI.Label = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
left: o.hgap + o.lgap, left: o.hgap + o.lgap,
@ -124,7 +124,7 @@ BI.Label = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
}] }]
@ -136,7 +136,7 @@ BI.Label = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
@ -156,7 +156,7 @@ BI.Label = BI.inherit(BI.Single, {
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
@ -170,7 +170,7 @@ BI.Label = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
left: o.hgap + o.lgap, left: o.hgap + o.lgap,
@ -193,7 +193,7 @@ BI.Label = BI.inherit(BI.Single, {
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
this.text = BI.createWidget(BI.extend(json, { this.text = BI.createWidget(BI.extend(json, {
element: this.element element: this
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -214,13 +214,13 @@ BI.Label = BI.inherit(BI.Single, {
this.text = BI.createWidget(json); this.text = BI.createWidget(json);
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
} }
this.text = BI.createWidget(BI.extend(json, { this.text = BI.createWidget(BI.extend(json, {
element: this.element element: this
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -239,7 +239,7 @@ BI.Label = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
@ -263,7 +263,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
@ -283,7 +283,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
@ -295,7 +295,7 @@ BI.Label = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
left: o.hgap + o.lgap, left: o.hgap + o.lgap,
@ -316,7 +316,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
}] }]
@ -334,7 +334,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [ items: [
{ {
el: (this.text = BI.createWidget(json)) el: (this.text = BI.createWidget(json))
@ -354,7 +354,7 @@ BI.Label = BI.inherit(BI.Single, {
rgap: o.rgap, rgap: o.rgap,
tgap: o.tgap, tgap: o.tgap,
bgap: o.bgap, bgap: o.bgap,
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
@ -368,7 +368,7 @@ BI.Label = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,
scrollable: true, scrollable: true,
element: this.element, element: this,
items: [{ items: [{
el: (this.text = BI.createWidget(json)), el: (this.text = BI.createWidget(json)),
left: o.hgap + o.lgap, left: o.hgap + o.lgap,
@ -391,7 +391,7 @@ BI.Label = BI.inherit(BI.Single, {
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
this.text = BI.createWidget(BI.extend(json, { this.text = BI.createWidget(BI.extend(json, {
element: this.element element: this
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -412,13 +412,13 @@ BI.Label = BI.inherit(BI.Single, {
this.text = BI.createWidget(json); this.text = BI.createWidget(json);
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: "bi.vertical_adapt",
element: this.element, element: this,
items: [this.text] items: [this.text]
}); });
return; return;
} }
this.text = BI.createWidget(BI.extend(json, { this.text = BI.createWidget(BI.extend(json, {
element: this.element element: this
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.layout", type: "bi.layout",

2
src/base/table/table.cell.js

@ -19,7 +19,7 @@ BI.TableCell = BI.inherit(BI.Widget, {
BI.TableCell.superclass._init.apply(this, arguments); BI.TableCell.superclass._init.apply(this, arguments);
BI.createWidget({ BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
whiteSpace: "nowrap", whiteSpace: "nowrap",
textAlign: this.options.textAlign, textAlign: this.options.textAlign,
height: this.options.height, height: this.options.height,

2
src/base/table/table.collection.cell.js

@ -30,7 +30,7 @@ BI.CollectionTableCell = BI.inherit(BI.Widget, {
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.cell, el: this.cell,
left: 0, left: 0,

4
src/base/table/table.collection.js

@ -101,7 +101,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
}); });
this.contextLayout = BI.createWidget({ this.contextLayout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.topLeft, el: this.topLeft,
top: 0, top: 0,
@ -146,7 +146,7 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
}); });
this.scrollBarLayout = BI.createWidget({ this.scrollBarLayout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.topScrollbar, el: this.topScrollbar,
right: 0, right: 0,

2
src/base/table/table.grid.cell.js

@ -32,7 +32,7 @@ BI.GridTableCell = BI.inherit(BI.Widget, {
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.cell, el: this.cell,
left: 0, left: 0,

4
src/base/table/table.grid.js

@ -103,7 +103,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
}); });
this.contextLayout = BI.createWidget({ this.contextLayout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.topLeft, el: this.topLeft,
top: 0, top: 0,
@ -148,7 +148,7 @@ BI.GridTable = BI.inherit(BI.Widget, {
}); });
this.scrollBarLayout = BI.createWidget({ this.scrollBarLayout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.topScrollbar, el: this.topScrollbar,
right: 0, right: 0,

4
src/base/table/table.grid.scrollbar.js

@ -40,7 +40,7 @@ BI.GridTableScrollbar = BI.inherit(BI.Widget, {
}); });
this.contextLayout = BI.createWidget({ this.contextLayout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.face, el: this.face,
left: 0, left: 0,
@ -362,7 +362,7 @@ BI.GridTableHorizontalScrollbar = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
cls: "horizontal-scrollbar", cls: "horizontal-scrollbar",
element: this.element, element: this,
width: o.size, width: o.size,
height: BI.GridTableScrollbar.SIZE, height: BI.GridTableScrollbar.SIZE,
items: [{ items: [{

2
src/base/table/table.header.cell.js

@ -18,7 +18,7 @@ BI.TableHeaderCell = BI.inherit(BI.Widget, {
BI.TableHeaderCell.superclass._init.apply(this, arguments); BI.TableHeaderCell.superclass._init.apply(this, arguments);
BI.createWidget({ BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
textAlign: "center", textAlign: "center",
height: this.options.height, height: this.options.height,
text: this.options.text, text: this.options.text,

4
src/base/table/table.js

@ -443,7 +443,7 @@ BI.Table = BI.inherit(BI.Widget, {
regionColumnSize = isRight ? [0, 'fill'] : ['fill', 0]; regionColumnSize = isRight ? [0, 'fill'] : ['fill', 0];
} }
this.partitions = BI.createWidget(BI.extend({ this.partitions = BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("table", BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic("table", BI.extend({}, o.logic, {
rows: 2, rows: 2,
columns: 2, columns: 2,
@ -1051,7 +1051,7 @@ BI.Table = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
cls: "bottom-right", cls: "bottom-right",
element: this.element, element: this,
scrollable: false, scrollable: false,
items: [this.scrollBottomRight] items: [this.scrollBottomRight]
}); });

2
src/base/table/table.resizable.cell.js

@ -65,7 +65,7 @@ BI.ResizableTableCell = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.cell, el: this.cell,
left: 0, left: 0,

4
src/base/table/table.resizable.js

@ -41,7 +41,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
this.regionResizerHandler = this._createResizerHandler(); this.regionResizerHandler = this._createResizerHandler();
this.table = BI.createWidget(o.el, { this.table = BI.createWidget(o.el, {
type: "bi.grid_table", type: "bi.grid_table",
element: this.element, element: this,
width: o.width, width: o.width,
height: o.height, height: o.height,
headerRowSize: o.headerRowSize, headerRowSize: o.headerRowSize,
@ -63,7 +63,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this.element, element: this,
items: [{ items: [{
el: this.regionResizerHandler, el: this.regionResizerHandler,
left: 0, left: 0,

2
src/base/tree/1treeview.js

@ -28,7 +28,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
type: "bi.vertical", type: "bi.vertical",
scrollable: true, scrollable: true,
scrolly: false, scrolly: false,
element: this.element, element: this,
items: [this.container, this.tip] items: [this.container, this.tip]
}); });

2
src/base/tree/customtree.js

@ -87,7 +87,7 @@ BI.CustomTree = BI.inherit(BI.Widget, {
initTree: function (nodes) { initTree: function (nodes) {
var self = this, o = this.options; var self = this, o = this.options;
this.tree = BI.createWidget(o.el, { this.tree = BI.createWidget(o.el, {
element: this.element, element: this,
items: this._formatItems(nodes), items: this._formatItems(nodes),
itemsCreator: function (op, callback) { itemsCreator: function (op, callback) {
o.itemsCreator.apply(this, [op, function (items) { o.itemsCreator.apply(this, [op, function (items) {

2
src/case/button/icon/icon.change.js

@ -35,7 +35,7 @@ BI.IconChangeButton = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
this.button = BI.createWidget({ this.button = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
element: this.element, element: this,
cls: o.iconClass, cls: o.iconClass,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,

2
src/case/button/item.multiselect.js

@ -40,7 +40,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", { items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt", type: "bi.center_adapt",

2
src/case/button/item.singleselect.icontext.js

@ -18,7 +18,7 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.icon_text_item", type: "bi.icon_text_item",
element: this.element, element: this,
cls: o.iconClass, cls: o.iconClass,
once: o.once, once: o.once,
selected: o.selected, selected: o.selected,

2
src/case/button/item.singleselect.js

@ -16,7 +16,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
element: this.element, element: this,
textAlign: "left", textAlign: "left",
whiteSpace: "nowrap", whiteSpace: "nowrap",
textHeight: o.height, textHeight: o.height,

2
src/case/button/item.singleselect.radio.js

@ -41,7 +41,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", { items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt", type: "bi.center_adapt",

2
src/case/button/node/node.arrow.js

@ -49,7 +49,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.first.plus.js

@ -51,7 +51,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.icon.arrow.js

@ -72,7 +72,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
el: icon el: icon
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.last.plus.js

@ -51,7 +51,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.mid.plus.js

@ -51,7 +51,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.multilayer.icon.arrow.js

@ -49,7 +49,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
items.push(this.node); items.push(this.node);
BI.createWidget({ BI.createWidget({
type: "bi.td", type: "bi.td",
element: this.element, element: this,
columnSize: BI.makeArray(o.layer, 13), columnSize: BI.makeArray(o.layer, 13),
items: [items] items: [items]
}) })

2
src/case/button/node/node.plus.js

@ -47,7 +47,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/node/node.triangle.js

@ -50,7 +50,7 @@ BI.TriangleGroupNode = BI.inherit(BI.NodeButton, {
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/treeitem/item.first.treeleaf.js

@ -60,7 +60,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
el: this.text el: this.text
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

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

@ -46,7 +46,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
el: this.text el: this.text
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

2
src/case/button/treeitem/item.last.treeleaf.js

@ -60,7 +60,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
el: this.text el: this.text
}); });
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({
element: this.element element: this
}, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
items: items items: items
})))); }))));

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save