hqchart 1.1.15106 → 1.1.15121

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);
         }
     }
 
@@ -6722,6 +6722,14 @@ JSChart.RegisterChartFrameClass=function(name, option)
 }
 
 
+//注册DOM对话框类
+//option:{ Create:创建类方法 }
+JSChart.RegisterDOMClass=function(name, option)
+{
+    return g_JSDOMFactory.Add(name, option);
+}
+
+
 //一些公共函数
 JSChart.ToFixedPoint=function(value)
 {
@@ -16605,6 +16613,85 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         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;
+    }
+
+    this.TryClickLock=function(x,y)
+    {
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+
+        for(var i=0;i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
+
+            var tooltip=new TooltipData();
+            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;
+        }
+
+        return false;
     }
 }
 
@@ -17253,8 +17340,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;          //是否显示边框
@@ -17526,15 +17613,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()
@@ -17590,46 +17670,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;
     }
@@ -20386,7 +20448,7 @@ function AverageWidthFrame()
 
         if (this.ClassName=="MinuteFrame" || this.ClassName=="KLineFrame")
         {
-            this.DivFrameToolbar=new JSDivFrameToolbar();
+            this.DivFrameToolbar=g_JSDOMFactory.Create('JSDivFrameToolbar');//new JSDivFrameToolbar();
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
@@ -22666,6 +22728,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()
     {
@@ -22724,6 +22793,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()
     {
@@ -24111,6 +24187,12 @@ function OverlayKLineFrame()
         }
     }
 
+    this.GetLockRect=function()
+    {
+        if (!this.MainFrame || !this.MainFrame.GetLockRect) return null;
+        return this.MainFrame.GetLockRect();
+    }
+
     this.Draw=function()
     {
         this.Buttons=[];
@@ -25423,6 +25505,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();
@@ -26629,7 +26717,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();
@@ -26651,10 +26739,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);
         }
     }
 
@@ -30894,9 +30993,20 @@ function IChartPainting()
         var x=left+width/2;
         var y=top+height/2;
 
+        var bHScreen=this.ChartFrame.IsHScreen;
+        if (bHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(x, y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            x=0,y=0;
+        }
+
         this.Canvas.textAlign="center";
         this.Canvas.textBaseline="middle";
         this.Canvas.fillText(this.NotSupportMessage,x,y);
+
+        if (bHScreen)  this.Canvas.restore();
     }
 
     this.GetTooltipData=function(x,y,tooltip)
@@ -42801,6 +42911,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)
@@ -51876,6 +51993,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()
 {
@@ -51884,17 +52034,41 @@ 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.MinWidthText="  付费指标  "
+
+    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)
     {
@@ -51916,7 +52090,7 @@ function ChartLock()
             }
             else
             {
-                 if (item.Font) 
+                if (item.Font) 
                 {
                     this.Canvas.font=item.Font;
                     lineHeight=this.Canvas.measureText("擎").width;
@@ -51962,12 +52136,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();
@@ -52008,35 +52177,59 @@ function ChartLock()
             }
         }
 
+        this.Canvas.font=this.Font;
+        var minWidth=this.Canvas.measureText(this.MinWidthText).width;
+
+        var aryText=null;
+        if (Array.isArray(this.Title)) aryText=this.Title;
+        else aryText=[{Text:this.Title}];
+            
+        var outSize={ };
+        if (!this.CalculateTextSize(aryText, this.Font, outSize)) outSize=null;
+        if (outSize && outSize.Width+8>minWidth) minWidth=outSize.Width+8;  //确保文字可以显示
+
         if (bHScreen)
         {
             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);
+            if (rtBG.Height<minWidth)
+            {
+                rtBG.Height=minWidth;
+                rtBG.Top=rtBG.Bottom-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);
+            if (rtBG.Width<minWidth)
+            {
+                rtBG.Width=minWidth;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+            }
             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);
+            }
         }
 
-        var aryText=null;
-        if (Array.isArray(this.Title)) aryText=this.Title;
-        else aryText=[{Text:this.Title}];
-            
-        var outSize={ };
-        if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
+        if (!bDraw) return;
+        if (!outSize) return;
 
         this.Canvas.textAlign='left';
         this.Canvas.textBaseline='bottom';
@@ -52047,67 +52240,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;
-
-                if (item.Font) this.Canvas.font = item.Font;
-                else this.Canvas.font = this.Font;
-
-                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)
             {
-                var item=outSize.AryText[i];
-                if (item.Image)
+                if (item.Align===1)
                 {
-                    xText=left;
-                    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;
+                    if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
                 }
-                else
-                {
-                    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;
+                this.Canvas.drawImage(item.Image.Data, xText, yText, item.Image.Width, item.Image.Height);
 
-                    yText+=item.Height;
-                    xText=left;
-                    if (item.Align===1)
-                    {
-                        if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
-                    }
+                yText+=item.Height;
+            }
+            else
+            {
+                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;
 
-                    this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+                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是否在上锁区域
@@ -52117,7 +52297,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;
         }
@@ -87074,6 +87254,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;
@@ -87175,6 +87356,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;
@@ -89634,7 +89816,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         
         
         subFrame.YSpecificMaxMin=null;    //清空指定最大最小值
-        subFrame.IsLocked=false;          //解除上锁
         subFrame.YSplitScale = null;      //清空固定刻度
         subFrame.YSplitOperator.SplitType=subFrame.YSplitOperator.DefaultSplitType;  //还原Y坐标分割模式
 
@@ -89932,7 +90113,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;
@@ -89990,7 +90170,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
@@ -90325,7 +90505,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             frame.YSpecificMaxMin=null;
-            frame.IsLocked=false;
             frame.YSplitScale = null;
         }
         
@@ -90705,51 +90884,6 @@ 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 tooltip=new TooltipData();
-            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;
-        }
-
-        return false;
-    }
-
     this.TryClickIndexTitle=function(x,y)
     {
         for(var i in this.TitlePaint)
@@ -96739,6 +96873,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             if (i>=2)
             {
@@ -96850,6 +96985,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)
         {
@@ -96975,7 +97111,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         //清空指定最大最小值
         
         subFrame.YSpecificMaxMin=null;
-        subFrame.IsLocked=false;          //解除上锁
         subFrame.YSplitOperator.SplitType=subFrame.YSplitOperator.DefaultSplitType;  //还原Y坐标分割模式
 
         this.ChartPaint=paint;
@@ -97208,7 +97343,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             frame.YSpecificMaxMin=null;
-            frame.IsLocked=false;
             frame.YSplitScale = null;
         }
         
@@ -99455,9 +99589,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;
@@ -99640,9 +99774,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;
@@ -100556,25 +100690,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return false;
     }
-
-    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 tooltip=new TooltipData();
-            if (!item.Frame.LockPaint.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
 }
 
 //盘前数据
@@ -102526,6 +102641,7 @@ function KLineChartHScreenContainer(uielement)
             frame.RightSpaceCount=this.RightSpaceCount; //右边
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
+            frame.CreateLockPaint();
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -102714,6 +102830,7 @@ function MinuteChartHScreenContainer(uielement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
             frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
@@ -109489,8 +109606,6 @@ function JSDivFrameToolbar()
         this.SetToolbar(aryButton); //重新设置按钮
     }
 
-    
-
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -109672,6 +109787,37 @@ JSDivFrameToolbar.GetDfaultButtons=function()
 }
 
 
+
+//DOM工厂类
+function JSDOMFactory()
+{
+    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
+    this.DataMap=new Map(
+    [
+        ["JSDivFrameToolbar", { Create:function(option) { return new JSDivFrameToolbar(option); } }],
+    ]); 
+
+    this.Create=function(name, option)
+    {
+        if (!this.DataMap.has(name)) 
+        {
+            JSConsole.Chart.Warn(`[JSDOMFactory::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_JSDOMFactory=new JSDOMFactory();
+
+
 function JSToolbarTooltip()
 {
     this.DivTooltip=null;
@@ -130284,7 +130430,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,
@@ -132973,6 +133119,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();          //调整坐标最大 最小值
 
@@ -134833,20 +134991,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();          //调整坐标最大 最小值
 
@@ -153717,7 +153875,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15105";
+var HQCHART_VERSION="1.1.15120";
 
 function PrintHQChartVersion()
 {
@@ -153873,6 +154031,7 @@ export default  {
         JSCHART_MENU_ID:JSCHART_MENU_ID,
         JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,                //交易状态
         JSCHART_CORSSCURSOR_STATUS_ID:JSCHART_CORSSCURSOR_STATUS_ID,    //十字光标状态
+        CONDITION_PERIOD:CONDITION_PERIOD,          //指标周期条件枚举
     },
 }