hqchart 1.1.13206 → 1.1.13210

package/lib/umychart.vue.js

@@ -1482,7 +1482,11 @@ CMD_HIDE_STOCKCHIP_ID:21,CMD_ENABLE_SELECT_RECT_ID:22,//启动区间选择
 CMD_CHANGE_DAY_COUNT_ID:23,//切换天数
 CMD_SHOW_BEFORE_DATA_ID:24,//显示|隐藏集合竞价
 CMD_SELECTED_ZOOM_ID:25,//选中放大
-CMD_SELECTED_SUMMARY_ID:26//区间统计
+CMD_SELECTED_SUMMARY_ID:26,//区间统计
+CMD_SHOW_INDEX_ID:27,//显示隐藏指标
+CMD_SHOW_OVERLAY_INDEX_ID:28,//显示隐藏叠加指标
+CMD_DELETE_OVERLAY_INDEX_ID:29,//删除叠加指标
+CMD_SHOW_OVERLAY_Y_AXIS_ID:30//显示隐藏Y轴叠加指标
 };function PhoneDBClick(){this.Start=[];this.Clear=function(){this.Start=[];};this.AddTouchStart=function(x,y,time){if(this.Start.length>0){var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>0&&spanTime<300){this.Start.push({X:x,Y:y,Time:time});}else{this.Start=[];}}else{this.Start.push({X:x,Y:y,Time:time});}};this.IsVaildDBClick=function(){if(this.Start.length==2)return true;return false;};this.AddTouchEnd=function(time){if(this.Start.length<=0)return;var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>=0&&spanTime<150){}else{this.Start=[];}};}/*
     图形控件
 */function JSChartContainer(uielement,OffscreenElement,cacheElement){var _this5=this;this.ClassName='JSChartContainer';var _self=this;this.Frame;//框架画法
@@ -1979,7 +1983,11 @@ if(this.ChangePriceGap&&IFrameSplitOperator.IsBool(aryArgs[0])){if(aryArgs[0]==f
 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;case JSCHART_MENU_ID.CMD_SHOW_BEFORE_DATA_ID:if(this.ShowCallAuctionData&&IFrameSplitOperator.IsBool(srcParam))this.ShowCallAuctionData({Left:srcParam,MultiDay:{Left:srcParam}});break;case JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID:if(this.ShowSelectData&&srcParam)this.ShowSelectData(srcParam);break;case JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID:var dlg=new KLineSelectRectDialog(this.DivElement);dlg.DoModal(srcParam);break;}};//点击右键菜单
+{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;case JSCHART_MENU_ID.CMD_SHOW_BEFORE_DATA_ID:if(this.ShowCallAuctionData&&IFrameSplitOperator.IsBool(srcParam))this.ShowCallAuctionData({Left:srcParam,MultiDay:{Left:srcParam}});break;case JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID:if(this.ShowSelectData&&srcParam)this.ShowSelectData(srcParam);break;case JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID:var dlg=new KLineSelectRectDialog(this.DivElement);dlg.DoModal(srcParam);break;case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID://显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
+if(param==null||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;var windowIndex=param,showType=aryArgs[1];var script=this.WindowIndex[windowIndex];if(!script)return false;if(showType==1)script.IsShow=false;else if(showType==2)script.IsShow=true;else script.IsShow=!script.IsShow;this.UpdateWindowIndex(windowIndex);break;case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID://显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
+if(!srcParam||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;var indexGuid=srcParam,showType=aryArgs[1];var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return false;var script=overlay.OverlayItem.Script;if(showType==1)script.IsShow=false;else if(showType==2)script.IsShow==true;else script.IsShow=!script.IsShow;this.UpdateOverlayIndex(indexGuid);break;case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:if(srcParam&&this.DeleteOverlayWindowsIndex)this.DeleteOverlayWindowsIndex(srcParam);break;case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:if(!srcParam||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;if(!this.GetOverlayIndexByIdentify)return false;var indexGuid=srcParam,showType=aryArgs[1];var finder=this.GetOverlayIndexByIdentify(indexGuid);if(!finder||!finder.OverlayItem)return false;var frame=finder.OverlayItem.Frame;if(showType==1)frame.IsShow=false;else if(showType==2)frame.IsShow==true;else frame.IsShow=!frame.IsShow;this.UpdataDataoffset();//更新数据偏移
+this.UpdateFrameMaxMin();//调整坐标最大 最小值
+this.Draw();break;}};this.GetShowIndexMenuData=function(windowIndex,showType){var script=this.WindowIndex[windowIndex];if(!script)return null;var data={Name:script.IsShow?"隐藏指标":"显示指标",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_INDEX_ID,Args:[windowIndex,0]}};return data;};this.GetShowOverlayIndexMenuData=function(indexGuid,showType){var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return null;var script=overlay.OverlayItem.Script;var data={Name:script.IsShow?"隐藏指标":"显示指标",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID,Args:[indexGuid,0]}};return data;};this.GetShowOverlayIndexYAxisMenuData=function(indexGuid,showType){var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return null;var frame=overlay.OverlayItem.Frame;var data={Name:frame.IsShow?"隐藏Y轴":"显示Y轴",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID,Args:[indexGuid,0]}};return data;};//点击右键菜单
 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 event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);//回调通知外部
@@ -5805,7 +5813,7 @@ if(left+textWidth>right)break;this.Canvas.fillText(text,left,bottom,textWidth);l
 }};this.OnDrawEventCallback=function(drawData){if(!this.OnDrawEvent||!this.OnDrawEvent.Callback)return;var data={Draw:drawData,Name:'DynamicChartTitlePainting'};this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);};this.GetFontHeight=function(font){return GetFontHeight(this.Canvas,font,"擎");};//指标名字按钮
 this.DrawNameButton=function(rtButton,moveonPoint,mouseStatus){var pixelRatio=GetDevicePixelRatio();var title=this.Title;if(this.IsShowNameArrow)title+='▼';var textWidth=this.Canvas.measureText(title).width;var bgHeight=this.Canvas.measureText("擎").width+4*pixelRatio;var roundRadius=this.BorderRoundRadius*pixelRatio;var bgWidth=textWidth+4*pixelRatio+roundRadius*2;rtButton.Top=rtButton.YCenter-bgHeight/2-1,rtButton.Width=bgWidth;rtButton.Height=bgHeight;rtButton.Right=rtButton.Left+rtButton.Width;rtButton.Bottom=rtButton.Top+rtButton.Height;var borderColor=this.BGBorderColor;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){if(this.BGBorderMoveOnColor)borderColor=this.BGBorderMoveOnColor;if(mouseStatus){var btnItem={ID:JSCHART_BUTTON_ID.INDEX_NAME_BUTTON};mouseStatus.MouseOnToolbar={ID:"IndexNameButton",Rect:rtButton,Item:btnItem,Frame:this.Frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}}if(this.NameButtonStyle==1){this.Canvas.beginPath();this.Canvas.roundRect(ToFixedPoint(rtButton.Left),ToFixedPoint(rtButton.Top),ToFixedRect(rtButton.Width),ToFixedRect(rtButton.Height),[roundRadius]);this.Canvas.closePath();this.Canvas.fillStyle=this.BGColor;this.Canvas.fill();if(borderColor){this.Canvas.strokeStyle=borderColor;this.Canvas.stroke();}}else{this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);if(borderColor){this.Canvas.strokeStyle=borderColor;this.Canvas.strokeRect(ToFixedPoint(rtButton.Left),ToFixedPoint(rtButton.Top),ToFixedRect(rtButton.Width),ToFixedRect(rtButton.Height),[roundRadius]);}}this.Canvas.fillStyle=this.TitleColor;this.Canvas.fillText(title,rtButton.Left+roundRadius+2*pixelRatio,rtButton.YCenter,textWidth);};//绘制按钮
 this.DrawButton=function(item,rtButton,moveonPoint,mouseStatus){var size=item.Style.Size;if(IFrameSplitOperator.IsNumber(item.Style.YMoveOffset))rtButton.YCenter+=item.Style.YMoveOffset;var font=size+'px '+item.Style.Family;rtButton.Top=rtButton.YCenter-size/2;rtButton.Width=size+item.Style.MerginLeft;rtButton.Height=size;rtButton.Bottom=rtButton.Top+rtButton.Height;rtButton.Right=rtButton.Left+rtButton.Width;var color=item.Style.Color;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){color=item.Style.MoveOnColor;if(mouseStatus)mouseStatus.MouseOnToolbar={ID:"TitleButton",Rect:rtButton,Item:item,Frame:this.Frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}this.Canvas.fillStyle=color;this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Style.Text,rtButton.Left,rtButton.YCenter);return true;};this.DrawToolbar=function(toolbarInfo,moveonPoint,mouseStatus){toolbarInfo.Width=0;if(!this.Frame||!this.Frame.GetLeftToolbar)return;var aryButton=this.Frame.GetLeftToolbar();if(!IFrameSplitOperator.IsNonEmptyArray(aryButton))return;if(this.Frame.IsHScreen===true){}else{var border=this.Frame.GetBorder();var right=border.Right-3;var left=border.Left+3;var yCenter=toolbarInfo.YCenter;for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var rtButton={Left:left,YCenter:yCenter};this.DrawButton(item,rtButton,moveonPoint,mouseStatus);this.Buttons.push({ID:item.ID,Rect:rtButton,FrameID:this.Frame.Identify,Type:0,Data:item.Data});//Type 0=主图按钮 1=附图按钮 2=主图指标名字按钮
-left=rtButton.Right;toolbarInfo.Width+=rtButton.Width;}if(toolbarInfo.Width>0)toolbarInfo.Width+=3;}};this.DrawOverlayToolbar=function(overlayItem,toolbarInfo,moveonPoint,mouseStatus){toolbarInfo.Width=0;if(!overlayItem||!overlayItem.Frame||!overlayItem.Frame.GetLeftToolbar)return;var frame=overlayItem.Frame;var aryButton=frame.GetLeftToolbar({Overlay:overlayItem,OverlayID:toolbarInfo.ID});if(!IFrameSplitOperator.IsNonEmptyArray(aryButton))return;if(this.Frame.IsHScreen===true){}else{var border=frame.GetBorder();var right=border.Right-3;var left=border.Left+3;var yCenter=toolbarInfo.YCenter;for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var rtButton={Left:left,YCenter:yCenter};this.DrawButton(item,rtButton,moveonPoint,mouseStatus);this.Buttons.push({ID:item.ID,Rect:rtButton,FrameID:this.Frame.Identify,Type:1,OverlayID:toolbarInfo.ID,Title:overlayItem.Title});left=rtButton.Right;toolbarInfo.Width+=rtButton.Width;}if(toolbarInfo.Width>0)toolbarInfo.Width+=3;}};this.PtInButtons=function(x,y){for(var i=0;i<this.Buttons.length;++i){var item=this.Buttons[i];if(!item.Rect)continue;var rect=item.Rect;if(x>rect.Left&&x<rect.Right&&y>rect.Top&&y<rect.Bottom){var result={ID:item.ID,Rect:rect,FrameID:item.FrameID,Type:item.Type,Data:item.Data};if(item.Type==1){result.Title=item.Title;result.OverlayID=item.OverlayID;}return result;}}return null;};}//画图工具
+left=rtButton.Right;toolbarInfo.Width+=rtButton.Width;}if(toolbarInfo.Width>0)toolbarInfo.Width+=3;}};this.DrawOverlayToolbar=function(overlayItem,toolbarInfo,moveonPoint,mouseStatus){toolbarInfo.Width=0;if(!overlayItem||!overlayItem.Frame||!overlayItem.Frame.GetLeftToolbar)return;var frame=overlayItem.Frame;var aryButton=frame.GetLeftToolbar({Overlay:overlayItem,OverlayID:toolbarInfo.ID});if(!IFrameSplitOperator.IsNonEmptyArray(aryButton))return;if(this.Frame.IsHScreen===true){}else{var border=frame.GetBorder();var right=border.Right-3;var left=border.Left+3;var yCenter=toolbarInfo.YCenter;for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var rtButton={Left:left,YCenter:yCenter};this.DrawButton(item,rtButton,moveonPoint,mouseStatus);this.Buttons.push({ID:item.ID,Rect:rtButton,FrameID:this.Frame.Identify,Type:1,OverlayID:toolbarInfo.ID,Title:overlayItem.Title,Data:item.Data});left=rtButton.Right;toolbarInfo.Width+=rtButton.Width;}if(toolbarInfo.Width>0)toolbarInfo.Width+=3;}};this.PtInButtons=function(x,y){for(var i=0;i<this.Buttons.length;++i){var item=this.Buttons[i];if(!item.Rect)continue;var rect=item.Rect;if(x>rect.Left&&x<rect.Right&&y>rect.Top&&y<rect.Bottom){var result={ID:item.ID,Rect:rect,FrameID:item.FrameID,Type:item.Type,Data:item.Data};if(item.Type==1){result.Title=item.Title;result.OverlayID=item.OverlayID;}return result;}}return null;};}//画图工具
 function IChartDrawPicture(){this.Frame;this.Canvas;this.Point=new Array();//画图的点
 this.Value=new Array();//XValue,YValue
 this.LinePoint=[];this.PointCount=2;//画点的个数
@@ -6010,8 +6018,10 @@ this.LineWidth=1;this.Precision=2;//小数位数
 this.ValueTextColor='rgb(250,250,250)';this.IsShowCorssCursor=true;//画的时候是否显示十字光标
 this.GetLabelCallback;//绘制标题回调函数
 this.PointCount=1;this.ClassName='ChartDrawHLine';this.Font=14*GetDevicePixelRatio()+"px 微软雅黑";this.TextFont=12*GetDevicePixelRatio()+"px 微软雅黑";this.RightSpaceWidth=50;this.ButtonPosition=0;//按钮位置, 0=价格后面， 1=价格上面
-this.ButtonBGColor='rgb(190,190,190)';this.ButtonSpace=3;this.TextMargin={Left:0,Right:0};this.Button={CloseIcon:{Text:'\uE62B',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,TooltipText:null},SettingIcon:{Text:'\uE623',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,TooltipText:null//修改ID, Text , TooltipText 可以外部定制按钮
-}};this.AryButton=[];this.ExtendData;//扩展数据
+this.ButtonBGColor='rgb(190,190,190)';this.ButtonSpace=3;this.TextMargin={Left:0,Right:0};this.Button={CloseIcon:{Text:'\uE62B',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,TooltipText:null,Margin:{Left:2,Right:2}},SettingIcon:{Text:'\uE623',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,TooltipText:null,Margin:{Left:2,Right:2}//修改ID, Text , TooltipText 可以外部定制按钮
+}};this.CustomButton=[];//自定义的按钮 { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1, TooltipText:null }
+this.AryShowButton=[];//需要显示的按钮 { Data:, Width }
+this.AryButton=[];this.ExtendData;//扩展数据
 this.ShowPriceTextConfig={IsShow:[false,false,true],//[0]=left内 [1]=right内 [2]=right外
 Font:[12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1']};//内部变量
 this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.GetLabelCallback){this.GetLabelCallback=option.GetLabelCallback;}if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(IFrameSplitOperator.IsNumber(option.ButtonPosition))this.ButtonPosition=option.ButtonPosition;if(IFrameSplitOperator.IsNumber(option.RightSpaceWidth))this.RightSpaceWidth=option.RightSpaceWidth;if(option.Button){var item=option.Button;if(item.CloseIcon)this.Button.CloseIcon=CloneData(item.CloseIcon);else if(item.CloseIcon===null)this.Button.CloseIcon=null;if(item.SettingIcon)this.Button.SettingIcon=CloneData(item.SettingIcon);else if(item.SettingIcon===null)this.Button.SettingIcon=null;}if(option.ExtendData)this.ExtendData=option.ExtendData;if(IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText)){for(var i=0;i<option.IsShowPriceText.length&&i<3;++i){var value=option.IsShowPriceText[i];if(IFrameSplitOperator.IsBool(value))this.ShowPriceTextConfig.IsShow[i]=value;}}if(option.TextMargin){var item=option.TextMargin;if(IFrameSplitOperator.IsNumber(item.Left))this.TextMargin.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))this.TextMargin.Right=item.Right;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.IsPointIn=this.IsPointIn_XYValue_Line;/*
@@ -6023,9 +6033,11 @@ this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOpt
         return this.PointRange(drawPoint);
     }
     */this.IsDrawMain=function()//选中绘制在动态绘图上， 没有选中绘制在背景上
-{if(!this.GetActiveDrawPicture)return true;var active=this.GetActiveDrawPicture();if(active.Select.Guid==this.Guid)return false;return true;};this.MainDraw=function(){this.Draw();};this.Draw=function(moveonPoint,mouseStatus){this.LinePoint=[];this.AryButton=[];this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;if(this.IsFrameMinSize())return;if(!this.IsShow)return;var drawPoint=this.CalculateDrawPoint();if(!drawPoint||drawPoint.length!=1)return;if(!this.Frame)return;if(this.Value.length!=1)return;if(!this.IsYValueInFrame(this.Value[0].YValue))return null;var isHScreen=this.Frame.IsHScreen;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();if(isHScreen){left=this.Frame.ChartBorder.GetTop();right=this.Frame.ChartBorder.GetBottom();}this.ClipFrame();//画线段
+{if(!this.GetActiveDrawPicture)return true;var active=this.GetActiveDrawPicture();if(active.Select.Guid==this.Guid)return false;return true;};this.MainDraw=function(){this.Draw();};//获取需要显示的按钮 系统按钮+自定义按钮
+this.GetShowButton=function(){var aryButton=[];var item=this.Button.SettingIcon;if(item&&item.Text)aryButton.push({Data:item,Width:null});item=this.Button.CloseIcon;if(item&&item.Text)aryButton.push({Data:item,Width:null});if(IFrameSplitOperator.IsNonEmptyArray(this.CustomButton)){for(var i=0;i<this.CustomButton.length;++i){item=this.CustomButton[i];if(item&&item.Text)aryButton.push({Data:item,Width:null});}}return aryButton;};this.Draw=function(moveonPoint,mouseStatus){this.AryShowButton=[];this.LinePoint=[];this.AryButton=[];this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;if(this.IsFrameMinSize())return;if(!this.IsShow)return;var drawPoint=this.CalculateDrawPoint();if(!drawPoint||drawPoint.length!=1)return;if(!this.Frame)return;if(this.Value.length!=1)return;if(!this.IsYValueInFrame(this.Value[0].YValue))return null;var isHScreen=this.Frame.IsHScreen;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();if(isHScreen){left=this.Frame.ChartBorder.GetTop();right=this.Frame.ChartBorder.GetBottom();}this.ClipFrame();//画线段
 this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();if(isHScreen){this.Canvas.moveTo(drawPoint[0].X,left);this.Canvas.lineTo(drawPoint[0].X,right);}else{this.Canvas.moveTo(left,ToFixedPoint(drawPoint[0].Y));this.Canvas.lineTo(right,ToFixedPoint(drawPoint[0].Y));}this.Canvas.stroke();this.RestoreLineWidth();//画水平线段
-var line={Start:new Point(),End:new Point()};if(isHScreen){line.Start.X=drawPoint[0].X;line.Start.Y=left;line.End.X=drawPoint[0].X;line.End.Y=right;}else{line.Start.X=left;line.Start.Y=drawPoint[0].Y;line.End.X=right;line.End.Y=drawPoint[0].Y;}this.LinePoint.push(line);var yValue=this.Frame.GetYData(drawPoint[0].Y);var strPrice=yValue.toFixed(this.Precision);if(this.ShowPriceTextConfig.IsShow[0]){this.DrawPriceText(strPrice,line.Start,line.End,0);}if(this.ShowPriceTextConfig.IsShow[1]){this.DrawPriceText(strPrice,line.Start,line.End,1);}var labInfo;if(this.GetLabelCallback)labInfo=this.GetLabelCallback(this);//描述信息
+var line={Start:new Point(),End:new Point()};if(isHScreen){line.Start.X=drawPoint[0].X;line.Start.Y=left;line.End.X=drawPoint[0].X;line.End.Y=right;}else{line.Start.X=left;line.Start.Y=drawPoint[0].Y;line.End.X=right;line.End.Y=drawPoint[0].Y;}this.LinePoint.push(line);var yValue=this.Frame.GetYData(drawPoint[0].Y);var strPrice=yValue.toFixed(this.Precision);if(this.ShowPriceTextConfig.IsShow[0]){this.DrawPriceText(strPrice,line.Start,line.End,0);}if(this.ShowPriceTextConfig.IsShow[1]){this.DrawPriceText(strPrice,line.Start,line.End,1);}var labInfo;if(this.GetLabelCallback)labInfo=this.GetLabelCallback(this);this.AryShowButton=this.GetShowButton();//获取按钮
+//描述信息
 if(labInfo)this.DrawLab(labInfo,drawPoint[0].Y);//画中心点
 var xCenter=left+(right-left)/2;var point={X:xCenter,Y:drawPoint[0].Y};this.DrawPoint([point]);this.Canvas.restore();//外部右侧显示价格
 if(this.ShowPriceTextConfig.IsShow[2]){var rtDraw={};this.CalculateButtonSize();this.DrawValueText(drawPoint[0].Y,rtDraw,labInfo);if(labInfo)this.DrawRightLab(labInfo,rtDraw);if(labInfo)this.DrawCustomHLine(labInfo,drawPoint[0].Y);}//鼠标是否在按钮上
@@ -6034,18 +6046,7 @@ if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=y-labSize.He
 if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=drawTop;this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(labSize.Width),ToFixedRect(labSize.Height));}var yText=drawTop+1+lineSpace;this.Canvas.textBaseline="top";for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];if(item.Name){this.Canvas.textAlign="left";this.Canvas.fillStyle=item.NameColor;this.Canvas.fillText(item.Name,drawLeft+1,yText+1);}if(item.Text){this.Canvas.textAlign="right";this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,drawRight-1,yText+1);}yText+=labSize.LineHeight+lineSpace;}};this.DrawCustomHLine=function(labInfo,yLine){if(!labInfo)return;if(!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryLine))return;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var pixelRatio=GetDevicePixelRatio();var yMax=yLine,yMin=yLine;for(var i=0;i<labInfo.AryLine.length;++i){var item=labInfo.AryLine[i];if(!IFrameSplitOperator.IsNumber(item.Value))continue;if(item.Width<0)continue;var y=this.Frame.GetYFromData(item.Value);var yFixed=ToFixedPoint(y);var xRight=right;if(IFrameSplitOperator.IsPlusNumber(item.Width)){if(item.Width<1)xRight=left+item.Width*(right-left);//0.3 百分比
 else xRight=left+item.Width*pixelRatio;//>1 实际数值就是长度
 }if(item.Color)this.Canvas.strokeStyle=item.Color;else this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(xRight,yFixed);this.Canvas.stroke();if(yMax<yFixed)yMax=yFixed;if(yMin>yFixed)yMin=yFixed;}if(yMax!=yMin&&labInfo.VLine){var item=labInfo.VLine;var x=left+20*pixelRatio;if(IFrameSplitOperator.IsNumber(item.XOffset))x=left+item.XOffset*pixelRatio;x=ToFixedPoint(x);if(item.Color)this.Canvas.strokeStyle=item.Color;else this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(x,yMax);this.Canvas.lineTo(x,yMin);this.Canvas.stroke();}};this.DrawValueText=function(y,rtDraw,labInfo){var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();if(this.RightSpaceWidth>0){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(right,ToFixedPoint(y));this.Canvas.lineTo(right+this.RightSpaceWidth,ToFixedPoint(y));this.Canvas.stroke();}var yValue=this.Frame.GetYData(y);var strValue=yValue.toFixed(this.Precision);if(labInfo&&labInfo.PriceSuffixText)strValue+=labInfo.PriceSuffixText;this.Canvas.fillStyle=this.LineColor;this.Canvas.font=this.Font;var textWidth=this.Canvas.measureText(strValue).width;var lineHeight=this.GetFontHeight();var rtBG={Left:right+this.RightSpaceWidth,Top:y-lineHeight/2,Width:textWidth+4,Height:lineHeight};//rtBG.Right=rtBG.Left+rtBG.Width;
-rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Width+=this.TextMargin.Left+this.TextMargin.Right;rtBG.Right=rtBG.Left+rtBG.Width;var xText=rtBG.Left+this.TextMargin.Left+2;if(this.ButtonPosition==1){this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));}else{this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));}this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(strValue,xText,y);rtDraw.Left=rtBG.Left;rtDraw.Top=rtBG.Top;rtDraw.Bottom=rtBG.Bottom;rtDraw.Right=rtBG.Right;this.DrawButton(rtBG.Top,rtBG.Right,lineHeight,rtDraw);};this.DrawPriceText=function(text,ptStart,ptEnd,position){if(position!=1&&position!=0)return;var font=this.ShowPriceTextConfig.Font[position];this.Canvas.fillStyle=this.LineColor;this.Canvas.font=font;var textWidth=this.Canvas.measureText(text).width;var lineHeight=this.GetFontHeight();var rtBG=null;if(position==1){var rtBG={Left:ptStart.X,Top:ptStart.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}else if(position==0){var rtBG={Right:ptEnd.X,Top:ptEnd.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Left=rtBG.Right-rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(text,rtBG.Left+2,ptStart.Y);};this.CalculateButtonSize=function(){var pixelRatio=GetDevicePixelRatio();if(this.Button.SettingIcon){var icon=this.Button.SettingIcon;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;var width=this.Canvas.measureText(icon.Text).width;this.SettingButtonSize=width;}if(this.Button.CloseIcon){var icon=this.Button.CloseIcon;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;var width=this.Canvas.measureText(icon.Text).width;this.ColseButtonSize=width;}if(this.ColseButtonSize<=0&&this.SettingButtonSize<=0)return;var buttonWidth=0;if(this.SettingButtonSize>0)buttonWidth+=this.SettingButtonSize;if(this.ColseButtonSize>0){if(buttonWidth>0)buttonWidth+=this.ButtonSpace;buttonWidth+=this.ColseButtonSize;}buttonWidth+=4;this.ButtonBGWidth=buttonWidth;};this.DrawButton=function(drawTop,drawLeft,drawHeight,rtDraw){if(this.ColseButtonSize<=0&&this.SettingButtonSize<=0)return;if(this.ButtonPosition==1)drawTop-=drawHeight;this.Canvas.fillStyle=this.LineColor;var left=drawLeft;var rtBG={Left:drawLeft,Top:drawTop,Width:this.ButtonBGWidth,Height:drawHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;this.Canvas.fillStyle=this.ButtonBGColor;this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));left+=1;var pixelRatio=GetDevicePixelRatio();if(this.Button.SettingIcon&&this.Button.SettingIcon.Text){var rtButton={Left:left,Top:drawTop,Width:this.SettingButtonSize,Height:drawHeight};rtButton.Right=rtButton.Left+rtButton.Width;rtButton.Bottom=rtButton.Top+rtButton.Height;var yCenter=rtButton.Top+rtButton.Height/2;var xCenter=rtButton.Left+rtButton.Width/2;var icon=this.Button.SettingIcon;this.Canvas.font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=icon.Color;this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);this.AryButton.push({Rect:rtButton,ID:icon.ID,TooltipText:icon.TooltipText});/*
-            if (this.ColseButtonSize>0)
-            {
-                var xLine=rtButton.Right+this.ButtonSpace/2;
-                xLine=ToFixedPoint(xLine);
-                this.Canvas.strokeStyle=this.ButtonSplitLineColor;
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(xLine,rtButton.Top);
-                this.Canvas.lineTo(xLine,rtButton.Bottom);
-                this.Canvas.stroke();
-            }
-            */left=rtButton.Right+this.ButtonSpace;}if(this.Button.CloseIcon&&this.Button.CloseIcon.Text){var rtButton={Left:left,Top:drawTop,Width:this.ColseButtonSize,Height:drawHeight};rtButton.Right=rtButton.Left+rtButton.Width;rtButton.Bottom=rtButton.Top+rtButton.Height;var yCenter=rtButton.Top+rtButton.Height/2;var xCenter=rtButton.Left+rtButton.Width/2;var icon=this.Button.CloseIcon;this.Canvas.font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=icon.Color;this.Canvas.fillText(this.Button.CloseIcon.Text,xCenter,yCenter);this.AryButton.push({Rect:rtButton,ID:icon.ID,TooltipText:icon.TooltipText});left=rtButton.Right;}rtDraw.Right=rtBG.Right;};this.PtInButtons=function(x,y){for(var i=0;i<this.AryButton.length;++i){var item=this.AryButton[i];if(!item.Rect)continue;var rect=item.Rect;this.Canvas.beginPath();this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);if(this.Canvas.isPointInPath(x,y)){return{ID:item.ID,Rect:rect};}}return null;};}//趋势线
+rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Width+=this.TextMargin.Left+this.TextMargin.Right;rtBG.Right=rtBG.Left+rtBG.Width;var xText=rtBG.Left+this.TextMargin.Left+2;if(this.ButtonPosition==1){this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));}else{this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));}this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(strValue,xText,y);rtDraw.Left=rtBG.Left;rtDraw.Top=rtBG.Top;rtDraw.Bottom=rtBG.Bottom;rtDraw.Right=rtBG.Right;this.DrawButton(rtBG.Top,rtBG.Right,lineHeight,rtDraw);};this.DrawPriceText=function(text,ptStart,ptEnd,position){if(position!=1&&position!=0)return;var font=this.ShowPriceTextConfig.Font[position];this.Canvas.fillStyle=this.LineColor;this.Canvas.font=font;var textWidth=this.Canvas.measureText(text).width;var lineHeight=this.GetFontHeight();var rtBG=null;if(position==1){var rtBG={Left:ptStart.X,Top:ptStart.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}else if(position==0){var rtBG={Right:ptEnd.X,Top:ptEnd.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Left=rtBG.Right-rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(text,rtBG.Left+2,ptStart.Y);};this.CalculateButtonSize=function(){var pixelRatio=GetDevicePixelRatio();if(!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton))return;var totalWidth=0;for(var i=0;i<this.AryShowButton.length;++i){var item=this.AryShowButton[i];var icon=item.Data;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;item.Width=this.Canvas.measureText(icon.Text).width+2;if(icon.Margin){var margin=icon.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))item.Width+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))item.Width+=margin.Right;}totalWidth+=item.Width;}this.ButtonBGWidth=totalWidth;};this.DrawButton=function(drawTop,drawLeft,drawHeight,rtDraw){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton))return;if(this.ButtonPosition==1)drawTop-=drawHeight;this.Canvas.fillStyle=this.LineColor;var left=drawLeft;var rtBG={Left:drawLeft,Top:drawTop,Width:this.ButtonBGWidth,Height:drawHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;this.Canvas.fillStyle=this.ButtonBGColor;this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));var pixelRatio=GetDevicePixelRatio();for(var i=0;i<this.AryShowButton.length;++i){var item=this.AryShowButton[i];var icon=item.Data;var rtButton={Left:left,Top:drawTop,Width:item.Width,Height:drawHeight};rtButton.Right=rtButton.Left+rtButton.Width;rtButton.Bottom=rtButton.Top+rtButton.Height;var yCenter=rtButton.Top+rtButton.Height/2;var xCenter=rtButton.Left+rtButton.Width/2;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=icon.Color;this.Canvas.fillText(icon.Text,xCenter,yCenter);this.AryButton.push({Rect:rtButton,ID:icon.ID,TooltipText:icon.TooltipText});left=rtButton.Right;}};this.PtInButtons=function(x,y){for(var i=0;i<this.AryButton.length;++i){var item=this.AryButton[i];if(!item.Rect)continue;var rect=item.Rect;this.Canvas.beginPath();this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);if(this.Canvas.isPointInPath(x,y)){return{ID:item.ID,Rect:rect};}}return null;};}//趋势线
 function ChartDrawPictureTrendLine(){this.newMethod=IChartDrawPicture;//派生
 this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureTrendLine';this.IsPointIn=this.IsPointIn_XYValue_Line;this.GetXYCoordinate=this.GetXYCoordinate_default;this.OnlyMoveXIndex=true;this.IsSupportMagnet=true;this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;if(!this.IsShow)return;var drawPoint=this.CalculateDrawPoint({IsCheckX:false,IsCheckY:false});if(!drawPoint||drawPoint.length!=2)return;var ptStart=drawPoint[0];var ptEnd=drawPoint[1];var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);this.ClipFrame();this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();this.Canvas.moveTo(extendLine.Start.X,extendLine.Start.Y);this.Canvas.lineTo(extendLine.End.X,extendLine.End.Y);this.Canvas.stroke();this.RestoreLineWidth();var line={Start:ptStart,End:ptEnd};this.LinePoint.push(line);this.DrawPoint(drawPoint);//画点
 this.Canvas.restore();};}//画图工具-矩形
@@ -11602,7 +11603,7 @@ frame.ChartPaint.push(chartText);};//创建文本
 this.CreateText=function(hqChart,windowIndex,varItem,id,drawName){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSingleText();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.ReloadResource();if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);var titleIndex=windowIndex+1;if(varItem.Draw.Position)chart.Position=varItem.Draw.Position;//赋值坐标
 if(varItem.Draw.DrawData)chart.Data.Data=varItem.Draw.DrawData;chart.Text=varItem.Draw.Text;if(varItem.Draw.Direction>0)chart.Direction=varItem.Draw.Direction;if(varItem.Draw.YOffset>0)chart.YOffset=varItem.Draw.YOffset;if(varItem.Draw.TextAlign)chart.TextAlign=varItem.Draw.TextAlign;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
 frame.ChartPaint.push(chart);};//COLORSTICK 
-this.CreateMACD=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMACD();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];var clrTitle=this.GetDefaultColor(id);if(varItem.Color)clrTitle=this.GetColor(varItem.Color);if(varItem.UpColor)chart.UpColor=varItem.UpColor;if(varItem.DownColor)chart.DownColor=varItem.DownColor;this.ReloadChartResource(hqChart,windowIndex,chart);titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);frame.ChartPaint.push(chart);};this.CreatePointDot=function(hqChart,windowIndex,varItem,id,hisData){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartPointDot();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.Radius)chart.Radius=varItem.Radius;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.Radius=width;}if(IFrameSplitOperator.IsBool(varItem.UpDownDot)){chart.EnableUpDownColor=varItem.UpDownDot;chart.HistoryData=hisData;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateStick=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;this.ReloadChartResource(hqChart,windowIndex,chart);var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);frame.ChartPaint.push(chart);};this.CreateLineStick=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartLineStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);frame.ChartPaint.push(chart);};this.CreateStraightLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartLine();chart.DrawType=1;chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Draw.DrawData;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,varItem.Name,line.Color);
+this.CreateMACD=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMACD();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];var clrTitle=this.GetDefaultColor(id);if(varItem.Color)clrTitle=this.GetColor(varItem.Color);if(varItem.UpColor)chart.UpColor=varItem.UpColor;if(varItem.DownColor)chart.DownColor=varItem.DownColor;this.ReloadChartResource(hqChart,windowIndex,chart);titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreatePointDot=function(hqChart,windowIndex,varItem,id,hisData){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartPointDot();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.Radius)chart.Radius=varItem.Radius;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.Radius=width;}if(IFrameSplitOperator.IsBool(varItem.UpDownDot)){chart.EnableUpDownColor=varItem.UpDownDot;chart.HistoryData=hisData;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateStick=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;this.ReloadChartResource(hqChart,windowIndex,chart);var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);frame.ChartPaint.push(chart);};this.CreateLineStick=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartLineStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;var titlePaint=hqChart.TitlePaint[titleIndex];titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);frame.ChartPaint.push(chart);};this.CreateStraightLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartLine();chart.DrawType=1;chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Draw.DrawData;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,varItem.Name,line.Color);
 frame.ChartPaint.push(chart);};this.CreateVolStick=function(hqChart,windowIndex,varItem,id,hisData){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartVolStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.KLineDrawType=hqChart.KLineDrawType;//设置K线显示类型
 if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.UpColor)chart.UpColor=varItem.UpColor;if(varItem.DownColor)chart.DownColor=varItem.DownColor;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(IFrameSplitOperator.IsPlusNumber(width))chart.BarWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;chart.HistoryData=hisData;this.ReloadChartResource(hqChart,windowIndex,chart);var titlePaint=hqChart.TitlePaint[titleIndex];var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;this.SetTitleData(titleData,chart);this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateBand=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartBand();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.FirstColor=varItem.Draw.Color[0];chart.SecondColor=varItem.Draw.Color[1];chart.Data.Data=varItem.Draw.DrawData;if(IFrameSplitOperator.IsBool(varItem.IsFirstDraw))chart.IsDrawFirst=varItem.IsFirstDraw;frame.ChartPaint.push(chart);};//创建K线图
 this.CreateKLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartKLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data.Data=varItem.Draw.DrawData;chart.IsShowMaxMinPrice=false;chart.IsShowKTooltip=false;if(varItem.Color)//如果设置了颜色,使用外面设置的颜色
@@ -11612,7 +11613,7 @@ var titleIndex=windowIndex+1;chart.Data.Data=varItem.Draw.DrawData.Value;chart.T
 this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateTextLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartTextLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;chart.Text=drawData.Text;chart.Line=drawData.Line;chart.Price=drawData.Price;}frame.ChartPaint.push(chart);};this.CreateStackedBar=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartStackedBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarColor))chart.BarColor=varItem.Draw.BarColor;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarName))chart.BarName=varItem.Draw.BarName;if(IFrameSplitOperator.IsNumber(varItem.Draw.LineWidth))chart.LineWidth=varItem.Draw.LineWidth;if(IFrameSplitOperator.IsNumber(varItem.Draw.BarType))chart.BarType=varItem.Draw.BarType;chart.Data.Data=varItem.Draw.DrawData;var titleIndex=windowIndex+1;var titlePaint=hqChart.TitlePaint[titleIndex];var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);titleData.DataType="ChartStackedBar";titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;frame.ChartPaint.push(chart);};//创建图标
 this.CreateIcon=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSingleText();chart.Canvas=hqChart.Canvas;chart.TextAlign='center';chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.DrawVAlign>=0){if(varItem.DrawVAlign==0)chart.Direction=1;else if(varItem.DrawVAlign==1)chart.Direction=0;else if(varItem.DrawVAlign==2)chart.Direction=2;}if(varItem.DrawAlign>=0){if(varItem.DrawAlign==0)chart.TextAlign="left";else if(varItem.DrawAlign==1)chart.TextAlign="center";else if(varItem.DrawAlign==2)chart.TextAlign='right';}if(IFrameSplitOperator.IsNumber(varItem.XOffset))chart.ShowOffset.X=varItem.XOffset;if(IFrameSplitOperator.IsNumber(varItem.YOffset))chart.ShowOffset.Y=varItem.YOffset;chart.Data.Data=varItem.Draw.DrawData;var icon=varItem.Draw.Icon;if(icon.IconFont==true){chart.IconFont={Family:icon.Family,Text:icon.Symbol,Color:icon.Color};}else{chart.Text=icon.Symbol;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else if(icon.Color)chart.Color=icon.Color;else chart.Color='rgb(0,0,0)';}//var titleIndex=windowIndex+1;
 //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
-frame.ChartPaint.push(chart);};this.CreateTipIcon=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(hqChart.ChartPaint[0].IsMinuteFrame())chart.Data=hqChart.SourceData;else chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateTipIcon=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(hqChart.ChartPaint[0].IsMinuteFrame())chart.Data=hqChart.SourceData;else chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
 chart.Family=varItem.Draw.Icon.Family;chart.TextFont=g_JSChartResource.TIPICON.TextFont;var svgSize=g_JSChartResource.TIPICON.Size;var svgColor=g_JSChartResource.TIPICON.Color;var svgYOffset=0;var svgVAlign=2;//上下对齐方式
 if(IFrameSplitOperator.IsNumber(varItem.YOffset))svgYOffset=varItem.YOffset;if(varItem.Color)svgColor=this.GetColor(varItem.Color);if(varItem.DrawFontSize>0)svgSize=varItem.DrawFontSize;if(varItem.DrawVAlign>=0)svgVAlign=varItem.DrawVAlign;if(varItem.Draw&&IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.DrawData)&&varItem.Draw.Icon){var drawData=varItem.Draw.DrawData;var aryData=[];var isArrayTip=Array.isArray(varItem.Draw.Text);var singleTip=null;if(!isArrayTip&&varItem.Draw.Text)singleTip={Text:varItem.Draw.Text};for(var j=0;j<drawData.length;++j){var item=drawData[j];if(!IFrameSplitOperator.IsNumber(item))continue;var svgItem={Index:j,Value:item,SVG:{Symbol:varItem.Draw.Icon.Symbol,Size:svgSize,Color:svgColor,YOffset:svgYOffset,VAlign:svgVAlign}};if(isArrayTip){var text=varItem.Draw.Text[j];if(text)svgItem.Tooltip={Text:text};}else{svgItem.Tooltip=singleTip;}aryData.push(svgItem);}chart.Texts=aryData;}frame.ChartPaint.push(chart);};//创建通道
 this.CreateChannel=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartChannel();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Draw.AreaColor)chart.AreaColor=varItem.Draw.AreaColor;else if(varItem.Color)chart.AreaColor=this.GetColor(varItem.Color);else chart.AreaColor=this.GetDefaultColor(id);if(varItem.Draw.Border.Color)chart.LineColor=varItem.Draw.Border.Color;else chart.LineColor=null;if(varItem.Draw.Border.Dotted)chart.LineDotted=varItem.Draw.Border.Dotted;if(varItem.Draw.Border.Width>0)chart.LineWidth=varItem.Draw.Border.Width;//let titleIndex=windowIndex+1;
@@ -13181,7 +13182,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.13205";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.13209";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13206",
+  "version": "1.1.13210",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.complier.js

@@ -22360,6 +22360,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -22714,6 +22715,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         //var titleIndex=windowIndex+1;
         //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 

package/src/jscommon/umychart.js

@@ -2661,7 +2661,12 @@ var JSCHART_MENU_ID=
     CMD_SHOW_BEFORE_DATA_ID:24,     //显示|隐藏集合竞价
 
     CMD_SELECTED_ZOOM_ID:25,        //选中放大
-    CMD_SELECTED_SUMMARY_ID:26,  //区间统计
+    CMD_SELECTED_SUMMARY_ID:26,     //区间统计
+
+    CMD_SHOW_INDEX_ID:27,           //显示隐藏指标
+    CMD_SHOW_OVERLAY_INDEX_ID:28,   //显示隐藏叠加指标
+    CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
+    CMD_SHOW_OVERLAY_Y_AXIS_ID:30,   //显示隐藏Y轴叠加指标
 }
 
 
@@ -9256,9 +9261,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var dlg=new KLineSelectRectDialog(this.DivElement);
                 dlg.DoModal(srcParam);
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID:        //显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
+                if (param==null || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var windowIndex=param, showType=aryArgs[1];
+                var script=this.WindowIndex[windowIndex];
+                if (!script) return false;
+            
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow=true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateWindowIndex(windowIndex);
+                break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID:   //显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var indexGuid=srcParam,showType=aryArgs[1];
+
+                var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return false;
+
+                var script=overlay.OverlayItem.Script;
+
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow==true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateOverlayIndex(indexGuid);
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:
+                if (srcParam && this.DeleteOverlayWindowsIndex)
+                    this.DeleteOverlayWindowsIndex(srcParam);
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                if (!this.GetOverlayIndexByIdentify) return false;
+
+                var indexGuid=srcParam,showType=aryArgs[1];
+                var finder=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!finder || !finder.OverlayItem) return false;
+                
+                var frame=finder.OverlayItem.Frame;
+                if (showType==1) frame.IsShow=false;
+                else if (showType==2) frame.IsShow==true;
+                else frame.IsShow=!frame.IsShow; 
+
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.Draw();
+
+                break;
         }
     }
 
+    this.GetShowIndexMenuData=function(windowIndex, showType)
+    {
+        var script=this.WindowIndex[windowIndex];
+        if (!script) return null;
+
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_INDEX_ID, Args:[windowIndex, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var script=overlay.OverlayItem.Script;
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var frame=overlay.OverlayItem.Frame;
+        var data= { Name:frame.IsShow?"隐藏Y轴":"显示Y轴",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
     //点击右键菜单
     this.OnClickRightMenu=function(data)
     {
@@ -53763,7 +53851,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title  });
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title, Data:item.Data  });
 
                 left=rtButton.Right;
 
@@ -55993,11 +56081,14 @@ function ChartDrawHLine()
 
     this.Button= 
     { 
-        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
-        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null }
+        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null, Margin:{ Left:2, Right:2 } },
+        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null, Margin:{ Left:2, Right:2 } }
         //修改ID, Text , TooltipText 可以外部定制按钮
     }
 
+    this.CustomButton=[];   //自定义的按钮 { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1, TooltipText:null }
+
+    this.AryShowButton=[];  //需要显示的按钮 { Data:, Width }
     this.AryButton=[];
     this.ExtendData;    //扩展数据
     this.ShowPriceTextConfig=
@@ -56103,8 +56194,32 @@ function ChartDrawHLine()
         this.Draw();
     }
 
+    //获取需要显示的按钮 系统按钮+自定义按钮
+    this.GetShowButton=function()
+    {
+        var aryButton=[];
+
+        var item=this.Button.SettingIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        item=this.Button.CloseIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomButton))
+        {
+            for(var i=0;i<this.CustomButton.length;++i)
+            {
+                item=this.CustomButton[i];
+                if (item && item.Text) aryButton.push({ Data:item, Width:null });
+            }
+        }
+
+        return aryButton;
+    }
+
     this.Draw=function(moveonPoint, mouseStatus)
     {
+        this.AryShowButton=[];
         this.LinePoint=[];
         this.AryButton=[];
         this.ColseButtonSize=0;
@@ -56180,6 +56295,8 @@ function ChartDrawHLine()
         var labInfo;
         if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
 
+        this.AryShowButton=this.GetShowButton();    //获取按钮
+
         //描述信息
         if (labInfo)
             this.DrawLab(labInfo, drawPoint[0].Y);
@@ -56483,42 +56600,33 @@ function ChartDrawHLine()
     {
         var pixelRatio=GetDevicePixelRatio();
 
-        if (this.Button.SettingIcon)
-        {
-            var icon=this.Button.SettingIcon;
-            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.SettingButtonSize=width;
-        }
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
-        if (this.Button.CloseIcon)
+        var totalWidth=0;
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var icon=this.Button.CloseIcon;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
             var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
             this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.ColseButtonSize=width;
-        }
+            item.Width=this.Canvas.measureText(icon.Text).width+2;
 
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+            if (icon.Margin)
+            {
+                var margin=icon.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) item.Width+=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) item.Width+=margin.Right;
+            }
 
-        var buttonWidth=0
-        if (this.SettingButtonSize>0) buttonWidth+=this.SettingButtonSize;
-        if (this.ColseButtonSize>0) 
-        {
-            if (buttonWidth>0) buttonWidth+=this.ButtonSpace;
-            buttonWidth+=this.ColseButtonSize;
+            totalWidth+=item.Width;
         }
 
-        buttonWidth+=4;
-
-        this.ButtonBGWidth=buttonWidth;
+        this.ButtonBGWidth=totalWidth;
     }
 
     this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
     {
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
         if (this.ButtonPosition==1) drawTop-=drawHeight;
 
@@ -56530,61 +56638,29 @@ function ChartDrawHLine()
         this.Canvas.fillStyle=this.ButtonBGColor;
         this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
 
-        left+=1;
         var pixelRatio=GetDevicePixelRatio();
-        if (this.Button.SettingIcon && this.Button.SettingIcon.Text)
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var rtButton={Left:left, Top:drawTop, Width:this.SettingButtonSize, Height:drawHeight };
-            rtButton.Right=rtButton.Left+rtButton.Width;
-            rtButton.Bottom=rtButton.Top+rtButton.Height;
-            var yCenter=rtButton.Top+rtButton.Height/2;
-            var xCenter=rtButton.Left+rtButton.Width/2;
-
-            var icon=this.Button.SettingIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.textAlign="center";
-            this.Canvas.textBaseline="middle";
-            this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);
-
-            this.AryButton.push({Rect:rtButton, ID:icon.ID, TooltipText:icon.TooltipText});
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
 
-            /*
-            if (this.ColseButtonSize>0)
-            {
-                var xLine=rtButton.Right+this.ButtonSpace/2;
-                xLine=ToFixedPoint(xLine);
-                this.Canvas.strokeStyle=this.ButtonSplitLineColor;
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(xLine,rtButton.Top);
-                this.Canvas.lineTo(xLine,rtButton.Bottom);
-                this.Canvas.stroke();
-            }
-            */
-
-            left=rtButton.Right+this.ButtonSpace;
-        }
-
-        if (this.Button.CloseIcon && this.Button.CloseIcon.Text)
-        {
-            var rtButton={Left:left, Top:drawTop, Width:this.ColseButtonSize, Height:drawHeight };
+            var rtButton={Left:left, Top:drawTop, Width:item.Width, Height:drawHeight };
             rtButton.Right=rtButton.Left+rtButton.Width;
             rtButton.Bottom=rtButton.Top+rtButton.Height;
             var yCenter=rtButton.Top+rtButton.Height/2;
             var xCenter=rtButton.Left+rtButton.Width/2;
-            var icon=this.Button.CloseIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+
+            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+            this.Canvas.font=font;
             this.Canvas.textAlign="center";
             this.Canvas.textBaseline="middle";
             this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.CloseIcon.Text,xCenter,yCenter);
+            this.Canvas.fillText(icon.Text,xCenter,yCenter);
 
             this.AryButton.push({Rect:rtButton,ID:icon.ID, TooltipText:icon.TooltipText });
 
             left=rtButton.Right;
         }
-
-        rtDraw.Right=rtBG.Right;
     }
 
     this.PtInButtons=function(x,y)

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

@@ -6553,7 +6553,12 @@ var JSCHART_MENU_ID=
     CMD_SHOW_BEFORE_DATA_ID:24,     //显示|隐藏集合竞价
 
     CMD_SELECTED_ZOOM_ID:25,        //选中放大
-    CMD_SELECTED_SUMMARY_ID:26,  //区间统计
+    CMD_SELECTED_SUMMARY_ID:26,     //区间统计
+
+    CMD_SHOW_INDEX_ID:27,           //显示隐藏指标
+    CMD_SHOW_OVERLAY_INDEX_ID:28,   //显示隐藏叠加指标
+    CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
+    CMD_SHOW_OVERLAY_Y_AXIS_ID:30,   //显示隐藏Y轴叠加指标
 }
 
 
@@ -13148,9 +13153,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var dlg=new KLineSelectRectDialog(this.DivElement);
                 dlg.DoModal(srcParam);
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID:        //显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
+                if (param==null || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var windowIndex=param, showType=aryArgs[1];
+                var script=this.WindowIndex[windowIndex];
+                if (!script) return false;
+            
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow=true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateWindowIndex(windowIndex);
+                break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID:   //显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var indexGuid=srcParam,showType=aryArgs[1];
+
+                var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return false;
+
+                var script=overlay.OverlayItem.Script;
+
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow==true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateOverlayIndex(indexGuid);
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:
+                if (srcParam && this.DeleteOverlayWindowsIndex)
+                    this.DeleteOverlayWindowsIndex(srcParam);
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                if (!this.GetOverlayIndexByIdentify) return false;
+
+                var indexGuid=srcParam,showType=aryArgs[1];
+                var finder=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!finder || !finder.OverlayItem) return false;
+                
+                var frame=finder.OverlayItem.Frame;
+                if (showType==1) frame.IsShow=false;
+                else if (showType==2) frame.IsShow==true;
+                else frame.IsShow=!frame.IsShow; 
+
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.Draw();
+
+                break;
         }
     }
 
+    this.GetShowIndexMenuData=function(windowIndex, showType)
+    {
+        var script=this.WindowIndex[windowIndex];
+        if (!script) return null;
+
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_INDEX_ID, Args:[windowIndex, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var script=overlay.OverlayItem.Script;
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var frame=overlay.OverlayItem.Frame;
+        var data= { Name:frame.IsShow?"隐藏Y轴":"显示Y轴",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
     //点击右键菜单
     this.OnClickRightMenu=function(data)
     {
@@ -57655,7 +57743,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title  });
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title, Data:item.Data  });
 
                 left=rtButton.Right;
 
@@ -59885,11 +59973,14 @@ function ChartDrawHLine()
 
     this.Button= 
     { 
-        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
-        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null }
+        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null, Margin:{ Left:2, Right:2 } },
+        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null, Margin:{ Left:2, Right:2 } }
         //修改ID, Text , TooltipText 可以外部定制按钮
     }
 
+    this.CustomButton=[];   //自定义的按钮 { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1, TooltipText:null }
+
+    this.AryShowButton=[];  //需要显示的按钮 { Data:, Width }
     this.AryButton=[];
     this.ExtendData;    //扩展数据
     this.ShowPriceTextConfig=
@@ -59995,8 +60086,32 @@ function ChartDrawHLine()
         this.Draw();
     }
 
+    //获取需要显示的按钮 系统按钮+自定义按钮
+    this.GetShowButton=function()
+    {
+        var aryButton=[];
+
+        var item=this.Button.SettingIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        item=this.Button.CloseIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomButton))
+        {
+            for(var i=0;i<this.CustomButton.length;++i)
+            {
+                item=this.CustomButton[i];
+                if (item && item.Text) aryButton.push({ Data:item, Width:null });
+            }
+        }
+
+        return aryButton;
+    }
+
     this.Draw=function(moveonPoint, mouseStatus)
     {
+        this.AryShowButton=[];
         this.LinePoint=[];
         this.AryButton=[];
         this.ColseButtonSize=0;
@@ -60072,6 +60187,8 @@ function ChartDrawHLine()
         var labInfo;
         if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
 
+        this.AryShowButton=this.GetShowButton();    //获取按钮
+
         //描述信息
         if (labInfo)
             this.DrawLab(labInfo, drawPoint[0].Y);
@@ -60375,42 +60492,33 @@ function ChartDrawHLine()
     {
         var pixelRatio=GetDevicePixelRatio();
 
-        if (this.Button.SettingIcon)
-        {
-            var icon=this.Button.SettingIcon;
-            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.SettingButtonSize=width;
-        }
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
-        if (this.Button.CloseIcon)
+        var totalWidth=0;
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var icon=this.Button.CloseIcon;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
             var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
             this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.ColseButtonSize=width;
-        }
+            item.Width=this.Canvas.measureText(icon.Text).width+2;
 
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+            if (icon.Margin)
+            {
+                var margin=icon.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) item.Width+=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) item.Width+=margin.Right;
+            }
 
-        var buttonWidth=0
-        if (this.SettingButtonSize>0) buttonWidth+=this.SettingButtonSize;
-        if (this.ColseButtonSize>0) 
-        {
-            if (buttonWidth>0) buttonWidth+=this.ButtonSpace;
-            buttonWidth+=this.ColseButtonSize;
+            totalWidth+=item.Width;
         }
 
-        buttonWidth+=4;
-
-        this.ButtonBGWidth=buttonWidth;
+        this.ButtonBGWidth=totalWidth;
     }
 
     this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
     {
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
         if (this.ButtonPosition==1) drawTop-=drawHeight;
 
@@ -60422,61 +60530,29 @@ function ChartDrawHLine()
         this.Canvas.fillStyle=this.ButtonBGColor;
         this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
 
-        left+=1;
         var pixelRatio=GetDevicePixelRatio();
-        if (this.Button.SettingIcon && this.Button.SettingIcon.Text)
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var rtButton={Left:left, Top:drawTop, Width:this.SettingButtonSize, Height:drawHeight };
-            rtButton.Right=rtButton.Left+rtButton.Width;
-            rtButton.Bottom=rtButton.Top+rtButton.Height;
-            var yCenter=rtButton.Top+rtButton.Height/2;
-            var xCenter=rtButton.Left+rtButton.Width/2;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
 
-            var icon=this.Button.SettingIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.textAlign="center";
-            this.Canvas.textBaseline="middle";
-            this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);
-
-            this.AryButton.push({Rect:rtButton, ID:icon.ID, TooltipText:icon.TooltipText});
-
-            /*
-            if (this.ColseButtonSize>0)
-            {
-                var xLine=rtButton.Right+this.ButtonSpace/2;
-                xLine=ToFixedPoint(xLine);
-                this.Canvas.strokeStyle=this.ButtonSplitLineColor;
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(xLine,rtButton.Top);
-                this.Canvas.lineTo(xLine,rtButton.Bottom);
-                this.Canvas.stroke();
-            }
-            */
-
-            left=rtButton.Right+this.ButtonSpace;
-        }
-
-        if (this.Button.CloseIcon && this.Button.CloseIcon.Text)
-        {
-            var rtButton={Left:left, Top:drawTop, Width:this.ColseButtonSize, Height:drawHeight };
+            var rtButton={Left:left, Top:drawTop, Width:item.Width, Height:drawHeight };
             rtButton.Right=rtButton.Left+rtButton.Width;
             rtButton.Bottom=rtButton.Top+rtButton.Height;
             var yCenter=rtButton.Top+rtButton.Height/2;
             var xCenter=rtButton.Left+rtButton.Width/2;
-            var icon=this.Button.CloseIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+
+            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+            this.Canvas.font=font;
             this.Canvas.textAlign="center";
             this.Canvas.textBaseline="middle";
             this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.CloseIcon.Text,xCenter,yCenter);
+            this.Canvas.fillText(icon.Text,xCenter,yCenter);
 
             this.AryButton.push({Rect:rtButton,ID:icon.ID, TooltipText:icon.TooltipText });
 
             left=rtButton.Right;
         }
-
-        rtDraw.Right=rtBG.Right;
     }
 
     this.PtInButtons=function(x,y)
@@ -116973,6 +117049,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117327,6 +117404,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         //var titleIndex=windowIndex+1;
         //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -131875,7 +131953,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13205";
+var HQCHART_VERSION="1.1.13209";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.13205";
+var HQCHART_VERSION="1.1.13209";
 
 function PrintHQChartVersion()
 {

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

@@ -6597,7 +6597,12 @@ var JSCHART_MENU_ID=
     CMD_SHOW_BEFORE_DATA_ID:24,     //显示|隐藏集合竞价
 
     CMD_SELECTED_ZOOM_ID:25,        //选中放大
-    CMD_SELECTED_SUMMARY_ID:26,  //区间统计
+    CMD_SELECTED_SUMMARY_ID:26,     //区间统计
+
+    CMD_SHOW_INDEX_ID:27,           //显示隐藏指标
+    CMD_SHOW_OVERLAY_INDEX_ID:28,   //显示隐藏叠加指标
+    CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
+    CMD_SHOW_OVERLAY_Y_AXIS_ID:30,   //显示隐藏Y轴叠加指标
 }
 
 
@@ -13192,9 +13197,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var dlg=new KLineSelectRectDialog(this.DivElement);
                 dlg.DoModal(srcParam);
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID:        //显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
+                if (param==null || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var windowIndex=param, showType=aryArgs[1];
+                var script=this.WindowIndex[windowIndex];
+                if (!script) return false;
+            
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow=true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateWindowIndex(windowIndex);
+                break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID:   //显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var indexGuid=srcParam,showType=aryArgs[1];
+
+                var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return false;
+
+                var script=overlay.OverlayItem.Script;
+
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow==true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateOverlayIndex(indexGuid);
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:
+                if (srcParam && this.DeleteOverlayWindowsIndex)
+                    this.DeleteOverlayWindowsIndex(srcParam);
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                if (!this.GetOverlayIndexByIdentify) return false;
+
+                var indexGuid=srcParam,showType=aryArgs[1];
+                var finder=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!finder || !finder.OverlayItem) return false;
+                
+                var frame=finder.OverlayItem.Frame;
+                if (showType==1) frame.IsShow=false;
+                else if (showType==2) frame.IsShow==true;
+                else frame.IsShow=!frame.IsShow; 
+
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.Draw();
+
+                break;
         }
     }
 
+    this.GetShowIndexMenuData=function(windowIndex, showType)
+    {
+        var script=this.WindowIndex[windowIndex];
+        if (!script) return null;
+
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_INDEX_ID, Args:[windowIndex, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var script=overlay.OverlayItem.Script;
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var frame=overlay.OverlayItem.Frame;
+        var data= { Name:frame.IsShow?"隐藏Y轴":"显示Y轴",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
     //点击右键菜单
     this.OnClickRightMenu=function(data)
     {
@@ -57699,7 +57787,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title  });
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title, Data:item.Data  });
 
                 left=rtButton.Right;
 
@@ -59929,11 +60017,14 @@ function ChartDrawHLine()
 
     this.Button= 
     { 
-        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
-        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null }
+        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null, Margin:{ Left:2, Right:2 } },
+        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null, Margin:{ Left:2, Right:2 } }
         //修改ID, Text , TooltipText 可以外部定制按钮
     }
 
+    this.CustomButton=[];   //自定义的按钮 { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1, TooltipText:null }
+
+    this.AryShowButton=[];  //需要显示的按钮 { Data:, Width }
     this.AryButton=[];
     this.ExtendData;    //扩展数据
     this.ShowPriceTextConfig=
@@ -60039,8 +60130,32 @@ function ChartDrawHLine()
         this.Draw();
     }
 
+    //获取需要显示的按钮 系统按钮+自定义按钮
+    this.GetShowButton=function()
+    {
+        var aryButton=[];
+
+        var item=this.Button.SettingIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        item=this.Button.CloseIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomButton))
+        {
+            for(var i=0;i<this.CustomButton.length;++i)
+            {
+                item=this.CustomButton[i];
+                if (item && item.Text) aryButton.push({ Data:item, Width:null });
+            }
+        }
+
+        return aryButton;
+    }
+
     this.Draw=function(moveonPoint, mouseStatus)
     {
+        this.AryShowButton=[];
         this.LinePoint=[];
         this.AryButton=[];
         this.ColseButtonSize=0;
@@ -60116,6 +60231,8 @@ function ChartDrawHLine()
         var labInfo;
         if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
 
+        this.AryShowButton=this.GetShowButton();    //获取按钮
+
         //描述信息
         if (labInfo)
             this.DrawLab(labInfo, drawPoint[0].Y);
@@ -60419,42 +60536,33 @@ function ChartDrawHLine()
     {
         var pixelRatio=GetDevicePixelRatio();
 
-        if (this.Button.SettingIcon)
-        {
-            var icon=this.Button.SettingIcon;
-            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.SettingButtonSize=width;
-        }
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
-        if (this.Button.CloseIcon)
+        var totalWidth=0;
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var icon=this.Button.CloseIcon;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
             var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
             this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.ColseButtonSize=width;
-        }
+            item.Width=this.Canvas.measureText(icon.Text).width+2;
 
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+            if (icon.Margin)
+            {
+                var margin=icon.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) item.Width+=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) item.Width+=margin.Right;
+            }
 
-        var buttonWidth=0
-        if (this.SettingButtonSize>0) buttonWidth+=this.SettingButtonSize;
-        if (this.ColseButtonSize>0) 
-        {
-            if (buttonWidth>0) buttonWidth+=this.ButtonSpace;
-            buttonWidth+=this.ColseButtonSize;
+            totalWidth+=item.Width;
         }
 
-        buttonWidth+=4;
-
-        this.ButtonBGWidth=buttonWidth;
+        this.ButtonBGWidth=totalWidth;
     }
 
     this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
     {
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
         if (this.ButtonPosition==1) drawTop-=drawHeight;
 
@@ -60466,61 +60574,29 @@ function ChartDrawHLine()
         this.Canvas.fillStyle=this.ButtonBGColor;
         this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
 
-        left+=1;
         var pixelRatio=GetDevicePixelRatio();
-        if (this.Button.SettingIcon && this.Button.SettingIcon.Text)
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var rtButton={Left:left, Top:drawTop, Width:this.SettingButtonSize, Height:drawHeight };
-            rtButton.Right=rtButton.Left+rtButton.Width;
-            rtButton.Bottom=rtButton.Top+rtButton.Height;
-            var yCenter=rtButton.Top+rtButton.Height/2;
-            var xCenter=rtButton.Left+rtButton.Width/2;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
 
-            var icon=this.Button.SettingIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.textAlign="center";
-            this.Canvas.textBaseline="middle";
-            this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);
-
-            this.AryButton.push({Rect:rtButton, ID:icon.ID, TooltipText:icon.TooltipText});
-
-            /*
-            if (this.ColseButtonSize>0)
-            {
-                var xLine=rtButton.Right+this.ButtonSpace/2;
-                xLine=ToFixedPoint(xLine);
-                this.Canvas.strokeStyle=this.ButtonSplitLineColor;
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(xLine,rtButton.Top);
-                this.Canvas.lineTo(xLine,rtButton.Bottom);
-                this.Canvas.stroke();
-            }
-            */
-
-            left=rtButton.Right+this.ButtonSpace;
-        }
-
-        if (this.Button.CloseIcon && this.Button.CloseIcon.Text)
-        {
-            var rtButton={Left:left, Top:drawTop, Width:this.ColseButtonSize, Height:drawHeight };
+            var rtButton={Left:left, Top:drawTop, Width:item.Width, Height:drawHeight };
             rtButton.Right=rtButton.Left+rtButton.Width;
             rtButton.Bottom=rtButton.Top+rtButton.Height;
             var yCenter=rtButton.Top+rtButton.Height/2;
             var xCenter=rtButton.Left+rtButton.Width/2;
-            var icon=this.Button.CloseIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+
+            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+            this.Canvas.font=font;
             this.Canvas.textAlign="center";
             this.Canvas.textBaseline="middle";
             this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.CloseIcon.Text,xCenter,yCenter);
+            this.Canvas.fillText(icon.Text,xCenter,yCenter);
 
             this.AryButton.push({Rect:rtButton,ID:icon.ID, TooltipText:icon.TooltipText });
 
             left=rtButton.Right;
         }
-
-        rtDraw.Right=rtBG.Right;
     }
 
     this.PtInButtons=function(x,y)
@@ -117017,6 +117093,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117371,6 +117448,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         //var titleIndex=windowIndex+1;
         //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -134788,7 +134866,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13205";
+var HQCHART_VERSION="1.1.13209";
 
 function PrintHQChartVersion()
 {