From d9369897a34c5e01f5fd7abe6359a6b8c01bbe46 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 27 Mar 2022 22:32:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E5=B0=8F=E4=B8=89=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/bubble.js | 2 +- src/base/combination/combo.js | 2 +- src/base/layer/layer.popup.js | 2 +- src/less/base/combo/popup.bubble.less | 2 +- src/less/base/view/popupview.less | 38 +++++++++++++-------------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/base/combination/bubble.js b/src/base/combination/bubble.js index ca0c9ef60..613ffaf6b 100644 --- a/src/base/combination/bubble.js +++ b/src/base/combination/bubble.js @@ -332,7 +332,7 @@ name: "offset", options: { offset: function () { - return [o.adjustXOffset, (o.showArrow ? 9 : 0) + (o.adjustYOffset + o.adjustLength)]; + return [o.adjustXOffset, (o.showArrow ? 14 : 0) + (o.adjustYOffset + o.adjustLength)]; } } }]; diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 202e31c3d..52eb5bc62 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -7,7 +7,7 @@ */ BI.Combo = BI.inherit(BI.Bubble, { _const: { - TRIANGLE_LENGTH: 9 + TRIANGLE_LENGTH: 14 }, _defaultConfig: function () { var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments); diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index a4cd139b3..f476bddd3 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -5,7 +5,7 @@ */ BI.PopupView = BI.inherit(BI.Widget, { _const: { - TRIANGLE_LENGTH: 9 + TRIANGLE_LENGTH: 14 }, _defaultConfig: function (props) { return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), { diff --git a/src/less/base/combo/popup.bubble.less b/src/less/base/combo/popup.bubble.less index 4a324ac95..2bfd50acc 100644 --- a/src/less/base/combo/popup.bubble.less +++ b/src/less/base/combo/popup.bubble.less @@ -5,4 +5,4 @@ .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); } -} \ No newline at end of file +} diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 318518b57..f8ea08b79 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -32,11 +32,11 @@ bottom: 0; left: 0; > .bi-bubble-arrow { - bottom: -12px; - width: 14px; + bottom: -14px; + width: 18px; > .bubble-arrow { bottom: 8px; - left: 1px; + left: 2px; } } } @@ -46,11 +46,11 @@ top: 0; left: 0; > .bi-bubble-arrow { - top: -12px; - width: 14px; + top: -14px; + width: 18px; > .bubble-arrow { top: 8px; - left: 1px; + left: 2px; } } } @@ -60,11 +60,11 @@ right: 0; top: 0; > .bi-bubble-arrow { - right: -12px; - height: 14px; + right: -14px; + height: 18px; > .bubble-arrow { right: 8px; - top: 1px; + top: 2px; } } } @@ -74,29 +74,29 @@ left: 0; top: 0; > .bi-bubble-arrow { - left: -12px; - height: 14px; + left: -14px; + height: 18px; > .bubble-arrow { left: 8px; - top: 1px; + top: 2px; } } } } .bi-bubble-arrow { - width: 12px; - height: 12px; + width: 14px; + height: 14px; // 消除祖先节点设置的line-height:normal对空白节点的行高影响 line-height: 0; overflow: hidden; .bubble-arrow { - width: 12px; - height: 12px; + width: 14px; + height: 14px; position: absolute; &:before { - width: 12px; - height: 12px; + width: 14px; + height: 14px; position: absolute; content: ""; background: @color-bi-background-default; @@ -106,7 +106,7 @@ visibility: visible; transform: translateX(0px) rotate(-135deg); transform-origin: center center; - .box-shadow(3px 3px 10px 0,rgba(0,0,0,6%)); + .box-shadow(3px 3px 10px 0,rgba(0, 0, 0, 6%)); } } } From bb7e72ea3dfc66913c1677f6455592e36b1a75a1 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 27 Mar 2022 22:42:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E5=B0=8F=E4=B8=89=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/bubble.js | 4 ++-- src/base/combination/combo.js | 2 +- src/base/layer/layer.popup.js | 34 +++++++++++++++---------------- src/less/base/view/popupview.less | 32 ++++++++++++++--------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/base/combination/bubble.js b/src/base/combination/bubble.js index 613ffaf6b..11af9cb7a 100644 --- a/src/base/combination/bubble.js +++ b/src/base/combination/bubble.js @@ -332,7 +332,7 @@ name: "offset", options: { offset: function () { - return [o.adjustXOffset, (o.showArrow ? 14 : 0) + (o.adjustYOffset + o.adjustLength)]; + return [o.adjustXOffset, (o.showArrow ? 12 : 0) + (o.adjustYOffset + o.adjustLength)]; } } }]; @@ -340,7 +340,7 @@ modifiers.push({ name: "arrow", options: { - padding: 5, + padding: 4, element: this.popupView.arrow.element[0] } }); diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 52eb5bc62..ddf020a62 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -7,7 +7,7 @@ */ BI.Combo = BI.inherit(BI.Bubble, { _const: { - TRIANGLE_LENGTH: 14 + TRIANGLE_LENGTH: 12 }, _defaultConfig: function () { var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments); diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index f476bddd3..5ad4f064d 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -5,7 +5,7 @@ */ BI.PopupView = BI.inherit(BI.Widget, { _const: { - TRIANGLE_LENGTH: 14 + TRIANGLE_LENGTH: 12 }, _defaultConfig: function (props) { return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), { @@ -197,22 +197,22 @@ BI.PopupView = BI.inherit(BI.Widget, { var offsetStyle = position.offsetStyle; var middle = offsetStyle === "center" || offsetStyle === "middle"; - var minLeft = Math.max(5, offset.left + 5 + popupWidth - bodyWidth); - var minRight = Math.max(5, popupWidth - (offset.left + 5)); - var minTop = Math.max(5, offset.top + 5 + popupHeight - bodyHeight); - var minBottom = Math.max(5, popupHeight - (offset.top + 5)); + var minLeft = Math.max(4, offset.left + 4 + popupWidth - bodyWidth); + var minRight = Math.max(4, popupWidth - (offset.left + 4)); + var minTop = Math.max(4, offset.top + 4 + popupHeight - bodyHeight); + var minBottom = Math.max(4, popupHeight - (offset.top + 4)); - var maxLeft = Math.min(popupWidth - 12 - 5, offset.left + position.width - 12 - 5); - var maxRight = Math.min(popupWidth - 12 - 5, bodyWidth - (offset.left + position.width - 12 - 5)); - var maxTop = Math.min(popupHeight - 12 - 5, offset.top + position.height - 12 - 5); - var maxBottom = Math.min(popupHeight - 12 - 5, bodyHeight - (offset.top + position.height - 12 - 5)); + var maxLeft = Math.min(popupWidth - 16 - 4, offset.left + position.width - 16 - 4); + var maxRight = Math.min(popupWidth - 16 - 4, bodyWidth - (offset.left + position.width - 16 - 4)); + var maxTop = Math.min(popupHeight - 16 - 4, offset.top + position.height - 16 - 4); + var maxBottom = Math.min(popupHeight - 16 - 4, bodyHeight - (offset.top + position.height - 16 - 4)); switch (direction) { case "bottom": case "bottom,right": direction = "bottom"; style = { // 5表示留出一定的空间 - left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft) + left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft) }; wrapperStyle = { top: o.tgap + o.vgap, @@ -231,7 +231,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "bottom,left": direction = "bottom"; style = { - right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight) + right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight) }; wrapperStyle = { top: o.bgap + o.vgap, @@ -251,7 +251,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "top,right": direction = "top"; style = { - left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft) + left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft) }; wrapperStyle = { bottom: o.bgap + o.vgap, @@ -270,7 +270,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "top,left": direction = "top"; style = { - right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight) + right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight) }; wrapperStyle = { bottom: o.bgap + o.vgap, @@ -290,7 +290,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "left,bottom": direction = "left"; style = { - top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop) + top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop) }; wrapperStyle = { right: o.rgap + o.hgap, @@ -309,7 +309,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "left,top": direction = "left"; style = { - bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom) + bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom) }; wrapperStyle = { right: o.rgap + o.hgap, @@ -329,7 +329,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "right,bottom": direction = "right"; style = { - top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop) + top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop) }; wrapperStyle = { left: o.lgap + o.hgap, @@ -348,7 +348,7 @@ BI.PopupView = BI.inherit(BI.Widget, { case "right,top": direction = "right"; style = { - bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom) + bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom) }; wrapperStyle = { left: o.lgap + o.hgap, diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index f8ea08b79..37c421152 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -32,11 +32,11 @@ bottom: 0; left: 0; > .bi-bubble-arrow { - bottom: -14px; - width: 18px; + bottom: -12px; + width: 16px; > .bubble-arrow { - bottom: 8px; - left: 2px; + bottom: 7px; + left: 1px; } } } @@ -46,11 +46,11 @@ top: 0; left: 0; > .bi-bubble-arrow { - top: -14px; - width: 18px; + top: -12px; + width: 16px; > .bubble-arrow { - top: 8px; - left: 2px; + top: 7px; + left: 1px; } } } @@ -60,11 +60,11 @@ right: 0; top: 0; > .bi-bubble-arrow { - right: -14px; - height: 18px; + right: -12px; + height: 16px; > .bubble-arrow { - right: 8px; - top: 2px; + right: 7px; + top: 1px; } } } @@ -74,11 +74,11 @@ left: 0; top: 0; > .bi-bubble-arrow { - left: -14px; - height: 18px; + left: -12px; + height: 16px; > .bubble-arrow { - left: 8px; - top: 2px; + left: 7px; + top: 1px; } } }