Pull request #2455: chore: 整理

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'a5407abe8a4d3b5a6423393db5d202d3c53f3092':
  chore: 整理
  chore: 整理
  feature: switch字体大小

src/base/combination/combo.js

@@ -286,6 +286,8 @@
                 width: width,
                 height: height,
                 offsetStyle: o.offsetStyle,
+                adjustXOffset: o.adjustXOffset,
+                adjustYOffset: o.adjustYOffset,
                 offset: this.combo.element.offset()
             });
             if ("left" in p) {

src/base/layer/layer.popup.js

@@ -176,6 +176,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
     setDirection: function (direction, position) {
         if (this.options.showArrow) {
             var style, placeholderStyle;
+            var adjustXOffset = position.adjustXOffset || 0;
+            var adjustYOffset = position.adjustYOffset || 0;
             var bodyBounds = BI.Widget._renderEngine.createElement("body").bounds();
             var bodyWidth = bodyBounds.width;
             var bodyHeight = bodyBounds.height;
@@ -200,7 +202,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                     direction = "bottom";
                     style = {
                         // 5表示留出一定的空间
-                        left: BI.clamp((middle ? popupWidth : position.width) / 2 - 6, minLeft, maxLeft)
+                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft)
                     };
                     placeholderStyle = {
                         left: 0,
@@ -213,7 +215,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "bottom,left":
                     direction = "bottom";
                     style = {
-                        right: BI.clamp((middle ? popupWidth : position.width) / 2 - 6, minRight, maxRight)
+                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight)
                     };
                     placeholderStyle = {
                         left: 0,
@@ -227,7 +229,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "top,right":
                     direction = "top";
                     style = {
-                        left: BI.clamp((middle ? popupWidth : position.width) / 2 - 6, minLeft, maxLeft)
+                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft)
                     };
                     placeholderStyle = {
                         left: 0,
@@ -240,7 +242,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "top,left":
                     direction = "top";
                     style = {
-                        right: BI.clamp((middle ? popupWidth : position.width) / 2 - 6, minRight, maxRight)
+                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight)
                     };
                     placeholderStyle = {
                         left: 0,
@@ -254,7 +256,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "left,bottom":
                     direction = "left";
                     style = {
-                        top: BI.clamp((middle ? popupHeight : position.height) / 2 - 6, minTop, maxTop)
+                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop)
                     };
                     placeholderStyle = {
                         top: 0,
@@ -267,7 +269,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "left,top":
                     direction = "left";
                     style = {
-                        bottom: BI.clamp((middle ? popupHeight : position.height) / 2 - 6, minBottom, maxBottom)
+                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom)
                     };
                     placeholderStyle = {
                         top: 0,
@@ -281,7 +283,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "right,bottom":
                     direction = "right";
                     style = {
-                        top: BI.clamp((middle ? popupHeight : position.height) / 2 - 6, minTop, maxTop)
+                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop)
                     };
                     placeholderStyle = {
                         top: 0,
@@ -294,7 +296,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "right,top":
                     direction = "right";
                     style = {
-                        bottom: BI.clamp((middle ? popupHeight : position.height) / 2 - 6, minBottom, maxBottom)
+                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom)
                     };
                     placeholderStyle = {
                         top: 0,

src/less/base/single/button/switch.less

@@ -1,6 +1,7 @@
 @import "../../../index";
 
-.bi-switch{
+.bi-switch {
+  font-size: @font-size-12;
   .border-radius(40px 40px 40px 40px);
   background-color: @color-bi-background-switch;
   .transition(all .2s);

src/less/widget/interactivearrangement/interactivearrangement.less

@@ -1,11 +0,0 @@
-@import "../../index";
-
-.bi-interactive-arrangement {
-  & .interactive-arrangement-dragtag-line {
-    z-index: @zIndex-tip;
-    background-color: @color-bi-background-interactive-arrangement-dragtag-line;
-  }
-  & .interactive-arrangement-dragtag-icon {
-    z-index: @zIndex-tip;
-  }
-}