From b99ef8a9bc6086b74df5f123123143c794f158a0 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 13 May 2022 16:39:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=20item=E5=AD=98=E5=9C=A8el?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B,=E4=B9=9F=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=94=AF=E6=8C=81=5Flgap=E5=92=8Clgap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index 786e522d1..7a41ee0ae 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -294,37 +294,37 @@ BI.Layout = BI.inherit(BI.Widget, { _optimiseItemLgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.lgap : item._lgap) || 0; + return ((!item.type && item.el) ? ((item._lgap || 0) + (item.lgap || 0)) : item._lgap) || 0; } return (item._lgap || 0) + (item.lgap || 0); }, _optimiseItemRgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.rgap : item._rgap) || 0; + return ((!item.type && item.el) ? ((item._rgap || 0) + (item.rgap || 0)) : item._rgap) || 0; } return (item._rgap || 0) + (item.rgap || 0); }, _optimiseItemTgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.tgap : item._tgap) || 0; + return ((!item.type && item.el) ? ((item._tgap || 0) + (item.tgap || 0)) : item._tgap) || 0; } return (item._tgap || 0) + (item.tgap || 0); }, _optimiseItemBgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.bgap : item._bgap) || 0; + return ((!item.type && item.el) ? ((item._bgap || 0) + (item.bgap || 0)) : item._bgap) || 0; } return (item._bgap || 0) + (item.bgap || 0); }, _optimiseItemHgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.hgap : item._hgap) || 0; + return ((!item.type && item.el) ? ((item._hgap || 0) + (item.hgap || 0)) : item._hgap) || 0; } return (item._hgap || 0) + (item.hgap || 0); }, _optimiseItemVgap: function (item) { if (BI.Providers.getProvider("bi.provider.system").getLayoutOptimize()) { - return ((!item.type && item.el) ? item.vgap : item._vgap) || 0; + return ((!item.type && item.el) ? ((item._vgap || 0) + (item.vgap || 0)) : item._vgap) || 0; } return (item._vgap || 0) + (item.vgap || 0); }, From 46a7c0406b84647da5d4df3f4352ddf7e4ce5073 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 13 May 2022 17:21:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0jira=20SearchTextValueCombo=20?= =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/searchtextvaluecombo/combo.searchtextvalue.js | 7 ++++++- src/less/base/trigger/trigger.searchtextvalue.less | 6 +++++- src/less/base/trigger/trigger.text.less | 8 ++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index b3e6ddc95..8eec27e80 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -23,11 +23,16 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { self.populate(newValue); }) : o.items; + var height = BI.isNumeric(o.height) ? (o.height - (o.simple ? 1 : 2)) : o.height; + var width = BI.isNumeric(o.width) ? (o.width - 2) : o.width; + return { type: "bi.combo", cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-focus-shadow", container: o.container, adjustLength: 2, + height: height, + width: width, toggle: false, ref: function () { self.combo = this; @@ -40,7 +45,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { self.trigger = this; }, items: o.items, - height: o.height - (o.simple ? 1 : 2), + height: height, text: o.text, defaultText: o.defaultText, value: o.value, diff --git a/src/less/base/trigger/trigger.searchtextvalue.less b/src/less/base/trigger/trigger.searchtextvalue.less index 33508ae3b..457589b20 100644 --- a/src/less/base/trigger/trigger.searchtextvalue.less +++ b/src/less/base/trigger/trigger.searchtextvalue.less @@ -5,7 +5,11 @@ color: @color-bi-text-error-text-trigger; } - &:where(:not(&:hover)) .clear-button { + .clear-button { display: none; } + + &:hover .clear-button { + display: block; + } } diff --git a/src/less/base/trigger/trigger.text.less b/src/less/base/trigger/trigger.text.less index 9e2040512..758d7c48d 100644 --- a/src/less/base/trigger/trigger.text.less +++ b/src/less/base/trigger/trigger.text.less @@ -4,8 +4,12 @@ &.error .select-text-label { color: @color-bi-text-error-text-trigger; } - - &:where(:not(&:hover)) .clear-button { + + .clear-button { display: none; } + + &:hover .clear-button { + display: block; + } } From 7152d5dfa1d61446d9cc4dd7462806bb647e377c Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 16 May 2022 10:37:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BI-104841=20fix:=20ie11=E7=9A=84=E5=9C=A8fi?= =?UTF-8?q?ll=E5=B8=83=E5=B1=80=E4=B8=AD=E8=A7=A3=E5=86=B3=E4=B8=8D?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=B8=AD,=20=E5=8F=AA=E8=AF=86=E5=88=ABoverflow:hidden?= =?UTF-8?q?=E6=88=96=E8=80=85=E4=B8=8D=E4=B8=BA=E9=9B=B6=E7=9A=84min-heigh?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit min-height:0 IE不管用. 0或者1其实都无所谓,因此改成1 --- src/less/core/wrapper/flex.horizontal.less | 3 ++- src/less/core/wrapper/flex.vertical.less | 3 ++- src/less/core/wrapper/flex.wrapper.horizontal.less | 3 ++- src/less/core/wrapper/flex.wrapper.vertical.less | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index 24d8862f6..606e929d5 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -170,8 +170,9 @@ > .f-f { &:not(.f-s-n) { - min-width: 0; + min-width: 1px; } + -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index 007396436..8124422b3 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -169,8 +169,9 @@ > .f-f { &:not(.f-s-n) { - min-height: 0; + min-height: 1px; } + -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 09926f54b..70ae040d7 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -266,8 +266,9 @@ > .f-f { &:not(.f-s-n) { - min-width: 0; + min-width: 1px; } + -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index 118759152..755289825 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -260,8 +260,9 @@ > .f-f { &:not(.f-s-n) { - min-height: 0; + min-height: 1px; } + -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1;