hqchart 1.1.13754 → 1.1.13760

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -62476,7 +62476,7 @@ function ChartDrawHLine()
     this.ButtonBGColor='rgb(190,190,190)';
     this.ButtonSpace=3;
     
-    this.TextMargin={ Left:0, Right:0 };
+    this.TextMargin={ Left:0, Right:0, Top:0, Bottom:0, YOffset:4*GetDevicePixelRatio() };
 
     this.AlwaysShowLab=false;        //总是显示标签
 
@@ -62500,7 +62500,9 @@ function ChartDrawHLine()
             `${12*GetDevicePixelRatio()}px 微软雅黑`,
             `${12*GetDevicePixelRatio()}px 微软雅黑`,
         ],
-    };  
+    }; 
+
+    this.LableInfo; //{ Position:2=右侧外部 }
 
     //内部变量
     this.ColseButtonSize=0;
@@ -62508,7 +62510,7 @@ function ChartDrawHLine()
     this.ButtonBGWidth=0;
     this.VerticalButtonInfo={ Width:0, Height:0 };  //垂直按钮信息
    
-
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
 
     this.SetOption=function(option)
     {
@@ -62569,6 +62571,9 @@ function ChartDrawHLine()
                 var item=option.TextMargin;
                 if (IFrameSplitOperator.IsNumber(item.Left)) this.TextMargin.Left=item.Left;
                 if (IFrameSplitOperator.IsNumber(item.Right)) this.TextMargin.Right=item.Right;
+                if (IFrameSplitOperator.IsNumber(item.Top)) this.TextMargin.Top=item.Top;
+                if (IFrameSplitOperator.IsNumber(item.Bottom)) this.TextMargin.Bottom=item.Bottom;
+                if (IFrameSplitOperator.IsNumber(item.YOffset)) this.TextMargin.YOffset=item.YOffset;
             }
         }
     }
@@ -62585,10 +62590,6 @@ function ChartDrawHLine()
         return storageData;
     }
 
-   
-    this.IsPointIn=this.IsPointIn_XYValue_Line;
-    
-
     /*
     this.GetXYCoordinate=function()
     {
@@ -62645,7 +62646,7 @@ function ChartDrawHLine()
         this.ColseButtonSize=0;
         this.SettingButtonSize=0;
         this.ButtonBGWidth=0;
-
+        this.LableInfo=null;
         this.VerticalButtonInfo.Width=0;
         this.VerticalButtonInfo.Height=0;
 
@@ -62708,7 +62709,7 @@ function ChartDrawHLine()
         }
         this.LinePoint.push(line);
 
-        if (bVisibleRange)
+        if (bVisibleRange)  //在可视范围内
         {
             var yValue=this.Frame.GetYData(drawPoint[0].Y, false);
             var strPrice=yValue.toFixed(this.Precision);
@@ -62722,15 +62723,11 @@ function ChartDrawHLine()
                 this.DrawPriceText(strPrice, line.Start, line.End, 1);
             }
         }
-        
-        var labInfo;
-        if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
+       
+        if (this.GetLabelCallback) this.LableInfo=this.GetLabelCallback(this);
 
         this.AryShowButton=this.GetShowButton();    //获取按钮
-
-        //框架内的描述信息
-        if (labInfo && bVisibleRange)
-            this.DrawLab(labInfo, drawPoint[0].Y);
+        if (bVisibleRange) this.DrawInternalLabel(drawPoint[0].Y);  //内部价格标签
 
         //画中心点
         if (bVisibleRange)
@@ -62747,11 +62744,11 @@ function ChartDrawHLine()
         {
             var rtDraw={ };
             this.CalculateButtonSize();
-            this.DrawValueText(drawPoint[0].Y, rtDraw, labInfo); 
-            if (labInfo) this.DrawRightLab(labInfo, rtDraw);
-            if (labInfo && bVisibleRange) this.DrawCustomHLine(labInfo, drawPoint[0].Y);
+            this.DrawRightLabel(drawPoint[0].Y);
+            if (bVisibleRange) this.DrawCustomHLine(drawPoint[0].Y);
         }
 
+
         //鼠标是否在按钮上
         if (moveonPoint && mouseStatus)
         {
@@ -62799,113 +62796,141 @@ function ChartDrawHLine()
             ++lineCount;
         }
 
-        var size={ Width:maxWidth, Height: lineCount*(lineHeight+lineSpace)+lineSpace, NameWidth:maxNameWidth, TextWidth:maxTextWidth, LineHeight:lineHeight };
+        var size={ Width:maxWidth, Height:lineCount*lineHeight+(lineCount-1)*lineSpace, NameWidth:maxNameWidth, TextWidth:maxTextWidth, LineHeight:lineHeight };
+        if (labInfo.LabelMargin)
+        {
+            var item=labInfo.LabelMargin;
+            if (IFrameSplitOperator.IsNumber(item.Left)) size.Width+=item.Left;
+            if (IFrameSplitOperator.IsNumber(item.Right)) size.Width+=item.Right;
+            if (IFrameSplitOperator.IsNumber(item.Top)) size.Height+=item.Top;
+            if (IFrameSplitOperator.IsNumber(item.Bottom)) size.Height+=item.Bottom;
+        }
 
         return size;
     }
 
-    this.DrawLab=function(labInfo, y)
+    //绘制窗口内部标签
+    this.DrawInternalLabel=function(y)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText)) return;
-        if (labInfo.Position===2) return;
+        if (!this.LableInfo || !IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryText)) return;
+        if (this.LableInfo.Position==2) return; 
 
-        var left=this.Frame.ChartBorder.GetLeft();
-        var right=this.Frame.ChartBorder.GetRight();
-        var labSize=this.CalculateLabSize(labInfo);
+        var border=this.Frame.GetBorder();
+        var left=border.Left;
+        var right=border.Right;
+        var labSize=this.CalculateLabSize(this.LableInfo);
         var drawLeft=right-labSize.Width;
+        var drawRight=drawLeft+labSize.Width;
         var drawTop=y-labSize.Height-1;
+        if (drawTop<=border.TopEx) drawTop=y+1;
 
-        //背景色
-        if (labInfo.BGColor)
-        {
-            this.Canvas.fillStyle=labInfo.BGColor;
-            var rtTop=y-labSize.Height-4;
-            this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(right+drawLeft),ToFixedRect(y-rtTop)); 
-        }
+        var rtLabel={ Left:drawLeft, Right:drawRight, Top:drawTop, Width:labSize.Width, Height:labSize.Height };
+        rtLabel.Bottom=rtLabel.Top+rtLabel.Height;
 
-        var yText=drawTop;
-        for(var i=0;i<labInfo.AryText.length;++i)
-        {
-            var item=labInfo.AryText[i];
-            if (item.Name)
-            {
-                this.Canvas.fillStyle=item.NameColor;
-                this.Canvas.fillText(item.Name,drawLeft+1,yText+1);
-            }
-            
-            if (item.Text)
-            {
-                this.Canvas.fillStyle=item.TextColor;
-                this.Canvas.fillText(item.Text,drawLeft+labSize.NameWidth+1,yText+1);
-            }
-
-            yText+=labSize.LineHeight;
-        }
+        this.DrawLabel(this.LableInfo, labSize, rtLabel);
     }
 
-    this.DrawRightLab=function(labInfo, rtLeftDraw)
+    //绘制标签页
+    this.DrawLabel=function(labelInfo, labelSize, rtLabel)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText)) return;
-        if (labInfo.Position!=2) return;
-        var labSize=this.CalculateLabSize(labInfo);
+        //背景色
+        if (labelInfo.BGColor)
+        {
+            this.Canvas.fillStyle=labelInfo.BGColor;
+            this.Canvas.fillRect(ToFixedRect(rtLabel.Left),ToFixedRect(rtLabel.Top),ToFixedRect(rtLabel.Width),ToFixedRect(rtLabel.Height)); 
+        }
 
-        var drawLeft=rtLeftDraw.Right-labSize.Width;
-        if (drawLeft<rtLeftDraw.Left) drawLeft=rtLeftDraw.Left;
-        var drawRight=drawLeft+labSize.Width;
-        var drawTop=rtLeftDraw.Bottom;
+        var labelMargin=labelInfo.LabelMargin;
         var lineSpace=0;
-        if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
+        if (IFrameSplitOperator.IsNumber(labelInfo.LineSpace)) lineSpace=labelInfo.LineSpace;
+        
+        var yText=rtLabel.Top;
+        var xText=rtLabel.Left;
+        var yRightText=rtLabel.Right;
 
-        //背景色
-        var rtLab={ Left:drawLeft, Top:drawTop, Width:labSize.Width, Height:labSize.Height }
-        rtLab.Right=rtLab.Left+rtLab.Width;
-        rtLab.Bottom=rtLab.Top+rtLab.Height;
-        if (labInfo.BGColor)
+        if (labelMargin)
         {
-            this.Canvas.fillStyle=labInfo.BGColor;
-            this.Canvas.fillRect(ToFixedRect(rtLab.Left),ToFixedRect(rtLab.Top),ToFixedRect(rtLab.Width),ToFixedRect(rtLab.Height));  
+            if (IFrameSplitOperator.IsNumber(labelMargin.Left)) xText+=labelMargin.Left;
+            if (IFrameSplitOperator.IsNumber(labelMargin.Right)) yRightText-=labelMargin.Right;
+            if (IFrameSplitOperator.IsNumber(labelMargin.Top)) yText+=labelMargin.Top;
+            
         }
 
-        var yText=drawTop+1+lineSpace;
+        this.Canvas.font=this.TextFont;
         this.Canvas.textBaseline="top";
-        for(var i=0;i<labInfo.AryText.length;++i)
+        for(var i=0;i<labelInfo.AryText.length;++i)
         {
-            var item=labInfo.AryText[i];
+            if (i>0) yText+=lineSpace;
+            var item=labelInfo.AryText[i];
             if (item.Name)
             {
                 this.Canvas.textAlign="left";
                 this.Canvas.fillStyle=item.NameColor;
-                this.Canvas.fillText(item.Name,drawLeft+1,yText+1);
+                this.Canvas.fillText(item.Name,xText,yText);
             }
             
             if (item.Text)
             {
                 this.Canvas.textAlign="right";
                 this.Canvas.fillStyle=item.TextColor;
-                this.Canvas.fillText(item.Text,drawRight-1,yText+1);
+                this.Canvas.fillText(item.Text,yRightText,yText);
             }
 
-            yText+=labSize.LineHeight+lineSpace;
+            yText+=labelSize.LineHeight;
         }
+    }
 
-        this.DrawVerticalButton(rtLab);
+    this.DrawRightLabel=function(y)
+    {
+        var rtDraw={ };
+        if (!this.LableInfo || !IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryText) || this.LableInfo.Position!=2)
+        {
+            this.DrawValueText(y, rtDraw); 
+            return;
+        }
+        
+        var priceSize=this.CalculateValueText(y);
+        var labSize=this.CalculateLabSize(this.LableInfo);
+        var border=this.Frame.GetBorder();
+        var yTop=y-priceSize.Height/2;
+        var totalHeight=priceSize.Height+labSize.Height;
+        var yBottom=yTop+totalHeight;
+        var option={ };
+        if (yBottom>border.Bottom)  //超过窗口底部, 标签位置不动
+        {
+            yBottom=border.Bottom;
+            yTop=yBottom-totalHeight;
+            option.Top=yTop;
+        }
+
+        this.DrawValueText(y, rtDraw, option); 
+        
+        var drawLeft=rtDraw.Right-labSize.Width;
+        if (drawLeft<rtDraw.Left) drawLeft=rtDraw.Left;
+        var drawRight=drawLeft+labSize.Width;
+        var drawTop=rtDraw.Bottom;
+
+        var rtLabel={ Left:drawLeft, Right:drawRight, Top:drawTop, Width:labSize.Width, Height:labSize.Height };
+        rtLabel.Bottom=rtLabel.Top+rtLabel.Height;
+       
+        this.DrawLabel(this.LableInfo, labSize, rtLabel);
+       
+        this.DrawVerticalButton(rtLabel);
     }
 
-    this.DrawCustomHLine=function(labInfo, yLine)
+    this.DrawCustomHLine=function(yLine)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryLine)) return;
+        if (!this.LableInfo) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryLine)) return;
 
         var left=this.Frame.ChartBorder.GetLeft();
         var right=this.Frame.ChartBorder.GetRight();
         var pixelRatio=GetDevicePixelRatio();
 
         var yMax=yLine, yMin=yLine;
-        for(var i=0;i<labInfo.AryLine.length;++i)
+        for(var i=0;i<this.LableInfo.AryLine.length;++i)
         {
-            var item=labInfo.AryLine[i];
+            var item=this.LableInfo.AryLine[i];
             if (!IFrameSplitOperator.IsNumber(item.Value)) continue;
             if (item.Width<0) continue;
 
@@ -62930,9 +62955,9 @@ function ChartDrawHLine()
             if (yMin>yFixed) yMin=yFixed;
         }
 
-        if (yMax!=yMin && labInfo.VLine)
+        if (yMax!=yMin && this.LableInfo.VLine)
         {
-            var item=labInfo.VLine;
+            var item=this.LableInfo.VLine;
             var x=left+20*pixelRatio;
             if (IFrameSplitOperator.IsNumber(item.XOffset)) x=left+item.XOffset*pixelRatio;
             x=ToFixedPoint(x);
@@ -62946,14 +62971,14 @@ function ChartDrawHLine()
         }
     }
 
-    this.DrawValueText=function(y, rtDraw, labInfo)
+    this.DrawValueText=function(y, rtDraw, option)
     {
         var left=this.Frame.ChartBorder.GetLeft();
         var right=this.Frame.ChartBorder.GetRight();
         var top=this.Frame.ChartBorder.GetTopEx();
         var bottom=this.Frame.ChartBorder.GetBottomEx();
         var pixelTatio = GetDevicePixelRatio();
-
+        var labInfo=this.LabelInfo;
         if (labInfo && IFrameSplitOperator.IsNumber(labInfo.TopOffset)) top-=labInfo.TopOffset;
         if (labInfo && IFrameSplitOperator.IsNumber(labInfo.BottomOffset)) bottom+=labInfo.BottomOffset;
 
@@ -62988,12 +63013,21 @@ function ChartDrawHLine()
         this.Canvas.font=this.Font;
         var textWidth=this.Canvas.measureText(strValue).width;
         var lineHeight=this.GetFontHeight();
-        var rtBG={ Left:right+this.RightSpaceWidth, Top:y- lineHeight/2, Width:textWidth+4, Height:lineHeight };
-        //rtBG.Right=rtBG.Left+rtBG.Width;
-        rtBG.Bottom=rtBG.Top+rtBG.Height;
+        var rtBG={ Left:right+this.RightSpaceWidth, YCenter:y, Width:textWidth, Height:lineHeight };
+        rtBG.Height+=(this.TextMargin.Top+this.TextMargin.Bottom);
         rtBG.Width+=(this.TextMargin.Left+this.TextMargin.Right);
         rtBG.Right=rtBG.Left+rtBG.Width;
-        var xText=rtBG.Left+this.TextMargin.Left+2;
+        rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        if (option && IFrameSplitOperator.IsNumber(option.Top))
+        {
+            rtBG.Top=option.Top;
+            rtBG.Bottom=rtBG.Top+rtBG.Height;
+        }
+        
+        var xText=rtBG.Left+this.TextMargin.Left;
+        var yText=rtBG.Top+this.TextMargin.Top+this.TextMargin.YOffset;
 
         if (this.ButtonPosition==1)
         {
@@ -63006,8 +63040,8 @@ function ChartDrawHLine()
 
         this.Canvas.fillStyle=this.ValueTextColor
         this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="middle";
-        this.Canvas.fillText(strValue,xText,y);
+        this.Canvas.textBaseline="top";
+        this.Canvas.fillText(strValue,xText,yText);
 
         rtDraw.Left=rtBG.Left;
         rtDraw.Top=rtBG.Top;
@@ -63017,6 +63051,24 @@ function ChartDrawHLine()
         this.DrawButton(rtBG.Top, rtBG.Right, lineHeight, rtDraw);
     }
 
+    //计算右侧价格标签大小
+    this.CalculateValueText=function(y)
+    {
+        var yValue=this.Frame.GetYData(y,false);
+        var strValue=yValue.toFixed(this.Precision);
+        if (this.LableInfo &&this.LableInfo.PriceSuffixText) strValue+=this.LableInfo.PriceSuffixText;
+
+        this.Canvas.font=this.Font;
+        var textWidth=this.Canvas.measureText(strValue).width;
+        var lineHeight=this.GetFontHeight();
+
+        var size={ Width:textWidth, Height:lineHeight };
+        size.Height+=(this.TextMargin.Top+this.TextMargin.Bottom);
+        size.Width+=(this.TextMargin.Left+this.TextMargin.Right);
+
+        return size;
+    }
+
     this.DrawPriceText=function(text, ptStart, ptEnd, position)
     {
         if (position!=1 && position!=0) return;
@@ -138614,7 +138666,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13753";
+var HQCHART_VERSION="1.1.13759";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.13753";
+var HQCHART_VERSION="1.1.13759";
 
 function PrintHQChartVersion()
 {