hqchart 1.1.15091 → 1.1.15104

package/src/jscommon/umychart.js

@@ -2896,6 +2896,8 @@ var JSCHART_EVENT_ID=
     ON_FORMAT_TVLONGPOSITION_LABEL:176,
 
     ON_FORMAT_COUNTDOWN_TEXT:177,       //倒计时
+    ON_CLICK_INDEX_LOCK:178,            //点击指标锁
+    ON_CORSSCURSOR_STATUS_CHANGE:179,   //十字光标状态改变
 }
 
 var JSCHART_OPERATOR_ID=
@@ -3133,6 +3135,18 @@ var JSCHART_TRADE_STATUS_ID=
     SUSP_ID:1,                 //停牌
 }
 
+//十字光标状态
+var JSCHART_CORSSCURSOR_STATUS_ID=
+{
+    NONE_ID:0,
+    LINE_ID:1,
+    LEFT_TEXT_ID:2,
+    LEFT_INTER_TEXT_ID:4,
+    RIGHT_TEXT_ID:8,
+    RIGHT_INTER_TEXT_ID:16,
+    BOTTOM_TEXT_ID:32,
+}
+
 
 function PhoneDBClick()
 {
@@ -3349,6 +3363,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         //锁十字光标
         LockCorssCursor:{ X:{ Enable:false } },
 
+        CorssCursorStatus:{ Value:null },    //十字光标状态 只读
+
         //图形中的单元选中状态
         MapIndexChartCache:new Map(),      //key 指标GUID
 
@@ -3515,6 +3531,29 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.BuySellData.ArySell=null;
     }
 
+    this.UpdateCorssCursorStatus=function()
+    {
+        if (!this.ChartCorssCursor) return false;
+        if (!this.GlobalOption || !this.GlobalOption.CorssCursorStatus) return false;
+        
+        var status=this.ChartCorssCursor.Status;
+       
+        //状态改变了
+        if (this.GlobalOption.CorssCursorStatus.Value!=status)
+        {
+            this.GlobalOption.CorssCursorStatus.Value=status;
+
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CORSSCURSOR_STATUS_CHANGE);
+            if (event && event.Callback)
+            {
+                var sendData={ Status:status, IsShowLine:(status&JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID)>0 };
+                event.Callback(event, sendData, this);
+            }
+        }
+
+        return true;
+    }
+
     this.InitalPopMenu=function()   //初始化弹出窗口
     {
         if (this.JSPopMenu) return;
@@ -6482,6 +6521,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ClearCoordinateText();
             this.Frame.Draw( { IsEnableSplash:this.ChartSplashPaint.IsEnableSplash} );
             this.ChartSplashPaint.Draw();
+            this.UpdateCorssCursorStatus();
             return;
         }
 
@@ -6774,6 +6814,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         ++this.TouchDrawCount;
+
+        this.UpdateCorssCursorStatus();
     }
 
     this.DrawExtendChartPaint=function(level, option)
@@ -7253,39 +7295,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             exChartOption.Tooltip=option.Tooltip;
             exChartOption.Point=option.Point;
         }
-        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25,exChartOption);
-        /*
-        for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形   在动态标题以后画
-        {
-            var item=this.ExtendChartPaint[i];
-            if (item.IsCallbackDraw) continue;
-            if (item.DrawAfterPicture) continue;
-            if (item.ClassName=='KLineTooltipPaint' && option)
-            {
-                if (option.Tooltip==false) continue;
-                if (option.Point) item.LatestPoint=option.Point;
-            }
-            else if (item.ClassName=="MinuteTooltipPaint" && option)
-            {
-                if (option.Point) item.LatestPoint=option.Point;
-            }
-
-            if (item.IsDynamic && item.DrawAfterTitle===true) item.Draw(moveonPoint, this.LastMouseStatus);
-        }
-        */
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25,exChartOption);
+       
         if (this.EnableAnimation) this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_30);
-        /*
-        if (this.EnableAnimation)
-        {
-            for(var i=0;i<this.ExtendChartPaint.length;++i) //动画
-            {
-                var item=this.ExtendChartPaint[i];
-                if (item.IsAnimation===true) item.Draw();
-            }
-        }
-        */
-
+       
         for(var i=0;i<this.ChartDrawPicture.length;++i)
         {
             var item=this.ChartDrawPicture[i];
@@ -7311,15 +7325,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50);
-        /*
-        for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
-        {
-            var item=this.ExtendChartPaint[i];
-            if (item.DrawAfterPicture) 
-                item.Draw();
-        }
-        */
-
+       
         if (this.LastMouseStatus.MouseOnToolbar)    //工具栏按钮提示信息
         {
             var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
@@ -7331,6 +7337,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (bDrawDialogTooltip) this.DrawTooltipDialog();
 
         ++this.TouchDrawCount;
+
+        this.UpdateCorssCursorStatus();
     }
 
     this.DrawAnimation=function()   //绘制动画 如弹幕
@@ -47786,7 +47794,6 @@ function ChartLock()
     delete this.newMethod;
 
     this.ClassName="ChartLock";
-    this.WidthDiv = 0.2;  // 框子宽度占比
     this.LockCount = 20; // 锁最新的几个数据
     this.BGColor = g_JSChartResource.IndexLock.BGColor;
     this.TextColor = g_JSChartResource.IndexLock.TextColor;
@@ -47797,7 +47804,6 @@ function ChartLock()
     this.Callback;      //回调
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
-    this.MinWidth=null;  //最小宽度
 
 
     this.CalculateTextSize=function(aryText, defaultFont, out)
@@ -47840,70 +47846,78 @@ function ChartLock()
         return true;
     }
 
-    this.Draw=function(isDraw)
+    this.Draw=function(bDraw)
     {
         this.LockRect=null;
+        if (!bDraw) return;
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
             return;
         }
 
-        if (this.ChartFrame.IsHScreen===true)
+        var bHScreen=this.ChartFrame.IsHScreen;
+        var bMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var border=this.ChartFrame.GetBorder();
+        if (bHScreen)
         {
-            this.HScreenDraw(isDraw);
-            return;
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
         }
 
-        var xOffset = this.ChartBorder.GetRight();
-        var border=this.ChartBorder.GetBorder();
-        var lOffsetWidth = 0;
-        if (this.ChartFrame.Data != null)
+        var kData=this.ChartFrame.Data;
+        var left=xOffset;
+        if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
         {
-            var dataWidth=this.ChartFrame.DataWidth;
-            var distanceWidth=this.ChartFrame.DistanceWidth;
-            xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
-            var chartright=this.ChartBorder.GetRight();
-            var xPointCount=this.ChartFrame.XPointCount;
-            for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+            for(var i=kData.DataOffset,j=0;i<kData.Data.length-this.LockCount && j<xPointCount-this.LockCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
             {
-                var data=this.ChartFrame.Data.Data[i];
-                if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+                var kItem=kData.Data[i];
+                if (kItem.Open==null || kItem.High==null || kItem.Low==null || kItem.Close==null) continue;
 
-                var left=xOffset;
-                var right=xOffset+dataWidth;
-                if (right>chartright) break;
+                if (bMinute)
+                {
+                    left=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    left=xOffset;
+                    var right=xOffset+dataWidth;
+                    if (right>chartright) break;
+                }
             }
-            lOffsetWidth = (dataWidth + distanceWidth) * this.LockCount;    
         }
-        if (lOffsetWidth == 0)
+
+        if (bHScreen)
         {
-            lOffsetWidth = (xOffset - this.ChartBorder.GetLeft()) * this.WidthDiv;
-        }
-        var lLeft = xOffset - lOffsetWidth;
-        if (lLeft < this.ChartBorder.GetLeft())
-            lLeft = this.ChartBorder.GetLeft();
-        var lWidth = this.ChartBorder.GetRight() - lLeft;
+            var rtBG={ Left:border.Left, Right:border.RightEx, Top:left, Bottom:border.Bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
 
-        if (this.MinWidth>10 && lWidth<this.MinWidth) 
+            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Right, rtBG.Top);
+            this.Canvas.fillStyle =bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+            this.LockRect=rtBG;    //保存上锁区域
+        }
+        else
         {
-            lWidth=this.MinWidth;
-            lLeft=this.ChartBorder.GetRight()-lWidth;
-            if (lLeft < this.ChartBorder.GetLeft()) lLeft = this.ChartBorder.GetLeft();
+            var rtBG={ Left:left, Right:border.RightEx, Top:border.TopTitle, Bottom:border.Bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            //上下渐变
+            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
+            this.Canvas.fillStyle =bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+            this.LockRect=rtBG;    //保存上锁区域
         }
 
-        var rtBG={ Left:lLeft, Top:border.TopTitle, Bottom:border.Bottom, Width:lWidth };
-        rtBG.Right=rtBG.Width+rtBG.Left;
-        rtBG.Height=rtBG.Bottom-rtBG.Top;
-        this.LockRect=rtBG;    //保存上锁区域
-
-        if (!isDraw) return;
-        
-        //上下渐变
-        var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
-        this.Canvas.fillStyle =bgColor;
-        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
-
         var aryText=null;
         if (Array.isArray(this.Title)) aryText=this.Title;
         else aryText=[{Text:this.Title}];
@@ -47911,85 +47925,57 @@ function ChartLock()
         var outSize={ };
         if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
 
-        var left=rtBG.Left+(rtBG.Width-outSize.Width)/2;
-        if (outSize.Width>rtBG.Width) left=rtBG.Right-outSize.Width;
-        var top=rtBG.Top+(rtBG.Height-outSize.Height)/2;
-
         this.Canvas.textAlign='left';
         this.Canvas.textBaseline='bottom';
         this.Canvas.font = this.Font;
-        var yText=top;
-        for(var i=0;i<outSize.AryText.length;++i)
+
+        if (bHScreen)
         {
-            var item=outSize.AryText[i];
-            if (item.Color)  this.Canvas.fillStyle=item.Color;
-            else this.Canvas.fillStyle=this.TextColor;
+            var top=rtBG.Top+(rtBG.Height-outSize.Width)/2;
+            if (outSize.Width>rtBG.Height) top=rtBG.Bottom-outSize.Width;
+            var left=rtBG.Left+(rtBG.Width-outSize.Height)/2;
 
-            yText+=item.Height;
-            this.Canvas.fillText(item.Text, left, yText+item.YOffset);
-        } 
-    }
+            this.Canvas.save(); 
+            this.Canvas.translate(left, top);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            var yText=0,xText=0;
+            for(var i=0;i<outSize.AryText.length;++i)
+            {
+                var item=outSize.AryText[i];
+                if (item.Color)  this.Canvas.fillStyle=item.Color;
+                else this.Canvas.fillStyle=this.TextColor;
 
-    this.HScreenDraw=function(isDraw)
-    {
-        var xOffset = this.ChartBorder.GetBottom();
+                yText+=item.Height;
+                this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+            } 
 
-        var lOffsetWidth = 0;
-        if (this.ChartFrame.Data != null)
+            this.Canvas.restore();
+        }
+        else
         {
-            var dataWidth=this.ChartFrame.DataWidth;
-            var distanceWidth=this.ChartFrame.DistanceWidth;
-            xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
-            var chartright=this.ChartBorder.GetBottom();
-            var xPointCount=this.ChartFrame.XPointCount;
-            //求最后1个数据的位置
-            for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+            var left=rtBG.Left+(rtBG.Width-outSize.Width)/2;
+            if (outSize.Width>rtBG.Width) left=rtBG.Right-outSize.Width;
+            var top=rtBG.Top+(rtBG.Height-outSize.Height)/2;
+            
+            var yText=top, xText=left;
+            for(var i=0;i<outSize.AryText.length;++i)
             {
-                var data=this.ChartFrame.Data.Data[i];
-                if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+                var item=outSize.AryText[i];
+                if (item.Color)  this.Canvas.fillStyle=item.Color;
+                else this.Canvas.fillStyle=this.TextColor;
 
-                var left=xOffset;
-                var right=xOffset+dataWidth;
-                if (right>chartright) break;
-            }
-            lOffsetWidth = (dataWidth + distanceWidth) * this.LockCount;    
-        }
-        if (lOffsetWidth == 0)
-        {
-            lOffsetWidth = (xOffset - this.ChartBorder.GetTop()) * this.WidthDiv;
+                yText+=item.Height;
+                this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+            } 
         }
-
-        var lLeft = xOffset - lOffsetWidth;
-        if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
-        var lHeight =  this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
-        var lWidth = this.ChartBorder.GetBottom() - lLeft;
-
-        this.Canvas.fillStyle = this.BGColor;
-        this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
-
-        var xCenter = this.ChartBorder.GetLeft() + lHeight / 2;
-        var yCenter = lLeft + lWidth / 2;
-        this.Canvas.save(); 
-        this.Canvas.translate(xCenter, yCenter);
-        this.Canvas.rotate(90 * Math.PI / 180);
-        this.Canvas.textAlign = 'center';
-        this.Canvas.textBaseline = 'middle';
-        this.Canvas.fillStyle = this.TextColor;
-        this.Canvas.font = this.Font;
-        this.Canvas.fillText(this.Title, 0, 0);
-        this.Canvas.restore();
-
-        this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth};    //保存上锁区域
     }
 
     //x,y是否在上锁区域
     this.GetTooltipData=function(x,y,tooltip)
     {
-        if (this.LockRect==null) return false;
+        if (!this.LockRect) return false;
 
-        this.Canvas.beginPath();
-        this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Height);
-        if (this.Canvas.isPointInPath(x,y))
+        if (Path2DHelper.PtInRect(x,y,this.LockRect))
         {
             tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
             tooltip.ChartPaint=this;
@@ -58244,7 +58230,7 @@ function ChartCorssCursor()
 
     this.Draw=function()
     {
-        this.Status=0;
+        this.Status=JSCHART_CORSSCURSOR_STATUS_ID.NONE_ID;
         this.RightButton.Rect=null;
         this.BottomButton.Rect=null;
         this.LastValue=null;
@@ -58391,6 +58377,7 @@ function ChartCorssCursor()
                 }
             }
             
+            this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
             this.Canvas.stroke();
             this.Canvas.restore();
 
@@ -58447,6 +58434,7 @@ function ChartCorssCursor()
                     rtBG.Right=rtBG.Left+rtBG.Width;
                 }
                 
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
             }
             else if (this.ShowTextMode.Left==2) //在框架内显示
             {
@@ -58454,6 +58442,8 @@ function ChartCorssCursor()
                 rtBG.Right=rtBG.Left+rtBG.Width;
                 rtBG.Top=rtBG.YCenter-rtBG.Height/2;
                 rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_INTER_TEXT_ID;
             }
 
             if (rtBG)
@@ -58463,6 +58453,7 @@ function ChartCorssCursor()
                 this.Canvas.textBaseline="bottom";
                 this.Canvas.fillStyle=this.TextColor;
                 this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
+                
             }
 
             var complexText=
@@ -58584,6 +58575,8 @@ function ChartCorssCursor()
                     this.DrawComplexRightText(rtBG,complexText,textSize);
 
                     if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
+
+                    this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_TEXT_ID;
                 }
             }
             else if (this.ShowTextMode.Right==2)    //框架内侧显示
@@ -58597,6 +58590,8 @@ function ChartCorssCursor()
                 this.DrawComplexRightText(rtBG,complexText,textSize);
 
                 if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_INTER_TEXT_ID;
             }
         }
 
@@ -58662,6 +58657,8 @@ function ChartCorssCursor()
                 if (this.StringFormatX.KItem) buttonData.KItem=this.StringFormatX.KItem;
                 this.BottomButton.Rect=rtBG;
                 this.BottomButton.Data=buttonData;
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.BOTTOM_TEXT_ID;
             }
         }
 
@@ -58710,8 +58707,6 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
             }
         }
-
-        this.Status=1;
     }
 
     this.DrawComplexRightText=function(rtBG, complexText, size)
@@ -58999,6 +58994,7 @@ function ChartCorssCursor()
 
     this.HScreenDraw=function()
     {
+        this.Status=JSCHART_CORSSCURSOR_STATUS_ID.NONE_ID;
         var x=this.LastPoint.X;
         var y=this.LastPoint.Y;
 
@@ -59092,6 +59088,8 @@ function ChartCorssCursor()
                 }
             }
 
+            this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
+
             this.Canvas.stroke();
             this.Canvas.restore();
 
@@ -59152,6 +59150,8 @@ function ChartCorssCursor()
                 }
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
             }
             else if (this.ShowTextMode.Left==2)
             {
@@ -59169,6 +59169,8 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,2,0,textWidth);
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_INTER_TEXT_ID;
             }
 
             if (this.StringFormatY.RText) 
@@ -59239,6 +59241,8 @@ function ChartCorssCursor()
                 }
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_TEXT_ID;
             }
             else if (this.ShowTextMode.Right==2)
             {
@@ -59256,6 +59260,8 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,-2,0,textWidth);
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_INTER_TEXT_ID;
             }
         }
 
@@ -59329,10 +59335,10 @@ function ChartCorssCursor()
 
                     this.Canvas.restore();
                 }
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.BOTTOM_TEXT_ID;
             }
         }
-
-        this.Status=1;
     }
 
     //data={ e:e, PreventDefault:false, KeyID, Draw:是否需要重绘 }
@@ -59404,6 +59410,7 @@ function ChartCorssCursor()
 }
 
 
+
 ////////////////////////////////////////////////////////////////////////////////
 //深度图十字光标
 function DepthChartCorssCursor()
@@ -86589,6 +86596,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             if (!item.Frame.LockPaint.GetTooltipData(x,y,tooltip)) continue;
 
             tooltip.HQChart=this;
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
+            if (event && event.Callback) 
+            {
+                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
+                event.Callback(event,sendData,this);
+            }
+
             if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
             return true;
         }