Browse Source

update

master
windy 7 years ago
parent
commit
2e6c8ae939
  1. 44
      dist/_fineui.min.js
  2. 2
      dist/bundle.css
  3. 99
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 44
      dist/bundle.min.js
  6. 2
      dist/fineui.css
  7. 99
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 44
      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. 2
      src/less/resource/font.less
  15. 3
      src/widget/downlist/combo.downlist.js
  16. 94
      src/widget/downlist/item.downlist.js
  17. 2
      src/widget/downlist/item.downlistgroup.js
  18. 2
      ui/css/font.css

44
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.css vendored

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

99
dist/bundle.js vendored

@ -90018,7 +90018,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: { popup: {
el: this.popupview, el: this.popupview,
stopPropagation: true, 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.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 () { _defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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); BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
element: this, cls: "list-item-text",
height: o.height, textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
logic: o.logic, keyword: o.keyword,
selected: o.selected, height: o.height
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);
}); });
this.text.on(BI.IconTextItem.EVENT_CHANGE, function () { this.icon = BI.createWidget({
self.fireEvent(BI.DownListItem.EVENT_CHANGE); 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 () { setValue: function () {
this.text.doRedMark.apply(this.text, arguments); if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
}, },
unRedMark: function () { getValue: function () {
this.text.unRedMark.apply(this.text, arguments); return this.text.getValue();
}, },
isSelected: function () { setText: function () {
return this.text.isSelected(); this.text.setText.apply(this.text, arguments);
}, },
setSelected: function (b) { getText: function () {
this.text.setSelected(b); return this.text.getText();
// if (b === true) {
// this.element.addClass("dot-e-font");
// } else {
// this.element.removeClass("dot-e-font");
// }
}, },
setValue: function (v) { doClick: function () {
this.text.setValue(v); BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
}, },
getValue: function () { doRedMark: function () {
return this.text.getValue(); 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"; 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({ this.icon1 = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: o.iconCls1, cls: o.iconCls1,
width: 24, width: 36,
forceNotSelected: true, forceNotSelected: true,
selected: this._digest(o.value) selected: this._digest(o.value)
}); });

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

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

99
dist/fineui.js vendored

@ -90267,7 +90267,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: { popup: {
el: this.popupview, el: this.popupview,
stopPropagation: true, 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.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 () { _defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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); BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
element: this, cls: "list-item-text",
height: o.height, textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
logic: o.logic, keyword: o.keyword,
selected: o.selected, height: o.height
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);
}); });
this.text.on(BI.IconTextItem.EVENT_CHANGE, function () { this.icon = BI.createWidget({
self.fireEvent(BI.DownListItem.EVENT_CHANGE); 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 () { setValue: function () {
this.text.doRedMark.apply(this.text, arguments); if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
}, },
unRedMark: function () { getValue: function () {
this.text.unRedMark.apply(this.text, arguments); return this.text.getValue();
}, },
isSelected: function () { setText: function () {
return this.text.isSelected(); this.text.setText.apply(this.text, arguments);
}, },
setSelected: function (b) { getText: function () {
this.text.setSelected(b); return this.text.getText();
// if (b === true) {
// this.element.addClass("dot-e-font");
// } else {
// this.element.removeClass("dot-e-font");
// }
}, },
setValue: function (v) { doClick: function () {
this.text.setValue(v); BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
}, },
getValue: function () { doRedMark: function () {
return this.text.getValue(); 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"; 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({ this.icon1 = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: o.iconCls1, cls: o.iconCls1,
width: 24, width: 36,
forceNotSelected: true, forceNotSelected: true,
selected: this._digest(o.value) selected: this._digest(o.value)
}); });

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

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

99
dist/widget.js vendored

@ -2271,7 +2271,8 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: { popup: {
el: this.popupview, el: this.popupview,
stopPropagation: true, 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.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 () { _defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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); BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
element: this, cls: "list-item-text",
height: o.height, textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
logic: o.logic, keyword: o.keyword,
selected: o.selected, height: o.height
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);
}); });
this.text.on(BI.IconTextItem.EVENT_CHANGE, function () { this.icon = BI.createWidget({
self.fireEvent(BI.DownListItem.EVENT_CHANGE); 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 () { setValue: function () {
this.text.doRedMark.apply(this.text, arguments); if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
}, },
unRedMark: function () { getValue: function () {
this.text.unRedMark.apply(this.text, arguments); return this.text.getValue();
}, },
isSelected: function () { setText: function () {
return this.text.isSelected(); this.text.setText.apply(this.text, arguments);
}, },
setSelected: function (b) { getText: function () {
this.text.setSelected(b); return this.text.getText();
// if (b === true) {
// this.element.addClass("dot-e-font");
// } else {
// this.element.removeClass("dot-e-font");
// }
}, },
setValue: function (v) { doClick: function () {
this.text.setValue(v); BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
}, },
getValue: function () { doRedMark: function () {
return this.text.getValue(); 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"; 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({ this.icon1 = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: o.iconCls1, cls: o.iconCls1,
width: 24, width: 36,
forceNotSelected: true, forceNotSelected: true,
selected: this._digest(o.value) selected: this._digest(o.value)
}); });

2
public/css/font.css

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

2
src/css/resource/font.css

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

2
src/less/resource/font.less

@ -84,7 +84,7 @@
.font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray); .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-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); .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

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

94
src/widget/downlist/item.downlist.js

@ -1,4 +1,4 @@
BI.DownListItem = BI.inherit(BI.Single, { BI.DownListItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
@ -21,59 +21,77 @@ BI.DownListItem = BI.inherit(BI.Single, {
BI.DownListItem.superclass._init.apply(this, arguments); BI.DownListItem.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
element: this, cls: "list-item-text",
height: o.height, textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text, text: o.text,
value: o.value, value: o.value,
logic: o.logic, keyword: o.keyword,
selected: o.selected, height: o.height
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);
}); });
this.text.on(BI.IconTextItem.EVENT_CHANGE, function () { this.icon = BI.createWidget({
self.fireEvent(BI.DownListItem.EVENT_CHANGE); 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 () { setValue: function () {
this.text.doRedMark.apply(this.text, arguments); if (!this.isReadOnly()) {
this.text.setValue.apply(this.text, arguments);
}
}, },
unRedMark: function () { getValue: function () {
this.text.unRedMark.apply(this.text, arguments); return this.text.getValue();
}, },
isSelected: function () { setText: function () {
return this.text.isSelected(); this.text.setText.apply(this.text, arguments);
}, },
setSelected: function (b) { getText: function () {
this.text.setSelected(b); return this.text.getText();
// if (b === true) {
// this.element.addClass("dot-e-font");
// } else {
// this.element.removeClass("dot-e-font");
// }
}, },
setValue: function (v) { doClick: function () {
this.text.setValue(v); BI.DownListItem.superclass.doClick.apply(this, arguments);
if (this.isValid()) {
this.fireEvent(BI.DownListItem.EVENT_CHANGE, this.getValue(), this);
}
}, },
getValue: function () { doRedMark: function () {
return this.text.getValue(); 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"; BI.DownListItem.EVENT_CHANGE = "EVENT_CHANGE";

2
src/widget/downlist/item.downlistgroup.js

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

2
ui/css/font.css

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

Loading…
Cancel
Save