hqchart 1.1.15066 → 1.1.15073

package/lib/umychart.vue.js

@@ -2758,7 +2758,7 @@ if(this.YSplitOperator&&this.YSplitOperator.CoordinateType==1)isYPercentage=true
 }if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;if(Array.isArray(item.Message[1])){if(this.MultiTextFormat==1)//显示1行 格式:价格/百分比
 {textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);}else if(this.MultiTextFormat==2)//显示2行
 {textWidth=this.Canvas.measureText(item.Message[1][0]).width;var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;if(textWidth<textWidth2)textWidth=textWidth2;}else if(this.MultiTextFormat==3){textWidth=this.GetMulitTextMaxWidth(item.Message[1]);}else//显示第1行
-{textWidth=this.Canvas.measureText(item.Message[1][0]).width;if(isYPercentage){var perTextWidth=this.Canvas.measureText("-00.00%").width;if(perTextWidth>textWidth)textWidth=perTextWidth;}}}else{textWidth=this.Canvas.measureText(item.Message[1]).width;}if(width.Right==null||width.Right<textWidth)width.Right=textWidth;}}if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=rightExtendWidth;if(IFrameSplitOperator.IsNumber(width.Left))width.Left+=this.YTextPadding[0]+leftExtendLineWidth;if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=this.YTextPadding[1]+rightExtendLineWidth;return{TextWidth:width};};this.CreateDivFrameToolbar=function(hqchart,frameID,divHQChart){if(this.ToolbarButtonStyle==1)return;if(this.DivFrameToolbar)return;if(this.ClassName=="MinuteFrame"||this.ClassName=="KLineFrame"){this.DivFrameToolbar=new JSDivFrameToolbar();this.DivFrameToolbar.HQChart=hqchart;this.DivFrameToolbar.DivHQChart=divHQChart;this.DivFrameToolbar.FrameID=frameID;this.DivFrameToolbar.Create();}};this.ClearToolbar=function(){if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Destroy();this.DivFrameToolbar=null;};this.HideToolbar=function(){if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Hide();};this.GetMainOverlayFrame=function(){if(!this.FrameData||!this.FrameData.SubFrameItem)return null;var subFrame=this.FrameData.SubFrameItem;var leftFrame=null,rightFrame=null;for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];var overlayFrame=item.Frame;if(overlayFrame.IsShowMainFrame==2)rightFrame=overlayFrame;else if(overlayFrame.IsShowMainFrame==1)leftFrame=overlayFrame;}if(!leftFrame&&!rightFrame)return null;return[leftFrame,rightFrame];};}function MinuteFrame(){this.newMethod=AverageWidthFrame;//派生
+{textWidth=this.Canvas.measureText(item.Message[1][0]).width;if(isYPercentage){var perTextWidth=this.Canvas.measureText("-00.00%").width;if(perTextWidth>textWidth)textWidth=perTextWidth;}}}else{textWidth=this.Canvas.measureText(item.Message[1]).width;}if(width.Right==null||width.Right<textWidth)width.Right=textWidth;}}if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=rightExtendWidth;if(IFrameSplitOperator.IsNumber(width.Left))width.Left+=this.YTextPadding[0]+leftExtendLineWidth;if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=this.YTextPadding[1]+rightExtendLineWidth;return{TextWidth:width};};this.CreateDivFrameToolbar=function(hqchart,frameID,divHQChart){if(this.ToolbarButtonStyle==1)return;if(this.DivFrameToolbar)return;if(this.ClassName=="MinuteFrame"||this.ClassName=="KLineFrame"){this.DivFrameToolbar=new JSDivFrameToolbar();this.DivFrameToolbar.HQChart=hqchart;this.DivFrameToolbar.DivHQChart=divHQChart;this.DivFrameToolbar.FrameID=frameID;this.DivFrameToolbar.Create(this);}};this.ClearToolbar=function(){if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Destroy();this.DivFrameToolbar=null;};this.HideToolbar=function(){if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Hide();};this.GetMainOverlayFrame=function(){if(!this.FrameData||!this.FrameData.SubFrameItem)return null;var subFrame=this.FrameData.SubFrameItem;var leftFrame=null,rightFrame=null;for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];var overlayFrame=item.Frame;if(overlayFrame.IsShowMainFrame==2)rightFrame=overlayFrame;else if(overlayFrame.IsShowMainFrame==1)leftFrame=overlayFrame;}if(!leftFrame&&!rightFrame)return null;return[leftFrame,rightFrame];};}function MinuteFrame(){this.newMethod=AverageWidthFrame;//派生
 this.newMethod();delete this.newMethod;this.ClassName="MinuteFrame";this.DataWidth=1*GetDevicePixelRatio();this.DistanceWidth=1*GetDevicePixelRatio();this.MinuteCount=243;//每天的分钟个数
 this.BeforeBGColor=g_JSChartResource.Minute.Before.BGColor;//集合竞价背景
 this.AfterBGColor=g_JSChartResource.Minute.After.BGColor;this.MultiDayBorderPen=g_JSChartResource.MultiDayBorderPen;this.CustomHorizontalInfo=[];this.RightFrame=null;//右侧多重坐标
@@ -4865,7 +4865,8 @@ this.LockID;//锁ID
 this.Callback;//回调
 this.IndexName;//指标名字
 this.MinWidth=null;//最小宽度
-this.Draw=function(isDraw){this.LockRect=null;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw(isDraw);return;}var xOffset=this.ChartBorder.GetRight();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetLeft())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();var lHeight=this.ChartBorder.GetBottom()-this.ChartBorder.GetTop();var lWidth=this.ChartBorder.GetRight()-lLeft;if(this.MinWidth>10&&lWidth<this.MinWidth){lWidth=this.MinWidth;lLeft=this.ChartBorder.GetRight()-lWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();}if(isDraw){this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(lLeft,this.ChartBorder.GetTop(),lWidth,lHeight);var xCenter=lLeft+lWidth/2;var yCenter=this.ChartBorder.GetTop()+lHeight/2;this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,xCenter,yCenter);}this.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};//保存上锁区域
+this.Draw=function(isDraw){this.LockRect=null;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw(isDraw);return;}var xOffset=this.ChartBorder.GetRight();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetLeft())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();var lHeight=this.ChartBorder.GetBottom()-this.ChartBorder.GetTop();var lWidth=this.ChartBorder.GetRight()-lLeft;if(this.MinWidth>10&&lWidth<this.MinWidth){lWidth=this.MinWidth;lLeft=this.ChartBorder.GetRight()-lWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();}if(isDraw){var rtBG={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Height:lHeight};rtBG.Right=rtBG.Width+rtBG.Left;rtBG.Bottom=rtBG.Height+rtBG.Top;//上下渐变
+var bgColor=this.SetFillStyle(this.BGColor,rtBG.Left,rtBG.Top,rtBG.Left,rtBG.Bottom);this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);var xCenter=rtBG.Left+rtBG.Width/2;var yCenter=rtBG.Top+lHeight/2;this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,xCenter,yCenter);}this.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};//保存上锁区域
 };this.HScreenDraw=function(isDraw){var xOffset=this.ChartBorder.GetBottom();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetBottom();var xPointCount=this.ChartFrame.XPointCount;//求最后1个数据的位置
 for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetTop())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetTop())lLeft=this.ChartBorder.GetTop();var lHeight=this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();var lWidth=this.ChartBorder.GetBottom()-lLeft;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(this.ChartBorder.GetLeft(),lLeft,lHeight,lWidth);var xCenter=this.ChartBorder.GetLeft()+lHeight/2;var yCenter=lLeft+lWidth/2;this.Canvas.save();this.Canvas.translate(xCenter,yCenter);this.Canvas.rotate(90*Math.PI/180);this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,0,0);this.Canvas.restore();this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth};//保存上锁区域
 };//x,y是否在上锁区域
@@ -5159,7 +5160,7 @@ this.NotSupportMessage="不支持筹码图";this.Buttons=[];this.DefaultButton=C
 this.LongButton=CloneData(g_JSChartResource.StockChip.LongButton);//远期筹码分布图
 this.RecentButton=CloneData(g_JSChartResource.StockChip.RecentButton);//近期筹码分布图
 this.CloseButton=CloneData(g_JSChartResource.StockChip.CloseButton);//关闭按钮
-this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);this.DAY_COLOR=[['rgb(255,0,0)','rgb(255,128,128)','rgb(255,0,128)','rgb(255,100,0)','rgb(192,128,0)','rgb(255,192,0)'],['rgb(120,80,225)','rgb(160,160,225)','rgb(80,80,255)','rgb(120,120,255)','rgb(32,64,192)','rgb(0,64,128)']];this.SetOption=function(option){if(!option)return;if(option.ShowType>0)this.ShowType=option.ShowType;if(option.IsShowX)this.IsShowX=option.IsShowX;if(option.ShowXCount>0)this.ShowXCount=option.ShowXCount;if(option.Width>100)this.Width=option.Width*GetDevicePixelRatio();if(option.CalculateType>0)this.CalculateType=option.CalculateType;if(IFrameSplitOperator.IsNumber(option.PriceZoom))this.PriceZoom=option.PriceZoom;};this.ReloadResource=function(resource){this.PenBorder=g_JSChartResource.FrameBorderPen;this.Font=g_JSChartResource.StockChip.Font;this.InfoColor=g_JSChartResource.StockChip.InfoColor;this.DayInfoColor=g_JSChartResource.StockChip.DayInfoColor;this.DefaultButton=CloneData(g_JSChartResource.StockChip.DefaultButton);//默认筹码分布图
+this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);this.DAY_COLOR=[['rgb(255,0,0)','rgb(255,128,128)','rgb(255,0,128)','rgb(255,100,0)','rgb(192,128,0)','rgb(255,192,0)'],['rgb(120,80,225)','rgb(160,160,225)','rgb(80,80,255)','rgb(120,120,255)','rgb(32,64,192)','rgb(0,64,128)']];this.SetOption=function(option){if(!option)return;if(option.ShowType>0)this.ShowType=option.ShowType;if(option.IsShowX)this.IsShowX=option.IsShowX;if(option.ShowXCount>0)this.ShowXCount=option.ShowXCount;if(option.Width>50)this.Width=option.Width*GetDevicePixelRatio();if(option.CalculateType>0)this.CalculateType=option.CalculateType;if(IFrameSplitOperator.IsNumber(option.PriceZoom))this.PriceZoom=option.PriceZoom;};this.ReloadResource=function(resource){this.PenBorder=g_JSChartResource.FrameBorderPen;this.Font=g_JSChartResource.StockChip.Font;this.InfoColor=g_JSChartResource.StockChip.InfoColor;this.DayInfoColor=g_JSChartResource.StockChip.DayInfoColor;this.DefaultButton=CloneData(g_JSChartResource.StockChip.DefaultButton);//默认筹码分布图
 this.LongButton=CloneData(g_JSChartResource.StockChip.LongButton);//远期筹码分布图
 this.RecentButton=CloneData(g_JSChartResource.StockChip.RecentButton);//近期筹码分布图
 this.CloseButton=CloneData(g_JSChartResource.StockChip.CloseButton);this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);};this.Draw=function(){this.PixelRatio=GetDevicePixelRatio();var left=ToFixedPoint(this.ChartBorder.GetRight()+this.Left);var top=ToFixedPoint(this.ChartBorder.GetTop());var right=ToFixedPoint(left+this.Width-1*this.PixelRatio);var bottom=ToFixedPoint(this.ChartBorder.GetBottom());var width=right-left;var height=bottom-top;this.ClientRect={Left:left,Top:top,Width:width,Height:height};if(ChartData.IsTickPeriod(this.HQChart.Period))//分笔图没有筹码
@@ -6513,10 +6514,10 @@ this.IsPointInLine=function(x,y,option){if(!this.LinePoint)return-1;var lineWidt
         return -1;
         */};//0-10 鼠标对应的点索引   100=鼠标在正个图形上  -1 鼠标不在图形上
 this.IsPointIn_XYValue_Line=function(x,y,option){if(this.Status!=10)return-1;var value=this.IsPointInXYValue(x,y,option);if(value>=0)return value;value=this.IsPointInLine(x,y,option);if(value>=0)return 100;return-1;};this.DrawLine=function(ptStart,ptEnd,isDottedline){if(isDottedline)this.Canvas.setLineDash([5,10]);this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(ptStart.X,ptStart.Y);this.Canvas.lineTo(ptEnd.X,ptEnd.Y);this.Canvas.stroke();if(isDottedline)this.Canvas.setLineDash([]);};this.CreateLineData=function(ptStart,ptEnd){var line={Start:new Point(),End:new Point()};line.Start.Y=ptStart.Y;line.Start.X=ptStart.X;line.End.Y=ptEnd.Y;line.End.X=ptEnd.X;return line;};//导出成存储格式
-this.ExportStorageData=function(){var storageData={ClassName:this.ClassName,Symbol:this.Symbol,Guid:this.Guid,Period:this.Period,Value:[],FrameID:this.Frame.Identify,LineColor:this.LineColor,AreaColor:this.AreaColor,LineWidth:this.LineWidth,Right:this.Right,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate};for(var i=0;i<this.Value.length;++i){var item=this.Value[i];storageData.Value.push({XValue:item.XValue,YValue:item.YValue,DateTime:item.DateTime});}if(this.Text)storageData.Text=this.Text;//如果有文本, 也导出
+this.ExportStorageData=function(){var storageData={ClassName:this.ClassName,Symbol:this.Symbol,Guid:this.Guid,Period:this.Period,Value:[],FrameID:this.Frame.Identify,LineColor:this.LineColor,AreaColor:this.AreaColor,LineWidth:this.LineWidth,Right:this.Right,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate,EnableCtrlMove:this.EnableCtrlMove};for(var i=0;i<this.Value.length;++i){var item=this.Value[i];storageData.Value.push({XValue:item.XValue,YValue:item.YValue,DateTime:item.DateTime});}if(this.Text)storageData.Text=this.Text;//如果有文本, 也导出
 if(this.FontOption)storageData.FontOption=this.FontOption;//字体也导出
 return storageData;};//导出基础的配置 不包含点
-this.ExportBaseData=function(){var data={ClassName:this.ClassName,Guid:this.Guid,FrameID:this.Frame.Identify,Symbol:this.Symbol,Period:this.Period,Right:this.Right,LineColor:this.LineColor,LineWidth:this.LineWidth,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate};if(this.AreaColor)data.AreaColor=this.AreaColor;if(this.Text)data.Text=this.Text;//如果有文本, 也导出
+this.ExportBaseData=function(){var data={ClassName:this.ClassName,Guid:this.Guid,FrameID:this.Frame.Identify,Symbol:this.Symbol,Period:this.Period,Right:this.Right,LineColor:this.LineColor,LineWidth:this.LineWidth,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate,EnableCtrlMove:this.EnableCtrlMove};if(this.AreaColor)data.AreaColor=this.AreaColor;if(this.Text)data.Text=this.Text;//如果有文本, 也导出
 if(this.FontOption){data.FontOption={};this.SetFont(data.FontOption,this.FontOption);//字体也导出
 }return data;};this.IsFrameMinSize=function()//框架是否是最小化模式
 {return this.Frame&&this.Frame.IsMinSize;};this.PointRange=function(aryPoint){if(!IFrameSplitOperator.IsNonEmptyArray(aryPoint))return null;if(aryPoint.length==1){var data={Points:[{X:aryPoint[0].X,Y:aryPoint[0].Y}]};return data;}else{var xMax=aryPoint[0].X;var xMin=xMax;var yMax=aryPoint[0].Y;var yMin=yMax;var aryData=[{X:aryPoint[0].X,Y:aryPoint[0].Y}];for(var i=1;i<aryPoint.length;++i){if(xMax<aryPoint[i].X)xMax=aryPoint[i].X;if(xMin>aryPoint[i].X)xMin=aryPoint[i].X;if(yMax<aryPoint[i].Y)yMax=aryPoint[i].Y;if(yMin>aryPoint[i].Y)yMin=aryPoint[i].Y;aryData.push({X:aryPoint[i].X,Y:aryPoint[i].Y});}var data={X:{Max:{X:xMax},Min:{X:xMin}},Y:{Max:{Y:yMax},Min:{Y:yMin}},Points:aryData//所有的点
@@ -6618,9 +6619,9 @@ this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureHaflLine'
 this.Canvas.restore();this.FullLine={Start:drawPoint[0],End:endPoint};};}// 画图工具-水平线 支持横屏
 function ChartDrawPictureHorizontalLine(){this.newMethod=IChartDrawPicture;//派生
 this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureHorizontalLine';this.PointCount=1;this.IsPointIn=this.IsPointIn_XYValue_Line;this.IsDrawFirst=true;this.LineWidth=1;this.Super_SetOption=this.SetOption;//父类函数
-this.Super_ExportStorageData=this.ExportStorageData;this.LabelConfig={Left:{IsShow:true,Margin:{Left:5,Top:4,Bottom:2,Right:5}},Right:{IsShow:true,Margin:{Left:5,Top:4,Bottom:2,Right:5}},Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',TextColor:"rgb(255,255,255)"};this.InsideLabelConfig={Position:0,//0=左, 1=右
-Font:14*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',Margin:{Left:5,Top:4,Bottom:2,Right:5},TextColor:"rgb(255,255,255)",BGAlpha:0.8//背景色透明度
-};this.LabelTitle;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.LabelTitle)this.LabelTitle=option.LabelTitle;if(option.Label){var item=option.Label;if(item.Left){var subItem=item.Left;if(IFrameSplitOperator.IsBool(subItem.IsShow))this.LabelConfig.Left.IsShow=subItem.IsShow;}if(item.Right){var subItem=item.Right;if(IFrameSplitOperator.IsBool(subItem.IsShow))this.LabelConfig.Right.IsShow=subItem.IsShow;}if(item.Font)this.LabelConfig.Font=item.Font;if(item.TextColor)this.LabelConfig.FoTextColornt=item.TextColor;}if(option.InsideLabel){var item=option.InsideLabel;if(item.Font)this.InsideLabelConfig.Font=item.Font;if(item.TextColor)this.InsideLabelConfig.TextColor=item.TextColor;if(IFrameSplitOperator.IsNumber(item.Position))this.InsideLabelConfig.Position=item.Position;if(IFrameSplitOperator.IsNumber(item.BGAlpha))this.InsideLabelConfig.BGAlpha=item.BGAlpha;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.LabelTitle)storageData.LabelTitle=this.LabelTitle;}return storageData;};/*
+this.Super_ExportStorageData=this.ExportStorageData;this.LabelConfig={Left:{IsShow:true,Margin:{Left:5,Top:4,Bottom:2,Right:5}},Right:{IsShow:true,Margin:{Left:5,Top:4,Bottom:2,Right:5}},Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',TextColor:"rgb(255,255,255)",BGColor:null};this.InsideLabelConfig={Position:0,//0=左, 1=右
+Font:14*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',Margin:{Left:5,Top:4,Bottom:2,Right:5},TextColor:"rgb(255,255,255)",BGAlpha:0.8,//背景色透明度,
+IsShow:true};this.LabelTitle;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.LabelTitle)this.LabelTitle=option.LabelTitle;if(option.Label){var item=option.Label;if(item.Left){var subItem=item.Left;if(IFrameSplitOperator.IsBool(subItem.IsShow))this.LabelConfig.Left.IsShow=subItem.IsShow;}if(item.Right){var subItem=item.Right;if(IFrameSplitOperator.IsBool(subItem.IsShow))this.LabelConfig.Right.IsShow=subItem.IsShow;}if(item.Font)this.LabelConfig.Font=item.Font;if(item.TextColor)this.LabelConfig.TextColor=item.TextColor;if(item.BGColor)this.LabelConfig.BGColor=item.BGColor;}if(option.InsideLabel){var item=option.InsideLabel;if(item.Font)this.InsideLabelConfig.Font=item.Font;if(item.TextColor)this.InsideLabelConfig.TextColor=item.TextColor;if(IFrameSplitOperator.IsNumber(item.Position))this.InsideLabelConfig.Position=item.Position;if(IFrameSplitOperator.IsNumber(item.BGAlpha))this.InsideLabelConfig.BGAlpha=item.BGAlpha;if(IFrameSplitOperator.IsBool(item.IsShow))this.InsideLabelConfig.IsShow=item.IsShow;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.LabelTitle)storageData.LabelTitle=this.LabelTitle;if(this.LabelConfig)storageData.Label=this.LabelConfig;if(this.InsideLabelConfig)storageData.InsideLabel=this.InsideLabelConfig;}return storageData;};/*
     this.GetXYCoordinate=function()
     {
         if (this.IsFrameMinSize()) return null;
@@ -6631,7 +6632,7 @@ Font:14*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',Margin:{Left:5,Top:4
     */this.Draw=function(){this.LinePoint=[];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{var yFixed=ToFixedPoint2(this.LineWidth,drawPoint[0].Y);this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(right,yFixed);}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);//画点
 this.DrawPoint(drawPoint);//显示价格
 this.DrawInsideLabel(drawPoint[0]);this.Canvas.restore();this.DrawValueLabel(drawPoint[0]);};this.DrawValueLabel=function(point){if(!point)return;if(this.Frame.IsHScreen)return;//不支持横屏
-var y=point.Y;var yValue=this.Frame.GetYData(y);var text=yValue.toFixed(2);var border=this.Frame.GetBorder();var config=this.LabelConfig;this.Canvas.font=config.Font;var textHeight=this.Canvas.measureText("擎").width;var textWidth=this.Canvas.measureText(text).width;if(config.Left.IsShow&&this.Frame.ChartBorder.Left>5){var margin=config.Left.Margin;var rtBG={Right:border.Left-1,Height:textHeight+margin.Top+margin.Bottom,Width:textWidth+margin.Left+margin.Right};rtBG.Top=y-textHeight/2-margin.Top;rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Left=rtBG.Right-rtBG.Width;this.Canvas.fillStyle=this.LineColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.textAlign="left";this.Canvas.textBaseline="top";var xText=rtBG.Left+margin.Left;var yText=rtBG.Top+margin.Top;this.Canvas.fillStyle=config.TextColor;this.Canvas.fillText(text,xText,yText);}if(config.Right.IsShow&&this.Frame.ChartBorder.Right>5){var margin=config.Right.Margin;var rtBG={Left:border.Right+1,Height:textHeight+margin.Top+margin.Bottom,Width:textWidth+margin.Left+margin.Right};rtBG.Top=y-textHeight/2-margin.Top;rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;this.Canvas.fillStyle=this.LineColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.textAlign="left";this.Canvas.textBaseline="top";var xText=rtBG.Left+margin.Left;var yText=rtBG.Top+margin.Top;this.Canvas.fillStyle=config.TextColor;this.Canvas.fillText(text,xText,yText);}};this.DrawInsideLabel=function(point){if(!point)return;var isHScreen=this.Frame.IsHScreen;var config=this.InsideLabelConfig;if(config.Position!=0&&config.Position!=1)return;var margin=config.Margin;this.Canvas.fillStyle=this.LineColor;this.Canvas.font=config.Font;var textHeight=this.Canvas.measureText("擎").width;var border=this.Frame.GetBorder();if(isHScreen){var yValue=this.Frame.GetYData(point.X);var text=yValue.toFixed(2);if(this.LabelTitle)text=this.LabelTitle+text;var textWidth=this.Canvas.measureText(text).width;var rtBG=null;if(config.Position==0)//左
+var y=point.Y;var yValue=this.Frame.GetYData(y);var text=yValue.toFixed(2);var border=this.Frame.GetBorder();var config=this.LabelConfig;this.Canvas.font=config.Font;var textHeight=this.Canvas.measureText("擎").width;var textWidth=this.Canvas.measureText(text).width;if(config.Left.IsShow&&this.Frame.ChartBorder.Left>5){var margin=config.Left.Margin;var rtBG={Right:border.Left-1,Height:textHeight+margin.Top+margin.Bottom,Width:textWidth+margin.Left+margin.Right};rtBG.Top=y-textHeight/2-margin.Top;rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Left=rtBG.Right-rtBG.Width;if(config.BGColor)this.Canvas.fillStyle=config.BGColor;else this.Canvas.fillStyle=this.LineColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.textAlign="left";this.Canvas.textBaseline="top";var xText=rtBG.Left+margin.Left;var yText=rtBG.Top+margin.Top;this.Canvas.fillStyle=config.TextColor;this.Canvas.fillText(text,xText,yText);}if(config.Right.IsShow&&this.Frame.ChartBorder.Right>5){var margin=config.Right.Margin;var rtBG={Left:border.Right+1,Height:textHeight+margin.Top+margin.Bottom,Width:textWidth+margin.Left+margin.Right};rtBG.Top=y-textHeight/2-margin.Top;rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;if(config.BGColor)this.Canvas.fillStyle=config.BGColor;else this.Canvas.fillStyle=this.LineColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.textAlign="left";this.Canvas.textBaseline="top";var xText=rtBG.Left+margin.Left;var yText=rtBG.Top+margin.Top;this.Canvas.fillStyle=config.TextColor;this.Canvas.fillText(text,xText,yText);}};this.DrawInsideLabel=function(point){if(!point)return;var isHScreen=this.Frame.IsHScreen;var config=this.InsideLabelConfig;if(!config.IsShow)return;if(config.Position!=0&&config.Position!=1)return;var margin=config.Margin;this.Canvas.fillStyle=this.LineColor;this.Canvas.font=config.Font;var textHeight=this.Canvas.measureText("擎").width;var border=this.Frame.GetBorder();if(isHScreen){var yValue=this.Frame.GetYData(point.X);var text=yValue.toFixed(2);if(this.LabelTitle)text=this.LabelTitle+text;var textWidth=this.Canvas.measureText(text).width;var rtBG=null;if(config.Position==0)//左
 {var rtBG={Top:border.Top+1,Width:textHeight+margin.Top+margin.Bottom,Height:textWidth+margin.Left+margin.Right,Left:point.X};rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;}else if(config.Position==1)//右
 {var rtBG={Bottom:border.Bottom-1,Width:textHeight+margin.Top+margin.Bottom,Height:textWidth+margin.Left+margin.Right,Left:point.X};rtBG.Top=rtBG.Bottom-rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;}var bgColor=this.LineColor;if(config.BGAlpha<1)bgColor=IChartDrawPicture.ColorToRGBA(this.LineColor,config.BGAlpha);this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);var xText=rtBG.Right-margin.Top;var yText=rtBG.Top+margin.Left;this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);//数据和框子旋转180度
 this.Canvas.textAlign="left";this.Canvas.textBaseline="top";this.Canvas.fillStyle=config.TextColor;this.Canvas.fillText(text,0,0);}else{var yValue=this.Frame.GetYData(point.Y);var text=yValue.toFixed(2);if(this.LabelTitle)text=this.LabelTitle+text;var textWidth=this.Canvas.measureText(text).width;var rtBG=null;if(config.Position==0)//左
@@ -10416,11 +10417,16 @@ Path2DHelper.FormatRadian=function(angle){angle%=PI2;if(angle<0)angle+=PI2;retur
 //
 ///////////////////////////////////////////////////////////////////////////////////
 function JSDivFrameToolbar(){this.DivToolbar=null;this.DivHQChart=null;this.HQChart=null;this.FrameID=-1;//指标窗口ID
-this.ID=Guid();this.Left=-1;this.Top=-1;this.IconConfig={Color:g_JSChartResource.DivFrameToolbar.Icon.Color,HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor};this.AryButton=[{ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param",Tooltip:{Text:"修改参数"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.CHANGE_INDEX,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index",Tooltip:{Text:"切换指标"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.OVERLAY_INDEX,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index",Tooltip:{Text:"叠加指标"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close",Tooltip:{Text:"关闭窗口"},Span:null,Div:null,TooltipSpan:null}];this.SetToolbar=function(aryButton){//清空原来的按钮
-for(var i=0;i<this.AryButton.length;i++){var item=this.AryButton[i];if(item.Div&&this.DivToolbar)this.DivToolbar.removeChild(item.Div);item.Div=null;item.Span=null;item.TooltipSpan=null;}this.AryButton=[];//重新创建
-for(var i=0;i<aryButton.length;i++){var item=aryButton[i];if(!item.ID||!item.ClassName)continue;var newItem={ID:item.ID,ClassName:item.ClassName,Span:null,Div:null,TooltipSpan:null};if(item.Tooltip&&item.Tooltip.Text)newItem.Tooltip={Text:item.Tooltip.Text};this.AryButton.push(newItem);if(this.DivToolbar)this.CreateButton(newItem,this.DivToolbar);}this.UpdateStyle();};this.Destroy=function(){if(this.DivToolbar){if(this.DivHQChart.removeChild)this.DivHQChart.removeChild(this.DivToolbar);this.DivToolbar=null;}this.HQChart=null;this.DivHQChart=null;this.FrameID=-1;};this.Create=function(){var divToolbar=document.createElement("div");divToolbar.className='UMyChart_FrameToolbar_Div';divToolbar.id=this.ID;divToolbar.oncontextmenu=function(){return false;};//屏蔽右键系统菜单
-for(var i=0;i<this.AryButton.length;i++){var item=this.AryButton[i];if(this.FrameID==0&&item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)continue;//第一个指标窗口不显示关闭按钮
-this.CreateButton(item,divToolbar);}this.DivHQChart.appendChild(divToolbar);this.DivToolbar=divToolbar;this.UpdateStyle();if(!this.HQChart.JSToolbarTooltip){this.HQChart.JSToolbarTooltip=new JSToolbarTooltip();this.HQChart.JSToolbarTooltip.DivHQChart=this.DivHQChart;this.HQChart.JSToolbarTooltip.Create();}};this.UpdateStyle=function(){if(!this.DivToolbar)return;for(var i=0;i<this.AryButton.length;i++){var item=this.AryButton[i];if(!item.Span)continue;item.Span.style["color"]=this.IconConfig.Color;}};this.ReloadResource=function(option){this.IconConfig.Color=g_JSChartResource.DivFrameToolbar.Icon.Color,this.IconConfig.HoverColor=g_JSChartResource.DivFrameToolbar.Icon.HoverColor;this.UpdateStyle();};this.CreateButton=function(item,divDom){var _this50=this;var btnDiv=document.createElement("div");btnDiv.className="UMyChart_FrameToolbar_Div_Button";btnDiv.onmouseover=function(e){_this50.OnHoverButton(e,item);};btnDiv.onmouseout=function(e){_this50.OnLeaveButton(e,item);};item.Div=btnDiv;var spanDom=document.createElement("span");spanDom.className=item.ClassName;spanDom.onmousedown=function(e){_this50.OnClickButton(e,item);};item.Span=spanDom;btnDiv.appendChild(spanDom);divDom.appendChild(btnDiv);};this.OnClickButton=function(e,item){if(!this.FrameID<0)return;if(!this.HQChart)return;var frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;var button={ID:item.ID,Frame:frame};this.HQChart.ClickFrameButton(button,e);};this.OnHoverButton=function(e,item){if(!item.Span)return;item.Span.style["color"]=this.IconConfig.HoverColor;this.ShowTooltip(e,item);};this.OnLeaveButton=function(e,item){if(!item.Span)return;item.Span.style["color"]=this.IconConfig.Color;this.HideTooltip();};this.Show=function(frameID){this.FrameID=frameID;if(!this.FrameID<0)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.Frame.SubFrame))return;if(!this.HQChart.Frame.SubFrame[this.FrameID])return;var pixelTatio=GetDevicePixelRatio();var frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;var border=frame.GetBorder();var top=border.Top/pixelTatio;var right=border.RightEx/pixelTatio;var left=right-this.DivToolbar.offsetWidth-2;if(this.Top!=top||this.Left!=left){this.DivToolbar.style.top=top+"px";this.DivToolbar.style.left=left+"px";this.DivToolbar.style.height=frame.ChartBorder.TitleHeight/pixelTatio+"px";this.Top=top;this.Left=left;}if(this.DivToolbar.style.visibility!='visible')this.DivToolbar.style.visibility='visible';};this.Hide=function(){if(this.DivToolbar)this.DivToolbar.style.visibility="hidden";};this.HideTooltip=function(){if(this.HQChart.JSToolbarTooltip)this.HQChart.JSToolbarTooltip.Hide();};this.ShowTooltip=function(e,item){if(!this.HQChart.JSToolbarTooltip)return;if(!item.Div)return;var rtButton=item.Div.getBoundingClientRect();var rtHQChart=this.DivHQChart.getBoundingClientRect();var left=rtButton.left-rtHQChart.left;var top=rtButton.bottom-rtHQChart.top+2;this.HQChart.JSToolbarTooltip.Show(top,left,{Text:item.Tooltip.Text});};}function JSToolbarTooltip(){this.DivTooltip=null;this.DivHQChart=null;this.Text=null;this.Left=-1;this.Top=-1;this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;this.Create=function(){var divDom=document.createElement("div");divDom.className='UMyChart_Toolbar_Tooltip_Div';this.DivHQChart.appendChild(divDom);this.DivTooltip=divDom;this.UpdateStyle();};this.ReloadResource=function(option){this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivTooltip)return;this.DivTooltip.style["background-color"]=this.BGColor;this.DivTooltip.style["color"]=this.TextColor;this.DivTooltip.style["border"]="1px solid "+this.BorderColor;};this.Show=function(top,left,tooltipData){if(!this.DivTooltip)return;if(this.Text!=tooltipData.Text)this.DivTooltip.innerHTML=tooltipData.Text;var right=left+this.DivTooltip.offsetWidth;if(right+5>=window.innerWidth)left=left-this.DivTooltip.offsetWidth;if(this.Top!=top||this.Left!=left){this.DivTooltip.style.top=top+"px";this.DivTooltip.style.left=left+"px";this.Top=top;this.Left=left;}if(this.DivTooltip.style.visibility!='visible')this.DivTooltip.style.visibility='visible';};this.Hide=function(){if(!this.DivTooltip)return;if(this.DivTooltip.style["visibility"]!='hidden')this.DivTooltip.style["visibility"]="hidden";};}/*
+this.ID=Guid();this.Left=-1;this.Top=-1;this.IconConfig={Color:g_JSChartResource.DivFrameToolbar.Icon.Color,HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor};this.AryButton=[];//按钮数组
+//创建按钮
+this.CreateArrayButton=function(aryButton){for(var i=0;i<aryButton.length;i++){var item=aryButton[i];if(!item.ID||!item.ClassName)continue;var newItem={ID:item.ID,ClassName:item.ClassName,Span:null,Div:null,TooltipSpan:null};if(item.Tooltip&&item.Tooltip.Text)newItem.Tooltip={Text:item.Tooltip.Text};this.AryButton.push(newItem);if(this.DivToolbar)this.CreateButton(newItem,this.DivToolbar);}};//清空原来的按钮
+this.ClearAllButtons=function(){//清空原来的按钮
+for(var i=0;i<this.AryButton.length;i++){var item=this.AryButton[i];if(item.Div&&this.DivToolbar)this.DivToolbar.removeChild(item.Div);item.Div=null;item.Span=null;item.TooltipSpan=null;}this.AryButton=[];};this.GetShowButtons=function(subFrame){var frame=subFrame;if(!frame&&this.FrameID>=0&&this.FrameID<this.HQChart.Frame.SubFrame.length)frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();var aryButton=[];for(var i=0;i<aryDefaultButton.length;i++){var item=aryDefaultButton[i];if(this.FrameID==0&&item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)continue;//第一个指标窗口不显示关闭按钮
+if(item.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM&&frame&&frame.ModifyIndex===false)continue;if(item.ID==JSCHART_BUTTON_ID.CHANGE_INDEX&&frame&&frame.ChangeIndex===false)continue;if(item.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX&&frame&&frame.OverlayIndex===false)continue;if(item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW&&frame&&frame.CloseIndex===false)continue;aryButton.push(item);}return aryButton;};this.SetToolbar=function(aryButton){this.ClearAllButtons();//清空原来的按钮
+this.CreateArrayButton(aryButton);//重新创建
+this.UpdateStyle();};this.UpdateButton=function(){if(!this.DivToolbar)return;var aryButton=this.GetShowButtons();var bChange=false;if(aryButton.length!=this.AryButton.length){bChange=true;}else{for(var i=0;i<this.AryButton.length;++i){var leftItem=this.AryButton[i];var rightItem=aryButton[i];if(leftItem.ID!=rightItem.ID||leftItem.ClassName!=rightItem.ClassName){bChange=true;break;}}}if(!bChange)return;this.SetToolbar(aryButton);//重新设置按钮
+};this.Destroy=function(){if(this.DivToolbar){if(this.DivHQChart.removeChild)this.DivHQChart.removeChild(this.DivToolbar);this.DivToolbar=null;}this.HQChart=null;this.DivHQChart=null;this.FrameID=-1;};this.Create=function(frame){var divToolbar=document.createElement("div");divToolbar.className='UMyChart_FrameToolbar_Div';divToolbar.id=this.ID;divToolbar.oncontextmenu=function(){return false;};//屏蔽右键系统菜单
+this.DivToolbar=divToolbar;var aryButtons=this.GetShowButtons(frame);this.CreateArrayButton(aryButtons);this.DivHQChart.appendChild(divToolbar);this.UpdateStyle();if(!this.HQChart.JSToolbarTooltip){this.HQChart.JSToolbarTooltip=new JSToolbarTooltip();this.HQChart.JSToolbarTooltip.DivHQChart=this.DivHQChart;this.HQChart.JSToolbarTooltip.Create();}};this.UpdateStyle=function(){if(!this.DivToolbar)return;for(var i=0;i<this.AryButton.length;i++){var item=this.AryButton[i];if(!item.Span)continue;item.Span.style["color"]=this.IconConfig.Color;}};this.ReloadResource=function(option){this.IconConfig.Color=g_JSChartResource.DivFrameToolbar.Icon.Color,this.IconConfig.HoverColor=g_JSChartResource.DivFrameToolbar.Icon.HoverColor;this.UpdateStyle();};this.CreateButton=function(item,divDom){var _this50=this;var btnDiv=document.createElement("div");btnDiv.className="UMyChart_FrameToolbar_Div_Button";btnDiv.onmouseover=function(e){_this50.OnHoverButton(e,item);};btnDiv.onmouseout=function(e){_this50.OnLeaveButton(e,item);};item.Div=btnDiv;var spanDom=document.createElement("span");spanDom.className=item.ClassName;spanDom.onmousedown=function(e){_this50.OnClickButton(e,item);};item.Span=spanDom;btnDiv.appendChild(spanDom);divDom.appendChild(btnDiv);};this.OnClickButton=function(e,item){if(!this.FrameID<0)return;if(!this.HQChart)return;var frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;var button={ID:item.ID,Frame:frame};this.HQChart.ClickFrameButton(button,e);};this.OnHoverButton=function(e,item){if(!item.Span)return;item.Span.style["color"]=this.IconConfig.HoverColor;this.ShowTooltip(e,item);};this.OnLeaveButton=function(e,item){if(!item.Span)return;item.Span.style["color"]=this.IconConfig.Color;this.HideTooltip();};this.Show=function(frameID){this.FrameID=frameID;if(!this.FrameID<0)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.Frame.SubFrame))return;if(!this.HQChart.Frame.SubFrame[this.FrameID])return;var pixelTatio=GetDevicePixelRatio();var frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;var border=frame.GetBorder();var top=border.Top/pixelTatio;var right=border.RightEx/pixelTatio;var left=right-this.DivToolbar.offsetWidth-2;if(this.Top!=top||this.Left!=left){this.DivToolbar.style.top=top+"px";this.DivToolbar.style.left=left+"px";this.DivToolbar.style.height=frame.ChartBorder.TitleHeight/pixelTatio+"px";this.Top=top;this.Left=left;}if(this.DivToolbar.style.visibility!='visible')this.DivToolbar.style.visibility='visible';};this.Hide=function(){if(this.DivToolbar)this.DivToolbar.style.visibility="hidden";};this.HideTooltip=function(){if(this.HQChart.JSToolbarTooltip)this.HQChart.JSToolbarTooltip.Hide();};this.ShowTooltip=function(e,item){if(!this.HQChart.JSToolbarTooltip)return;if(!item.Div)return;var rtButton=item.Div.getBoundingClientRect();var rtHQChart=this.DivHQChart.getBoundingClientRect();var left=rtButton.left-rtHQChart.left;var top=rtButton.bottom-rtHQChart.top+2;this.HQChart.JSToolbarTooltip.Show(top,left,{Text:item.Tooltip.Text});};}JSDivFrameToolbar.GetDfaultButtons=function(){var aryButton=[{ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param",Tooltip:{Text:"修改参数"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.CHANGE_INDEX,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index",Tooltip:{Text:"切换指标"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.OVERLAY_INDEX,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index",Tooltip:{Text:"叠加指标"},Span:null,Div:null,TooltipSpan:null},{ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close",Tooltip:{Text:"关闭窗口"},Span:null,Div:null,TooltipSpan:null}];return aryButton;};function JSToolbarTooltip(){this.DivTooltip=null;this.DivHQChart=null;this.Text=null;this.Left=-1;this.Top=-1;this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;this.Create=function(){var divDom=document.createElement("div");divDom.className='UMyChart_Toolbar_Tooltip_Div';this.DivHQChart.appendChild(divDom);this.DivTooltip=divDom;this.UpdateStyle();};this.ReloadResource=function(option){this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivTooltip)return;this.DivTooltip.style["background-color"]=this.BGColor;this.DivTooltip.style["color"]=this.TextColor;this.DivTooltip.style["border"]="1px solid "+this.BorderColor;};this.Show=function(top,left,tooltipData){if(!this.DivTooltip)return;if(this.Text!=tooltipData.Text)this.DivTooltip.innerHTML=tooltipData.Text;var right=left+this.DivTooltip.offsetWidth;if(right+5>=window.innerWidth)left=left-this.DivTooltip.offsetWidth;if(this.Top!=top||this.Left!=left){this.DivTooltip.style.top=top+"px";this.DivTooltip.style.left=left+"px";this.Top=top;this.Left=left;}if(this.DivTooltip.style.visibility!='visible')this.DivTooltip.style.visibility='visible';};this.Hide=function(){if(!this.DivTooltip)return;if(this.DivTooltip.style["visibility"]!='hidden')this.DivTooltip.style["visibility"]="hidden";};}/*
    Copyright (c) 2018 jones
  
     http://www.apache.org/licenses/LICENSE-2.0
@@ -15332,7 +15338,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.15065";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.15072";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}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.15066",
+  "version": "1.1.15073",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -16218,7 +16218,7 @@ function AverageWidthFrame()
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
-            this.DivFrameToolbar.Create();
+            this.DivFrameToolbar.Create(this);
         }
     }
 
@@ -47774,10 +47774,17 @@ function ChartLock()
 
         if (isDraw)
         {
-            this.Canvas.fillStyle = this.BGColor;
-            this.Canvas.fillRect(lLeft, this.ChartBorder.GetTop(), lWidth, lHeight);
-            var xCenter = lLeft + lWidth / 2;
-            var yCenter = this.ChartBorder.GetTop() + lHeight / 2;
+            var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
+            rtBG.Right=rtBG.Width+rtBG.Left;
+            rtBG.Bottom=rtBG.Height+rtBG.Top;
+
+            //上下渐变
+            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
+            this.Canvas.fillStyle =bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+
+            var xCenter = rtBG.Left + rtBG.Width / 2;
+            var yCenter = rtBG.Top + lHeight / 2;
             this.Canvas.textAlign = 'center';
             this.Canvas.textBaseline = 'middle';
             this.Canvas.fillStyle = this.TextColor;
@@ -47821,6 +47828,7 @@ function ChartLock()
         if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
         var lHeight =  this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
         var lWidth = this.ChartBorder.GetBottom() - lLeft;
+
         this.Canvas.fillStyle = this.BGColor;
         this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
 
@@ -49471,7 +49479,7 @@ function StockChip()
         if (option.ShowType>0) this.ShowType=option.ShowType;
         if (option.IsShowX) this.IsShowX=option.IsShowX;
         if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
-        if (option.Width>100) this.Width=option.Width*GetDevicePixelRatio();
+        if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
         if (option.CalculateType>0) this.CalculateType=option.CalculateType;
         if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
     }
@@ -65380,7 +65388,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
             FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
             LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
-            IsShowYCoordinate:this.IsShowYCoordinate
+            IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
         };
 
         for(var i=0; i<this.Value.length; ++i)
@@ -65404,7 +65412,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol,  Period:this.Period,Right:this.Right,
             LineColor:this.LineColor, 
             LineWidth:this.LineWidth,  
-            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
+            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
         };
 
         if (this.AreaColor) data.AreaColor=this.AreaColor;
@@ -66656,7 +66664,7 @@ function ChartDrawPictureHorizontalLine()
     { 
         Left:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
         Right:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
-        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)" 
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)", BGColor:null
     };
 
     this.InsideLabelConfig=
@@ -66665,7 +66673,8 @@ function ChartDrawPictureHorizontalLine()
         Font:`${14*GetDevicePixelRatio()}px 微软雅黑`,
         Margin:{ Left:5, Top:4, Bottom:2, Right:5 },
         TextColor:"rgb(255,255,255)",
-        BGAlpha:0.8, //背景色透明度
+        BGAlpha:0.8, //背景色透明度,
+        IsShow:true
     }
 
     this.LabelTitle;
@@ -66694,7 +66703,8 @@ function ChartDrawPictureHorizontalLine()
                 }
 
                 if (item.Font) this.LabelConfig.Font=item.Font;
-                if (item.TextColor) this.LabelConfig.FoTextColornt=item.TextColor;
+                if (item.TextColor) this.LabelConfig.TextColor=item.TextColor;
+                if (item.BGColor) this.LabelConfig.BGColor=item.BGColor;
             }
 
             if (option.InsideLabel)
@@ -66704,6 +66714,7 @@ function ChartDrawPictureHorizontalLine()
                 if (item.TextColor) this.InsideLabelConfig.TextColor=item.TextColor;
                 if (IFrameSplitOperator.IsNumber(item.Position)) this.InsideLabelConfig.Position=item.Position;
                 if (IFrameSplitOperator.IsNumber(item.BGAlpha)) this.InsideLabelConfig.BGAlpha=item.BGAlpha;
+                if (IFrameSplitOperator.IsBool(item.IsShow)) this.InsideLabelConfig.IsShow=item.IsShow;
             }
         }
     }
@@ -66715,6 +66726,8 @@ function ChartDrawPictureHorizontalLine()
         {
             storageData=this.Super_ExportStorageData();
             if (this.LabelTitle) storageData.LabelTitle=this.LabelTitle;
+            if (this.LabelConfig) storageData.Label=this.LabelConfig;
+            if (this.InsideLabelConfig) storageData.InsideLabel=this.InsideLabelConfig;
         }
 
         return storageData;
@@ -66821,7 +66834,8 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Left=rtBG.Right-rtBG.Width;
 
-            this.Canvas.fillStyle=this.LineColor;
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -66839,7 +66853,9 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Top=y-textHeight/2-margin.Top;
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Right=rtBG.Left+rtBG.Width;
-            this.Canvas.fillStyle=this.LineColor;
+
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -66857,6 +66873,7 @@ function ChartDrawPictureHorizontalLine()
 
         var isHScreen=this.Frame.IsHScreen;
         var config=this.InsideLabelConfig;
+        if (!config.IsShow) return;
         if (config.Position!=0 && config.Position!=1) return;
         var margin=config.Margin;
 
@@ -105278,27 +105295,26 @@ function JSDivFrameToolbar()
         HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor
     }
 
-    this.AryButton=
-    [
-        { 
-            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
-            Span:null, Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
-            Span:null,Div:null,  TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-    ];
+    this.AryButton=[]; //按钮数组
 
-    this.SetToolbar=function(aryButton)
+    //创建按钮
+    this.CreateArrayButton=function(aryButton)
+    {
+        for(var i=0;i<aryButton.length; i++)
+        {
+            var item=aryButton[i];
+            if (!item.ID || !item.ClassName) continue;
+            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
+            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+
+            this.AryButton.push(newItem);
+
+            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+        }
+    }
+
+    //清空原来的按钮
+    this.ClearAllButtons=function()
     {
         //清空原来的按钮
         for(var i=0; i<this.AryButton.length; i++)
@@ -105309,24 +105325,75 @@ function JSDivFrameToolbar()
             item.Span=null;
             item.TooltipSpan=null;
         }
+
         this.AryButton=[];
+    }
 
-        //重新创建
-        for(var i=0;i<aryButton.length; i++)
+    this.GetShowButtons=function(subFrame)
+    {
+        var frame=subFrame;
+        if (!frame && this.FrameID>=0 && this.FrameID<this.HQChart.Frame.SubFrame.length) 
+            frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
+
+        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();
+        var aryButton=[];
+        for(var i=0;i<aryDefaultButton.length; i++)
         {
-            var item=aryButton[i];
-            if (!item.ID || !item.ClassName) continue;
-            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
-            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+            var item=aryDefaultButton[i];
+            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
 
-            this.AryButton.push(newItem);
+            if (item.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM && frame && frame.ModifyIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CHANGE_INDEX && frame && frame.ChangeIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX && frame && frame.OverlayIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW && frame && frame.CloseIndex===false) continue;
 
-            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+            aryButton.push(item);
         }
 
+        return aryButton;
+    }
+
+    this.SetToolbar=function(aryButton)
+    {
+        this.ClearAllButtons(); //清空原来的按钮
+        
+        this.CreateArrayButton(aryButton);  //重新创建
+        
         this.UpdateStyle();
     }
 
+    this.UpdateButton=function()
+    {
+        if (!this.DivToolbar) return;
+
+        var aryButton=this.GetShowButtons();
+        var bChange=false;
+        if (aryButton.length!=this.AryButton.length)
+        {
+            bChange=true;
+        } 
+        else
+        {
+            for(var i=0;i<this.AryButton.length;++i)
+            {
+                var leftItem=this.AryButton[i];
+                var rightItem=aryButton[i];
+
+                if (leftItem.ID!=rightItem.ID || leftItem.ClassName!=rightItem.ClassName)
+                {
+                    bChange=true;
+                    break;
+                }
+            }
+        }
+
+        if (!bChange) return;
+
+        this.SetToolbar(aryButton); //重新设置按钮
+    }
+
+    
+
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -105340,24 +105407,19 @@ function JSDivFrameToolbar()
         this.FrameID=-1;
     }
 
-    this.Create=function()
+    this.Create=function(frame)
     {
         var divToolbar=document.createElement("div");
         divToolbar.className='UMyChart_FrameToolbar_Div';
         divToolbar.id=this.ID;
         divToolbar.oncontextmenu = function() { return false; }; //屏蔽右键系统菜单
+        this.DivToolbar=divToolbar;
 
-        for(var i=0;i<this.AryButton.length; i++)
-        {
-            var item=this.AryButton[i];
-            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
-            this.CreateButton(item, divToolbar);
-        }
+        var aryButtons=this.GetShowButtons(frame);
+        this.CreateArrayButton(aryButtons)
         
         this.DivHQChart.appendChild(divToolbar);
 
-        this.DivToolbar=divToolbar;
-
         this.UpdateStyle();
 
         if (!this.HQChart.JSToolbarTooltip)
@@ -105483,6 +105545,32 @@ function JSDivFrameToolbar()
     }
 }
 
+JSDivFrameToolbar.GetDfaultButtons=function()
+{
+    var aryButton=
+    [
+
+        { 
+            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
+            Span:null, Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
+            Span:null,Div:null,  TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+    ];
+
+    return aryButton
+}
+
 
 function JSToolbarTooltip()
 {

package/src/jscommon/umychart.resource/css/tools.css

@@ -2386,6 +2386,7 @@ input[type="color"] {
 
 .UMyChart_Toolbar_Tooltip_Div
 {
+    visibility:hidden;
     background-color: rgb(220,220,220);
     color: rgb(0,0,0);
     text-align: center;

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

@@ -20314,7 +20314,7 @@ function AverageWidthFrame()
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
-            this.DivFrameToolbar.Create();
+            this.DivFrameToolbar.Create(this);
         }
     }
 
@@ -51870,10 +51870,17 @@ function ChartLock()
 
         if (isDraw)
         {
-            this.Canvas.fillStyle = this.BGColor;
-            this.Canvas.fillRect(lLeft, this.ChartBorder.GetTop(), lWidth, lHeight);
-            var xCenter = lLeft + lWidth / 2;
-            var yCenter = this.ChartBorder.GetTop() + lHeight / 2;
+            var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
+            rtBG.Right=rtBG.Width+rtBG.Left;
+            rtBG.Bottom=rtBG.Height+rtBG.Top;
+
+            //上下渐变
+            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
+            this.Canvas.fillStyle =bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+
+            var xCenter = rtBG.Left + rtBG.Width / 2;
+            var yCenter = rtBG.Top + lHeight / 2;
             this.Canvas.textAlign = 'center';
             this.Canvas.textBaseline = 'middle';
             this.Canvas.fillStyle = this.TextColor;
@@ -51917,6 +51924,7 @@ function ChartLock()
         if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
         var lHeight =  this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
         var lWidth = this.ChartBorder.GetBottom() - lLeft;
+
         this.Canvas.fillStyle = this.BGColor;
         this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
 
@@ -53567,7 +53575,7 @@ function StockChip()
         if (option.ShowType>0) this.ShowType=option.ShowType;
         if (option.IsShowX) this.IsShowX=option.IsShowX;
         if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
-        if (option.Width>100) this.Width=option.Width*GetDevicePixelRatio();
+        if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
         if (option.CalculateType>0) this.CalculateType=option.CalculateType;
         if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
     }
@@ -69476,7 +69484,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
             FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
             LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
-            IsShowYCoordinate:this.IsShowYCoordinate
+            IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
         };
 
         for(var i=0; i<this.Value.length; ++i)
@@ -69500,7 +69508,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol,  Period:this.Period,Right:this.Right,
             LineColor:this.LineColor, 
             LineWidth:this.LineWidth,  
-            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
+            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
         };
 
         if (this.AreaColor) data.AreaColor=this.AreaColor;
@@ -70752,7 +70760,7 @@ function ChartDrawPictureHorizontalLine()
     { 
         Left:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
         Right:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
-        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)" 
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)", BGColor:null
     };
 
     this.InsideLabelConfig=
@@ -70761,7 +70769,8 @@ function ChartDrawPictureHorizontalLine()
         Font:`${14*GetDevicePixelRatio()}px 微软雅黑`,
         Margin:{ Left:5, Top:4, Bottom:2, Right:5 },
         TextColor:"rgb(255,255,255)",
-        BGAlpha:0.8, //背景色透明度
+        BGAlpha:0.8, //背景色透明度,
+        IsShow:true
     }
 
     this.LabelTitle;
@@ -70790,7 +70799,8 @@ function ChartDrawPictureHorizontalLine()
                 }
 
                 if (item.Font) this.LabelConfig.Font=item.Font;
-                if (item.TextColor) this.LabelConfig.FoTextColornt=item.TextColor;
+                if (item.TextColor) this.LabelConfig.TextColor=item.TextColor;
+                if (item.BGColor) this.LabelConfig.BGColor=item.BGColor;
             }
 
             if (option.InsideLabel)
@@ -70800,6 +70810,7 @@ function ChartDrawPictureHorizontalLine()
                 if (item.TextColor) this.InsideLabelConfig.TextColor=item.TextColor;
                 if (IFrameSplitOperator.IsNumber(item.Position)) this.InsideLabelConfig.Position=item.Position;
                 if (IFrameSplitOperator.IsNumber(item.BGAlpha)) this.InsideLabelConfig.BGAlpha=item.BGAlpha;
+                if (IFrameSplitOperator.IsBool(item.IsShow)) this.InsideLabelConfig.IsShow=item.IsShow;
             }
         }
     }
@@ -70811,6 +70822,8 @@ function ChartDrawPictureHorizontalLine()
         {
             storageData=this.Super_ExportStorageData();
             if (this.LabelTitle) storageData.LabelTitle=this.LabelTitle;
+            if (this.LabelConfig) storageData.Label=this.LabelConfig;
+            if (this.InsideLabelConfig) storageData.InsideLabel=this.InsideLabelConfig;
         }
 
         return storageData;
@@ -70917,7 +70930,8 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Left=rtBG.Right-rtBG.Width;
 
-            this.Canvas.fillStyle=this.LineColor;
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -70935,7 +70949,9 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Top=y-textHeight/2-margin.Top;
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Right=rtBG.Left+rtBG.Width;
-            this.Canvas.fillStyle=this.LineColor;
+
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -70953,6 +70969,7 @@ function ChartDrawPictureHorizontalLine()
 
         var isHScreen=this.Frame.IsHScreen;
         var config=this.InsideLabelConfig;
+        if (!config.IsShow) return;
         if (config.Position!=0 && config.Position!=1) return;
         var margin=config.Margin;
 
@@ -109374,27 +109391,26 @@ function JSDivFrameToolbar()
         HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor
     }
 
-    this.AryButton=
-    [
-        { 
-            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
-            Span:null, Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
-            Span:null,Div:null,  TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-    ];
+    this.AryButton=[]; //按钮数组
 
-    this.SetToolbar=function(aryButton)
+    //创建按钮
+    this.CreateArrayButton=function(aryButton)
+    {
+        for(var i=0;i<aryButton.length; i++)
+        {
+            var item=aryButton[i];
+            if (!item.ID || !item.ClassName) continue;
+            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
+            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+
+            this.AryButton.push(newItem);
+
+            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+        }
+    }
+
+    //清空原来的按钮
+    this.ClearAllButtons=function()
     {
         //清空原来的按钮
         for(var i=0; i<this.AryButton.length; i++)
@@ -109405,24 +109421,75 @@ function JSDivFrameToolbar()
             item.Span=null;
             item.TooltipSpan=null;
         }
+
         this.AryButton=[];
+    }
 
-        //重新创建
-        for(var i=0;i<aryButton.length; i++)
+    this.GetShowButtons=function(subFrame)
+    {
+        var frame=subFrame;
+        if (!frame && this.FrameID>=0 && this.FrameID<this.HQChart.Frame.SubFrame.length) 
+            frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
+
+        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();
+        var aryButton=[];
+        for(var i=0;i<aryDefaultButton.length; i++)
         {
-            var item=aryButton[i];
-            if (!item.ID || !item.ClassName) continue;
-            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
-            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+            var item=aryDefaultButton[i];
+            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
 
-            this.AryButton.push(newItem);
+            if (item.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM && frame && frame.ModifyIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CHANGE_INDEX && frame && frame.ChangeIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX && frame && frame.OverlayIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW && frame && frame.CloseIndex===false) continue;
 
-            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+            aryButton.push(item);
         }
 
+        return aryButton;
+    }
+
+    this.SetToolbar=function(aryButton)
+    {
+        this.ClearAllButtons(); //清空原来的按钮
+        
+        this.CreateArrayButton(aryButton);  //重新创建
+        
         this.UpdateStyle();
     }
 
+    this.UpdateButton=function()
+    {
+        if (!this.DivToolbar) return;
+
+        var aryButton=this.GetShowButtons();
+        var bChange=false;
+        if (aryButton.length!=this.AryButton.length)
+        {
+            bChange=true;
+        } 
+        else
+        {
+            for(var i=0;i<this.AryButton.length;++i)
+            {
+                var leftItem=this.AryButton[i];
+                var rightItem=aryButton[i];
+
+                if (leftItem.ID!=rightItem.ID || leftItem.ClassName!=rightItem.ClassName)
+                {
+                    bChange=true;
+                    break;
+                }
+            }
+        }
+
+        if (!bChange) return;
+
+        this.SetToolbar(aryButton); //重新设置按钮
+    }
+
+    
+
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -109436,24 +109503,19 @@ function JSDivFrameToolbar()
         this.FrameID=-1;
     }
 
-    this.Create=function()
+    this.Create=function(frame)
     {
         var divToolbar=document.createElement("div");
         divToolbar.className='UMyChart_FrameToolbar_Div';
         divToolbar.id=this.ID;
         divToolbar.oncontextmenu = function() { return false; }; //屏蔽右键系统菜单
+        this.DivToolbar=divToolbar;
 
-        for(var i=0;i<this.AryButton.length; i++)
-        {
-            var item=this.AryButton[i];
-            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
-            this.CreateButton(item, divToolbar);
-        }
+        var aryButtons=this.GetShowButtons(frame);
+        this.CreateArrayButton(aryButtons)
         
         this.DivHQChart.appendChild(divToolbar);
 
-        this.DivToolbar=divToolbar;
-
         this.UpdateStyle();
 
         if (!this.HQChart.JSToolbarTooltip)
@@ -109579,6 +109641,32 @@ function JSDivFrameToolbar()
     }
 }
 
+JSDivFrameToolbar.GetDfaultButtons=function()
+{
+    var aryButton=
+    [
+
+        { 
+            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
+            Span:null, Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
+            Span:null,Div:null,  TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+    ];
+
+    return aryButton
+}
+
 
 function JSToolbarTooltip()
 {
@@ -153619,7 +153707,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15065";
+var HQCHART_VERSION="1.1.15072";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -20358,7 +20358,7 @@ function AverageWidthFrame()
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
-            this.DivFrameToolbar.Create();
+            this.DivFrameToolbar.Create(this);
         }
     }
 
@@ -51914,10 +51914,17 @@ function ChartLock()
 
         if (isDraw)
         {
-            this.Canvas.fillStyle = this.BGColor;
-            this.Canvas.fillRect(lLeft, this.ChartBorder.GetTop(), lWidth, lHeight);
-            var xCenter = lLeft + lWidth / 2;
-            var yCenter = this.ChartBorder.GetTop() + lHeight / 2;
+            var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
+            rtBG.Right=rtBG.Width+rtBG.Left;
+            rtBG.Bottom=rtBG.Height+rtBG.Top;
+
+            //上下渐变
+            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
+            this.Canvas.fillStyle =bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+
+            var xCenter = rtBG.Left + rtBG.Width / 2;
+            var yCenter = rtBG.Top + lHeight / 2;
             this.Canvas.textAlign = 'center';
             this.Canvas.textBaseline = 'middle';
             this.Canvas.fillStyle = this.TextColor;
@@ -51961,6 +51968,7 @@ function ChartLock()
         if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
         var lHeight =  this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
         var lWidth = this.ChartBorder.GetBottom() - lLeft;
+
         this.Canvas.fillStyle = this.BGColor;
         this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
 
@@ -53611,7 +53619,7 @@ function StockChip()
         if (option.ShowType>0) this.ShowType=option.ShowType;
         if (option.IsShowX) this.IsShowX=option.IsShowX;
         if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
-        if (option.Width>100) this.Width=option.Width*GetDevicePixelRatio();
+        if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
         if (option.CalculateType>0) this.CalculateType=option.CalculateType;
         if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
     }
@@ -69520,7 +69528,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
             FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
             LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
-            IsShowYCoordinate:this.IsShowYCoordinate
+            IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
         };
 
         for(var i=0; i<this.Value.length; ++i)
@@ -69544,7 +69552,7 @@ function IChartDrawPicture()
             Symbol:this.Symbol,  Period:this.Period,Right:this.Right,
             LineColor:this.LineColor, 
             LineWidth:this.LineWidth,  
-            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
+            EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
         };
 
         if (this.AreaColor) data.AreaColor=this.AreaColor;
@@ -70796,7 +70804,7 @@ function ChartDrawPictureHorizontalLine()
     { 
         Left:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
         Right:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
-        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)" 
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)", BGColor:null
     };
 
     this.InsideLabelConfig=
@@ -70805,7 +70813,8 @@ function ChartDrawPictureHorizontalLine()
         Font:`${14*GetDevicePixelRatio()}px 微软雅黑`,
         Margin:{ Left:5, Top:4, Bottom:2, Right:5 },
         TextColor:"rgb(255,255,255)",
-        BGAlpha:0.8, //背景色透明度
+        BGAlpha:0.8, //背景色透明度,
+        IsShow:true
     }
 
     this.LabelTitle;
@@ -70834,7 +70843,8 @@ function ChartDrawPictureHorizontalLine()
                 }
 
                 if (item.Font) this.LabelConfig.Font=item.Font;
-                if (item.TextColor) this.LabelConfig.FoTextColornt=item.TextColor;
+                if (item.TextColor) this.LabelConfig.TextColor=item.TextColor;
+                if (item.BGColor) this.LabelConfig.BGColor=item.BGColor;
             }
 
             if (option.InsideLabel)
@@ -70844,6 +70854,7 @@ function ChartDrawPictureHorizontalLine()
                 if (item.TextColor) this.InsideLabelConfig.TextColor=item.TextColor;
                 if (IFrameSplitOperator.IsNumber(item.Position)) this.InsideLabelConfig.Position=item.Position;
                 if (IFrameSplitOperator.IsNumber(item.BGAlpha)) this.InsideLabelConfig.BGAlpha=item.BGAlpha;
+                if (IFrameSplitOperator.IsBool(item.IsShow)) this.InsideLabelConfig.IsShow=item.IsShow;
             }
         }
     }
@@ -70855,6 +70866,8 @@ function ChartDrawPictureHorizontalLine()
         {
             storageData=this.Super_ExportStorageData();
             if (this.LabelTitle) storageData.LabelTitle=this.LabelTitle;
+            if (this.LabelConfig) storageData.Label=this.LabelConfig;
+            if (this.InsideLabelConfig) storageData.InsideLabel=this.InsideLabelConfig;
         }
 
         return storageData;
@@ -70961,7 +70974,8 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Left=rtBG.Right-rtBG.Width;
 
-            this.Canvas.fillStyle=this.LineColor;
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -70979,7 +70993,9 @@ function ChartDrawPictureHorizontalLine()
             rtBG.Top=y-textHeight/2-margin.Top;
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Right=rtBG.Left+rtBG.Width;
-            this.Canvas.fillStyle=this.LineColor;
+
+            if (config.BGColor) this.Canvas.fillStyle=config.BGColor;
+            else this.Canvas.fillStyle=this.LineColor;
             this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
             this.Canvas.textAlign="left";
@@ -70997,6 +71013,7 @@ function ChartDrawPictureHorizontalLine()
 
         var isHScreen=this.Frame.IsHScreen;
         var config=this.InsideLabelConfig;
+        if (!config.IsShow) return;
         if (config.Position!=0 && config.Position!=1) return;
         var margin=config.Margin;
 
@@ -109418,27 +109435,26 @@ function JSDivFrameToolbar()
         HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor
     }
 
-    this.AryButton=
-    [
-        { 
-            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
-            Span:null, Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
-            Span:null,Div:null,  TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-        { 
-            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
-            Span:null,Div:null, TooltipSpan:null
-        },
-    ];
+    this.AryButton=[]; //按钮数组
 
-    this.SetToolbar=function(aryButton)
+    //创建按钮
+    this.CreateArrayButton=function(aryButton)
+    {
+        for(var i=0;i<aryButton.length; i++)
+        {
+            var item=aryButton[i];
+            if (!item.ID || !item.ClassName) continue;
+            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
+            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+
+            this.AryButton.push(newItem);
+
+            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+        }
+    }
+
+    //清空原来的按钮
+    this.ClearAllButtons=function()
     {
         //清空原来的按钮
         for(var i=0; i<this.AryButton.length; i++)
@@ -109449,24 +109465,75 @@ function JSDivFrameToolbar()
             item.Span=null;
             item.TooltipSpan=null;
         }
+
         this.AryButton=[];
+    }
 
-        //重新创建
-        for(var i=0;i<aryButton.length; i++)
+    this.GetShowButtons=function(subFrame)
+    {
+        var frame=subFrame;
+        if (!frame && this.FrameID>=0 && this.FrameID<this.HQChart.Frame.SubFrame.length) 
+            frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
+
+        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();
+        var aryButton=[];
+        for(var i=0;i<aryDefaultButton.length; i++)
         {
-            var item=aryButton[i];
-            if (!item.ID || !item.ClassName) continue;
-            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
-            if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
+            var item=aryDefaultButton[i];
+            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
 
-            this.AryButton.push(newItem);
+            if (item.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM && frame && frame.ModifyIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CHANGE_INDEX && frame && frame.ChangeIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX && frame && frame.OverlayIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW && frame && frame.CloseIndex===false) continue;
 
-            if (this.DivToolbar) this.CreateButton(newItem, this.DivToolbar);
+            aryButton.push(item);
         }
 
+        return aryButton;
+    }
+
+    this.SetToolbar=function(aryButton)
+    {
+        this.ClearAllButtons(); //清空原来的按钮
+        
+        this.CreateArrayButton(aryButton);  //重新创建
+        
         this.UpdateStyle();
     }
 
+    this.UpdateButton=function()
+    {
+        if (!this.DivToolbar) return;
+
+        var aryButton=this.GetShowButtons();
+        var bChange=false;
+        if (aryButton.length!=this.AryButton.length)
+        {
+            bChange=true;
+        } 
+        else
+        {
+            for(var i=0;i<this.AryButton.length;++i)
+            {
+                var leftItem=this.AryButton[i];
+                var rightItem=aryButton[i];
+
+                if (leftItem.ID!=rightItem.ID || leftItem.ClassName!=rightItem.ClassName)
+                {
+                    bChange=true;
+                    break;
+                }
+            }
+        }
+
+        if (!bChange) return;
+
+        this.SetToolbar(aryButton); //重新设置按钮
+    }
+
+    
+
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -109480,24 +109547,19 @@ function JSDivFrameToolbar()
         this.FrameID=-1;
     }
 
-    this.Create=function()
+    this.Create=function(frame)
     {
         var divToolbar=document.createElement("div");
         divToolbar.className='UMyChart_FrameToolbar_Div';
         divToolbar.id=this.ID;
         divToolbar.oncontextmenu = function() { return false; }; //屏蔽右键系统菜单
+        this.DivToolbar=divToolbar;
 
-        for(var i=0;i<this.AryButton.length; i++)
-        {
-            var item=this.AryButton[i];
-            if (this.FrameID==0 && item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW) continue; //第一个指标窗口不显示关闭按钮
-            this.CreateButton(item, divToolbar);
-        }
+        var aryButtons=this.GetShowButtons(frame);
+        this.CreateArrayButton(aryButtons)
         
         this.DivHQChart.appendChild(divToolbar);
 
-        this.DivToolbar=divToolbar;
-
         this.UpdateStyle();
 
         if (!this.HQChart.JSToolbarTooltip)
@@ -109623,6 +109685,32 @@ function JSDivFrameToolbar()
     }
 }
 
+JSDivFrameToolbar.GetDfaultButtons=function()
+{
+    var aryButton=
+    [
+
+        { 
+            ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
+            Span:null, Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CHANGE_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-change_index", Tooltip:{ Text:"切换指标"},
+            Span:null,Div:null,  TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-overlay_index", Tooltip:{ Text:"叠加指标"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+        { 
+            ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
+            Span:null,Div:null, TooltipSpan:null
+        },
+    ];
+
+    return aryButton
+}
+
 
 function JSToolbarTooltip()
 {
@@ -165499,7 +165587,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15065";
+var HQCHART_VERSION="1.1.15072";
 
 function PrintHQChartVersion()
 {