Browse Source

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

* commit '9ef557a24ab96aebd30319319b86dc1b93471e65':
  BI-45527 调整年月下拉选中效果 && label _setEnable
master
windy 6 years ago
parent
commit
0179e08c58
  1. 9
      src/base/single/label/label.js
  2. 2
      src/case/calendar/calendar.year.js
  3. 2
      src/widget/month/popup.month.js
  4. 2
      src/widget/yearmonth/card.static.yearmonth.js
  5. 2
      src/widget/yearquarter/card.static.yearquarter.js

9
src/base/single/label/label.js

@ -330,15 +330,6 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },

2
src/case/calendar/calendar.year.js

@ -59,7 +59,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) { return BI.map(item, function (j, td) {
return BI.extend(td, { return BI.extend(td, {
type: "bi.text_item", type: "bi.text_item",
cls: "bi-list-item-active", cls: "bi-list-item-select",
textAlign: "center", textAlign: "center",
whiteSpace: "normal", whiteSpace: "normal",
once: false, once: false,

2
src/widget/month/popup.month.js

@ -31,7 +31,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) { return BI.map(item, function (j, td) {
return { return {
type: "bi.text_item", type: "bi.text_item",
cls: "bi-list-item-active", cls: "bi-list-item-select",
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
once: false, once: false,

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

@ -19,7 +19,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
return BI.map(item, function (j, td) { return BI.map(item, function (j, td) {
return { return {
type: "bi.text_item", type: "bi.text_item",
cls: "bi-list-item-active", cls: "bi-list-item-select",
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
once: false, once: false,

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

@ -23,7 +23,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
return BI.map(items, function (j, item) { return BI.map(items, function (j, item) {
return BI.extend(item, { return BI.extend(item, {
type: "bi.text_item", type: "bi.text_item",
cls: "bi-list-item-active", cls: "bi-list-item-select",
textAlign: "center", textAlign: "center",
whiteSpace: "nowrap", whiteSpace: "nowrap",
once: false, once: false,

Loading…
Cancel
Save