Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.min.css
#	dist/fineui.min.css
master
imp 6 years ago
parent
commit
f483526123
  1. 18
      dist/bundle.css
  2. 78
      dist/bundle.js
  3. 2
      dist/bundle.min.css
  4. 10
      dist/bundle.min.js
  5. 44
      dist/core.js
  6. 18
      dist/fineui.css
  7. 78
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 10
      dist/fineui.min.js
  10. 34
      dist/fineui_without_jquery_polyfill.js
  11. 34
      dist/widget.js
  12. 18
      public/css/size.css
  13. 2
      public/less/size.less
  14. 44
      src/core/jquery.js
  15. 2
      src/widget/date/calendar/popup.year.js
  16. 2
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  17. 2
      src/widget/year/card.year.js
  18. 8
      src/widget/year/popup.year.js
  19. 2
      src/widget/yearmonth/card.static.yearmonth.js
  20. 8
      src/widget/yearmonth/popup.yearmonth.js
  21. 2
      src/widget/yearmonthinterval/yearmonthinterval.js
  22. 8
      src/widget/yearquarter/popup.yearquarter.js
  23. 18
      ui/css/size.css
  24. 2
      ui/less/size.less

18
dist/bundle.css vendored

@ -5648,3 +5648,21 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/trans_disable.png');
_background: none;
}
.icon-size-12 .b-font {
font-size: 12px;
}
.icon-size-16 .b-font {
font-size: 16px;
}
.icon-size-24 .b-font {
font-size: 24px;
}
.icon-size-40 .b-font {
font-size: 40px;
}
.icon-size-50 .b-font {
font-size: 50px;
}
.icon-size-70 .b-font {
font-size: 70px;
}

78
dist/bundle.js vendored

@ -9408,30 +9408,30 @@ jQuery.fn.offset = function( options ) {
// If we don't have gBCR, just use 0,0 rather than error
// BlackBerry 5, iOS 3 (original iPhone)
// if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
// box = elem.getBoundingClientRect();
// }
// 解决transform下的offset问题
var el = elem,
offsetLeft = 0,
offsetTop = 0;
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
box = elem.getBoundingClientRect();
}
// 解决transform下的offset问题(先恢复)
// var el = elem,
// offsetLeft = 0,
// offsetTop = 0;
// do{
// offsetLeft += el.offsetLeft;
// offsetTop += el.offsetTop;
// el = el.offsetParent;
// } while( el );
// var elm = elem;
// do{
// offsetLeft -= elm.scrollLeft || 0;
// offsetTop -= elm.scrollTop || 0;
// elm = elm.parentNode;
// } while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
};
};
@ -58977,7 +58977,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
dynamic: true
},
tab: {
cls: "year-popup-navigation bi-high-light bi-border-top",
cls: "year-popup-navigation bi-high-light bi-split-top",
height: 24,
items: [backBtn, preBtn]
},
@ -62644,7 +62644,7 @@ BI.DynamicDateTimePopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-date-time-select bi-border-top"
baseCls: "bi-date-time-select bi-split-top"
},
render: function () {
@ -77593,7 +77593,7 @@ BI.StaticYearCard = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.htape",
cls: "bi-border-top bi-border-bottom",
cls: "bi-split-top bi-split-bottom",
height: 30,
items: [{
el: {
@ -77869,7 +77869,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -77883,7 +77883,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
ref: function () {
@ -77898,7 +77898,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -77936,7 +77936,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -78345,7 +78345,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -78627,7 +78627,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -78640,7 +78640,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
@ -78656,7 +78656,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -78694,7 +78694,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -79061,7 +79061,7 @@ BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: {
height: 26,
height: 24,
width: 25,
lgap: 15,
offset: -15,
@ -79629,7 +79629,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
@ -79642,7 +79642,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
@ -79658,7 +79658,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
@ -79696,7 +79696,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

44
dist/core.js vendored

@ -9408,30 +9408,30 @@ jQuery.fn.offset = function( options ) {
// If we don't have gBCR, just use 0,0 rather than error
// BlackBerry 5, iOS 3 (original iPhone)
// if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
// box = elem.getBoundingClientRect();
// }
// 解决transform下的offset问题
var el = elem,
offsetLeft = 0,
offsetTop = 0;
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
box = elem.getBoundingClientRect();
}
// 解决transform下的offset问题(先恢复)
// var el = elem,
// offsetLeft = 0,
// offsetTop = 0;
// do{
// offsetLeft += el.offsetLeft;
// offsetTop += el.offsetTop;
// el = el.offsetParent;
// } while( el );
// var elm = elem;
// do{
// offsetLeft -= elm.scrollLeft || 0;
// offsetTop -= elm.scrollTop || 0;
// elm = elm.parentNode;
// } while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
};
};

18
dist/fineui.css vendored

@ -5648,3 +5648,21 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/trans_disable.png');
_background: none;
}
.icon-size-12 .b-font {
font-size: 12px;
}
.icon-size-16 .b-font {
font-size: 16px;
}
.icon-size-24 .b-font {
font-size: 24px;
}
.icon-size-40 .b-font {
font-size: 40px;
}
.icon-size-50 .b-font {
font-size: 50px;
}
.icon-size-70 .b-font {
font-size: 70px;
}

78
dist/fineui.js vendored

@ -9647,30 +9647,30 @@ jQuery.fn.offset = function( options ) {
// If we don't have gBCR, just use 0,0 rather than error
// BlackBerry 5, iOS 3 (original iPhone)
// if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
// box = elem.getBoundingClientRect();
// }
// 解决transform下的offset问题
var el = elem,
offsetLeft = 0,
offsetTop = 0;
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
box = elem.getBoundingClientRect();
}
// 解决transform下的offset问题(先恢复)
// var el = elem,
// offsetLeft = 0,
// offsetTop = 0;
// do{
// offsetLeft += el.offsetLeft;
// offsetTop += el.offsetTop;
// el = el.offsetParent;
// } while( el );
// var elm = elem;
// do{
// offsetLeft -= elm.scrollLeft || 0;
// offsetTop -= elm.scrollTop || 0;
// elm = elm.parentNode;
// } while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
};
};
@ -59216,7 +59216,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
dynamic: true
},
tab: {
cls: "year-popup-navigation bi-high-light bi-border-top",
cls: "year-popup-navigation bi-high-light bi-split-top",
height: 24,
items: [backBtn, preBtn]
},
@ -62883,7 +62883,7 @@ BI.DynamicDateTimePopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-date-time-select bi-border-top"
baseCls: "bi-date-time-select bi-split-top"
},
render: function () {
@ -77832,7 +77832,7 @@ BI.StaticYearCard = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.htape",
cls: "bi-border-top bi-border-bottom",
cls: "bi-split-top bi-split-bottom",
height: 30,
items: [{
el: {
@ -78108,7 +78108,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -78122,7 +78122,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
ref: function () {
@ -78137,7 +78137,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -78175,7 +78175,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -78584,7 +78584,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -78866,7 +78866,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -78879,7 +78879,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
@ -78895,7 +78895,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -78933,7 +78933,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -79300,7 +79300,7 @@ BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: {
height: 26,
height: 24,
width: 25,
lgap: 15,
offset: -15,
@ -79868,7 +79868,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
@ -79881,7 +79881,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
@ -79897,7 +79897,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
@ -79935,7 +79935,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

34
dist/fineui_without_jquery_polyfill.js vendored

@ -42803,7 +42803,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
dynamic: true
},
tab: {
cls: "year-popup-navigation bi-high-light bi-border-top",
cls: "year-popup-navigation bi-high-light bi-split-top",
height: 24,
items: [backBtn, preBtn]
},
@ -46470,7 +46470,7 @@ BI.DynamicDateTimePopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-date-time-select bi-border-top"
baseCls: "bi-date-time-select bi-split-top"
},
render: function () {
@ -61419,7 +61419,7 @@ BI.StaticYearCard = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.htape",
cls: "bi-border-top bi-border-bottom",
cls: "bi-split-top bi-split-bottom",
height: 30,
items: [{
el: {
@ -61695,7 +61695,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -61709,7 +61709,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
ref: function () {
@ -61724,7 +61724,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -61762,7 +61762,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -62171,7 +62171,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -62453,7 +62453,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -62466,7 +62466,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
@ -62482,7 +62482,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -62520,7 +62520,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -62887,7 +62887,7 @@ BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: {
height: 26,
height: 24,
width: 25,
lgap: 15,
offset: -15,
@ -63455,7 +63455,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
@ -63468,7 +63468,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
@ -63484,7 +63484,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
@ -63522,7 +63522,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),

34
dist/widget.js vendored

@ -602,7 +602,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
dynamic: true
},
tab: {
cls: "year-popup-navigation bi-high-light bi-border-top",
cls: "year-popup-navigation bi-high-light bi-split-top",
height: 24,
items: [backBtn, preBtn]
},
@ -4269,7 +4269,7 @@ BI.DynamicDateTimePopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-date-time-select bi-border-top"
baseCls: "bi-date-time-select bi-split-top"
},
render: function () {
@ -19218,7 +19218,7 @@ BI.StaticYearCard = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.htape",
cls: "bi-border-top bi-border-bottom",
cls: "bi-split-top bi-split-bottom",
height: 30,
items: [{
el: {
@ -19494,7 +19494,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -19508,7 +19508,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
ref: function () {
@ -19523,7 +19523,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -19561,7 +19561,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -19970,7 +19970,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -20252,7 +20252,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -20265,7 +20265,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
@ -20281,7 +20281,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -20319,7 +20319,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -20686,7 +20686,7 @@ BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: {
height: 26,
height: 24,
width: 25,
lgap: 15,
offset: -15,
@ -21254,7 +21254,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
@ -21267,7 +21267,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
@ -21283,7 +21283,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
@ -21321,7 +21321,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),

18
public/css/size.css

@ -0,0 +1,18 @@
.icon-size-12 .b-font {
font-size: 12px;
}
.icon-size-16 .b-font {
font-size: 16px;
}
.icon-size-24 .b-font {
font-size: 24px;
}
.icon-size-40 .b-font {
font-size: 40px;
}
.icon-size-50 .b-font {
font-size: 50px;
}
.icon-size-70 .b-font {
font-size: 70px;
}

2
public/less/size.less

@ -0,0 +1,2 @@
@import "../../src/less/resource/size";
@import "var";

44
src/core/jquery.js vendored

@ -9390,30 +9390,30 @@ jQuery.fn.offset = function( options ) {
// If we don't have gBCR, just use 0,0 rather than error
// BlackBerry 5, iOS 3 (original iPhone)
// if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
// box = elem.getBoundingClientRect();
// }
// 解决transform下的offset问题
var el = elem,
offsetLeft = 0,
offsetTop = 0;
do{
offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop;
el = el.offsetParent;
} while( el );
var elm = elem;
do{
offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode;
} while( elm );
if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
box = elem.getBoundingClientRect();
}
// 解决transform下的offset问题(先恢复)
// var el = elem,
// offsetLeft = 0,
// offsetTop = 0;
// do{
// offsetLeft += el.offsetLeft;
// offsetTop += el.offsetTop;
// el = el.offsetParent;
// } while( el );
// var elm = elem;
// do{
// offsetLeft -= elm.scrollLeft || 0;
// offsetTop -= elm.scrollTop || 0;
// elm = elm.parentNode;
// } while( elm );
win = getWindow( doc );
return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
};
};

2
src/widget/date/calendar/popup.year.js

@ -63,7 +63,7 @@ BI.YearPopup = BI.inherit(BI.Widget, {
dynamic: true
},
tab: {
cls: "year-popup-navigation bi-high-light bi-border-top",
cls: "year-popup-navigation bi-high-light bi-split-top",
height: 24,
items: [backBtn, preBtn]
},

2
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -1,7 +1,7 @@
BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-date-time-select bi-border-top"
baseCls: "bi-date-time-select bi-split-top"
},
render: function () {

2
src/widget/year/card.year.js

@ -81,7 +81,7 @@ BI.StaticYearCard = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.htape",
cls: "bi-border-top bi-border-bottom",
cls: "bi-split-top bi-split-bottom",
height: 30,
items: [{
el: {

8
src/widget/year/popup.year.js

@ -33,7 +33,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -47,7 +47,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
forceCenter: true,
textHeight: c.buttonHeight - 1,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
ref: function () {
@ -62,7 +62,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -100,7 +100,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),

2
src/widget/yearmonth/card.static.yearmonth.js

@ -56,7 +56,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;

8
src/widget/yearmonth/popup.yearmonth.js

@ -33,7 +33,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
@ -46,7 +46,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
@ -62,7 +62,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
@ -100,7 +100,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),

2
src/widget/yearmonthinterval/yearmonthinterval.js

@ -1,6 +1,6 @@
BI.YearMonthInterval = BI.inherit(BI.Single, {
constants: {
height: 26,
height: 24,
width: 25,
lgap: 15,
offset: -15,

8
src/widget/yearquarter/popup.yearquarter.js

@ -26,7 +26,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_Clear"),
@ -39,7 +39,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
@ -55,7 +55,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
forceCenter: true,
cls: "bi-border-top bi-high-light",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
text: BI.i18nText("BI-Basic_OK"),
@ -93,7 +93,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
},
tab: {
type: "bi.linear_segment",
cls: "bi-border-bottom",
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),

18
ui/css/size.css

@ -0,0 +1,18 @@
.icon-size-12 .b-font {
font-size: 12px;
}
.icon-size-16 .b-font {
font-size: 16px;
}
.icon-size-24 .b-font {
font-size: 24px;
}
.icon-size-40 .b-font {
font-size: 40px;
}
.icon-size-50 .b-font {
font-size: 50px;
}
.icon-size-70 .b-font {
font-size: 70px;
}

2
ui/less/size.less

@ -0,0 +1,2 @@
@import "../../src/less/resource/size";
@import "var";
Loading…
Cancel
Save