hqchart 1.1.15104 → 1.1.15111

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

@@ -6315,12 +6315,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     }
 
     //锁指标
-    this.LockIndex=function(lockData)
+    this.EnableLockIndex=function(aryData)
     {
-        if(this.JSChartContainer && typeof(this.JSChartContainer.LockIndex)=='function')
+        if(this.JSChartContainer && typeof(this.JSChartContainer.EnableLockIndex)=='function')
         {
-            JSConsole.Chart.Log('[JSChart:LockIndex] lockData', lockData);
-            this.JSChartContainer.LockIndex(lockData);
+            JSConsole.Chart.Log('[JSChart:EnableLockIndex] aryData', aryData);
+            this.JSChartContainer.EnableLockIndex(lockData);
         }
     }
 
@@ -6714,12 +6714,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)
@@ -16610,6 +16604,55 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!this.PressKeyboardConfig) return false;
         if (!this.PressKeyboardConfig.PauseUpdate) return false;
 
+        return true;
+    },
+
+    //启动|关闭锁指标 aryIndex=[{ IndexID:指标ID, LockData:{IsLocked:} } ]
+    this.EnableLockIndex=function(aryIndex)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
+
+        var mapIndex=new Map();
+        for(var i=0;i<aryIndex.length;++i)
+        {
+            var item=aryIndex[i];
+            if (item.IndexID && item.LockData) mapIndex.set(item.IndexID, item);
+        }
+
+        var aryUpdate=[];
+        for(var i=0; i<this.WindowIndex.length; ++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+            if (mapIndex.has(item.ID)) 
+            {
+                var mapItem=mapIndex.get(item.ID);
+                item.SetLock(mapItem.LockData);  //设置锁
+                aryUpdate.push({ ID:i});
+            }
+        }
+
+        for(var i=0; i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            if (!IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex)) continue;
+
+            for(var j=0; j<item.OverlayIndex.length; ++j)
+            {
+                var overlayItem=item.OverlayIndex[j];
+                var script=overlayItem.Script;
+                if (mapIndex.has(script.ID)) 
+                {
+                    var mapItem=mapIndex.get(script.ID);
+                    script.SetLock(mapItem.LockData);
+                    aryUpdate.push({OverlayID:overlayItem.Identify});
+                }
+            }
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryUpdate)) return false;
+
+        this.UpdateWindowIndexV2(aryUpdate);
         return true;
     }
 }
@@ -17259,8 +17302,8 @@ function IChartFramePainting()
     this.XSplitOperator;               //X轴分割
     this.Data;                         //主数据
 
-    this.IsLocked=false;               //是否上锁
-    this.LockPaint = null;
+    this.LockPaint = null;              //锁图形
+    this.IndexLock=new IndexLockData(); //指标锁
 
     this.YSpecificMaxMin=null;         //指定Y轴最大最小值
     this.IsShowBorder = true;          //是否显示边框
@@ -17532,15 +17575,8 @@ function IChartFramePainting()
 
     this.DrawLock=function()
     {
-        if (this.IsLocked)
-        {
-            if (this.LockPaint == null)
-                this.LockPaint = g_ChartPaintFactory.Create("ChartLock");//new ChartLock();
-            this.LockPaint.Canvas=this.Canvas;
-            this.LockPaint.ChartBorder=this.ChartBorder;
-            this.LockPaint.ChartFrame=this;
-            this.LockPaint.Draw(true);
-        }
+        if (!this.LockPaint) return;
+        this.LockPaint.Draw(true);
     }
 
     this.DrawLogo=function()
@@ -17596,46 +17632,28 @@ function IChartFramePainting()
         }   
     }
 
-    this.CalculateLock=function()
+    this.CalculateLock=function(aryData)
     {
-        if (this.IsLocked)
-        {
-            if (this.LockPaint == null)
-                this.LockPaint = g_ChartPaintFactory.Create("ChartLock"); // new ChartLock();
-            this.LockPaint.Canvas=this.Canvas;
-            this.LockPaint.ChartBorder=this.ChartBorder;
-            this.LockPaint.ChartFrame=this;
-            this.LockPaint.Draw(false);
-        }
+        this.LockPaint.SetData(aryData);
+        this.LockPaint.Draw(false);
     }
 
-    //设施上锁
-    this.SetLock=function(lockData)
+    //创建锁图形
+    this.CreateLockPaint=function()
     {
-        if (!lockData)  //空数据不上锁
-        {
-            this.IsLocked=false;
-            return;
-        }
-
-        this.IsLocked=true;
-        if (!this.LockPaint) this.LockPaint=g_ChartPaintFactory.Create("ChartLock"); //new ChartLock();    //创建锁
+        this.LockPaint = g_ChartPaintFactory.Create("ChartLock"); // new ChartLock();
+        this.LockPaint.Canvas=this.Canvas;
+        this.LockPaint.ChartBorder=this.ChartBorder;
+        this.LockPaint.ChartFrame=this;
+    }
 
-        if (lockData.Callback) this.LockPaint.Callback=lockData.Callback;       //回调
-        if (lockData.IndexName) this.LockPaint.IndexName=lockData.IndexName;    //指标名字
-        if (lockData.IndexID)  this.LockPaint.IndexID=lockData.IndexID;    //指标ID
-        if (lockData.ID) this.LockPaint.LockID=lockData.ID;                     //锁ID
-        if (lockData.BG) this.LockPaint.BGColor=lockData.BG;                    //背景色 
-        if (lockData.Text) this.LockPaint.Title= lockData.Text;   
-        if (lockData.TextColor) this.LockPaint.TextColor=lockData.TextColor;  
-        if (lockData.Font) this.LockPaint.Font=lockData.Font;
-        if (lockData.Count) this.LockPaint.LockCount=lockData.Count;
-        if (lockData.MinWidth>0) this.LockPaint.MinWidth=lockData.MinWidth;
+    this.SetLock=function(lockData)
+    {
+        this.IndexLock.SetData(lockData);
     }
 
     this.GetLockRect=function()
     {
-        if (!this.IsLocked) return null;
         if (!this.LockPaint) return null; 
         return this.LockPaint.LockRect;
     }
@@ -22672,6 +22690,13 @@ function OverlayMinuteFrame()
     this.IsShareY=false;            //使用和主框架公用Y轴
     this.IsCalculateYMaxMin=true;   //是否计算Y最大最小值
     this.IsShowMainFrame=0;         //是否显示在主框架坐标上 1=左边 2=右边
+    this.MainFrame=null;            //主框架
+
+    this.GetLockRect=function()
+    {
+        if (!this.MainFrame || !this.MainFrame.GetLockRect) return null;
+        return this.MainFrame.GetLockRect();
+    }
 
     this.Draw=function()
     {
@@ -22730,6 +22755,13 @@ function OverlayMinuteHScreenFrame()
 
     this.ClassName="OverlayMinuteHScreenFrame";
     this.IsShow=true;                   //坐标是否显示
+    this.MainFrame=null;                //主框架
+
+    this.GetLockRect=function()
+    {
+        if (!this.MainFrame || !this.MainFrame.GetLockRect) return null;
+        return this.MainFrame.GetLockRect();
+    }
 
     this.Draw=function()
     {
@@ -24117,6 +24149,12 @@ function OverlayKLineFrame()
         }
     }
 
+    this.GetLockRect=function()
+    {
+        if (!this.MainFrame || !this.MainFrame.GetLockRect) return null;
+        return this.MainFrame.GetLockRect();
+    }
+
     this.Draw=function()
     {
         this.Buttons=[];
@@ -25429,6 +25467,12 @@ function OverlayKLineHScreenFrame()
     this.TitleColor=g_JSChartResource.OverlayFrame.TitleColor;
     this.TitleFont=g_JSChartResource.OverlayFrame.TitleFont;
 
+    this.GetLockRect=function()
+    {
+        if (!this.MainFrame || !this.MainFrame.GetLockRect) return null;
+        return this.MainFrame.GetLockRect();
+    }
+
     this.Draw=function()
     {
         this.SplitXYCoordinate();
@@ -26635,7 +26679,7 @@ function HQTradeFrame()
 
     this.DrawLock=function()
     {
-        for (var i in this.SubFrame)
+        for (var i=0; i<this.SubFrame.length; ++i)
         {
             var item = this.SubFrame[i];
             item.Frame.DrawLock();
@@ -26657,10 +26701,21 @@ function HQTradeFrame()
 
     this.CalculateLock=function()
     {
-        for (var i in this.SubFrame)
+        for (var i=0, j=0; i<this.SubFrame.length; ++i)
         {
             var item = this.SubFrame[i];
-            item.Frame.CalculateLock();
+            var aryLockData=[];
+            if (item.Frame.IndexLock.IsLocked) aryLockData.push({ Data:item.Frame.IndexLock, IsOverlay:false });
+            for(j=0; j<item.OverlayIndex.length; ++j)
+            {
+                var subItem=item.OverlayIndex[j];
+                if (subItem.Frame.IndexLock.IsLocked===true)
+                {
+                    aryLockData.push({ Data:subItem.Frame.IndexLock, IsOverlay:true } );
+                }
+            }
+
+            item.Frame.CalculateLock(aryLockData);
         }
     }
 
@@ -42807,6 +42862,13 @@ function ChartStickLine()
             xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
         }
 
+        var lockRect=this.GetLockRect();
+        if (lockRect)
+        {
+            if (this.IsHScreen) chartright=lockRect.Top;
+            else chartright=lockRect.Left;
+        }
+
         var isMinute=this.IsMinuteFrame();
         
         if (isMinute)
@@ -51882,6 +51944,39 @@ function ChartDrawFlagText()
     }
 }
 
+function IndexLockData()
+{
+    this.IsLocked=false;
+    this.LockCount = 20; // 锁最新的几个数据
+    this.BGColor = g_JSChartResource.IndexLock.BGColor;
+    this.TextColor = g_JSChartResource.IndexLock.TextColor;
+    this.Font = g_JSChartResource.IndexLock.Font;
+    this.Title = g_JSChartResource.IndexLock.Title;
+    this.LockID;        //锁ID
+    this.IndexName;     //指标名字
+    this.IndexID;       //指标ID
+
+    this.SetData=function(lockData)
+    {
+        if (!lockData)  //空 解锁
+        {
+            this.IsLocked=false;
+            return;
+        }
+
+        this.IsLocked=true;
+        if (lockData.Callback) this.Callback=lockData.Callback;       //回调  !!废弃
+        if (lockData.IndexName) this.IndexName=lockData.IndexName;    //指标名字
+        if (lockData.IndexID)  this.IndexID=lockData.IndexID;         //指标ID
+        if (lockData.ID) this.LockID=lockData.ID;                     //锁ID
+        if (lockData.BG) this.BGColor=lockData.BG;                    //背景色 
+        if (lockData.Text) this.Title= lockData.Text;   
+        if (lockData.TextColor) this.TextColor=lockData.TextColor;  
+        if (lockData.Font) this.Font=lockData.Font;
+        if (lockData.Count) this.LockCount=lockData.Count;
+    }
+}
+
 //锁  支持横屏
 function ChartLock()
 {
@@ -51890,34 +51985,79 @@ function ChartLock()
     delete this.newMethod;
 
     this.ClassName="ChartLock";
+    this.AryData=null;
+    this.LockRect=null; //上锁区域
+
     this.LockCount = 20; // 锁最新的几个数据
     this.BGColor = g_JSChartResource.IndexLock.BGColor;
     this.TextColor = g_JSChartResource.IndexLock.TextColor;
     this.Font = g_JSChartResource.IndexLock.Font;
     this.Title = g_JSChartResource.IndexLock.Title;
-    this.LockRect=null; //上锁区域
+    
     this.LockID;        //锁ID
     this.Callback;      //回调
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
 
+    this.SetData=function(aryData)
+    {
+        this.AryData=aryData;
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.AryData))
+        {
+            var item=this.AryData[0].Data;   //取第一个锁
+
+            this.LockCount = item.LockCount; 
+            this.BGColor = item.BGColor
+            this.TextColor = item.TextColor
+            this.Font = item.Font
+            this.Title = item.Title
+            this.LockID=item.LockID;            //锁ID
+            this.Callback=item.Callback;        //回调
+            this.IndexName=item.IndexName;      //指标名字
+            this.IndexID=item.IndexID;          //指标ID
+        }
+    }
 
     this.CalculateTextSize=function(aryText, defaultFont, out)
     {
         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;
@@ -51945,12 +52085,7 @@ function ChartLock()
     this.Draw=function(bDraw)
     {
         this.LockRect=null;
-        if (!bDraw) return;
-        if (this.NotSupportMessage)
-        {
-            this.DrawNotSupportmessage();
-            return;
-        }
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryData)) return;
 
         var bHScreen=this.ChartFrame.IsHScreen;
         var bMinute=this.IsMinuteFrame();
@@ -51996,24 +52131,33 @@ function ChartLock()
             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;
-
-            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;    //保存上锁区域
+
+            if (bDraw)
+            {
+                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);
+            }
         }
         else
         {
             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;    //保存上锁区域
+
+            if (bDraw)
+            {
+                 //上下渐变
+                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);
+            }
         }
 
+        if (!bDraw) return;
+
         var aryText=null;
         if (Array.isArray(this.Title)) aryText=this.Title;
         else aryText=[{Text:this.Title}];
@@ -52030,40 +52174,54 @@ function ChartLock()
             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;
-
             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;
-
-                yText+=item.Height;
-                this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
-            } 
-
-            this.Canvas.restore();
+            var left=0,top=0;
         }
         else
         {
             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 yText=top, xText=left;
+        for(var i=0;i<outSize.AryText.length;++i)
+        {
+            var item=outSize.AryText[i];
+            xText=left;
+            if (item.Image)
+            {
+                if (item.Align===1)
+                {
+                    if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                }
+
+                this.Canvas.drawImage(item.Image.Data, xText, yText, item.Image.Width, item.Image.Height);
+
+                yText+=item.Height;
+            }
+            else
             {
-                var item=outSize.AryText[i];
                 if (item.Color)  this.Canvas.fillStyle=item.Color;
                 else this.Canvas.fillStyle=this.TextColor;
 
+                if (item.Font) this.Canvas.font = item.Font;
+                else this.Canvas.font = this.Font;
+
                 yText+=item.Height;
+               
+                if (item.Align===1)
+                {
+                    if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                }
+
                 this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
-            } 
+            }
         }
+
+        if (bHScreen)  this.Canvas.restore();
     }
 
     //x,y是否在上锁区域
@@ -52073,7 +52231,7 @@ function ChartLock()
 
         if (Path2DHelper.PtInRect(x,y,this.LockRect))
         {
-            tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
+            tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID, Data:this.AryData };
             tooltip.ChartPaint=this;
             return true;
         }
@@ -87030,6 +87188,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
             frame.CreateDivFrameToolbar(this, i, this.UIElement.parentNode);
+            frame.CreateLockPaint();
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -87131,6 +87290,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         frame.XSplitOperator.Symbol=this.Symbol;
         frame.XSplitOperator.Period=this.Period;
         frame.CreateDivFrameToolbar(this, id, this.UIElement.parentNode);
+        frame.CreateLockPaint();
 
         //K线数据绑定
         var xPointCouont=this.Frame.SubFrame[0].Frame.XPointCount;
@@ -89590,7 +89750,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         
         
         subFrame.YSpecificMaxMin=null;    //清空指定最大最小值
-        subFrame.IsLocked=false;          //解除上锁
         subFrame.YSplitScale = null;      //清空固定刻度
         subFrame.YSplitOperator.SplitType=subFrame.YSplitOperator.DefaultSplitType;  //还原Y坐标分割模式
 
@@ -89888,7 +90047,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         
         this.Frame.SubFrame[windowIndex].Frame.YSpecificMaxMin=null;    //清空指定最大最小值
-        this.Frame.SubFrame[windowIndex].Frame.IsLocked=false;          //解除上锁
         this.Frame.SubFrame[windowIndex].Frame.YSplitScale = null;      //清空固定刻度
 
         this.ChartPaint=paint;
@@ -89946,7 +90104,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (obj.Script)    //动态执行脚本
         {
-            indexInfo={ Script:obj.Script, ID:obj.indexName, Name:obj.indexName};
+            indexInfo={ Script:obj.Script, ID:obj.IndexName, Name:obj.IndexName};
             if (obj.Name) indexInfo.Name=obj.Name;
         }
         else
@@ -90281,7 +90439,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             frame.YSpecificMaxMin=null;
-            frame.IsLocked=false;
             frame.YSplitScale = null;
         }
         
@@ -90661,35 +90818,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-    //锁|解锁指标 { Index:指标名字,IsLocked:是否要锁上,Callback:回调 }
-    this.LockIndex=function(lockData)
-    {
-        if (!lockData) return;
-        if (!lockData.IndexName) return;
-
-        for(let i in this.WindowIndex)
-        {
-            let item=this.WindowIndex[i];
-            if (!item) conintue;
-            if (item.Name==lockData.IndexName)
-            {
-                item.SetLock(lockData);
-                this.Update();
-                break;
-            }
-        }
-    }
-
     this.TryClickLock=function(x,y)
     {
         for(var i=0;i<this.Frame.SubFrame.length; ++i)
         {
             var item=this.Frame.SubFrame[i];
-            if (!item.Frame.IsLocked) continue;
-            if (!item.Frame.LockPaint) continue;
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
 
             var tooltip=new TooltipData();
-            if (!item.Frame.LockPaint.GetTooltipData(x,y,tooltip)) continue;
+            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
 
             tooltip.HQChart=this;
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
@@ -96695,6 +96833,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             if (i>=2)
             {
@@ -96806,6 +96945,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         frame.XSplitOperator.Symbol=this.Symbol;
         frame.CreateDivFrameToolbar(this, id, this.UIElement.parentNode);
+        frame.CreateLockPaint();
 
         if (this.DayCount>1)
         {
@@ -96931,7 +97071,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         //清空指定最大最小值
         
         subFrame.YSpecificMaxMin=null;
-        subFrame.IsLocked=false;          //解除上锁
         subFrame.YSplitOperator.SplitType=subFrame.YSplitOperator.DefaultSplitType;  //还原Y坐标分割模式
 
         this.ChartPaint=paint;
@@ -97164,7 +97303,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             frame.YSpecificMaxMin=null;
-            frame.IsLocked=false;
             frame.YSplitScale = null;
         }
         
@@ -99411,9 +99549,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         {
             overlayFrame=new OverlayIndexItem();
             overlayFrame.Identify='Position_Line_Frame';
-
-            if (this.ClassName=="MinuteChartContainer") frame=new OverlayMinuteFrame();
-            else frame=new OverlayMinuteHScreenFrame();
+            frame=this.CreateOverlayFrame();
+            //if (this.ClassName=="MinuteChartContainer") frame=new OverlayMinuteFrame();
+            //else frame=new OverlayMinuteHScreenFrame();
 
             frame.Canvas=this.Canvas;
             frame.MainFrame=subFrame.Frame;
@@ -99596,9 +99734,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var subFrame=this.Frame.SubFrame[windowIndex];
         var overlayFrame=new OverlayIndexItem();
         if (obj.Identify) overlayFrame.Identify=obj.Identify;   //由外部指定id
-        var frame=null;
-        if (this.ClassName=="MinuteChartContainer") frame=new OverlayMinuteFrame();
-        else frame=new OverlayMinuteHScreenFrame();
+        var frame=this.CreateOverlayFrame();
+        //if (this.ClassName=="MinuteChartContainer") frame=new OverlayMinuteFrame();
+        //else frame=new OverlayMinuteHScreenFrame();
         frame.Canvas=this.Canvas;
         frame.MainFrame=subFrame.Frame;
         frame.ChartBorder=subFrame.Frame.ChartBorder;
@@ -100518,13 +100656,22 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         for(var i=0;i<this.Frame.SubFrame.length; ++i)
         {
             var item=this.Frame.SubFrame[i];
-            if (!item.Frame.IsLocked) continue;
-            if (!item.Frame.LockPaint) continue;
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
 
             var tooltip=new TooltipData();
-            if (!item.Frame.LockPaint.GetTooltipData(x,y,tooltip)) continue;
+            if (!chartLock.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;
         }
@@ -105059,239 +105206,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;   //派生
@@ -105380,6 +105297,7 @@ function ChartPictureVolProfileSettingMenu(divElement)
         }
     }
 }
+*/
 
 
 
@@ -130469,7 +130387,7 @@ function ScriptIndex(name,script,args,option)
             Name:hqChart.Name,
             Data:hisData,
             SourceData:hqChart.SourceData,
-            Callback:this.RecvResultData, CallbackParam:param,
+            Callback:(arg1, arg2)=>{ this.RecvResultData(arg1, arg2); }, CallbackParam:param,
             Async:true,
             MaxRequestDataCount:hqChart.MaxRequestDataCount,
             MaxRequestMinuteDayCount:hqChart.MaxRequestMinuteDayCount,
@@ -133158,6 +133076,18 @@ function OverlayScriptIndex(name,script,args,option)
         param.Self.OutVar=outVar;
         param.Self.BindData(hqChart,windowIndex,hisData);
 
+        var frame=this.OverlayIndex.Frame.Frame;
+        if (this.IsLocked==false) //不上锁
+        {
+            frame.SetLock(null);
+        }
+        else    //上锁
+        {
+            let lockData={ IsLocked:true,Callback:this.LockCallback,IndexName:this.Name ,ID:this.LockID, IndexID:this.ID,
+                BG:this.LockBG,Text:this.LockText,TextColor:this.LockTextColor, Font:this.LockFont, Count:this.LockCount, MinWidth:this.LockMinWidth };
+            frame.SetLock(lockData);
+        }
+
         param.HQChart.UpdataDataoffset();           //更新数据偏移
         param.HQChart.UpdateFrameMaxMin();          //调整坐标最大 最小值
 
@@ -135018,20 +134948,20 @@ function APIScriptIndex(name,script,args,option, isOverlay)
         }
         this.BindData(hqChart,windowIndex,hisData);
 
-        if (!this.IsOverlayIndex)
+        var frame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        if (this.IsOverlayIndex) frame=this.OverlayIndex.Frame.Frame;
+        
+        if (this.IsLocked==false) //不上锁
         {
-            if (this.IsLocked==false) //不上锁
-            {
-                hqChart.Frame.SubFrame[windowIndex].Frame.SetLock(null);
-            }
-            else    //上锁
-            {
-                let lockData={ IsLocked:true,Callback:this.LockCallback,IndexName:this.Name ,ID:this.LockID,
-                    BG:this.LockBG,Text:this.LockText,TextColor:this.LockTextColor, Font:this.LockFont, Count:this.LockCount, MinWidth:this.LockMinWidth };
-                hqChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);
-            }
+            frame.SetLock(null);
         }
-
+        else    //上锁
+        {
+            let lockData={ IsLocked:true,Callback:this.LockCallback,IndexName:this.Name ,ID:this.LockID,IndexID:this.ID,
+                BG:this.LockBG,Text:this.LockText,TextColor:this.LockTextColor, Font:this.LockFont, Count:this.LockCount, MinWidth:this.LockMinWidth };
+            frame.SetLock(lockData);
+        }
+        
         hqChart.UpdataDataoffset();           //更新数据偏移
         hqChart.UpdateFrameMaxMin();          //调整坐标最大 最小值
 
@@ -153902,7 +153832,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15103";
+var HQCHART_VERSION="1.1.15110";
 
 function PrintHQChartVersion()
 {