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

Merge branch 'master' into bugfix/bugfix 

# Conflicts:
#	dist/base.js
#	dist/bundle.js
#	dist/fineui.js
#	dist/widget.js
es6
iapyang 6 years ago
parent
186bac5239 fd88a7234e
commit
929f5b74ed
20 changed files with 391 additions and 93 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. 28
      dist/_fineui.min.js
  2. 2
      dist/bundle.css
  3. 95
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 28
      dist/bundle.min.js
  6. 2
      dist/fineui.css
  7. 95
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 28
      dist/fineui.min.js
  10. 2
      dist/resource.css
  11. 87
      dist/widget.js
  12. 2
      public/css/font.css
  13. 2
      src/css/resource/font.css
  14. 4
      src/less/lib/colors.less
  15. 2
      src/less/lib/constant.less
  16. 2
      src/less/resource/font.less
  17. 3
      src/widget/downlist/combo.downlist.js
  18. 94
      src/widget/downlist/item.downlist.js
  19. 2
      src/widget/downlist/item.downlistgroup.js
  20. 2
      ui/css/font.css

28
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/bundle.css vendored
Unescape View File

@ -5227,7 +5227,7 @@ textarea::-webkit-scrollbar-thumb:hover {
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.check-font .b-font:before {

95
dist/bundle.js vendored
Unescape View File

@ -50529,12 +50529,16 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
return this.editor.getValue(true, function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
<<<<<<< HEAD
var markedSpans = _.clone(line.markedSpans) || [];
markedSpans.sort(function (a, b) {
return a.from > b.from;
});
_.forEach(markedSpans, function (i, ms) {
=======
_.forEach(line.markedSpans, function (i, ms) {
>>>>>>> master
switch (i.marker.className) {
case "fieldName":
@ -50555,12 +50559,16 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
<<<<<<< HEAD
var markedSpans = _.clone(line.markedSpans) || [];
markedSpans.sort(function (a, b) {
return a.from > b.from;
});
_.forEach(markedSpans, function (i, ms) {
=======
_.forEach(line.markedSpans, function (i, ms) {
>>>>>>> master
switch (i.marker.className) {
case "fieldName":
case "error-field":
@ -90028,7 +90036,12 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
<<<<<<< HEAD
maxHeight: 1000
=======
maxHeight: 1000,
minWidth: 140
>>>>>>> master
}
});
@ -90110,7 +90123,11 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
<<<<<<< HEAD
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.Single, {
=======
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.BasicButton, {
>>>>>>> master
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -90133,6 +90150,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.text = BI.createWidget({
<<<<<<< HEAD
type: "bi.icon_text_item",
element: this,
height: o.height,
@ -90186,6 +90204,79 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
getValue: function () {
return this.text.getValue();
=======
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
});
this.icon = BI.createWidget({
type: "bi.center_adapt",
width: 36,
height: o.height,
items: [{
el: {
type: "bi.icon",
width: o.iconWidth,
height: o.iconHeight
}
}]
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, this.icon, this.text)
}))));
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
getValue: function () {
return this.text.getValue();
},
setText: function () {
this.text.setText.apply(this.text, arguments);
},
getText: function () {
return this.text.getText();
},
doClick: function () {
BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
>>>>>>> master
}
});
BI.DownListItem.EVENT_CHANGE = "EVENT_CHANGE";
@ -90218,7 +90309,11 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
<<<<<<< HEAD
width: 24,
=======
width: 36,
>>>>>>> master
forceNotSelected: true,
selected: this._digest(o.value)
});

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored
Unescape View File

@ -5227,7 +5227,7 @@ textarea::-webkit-scrollbar-thumb:hover {
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
}
.check-font .b-font:before {

95
dist/fineui.js vendored
Unescape View File

@ -50778,12 +50778,16 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
return this.editor.getValue(true, function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
<<<<<<< HEAD
var markedSpans = _.clone(line.markedSpans) || [];
markedSpans.sort(function (a, b) {
return a.from > b.from;
});
_.forEach(markedSpans, function (i, ms) {
=======
_.forEach(line.markedSpans, function (i, ms) {
>>>>>>> master
switch (i.marker.className) {
case "fieldName":
@ -50804,12 +50808,16 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var v = this.editor.getValue("\n", function (line) {
var rawText = line.text, value = line.text, num = 0;
value.text = rawText;
<<<<<<< HEAD
var markedSpans = _.clone(line.markedSpans) || [];
markedSpans.sort(function (a, b) {
return a.from > b.from;
});
_.forEach(markedSpans, function (i, ms) {
=======
_.forEach(line.markedSpans, function (i, ms) {
>>>>>>> master
switch (i.marker.className) {
case "fieldName":
case "error-field":
@ -90277,7 +90285,12 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
<<<<<<< HEAD
maxHeight: 1000
=======
maxHeight: 1000,
minWidth: 140
>>>>>>> master
}
});
@ -90359,7 +90372,11 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
<<<<<<< HEAD
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.Single, {
=======
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.BasicButton, {
>>>>>>> master
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -90382,6 +90399,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.text = BI.createWidget({
<<<<<<< HEAD
type: "bi.icon_text_item",
element: this,
height: o.height,
@ -90435,6 +90453,79 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
getValue: function () {
return this.text.getValue();
=======
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
});
this.icon = BI.createWidget({
type: "bi.center_adapt",
width: 36,
height: o.height,
items: [{
el: {
type: "bi.icon",
width: o.iconWidth,
height: o.iconHeight
}
}]
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, this.icon, this.text)
}))));
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
getValue: function () {
return this.text.getValue();
},
setText: function () {
this.text.setText.apply(this.text, arguments);
},
getText: function () {
return this.text.getText();
},
doClick: function () {
BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
>>>>>>> master
}
});
BI.DownListItem.EVENT_CHANGE = "EVENT_CHANGE";
@ -90467,7 +90558,11 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
<<<<<<< HEAD
width: 24,
=======
width: 36,
>>>>>>> master
forceNotSelected: true,
selected: this._digest(o.value)
});

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
Unescape View File

@ -1009,7 +1009,7 @@ textarea::-webkit-scrollbar-thumb:hover {
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
}
.check-font .b-font:before {

87
dist/widget.js vendored
Unescape View File

@ -2271,7 +2271,12 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
<<<<<<< HEAD
maxHeight: 1000
=======
maxHeight: 1000,
minWidth: 140
>>>>>>> master
}
});
@ -2353,7 +2358,11 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
<<<<<<< HEAD
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.Single, {
=======
BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit(BI.BasicButton, {
>>>>>>> master
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -2376,6 +2385,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.text = BI.createWidget({
<<<<<<< HEAD
type: "bi.icon_text_item",
element: this,
height: o.height,
@ -2429,6 +2439,79 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit
getValue: function () {
return this.text.getValue();
=======
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
});
this.icon = BI.createWidget({
type: "bi.center_adapt",
width: 36,
height: o.height,
items: [{
el: {
type: "bi.icon",
width: o.iconWidth,
height: o.iconHeight
}
}]
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, this.icon, this.text)
}))));
},
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
getValue: function () {
return this.text.getValue();
},
setText: function () {
this.text.setText.apply(this.text, arguments);
},
getText: function () {
return this.text.getText();
},
doClick: function () {
BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
>>>>>>> master
}
});
BI.DownListItem.EVENT_CHANGE = "EVENT_CHANGE";
@ -2461,7 +2544,11 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
<<<<<<< HEAD
width: 24,
=======
width: 36,
>>>>>>> master
forceNotSelected: true,
selected: this._digest(o.value)
});

2
public/css/font.css
Unescape View File

@ -683,7 +683,7 @@
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
}
.check-font .b-font:before {

2
src/css/resource/font.css
Unescape View File

@ -683,7 +683,7 @@
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
}
.check-font .b-font:before {

4
src/less/lib/colors.less
Unescape View File

@ -106,8 +106,8 @@
@color-bi-blue-60: fade(@font-color-highlight, 60);
@color-bi-blue-40: fade(@font-color-highlight, 40);
@color-bi-blue-30: fade(@font-color-highlight, 30);
@color-bi-blue-20: fade(@font-color-highlight, 20);
@color-bi-blue-10: fade(@font-color-highlight, 10);
@color-bi-blue-20: @background-color-medium-highlight;
@color-bi-blue-10: @background-color-light-highlight;
@color-bi-blue-5: fade(@font-color-highlight, 5);
//light-blue

2
src/less/lib/constant.less
Unescape View File

@ -36,6 +36,7 @@
@font-color-white: #ffffff;//
@font-color-white-theme-dark: #242640;//
@font-color-light-highlight: #eaf2fd;
@font-color-medium-highlight: #d7e7fc;
@font-color-highlight: #3685f2;
@font-color-blue: #23beef;
@font-color-light-blue: #e9f8fd;
@ -51,6 +52,7 @@
@background-color-normal: #f7f8fa;//
@background-color-normal-theme-dark: #191B2B;//
@background-color-light-highlight: #eaf2fd;
@background-color-medium-highlight: #d7e7fc;
@background-color-highlight: #3685f2;
@background-color-blue: #23beef;
@background-color-light-blue: #e9f8fd;

2
src/less/resource/font.less
Unescape View File

@ -84,7 +84,7 @@
.font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray);
.font-hover-active(pull-down-ha-font, @font-down-triangle, @color-bi-text-light-gray);
.font(check-font, @font-check-mark, @color-bi-text-highlight);
.font(check-font, @font-check-mark, @color-bi-text-highlight, @font-size-12);
.font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-font-active);

3
src/widget/downlist/combo.downlist.js
Unescape View File

@ -55,7 +55,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
maxHeight: 1000
maxHeight: 1000,
minWidth: 140
}
});

94
src/widget/downlist/item.downlist.js
Unescape View File

@ -1,4 +1,4 @@
BI.DownListItem = BI.inherit(BI.Single, {
BI.DownListItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -21,59 +21,77 @@ BI.DownListItem = BI.inherit(BI.Single, {
BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.text = BI.createWidget({
type: "bi.icon_text_item",
element: this,
height: o.height,
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
logic: o.logic,
selected: o.selected,
disabled: o.disabled,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth,
textHgap: o.textHgap,
textVgap: o.textVgap,
textLgap: o.textLgap,
textRgap: o.textRgap,
father: o.father,
bubble: o.bubble
});
this.text.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
keyword: o.keyword,
height: o.height
});
this.text.on(BI.IconTextItem.EVENT_CHANGE, function () {
self.fireEvent(BI.DownListItem.EVENT_CHANGE);
this.icon = BI.createWidget({
type: "bi.center_adapt",
width: 36,
height: o.height,
items: [{
el: {
type: "bi.icon",
width: o.iconWidth,
height: o.iconHeight
}
}]
});
// this.setSelected(o.selected);
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left), BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, this.icon, this.text)
}))));
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
setValue: function () {
if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
getValue: function () {
return this.text.getValue();
},
isSelected: function () {
return this.text.isSelected();
setText: function () {
this.text.setText.apply(this.text, arguments);
},
setSelected: function (b) {
this.text.setSelected(b);
// if (b === true) {
// this.element.addClass("dot-e-font");
// } else {
// this.element.removeClass("dot-e-font");
// }
getText: function () {
return this.text.getText();
},
setValue: function (v) {
this.text.setValue(v);
doClick: function () {
BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
},
getValue: function () {
return this.text.getValue();
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doHighLight: function () {
this.text.doHighLight.apply(this.text, arguments);
},
unHighLight: function () {
this.text.unHighLight.apply(this.text, arguments);
}
});
BI.DownListItem.EVENT_CHANGE = "EVENT_CHANGE";

2
src/widget/downlist/item.downlistgroup.js
Unescape View File

@ -27,7 +27,7 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
width: 24,
width: 36,
forceNotSelected: true,
selected: this._digest(o.value)
});

2
ui/css/font.css
Unescape View File

@ -683,7 +683,7 @@
color: #647185;
}
.check-font .b-font {
font-size: 16px;
font-size: 12px;
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
}
.check-font .b-font:before {

Write Preview
Loading…
Cancel
Save