diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index cb3cf42565..890220837e 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -228,7 +228,7 @@ body .bi-button, #body .bi-button { .transition(@activeStopVal) } &:hover{ - background-color: @color-bi-blue-5; + background-color: @color-bi-blue-10; .transition(@hoverVal); } } @@ -256,7 +256,7 @@ body .bi-button, #body .bi-button { } &.button-ignore { &:hover{ - background-color: @color-bi-blue-5; + background-color: @color-bi-blue-10; } &:active{ background-color: @color-bi-blue-10; diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 794c66b78b..05d9790996 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -519,7 +519,7 @@ textarea { & .bi-textarea { color: @color-bi-text-black; } - .background-color(@color-bi-background-highlight, 5%); + .background-color(@color-bi-background-highlight, 10%); } &.disabled { &, &:hover, &:active { @@ -548,7 +548,7 @@ textarea { & .bi-textarea { color: @color-bi-text; } - .background-color(@color-bi-background-highlight, 5%); + .background-color(@color-bi-background-highlight, 10%); } &.disabled { &, &:hover, &:active { diff --git a/src/widget/datepane/datepane.js b/src/widget/datepane/datepane.js index 52b8beacd5..4abd441767 100644 --- a/src/widget/datepane/datepane.js +++ b/src/widget/datepane/datepane.js @@ -1,7 +1,9 @@ BI.DynamicDatePane = BI.inherit(BI.Widget, { props: { - baseCls: "bi-dynamic-date-pane" + baseCls: "bi-dynamic-date-pane", + minDate: "1900-01-01", + maxDate: "2099-12-31", }, render: function () { @@ -85,6 +87,8 @@ BI.DynamicDatePane = BI.inherit(BI.Widget, { default: return { type: "bi.dynamic_date_card", + min: o.minDate, + max: o.maxDate, listeners: [{ eventName: "EVENT_CHANGE", action: function () { diff --git a/src/widget/datetimepane/datetimepane.js b/src/widget/datetimepane/datetimepane.js index b822b7fb24..119f162a26 100644 --- a/src/widget/datetimepane/datetimepane.js +++ b/src/widget/datetimepane/datetimepane.js @@ -1,7 +1,9 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { props: { - baseCls: "bi-dynamic-date-pane" + baseCls: "bi-dynamic-date-pane", + minDate: "1900-01-01", + maxDate: "2099-12-31", }, render: function () { @@ -84,6 +86,8 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { default: return { type: "bi.dynamic_date_card", + min: o.minDate, + max: o.maxDate, listeners: [{ eventName: "EVENT_CHANGE", action: function () {