fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

merge

es6
windy 7 years ago
parent
1ca816251f e41f1d39c0
commit
6adaf854ed
9 changed files with 140 additions and 106 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. 23
      demo/js/widget/table/demo.responsive_table.js
  2. 12
      dist/base.js
  3. 12
      dist/bundle.js
  4. 76
      dist/bundle.min.js
  5. 23
      dist/demo.js
  6. 12
      dist/fineui.js
  7. 76
      dist/fineui.min.js
  8. 2
      src/base/combination/switcher.js
  9. 10
      src/base/table/table.js

23
demo/js/widget/table/demo.responsive_table.js
Unescape View File

@ -129,23 +129,24 @@ Demo.Func = BI.inherit(BI.Widget, {
isNeedMerge: true,
isNeedFreeze: true,
mergeCols: [0, 1],
columnSize: ["", "", ""],
items: items,
header: header
items: [],
header: []
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.grid",
columns: 2,
rows: 2,
items: [{
column: 0,
row: 0,
el: table1
}]
type: "bi.tab",
defaultShowIndex: 1,
cardCreator: function (v) {
switch (v) {
case 1:
table1.attr("columnSize", ["", "", ""]);
table1.populate(items, header);
return table1;
}
}
},
left: 10,
right: 10,

12
dist/base.js vendored
Unescape View File

@ -4696,7 +4696,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
_initSwitcher: function () {
this.switcher = BI.createWidget(this.options.el, {
value: o.value
value: this.options.value
});
},
@ -33417,12 +33417,20 @@ BI.Table = BI.inherit(BI.Widget, {
},
_empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy();
this.topRight && this.topRight.destroy();
this.bottomLeft && this.bottomLeft.destroy();
this.bottomRight && this.bottomRight.destroy();
},
populate: function (items, header) {
this.options.items = items || [];
if (header) {
this.options.header = header;
}
this.empty();
this._empty();
if (this.options.isNeedFreeze) {
this._createFreezeTable();
} else {

12
dist/bundle.js vendored
Unescape View File

@ -30569,7 +30569,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
_initSwitcher: function () {
this.switcher = BI.createWidget(this.options.el, {
value: o.value
value: this.options.value
});
},
@ -59290,12 +59290,20 @@ BI.Table = BI.inherit(BI.Widget, {
},
_empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy();
this.topRight && this.topRight.destroy();
this.bottomLeft && this.bottomLeft.destroy();
this.bottomRight && this.bottomRight.destroy();
},
populate: function (items, header) {
this.options.items = items || [];
if (header) {
this.options.header = header;
}
this.empty();
this._empty();
if (this.options.isNeedFreeze) {
this._createFreezeTable();
} else {

76
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

23
dist/demo.js vendored
Unescape View File

@ -14112,23 +14112,24 @@ BI.shortcut("demo.preview_table", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
isNeedMerge: true,
isNeedFreeze: true,
mergeCols: [0, 1],
columnSize: ["", "", ""],
items: items,
header: header
items: [],
header: []
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.grid",
columns: 2,
rows: 2,
items: [{
column: 0,
row: 0,
el: table1
}]
type: "bi.tab",
defaultShowIndex: 1,
cardCreator: function (v) {
switch (v) {
case 1:
table1.attr("columnSize", ["", "", ""]);
table1.populate(items, header);
return table1;
}
}
},
left: 10,
right: 10,

12
dist/fineui.js vendored
Unescape View File

@ -32263,7 +32263,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
_initSwitcher: function () {
this.switcher = BI.createWidget(this.options.el, {
value: o.value
value: this.options.value
});
},
@ -60984,12 +60984,20 @@ BI.Table = BI.inherit(BI.Widget, {
},
_empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy();
this.topRight && this.topRight.destroy();
this.bottomLeft && this.bottomLeft.destroy();
this.bottomRight && this.bottomRight.destroy();
},
populate: function (items, header) {
this.options.items = items || [];
if (header) {
this.options.header = header;
}
this.empty();
this._empty();
if (this.options.isNeedFreeze) {
this._createFreezeTable();
} else {

76
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/base/combination/switcher.js
Unescape View File

@ -124,7 +124,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
_initSwitcher: function () {
this.switcher = BI.createWidget(this.options.el, {
value: o.value
value: this.options.value
});
},

10
src/base/table/table.js
Unescape View File

@ -1580,12 +1580,20 @@ BI.Table = BI.inherit(BI.Widget, {
},
_empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy();
this.topRight && this.topRight.destroy();
this.bottomLeft && this.bottomLeft.destroy();
this.bottomRight && this.bottomRight.destroy();
},
populate: function (items, header) {
this.options.items = items || [];
if (header) {
this.options.header = header;
}
this.empty();
this._empty();
if (this.options.isNeedFreeze) {
this._createFreezeTable();
} else {

Write Preview
Loading…
Cancel
Save