hqchart 1.1.14862 → 1.1.14870

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

@@ -18519,98 +18519,118 @@ function AverageWidthFrame()
                 this.DrawDayVertical(item, x, border);
             }
 
-            if (this.VerticalInfo[i].Message[0]!=null && this.ChartBorder.Bottom>5*pixelRatio)
+            if (item.Message[0]!=null && this.ChartBorder.Bottom>5*pixelRatio)
             {
-                if (this.VerticalInfo[i].Font) this.Canvas.font=this.VerticalInfo[i].Font;
-
-                var textLeft=0;
-                
-                this.Canvas.strokeStyle=item.TextColor;
-                var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;
-                var textHeight=this.Canvas.measureText("擎").width;
-                if (bottomTextExtend && bottomTextExtend.Align==1)
+                if (IFrameSplitOperator.IsObject(item.Message[0]))
                 {
-                    this.Canvas.textAlign="left";
-                    this.Canvas.textBaseline="top";
-                    textLeft=x;
+                    var textObj=item.Message[0];
+                    if (!textObj.Font) textObj.Font=item.Font;
+                    if (!textObj.TextColor) textObj.TextColor=item.TextColor;
+                    var drawInfo=this.GetMultiLineVTextSize(textObj);
+                    if (drawInfo)
+                    {
+                        drawInfo.XCenter=x;
+                        var rtBottom={ Left:0, Right:right, Top:bottom+2*pixelRatio, Bottom:border.Height };
+                        rtBottom.Width=rtBottom.Right-rtBottom.Left;
+                        rtBottom.Height=rtBottom.Bottom-rtBottom.Top;
+                        drawInfo.RectBottom=rtBottom;
+                        drawInfo.TextRightPrev=textRightPrev;
+                        this.DrawMultiLineVText(drawInfo);
+                        if (drawInfo.TextRight) textRightPrev=drawInfo.TextRight;
+                    }
                 }
                 else
                 {
-                    if (x<testWidth/2)
+                    if (item.Font) this.Canvas.font=item.Font;
+                    var textLeft=0;
+                    
+                    this.Canvas.strokeStyle=item.TextColor;
+                    var testWidth=this.Canvas.measureText(item.Message[0]).width;
+                    var textHeight=this.Canvas.measureText("擎").width;
+                    if (bottomTextExtend && bottomTextExtend.Align==1)
                     {
                         this.Canvas.textAlign="left";
                         this.Canvas.textBaseline="top";
                         textLeft=x;
                     }
-                    else if ((x + testWidth / 2) >= this.ChartBorder.GetChartWidth())
-                    {
-                        this.Canvas.textAlign = "right";
-                        this.Canvas.textBaseline="top";
-                        textLeft=x-testWidth;
-                    }
                     else
                     {
-                        this.Canvas.textAlign="center";
-                        this.Canvas.textBaseline="top";
-                        textLeft=x-(testWidth/2);
+                        if (x<testWidth/2)
+                        {
+                            this.Canvas.textAlign="left";
+                            this.Canvas.textBaseline="top";
+                            textLeft=x;
+                        }
+                        else if ((x + testWidth / 2) >= this.ChartBorder.GetChartWidth())
+                        {
+                            this.Canvas.textAlign = "right";
+                            this.Canvas.textBaseline="top";
+                            textLeft=x-testWidth;
+                        }
+                        else
+                        {
+                            this.Canvas.textAlign="center";
+                            this.Canvas.textBaseline="top";
+                            textLeft=x-(testWidth/2);
+                        }
                     }
-                }
                 
-                if (textRightPrev==null || textLeft>textRightPrev)
-                {
-                    var yText=bottom;
-                    if (item.LineType==3)
+                    if (textRightPrev==null || textLeft>textRightPrev)
                     {
-                        var lineLength=this.ShortXLineLength*pixelRatio;
-                        this.Canvas.beginPath();
-                        this.Canvas.moveTo(xFixed,yText);
-                        this.Canvas.lineTo(xFixed,yText+lineLength);
-                        this.Canvas.stroke();
+                        var yText=bottom;
+                        if (item.LineType==3)
+                        {
+                            var lineLength=this.ShortXLineLength*pixelRatio;
+                            this.Canvas.beginPath();
+                            this.Canvas.moveTo(xFixed,yText);
+                            this.Canvas.lineTo(xFixed,yText+lineLength);
+                            this.Canvas.stroke();
 
-                        yText+=lineLength+2*pixelRatio;
-                    }
+                            yText+=lineLength+2*pixelRatio;
+                        }
 
-                    if (bottomLineExtend)
-                    {
-                        if (bottomLineExtend.Mode===1)
+                        if (bottomLineExtend)
                         {
-                            if (item.Value>1)
+                            if (bottomLineExtend.Mode===1)
                             {
-                                if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
-                                this.Canvas.beginPath();
-                                this.Canvas.moveTo(xFixed,bottom);
-                                this.Canvas.lineTo(xFixed,border.ChartHeight);
-                                this.Canvas.stroke();
-                                x+=1;
+                                if (item.Value>1)
+                                {
+                                    if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
+                                    this.Canvas.beginPath();
+                                    this.Canvas.moveTo(xFixed,bottom);
+                                    this.Canvas.lineTo(xFixed,border.ChartHeight);
+                                    this.Canvas.stroke();
+                                    x+=1;
+                                }
                             }
-                        }
-                        else if (bottomLineExtend.Mode===2)
-                        {
-                            if (bottomLineExtend.Width>=1)
+                            else if (bottomLineExtend.Mode===2)
                             {
-                                var lineLength=bottomLineExtend.Width;
-                                if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
-                                this.Canvas.beginPath();
-                                this.Canvas.moveTo(xFixed,yText);
-                                this.Canvas.lineTo(xFixed,yText+lineLength);
-                                this.Canvas.stroke();
-        
-                                yText+=lineLength+2;
+                                if (bottomLineExtend.Width>=1)
+                                {
+                                    var lineLength=bottomLineExtend.Width;
+                                    if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
+                                    this.Canvas.beginPath();
+                                    this.Canvas.moveTo(xFixed,yText);
+                                    this.Canvas.lineTo(xFixed,yText+lineLength);
+                                    this.Canvas.stroke();
+            
+                                    yText+=lineLength+2;
+                                }
                             }
                         }
-                    }
 
-                    //item.TextBGColor="rgb(0,255,0)";
-                    if (item.TextBGColor)   //文字背景色
-                    {
-                        var rtText={ Left:textLeft, Top:yText+this.XBottomOffset, Width:testWidth, Height:textHeight };
-                        this.Canvas.fillStyle=item.TextBGColor;
-                        this.Canvas.fillRect(rtText.Left-1, rtText.Top, rtText.Width+2, rtText.Height);
-                    }
+                        //item.TextBGColor="rgb(0,255,0)";
+                        if (item.TextBGColor)   //文字背景色
+                        {
+                            var rtText={ Left:textLeft, Top:yText+this.XBottomOffset, Width:testWidth, Height:textHeight };
+                            this.Canvas.fillStyle=item.TextBGColor;
+                            this.Canvas.fillRect(rtText.Left-1, rtText.Top, rtText.Width+2, rtText.Height);
+                        }
 
-                    this.Canvas.fillStyle=item.TextColor;
-                    this.Canvas.fillText(this.VerticalInfo[i].Message[0],x,yText+this.XBottomOffset);
-                    textRightPrev=textLeft+testWidth;
+                        this.Canvas.fillStyle=item.TextColor;
+                        this.Canvas.fillText(this.VerticalInfo[i].Message[0],x,yText+this.XBottomOffset);
+                        textRightPrev=textLeft+testWidth;
+                    }
                 }
             }
 
@@ -18618,6 +18638,113 @@ function AverageWidthFrame()
         }
     }
 
+    //{Font:, AryText:[ { AryText:[{ Text:, Color: }], }, ] }
+    this.GetMultiLineVTextSize=function(obj)
+    {
+        if (obj.Font) this.Canvas.font=obj.Font;
+
+        var lineHeight=this.Canvas.measureText('擎').width;
+        var aryLine=[];
+        for(var i=0;i<obj.AryText.length;++i)
+        {
+            var item=obj.AryText[i];
+            var lineInfo={ Width:0, Height:lineHeight, AryText:[], Align:2, Margin:{ Top:1, Bottom:1 } , YOffset:-1 };
+            if (item.Margin)
+            {
+                if (IFrameSplitOperator.IsNumber(item.Margin.Top)) lineInfo.Margin.Top=item.Margin.Top;
+                if (IFrameSplitOperator.IsNumber(item.Margin.Bottom)) lineInfo.Margin.Bottom=item.Margin.Bottom;
+            }
+            if (IFrameSplitOperator.IsNumber(item.YOffset)) lineInfo.YOffset=item.YOffset;
+            if (IFrameSplitOperator.IsNumber(item.Align)) lineInfo.Align=item.Align;
+
+            lineInfo.Height=lineHeight+lineInfo.Margin.Top+lineInfo.Margin.Bottom;
+            
+            for(var j=0; j<item.AryText.length; ++j)
+            {
+                var subItem=item.AryText[j];
+                if (!subItem || !subItem.Text) continue;
+                var width=this.Canvas.measureText(subItem.Text).width;
+                var textItem={ Width: width, Text:subItem.Text, Color:obj.TextColor , Margin:{Left:0, Right:0 }};
+                if (subItem.Color) textItem.Color=subItem.Color;
+                if (subItem.Margin)
+                {
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Left)) textItem.Margin.Left=subItem.Margin.Left;
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Right)) textItem.Margin.Right=subItem.Margin.Right;
+                }
+                textItem.Width=width+textItem.Margin.Right+textItem.Margin.Left;
+
+                lineInfo.Width+=textItem.Width;
+                
+                lineInfo.AryText.push(textItem);
+            }
+
+            aryLine.push(lineInfo);
+        }
+
+        if (aryLine.length<=0) return null;
+
+        var width=0, height=0;
+        for(var i=0;i<aryLine.length;++i)
+        {
+            var item=aryLine[i];
+            if (width<item.Width) width=item.Width;
+            height+=item.Height;
+        }
+
+        if (width<=0 || height<=0) return null;
+
+        var drawInfo={ Width:width, Height:height, AryLine:aryLine, Align:2 };    //Align 1=left 2=center 3=right
+        if (IFrameSplitOperator.IsNumber(obj.Align)) drawInfo.Align=obj.Align;
+
+        return drawInfo;
+    }
+
+    //X轴底部文字多行输出
+    this.DrawMultiLineVText=function(drawInfo)
+    {
+        var xLeft=drawInfo.XCenter-drawInfo.Width/2;
+        if (drawInfo.Align==1) xLeft=drawInfo.XCenter;
+        if (drawInfo.TextRightPrev!=null && drawInfo.TextRightPrev>xLeft)
+            return false;
+
+        this.Canvas.font=drawInfo.Font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+        var yText=drawInfo.RectBottom.Top;
+        var textRight=null;
+        for(var i=0, j=0;i<drawInfo.AryLine.length;++i)
+        {
+            var lineItem=drawInfo.AryLine[i];
+            if (drawInfo.Align==1)
+            {
+                var xLeft=drawInfo.XCenter-drawInfo.Width/2;
+                if (lineItem.Align==1) xLeft=drawInfo.XCenter;
+                else if (lineItem.Align==2) xLeft=drawInfo.XCenter+drawInfo.Width-lineItem.Width;
+            }
+            else
+            {
+                var xLeft=drawInfo.XCenter-lineItem.Width/2;
+                if (lineItem.Align==1) xLeft=drawInfo.XCenter-drawInfo.Width/2;
+                else if (lineItem.Align==2) xLeft=drawInfo.XCenter+drawInfo.Width/2-lineItem.Width;
+            }
+
+            if (xLeft<1) xLeft=1;
+            yText+=lineItem.Height;
+            for(j=0;j<lineItem.AryText.length;++j)
+            {
+                var item=lineItem.AryText[j];    
+                this.Canvas.fillStyle=item.Color;
+                this.Canvas.fillText(item.Text,xLeft+item.Margin.Left,yText+lineItem.YOffset);   
+                xLeft+=item.Width;     
+            }
+
+            if (textRight==null || textRight<xLeft) textRight=xLeft;
+        }
+
+        drawInfo.TextRight=textRight;
+        return true;
+    }
+
     //Y坐标转y轴数值
     this.GetYData=function(y,isLimit)
     {
@@ -23912,7 +24039,7 @@ function OverlayKLineFrame()
 
                 var text=item.Message[1];
                 if (Array.isArray(item.Message[1])) text=item.Message[1][0];
-
+                this.Canvas.fillStyle=item.TextColor;
                 if (rightExtendText && rightExtendText.Align)
                 {
                     var textWidth=rightWidth;
@@ -23924,7 +24051,6 @@ function OverlayKLineFrame()
                 {
                     var xText=right+2;
                     if (rightLine && rightLine.Width>0) xText+=rightLine.Width;
-                    this.Canvas.fillStyle=item.TextColor;
                     this.Canvas.textAlign="left";
                     this.Canvas.fillText(text,xText,y);
                 }
@@ -68288,9 +68414,14 @@ function IChartDrawPicture()
                 pt.X=this.Frame.GetXFromIndex(item.XValue-data.DataOffset);
                 pt.Y=this.Frame.GetYFromData(item.YValue);
             }
+
+            if (Path2DHelper.PtInPoint(x,y,pt,radius)) 
+                return i;
+            /*
             this.Canvas.beginPath();
             this.Canvas.arc(pt.X,pt.Y,radius,0,360);
             if (this.Canvas.isPointInPath(x,y))  return i;
+            */
         }
 
         return -1;
@@ -68308,6 +68439,20 @@ function IChartDrawPicture()
         var pixel=GetDevicePixelRatio();
         lineWidth*=pixel;
         for(var i=0;i<this.LinePoint.length; ++i)
+        {
+            var item=this.LinePoint[i];
+            var ptStart=item.Start;
+            var ptEnd=item.End;
+
+            if (Path2DHelper.PtInLine(x, y, ptStart, ptEnd, lineWidth))
+            {
+                return i;
+            }
+        }
+        return -1;
+
+        /*
+        for(var i=0;i<this.LinePoint.length; ++i)
         {
             var item=this.LinePoint[i];
             var ptStart=item.Start;
@@ -68336,6 +68481,7 @@ function IChartDrawPicture()
         }
 
         return -1;
+        */
     }
 
     //0-10 鼠标对应的点索引   100=鼠标在正个图形上  -1 鼠标不在图形上
@@ -71029,6 +71175,18 @@ function ChartDrawPictureRect()
     //点是否在线段上 水平线段
     this.IsPointInLine=function(aryPoint,x,y,option)
     {
+        var lineWidth=5;
+        var pixel=GetDevicePixelRatio();
+        if (IFrameSplitOperator.IsPlusNumber(this.LineWidth) && this.LineWidth>lineWidth) lineWidth=this.LineWidth;
+        if (option && IFrameSplitOperator.IsNumber(option.Zoom)) lineWidth+=option.Zoom;
+        else if (this.Option && IFrameSplitOperator.IsNumber(this.Option.Zoom)) lineWidth+=this.Option.Zoom;
+        lineWidth*=pixel;
+        if (Path2DHelper.PtInLine(x,y,aryPoint[0], aryPoint[1], lineWidth))
+            return true;
+
+        return false;
+
+        /*
         var radius=5;
         if (option && IFrameSplitOperator.IsNumber(option.Zoom)) radius+=option.Zoom;
         else if (this.Option && IFrameSplitOperator.IsNumber(this.Option.Zoom)) radius+=this.Option.Zoom;
@@ -71043,11 +71201,14 @@ function ChartDrawPictureRect()
         this.Canvas.closePath();
         if (this.Canvas.isPointInPath(x,y))
             return true;
+        */
     }
 
     //垂直线段
     this.IsPointInLine2=function(aryPoint,x,y,option)
     {
+        return this.IsPointInLine(aryPoint,x,y,option);
+        /*
         var radius=5;
         if (option && IFrameSplitOperator.IsNumber(option.Zoom)) radius+=option.Zoom;
         else if (this.Option && IFrameSplitOperator.IsNumber(this.Option.Zoom)) radius+=this.Option.Zoom;
@@ -71062,6 +71223,7 @@ function ChartDrawPictureRect()
         this.Canvas.closePath();
         if (this.Canvas.isPointInPath(x,y))
             return true;
+        */
     }
 }
 
@@ -107100,6 +107262,117 @@ function GetLocalTime(i)    //得到标准时区的时间的函数
     return new Date(utcTime + 3600000 * i);
 }
 
+//图形路径方法
+function Path2DHelper() { }
+const PI2 = Math.PI * 2;
+
+//点是否在线段上
+Path2DHelper.PtInLine=function(x, y, pt, pt2, lineWidth)
+{
+    if (lineWidth<=0) return false;
+
+    var x0=pt.X, y0=pt.Y;
+    var x1=pt2.X, y1=pt2.Y;
+
+    const _l = lineWidth;
+    let _a = 0;
+    let _b = x0;
+
+    // Quick reject
+    if (
+        (y > y0 + _l && y > y1 + _l)
+        || (y < y0 - _l && y < y1 - _l)
+        || (x > x0 + _l && x > x1 + _l)
+        || (x < x0 - _l && x < x1 - _l)
+    ) 
+    {
+        return false;
+    }
+
+    if (x0 !== x1) 
+        {
+        _a = (y0 - y1) / (x0 - x1);
+        _b = (x0 * y1 - x1 * y0) / (x0 - x1);
+    }
+    else 
+    {
+        return Math.abs(x - x0) <= _l / 2;
+    }
+
+    const tmp = _a * x - y + _b;
+    const _s = tmp * tmp / (_a * _a + 1);
+    return _s <= _l / 2 * _l / 2;
+}
+
+//点是否在圆点上
+Path2DHelper.PtInPoint=function(x,y, ptCenter, radius)
+{
+    if (radius<=0) return false;
+
+    var cx=ptCenter.X;
+    var cy=ptCenter.Y;
+
+    x -= cx;
+    y -= cy;
+    const d = Math.sqrt(x * x + y * y); //到圆心的距离
+
+    if (d>radius) return false;
+
+    return true;
+}
+
+Path2DHelper.PtInArc=function(x, y, ptCenter, radius, startAngle, endAngle,lineWidth, anticlockwise)
+{
+    if (lineWidth<=0) return false;
+
+    const _l = lineWidth;
+    var cx=ptCenter.X;
+    var cy=ptCenter.Y;
+
+    x -= cx;
+    y -= cy;
+    const d = Math.sqrt(x * x + y * y);
+
+    if ((d - _l > r) || (d + _l < r)) 
+        return false;
+    
+    // TODO
+    if (Math.abs(startAngle - endAngle) % PI2 < 1e-4) 
+    {
+        // Is a circle
+        return true;
+    }
+
+    if (anticlockwise) 
+    {
+        const tmp = startAngle;
+        startAngle = Path2DHelper.FormatRadian(endAngle);
+        endAngle = Path2DHelper.FormatRadian(tmp);
+    }
+    else 
+    {
+        startAngle = Path2DHelper.FormatRadian(startAngle);
+        endAngle = Path2DHelper.FormatRadian(endAngle);
+    }
+
+    if (startAngle > endAngle) 
+        endAngle += PI2;
+    
+    var angle = Math.atan2(y, x);
+    if (angle < 0) 
+        angle += PI2;
+    
+    return (angle >= startAngle && angle <= endAngle) || (angle + PI2 >= startAngle && angle + PI2 <= endAngle);
+}
+
+//统一弧度方向
+Path2DHelper.FormatRadian=function(angle)
+{
+    angle%= PI2;
+    if (angle<0) angle += PI2;
+    return angle;
+}
+
 
 
 
@@ -132342,7 +132615,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                         var config=draw.Config;
                         if (IFrameSplitOperator.IsString(config.LineWidth)) outVarItem.LineWidth=config.LineWidth;
                         if (IFrameSplitOperator.IsNumber(config.LineType)) drawItem.DrawData.LineType=config.LineType;
-                        if (config.Color) outVarItem.Color=config.color;
+                        if (config.Color) outVarItem.Color=config.Color;
                     }
 
                     result.push(outVarItem);
@@ -150322,7 +150595,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14861";
+var HQCHART_VERSION="1.1.14869";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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