Browse Source

更新

master
windy 7 years ago
parent
commit
f6d2de7e10
  1. 62
      dist/_fineui.min.js
  2. 25
      dist/base.js
  3. 63
      dist/bundle.js
  4. 58
      dist/bundle.min.js
  5. 2
      dist/case.js
  6. 63
      dist/fineui.js
  7. 62
      dist/fineui.min.js
  8. 36
      dist/widget.js
  9. 10
      src/base/single/button/buttons/button.js
  10. 7
      src/base/table/table.cell.js
  11. 8
      src/base/table/table.header.cell.js
  12. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  13. 9
      src/widget/previewtable/previewtable.cell.js
  14. 9
      src/widget/previewtable/previewtable.header.cell.js
  15. 18
      src/widget/previewtable/previewtable.js

62
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/base.js vendored

@ -16720,19 +16720,21 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
BI.Button.superclass._init.apply(this, arguments);
var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: o.height + "px"});
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else {
this.element.css({lineHeight: o.height + "px"});
this.element.css({lineHeight: (o.height - 2) + "px"});
}
if (BI.isKey(o.iconCls)) {
this.icon = BI.createWidget({
type: "bi.icon",
width: 18
width: 18,
height: o.height - 2
});
this.text = BI.createWidget({
type: "bi.label",
text: o.text,
value: o.value
value: o.value,
height: o.height - 2
});
BI.createWidget({
type: "bi.horizontal_auto",
@ -30088,15 +30090,18 @@ BI.TableCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
whiteSpace: "nowrap",
whiteSpace: o.whiteSpace || "nowrap",
textAlign: this.options.textAlign,
height: this.options.height,
text: this.options.text,
value: this.options.value,
lgap: 5
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -32102,13 +32107,17 @@ BI.TableHeaderCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableHeaderCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "center",
textAlign: o.textAlign || "center",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});

63
dist/bundle.js vendored

@ -52490,19 +52490,21 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
BI.Button.superclass._init.apply(this, arguments);
var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: o.height + "px"});
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else {
this.element.css({lineHeight: o.height + "px"});
this.element.css({lineHeight: (o.height - 2) + "px"});
}
if (BI.isKey(o.iconCls)) {
this.icon = BI.createWidget({
type: "bi.icon",
width: 18
width: 18,
height: o.height - 2
});
this.text = BI.createWidget({
type: "bi.label",
text: o.text,
value: o.value
value: o.value,
height: o.height - 2
});
BI.createWidget({
type: "bi.horizontal_auto",
@ -65858,15 +65860,18 @@ BI.TableCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
whiteSpace: "nowrap",
whiteSpace: o.whiteSpace || "nowrap",
textAlign: this.options.textAlign,
height: this.options.height,
text: this.options.text,
value: this.options.value,
lgap: 5
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -67872,13 +67877,17 @@ BI.TableHeaderCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableHeaderCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "center",
textAlign: o.textAlign || "center",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -78632,8 +78641,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
this.trigger.attr("tipType", "warning");
} else {
this.element.removeClass("combo-error");
this.trigger.attr("tipType", "success");
}
}
},
@ -103459,11 +103470,14 @@ BI.PreviewTableCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -103490,11 +103504,14 @@ BI.PreviewTableHeaderCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -103697,6 +103714,24 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
},
populate: function (items, header) {
if (items) {
items = BI.map(items, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_cell"
}, item);
});
});
}
if (header) {
header = BI.map(header, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_header_cell"
}, item);
});
});
}
this.table.populate(items, header);
this._adjustColumns();
}

58
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/case.js vendored

@ -6163,8 +6163,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
this.trigger.attr("tipType", "warning");
} else {
this.element.removeClass("combo-error");
this.trigger.attr("tipType", "success");
}
}
},

63
dist/fineui.js vendored

@ -52733,19 +52733,21 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
BI.Button.superclass._init.apply(this, arguments);
var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: o.height + "px"});
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else {
this.element.css({lineHeight: o.height + "px"});
this.element.css({lineHeight: (o.height - 2) + "px"});
}
if (BI.isKey(o.iconCls)) {
this.icon = BI.createWidget({
type: "bi.icon",
width: 18
width: 18,
height: o.height - 2
});
this.text = BI.createWidget({
type: "bi.label",
text: o.text,
value: o.value
value: o.value,
height: o.height - 2
});
BI.createWidget({
type: "bi.horizontal_auto",
@ -66101,15 +66103,18 @@ BI.TableCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
whiteSpace: "nowrap",
whiteSpace: o.whiteSpace || "nowrap",
textAlign: this.options.textAlign,
height: this.options.height,
text: this.options.text,
value: this.options.value,
lgap: 5
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -68115,13 +68120,17 @@ BI.TableHeaderCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableHeaderCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "center",
textAlign: o.textAlign || "center",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -78875,8 +78884,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
this.trigger.attr("tipType", "warning");
} else {
this.element.removeClass("combo-error");
this.trigger.attr("tipType", "success");
}
}
},
@ -103702,11 +103713,14 @@ BI.PreviewTableCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -103733,11 +103747,14 @@ BI.PreviewTableHeaderCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -103940,6 +103957,24 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
},
populate: function (items, header) {
if (items) {
items = BI.map(items, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_cell"
}, item);
});
});
}
if (header) {
header = BI.map(header, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_header_cell"
}, item);
});
});
}
this.table.populate(items, header);
this._adjustColumns();
}

62
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

36
dist/widget.js vendored

@ -15847,11 +15847,14 @@ BI.PreviewTableCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -15878,11 +15881,14 @@ BI.PreviewTableHeaderCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});
@ -16085,6 +16091,24 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
},
populate: function (items, header) {
if (items) {
items = BI.map(items, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_cell"
}, item);
});
});
}
if (header) {
header = BI.map(header, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_header_cell"
}, item);
});
});
}
this.table.populate(items, header);
this._adjustColumns();
}

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

@ -42,19 +42,21 @@
BI.Button.superclass._init.apply(this, arguments);
var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: o.height + "px"});
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else {
this.element.css({lineHeight: o.height + "px"});
this.element.css({lineHeight: (o.height - 2) + "px"});
}
if (BI.isKey(o.iconCls)) {
this.icon = BI.createWidget({
type: "bi.icon",
width: 18
width: 18,
height: o.height - 2
});
this.text = BI.createWidget({
type: "bi.label",
text: o.text,
value: o.value
value: o.value,
height: o.height - 2
});
BI.createWidget({
type: "bi.horizontal_auto",

7
src/base/table/table.cell.js

@ -17,15 +17,18 @@ BI.TableCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
whiteSpace: "nowrap",
whiteSpace: o.whiteSpace || "nowrap",
textAlign: this.options.textAlign,
height: this.options.height,
text: this.options.text,
value: this.options.value,
lgap: 5
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});

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

@ -16,13 +16,17 @@ BI.TableHeaderCell = BI.inherit(BI.Widget, {
_init: function () {
BI.TableHeaderCell.superclass._init.apply(this, arguments);
var o = this.options;
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "center",
textAlign: o.textAlign || "center",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -125,8 +125,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
});
if (BI.isNull(result)) {
this.element.removeClass("combo-error").addClass("combo-error");
this.trigger.attr("tipType", "warning");
} else {
this.element.removeClass("combo-error");
this.trigger.attr("tipType", "success");
}
}
},

9
src/widget/previewtable/previewtable.cell.js

@ -21,11 +21,14 @@ BI.PreviewTableCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});

9
src/widget/previewtable/previewtable.header.cell.js

@ -21,11 +21,14 @@ BI.PreviewTableHeaderCell = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.label",
element: this,
textAlign: "left",
whiteSpace: "normal",
textAlign: o.textAlign || "left",
whiteSpace: o.whiteSpace || "normal",
height: this.options.height,
text: this.options.text,
value: this.options.value
value: this.options.value,
lgap: o.lgap,
rgap: o.rgap,
hgap: o.hgap || 5
});
}
});

18
src/widget/previewtable/previewtable.js

@ -197,6 +197,24 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
},
populate: function (items, header) {
if (items) {
items = BI.map(items, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_cell"
}, item);
});
});
}
if (header) {
header = BI.map(header, function (i, items) {
return BI.map(items, function (j, item) {
return BI.extend({
type: "bi.preview_table_header_cell"
}, item);
});
});
}
this.table.populate(items, header);
this._adjustColumns();
}

Loading…
Cancel
Save