caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feature: 小三角

es6
guy 3 years ago
parent
d9369897a3
commit
bb7e72ea3d
4 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/base/combination/bubble.js
  2. 2
      src/base/combination/combo.js
  3. 34
      src/base/layer/layer.popup.js
  4. 32
      src/less/base/view/popupview.less

4
src/base/combination/bubble.js
Unescape View File

@ -332,7 +332,7 @@
name: "offset", name: "offset",
options: { options: {
offset: function () { 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({ modifiers.push({
name: "arrow", name: "arrow",
options: { options: {
padding: 5, padding: 4,
element: this.popupView.arrow.element[0] element: this.popupView.arrow.element[0]
} }
}); });

2
src/base/combination/combo.js
Unescape View File

@ -7,7 +7,7 @@
*/ */
BI.Combo = BI.inherit(BI.Bubble, { BI.Combo = BI.inherit(BI.Bubble, {
_const: { _const: {
TRIANGLE_LENGTH: 14 TRIANGLE_LENGTH: 12
}, },
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments); var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments);

34
src/base/layer/layer.popup.js
Unescape View File

@ -5,7 +5,7 @@
*/ */
BI.PopupView = BI.inherit(BI.Widget, { BI.PopupView = BI.inherit(BI.Widget, {
_const: { _const: {
TRIANGLE_LENGTH: 14 TRIANGLE_LENGTH: 12
}, },
_defaultConfig: function (props) { _defaultConfig: function (props) {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), { 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 offsetStyle = position.offsetStyle;
var middle = offsetStyle === "center" || offsetStyle === "middle"; var middle = offsetStyle === "center" || offsetStyle === "middle";
var minLeft = Math.max(5, offset.left + 5 + popupWidth - bodyWidth); var minLeft = Math.max(4, offset.left + 4 + popupWidth - bodyWidth);
var minRight = Math.max(5, popupWidth - (offset.left + 5)); var minRight = Math.max(4, popupWidth - (offset.left + 4));
var minTop = Math.max(5, offset.top + 5 + popupHeight - bodyHeight); var minTop = Math.max(4, offset.top + 4 + popupHeight - bodyHeight);
var minBottom = Math.max(5, popupHeight - (offset.top + 5)); var minBottom = Math.max(4, popupHeight - (offset.top + 4));
var maxLeft = Math.min(popupWidth - 12 - 5, offset.left + position.width - 12 - 5); var maxLeft = Math.min(popupWidth - 16 - 4, offset.left + position.width - 16 - 4);
var maxRight = Math.min(popupWidth - 12 - 5, bodyWidth - (offset.left + position.width - 12 - 5)); var maxRight = Math.min(popupWidth - 16 - 4, bodyWidth - (offset.left + position.width - 16 - 4));
var maxTop = Math.min(popupHeight - 12 - 5, offset.top + position.height - 12 - 5); var maxTop = Math.min(popupHeight - 16 - 4, offset.top + position.height - 16 - 4);
var maxBottom = Math.min(popupHeight - 12 - 5, bodyHeight - (offset.top + position.height - 12 - 5)); var maxBottom = Math.min(popupHeight - 16 - 4, bodyHeight - (offset.top + position.height - 16 - 4));
switch (direction) { switch (direction) {
case "bottom": case "bottom":
case "bottom,right": case "bottom,right":
direction = "bottom"; direction = "bottom";
style = { style = {
// 5表示留出一定的空间 // 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 = { wrapperStyle = {
top: o.tgap + o.vgap, top: o.tgap + o.vgap,
@ -231,7 +231,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "bottom,left": case "bottom,left":
direction = "bottom"; direction = "bottom";
style = { 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 = { wrapperStyle = {
top: o.bgap + o.vgap, top: o.bgap + o.vgap,
@ -251,7 +251,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "top,right": case "top,right":
direction = "top"; direction = "top";
style = { 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 = { wrapperStyle = {
bottom: o.bgap + o.vgap, bottom: o.bgap + o.vgap,
@ -270,7 +270,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "top,left": case "top,left":
direction = "top"; direction = "top";
style = { 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 = { wrapperStyle = {
bottom: o.bgap + o.vgap, bottom: o.bgap + o.vgap,
@ -290,7 +290,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "left,bottom": case "left,bottom":
direction = "left"; direction = "left";
style = { 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 = { wrapperStyle = {
right: o.rgap + o.hgap, right: o.rgap + o.hgap,
@ -309,7 +309,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "left,top": case "left,top":
direction = "left"; direction = "left";
style = { 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 = { wrapperStyle = {
right: o.rgap + o.hgap, right: o.rgap + o.hgap,
@ -329,7 +329,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "right,bottom": case "right,bottom":
direction = "right"; direction = "right";
style = { 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 = { wrapperStyle = {
left: o.lgap + o.hgap, left: o.lgap + o.hgap,
@ -348,7 +348,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
case "right,top": case "right,top":
direction = "right"; direction = "right";
style = { 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 = { wrapperStyle = {
left: o.lgap + o.hgap, left: o.lgap + o.hgap,

32
src/less/base/view/popupview.less
Unescape View File

@ -32,11 +32,11 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
> .bi-bubble-arrow { > .bi-bubble-arrow {
bottom: -14px; bottom: -12px;
width: 18px; width: 16px;
> .bubble-arrow { > .bubble-arrow {
bottom: 8px; bottom: 7px;
left: 2px; left: 1px;
} }
} }
} }
@ -46,11 +46,11 @@
top: 0; top: 0;
left: 0; left: 0;
> .bi-bubble-arrow { > .bi-bubble-arrow {
top: -14px; top: -12px;
width: 18px; width: 16px;
> .bubble-arrow { > .bubble-arrow {
top: 8px; top: 7px;
left: 2px; left: 1px;
} }
} }
} }
@ -60,11 +60,11 @@
right: 0; right: 0;
top: 0; top: 0;
> .bi-bubble-arrow { > .bi-bubble-arrow {
right: -14px; right: -12px;
height: 18px; height: 16px;
> .bubble-arrow { > .bubble-arrow {
right: 8px; right: 7px;
top: 2px; top: 1px;
} }
} }
} }
@ -74,11 +74,11 @@
left: 0; left: 0;
top: 0; top: 0;
> .bi-bubble-arrow { > .bi-bubble-arrow {
left: -14px; left: -12px;
height: 18px; height: 16px;
> .bubble-arrow { > .bubble-arrow {
left: 8px; left: 7px;
top: 2px; top: 1px;
} }
} }
} }

Write Preview
Loading…
Cancel
Save