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

Merge pull request #508 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'e861770cb44fa674083a8c6340433299d40ee089':
  update
  BI-25955 down_list_combo样式
  update
es6
Young 6 years ago
parent
2f406096a6 e861770cb4
commit
fd88a7234e
21 changed files with 290922 additions and 290844 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. 30
      dist/_fineui.min.js
  2. 2
      dist/bundle.css
  3. 99
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 30
      dist/bundle.min.js
  6. 2
      dist/fineui.css
  7. 99
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 30
      dist/fineui.min.js
  10. 2
      dist/resource.css
  11. 99
      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

30
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 {

99
dist/bundle.js vendored
Unescape View File

@ -90018,7 +90018,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
maxHeight: 1000
maxHeight: 1000,
minWidth: 140
}
});
@ -90100,7 +90101,7 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
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, {
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -90123,59 +90124,77 @@ 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({
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";
@ -90208,7 +90227,7 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
width: 24,
width: 36,
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

30
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 = '');
}
.check-font .b-font:before {

99
dist/fineui.js vendored
Unescape View File

@ -90267,7 +90267,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
maxHeight: 1000
maxHeight: 1000,
minWidth: 140
}
});
@ -90349,7 +90350,7 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
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, {
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -90372,59 +90373,77 @@ 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({
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";
@ -90457,7 +90476,7 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
width: 24,
width: 36,
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

30
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 = '');
}
.check-font .b-font:before {

99
dist/widget.js vendored
Unescape View File

@ -2271,7 +2271,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
maxHeight: 1000
maxHeight: 1000,
minWidth: 140
}
});
@ -2353,7 +2354,7 @@ BI.DownListGroup = BI.inherit(BI.Widget, {
});
BI.DownListGroup.EVENT_CHANGE = "EVENT_CHANGE";
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, {
_defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -2376,59 +2377,77 @@ 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({
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";
@ -2461,7 +2480,7 @@ BI.shortcut("bi.down_list_item", BI.DownListItem);BI.DownListGroupItem = BI.inhe
this.icon1 = BI.createWidget({
type: "bi.icon_button",
cls: o.iconCls1,
width: 24,
width: 36,
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 = '');
}
.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 = '');
}
.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 = '');
}
.check-font .b-font:before {

Write Preview
Loading…
Cancel
Save