hqchart 1.1.15091 → 1.1.15106

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -6758,12 +6758,6 @@ JSChart.RegisterScriptIndexChart=function(name, option)
     return g_ScriptIndexChartFactory.Add(name, option);
 }
 
-//注册设置对话框类
-//option:{ Create:创建类方法 }
-JSChart.RegisterDialogClass=function(name, option)
-{
-    return g_DialogFactory.Add(name, option);
-}
 
 //注册框架类
 JSChart.RegisterChartFrameClass=function(name, option)
@@ -7036,6 +7030,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=
@@ -7273,6 +7269,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()
 {
@@ -7489,6 +7497,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         //锁十字光标
         LockCorssCursor:{ X:{ Enable:false } },
 
+        CorssCursorStatus:{ Value:null },    //十字光标状态 只读
+
         //图形中的单元选中状态
         MapIndexChartCache:new Map(),      //key 指标GUID
 
@@ -7655,6 +7665,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;
@@ -10622,6 +10655,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ClearCoordinateText();
             this.Frame.Draw( { IsEnableSplash:this.ChartSplashPaint.IsEnableSplash} );
             this.ChartSplashPaint.Draw();
+            this.UpdateCorssCursorStatus();
             return;
         }
 
@@ -10914,6 +10948,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         ++this.TouchDrawCount;
+
+        this.UpdateCorssCursorStatus();
     }
 
     this.DrawExtendChartPaint=function(level, option)
@@ -11393,39 +11429,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];
@@ -11451,15 +11459,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;
@@ -11471,6 +11471,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (bDrawDialogTooltip) this.DrawTooltipDialog();
 
         ++this.TouchDrawCount;
+
+        this.UpdateCorssCursorStatus();
     }
 
     this.DrawAnimation=function()   //绘制动画 如弹幕
@@ -51926,7 +51928,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;
@@ -51937,7 +51938,6 @@ function ChartLock()
     this.Callback;      //回调
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
-    this.MinWidth=null;  //最小宽度
 
 
     this.CalculateTextSize=function(aryText, defaultFont, out)
@@ -51945,17 +51945,40 @@ function ChartLock()
         if (!out || !IFrameSplitOperator.IsNonEmptyArray(aryText)) return false;
 
         this.Canvas.font=defaultFont;
-        var lineHeight=this.Canvas.measureText("擎").width; //行高
+        var defaultLineHeight=this.Canvas.measureText("擎").width; //行高
+        var lineHeight=defaultLineHeight;
         var height=0, width=0;
         out.AryText=[];
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
-            if (!item || !item.Text) continue;
-            var textWidth=this.Canvas.measureText(item.Text).width;
+            if (!item || (!item.Text && !item.Image)) continue;
+            if (item.Image)
+            {
+                textWidth=item.Image.Width;
+                lineHeight=item.Image.Height;
+            }
+            else
+            {
+                 if (item.Font) 
+                {
+                    this.Canvas.font=item.Font;
+                    lineHeight=this.Canvas.measureText("擎").width;
+                }
+                else 
+                {
+                    this.Canvas.font=defaultFont;
+                    lineHeight=defaultLineHeight;
+                }
+
+                var textWidth=this.Canvas.measureText(item.Text).width;
+            }
            
             var lineItem={ Text:item.Text, Width:textWidth, Height:lineHeight, Color:item.Color, TextMargin:{ Top:0, Bottom:0, Left:0, Right:0 }, YOffset:0 };
             if (IFrameSplitOperator.IsNumber(item.YOffset)) lineItem.YOffset=item.YOffset;
+            if (item.Font) lineItem.Font=item.Font;
+            if (IFrameSplitOperator.IsNumber(item.Align)) lineItem.Align=item.Align;    //左右对齐 0=左 1=中 2=右
+            if (item.Image) lineItem.Image=item.Image;
             if (item.TextMargin)
             {
                 var margin=item.TextMargin;
@@ -51980,70 +52003,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}];
@@ -52051,85 +52082,84 @@ 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();
+                if (item.Font) this.Canvas.font = item.Font;
+                else this.Canvas.font = this.Font;
 
-        var lOffsetWidth = 0;
-        if (this.ChartFrame.Data != null)
-        {
-            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 data=this.ChartFrame.Data.Data[i];
-                if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+                yText+=item.Height;
+                this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+            } 
 
-                var left=xOffset;
-                var right=xOffset+dataWidth;
-                if (right>chartright) break;
-            }
-            lOffsetWidth = (dataWidth + distanceWidth) * this.LockCount;    
+            this.Canvas.restore();
         }
-        if (lOffsetWidth == 0)
+        else
         {
-            lOffsetWidth = (xOffset - this.ChartBorder.GetTop()) * this.WidthDiv;
-        }
+            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 item=outSize.AryText[i];
+                if (item.Image)
+                {
+                    xText=left;
+                    if (item.Align===1)
+                    {
+                        if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                    }
 
-        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.drawImage(item.Image.Data, xText, yText, item.Image.Width, item.Image.Height);
 
-        this.Canvas.fillStyle = this.BGColor;
-        this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
+                    yText+=item.Height;
+                }
+                else
+                {
+                    if (item.Color)  this.Canvas.fillStyle=item.Color;
+                    else this.Canvas.fillStyle=this.TextColor;
 
-        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();
+                    if (item.Font) this.Canvas.font = item.Font;
+                    else this.Canvas.font = this.Font;
 
-        this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth};    //保存上锁区域
+                    yText+=item.Height;
+                    xText=left;
+                    if (item.Align===1)
+                    {
+                        if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                    }
+
+                    this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+                }
+            } 
+        }
     }
 
     //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;
@@ -62384,7 +62414,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;
@@ -62531,6 +62561,7 @@ function ChartCorssCursor()
                 }
             }
             
+            this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
             this.Canvas.stroke();
             this.Canvas.restore();
 
@@ -62587,6 +62618,7 @@ function ChartCorssCursor()
                     rtBG.Right=rtBG.Left+rtBG.Width;
                 }
                 
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
             }
             else if (this.ShowTextMode.Left==2) //在框架内显示
             {
@@ -62594,6 +62626,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)
@@ -62603,6 +62637,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=
@@ -62724,6 +62759,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)    //框架内侧显示
@@ -62737,6 +62774,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;
             }
         }
 
@@ -62802,6 +62841,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;
             }
         }
 
@@ -62850,8 +62891,6 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
             }
         }
-
-        this.Status=1;
     }
 
     this.DrawComplexRightText=function(rtBG, complexText, size)
@@ -63139,6 +63178,7 @@ function ChartCorssCursor()
 
     this.HScreenDraw=function()
     {
+        this.Status=JSCHART_CORSSCURSOR_STATUS_ID.NONE_ID;
         var x=this.LastPoint.X;
         var y=this.LastPoint.Y;
 
@@ -63232,6 +63272,8 @@ function ChartCorssCursor()
                 }
             }
 
+            this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
+
             this.Canvas.stroke();
             this.Canvas.restore();
 
@@ -63292,6 +63334,8 @@ function ChartCorssCursor()
                 }
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
             }
             else if (this.ShowTextMode.Left==2)
             {
@@ -63309,6 +63353,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) 
@@ -63379,6 +63425,8 @@ function ChartCorssCursor()
                 }
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_TEXT_ID;
             }
             else if (this.ShowTextMode.Right==2)
             {
@@ -63396,6 +63444,8 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,-2,0,textWidth);
 
                 this.Canvas.restore();
+
+                this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_INTER_TEXT_ID;
             }
         }
 
@@ -63469,10 +63519,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:是否需要重绘 }
@@ -63544,6 +63594,7 @@ function ChartCorssCursor()
 }
 
 
+
 ////////////////////////////////////////////////////////////////////////////////
 //深度图十字光标
 function DepthChartCorssCursor()
@@ -90729,6 +90780,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;
         }
@@ -105089,239 +105147,9 @@ function IsFundSymbol(symbol)
     return false;
 }
 
-//设置对话框工厂类
-function DialogFactory()
-{
-    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
-    this.DataMap=new Map(
-    [
-        ["ChartPictureSettingMenu", { Create:function(divElement) { return new ChartPictureSettingMenu(divElement); } }],
-    ]); 
-
-    this.Create=function(name, option)
-    {
-        if (!this.DataMap.has(name)) 
-        {
-            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
-            return null;
-        }
-
-        var item=this.DataMap.get(name);
-        return item.Create(option);
-    }
-
-    this.Add=function(name, option)
-    {
-        this.DataMap.set(name, { Create:option.Create } );
-    }
-}
-
-var g_DialogFactory=new DialogFactory();
-
-//设置窗口基类
-function IDivDialog(divElement)
-{
-    this.DivElement=divElement;     //父节点
-    this.ID=null;                   //div id
-    this.TimeOut=null;              //定时器
-
-    //隐藏窗口
-    this.Hide=function()
-    {
-        $("#"+this.ID).hide();
-    }
-
-    //显示窗口
-    this.Show=function(left,top,width,height)
-    {
-        var cssData={display:'block'};
-        if (IFrameSplitOperator.IsNumber(left)) cssData.left=left+'px';
-        if (IFrameSplitOperator.IsNumber(top)) cssData.top=top+'px';
-        if (IFrameSplitOperator.IsNumber(width)) cssData.width=width+'px';
-        if (IFrameSplitOperator.IsNumber(height)) cssData.height=height+'px';
-
-        $("#"+this.ID).css(cssData);
-    }
-}
-
-//等待动画窗口
-function WaitDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.Title='加载中......';
-    this.Dialog;
-
-    //隐藏窗口
-    this.Close=function()
-    {
-        if (this.Dialog) 
-        {
-            this.DivElement.removeChild(this.Dialog);
-            this.Dialog=null;
-        }
-    }
-
-    this.SetTitle=function(title)
-    {
-        this.Title=title;
-        if (!this.Dialog) return;
-        //TODO: 更新标题数据
-    }
-
-    this.Create=function()
-    {
-        this.ID=Guid();
-        var div=document.createElement('div');
-        div.className='jchart-wait-box';
-        div.id=this.ID;
-        div.innerHTML=
-        `<div class='parameter jchart-kline-match-box'>
-            <div class='parameter-header'>
-                <span>${this.Title}</span>
-            </div>
-        </div>`.trim();
-
-        this.DivElement.appendChild(div);
-        this.Dialog=div;
-    }
-
-    //显示
-    this.DoModal=function(event)
-    {
-        this.Title=event.data.Title;
-        var chart=event.data.Chart;
-        if (this.ID==null) this.Create();   //第1次 需要创建div
-        
-        //居中显示
-        var border=chart.Frame.ChartBorder;
-        var scrollPos=GetScrollPosition();
-        var left=border.GetWidth()/2;
-        var top=border.GetHeight()/2;
-
-        this.Show(left,top,200,40);      //显示
-    }
-}
-
-//画图工具 单个图形设置
-function ChartPictureSettingMenu(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.HQChart;
-    this.ChartPicture;
-    this.SubToolsDiv;
-    this.SettingMenu;
-    this.SettingPV;
-
-    this.DoModal=function(event)
-    {
-        var $body;
-        if (!this.SubToolsDiv)
-        {
-            this.ID=Guid();
-            var div=document.createElement("div");
-            div.className='subTolls';
-            div.id=this.ID;
-            this.DivElement.appendChild(div);
-            //$body = $("."+event.data.HQChart.ClassName).context.body;
-            //$body.append(div);
-            this.SubToolsDiv=div;
-        }
-        this.HQChart=event.data.HQChart;
-        this.ChartPicture=event.data.ChartPicture;
-
-        var pixelTatio = GetDevicePixelRatio();
-        var frame=this.HQChart.Frame.SubFrame[0].Frame;
-        // var top=frame.ChartBorder.GetTopTitle();
-        var top=frame.ChartBorder.Top + 40;
-        // var right=frame.ChartBorder.GetRight();
-        var right=frame.ChartBorder.Right;
-        var left=frame.ChartBorder.GetLeft();
-        var className = this.ChartPicture.ClassName; //='ChartDrawPictureText'时加“设置”
-        var lineColor=this.ChartPicture.LineColor;
-        if (lineColor.indexOf("rgb(")==0 || lineColor.indexOf("RGB(")==0)
-            lineColor=IChartDrawPicture.RGBToHex(lineColor.toLowerCase());
-        var toolsDiv = "";
-        if(className === 'ChartDrawPictureText')
-        {
-            toolsDiv = '<span class="changes-color" title="改变图形颜色">'+
-                           '<i class="iconfont icon-bianji"></i>'+
-                           '<input type="color" name="color" id="color" class="change-color" value="'+ lineColor +'">'+
-                        '</span>\n' +
-                        '<span class="subtool-set" title="设置"><i class="iconfont icon-shezhi"></i></span>'+
-                        '<span class="subtool-del"><i class="iconfont icon-recycle_bin"></i></span>';
-        }
-        else if (className=="ChartDrawVolProfile")
-        {
-            toolsDiv='<span class="vp-set" title="设置"><i class="iconfont icon-shezhi"></i></span>'+
-            '<span class="subtool-del"><i class="iconfont icon-recycle_bin"></i></span>';
-        }
-        else
-        {
-            toolsDiv =
-            '<p class="changes-color" title="改变图形颜色"><i class="iconfont icon-bianji"></i>' +
-            '<input type="color" name="color" id="color" class="change-color" value="'+ lineColor +'"></p>\n' +
-            '        <p class="subtool-del"><i class="iconfont icon-recycle_bin"></i></p>';
-        }
-
-        
-        this.SubToolsDiv.style.right = right/pixelTatio + "px";
-        this.SubToolsDiv.style.top = top/pixelTatio + "px";
-        this.SubToolsDiv.innerHTML = toolsDiv;
-        this.SubToolsDiv.style.position = "absolute";
-        this.SubToolsDiv.style.display = "block";
-
-        var hqChart = this.HQChart;
-        var picture = this.ChartPicture;
-        var subToolDiv = this.SubToolsDiv;
-        $(".subtool-del").click(function(){
-            hqChart.SelectChartDrawPicture=null;
-            hqChart.ClearChartDrawPicture(picture);
-            // subToolDiv.innerHTML = "";
-            $(".subTolls").css("display","none");
-        });
-        var self = this;
-        $(".subtool-set").click(function(){
-            $(self.SubToolsDiv).hide();
-            //创建div设置窗口
-            if (!self.SettingMenu) self.SettingMenu=new ChartPictureTextSettingMenu(frame.ChartBorder.UIElement.parentNode);
-
-            self.SettingMenu.ChartPicture=picture;
-            self.SettingMenu.HQChart=hqChart;
-            self.SettingMenu.Position={Left:right + 80,Top:top + 20};
-            self.SettingMenu.DoModal();
-        });
-        $(".changes-color").click(function () {
-            document.getElementById('color').click();
-            $(".change-color").change(function () {
-                var color = $(".change-color").val();
-                picture.LineColor = color;
-                picture.PointColor = color;
-                if (hqChart.ChartDrawStorage) hqChart.ChartDrawStorage.SaveDrawData(picture);   //保存下
-            });
-        });
-
-        //成交量分布图设置
-        $(".vp-set").click(function()
-        {
-            if (!self.SettingPV) self.SettingPV=new ChartPictureVolProfileSettingMenu(frame.ChartBorder.UIElement.parentNode);
-            self.SettingPV.ChartPicture=picture;
-            self.SettingPV.HQChart=hqChart;
-            self.SettingPV.Position={Left:right + 80,Top:top + 20};
-            self.SettingPV.DoModal();
-        });
-
-
-        JSConsole.Chart.Log("[ChartPictureSettingMenu::DoModal]", {Top:top,Left:left, Right:right});
-    }
-}
 
 
+/*
 function ChartPictureVolProfileSettingMenu(divElement)
 {
     this.newMethod=IDivDialog;   //派生
@@ -105410,6 +105238,7 @@ function ChartPictureVolProfileSettingMenu(divElement)
         }
     }
 }
+*/
 
 
 
@@ -158672,6 +158501,11 @@ function JSDialogModifyDraw()
         this.HQChart.Draw();
     }
 
+    this.AdvancedSetting=function()
+    {
+        
+    }
+
     this.GetRandomText=function(text)
     {
         var ARY_TEXT=["下跌形态","反转十字星","低位档五阳线","倒V型反转","双顶","持续整理形态"];
@@ -165768,7 +165602,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15090";
+var HQCHART_VERSION="1.1.15105";
 
 function PrintHQChartVersion()
 {
@@ -165934,6 +165768,7 @@ export default {
         JSCHART_WORKER_MESSAGE_ID:JSCHART_WORKER_MESSAGE_ID,
         JSCHART_MENU_ID:JSCHART_MENU_ID,
         JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,        //交易状态
+        JSCHART_CORSSCURSOR_STATUS_ID:JSCHART_CORSSCURSOR_STATUS_ID,    //十字光标状态
     },