hqchart 1.1.13171 → 1.1.13182

package/src/jscommon/umychart.js

@@ -275,6 +275,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
         chart.ChangeIndexDialog=this.ChangeIndexDialog;
         chart.MinuteDialog=this.MinuteDialog;
+
+        var pixelRatio=GetDevicePixelRatio();
         
         //右键菜单
         if (option.IsShowRightMenu==true) chart.RightMenu=new KLineRightMenu(this.DivElement);
@@ -493,8 +495,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                     chart.Frame.SubFrame[i].Frame.IsShowYText[1]=item.IsShowRightText;
                     chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowRightText=item.IsShowRightText;         //显示右边刻度
                 }
-                if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace;
-                if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace;
+                if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace*pixelRatio;
+                if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace*pixelRatio;
 
                 if (item.RightTextPosition>0) chart.Frame.SubFrame[i].Frame.YTextPosition[1]=item.RightTextPosition;
                 if (item.LeftTextPosition>0) chart.Frame.SubFrame[i].Frame.YTextPosition[0]=item.LeftTextPosition;
@@ -796,6 +798,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
         chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
+        var pixelRatio=GetDevicePixelRatio();
+
         var windowsCount=2;
         if (option.Windows && option.Windows.length>0) windowsCount+=option.Windows.length; //指标窗口从第3个窗口开始
         if (option.EnableScrollUpDown==true) chart.EnableScrollUpDown=option.EnableScrollUpDown;
@@ -963,8 +967,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsNumber(item.YTextBaseline)) chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;
                 if (IFrameSplitOperator.IsBool(item.IsShowIndexTitle)) chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;
 
-                if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace;
-                if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace;
+                if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace*pixelRatio;
+                if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace*pixelRatio;
 
                 //是否显示关闭集合竞价按钮
                 if (IFrameSplitOperator.IsNumber(item.CloseBeforeButton)) chart.Frame.SubFrame[i].Frame.IsShowCloseButton=item.CloseBeforeButton;
@@ -1637,6 +1641,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         //是否自动更新
         if (option.IsAutoUpdate!=null) chart.IsAutoUpdate=option.IsAutoUpdate;
         if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
+        //内置菜单
+        if (option.EnablePopMenuV2===true)
+        {
+            chart.JSPopMenu=new JSPopMenu();
+            chart.JSPopMenu.Inital();
+            chart.EnablePopMenuV2=true;
+        }
         //注册事件
         if (option.EventCallback)
         {
@@ -1663,19 +1674,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             this.DivElement.JSChart=this;   //div中保存一份
             this.JSChartContainer.Draw();
         }
-
-        if (IFrameSplitOperator.IsBool(option.CheckLatestVerion) && option.CheckLatestVerion==false)
-        {
-
-        }
-        else if (JSChart.LastVersion==null)
-        {
-            if (chart && typeof(chart.GetLatestVersion)=='function') 
-            {
-                //由于域名都要备案,获取最新版本接口停止使用
-                //chart.GetLatestVersion();
-            }
-        }
     }
 
     //创建工具条
@@ -2119,6 +2117,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             return this.JSChartContainer.ChangePriceGap(option);
         }
     }
+
+    this.PopupMenuByTab=function(menuData, rtTab)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.PopupMenuByTab)=='function')
+        {
+            JSConsole.Chart.Log('[JSChart:ChangePriceGap] ');
+            return this.JSChartContainer.PopupMenuByTab(menuData, rtTab);
+        }
+    }
 }
 
 JSChart.LastVersion=null;   //最新的版本号
@@ -2324,6 +2331,12 @@ JSChart.ToFixedRect=function(value)
     return ToFixedRect(value);
 }
 
+JSChart.GetScrollPosition=function()
+{
+    return GetScrollPosition();
+}
+
+
 
 
 var JSCHART_EVENT_ID=
@@ -2609,6 +2622,36 @@ var JSCHART_WORKER_MESSAGE_ID=
     ERROR_EXECUTE_SCRIPT:3,
 }
 
+var JSCHART_MENU_ID=
+{
+    CMD_CHANGE_PERIOD_ID:1,       //切换周期
+    CMD_CHANGE_WINDOW_COUNT_ID:2, //窗口个数
+    CMD_CHANGE_RIGHT_ID:3,        //复权
+    CMD_CHANGE_INDEX_ID:4,          //切换指标
+    CMD_CHANGE_COLOR_INDEX_ID:5,    //五彩K线指标
+    CMD_CHANGE_TRADE_INDEX_ID:6,    //专家系统(交易指标)
+    CMD_DELETE_COLOR_INDEX_ID:7,    //删除五彩K线指标
+    CMD_DELETE_TRADE_INDEX_ID:8,    //删除专家系统(交易指标)
+    CMD_CHANGE_KLINE_TYPE_ID:9,     //切换K线类型
+    CMD_CHANGE_PRICE_GAP_ID:10,     //缺口提示
+    CMD_OVERLAY_SYMBOL_ID:11,       //叠加品种
+    CMD_DELETE_ALL_OVERLAY_SYMBOL_ID:12,    //删除所有叠加品种
+    CMD_CHANGE_COORDINATETYPE_ID:13,    //切换坐标类型
+    CMD_CHANGE_KLINE_INFO_ID:14,        //切换信息地雷
+    CMD_DELETE_ALL_KLINE_INFO_ID:15,    //清空信息地雷
+    CMD_CHANGE_DRAG_MODE_ID:16,         //切换拖动模式
+    CMD_CHANGE_BG_SPLIT_ID:17,          //背景分割
+
+    CMD_SHOW_DRAWTOOL_ID:18,    //画图工具
+    CMD_HIDE_DRAWTOOL_ID:19,
+
+    CMD_SHOW_STOCKCHIP_ID:20,   //筹码分布
+    CMD_HIDE_STOCKCHIP_ID:21,
+
+    CMD_ENABLE_SELECT_RECT_ID:22,   //启动区间选择
+    CMD_CHANGE_DAY_COUNT_ID:23,     //切换天数
+}
+
 
 function PhoneDBClick()
 {
@@ -2694,6 +2737,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.LoadDataSplashTitle="数据加载中";           //下载数据提示信息
     this.DefaultCursor="default"; //crosshair , default  默认手型
 
+    this.EnablePopMenuV2=false;
+    this.JSPopMenu;         //内置菜单
+    //this.JSPopMenu=new JSPopMenu();     //内置菜单
+    //this.JSPopMenu.Inital();
+
     //绘图缓存
     this.CacheCanvas=null;   
     this.CacheElement=null;
@@ -2889,61 +2937,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
-
-        if (this.GetLatestVersionTimer!=null) 
-        {
-            clearTimeout(this.GetLatestVersionTimer);
-            this.GetLatestVersionTimer=null;
-        }
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
 
-
-    this.GetLatestVersionTimer=null;    //获取最新版本
-    this.GetLatestVersion=function()
-    {
-        if (this.GetLatestVersionTimer!=null)
-        {
-            clearTimeout(this.GetLatestVersionTimer);
-            this.GetLatestVersionTimer=null;
-        }
-
-        var roundeTime=Math.floor(Math.random()*50); 
-        var waittimer=1000*60*3+(roundeTime*1000);
-        var value="aHR0cHM6Ly9ocWNoYXJ0LnplYWxpbmsuY29tL2FwaS9HZXRWZXJzaW9u";
-        JSConsole.Chart.Log("[JSChartContainer::GetLatestVersion] wait for get hqchart latest version. ",waittimer);
-        this.GetLatestVersionTimer = setTimeout(()=>
-        {
-            var width=0, height=0;
-            if (this.Frame && this.Frame.ChartBorder)
-            {
-                width=this.Frame.ChartBorder.GetChartWidth();
-                height=this.Frame.ChartBorder.GetChartHeight();
-            }
-            
-            var url=`${atob(value)}?width=${width}&height=${height}&type=h5`;
-
-            if (JSChart.LastVersion!=null) return;  //只请求一次
-
-            JSNetwork.HttpRequest({
-                url: url,
-                type:"get",
-                dataType: "json",
-                async:true,
-                success:function(data)
-                {
-                    JSConsole.Chart.Log("[JSChartContainer::GetLatestVersion] hqchart latest version. ",data);
-                    JSChart.LastVersion=data;
-                },
-                error:function(request, textStatus, errorThrown)
-                {
-                    JSConsole.Chart.Log("[JSChartContainer::GetLatestVersion] Get HQChart latest version failed.", request);
-                }
-            });
-        }, waittimer);
-    }
-
     //设置焦点
     this.SetFocus=function()
     {
@@ -9002,6 +8999,213 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
     }
+
+    this.PopupMenuByTab=function(menuData, rtTab)
+    {
+        if (!this.JSPopMenu) return;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtTab.Left/pixelRatio, Right:rtTab.Right/pixelRatio, Bottom:rtTab.Bottom/pixelRatio, Top:rtTab.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByTab(rtCell);
+    }
+
+    this.PopuMenuByRClick=function(menuData, x, y)
+    {
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        x+=rtClient.left+rtScroll.Left;
+        y+=rtClient.top+rtScroll.Top;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByRight(x,y);
+    }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);
+        if (!data || !data.Data) return;
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+        var param=null, srcParam=null;  //原始值
+        if (IFrameSplitOperator.IsNonEmptyArray(aryArgs))
+        {
+            srcParam=aryArgs[0];
+            if (IFrameSplitOperator.IsNumber(aryArgs[0])) param=aryArgs[0];
+        }
+
+        switch(cmdID)
+        {
+            case JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID:
+                if (this.ChangePeriod && param!=null)
+                    this.ChangePeriod(param);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID:
+                if (this.ChangeIndexWindowCount && param!=null)
+                    this.ChangeIndexWindowCount(param);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID:
+                if (this.ChangeRight && param!=null)
+                    this.ChangeRight(param);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID:
+                if (this.ChangeIndex && param!=null && aryArgs[1]) 
+                    this.ChangeIndex(param,aryArgs[1]);
+                break;
+
+            case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:
+            case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:
+                if (this.ChangeInstructionIndex && aryArgs[0])
+                    this.ChangeInstructionIndex(aryArgs[0]);
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID:    //删除五彩K线指标
+            case JSCHART_MENU_ID.CMD_DELETE_TRADE_INDEX_ID:    //删除专家系统(交易指标)
+                if (this.CancelInstructionIndex) this.CancelInstructionIndex();
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID:      //切换K线类型
+                if (this.ChangeKLineDrawType && param!=null)
+                    this.ChangeKLineDrawType(param,aryArgs[1],aryArgs[2]);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID:       //缺口提示
+                if (this.ChangePriceGap && IFrameSplitOperator.IsBool(aryArgs[0]))
+                {
+                    if (aryArgs[0]==false)
+                    {
+                        this.ChangePriceGap({ Enable:aryArgs[0] });
+                    }
+                    else 
+                    {
+                        if (IFrameSplitOperator.IsNumber(aryArgs[1]))
+                            this.ChangePriceGap({ Enable:aryArgs[0], Count:aryArgs[1] });
+                    }
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID:
+                if (aryArgs[1]===true)
+                {
+                    if (this.OverlaySymbol && aryArgs[0]) this.OverlaySymbol(aryArgs[0]);
+                }
+                else if (aryArgs[1]===false)
+                {
+                    if (this.DeleteOverlaySymbol && aryArgs[0]) this.DeleteOverlaySymbol(aryArgs[0]);
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID:
+                if (this.ClearOverlaySymbol) this.ClearOverlaySymbol();
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID:
+                if (this.ChangeCoordinateType && aryArgs[0]) this.ChangeCoordinateType(aryArgs[0]);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID:
+                if (aryArgs[0] && IFrameSplitOperator.IsBool(aryArgs[1]))
+                {
+                    if (aryArgs[1]==true && this.AddKLineInfo) this.AddKLineInfo(aryArgs[0],true);
+                    else if (aryArgs[1]==false && this.DeleteKLineInfo) this.DeleteKLineInfo(aryArgs[0]);
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_ALL_KLINE_INFO_ID:
+                if (this.ClearKLineInfo) this.ClearKLineInfo();
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID:
+                if (param!=null) this.DragMode=param;
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID:
+                if (IFrameSplitOperator.IsBool(srcParam))
+                {
+                    if (srcParam) 
+                    {
+                        this.CreateExtendChart("SessionBreaksPaint", { }); 
+                        this.Draw();
+                    }
+                    else 
+                    {
+                        var finder=this.GetExtendChartByClassName("SessionBreaksPaint");
+                        if (finder) 
+                        {
+                            this.DeleteExtendChartByID(finder.Chart.ID);
+                            this.Draw();
+                        }
+                    }
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID:
+                var option={Name:'画图工具', Top:this.Frame.ChartBorder.Top };
+                var extendChart=this.CreateExtendChart(option.Name, option);   //创建扩展图形
+                this.SetSizeChange(true);
+                this.Draw();
+                break;
+            case JSCHART_MENU_ID.CMD_HIDE_DRAWTOOL_ID:
+                var drawTools=this.GetExtendChartByClassName('DrawToolsButton');
+                if (drawTools)
+                {
+                    var toolsWidth=drawTools.Chart.Width;
+                    var toolsIndex=parseInt(drawTools.Index);
+                    for(var i=toolsIndex+1; i<this.ExtendChartPaint.length; ++i)   //在画图工具后面创建的需要减去工具的宽度
+                    {
+                        var item=this.ExtendChartPaint[i];
+                        if (item.ClassName=='StockChip')
+                        {
+                            item.Left-=toolsWidth;
+                        }
+                    }
+                    this.DeleteExtendChart(drawTools); 
+                    this.Frame.ChartBorder.Right-=toolsWidth;
+                    this.SetSizeChange(true);
+                    this.Draw();
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID:
+                var option={Name:'筹码分布', ShowType:1, Width:230 };
+                var extendChart=this.CreateExtendChart(option.Name, option);   //创建扩展图形
+                this.SetSizeChange(true);
+                this.Draw();
+                break;
+            case JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:
+                var StockChip=chart.GetExtendChartByClassName('StockChip');
+                if (StockChip)
+                {
+                    var chipWidth=StockChip.Chart.Width;
+                    var chipIndex=parseInt(StockChip.Index);
+                    for(var i=chipIndex+1; i<this.ExtendChartPaint.length; ++i)   //在筹码后面创建的需要筹码的宽度
+                    {
+                        var item=this.ExtendChartPaint[i];
+                        if (item.ClassName=='DrawToolsButton')
+                        {
+                            item.Left-=chipWidth;
+                        }
+                    }
+                    this.DeleteExtendChart(StockChip); 
+                    this.Frame.ChartBorder.Right-=chipWidth;
+                    this.SetSizeChange(true);
+                    this.Draw();
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID:
+                if (IFrameSplitOperator.IsBool(srcParam))
+                    this.EnableSelectRect=srcParam;
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID:
+                if (this.ChangeDayCount && param!=null)
+                    this.ChangeDayCount(param);
+                break;
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -9099,11 +9303,12 @@ function GetScrollPosition()
     var scrollPos={};
     var scrollTop=0;
     var scrollLeft=0;
-    if(document.documentElement && document.documentElement.scrollTop)
+    if (document.documentElement && (document.documentElement.scrollTop || document.documentElement.scrollLeft))
     {
         scrollTop=document.documentElement.scrollTop;
         scrollLeft=document.documentElement.scrollLeft;
-    }else if(document.body)
+    }
+    else if(document.body)
     {
         scrollTop=document.body.scrollTop;
         scrollLeft=document.body.scrollLeft;
@@ -44067,7 +44272,8 @@ function FrameButtomToolbarPaint()
             this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
         }
 
-        var font=this.TitleFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);
+        var font=this.GetTitleFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);
+        var svgFont=this.GetSVGFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);
         this.Canvas.textBaseline='middle';
         this.Canvas.textAlign='center';
         this.Canvas.font=font;
@@ -44075,9 +44281,23 @@ function FrameButtomToolbarPaint()
         for(var i=0;i<this.AryButton.length;++i)
         {
             var item=this.AryButton[i];
-            if (!item.Title) return;
-            var textWidth=this.Canvas.measureText(item.Title).width+2;
-            var buttonWidth=textWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;
+            if (!item.Title && !(item.SVGButton && item.SVGButton.Symbol)) return;
+
+            var textWidth=0;
+            if (item.Title)
+            {
+                textWidth=this.Canvas.measureText(item.Title).width+2;
+            }
+            
+            var svgButtonWidth=0;
+            if (item.SVGButton && item.SVGButton.Symbol) 
+            {
+                svgButtonWidth=this.ButtonConfig.SVG.Size;
+                if (textWidth>0) svgButtonWidth+=this.ButtonConfig.SVG.MerginLeft;
+                
+            }
+
+            var buttonWidth=textWidth+svgButtonWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;
             var rtButton={ Left:xBotton, Top:rtBG.Top, Bottom:rtBG.Bottom, Height:rtBG.Height, Width:buttonWidth };
             rtButton.Right=rtButton.Left+rtButton.Width;
 
@@ -44114,12 +44334,50 @@ function FrameButtomToolbarPaint()
                 this.Canvas.stroke();
             }
 
-            this.Canvas.fillStyle=titleColor;
-            var xText=rtButton.Left+rtButton.Width/2;   //居中
-            var yText=rtButton.Top+this.ButtonConfig.Mergin.Top+(rtButton.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom)/2;
-            this.Canvas.fillText(item.Title,xText,yText);
+            if (item.Title)
+            {
+                this.Canvas.fillStyle=titleColor;
+                var xText=rtButton.Left+(rtButton.Width-svgButtonWidth)/2;   //居中
+                var yText=rtButton.Top+this.ButtonConfig.Mergin.Top+(rtButton.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom)/2;
+                this.Canvas.fillText(item.Title,xText,yText);
+            }
+           
+
+            var rtSVG=null;
+            if (item.SVGButton && item.SVGButton.Symbol) 
+            {
+                this.Canvas.font=svgFont;
+                this.Canvas.fillStyle=titleColor;
+                var xText=rtButton.Right-this.ButtonConfig.SVG.Size/2-this.ButtonConfig.Mergin.Right;
+                this.Canvas.fillText(item.SVGButton.Symbol,xText,yText);
+                this.Canvas.font=font;
+
+                rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size, Top:rtButton.Top, Width:this.ButtonConfig.SVG.Size, Height:this.ButtonConfig.SVG.Size};
+                rtSVG.Right=rtSVG.Left+rtSVG.Width;
+                rtSVG.Bottom=rtSVG.Top+rtSVG.Height;
+            }
+
+            //{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
+            if (textWidth>0 && svgButtonWidth>0)
+            {
+                var rtText={ Left:rtButton.Left, Top:rtButton.Top, Bottom:rtButton.Bottom };
+                rtText.Right=rtText.Left+textWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.SVG.MerginLeft/2;
+                var cacheItem={ Rect:rtText, ID:item.ID, Data:item, RectCell:rtButton, ButtonType:0 };  
+                this.AryRectButton.push(cacheItem);
+
+                var rtSVG={Left:rtText.Right, Right:rtButton.Right, Top:rtButton.Top, Bottom:rtButton.Bottom };
+                var cacheItem={ Rect:rtSVG, ID:item.ID, Data:item, RectCell:rtButton, ButtonType:1 };  
+                this.AryRectButton.push(cacheItem);
+            }
+            else
+            {
+                var cacheItem={ Rect:rtButton, ID:item.ID, Data:item, RectCell:rtButton };  //RectCell 全部的大小
+                if (textWidth>0) cacheItem.ButtonType=0;
+                else if (svgButtonWidth>0) cacheItem.ButtonType=1;
+                this.AryRectButton.push(cacheItem);
+            }
+            
             
-            this.AryRectButton.push({ Rect:rtButton, ID:item.ID, Data:item });
 
             xBotton+=buttonWidth+1;
         }
@@ -44148,13 +44406,22 @@ function FrameButtomToolbarPaint()
         return null;
     }
 
-    this.TitleFont=function(height)
+    this.GetTitleFont=function(height)
     {
         var config=this.ButtonConfig.Font;
-        var fontSize=height;
+        var fontSize=height*GetDevicePixelRatio();
         if (IFrameSplitOperator.IsPlusNumber(config.Size)) fontSize=config.Size;
         
-        var font=`${fontSize*GetDevicePixelRatio()}px ${config.Family}`;
+        var font=`${fontSize}px ${config.Family}`;
+        return font;
+    }
+
+    this.GetSVGFont=function(height)
+    {
+        var config=this.ButtonConfig.SVG;
+        var fontSize=height*GetDevicePixelRatio();
+        if (IFrameSplitOperator.IsPlusNumber(config.Size)) fontSize=config.Size;
+        var font=`${fontSize}px ${config.Family}`;
         return font;
     }
 
@@ -44167,7 +44434,7 @@ function FrameButtomToolbarPaint()
             if (x>rect.Left && x<rect.Right && y>rect.Top && y<rect.Bottom)
             {
                 var frame=this.GetFrame();
-                var result={ ID:item.Data.ID, Rect:rect, FrameID:this.FrameID, Frame:frame, Data:item.Data };
+                var result={ ID:item.Data.ID, Rect:rect, FrameID:this.FrameID, Frame:frame, Data:item.Data, ButtonType:item.ButtonType, RectCell:item.RectCell, };
                 return result;
             }
         }
@@ -53508,7 +53775,7 @@ function IChartDrawPicture()
         if (option.LineWidth>0) this.LineWidth=option.LineWidth;
         if (option.AreaColor) this.AreaColor=option.AreaColor;
         if (option.PointColor) this.PointColor=option.PointColor;
-        if (option.MoveOnPointColor) this.SelectPointColor=option.PointColor;
+        if (option.MoveOnPointColor) this.MoveOnPointColor=option.MoveOnPointColor;
         if (option.PointRadius) this.PointRadius=option.PointRadius;
         if (IFrameSplitOperator.IsNumber(option.SquareSize)) this.SquareSize=option.SquareSize;
         if (IFrameSplitOperator.IsBool(option.IsShowPoint)) this.IsShowPoint=option.IsShowPoint;
@@ -53707,8 +53974,8 @@ function IChartDrawPicture()
             for(var i=0; i<this.Point.length; ++i)
             {
                 var item=this.Point[i];
-                var xValue=parseInt(this.Frame.GetXData(item.Y));
-                var yValue=this.Frame.GetYData(item.X);
+                var xValue=parseInt(this.Frame.GetXData(item.Y,false));
+                var yValue=this.Frame.GetYData(item.X,false);
 
                 var valueItem={ XValue:xValue, YValue:yValue };
                 var minuteItem=data.Data[xValue];
@@ -53722,8 +53989,8 @@ function IChartDrawPicture()
             for(var i=0; i<this.Point.length; ++i)
             {
                 var item=this.Point[i];
-                var xValue=parseInt(this.Frame.GetXData(item.X));
-                var yValue=this.Frame.GetYData(item.Y);
+                var xValue=parseInt(this.Frame.GetXData(item.X,false));
+                var yValue=this.Frame.GetYData(item.Y,false);
 
                 if (xValue>=data.Data.length) //超过当前数据,直接读固定时间
                 {
@@ -53798,7 +54065,7 @@ function IChartDrawPicture()
         }
 
         data.FindDataIndexByDateTime(aryDateTime);
-        for(var i in aryDateTime)
+        for(var i=0; i<aryDateTime.length; ++i)
         {
             var findItem=aryDateTime[i];
             var valueItem=this.Value[i];
@@ -53806,6 +54073,17 @@ function IChartDrawPicture()
         }
     }
 
+    //重置X索引数据
+    this.ResetXValue=function()
+    {
+        for(var i=0; i<this.Value.length; ++i)
+        {
+            var item=this.Value[i];
+            item.XValue=null;
+        }
+        return true;
+    }
+
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
@@ -53931,6 +54209,8 @@ function IChartDrawPicture()
             for(var i=0; i<this.Value.length; ++i)
             {
                 var item=this.Value[i];
+                if (!IFrameSplitOperator.IsNumber(item.XValue)) return null;    //无效索引 不显示
+
                 var dataIndex=item.XValue-data.DataOffset;
                 if (dataIndex<0 || dataIndex>=showCount) ++invaildX;
             
@@ -55001,7 +55281,7 @@ function ChartDrawPictureLine()
         if (this.IsFrameMinSize()) return;
         if (!this.IsShow) return;
 
-        var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
+        var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:false} );
         if (!drawPoint) return;
         if (drawPoint.length!=2) return;
 
@@ -64834,12 +65114,14 @@ function JSChartResource()
         BorderColor:"rgb(204,204,204)",
         Button:
         {
-            Font:{ Family:"微软雅黑" },
+            Font:{ Family:"微软雅黑", Size:12*GetDevicePixelRatio() },
             TitleColor: { Selected:"rgb(255,255,255)", Default:"rgb(125,125,125)", MoveOn:"rgb(234,85,4)" },
             BGColor: {  Selected:"rgb(234,85,4)", Default:"rgb(235,235,235)", MoveOn:"rgb(242,242,242)" },
             BorderColor:"rgb(204,204,204)",
 
-            Mergin: { Left:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), Top:4*GetDevicePixelRatio(), Bottom:2*GetDevicePixelRatio() }
+            Mergin: { Left:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), Top:4*GetDevicePixelRatio(), Bottom:2*GetDevicePixelRatio() },
+
+            SVG:{ Family:"iconfont", Size:12*GetDevicePixelRatio(), MerginLeft:4*GetDevicePixelRatio() }
         }
     }
 
@@ -65858,6 +66140,15 @@ function JSChartResource()
                 if (IFrameSplitOperator.IsNumber(item.Top)) destItem.Top=item.Top;
                 if (IFrameSplitOperator.IsNumber(item.Bottom)) destItem.Bottom=item.Bottom;
             }
+
+            if (button.SVG)
+            {
+                var item=button.SVG;
+                var destItem=this.FrameButtomToolbar.Button.SVG;
+                if (IFrameSplitOperator.IsNumber(item.Size)) destItem.Size=item.Size;
+                if (IFrameSplitOperator.IsNumber(item.MerginLeft)) destItem.MerginLeft=item.MerginLeft;
+                if (item.Family) destItem.Family=item.Family;
+            }
         }
         
     }
@@ -72169,12 +72460,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-
     //注册鼠标右键事件
     this.OnRightMenu=function(x,y,e)
     {
         var pixelTatio = GetDevicePixelRatio(); //x,y 需要乘以放大倍速
-        if (this.RightMenu)
+        if (this.EnablePopMenuV2)
+        {
+            var frameId=this.Frame.PtInFrame(x*pixelTatio,y*pixelTatio);
+            this.PopuRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId}, e);
+        }
+        else if (this.RightMenu)
         {
             var frameId=this.Frame.PtInFrame(x*pixelTatio,y*pixelTatio);
             e.data={ Chart:this, FrameID:frameId };
@@ -72190,11 +72485,286 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
+    //右键菜单数据
+    this.GetRightMenuData=function(frameID)
+    {
+        var windowCount=this.Frame.SubFrame.length; //窗口个数
+        var klineChart=this.ChartPaint[0];
+        var priceGap=klineChart.PriceGap;                   //缺口配置信息
+        var coordinateType=null, yCoordinateType=null;      //坐标类型
+        var mainFrame=null;
+        if (this.Frame.SubFrame[0] && this.Frame.SubFrame[0].Frame) mainFrame=this.Frame.SubFrame[0].Frame;
+        if (mainFrame) 
+        {
+            coordinateType=mainFrame.CoordinateType;
+            if (mainFrame.YSplitOperator) yCoordinateType=mainFrame.YSplitOperator.CoordinateType;
+        }
+
+        var aryKLineInfo=[];    //信息地雷
+        for(var i=0;i<this.ChartInfo.length;++i)
+        {
+            var item=this.ChartInfo[i];
+            if (item && item.ClassName) aryKLineInfo.push(item.ClassName);
+        }
+
+        var aryOverlaySymbol=[];    //叠加的股票列表
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            if (item && item.Symbol) aryOverlaySymbol.push(item.Symbol)
+        }
+
+        var bBGSpit=false, bShowDrawTool=false, bShowStockChip=false;
+        if (this.GetExtendChartByClassName("SessionBreaksPaint")) bBGSpit=true;
+        if (this.GetExtendChartByClassName('DrawToolsButton')) bShowDrawTool=true;  //画图工具
+        if (this.GetExtendChartByClassName('StockChip')) bShowStockChip=true;       //筹码
+
+        var aryMenu=
+        [
+            { 
+                Name:"分析周期", 
+                SubMenu:
+                [
+                    { Name:"日线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[0] }, Checked:this.Period==0 },
+                    { Name:"周线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[1] }, Checked:this.Period==1 },
+                    { Name:"双周线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[21]}, Checked:this.Period==21   },
+                    { Name:"月线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[2]}, Checked:this.Period==2 },
+                    { Name:"季线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[9]}, Checked:this.Period==9  },
+                    { Name:"半年", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[22]}, Checked:this.Period==22  },
+                    { Name:"年线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[3]}, Checked:this.Period==3  },
+                    { Name:"1分", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[4]}, Checked:this.Period==4  },
+                    { Name:"5分", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[5]}, Checked:this.Period==5  },
+                    { Name:"15分", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[6]}, Checked:this.Period==6  },
+                    { Name:"30分", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[7]}, Checked:this.Period==7  },
+                    { Name:"60分", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[8]}, Checked:this.Period==8  },
+                    { Name:"2小时", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[11]}, Checked:this.Period==11  },
+                    { Name:"4小时", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[12]}, Checked:this.Period==12  },
+                    { Name:"分笔", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[10]}, Checked:this.Period==10  },
+                    { Name:"自定义周期:3分钟", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[20003]}, Checked:this.Period==20003  },
+                    { Name:"自定义周期:35分钟", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[20035]}, Checked:this.Period==20035  },
+                    { Name:"自定义周期:8日", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID, Args:[40008]}, Checked:this.Period==40008  },
+                ]
+            },
+            { 
+                Name:"指标切换", 
+                SubMenu:
+                [
+                    { Name:"均线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "均线"]}},
+                    { Name:"BOLL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "BOLL"]}},
+                    { Name:"MACD", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD"]}},
+                    { Name:"KDJ", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "KDJ"]}},
+                    { Name:"VOL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "VOL"]}},
+                    { Name:"RSI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "RSI"]}},
+                    { Name:"BRAR", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "BRAR"]}},
+                    { Name:"WR", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "WR"]}},
+                ]
+            },
+            { 
+                Name:"五彩K线", 
+                SubMenu:
+                [
+                    { Name:"十字星", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-十字星"]}},
+                    { Name:"早晨之星", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-早晨之星"]}},
+                    { Name:"垂死十字", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-垂死十字"]}},
+                    { Name:"三只乌鸦", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-三只乌鸦"]}},
+                    { Name:"光脚阴线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-光脚阴线"]}},
+                    { Name:"黄昏之星", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID, Args:["五彩K线-黄昏之星"]}},
+                ]
+
+            },
+            { 
+                Name:"专家系统", 
+                SubMenu:
+                [
+                    { Name:"BIAS", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-BIAS"]}},
+                    { Name:"CCI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-CCI"]}},
+                    { Name:"DMI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-DMI"]}},
+                    { Name:"KD", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-KD"]}},
+                    { Name:"BOLL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-BOLL"]}},
+                    { Name:"KDJ", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID, Args:["交易系统-KDJ"]}},
+                ]
+            },
+            { 
+                Name:"信息地雷", 
+                SubMenu:
+                [
+                    { Name:"公告", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["公告", !aryKLineInfo.includes("AnnouncementInfo")]}, Checked:aryKLineInfo.includes("AnnouncementInfo") },
+                    { Name:"业绩预告", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["业绩预告", !aryKLineInfo.includes("PforecastInfo")]}, Checked:aryKLineInfo.includes("PforecastInfo") },
+                    { Name:"调研", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["调研", !aryKLineInfo.includes("ResearchInfo") ]}, Checked:aryKLineInfo.includes("ResearchInfo") },
+                    { Name:"大宗交易", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["大宗交易", !aryKLineInfo.includes("BlockTrading")]}, Checked:aryKLineInfo.includes("BlockTrading") },
+                    { Name:"龙虎榜", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["龙虎榜", !aryKLineInfo.includes("TradeDetail")]}, Checked:aryKLineInfo.includes("TradeDetail") },
+                    { Name:"互动易", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["互动易", !aryKLineInfo.includes("InvestorInfo")]}, Checked:aryKLineInfo.includes("InvestorInfo") },
+                ]
+            },
+            { 
+                Name:"缺口提示", 
+                SubMenu:
+                [
+                    { Name:"显示1个缺口", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID, Args:[true, 1]}, Checked:(priceGap.Enable==true && priceGap.Count==1) },
+                    { Name:"显示2个缺口", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID, Args:[true, 2]}, Checked:(priceGap.Enable==true && priceGap.Count==2) },
+                    { Name:"显示3个缺口", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID, Args:[true, 3]}, Checked:(priceGap.Enable==true && priceGap.Count==3) },
+                    { Name:"隐藏缺口", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID, Args:[false]}, Checked:priceGap.Enable==false },
+                ]
+            },
+            { 
+                Name:"叠加品种", 
+                SubMenu:
+                [
+                    { Name:"上证指数", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["000001.sh", !aryOverlaySymbol.includes("000001.sh")]}, Checked:aryOverlaySymbol.includes("000001.sh") },
+                    { Name:"深证成指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399001.sz", !aryOverlaySymbol.includes("399001.sz")]}, Checked:aryOverlaySymbol.includes("399001.sz") },
+                    { Name:"中小板指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399005.sz", !aryOverlaySymbol.includes("399005.sz")]}, Checked:aryOverlaySymbol.includes("399005.sz") },
+                    { Name:"创业板指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399006.sz", !aryOverlaySymbol.includes("399006.sz")]}, Checked:aryOverlaySymbol.includes("399006.sz") },
+                    { Name:"沪深300", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["000300.sh", !aryOverlaySymbol.includes("000300.sh")]}, Checked:aryOverlaySymbol.includes("000300.sh")},
+                ]
+            },
+            { 
+                Name:"主图线型", 
+                SubMenu:
+                [
+                    { Name:"K线(空心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[3]} },
+                    { Name:"K线(实心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[0]} },
+                    { Name:"美国线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:false }]} },
+                    { Name:"美国线(细)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:true }]} },
+                    { Name:"收盘线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[1]} },
+                    { Name:"收盘面积", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[4]} },
+                    { Name:"K线(空心阳线阴线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[6]} },
+                    { Name:"Heikin Ashi", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[11]} },
+                    { Name:"Line Break", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[12]} },
+                    { Name:"High-low", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[13]} },
+                    { Name:"HLC Area", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[15]} },
+                ]
+            },
+            { 
+                Name:"坐标类型", 
+                SubMenu:
+                [
+                    { Name:"反转坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ IsReverse:coordinateType==0 }]}, Checked:coordinateType==1 },
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+
+                    { Name:"普通坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:0 }]}, Checked:yCoordinateType==0 },
+                    { Name:"百分比坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:1 }]}, Checked:yCoordinateType==1 },
+                    { Name:"对数坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:2 }]}, Checked:yCoordinateType==2 },
+                    { Name:"等比坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:3 }]}, Checked:yCoordinateType==3 },
+                    { Name:"等分坐标", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:4 }]}, Checked:yCoordinateType==4 },
+                    { Name:"黄金分割", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID, Args:[{ Type:5 }]}, Checked:yCoordinateType==5},
+
+                ]
+            },
+            { 
+                Name:"指标窗口个数",
+                SubMenu:
+                [
+                    { Name:"1个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[2]}, Checked:2==windowCount },
+                    { Name:"2个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[3]}, Checked:3==windowCount },
+                    { Name:"3个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[4]}, Checked:4==windowCount },
+                    { Name:"4个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[5]}, Checked:5==windowCount },
+                    { Name:"5个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[6]}, Checked:6==windowCount },
+                ]
+            },
+            {
+                Name:"其他设置",
+                SubMenu:
+                [
+                    
+                    { Name:"禁止拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[0]}, Checked:0==this.DragMode },
+                    { Name:"启动拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1]}, Checked:1==this.DragMode },
+                    { Name:"区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[2]}, Checked:2==this.DragMode },
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+
+                    { Name:"背景分割", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID, Args:[!bBGSpit]}, Checked:bBGSpit},
+
+                    { Name:"画图工具", Data:{ ID:bShowDrawTool?JSCHART_MENU_ID.CMD_HIDE_DRAWTOOL_ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:bShowDrawTool},
+
+                    { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
+                ]
+            }
+        ];
+
+        //复权
+        if(!MARKET_SUFFIX_NAME.IsSHSZIndex(this.Symbol) && !MARKET_SUFFIX_NAME.IsBIT(this.Symbol))
+        {
+            var rightMenu=
+            {
+                Name:"复权处理",
+                SubMenu:
+                [
+                    { Name:"不复权", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID, Args:[0]}, Checked:0==this.Right },
+                    { Name:"前复权", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID, Args:[1]}, Checked:1==this.Right },
+                    { Name:"后复权", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID, Args:[2]}, Checked:2==this.Right }
+                ]
+            };
+
+            aryMenu.splice(1,0,rightMenu);
+        }
+
+        //删除菜单
+        for(var i=0;i<aryMenu.length;++i)
+        {
+            var item=aryMenu[i];
+            if (item.Name=="五彩K线")
+            {
+                if (this.ColorIndex) 
+                {   
+                    item.SubMenu.push({ Name:JSPopMenu.SEPARATOR_LINE_NAME });
+                    item.SubMenu.push({ Name:"删除五彩K线", Data:{ ID: JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID} });
+                }
+            }
+            else if (item.Name=="专家系统")
+            {
+                if (this.TradeIndex) 
+                {
+                    item.SubMenu.push({ Name:JSPopMenu.SEPARATOR_LINE_NAME });
+                    item.SubMenu.push({ Name:"删除专家系统", Data:{ ID: JSCHART_MENU_ID.CMD_DELETE_TRADE_INDEX_ID} });
+                }
+            }
+            else if (item.Name=="叠加品种")
+            {
+                for(var j=0;j<item.SubMenu.length;++j)
+                {
+                    if (item.SubMenu[j].Checked)
+                    {
+                        item.SubMenu.push({ Name:JSPopMenu.SEPARATOR_LINE_NAME });
+                        item.SubMenu.push({ Name:"取消叠加", Data:{ ID: JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID} });
+                        break;
+                    }
+                }
+            }
+            else if (item.Name=="信息地雷")
+            {
+                for(var j=0;j<item.SubMenu.length;++j)
+                {
+                    if (item.SubMenu[j].Checked)
+                    {
+                        item.SubMenu.push({ Name:JSPopMenu.SEPARATOR_LINE_NAME });
+                        item.SubMenu.push({ Name:"删除所有", Data:{ ID: JSCHART_MENU_ID.CMD_DELETE_ALL_KLINE_INFO_ID} });
+                        break;
+                    }
+                }
+            }
+        }
+
+        return aryMenu;
+    }
+
+    this.PopuRightMenuV2=function(data,e)
+    {
+        if (!this.JSPopMenu) return;
+        var x=data.X, y=data.Y;
+        var frameID=data.FrameID;
+        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        this.PopuMenuByRClick(menuData, x, y);
+    }
+
     //重新加载画图工具(切换股票|周期)
     this.ReloadChartDrawPicture=function()
     {
         this.ChartDrawPicture=[];
-        this.ChartDrawStorageCache;
+        if (this.SelectChartDrawPicture)  this.SelectChartDrawPicture.IsSelected=false; 
+        this.SelectChartDrawPicture=null;
+        this.CurrentChartDrawPicture=null;
+
         if (this.ChartDrawStorage)
         {
             this.ChartDrawStorageCache=this.ChartDrawStorage.GetDrawData( {Symbol:this.Symbol, Period:this.Period} );
@@ -73585,7 +74155,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_EXTENDCHART_BUTTON);
         if (event && event.Callback)
         {
-            var data={ Info:button, PreventDefault:false  };    //PreventDefault 是否阻止内置的点击处理
+            var data={ Info:button, PreventDefault:false, e:e  };    //PreventDefault 是否阻止内置的点击处理
             event.Callback(event,data,this);
             if (data.PreventDefault) return;
         }
@@ -75552,7 +76122,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //注册鼠标右键事件
     this.OnRightMenu=function(x,y,e)
     {
-        if (this.RightMenu)
+        var pixelTatio = GetDevicePixelRatio(); //x,y 需要乘以放大倍速
+        if (this.EnablePopMenuV2)
+        {
+            var frameId=this.Frame.PtInFrame(x*pixelTatio,y*pixelTatio);
+            this.PopuRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId}, e);
+        }
+        else if (this.RightMenu)
         {
             var frameId=this.Frame.PtInFrame(x,y);
             e.data={ Chart:this, FrameID:frameId };
@@ -75568,6 +76144,107 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    //右键菜单数据
+    this.GetRightMenuData=function(frameID)
+    {
+        var windowCount=this.Frame.SubFrame.length; //窗口个数
+
+        var aryOverlaySymbol=[];                    //叠加的股票列表
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            if (item && item.Symbol) aryOverlaySymbol.push(item.Symbol)
+        }
+
+        var aryMenu=
+        [
+            { 
+                Name:"叠加品种", 
+                SubMenu:
+                [
+                    { Name:"上证指数", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["000001.sh", !aryOverlaySymbol.includes("000001.sh")]}, Checked:aryOverlaySymbol.includes("000001.sh") },
+                    { Name:"深证成指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399001.sz", !aryOverlaySymbol.includes("399001.sz")]}, Checked:aryOverlaySymbol.includes("399001.sz") },
+                    { Name:"中小板指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399005.sz", !aryOverlaySymbol.includes("399005.sz")]}, Checked:aryOverlaySymbol.includes("399005.sz") },
+                    { Name:"创业板指", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["399006.sz", !aryOverlaySymbol.includes("399006.sz")]}, Checked:aryOverlaySymbol.includes("399006.sz") },
+                    { Name:"沪深300", Data:{ ID: JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID, Args:["000300.sh", !aryOverlaySymbol.includes("000300.sh")]}, Checked:aryOverlaySymbol.includes("000300.sh")},
+                ]
+            },
+            {
+                Name:"多日分时图",
+                SubMenu:
+                [
+                    { Name:"当日分时图", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[1]}, Checked:this.DayCount==1 },
+                    { Name:"最近2日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[2]}, Checked:this.DayCount==2 },
+                    { Name:"最近3日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[3]}, Checked:this.DayCount==3 },
+                    { Name:"最近4日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[4]}, Checked:this.DayCount==4 },
+                    { Name:"最近5日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[5]}, Checked:this.DayCount==5 },
+                ]
+            },
+            {
+                Name:"指标窗口个数",
+                SubMenu:
+                [
+                    { Name:"1个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[2]}, Checked:3==windowCount },
+                    { Name:"2个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[3]}, Checked:4==windowCount },
+                    { Name:"3个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[4]}, Checked:5==windowCount },
+                    { Name:"4个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[5]}, Checked:6==windowCount },
+                    { Name:"5个窗口", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID, Args:[6]}, Checked:7==windowCount },
+                ]
+            },
+            {
+                Name:"指标切换",
+                SubMenu:
+                [
+                    { Name:"MACD", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD"]}},
+                    { Name:"DMI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "DMI"]}},
+                    { Name:"DMA", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "DMA"]}},
+                    { Name:"BRAR", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "BRAR"]}},
+                    { Name:"KDJ", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "KDJ"]}},
+                    { Name:"RSI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "RSI"]}},
+                    { Name:"WR", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "WR"]}},
+                    { Name:"CCI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "CCI"]}},
+                    { Name:"TRIX", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "TRIX"]}},
+                ]
+            },
+            {
+                Name:"区间选择",Data:{ ID: JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID, Args:[!this.EnableSelectRect]}, Checked:this.EnableSelectRect
+            }
+
+        ];
+
+        
+        //删除菜单
+        for(var i=0;i<aryMenu.length;++i)
+        {
+            var item=aryMenu[i];
+            if (item.Name=="叠加品种")
+            {
+                for(var j=0;j<item.SubMenu.length;++j)
+                {
+                    if (item.SubMenu[j].Checked)
+                    {
+                        item.SubMenu.push({ Name:JSPopMenu.SEPARATOR_LINE_NAME });
+                        item.SubMenu.push({ Name:"取消叠加", Data:{ ID: JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID} });
+                        break;
+                    }
+                }
+            }
+        }
+
+        return aryMenu;
+    }
+
+    this.PopuRightMenuV2=function(data,e)
+    {
+        if (!this.JSPopMenu) return;
+        var x=data.X, y=data.Y;
+        var frameID=data.FrameID;
+        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        this.PopuMenuByRClick(menuData, x, y);
+    }
+
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
@@ -76672,15 +77349,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.ResetDayOffset();
         }
         
-        if (this.DayCount>1)
-        {
-            this.ChartDrawPicture=[];
-        }
-        else
-        {
-            this.ReloadChartDrawPicture();
-        }
-
+        this.ReloadChartDrawPicture();
         this.ResetDataStatus();
         this.ClearIndexPaint();             //清空指标
         this.Frame.ClearYCoordinateMaxMin();
@@ -77202,6 +77871,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.TitlePaint[0].IsShowDate=true;
         this.UpdateDataOffset();
         this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.CreateChartDrawPictureByStorage(); //创建画图工具
 
         //执行脚本
         if (this.Frame.SubFrame.length>2)
@@ -77500,7 +78170,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.UpdateLatestMinuteDataV2(minuteData);
             this.UpdateHistoryMinuteUI(updateTime);
             this.RecvMinuteDataEvent({FunctionName:"RecvUpdateMinuteData"} );
-            this.RequestOverlayMinuteData();    //请求叠加数据 (主数据下载完再下载)
+            this.RequestOverlayMinuteData();        //请求叠加数据 (主数据下载完再下载)
             this.BindAllOverlayIndexData(this.SourceData);
             this.AutoUpdateEvent(true, "MinuteChartContainer::RecvUpdateMinuteData");
             this.AutoUpdate();
@@ -78920,7 +79590,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ReloadChartDrawPicture=function()
     {
         this.ChartDrawPicture=[];
-        this.ChartDrawStorageCache;
+        if (this.SelectChartDrawPicture)  this.SelectChartDrawPicture.IsSelected=false; 
+        this.SelectChartDrawPicture=null;
+        this.CurrentChartDrawPicture=null;
+        this.MoveOnChartDrawPicture=null;
+        
         if (this.ChartDrawStorage)
         {
             this.ChartDrawStorageCache=this.ChartDrawStorage.GetDrawData( { Symbol:this.Symbol, Period:888888888 } );
@@ -78931,7 +79605,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         if (!this.ChartDrawStorageCache || this.ChartDrawStorageCache.length<=0) return;
 
-        for(var i in this.ChartDrawStorageCache)
+        var self=this;
+        for(var i=0; i<this.ChartDrawStorageCache.length; ++i)
         {
             var item=this.ChartDrawStorageCache[i];
             if (item.FrameID<0 || !this.Frame.SubFrame || this.Frame.SubFrame.length<item.FrameID) continue;
@@ -78942,8 +79617,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             drawPicture.Canvas=this.Canvas;
             drawPicture.Status=10;
             drawPicture.Frame=this.Frame.SubFrame[item.FrameID].Frame;  //绑定框架坐标
+            if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(item);
+            drawPicture.ResetXValue();
             drawPicture.UpdateXValue();
             drawPicture.ValueToPoint();
+            drawPicture.GetActiveDrawPicture=()=>{ return this.GetActiveDrawPicture(); }
 
             if (drawPicture.ClassName==='ChartDrawPictureText') drawPicture.IsInitialized=true;