From 6ad4bb642f885d030e1aaa8a674890ed47a13fa3 Mon Sep 17 00:00:00 2001 From: Guyi Date: Tue, 19 Jan 2021 22:49:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?QFX-3089=20refactor=EF=BC=9A=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=E5=BC=B9=E7=AA=97=E5=B0=8F=E4=B8=89=E8=A7=92=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/combo.bubble.js | 4 +-- src/less/base/combo/combo.bubble.less | 2 -- src/less/base/combo/popup.bubble.less | 1 + src/less/visual.less | 38 ++++++++++++---------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index bd355055e..c64b67686 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -6,7 +6,7 @@ */ BI.BubbleCombo = BI.inherit(BI.Widget, { _const: { - TRIANGLE_LENGTH: 6 + TRIANGLE_LENGTH: 9 }, _defaultConfig: function () { return BI.extend(BI.BubbleCombo.superclass._defaultConfig.apply(this, arguments), { @@ -19,7 +19,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustWidth: true, stopPropagation: false, - adjustLength: 0, // 调整的距离 + adjustLength: 5, // 调整的距离 // adjustXOffset: 0, // adjustYOffset: 10, hideChecker: BI.emptyFn, diff --git a/src/less/base/combo/combo.bubble.less b/src/less/base/combo/combo.bubble.less index e6e7a5aa8..b8ca94ed1 100644 --- a/src/less/base/combo/combo.bubble.less +++ b/src/less/base/combo/combo.bubble.less @@ -28,8 +28,6 @@ & .bubble-combo-triangle-left, & .bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom { &:before { background-color: @color-bi-background-default; - border-bottom: 1px solid @border-color-light-line; - border-right: 1px solid @border-color-light-line; } } } diff --git a/src/less/base/combo/popup.bubble.less b/src/less/base/combo/popup.bubble.less index 939c501ce..fb85dcae0 100644 --- a/src/less/base/combo/popup.bubble.less +++ b/src/less/base/combo/popup.bubble.less @@ -2,6 +2,7 @@ .bi-bubble-popup-view { .box-shadows(0px 9px 28px 8px rgba(0, 0, 0, 0.05), 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12)); + .border-radius(4px); // 只去掉bubble-popup子元素的阴影 &.bi-popup-view > .list-view-shadow { diff --git a/src/less/visual.less b/src/less/visual.less index 241c1cc6e..cebb0eb61 100644 --- a/src/less/visual.less +++ b/src/less/visual.less @@ -200,73 +200,77 @@ .triangle-top() { position: absolute; width: 16px; - height: 6px; + height: 9px; //虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响，这边重置掉 text-align: left; &:before { position: absolute; - width: 6px; - height: 6px; + width: 9px; + height: 9px; margin-left: 4px; - margin-top: 2px; + margin-top: 5px; content: ""; transform: rotate(-135deg); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); } } .triangle-bottom() { position: absolute; width: 16px; - height: 6px; + height: 9px; //虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响，这边重置掉 text-align: left; &:before { position: absolute; - width: 6px; - height: 6px; + width: 9px; + height: 9px; margin-left: 4px; - margin-top: -3px; + margin-top: -5px; content: ""; transform: rotate(45deg); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); } } .triangle-left() { position: absolute; - width: 6px; + width: 9px; height: 16px; //虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响，这边重置掉 text-align: left; &:before { position: absolute; - width: 6px; - height: 6px; - margin-left: 2px; - margin-top: 3px; + width: 9px; + height: 9px; + margin-left: 5px; + margin-top: 4px; content: ""; transform: rotate(135deg); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06)); } } .triangle-right() { position: absolute; - width: 6px; + width: 9px; height: 16px; //虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响，这边重置掉 text-align: left; &:before { position: absolute; - width: 6px; - height: 6px; - margin-left: -3px; + width: 10px; + height: 10px; + margin-left: -5px; margin-top: 4px; content: ""; transform: rotate(-45deg); + .box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07)); } } From bfba8041ac4d72757919b272e8db7392ba68abc4 Mon Sep 17 00:00:00 2001 From: Guyi Date: Tue, 19 Jan 2021 22:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?QFX-3089=20refactor=EF=BC=9A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B7=9D=E7=A6=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/combo.bubble.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index c64b67686..88e050a9f 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -19,7 +19,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustWidth: true, stopPropagation: false, - adjustLength: 5, // 调整的距离 + adjustLength: 0, // 调整的距离 // adjustXOffset: 0, // adjustYOffset: 10, hideChecker: BI.emptyFn,