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

Merge branch 'master' into bugfix/BI-24627 

# Conflicts:
#	dist/_fineui.min.js
#	dist/base.js
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	src/base/formula/formulaeditor.js
es6
iapyang 6 years ago
parent
561315e1d8 adc5af5aef
commit
a3f323f189
19 changed files with 1566 additions and 1429 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. 1
      demo/js/case/combo/demo.search_text_value_combo.js
  2. 2
      demo/js/widget/multiselect/demo.multi_select_combo.js
  3. 64
      dist/_fineui.min.js
  4. 28
      dist/base.js
  5. 66
      dist/bundle.js
  6. 62
      dist/bundle.min.js
  7. 2
      dist/case.js
  8. 3
      dist/demo.js
  9. 66
      dist/fineui.js
  10. 65
      dist/fineui.min.js
  11. 36
      dist/widget.js
  12. 1
      src/base/formula/formulaeditor.js
  13. 10
      src/base/single/button/buttons/button.js
  14. 7
      src/base/table/table.cell.js
  15. 8
      src/base/table/table.header.cell.js
  16. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  17. 9
      src/widget/previewtable/previewtable.cell.js
  18. 9
      src/widget/previewtable/previewtable.header.cell.js
  19. 18
      src/widget/previewtable/previewtable.js

1
demo/js/case/combo/demo.search_text_value_combo.js
Unescape View File

@ -14,6 +14,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
combo = this;
},
warningTitle: "111",
text: "默认值",
value: 14,
width: 300,

2
demo/js/widget/multiselect/demo.multi_select_combo.js
Unescape View File

@ -9,7 +9,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_combo",
type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this),
width: 200,
value: {

64
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/base.js vendored
Unescape View File

@ -14740,7 +14740,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
break;
}
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
@ -15412,7 +15411,7 @@ BI.Popover = BI.inherit(BI.Widget, {
items: [{
el: BI.createWidget(o.body),
left: 20,
top: 10,
top: 20,
right: 20,
bottom: 0
}]
@ -16722,19 +16721,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",
@ -30090,15 +30091,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
});
}
});
@ -32104,13 +32108,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
});
}
});

66
dist/bundle.js vendored
Unescape View File

@ -50510,7 +50510,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
break;
}
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
@ -51182,7 +51181,7 @@ BI.Popover = BI.inherit(BI.Widget, {
items: [{
el: BI.createWidget(o.body),
left: 20,
top: 10,
top: 20,
right: 20,
bottom: 0
}]
@ -52492,19 +52491,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",
@ -65860,15 +65861,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
});
}
});
@ -67874,13 +67878,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
});
}
});
@ -78634,8 +78642,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");
}
}
},
@ -103461,11 +103471,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
});
}
});
@ -103492,11 +103505,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
});
}
});
@ -103699,6 +103715,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/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/case.js vendored
Unescape View File

@ -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");
}
}
},

3
dist/demo.js vendored
Unescape View File

@ -2068,6 +2068,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
combo = this;
},
warningTitle: "111",
text: "默认值",
value: 14,
width: 300,
@ -12762,7 +12763,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_combo",
type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this),
width: 200,
value: {

66
dist/fineui.js vendored
Unescape View File

@ -50753,7 +50753,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
break;
}
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");
@ -51425,7 +51424,7 @@ BI.Popover = BI.inherit(BI.Widget, {
items: [{
el: BI.createWidget(o.body),
left: 20,
top: 10,
top: 20,
right: 20,
bottom: 0
}]
@ -52735,19 +52734,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",
@ -66103,15 +66104,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
});
}
});
@ -68117,13 +68121,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
});
}
});
@ -78877,8 +78885,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");
}
}
},
@ -103704,11 +103714,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
});
}
});
@ -103735,11 +103748,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
});
}
});
@ -103942,6 +103958,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();
}

65
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/widget.js vendored
Unescape View File

@ -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();
}

1
src/base/formula/formulaeditor.js
Unescape View File

@ -217,7 +217,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
break;
}
});
return value;
});
return v.replaceAll("(\\$\\{.*?\\})\\s", "$1");

10
src/base/single/button/buttons/button.js
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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();
}

Write Preview
Loading…
Cancel
Save