From 447d88860052a362f2d2222b81fc4922d349fc2b Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Thu, 17 Sep 2020 20:33:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BI-73034=20fix:=E7=BB=93=E6=9E=9C=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E8=AE=BE=E7=BD=AE=E5=BE=88=E5=A4=9A=E4=B8=AA=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=A1=AE=E5=AE=9A=E5=92=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E4=BC=9A=E8=A2=AB=E9=81=AE?= =?UTF-8?q?=E6=8C=A1=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB=20(=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=9C=80=E5=A4=A7=E9=AB=98=E5=BA=A6=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84600=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=99=E4=B8=AA600?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=AE=BE=E7=BD=AE=E5=9C=A8=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=97=E9=AB=98=E5=BA=A6=E5=8F=AF=E5=8F=98?= =?UTF-8?q?=E6=98=AF=E6=A0=B9=E6=8D=AE=E5=86=85=E9=83=A8=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E7=9A=84=EF=BC=8C=E6=89=80=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E4=BD=8E=E5=86=85=E9=83=A8=E6=9C=80=E5=A4=A7=E9=AB=98=E5=BA=A6?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/layer/layer.popover.js | 2 +- src/less/base/layer/layer.popover.less | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index d20167539a..360d5c593e 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -17,7 +17,7 @@ BI.Popover = BI.inherit(BI.Widget, { size: "normal", // small, normal, big logic: { dynamic: false, - maxHeight: 600, + maxHeight: 500, }, header: null, headerHeight: 40, diff --git a/src/less/base/layer/layer.popover.less b/src/less/base/layer/layer.popover.less index 6d038aeb44..7d9bb68f87 100644 --- a/src/less/base/layer/layer.popover.less +++ b/src/less/base/layer/layer.popover.less @@ -1,13 +1,14 @@ -@maxHeight: 600px; +@maxHeight: 500px; .bi-popover { + .dynamic-height-limit-layout-small { min-height: 200px; max-height: @maxHeight; } .dynamic-height-limit-layout-big, .dynamic-height-limit-layout-default { - min-height: 500px; + min-height: 400px; max-height: @maxHeight; } } From 9320258332d9c6de6e83eab7e178d151551db288 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 25 Nov 2020 20:44:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?CHART-17034=20fix:=E6=B7=B1=E8=89=B2?= =?UTF-8?q?=E8=83=8C=E6=99=AF=EF=BC=8C=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E9=A2=9C=E8=89=B2=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/segment/segment.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index d72dcf8a07..8cd92b94ba 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -30,7 +30,12 @@ border-bottom: 1px solid @color-bi-border-line-theme-dark; } & > .first-element{ - border-left: 1px solid @color-bi-background-default-theme-dark; + border-left: 1px solid @color-bi-border-line-theme-dark; + } + & .bi-list-item-select.disabled{ + &.active, &.hover { + background-color: @background-color-black-theme-dark !important; + } } } } \ No newline at end of file From 951a3bab3fe451b0112fe6e2f1e48a5450bfc61a Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 25 Nov 2020 20:49:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?CHART-17034=20style:=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E6=8F=90=E4=BA=A4=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/layer/layer.popover.less | 14 -------------- src/less/base/segment/segment.less | 3 +++ 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 src/less/base/layer/layer.popover.less diff --git a/src/less/base/layer/layer.popover.less b/src/less/base/layer/layer.popover.less deleted file mode 100644 index 7d9bb68f87..0000000000 --- a/src/less/base/layer/layer.popover.less +++ /dev/null @@ -1,14 +0,0 @@ -@maxHeight: 500px; - -.bi-popover { - - .dynamic-height-limit-layout-small { - min-height: 200px; - max-height: @maxHeight; - } - - .dynamic-height-limit-layout-big, .dynamic-height-limit-layout-default { - min-height: 400px; - max-height: @maxHeight; - } -} diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index 8cd92b94ba..a047919c2c 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -30,6 +30,9 @@ border-bottom: 1px solid @color-bi-border-line-theme-dark; } & > .first-element{ + border-left: 1px solid @color-bi-background-default-theme-dark; + } + & > .first-element.bi-list-item-select.disabled{ border-left: 1px solid @color-bi-border-line-theme-dark; } & .bi-list-item-select.disabled{ From 5d7de35188671a8076cf963caa230d71eccec8b1 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 25 Nov 2020 20:57:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?CHART-17034=20style:=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/segment/segment.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index a047919c2c..82e6f2b3ec 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -32,7 +32,7 @@ & > .first-element{ border-left: 1px solid @color-bi-background-default-theme-dark; } - & > .first-element.bi-list-item-select.disabled{ + &.disabled > .first-element{ border-left: 1px solid @color-bi-border-line-theme-dark; } & .bi-list-item-select.disabled{ From 5c0f5f3be0a9ea12193ab31f935e3cced9de4547 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Tue, 26 Jan 2021 16:52:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?BI-80730=20fix:=E6=98=BE=E7=A4=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E6=97=A5=E6=9C=9F=E9=9D=A2=E6=9D=BF=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=8A=A8=E9=9D=99=E6=80=81=E6=97=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=90=91=E4=B8=8A=E4=BC=A0=E9=80=92=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/datetimepane/datetimepane.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widget/datetimepane/datetimepane.js b/src/widget/datetimepane/datetimepane.js index 119f162a26..20a00d3008 100644 --- a/src/widget/datetimepane/datetimepane.js +++ b/src/widget/datetimepane/datetimepane.js @@ -46,6 +46,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { default: break; } + self.fireEvent(BI.DynamicDateTimePane.EVENT_CHANGE); } }], ref: function () { @@ -170,6 +171,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { }; } }); +BI.DynamicDateTimePane.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.dynamic_date_time_pane", BI.DynamicDateTimePane); BI.extend(BI.DynamicDateTimePane, { From 53d5cd18912a73b6986f808f8d64e4892eb1671b Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Tue, 26 Jan 2021 16:53:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?rever:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/segment/segment.less | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index 1b45c9afc6..7796d85af2 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -32,13 +32,5 @@ & > .first-element{ border-left: 1px solid @color-bi-border-line-theme-dark; } - &.disabled > .first-element{ - border-left: 1px solid @color-bi-border-line-theme-dark; - } - & .bi-list-item-select.disabled{ - &.active, &.hover { - background-color: @background-color-black-theme-dark !important; - } - } } }