hqchart 1.1.14653 → 1.1.14660

package/lib/umychart.vue.js

@@ -5058,12 +5058,13 @@ this.PriceZoom=100;//价格放大倍数
 this.NotSupportMessage="不支持筹码图";this.Buttons=[];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.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.LongButton=CloneData(g_JSChartResource.StockChip.LongButton);//远期筹码分布图
 this.RecentButton=CloneData(g_JSChartResource.StockChip.RecentButton);//近期筹码分布图
-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))//分笔图没有筹码
+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))//分笔图没有筹码
 {this.Canvas.font=this.Font;this.Canvas.fillStyle=this.InfoColor;var x=left+width/2;var y=top+height/2;this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillText(this.NotSupportMessage,x,y);this.DrawBorder();return;}if(this.CalculateChip()){this.DrawFrame();this.DrawAllChip();if(this.ShowType==1||this.ShowType==2)this.DrawDayChip();this.CalculateCast();//计算成本  
-this.DrawChipInfo();}else{JSConsole.Chart.Log('[StockChip::Draw] no data');}this.DrawBorder();this.SizeChange=false;};this.DrawChipInfo=function(){var bottom=this.ClientRect.Top+this.ClientRect.Height-1;var left=this.ClientRect.Left+2;var right=this.ClientRect.Left+this.ClientRect.Width;this.Canvas.font=this.Font;this.Canvas.fillStyle=this.InfoColor;this.Canvas.textBaseline='bottom';this.Canvas.textAlign='left';var lineHeight=this.LineHeight*GetDevicePixelRatio();var text='70%成本价 --.--';if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast))text='70%成本价'+this.Data.Cast[1].MinPrice.toFixed(2)+'-'+this.Data.Cast[1].MaxPrice.toFixed(2)+'集中'+this.Data.Cast[1].Rate.toFixed(2)+'%';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='90%成本价 --.--';if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast))text='90%成本价'+this.Data.Cast[0].MinPrice.toFixed(2)+'-'+this.Data.Cast[0].MaxPrice.toFixed(2)+'集中'+this.Data.Cast[0].Rate.toFixed(2)+'%';;this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='平均成本：'+this.Data.ChipInfo.AveragePrice.toFixed(2)+'元';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text=+this.Data.YPrice.toFixed(2)+'处获利盘：'+this.Data.ChipInfo.YProfitRate.toFixed(2)+'%';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='获利比例：';this.Canvas.fillText(text,left,bottom);var textWidth=this.Canvas.measureText(text).width+2;var barLeft=left+textWidth;var barWidth=right-5-barLeft;this.Canvas.strokeStyle=this.ColorNoProfit;this.Canvas.strokeRect(barLeft,bottom-lineHeight,barWidth,lineHeight);this.Canvas.strokeStyle=this.ColorProfit;this.Canvas.strokeRect(barLeft,bottom-lineHeight,barWidth*(this.Data.ChipInfo.ProfitRate/100),lineHeight);text=this.Data.ChipInfo.ProfitRate.toFixed(2)+'%';this.Canvas.textAlign='center';this.Canvas.fillText(text,barLeft+barWidth/2,bottom);bottom-=lineHeight;this.Canvas.textAlign='left';text='成本分布,日期：'+IFrameSplitOperator.FormatDateString(this.Data.SelectData.Date);if(this.Data.SelectData.Time)text+=' '+IFrameSplitOperator.FormatTimeString(this.Data.SelectData.Time);this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;if(this.ShowType!=1&&this.ShowType!=2)return;var right=this.ClientRect.Left+this.ClientRect.Width-1;this.Canvas.textAlign='right';var textWidth=50;this.Data.DayChip.sort(function(a,b){return b.Day-a.Day;});for(var i in this.Data.DayChip){var item=this.Data.DayChip[i];var rate=0;if(this.Data.ChipInfo&&this.Data.ChipInfo.Vol>0)rate=item.Vol/this.Data.ChipInfo.Vol*100;text=item.Day+'周期'+(this.ShowType==1?'前':'内')+'成本'+(IFrameSplitOperator.IsNumber(rate)?rate.toFixed(2)+'%':"--.--%");if(i==0)textWidth=this.Canvas.measureText(text).width+8;this.Canvas.fillStyle=item.Color;this.Canvas.fillRect(right-textWidth,bottom-lineHeight,textWidth,lineHeight);this.Canvas.fillStyle=this.DayInfoColor;this.Canvas.fillText(text,right,bottom);bottom-=lineHeight;}};this.DrawDayChip=function(){var KLineFrame=this.HQChart.Frame.SubFrame[0].Frame;for(var i in this.Data.DayChip){var aryPoint=[];var chipData=this.Data.DayChip[i].Chip;if(!chipData)continue;var totalVol=0;for(var j=0;j<chipData.length;++j){var vol=chipData[j];if(!vol)continue;totalVol+=vol;var price=(j+this.Data.MinPrice)/100;var y=KLineFrame.GetYFromData(price);var x=vol/this.Data.MaxVol*this.ClientRect.Width+this.ClientRect.Left;aryPoint.push({X:x,Y:y});}this.Data.DayChip[i].Vol=totalVol;this.DrawArea(aryPoint,this.Data.DayChip[i].Color);}};this.DrawToolbar=function(moveonPoint,mouseStatus){this.Buttons=[];var left=this.ClientRect.Left;var right=this.ClientRect.Left+this.ClientRect.Width;var yButton=this.ClientRect.Top+this.ChartBorder.TitleHeight/2;var aryButton=[{ID:JSCHART_BUTTON_ID.CHIP_RECENT,Style:this.RecentButton,ShowType:2},{ID:JSCHART_BUTTON_ID.CHIP_LONG,Style:this.LongButton,ShowType:1},{ID:JSCHART_BUTTON_ID.CHIP_DEFULT,Style:this.DefaultButton,ShowType:0}];//右往左绘制
+this.DrawChipInfo();}else{JSConsole.Chart.Log('[StockChip::Draw] no data');}this.DrawBorder();this.SizeChange=false;};this.DrawChipInfo=function(){var bottom=this.ClientRect.Top+this.ClientRect.Height-1;var left=this.ClientRect.Left+2;var right=this.ClientRect.Left+this.ClientRect.Width;this.Canvas.font=this.Font;this.Canvas.fillStyle=this.InfoColor;this.Canvas.textBaseline='bottom';this.Canvas.textAlign='left';var lineHeight=this.LineHeight*GetDevicePixelRatio();var text='70%成本价 --.--';if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast))text='70%成本价'+this.Data.Cast[1].MinPrice.toFixed(2)+'-'+this.Data.Cast[1].MaxPrice.toFixed(2)+'集中'+this.Data.Cast[1].Rate.toFixed(2)+'%';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='90%成本价 --.--';if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast))text='90%成本价'+this.Data.Cast[0].MinPrice.toFixed(2)+'-'+this.Data.Cast[0].MaxPrice.toFixed(2)+'集中'+this.Data.Cast[0].Rate.toFixed(2)+'%';;this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='平均成本：'+this.Data.ChipInfo.AveragePrice.toFixed(2)+'元';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text=+this.Data.YPrice.toFixed(2)+'处获利盘：'+this.Data.ChipInfo.YProfitRate.toFixed(2)+'%';this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;text='获利比例：';this.Canvas.fillText(text,left,bottom);var textWidth=this.Canvas.measureText(text).width+2;var barLeft=left+textWidth;var barWidth=right-5-barLeft;this.Canvas.strokeStyle=this.ColorNoProfit;this.Canvas.strokeRect(barLeft,bottom-lineHeight,barWidth,lineHeight);this.Canvas.strokeStyle=this.ColorProfit;this.Canvas.strokeRect(barLeft,bottom-lineHeight,barWidth*(this.Data.ChipInfo.ProfitRate/100),lineHeight);text=this.Data.ChipInfo.ProfitRate.toFixed(2)+'%';this.Canvas.textAlign='center';this.Canvas.fillText(text,barLeft+barWidth/2,bottom);bottom-=lineHeight;this.Canvas.textAlign='left';text='成本分布,日期：'+IFrameSplitOperator.FormatDateString(this.Data.SelectData.Date);if(this.Data.SelectData.Time)text+=' '+IFrameSplitOperator.FormatTimeString(this.Data.SelectData.Time);this.Canvas.fillText(text,left,bottom);bottom-=lineHeight;if(this.ShowType!=1&&this.ShowType!=2)return;var right=this.ClientRect.Left+this.ClientRect.Width-1;this.Canvas.textAlign='right';var textWidth=50;this.Data.DayChip.sort(function(a,b){return b.Day-a.Day;});for(var i in this.Data.DayChip){var item=this.Data.DayChip[i];var rate=0;if(this.Data.ChipInfo&&this.Data.ChipInfo.Vol>0)rate=item.Vol/this.Data.ChipInfo.Vol*100;text=item.Day+'周期'+(this.ShowType==1?'前':'内')+'成本'+(IFrameSplitOperator.IsNumber(rate)?rate.toFixed(2)+'%':"--.--%");if(i==0)textWidth=this.Canvas.measureText(text).width+8;this.Canvas.fillStyle=item.Color;this.Canvas.fillRect(right-textWidth,bottom-lineHeight,textWidth,lineHeight);this.Canvas.fillStyle=this.DayInfoColor;this.Canvas.fillText(text,right,bottom);bottom-=lineHeight;}};this.DrawDayChip=function(){var KLineFrame=this.HQChart.Frame.SubFrame[0].Frame;for(var i in this.Data.DayChip){var aryPoint=[];var chipData=this.Data.DayChip[i].Chip;if(!chipData)continue;var totalVol=0;for(var j=0;j<chipData.length;++j){var vol=chipData[j];if(!vol)continue;totalVol+=vol;var price=(j+this.Data.MinPrice)/100;var y=KLineFrame.GetYFromData(price);var x=vol/this.Data.MaxVol*this.ClientRect.Width+this.ClientRect.Left;aryPoint.push({X:x,Y:y});}this.Data.DayChip[i].Vol=totalVol;this.DrawArea(aryPoint,this.Data.DayChip[i].Color);}};this.DrawToolbar=function(moveonPoint,mouseStatus){this.Buttons=[];var left=this.ClientRect.Left;var right=this.ClientRect.Left+this.ClientRect.Width;var yButton=this.ClientRect.Top+this.ChartBorder.TitleHeight/2;var aryButton=[{ID:JSCHART_BUTTON_ID.CHIP_CLOSE,Style:this.CloseButton},{ID:JSCHART_BUTTON_ID.CHIP_RECENT,Style:this.RecentButton,ShowType:2},{ID:JSCHART_BUTTON_ID.CHIP_LONG,Style:this.LongButton,ShowType:1},{ID:JSCHART_BUTTON_ID.CHIP_DEFULT,Style:this.DefaultButton,ShowType:0}];//右往左绘制
 for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var size=item.Style.Size;var xBotton=right-size-item.Style.MerginLeft;var font=size+'px '+item.Style.Family;var rtButton={Left:xBotton,Top:yButton-size/2,Right:xBotton+size+item.Style.MerginLeft,Bottom:yButton+size/2,Width:size+item.Style.MerginLeft,Height:size};var color=item.Style.Color;var btnItem={ID:item.ID,Rect:rtButton};if(this.ShowType==item.ShowType){color=item.Style.SelectedColor;if(mouseStatus&&moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:btnItem,Frame:this,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}else{if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){color=item.Style.MoveOnColor;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:btnItem,Frame:this,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}}this.Canvas.fillStyle=color;this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Style.Text,xBotton,yButton);this.Buttons.push(btnItem);right=xBotton;}};this.DrawToolbarTooltip=function(mouseOnToolbar){if(!mouseOnToolbar)return;var left=this.ClientRect.Left;var right=this.ClientRect.Left+this.ClientRect.Width;var key='Toolbar-'+mouseOnToolbar.Item.ID;text=g_JSChartLocalization.GetText(key,0);if(!text)return;var rtButton=mouseOnToolbar.Rect;var xCenter=rtButton.Left+rtButton.Width/2;this.Canvas.font=this.ButtonTooltip.Font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";var textWidth=this.Canvas.measureText(text).width+8;var textHeight=this.GetFontHeight();var bgHeight=textHeight+8;var x=xCenter-textWidth/2;var y=rtButton.Top-bgHeight;if(y<0)y=rtButton.Bottom+1;if(x+textWidth>right)x=right-textWidth-2;this.Canvas.fillStyle=this.ButtonTooltip.ColorBG;this.Canvas.fillRect(x,y,textWidth,bgHeight);//画一个背景色, 不然是一个黑的背景
 this.Canvas.fillStyle=this.ButtonTooltip.Color;this.Canvas.fillText(text,x+4,y+bgHeight/2);};this.PtInButtons=function(x,y)//坐标是否在按钮上
 {for(var i=0;i<this.Buttons.length;++i){var item=this.Buttons[i];if(!item.Rect)continue;var rect=item.Rect;this.Canvas.beginPath();this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);if(this.Canvas.isPointInPath(x,y)){return{ID:item.ID,Rect:rect};}}return null;};this.DrawAllChip=function(){var KLineFrame=this.HQChart.Frame.SubFrame[0].Frame;var selectPrice=this.Data.SelectData.Close;var aryProfitPoint=[];var aryNoProfitPoint=[];var totalVol=0,totalAmount=0,totalProfitVol=0,totalYProfitVol=0;//总的成交量, 总的成交金额, 总的盈利的成交量
@@ -7115,7 +7116,7 @@ Value:1},FontName:'微软雅黑'//字体
 };this.CIRCLEDOT={Radius:1.3*GetDevicePixelRatio()};this.TIPICON={Family:'iconfont',TextFont:GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',Size:10*GetDevicePixelRatio(),Color:"rgb(255,165,0)"};this.POINTDOT={Radius:2*GetDevicePixelRatio()};this.DepthMapPaint={LineColor:"rgba(255,185,15)",AreaColor:["rgba(255,185,15,0.8)","rgba(255,185,15,0.4)"],TextColor:"rgba(255,255,255)",TextBGColor:'rgb(43,54,69)'};this.KLineYAxisBGPaint={Font:12*GetDevicePixelRatio()+'px 微软雅黑',LineColor:"rgb(117,125,129)",DiffValutTextColor:"rgb(117,125,129)",DiffValueBGColor:"rgb(251,140,1)"};this.ChartScatterPlotV2={Color:"rgb(0,0,255)",TextColor:"rgb(0,0,0)",Radius:3,Font:10*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1'//筹码分布图
 };this.StockChip={InfoColor:'rgb(0,0,0)',//文字颜色
 DayInfoColor:'rgb(255,255,255)',//周期颜色内文字颜色
-Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',DefaultButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(255,0,0)",Family:"iconfont",Text:'\uE621',Size:13*GetDevicePixelRatio(),MerginLeft:4},LongButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(255,128,0)",Family:"iconfont",Text:'\uE617',Size:13*GetDevicePixelRatio(),MerginLeft:4},RecentButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(0,0,204)",Family:"iconfont",Text:'\uE617',Size:13*GetDevicePixelRatio(),MerginLeft:4},//手机端
+Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',DefaultButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(255,0,0)",Family:"iconfont",Text:'\uE621',Size:13*GetDevicePixelRatio(),MerginLeft:4},LongButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(255,128,0)",Family:"iconfont",Text:'\uE617',Size:13*GetDevicePixelRatio(),MerginLeft:4},RecentButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(0,0,204)",Family:"iconfont",Text:'\uE617',Size:13*GetDevicePixelRatio(),MerginLeft:4},CloseButton:{Color:"rgb(128,128,128)",MoveOnColor:'rgb(30,144,255)',SelectedColor:"rgb(0,0,204)",Family:"iconfont",Text:'\uE60C',Size:13*GetDevicePixelRatio(),MerginLeft:4},//手机端
 PhoneCloseButton:{Family:"iconfont",Size:16*GetDevicePixelRatio(),Text:'\uE60C',Color:"rgb(255,255,255)",Border:{BGColor:"rgb(169,169,169)"}}//深度图
 };this.DepthChart={BidColor:{Line:"rgb(82,176,123)",Area:"rgba(82,176,123,0.8)"},//卖
 AskColor:{Line:"rgb(207,76,89)",Area:"rgba(207,76,89, 0.8)"},//买
@@ -7206,7 +7207,7 @@ LANGUAGE_TRADITIONAL_CHINESE_ID:2//繁体中文 TC
 ['不复权',{CN:'不复权',EN:'No Right',TC:'不復權'}],['前复权',{CN:'前复权',EN:'Pro Right',TC:'前復權'}],['后复权',{CN:'后复权',EN:'Post Right',TC:'后復權'}],//week
 ['日',{CN:'日',EN:'Sun.',TC:'日'}],['一',{CN:'一',EN:'Mon.',TC:'壹'}],['二',{CN:'二',EN:'Tues.',TC:'貳'}],['三',{CN:'三',EN:'Wed.',TC:'叁'}],['四',{CN:'四',EN:'Thur.',TC:'肆'}],['五',{CN:'五',EN:'Fri.',TC:'伍'}],['六',{CN:'六',EN:'Sat.',TC:'陸'}],['1月',{CN:'1月',EN:'Jan',TC:'1月'}],['2月',{CN:'2月',EN:'Feb',TC:'2月'}],['3月',{CN:'3月',EN:'Mar',TC:'3月'}],['4月',{CN:'4月',EN:'Apr',TC:'4月'}],['5月',{CN:'5月',EN:'May',TC:'5月'}],['6月',{CN:'6月',EN:'Jun',TC:'6月'}],['7月',{CN:'7月',EN:'Jul',TC:'7月'}],['8月',{CN:'8月',EN:'Aug',TC:'8月'}],['9月',{CN:'9月',EN:'Sept',TC:'9月'}],['10月',{CN:'10月',EN:'Oct',TC:'10月'}],['11月',{CN:'11月',EN:'Nov',TC:'11月'}],['12月',{CN:'12月',EN:'Dec',TC:'12月'}],['自定义分钟',{CN:'分',EN:'Min',TC:'分'}],['自定义日线',{CN:'日',EN:'D',TC:'日'}],['自定义秒',{CN:'秒',EN:'S',TC:'秒'}],['自定义毫秒',{CN:'毫秒',EN:'MS',TC:'毫秒'}],["MVol-Vol",{CN:"成交量",EN:"Volume",TC:'成交量'}],["MVol-Position",{CN:"持仓量",EN:"Position",TC:'持倉量'}],//深度图
 ["Depth-Price",{CN:"委托价",EN:"Price",TC:'委托價'}],["Depth-Sum",{CN:"累计",EN:"Sum",TC:'累計'}],//工具栏提示信息
-["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,{CN:"调整指标参数",EN:"Change indicator parameters",TC:"调整指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.CHANGE_INDEX,{CN:"选择指标",EN:"Change indicator",TC:"切换指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,{CN:"关闭窗口",EN:"Delete window",TC:"关闭指标窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.OVERLAY_INDEX,{CN:"叠加指标",EN:"Overlay indicator",TC:"叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_OVERLAY_INDEX_PARAM,{CN:"调整叠加指标参数",EN:"Change overlay indicator parameters",TC:"调整叠加指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.MAX_MIN_WINDOW,{CN:"最大化",EN:"Maximize",TC:"最大化"}],["Toolbar-"+JSCHART_BUTTON_ID.TITLE_WINDOW,{CN:"折叠窗口",EN:"Collapse window",TC:"折叠窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.EXPORT_DATA,{CN:"数据导出",EN:"Export data",TC:"数据导出"}],["Toolbar-"+JSCHART_BUTTON_ID.ADD_INDEX_WINDOW,{CN:"增加指标窗口",EN:"Add index window",TC:"增加指标窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID,{CN:"关闭集合竞价",EN:"Close call auction",TC:"关闭集合竞价"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_OVERLAY_INDEX,{CN:"关闭叠加指标",EN:"Delte overlay indicator",TC:"关闭叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT,{CN:"近期成本分布",EN:"Recent chip",TC:"近期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG,{CN:"远期成本分布",EN:"Long chip",TC:"远期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT,{CN:"默认筹码分布",EN:"Default chip",TC:"默认筹码分布"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,{CN:"删除",EN:"Delete",TC:"删除"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,{CN:"设置",EN:"Setting",TC:"设置"}],//日盘|夜盘
+["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,{CN:"调整指标参数",EN:"Change indicator parameters",TC:"调整指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.CHANGE_INDEX,{CN:"选择指标",EN:"Change indicator",TC:"切换指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,{CN:"关闭窗口",EN:"Delete window",TC:"关闭指标窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.OVERLAY_INDEX,{CN:"叠加指标",EN:"Overlay indicator",TC:"叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_OVERLAY_INDEX_PARAM,{CN:"调整叠加指标参数",EN:"Change overlay indicator parameters",TC:"调整叠加指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.MAX_MIN_WINDOW,{CN:"最大化",EN:"Maximize",TC:"最大化"}],["Toolbar-"+JSCHART_BUTTON_ID.TITLE_WINDOW,{CN:"折叠窗口",EN:"Collapse window",TC:"折叠窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.EXPORT_DATA,{CN:"数据导出",EN:"Export data",TC:"数据导出"}],["Toolbar-"+JSCHART_BUTTON_ID.ADD_INDEX_WINDOW,{CN:"增加指标窗口",EN:"Add index window",TC:"增加指标窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID,{CN:"关闭集合竞价",EN:"Close call auction",TC:"关闭集合竞价"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_OVERLAY_INDEX,{CN:"关闭叠加指标",EN:"Delte overlay indicator",TC:"关闭叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT,{CN:"近期成本分布",EN:"Recent chip",TC:"近期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG,{CN:"远期成本分布",EN:"Long chip",TC:"远期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT,{CN:"默认筹码分布",EN:"Default chip",TC:"默认筹码分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_CLOSE,{CN:"关闭筹码图",EN:"Close chip",TC:"关闭筹码图"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,{CN:"删除",EN:"Delete",TC:"删除"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,{CN:"设置",EN:"Setting",TC:"设置"}],//日盘|夜盘
 ["日盘",{CN:'日盘',EN:'Day',TC:'日盤'}],["夜盘",{CN:'夜盘',EN:'Night',TC:'夜盤'}]]);this.GetText=function(key,language){var item=this.TextResource.get(key);if(!item)return'';switch(language){case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:return item.CN;case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:return item.EN;case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:return item.TC;default:return item.CN;}};this.SetTextResource=function(key,value){this.TextResource.set(key,value);};this.GetLanguageID=function(languageName){var languageID=null;switch(languageName){case'EN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID;break;case'CN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;break;case"TC":languageID=JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID;break;default:break;}return languageID;};this.GetLanguageName=function(id){switch(id){case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:return"EN";case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:return"CN";case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:return"TC";default:return null;}};};var g_JSChartLocalization=new JSChartLocalization();/*
     指标列表 指标信息都在这里,不够后面再加字段
 */function JSIndexMap(){}JSIndexMap.Get=function(id){var indexMap=new _map2.default([['CJL',{IsMainIndex:false,Create:function Create(){return new JSIndex_CJL();}}],//期货指标
@@ -13052,7 +13053,8 @@ this.AddEventCallback=function(object){if(!object||!object.event||!object.callba
 {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(1)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上
 {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(-1)){this.Draw();this.DelayUpdateStockData();}}}else{if(wheelValue<0)//下一页
 {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上一页
-{this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
+{this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;//回调事件
+var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);if(event&&event.Callback){var sendData={e:e,KeyID:keyID,PreventDefault:false,ReportChart:reportChart};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}if(keyID==116)return;//F15刷新不处理
 this.HideAllTooltip();switch(keyID){case 33://page up
 if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}break;case 34://page down
 if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}break;case 38://up
@@ -13808,7 +13810,8 @@ case TREPORT_COLUMN_ID.AMPLITUDE_ID:case TREPORT_COLUMN_ID.INCREASE_ID:case TREP
 {if(leftStock&&IFrameSplitOperator.IsNumber(leftStock.ExePrice))leftValue=leftStock.ExePrice;if(rightStock&&IFrameSplitOperator.IsNumber(rightStock.ExePrice))rightValue=rightStock.ExePrice;}else if(cellType==1){if(leftStock&&leftStock.LeftData){var value=leftStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.LeftData){var value=rightStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}else if(cellType==2){if(leftStock&&leftStock.RightData){var value=leftStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.RightData){var value=rightStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.OnWheel=function(e)//滚轴
 {JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);if(!isInClient)return;var chart=this.GetTReportChart();if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;if(wheelValue<0)//下
 {this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();this.HideFloatTooltip();var result=this.MoveSelectedRow(1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}else if(wheelValue>0)//上
-{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();this.HideFloatTooltip();var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
+{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();this.HideFloatTooltip();var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;//回调事件
+var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);if(event&&event.Callback){var sendData={e:e,KeyID:keyID,PreventDefault:false,ReportChart:reportChart};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}if(keyID==116)return;//F15刷新不处理
 this.HideMinuteChartTooltip();this.HideFloatTooltip();switch(keyID){/*
             case 33:    //page up
                 if (this.GotoPreviousPage(this.PageUpDownCycle)) 
@@ -14737,7 +14740,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.14652";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.14659";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.14653",
+  "version": "1.1.14660",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.TReport.js

@@ -1429,6 +1429,16 @@ function JSTReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+         //回调事件
+         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
+         if (event && event.Callback)
+         {
+             var sendData={ e:e, KeyID:keyID, PreventDefault:false, ReportChart:reportChart };
+             event.Callback(event, sendData, this);
+             if (sendData.PreventDefault) return;
+         }
+         
         if (keyID==116) return; //F15刷新不处理
 
         this.HideMinuteChartTooltip();

package/src/jscommon/umychart.js

@@ -47412,6 +47412,7 @@ function StockChip()
     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.DAY_COLOR=
@@ -47441,6 +47442,7 @@ function StockChip()
         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);
     }
     
@@ -47598,9 +47600,11 @@ function StockChip()
         
         var aryButton=
         [
+            {ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Style:this.CloseButton },
             {ID:JSCHART_BUTTON_ID.CHIP_RECENT, Style: this.RecentButton, ShowType:2 },
             {ID:JSCHART_BUTTON_ID.CHIP_LONG, Style: this.LongButton , ShowType:1},
-            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 }
+            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 },
+           
         ];
 
         //右往左绘制
@@ -74239,6 +74243,17 @@ function JSChartResource()
             MerginLeft:4
         },
 
+        CloseButton:
+        {
+            Color:"rgb(128,128,128)",
+            MoveOnColor:'rgb(30,144,255)',
+            SelectedColor:"rgb(0,0,204)",
+            Family:"iconfont",
+            Text:"\ue60c",
+            Size:13*GetDevicePixelRatio(),
+            MerginLeft:4
+        },
+
         //手机端
         PhoneCloseButton:
         {
@@ -76526,6 +76541,7 @@ function JSChartLocalization()
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT, {CN:"近期成本分布", EN:"Recent chip", TC:"近期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG, {CN:"远期成本分布", EN:"Long chip", TC:"远期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT, {CN:"默认筹码分布", EN:"Default chip", TC:"默认筹码分布"}],
+        ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_CLOSE, {CN:"关闭筹码图", EN:"Close chip", TC:"关闭筹码图"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, {CN:"删除", EN:"Delete", TC:"删除"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, {CN:"设置", EN:"Setting", TC:"设置"}],
 

package/src/jscommon/umychart.report.js

@@ -1962,6 +1962,16 @@ function JSReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+         //回调事件
+         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
+         if (event && event.Callback)
+         {
+             var sendData={ e:e, KeyID:keyID, PreventDefault:false, ReportChart:reportChart };
+             event.Callback(event, sendData, this);
+             if (sendData.PreventDefault) return;
+         }
+
         if (keyID==116) return; //F15刷新不处理
 
         this.HideAllTooltip();

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

@@ -51508,6 +51508,7 @@ function StockChip()
     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.DAY_COLOR=
@@ -51537,6 +51538,7 @@ function StockChip()
         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);
     }
     
@@ -51694,9 +51696,11 @@ function StockChip()
         
         var aryButton=
         [
+            {ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Style:this.CloseButton },
             {ID:JSCHART_BUTTON_ID.CHIP_RECENT, Style: this.RecentButton, ShowType:2 },
             {ID:JSCHART_BUTTON_ID.CHIP_LONG, Style: this.LongButton , ShowType:1},
-            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 }
+            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 },
+           
         ];
 
         //右往左绘制
@@ -78335,6 +78339,17 @@ function JSChartResource()
             MerginLeft:4
         },
 
+        CloseButton:
+        {
+            Color:"rgb(128,128,128)",
+            MoveOnColor:'rgb(30,144,255)',
+            SelectedColor:"rgb(0,0,204)",
+            Family:"iconfont",
+            Text:"\ue60c",
+            Size:13*GetDevicePixelRatio(),
+            MerginLeft:4
+        },
+
         //手机端
         PhoneCloseButton:
         {
@@ -80622,6 +80637,7 @@ function JSChartLocalization()
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT, {CN:"近期成本分布", EN:"Recent chip", TC:"近期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG, {CN:"远期成本分布", EN:"Long chip", TC:"远期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT, {CN:"默认筹码分布", EN:"Default chip", TC:"默认筹码分布"}],
+        ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_CLOSE, {CN:"关闭筹码图", EN:"Close chip", TC:"关闭筹码图"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, {CN:"删除", EN:"Delete", TC:"删除"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, {CN:"设置", EN:"Setting", TC:"设置"}],
 
@@ -135734,6 +135750,16 @@ function JSReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+         //回调事件
+         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
+         if (event && event.Callback)
+         {
+             var sendData={ e:e, KeyID:keyID, PreventDefault:false, ReportChart:reportChart };
+             event.Callback(event, sendData, this);
+             if (sendData.PreventDefault) return;
+         }
+
         if (keyID==116) return; //F15刷新不处理
 
         this.HideAllTooltip();
@@ -146800,7 +146826,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14652";
+var HQCHART_VERSION="1.1.14659";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -51552,6 +51552,7 @@ function StockChip()
     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.DAY_COLOR=
@@ -51581,6 +51582,7 @@ function StockChip()
         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);
     }
     
@@ -51738,9 +51740,11 @@ function StockChip()
         
         var aryButton=
         [
+            {ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Style:this.CloseButton },
             {ID:JSCHART_BUTTON_ID.CHIP_RECENT, Style: this.RecentButton, ShowType:2 },
             {ID:JSCHART_BUTTON_ID.CHIP_LONG, Style: this.LongButton , ShowType:1},
-            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 }
+            {ID:JSCHART_BUTTON_ID.CHIP_DEFULT, Style: this.DefaultButton, ShowType:0 },
+           
         ];
 
         //右往左绘制
@@ -78379,6 +78383,17 @@ function JSChartResource()
             MerginLeft:4
         },
 
+        CloseButton:
+        {
+            Color:"rgb(128,128,128)",
+            MoveOnColor:'rgb(30,144,255)',
+            SelectedColor:"rgb(0,0,204)",
+            Family:"iconfont",
+            Text:"\ue60c",
+            Size:13*GetDevicePixelRatio(),
+            MerginLeft:4
+        },
+
         //手机端
         PhoneCloseButton:
         {
@@ -80666,6 +80681,7 @@ function JSChartLocalization()
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT, {CN:"近期成本分布", EN:"Recent chip", TC:"近期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG, {CN:"远期成本分布", EN:"Long chip", TC:"远期成本分布"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT, {CN:"默认筹码分布", EN:"Default chip", TC:"默认筹码分布"}],
+        ["Toolbar-"+JSCHART_BUTTON_ID.CHIP_CLOSE, {CN:"关闭筹码图", EN:"Close chip", TC:"关闭筹码图"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, {CN:"删除", EN:"Delete", TC:"删除"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, {CN:"设置", EN:"Setting", TC:"设置"}],
 
@@ -135778,6 +135794,16 @@ function JSReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+         //回调事件
+         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
+         if (event && event.Callback)
+         {
+             var sendData={ e:e, KeyID:keyID, PreventDefault:false, ReportChart:reportChart };
+             event.Callback(event, sendData, this);
+             if (sendData.PreventDefault) return;
+         }
+
         if (keyID==116) return; //F15刷新不处理
 
         this.HideAllTooltip();
@@ -144934,6 +144960,16 @@ function JSTReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+         //回调事件
+         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
+         if (event && event.Callback)
+         {
+             var sendData={ e:e, KeyID:keyID, PreventDefault:false, ReportChart:reportChart };
+             event.Callback(event, sendData, this);
+             if (sendData.PreventDefault) return;
+         }
+         
         if (keyID==116) return; //F15刷新不处理
 
         this.HideMinuteChartTooltip();
@@ -157522,7 +157558,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14652";
+var HQCHART_VERSION="1.1.14659";
 
 function PrintHQChartVersion()
 {