From cd26026503140a50f42bf604b1c86897117bb5f1 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 11 Jan 2021 10:37:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BI-77335=20=E4=BF=AE=E6=94=B9=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=82=AC=E6=B5=AE=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/button/button.less | 4 ++-- src/less/core/utils/common.less | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 { From 6d0a6f29662865220ddb7ae4298dfd55427e1fd1 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 11 Jan 2021 11:08:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/datepane/datepane.js | 2 ++ src/widget/datetimepane/datetimepane.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/widget/datepane/datepane.js b/src/widget/datepane/datepane.js index 52b8beacd5..c2bdf7451c 100644 --- a/src/widget/datepane/datepane.js +++ b/src/widget/datepane/datepane.js @@ -85,6 +85,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..34e6f42246 100644 --- a/src/widget/datetimepane/datetimepane.js +++ b/src/widget/datetimepane/datetimepane.js @@ -84,6 +84,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 () { From bd2c186696a39257f9ea6bb219fe7d8860a336fc Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 11 Jan 2021 11:11:46 +0800 Subject: [PATCH 3/3] update --- src/widget/datepane/datepane.js | 4 +++- src/widget/datetimepane/datetimepane.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/widget/datepane/datepane.js b/src/widget/datepane/datepane.js index c2bdf7451c..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 () { diff --git a/src/widget/datetimepane/datetimepane.js b/src/widget/datetimepane/datetimepane.js index 34e6f42246..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 () {