hqchart 1.1.14864 → 1.1.14874

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

@@ -7902,6 +7902,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DestroyPopMenu();
 
+        if (this.DestroyPopMinuteChart) this.DestroyPopMinuteChart();
+
         this.StopLatestPointFlash();
 
         document.oncontextmenu=null;
@@ -18655,6 +18657,7 @@ function AverageWidthFrame()
                 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;
             
@@ -18692,13 +18695,17 @@ function AverageWidthFrame()
 
         if (width<=0 || height<=0) return null;
 
-        return { Width:width, Height:height, AryLine:aryLine, Align:2 };    //Align 1=left 2=center 3=right
+        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;
 
@@ -18710,8 +18717,19 @@ function AverageWidthFrame()
         for(var i=0, j=0;i<drawInfo.AryLine.length;++i)
         {
             var lineItem=drawInfo.AryLine[i];
-            if (lineItem.Align==2)
-            var xLeft=drawInfo.XCenter-lineItem.Width/2;
+            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)
@@ -24023,7 +24041,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;
@@ -24035,7 +24053,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);
                 }
@@ -37866,6 +37883,7 @@ function ChartKLineTable()
 
     this.TextFont;
     this.TextColor='rgb(0,0,0)';
+    this.Style=0;   //0=全部窗口模式  1=顶部指定行数  2=底部指定行数；
 
     this.AryTableData=[];
     this.MapCache=null; //key=date/date-time  value={ Date:, Time:, Data:[ ] }
@@ -37891,9 +37909,15 @@ function ChartKLineTable()
     {
         if (!this.BGColor) return;
 
-        if (this.BGColor)
+        this.Canvas.fillStyle=this.BGColor;
+        if ((this.Style===1 || this.Style===2) && this.RowHeightType==1)
+        {
+            var height=this.RowCount*this.RowHeight;
+            height=Math.min(rtBG.Height,height);
+            this.Canvas.fillRect(rtBG.Left+1, rtBG.Top, rtBG.Width-2, height);
+        }
+        else
         {
-            this.Canvas.fillStyle=this.BGColor;
             this.Canvas.fillRect(rtBG.Left+1, rtBG.Top, rtBG.Width-1, rtBG.Height);
         }
     }
@@ -37902,8 +37926,11 @@ function ChartKLineTable()
     {
         if (!this.BorderColor) return;
 
+        var lineCount=30;
+        if (this.Style===1 || this.Style===2) lineCount=this.RowCount+1;
+
         var yLine=rtBG.Top;
-        for(var i=0;i<30;++i)
+        for(var i=0;i<lineCount;++i)
         {
             this.Canvas.beginPath();
             this.Canvas.moveTo(rtBG.Left,ToFixedPoint(yLine));
@@ -37953,12 +37980,29 @@ function ChartKLineTable()
         var bottom=border.Bottom;
 
         //绘制背景
-        var rtBG={ Left:border.LeftEx, Top:top, Right:border.RightEx, Bottom:bottom };
-        rtBG.Width=rtBG.Right-rtBG.Left;
-        rtBG.Height=rtBG.Bottom-rtBG.Top;
-        this.DrawBG(rtBG);
-
+        if (this.Style===1)
+        {
+            var rtBG={ Left:border.LeftEx, Top:border.TopTitle, Right:border.RightEx, Bottom:border.TopEx };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+        }
+        else if (this.Style===2)
+        {
+            var rtBG={ Left:border.LeftEx, Top:border.BottomEx, Right:border.RightEx, Bottom:border.Bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            top=rtBG.Top;
+        }
+        else
+        {
+            var rtBG={ Left:border.LeftEx, Top:top, Right:border.RightEx, Bottom:bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+        }
+        
         this.CalculateRowHeight(rtBG);
+
+        this.DrawBG(rtBG);
         
         var itemHeight=this.RowHeight;
         var itemWidth=dataWidth+distanceWidth;
@@ -37991,7 +38035,7 @@ function ChartKLineTable()
             if (!bDrawName) this.DrawRow(mapItem, top, bottom, left, right);    //绘制一列
         }
 
-        if (this.RowNamePosition==3) this.DrawRightRowName();
+        if (this.RowNamePosition==3) this.DrawRightRowName(rtBG);
 
         this.DrawBorder(rtBG);
     }
@@ -38038,20 +38082,51 @@ function ChartKLineTable()
     }
 
     //绘制右侧行名
-    this.DrawRightRowName=function()
+    this.DrawRightRowName=function(rtBG)
     {
         var border=this.ChartFrame.GetBorder();
 
         if (this.BGColor)
         {
-            var rtRightBG={Left:border.RightEx, Top:border.Top, Right:border.ChartWidth, Bottom:border.Bottom };
-            rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
-            rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
-            this.Canvas.fillStyle=this.BGColor;
-            this.Canvas.fillRect(rtRightBG.Left+1, rtRightBG.Top, rtRightBG.Width-1, rtRightBG.Height);
+            if (this.Style===1)
+            {
+                var height=this.RowCount*this.RowHeight;
+                height=Math.min(rtBG.Height,height);
+                var width=border.ChartWidth-rtBG.Right-2;
+                var maxTextWidth=0;
+                for(var i=0;i<this.RowName.length;++i)
+                {
+                    var item=this.RowName[i];
+                    if (!item || !item.Name) continue;
+
+                    var textWidth=this.Canvas.measureText(item.Name).width;
+                    if (textWidth>maxTextWidth) maxTextWidth=textWidth;
+                }
+                if (maxTextWidth>0)
+                {
+                    maxTextWidth+=4;
+                    width=Math.min(width, maxTextWidth);
+                }
+
+                var rtRightBG={Left:rtBG.Right+1, Top:rtBG.Top+1, Width:width, Height:height };
+                rtRightBG.Right=rtRightBG.Left+rtRightBG.Width;
+                rtRightBG.Bottom=rtRightBG.Top+rtRightBG.Height;
+                
+
+                this.Canvas.fillStyle=this.BGColor;
+                this.Canvas.fillRect(rtRightBG.Left, rtRightBG.Top, rtRightBG.Width, rtRightBG.Height);
+            }
+            else
+            {
+                var rtRightBG={Left:border.RightEx, Top:border.Top, Right:border.ChartWidth, Bottom:border.Bottom };
+                rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
+                rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
+                this.Canvas.fillStyle=this.BGColor;
+                this.Canvas.fillRect(rtRightBG.Left+1, rtRightBG.Top, rtRightBG.Width-2, rtRightBG.Height);
+            }
         }
         
-        var x=border.RightEx, y=border.TopTitle;
+        var x=rtBG.Right, y=rtBG.Top;
         var yOffset=3;
         if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
         for(var i=0;i<this.RowName.length;++i)
@@ -68399,9 +68474,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;
@@ -68419,6 +68499,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;
@@ -68447,6 +68541,7 @@ function IChartDrawPicture()
         }
 
         return -1;
+        */
     }
 
     //0-10 鼠标对应的点索引   100=鼠标在正个图形上  -1 鼠标不在图形上
@@ -71140,6 +71235,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;
@@ -71154,11 +71261,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;
@@ -71173,6 +71283,7 @@ function ChartDrawPictureRect()
         this.Canvas.closePath();
         if (this.Canvas.isPointInPath(x,y))
             return true;
+        */
     }
 }
 
@@ -84817,6 +84928,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.PopMinuteChart=null;
     }
 
+    this.ClosePopMinuteChart=function()
+    {
+        if (!this.PopMinuteChart) return;
+
+        this.PopMinuteChart.Close();
+    }
+
     this.ShowMinuteChartDialog=function(data, x,y)
     {
         if (!this.PopMinuteChart) return;
@@ -87405,6 +87523,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     //周期切换
     this.ChangePeriod=function(period,option)
     {
+        this.ClosePopMinuteChart();
+
         var oldData={ Period:this.Period, Right:this.Right, KLineDrawType:this.KLineDrawType, Symbol:this.Symbol};
 
         var isChangeKLineDrawType=false;
@@ -88963,6 +89083,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ClearIndexRunCount();
         this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
+        this.ClosePopMinuteChart();
         
         
         this.Symbol=symbol;
@@ -107211,6 +107332,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;
+}
+
 
 
 
@@ -130301,6 +130533,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.BASELINE_BAR:
                         this.CreateBaseLineBar(hqChart,windowIndex,item,i);
                         break;
+                    case SCRIPT_CHART_NAME.KLINE_TABLE:
+                        this.CreateKLineTable(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAWCOLORKLINE":
                         this.CreateDrawColorKLine(hqChart,windowIndex,item,i);
                         break;
@@ -131110,6 +131345,7 @@ function OverlayScriptIndex(name,script,args,option)
         }
 
         chart.BuildCacheData();
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -131140,6 +131376,61 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateKLineTable=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartKLineTable();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.HQChart=hqChart;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryTableData=varItem.Draw.DrawData;
+        if (IFrameSplitOperator.IsNumber(varItem.Draw.RowCount)) chart.RowCount=varItem.Draw.RowCount;
+        if (IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName)) chart.RowName=varItem.Draw.RowName;
+
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.BGColor) chart.BGColor=config.BGColor;
+            if (config.TextColor) chart.TextColor=config.TextColor;
+            if (config.BorderColor) chart.BorderColor=config.BorderColor;
+            if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
+            if (IFrameSplitOperator.IsNumber(config.RowHeightType)) chart.RowHeightType=config.RowHeightType;
+            if (IFrameSplitOperator.IsNumber(config.Style)) chart.Style=config.Style;
+
+            if (config.ItemMergin)
+            {
+                var subItem=config.ItemMergin;
+                if (IFrameSplitOperator.IsNumber(subItem.Left)) chart.ItemMergin.Left=subItem.Left;
+                if (IFrameSplitOperator.IsNumber(subItem.Top)) chart.ItemMergin.Top=subItem.Top;
+                if (IFrameSplitOperator.IsNumber(subItem.Bottom)) chart.ItemMergin.Bottom=subItem.Bottom;
+                if (IFrameSplitOperator.IsNumber(subItem.Right)) chart.ItemMergin.Right=subItem.Right;
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) chart.ItemMergin.YOffset=subItem.YOffset;
+            }
+           
+            if (config.TextFont)
+            {
+                var subItem=config.TextFont;
+                if (IFrameSplitOperator.IsNumber(subItem.FontMaxSize)) chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;
+                if (subItem.Family) chart.TextFontConfig.Family=subItem.Family;
+            }
+        }
+        
+        chart.BuildCacheData();
+        frame.ChartPaint.push(chart);
+
+        var titleIndex=windowIndex+1;
+        var titlePaint=hqChart.TitlePaint[titleIndex];
+        var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);
+        titleData.DataType="ChartKLineTable";
+        titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
+    }
+
 
     //创建通道
     this.CreateChannel=function(hqChart,windowIndex,varItem,id)
@@ -150433,7 +150724,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14863";
+var HQCHART_VERSION="1.1.14873";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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