Merge pull request #562 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '2297e79ea2e4c5853c15cde46d617989ecc3a2b5':
  BI-28985
  BI-29038
  BI-29038 offset要减去scroll

dist/bundle.js

@@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
 		offsetLeft += el.offsetLeft;
 		offsetTop  += el.offsetTop;
 
+        offsetLeft -= el.scrollLeft;
+        offsetTop  -= el.scrollTop;
+
 		el = el.offsetParent;
 	} while( el );
 	win = getWindow( doc );
@@ -28833,11 +28836,12 @@ BI.extend(BI.DOM, {
         ctx.fillText(param, 6 * ratio, 12 * ratio);
         $(canvas).destroy();
         var backColor = backgroundColor || "#EAF2FD";
+        // IE可以放大缩小所以要固定最大最小宽高
         return {
             width: w,
             height: 24,
             src: canvas.toDataURL("image/png"),
-            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px",
+            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
             param: param
         };
     }

dist/core.js

@@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
 		offsetLeft += el.offsetLeft;
 		offsetTop  += el.offsetTop;
 
+        offsetLeft -= el.scrollLeft;
+        offsetTop  -= el.scrollTop;
+
 		el = el.offsetParent;
 	} while( el );
 	win = getWindow( doc );
@@ -28833,11 +28836,12 @@ BI.extend(BI.DOM, {
         ctx.fillText(param, 6 * ratio, 12 * ratio);
         $(canvas).destroy();
         var backColor = backgroundColor || "#EAF2FD";
+        // IE可以放大缩小所以要固定最大最小宽高
         return {
             width: w,
             height: 24,
             src: canvas.toDataURL("image/png"),
-            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px",
+            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
             param: param
         };
     }

dist/fineui.js

@@ -9623,6 +9623,9 @@ jQuery.fn.offset = function( options ) {
 		offsetLeft += el.offsetLeft;
 		offsetTop  += el.offsetTop;
 
+        offsetLeft -= el.scrollLeft;
+        offsetTop  -= el.scrollTop;
+
 		el = el.offsetParent;
 	} while( el );
 	win = getWindow( doc );
@@ -29054,11 +29057,12 @@ BI.extend(BI.DOM, {
         ctx.fillText(param, 6 * ratio, 12 * ratio);
         $(canvas).destroy();
         var backColor = backgroundColor || "#EAF2FD";
+        // IE可以放大缩小所以要固定最大最小宽高
         return {
             width: w,
             height: 24,
             src: canvas.toDataURL("image/png"),
-            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px",
+            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
             param: param
         };
     }

src/core/func/function.js

@@ -315,11 +315,12 @@ BI.extend(BI.DOM, {
         ctx.fillText(param, 6 * ratio, 12 * ratio);
         $(canvas).destroy();
         var backColor = backgroundColor || "#EAF2FD";
+        // IE可以放大缩小所以要固定最大最小宽高
         return {
             width: w,
             height: 24,
             src: canvas.toDataURL("image/png"),
-            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px",
+            style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
             param: param
         };
     }

src/core/jquery.js

@@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
 		offsetLeft += el.offsetLeft;
 		offsetTop  += el.offsetTop;
 
+        offsetLeft -= el.scrollLeft;
+        offsetTop  -= el.scrollTop;
+
 		el = el.offsetParent;
 	} while( el );
 	win = getWindow( doc );