hqchart 1.1.15753 → 1.1.15771

package/lib/umychart.vue.js

@@ -1684,6 +1684,7 @@ CMD_DELETE_INDEX_ID:65,//删除指标
 CMD_SHOW_MAXMIN_ID:66,//显示隐藏最大最小值
 CMD_CHANGE_MINUTE_INFO_ID:67,//切换分时图信息地雷
 CMD_DELETE_ALL_MINUTE_INFO_ID:68,CMD_MODIFY_MINUTE_INFO_PROPERTY_ID:69,CMD_SHOW_CHANGE_INDEX_DIALOG_ID:70,//切换指标对话框
+CMD_SELECTED_DATA_ANALYZE_ID:71,//区间选择数据分析
 CMD_REPORT_CHANGE_BLOCK_ID:100,//报价列表 切换板块ID
 CMD_REPORT_COLUMN_SORT_ID:101,//报价列表 表头排序  Arg[列序号, 排序方向]
 CMD_REPORT_COLUMN_DEL_ID:102,//报价列表 删除列
@@ -1926,7 +1927,7 @@ if(e)//往事件里面 写如我们的数据
 RectSelectPaint:paint,//区间选择背景
 IsLButton:selectData.IsLButton,IsRButton:selectData.IsRButton};e.data=data;}var aryMenu=null,command=null;if(bMinuteChart)//分时图 默认区间统计
 {command={ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]};}else//K线默认 区间选择K线
-{aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}}];}if(event&&event.Callback){var sendData={X:x,Y:y,e:e,SelectData:selectData,//区间选择的数据
+{aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}},{Name:"区间分析",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_DATA_ANALYZE_ID,Args:[selectData]}}];}if(event&&event.Callback){var sendData={X:x,Y:y,e:e,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint,//区间选择背景
 AryMenu:aryMenu,//菜单  填null 不就会弹菜单
 Command:command,//执行命令
@@ -2433,7 +2434,7 @@ this.CreateMainScript=function(src){var scriptIndex=null;switch(src.ClassName){c
 this.DeleteMainIndex=function(identify,windowIndex){var mainIndex=this.WindowIndex[windowIndex];if(!mainIndex)return false;var subFrame=this.Frame.SubFrame[windowIndex];if(!subFrame)return false;if(!IFrameSplitOperator.IsNonEmptyArray(subFrame.OverlayIndex)){this.RemoveIndexWindow(windowIndex,{DeleteMainIndex:true});}else{var overlayItem=subFrame.OverlayIndex[0];this.DeleteOverlayIndex(overlayItem.Identify,windowIndex);this.WindowIndex[windowIndex]=this.CreateMainScript(overlayItem.Script);var bindData=this.GetMainData();this.BindIndexData(windowIndex,bindData);//执行脚本
 }};this.GetMainData=function(){switch(this.ClassName){case"MinuteChartContainer":case"MinuteChartHScreenContainer":return this.SourceData;case"KLineChartContainer":case"KLineChartHScreenContainer":return this.ChartPaint[0].Data;}};this.CreateOverlayFrame=function(){switch(this.ClassName){case"KLineChartContainer":return new OverlayKLineFrame();case"KLineChartHScreenContainer":return new OverlayKLineHScreenFrame();case"MinuteChartContainer":return new OverlayMinuteFrame();case"MinuteChartHScreenContainer":return new OverlayMinuteHScreenFrame();}};//数据导出
 this.ExportData=function(option){if(!this.ExportMainData)return null;if(!this.ChartPaint[0])return null;var mainData=this.GetMainData();if(!mainData||!IFrameSplitOperator.IsNonEmptyArray(mainData.Data))return null;var range=null;var aryKData=mainData.Data;//K线/分时数据
-if(option&&option.Start&&option.End)range=mainData.GetDataRange(option.Start,option.End);var aryData=this.ExportMainData(mainData,range);//导出K线/分时
+if(option&&option.DataRange)range=mainData.GetDataRange(option.DataRange);var aryData=this.ExportMainData(mainData,range);//导出K线/分时
 if(!aryData)return null;//主图+附图指标
 for(var i=1;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item||!item.ExportData)continue;var data=item.ExportData(aryKData,range);if(data&&IFrameSplitOperator.IsNonEmptyArray(data)){for(var j=0;j<data.length;++j){var subItem=data[j];if(item.IndexName)aryData.push({Name:subItem.Name+'('+item.IndexName+')',Data:subItem.Data,Description:subItem.Description,Type:1});else aryData.push(subItem);}}}//叠加股票
 for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Data||!IFrameSplitOperator.IsNonEmptyArray(item.Data.Data))continue;var data=this.ExportMainData(item.Data,{IsOverlay:true});if(data&&IFrameSplitOperator.IsNonEmptyArray(data)){for(var j=0;j<data.length;++j){var subItem=data[j];aryData.push({Name:subItem.Name+'('+item.Symbol+')',Data:subItem.Data,Type:2});}}}//叠加指标
@@ -2515,7 +2516,7 @@ if(!corssCursor||corssCursor.Status==0)return;if(!IFrameSplitOperator.IsNumber(c
 e:e};event.Callback(event,data,this);}this.Draw();}else if(pointCount==2){var selectData=paint.GetSelectRectData();if(e){var data={Chart:this,X:x,Y:y,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint//区间选择背景
 };e.data=data;}var aryMenu=null,command=null;var bMinuteChart=this.IsMinuteContainer();if(bMinuteChart){command={ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]};}else//K线默认
-{aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}}];}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT);if(event&&event.Callback){var sendData={X:x,Y:y,SelectData:selectData,//区间选择的数据
+{aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}},{Name:"区间分析",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_DATA_ANALYZE_ID,Args:[selectData]}}];}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT);if(event&&event.Callback){var sendData={X:x,Y:y,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint,//区间选择背景
 AryMenu:aryMenu,Command:command,e:e,PreventDefault:false};if(bMinuteChart)sendData.Command=null;//分时图 调用事件 不做任何事
 event.Callback(event,sendData,this);aryMenu=sendData.AryMenu;command=sendData.Command;if(sendData.PreventDefault){this.Draw();return;}}if(command){this.ExecuteMenuCommand(command.ID,command.Args);}else if(aryMenu){this.PopupSelectRectMenuV3(aryMenu,data,e);}this.Draw();}};this.MoveCorssCursorUp=function(step){if(!IFrameSplitOperator.IsNumber(this.LastPoint.Y))return;var border=this.Frame.ChartBorder.GetBorder();var top=border.TopEx;if(this.LastPoint.Y-step<=top)return;this.LastPoint.Y-=step;this.DrawDynamicInfo();};this.MoveCorssCursorDown=function(step){if(!IFrameSplitOperator.IsNumber(this.LastPoint.Y))return;var border=this.Frame.ChartBorder.GetBorder();var border=this.Frame.ChartBorder.GetBorder();var bottom=border.BottomEx;if(this.LastPoint.Y+step>=bottom)return;this.LastPoint.Y+=step;this.DrawDynamicInfo();};//整屏区间统计
@@ -2529,9 +2530,9 @@ if(option.IsClear===true)this.GlobalOption.TradeStatus=null;}if(!data)return fal
 this.IsPauseUpdateByKeyboard=function(){if(!this.IsPressKeyboard)return false;if(!this.PressKeyboardConfig)return false;if(!this.PressKeyboardConfig.PauseUpdate)return false;return true;},//启动|关闭锁指标 aryIndex=[{ IndexID:指标ID, LockData:{IsLocked:} } ]
 this.EnableLockIndex=function(aryIndex){if(!IFrameSplitOperator.IsNonEmptyArray(aryIndex))return false;var mapIndex=new _map2.default();for(var i=0;i<aryIndex.length;++i){var item=aryIndex[i];if(item.IndexID&&item.LockData)mapIndex.set(item.IndexID,item);}var aryUpdate=[];for(var i=0;i<this.WindowIndex.length;++i){var item=this.WindowIndex[i];if(!item)continue;if(mapIndex.has(item.ID)){var mapItem=mapIndex.get(item.ID);item.SetLock(mapItem.LockData);//设置锁
 aryUpdate.push({ID:i});}}for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];if(!IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex))continue;for(var j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];var script=overlayItem.Script;if(mapIndex.has(script.ID)){var mapItem=mapIndex.get(script.ID);script.SetLock(mapItem.LockData);aryUpdate.push({OverlayID:overlayItem.Identify});}}}if(!IFrameSplitOperator.IsNonEmptyArray(aryUpdate))return false;this.UpdateWindowIndexV2(aryUpdate);return true;};this.TryClickLock=function(x,y){if(!this.Frame||!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];var chartLock=item.Frame.LockPaint;if(!chartLock||!chartLock.LockRect)continue;var tooltip=new TooltipData();if(!chartLock.GetTooltipData(x,y,tooltip))continue;tooltip.HQChart=this;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);if(event&&event.Callback){var sendData={FrameID:item.Frame.Identify,Data:tooltip};event.Callback(event,sendData,this);}if(tooltip.Data.Callback)tooltip.Data.Callback(tooltip);return true;}return false;};this.RecvOverlayIndex=function(identify,data){var overlayIndex=this.GetOverlayIndexByIdentify(identify);if(overlayIndex==null){console.warn('[JSChartContainer::RecvOverlayIndex] can\'t find overlay index. [identify='+identify+']');return;}var script=overlayIndex.OverlayItem.Script;if(!script)return;if(typeof script.RecvSubscribeData!="function")return;var kData=this.GetKData();if(!kData)return;script.RecvSubscribeData(data,this,overlayIndex.WindowIndex,kData);};this.UpdateIndexTemporaryAttribute=function(windowIndex,aryAttribute){if(windowIndex<0)return;if(!IFrameSplitOperator.IsNonEmptyArray(aryAttribute))return;if(!this.Frame||!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return;var mainFrame=this.Frame.SubFrame[windowIndex].Frame;this.IndexTemporaryAttribute[windowIndex]=[];var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];for(var i=0;i<aryAttribute.length;++i){var item=aryAttribute[i];if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE){var backup=mainFrame.ChartBorder.BottomSpace;mainFrame.ChartBorder.BottomSpace=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE){var backup=mainFrame.ChartBorder.TopSpace;mainFrame.ChartBorder.TopSpace=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT){var backup=mainFrame.YSplitOperator.IsShowLeftText;mainFrame.YSplitOperator.IsShowLeftText=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT){var backup=mainFrame.YSplitOperator.IsShowRightText;mainFrame.YSplitOperator.IsShowRightText=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE){var backup=mainFrame.YSplitOperator.SplitType;mainFrame.YSplitOperator.SplitType=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.HRESERVED){var backup=mainFrame.HorizontalReserved;mainFrame.HorizontalReserved=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TITLEHEIGHT){var backup=mainFrame.ChartBorder.TitleHeight;mainFrame.ChartBorder.TitleHeight=item.Value;aryTemporaryAttribute.push({Name:item.Name,Value:item.Value,BackupValue:backup});}}};this.RestoreIndexTemporaryAttribute=function(windowIndex){if(windowIndex<0)return;if(!this.Frame||!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return;var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];if(!IFrameSplitOperator.IsNonEmptyArray(aryTemporaryAttribute))return;var mainFrame=this.Frame.SubFrame[windowIndex].Frame;for(var i=0;i<aryTemporaryAttribute.length;++i){var item=aryTemporaryAttribute[i];if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE){mainFrame.ChartBorder.BottomSpace=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE){mainFrame.ChartBorder.TopSpace=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT){mainFrame.YSplitOperator.IsShowLeftText=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT){mainFrame.YSplitOperator.IsShowRightText=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE){mainFrame.YSplitOperator.SplitType=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.HRESERVED){mainFrame.HorizontalReserved=item.BackupValue;}else if(item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TITLEHEIGHT){mainFrame.ChartBorder.TitleHeight=item.BackupValue;}}};//把图形数据格式化导出, 给AI分析
-this.GetGraphicsDescription=function(option){var data=this.GetGraphicsRawDescription(option);if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.AryData))return null;var strTitle=data.Title;strTitle+="包含以下数据:\r\n";strContent="";for(var i=0;i<data.AryData.length;++i){var item=data.AryData[i];strTitle+=i+1+'. '+item.Title+'\r\n';strContent+=item.Content;}var date=new Date();strTitle+='\u6570\u636E\u521B\u5EFA\u65F6\u95F4:'+date+'\r\n';var strDescription=strTitle+"\r\n\r\n====================完整数据部分========================\r\n\r\n\r\n"+strContent;return{Symbol:this.Symbol,Name:this.Name,Data:strDescription};};//获取原始数据, 给AI分析
+this.GetGraphicsDescription=function(option){var data=this.GetGraphicsRawDescription(option);if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.AryData))return null;var strTitle=data.Title;strTitle+="包含以下数据:\r\n";strContent="";for(var i=0;i<data.AryData.length;++i){var item=data.AryData[i];strTitle+=i+1+'. '+item.Title+'\r\n';strContent+=item.Content;}var date=new Date();strTitle+='\u6570\u636E\u521B\u5EFA\u65F6\u95F4:'+date+'\r\n';var strDescription=strTitle+"\r\n\r\n====================完整数据部分========================\r\n\r\n\r\n"+strContent;var result={Symbol:this.Symbol,Name:this.Name,Data:strDescription,ChartType:data.ChartType};if(IFrameSplitOperator.IsNumber(data.Period))result.Period=data.Period;if(IFrameSplitOperator.IsNumber(data.Right))result.Right=data.Right;if(IFrameSplitOperator.IsNumber(data.DayCount))result.DayCount=data.DayCount;return result;};//获取原始数据, 给AI分析
 this.GetGraphicsRawDescription=function(option){JSConsole.Chart.Warn('[JSChartContainer::GetGraphicsRawDescription]  '+name+'::GetGraphicsRawDescription not implemented.');return null;};//指标数据
-this.GetIndexDataDescription=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.WindowIndex))return null;var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var range=null;if(option&&option.Start&&option.End)range=kData.GetDataRange(option.Start,option.End);var aryKData=kData.Data;var mapIndex=new _map2.default();//key=id, value={ IndexName:, ID:, AryData:[] }
+this.GetIndexDataDescription=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.WindowIndex))return null;var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var aryKData=kData.Data;var range=null;if(option&&option.DataRange){range=kData.GetDataRange(option.DataRange);}var mapIndex=new _map2.default();//key=id, value={ IndexName:, ID:, AryData:[] }
 for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item||!item.ExportData)continue;if(["Main-KLine","Minute-Line","Minute-Average-Line","Minute-Vol-Bar","Minute-BuySell-Bar"].includes(item.Identify))continue;var guid=item.Identify;var data=item.ExportData(aryKData,range);if(!IFrameSplitOperator.IsNonEmptyArray(data))conintue;var indexData=null;if(mapIndex.has(guid)){indexData=mapIndex.get(guid);}else{indexData={Guid:guid,Name:item.IndexName,ID:item.IndexID,AryData:[]};mapIndex.set(guid,indexData);}for(var j=0;j<data.length;++j){var subItem=data[j];var outName="未定义名字";if(subItem.Name)outName=subItem.Name;indexData.AryData.push({Name:''+outName,Data:subItem.Data,Description:subItem.Description});}}//叠加指标
 for(var i=0,j=0,k=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];for(j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];if(!IFrameSplitOperator.IsNonEmptyArray(overlayItem.ChartPaint))continue;for(k=0;k<overlayItem.ChartPaint.length;++k){var chart=overlayItem.ChartPaint[k];var guid=chart.Identify;if(!chart||!chart.ExportData)continue;var data=chart.ExportData(aryKData,range);if(!IFrameSplitOperator.IsNonEmptyArray(data))continue;var indexData=null;if(mapIndex.has(guid)){indexData=mapIndex.get(guid);}else{indexData={Guid:guid,Name:chart.IndexName,ID:chart.IndexID,AryData:[]};mapIndex.set(guid,indexData);}for(var index=0;index<data.length;++index){var subItem=data[index];var outName="未定义名字";if(subItem.Name)outName=subItem.Name;indexData.AryData.push({Name:''+outName,Data:subItem.Data,Description:subItem.Description});}}}}if(mapIndex.size<=0)return null;var aryData=[];var bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);var startIndex=0,endIndex=0;if(range){startIndex=range.Start.Index;endIndex=range.End.Index;}for(var i=0;i<this.WindowIndex.length;++i){var item=this.WindowIndex[i];if(!item)continue;var guid=item.Guid;if(!mapIndex.has(guid))continue;var indexData=mapIndex.get(guid);var data=this.GetIndexItemDescription(aryKData,indexData,item,range);if(data)aryData.push(data);}for(var i=0,j=0,k=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];for(j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];var indexInfo=overlayItem.Script;var guid=overlayItem.Identify;if(!mapIndex.has(guid))continue;var indexData=mapIndex.get(guid);var data=this.GetIndexItemDescription(aryKData,indexData,indexInfo,range);if(data)aryData.push(data);}}return aryData;};this.GetIndexItemDescription=function(aryKData,indexData,indexInfo,range){var bMinuteChart=this.IsMinuteContainer();var bMinutePeriod=false;if(bMinuteChart)bMinutePeriod=true;else bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);var startIndex=0,endIndex=aryKData.length-1;if(range){startIndex=range.Start.Index;endIndex=range.End.Index;}var strTitle=this.Name+' '+this.Symbol+' '+indexInfo.Name+'\u6307\u6807\u6570\u636E';var strText='\u3010'+strTitle+'\u3011\r\n';var strValue=null;if(indexInfo.Description)strValue=indexInfo.Description;if(indexInfo.FullDescription)strValue=indexInfo.FullDescription;strText+='\u6307\u6807\u89E3\u91CA:'+strValue+'\r\n';if(indexInfo.Script)strText+='\u6307\u6807\u516C\u5F0F:\r\n----------------------\r\n'+indexInfo.Script+'\r\n------------------------\r\n';if(IFrameSplitOperator.IsNonEmptyArray(indexInfo.Arguments))//参数
 {strValue="";for(var i=0;i<indexInfo.Arguments.length;++i){var argItem=indexInfo.Arguments[i];strValue+=argItem.Name+'='+argItem.Value+',';}strText+='\u6307\u6807\u53C2\u6570:'+strValue+'\r\n';}strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 格式hhmm\r\n";strText+="原始数据如下\r\n";strText+="Date,Time";for(var i=0;i<indexData.AryData.length;++i){var indexItem=indexData.AryData[i];strText+=','+indexItem.Name;}strText+="\r\n";for(var i=startIndex;i<=endIndex&&i<aryKData.length;++i){var kItem=aryKData[i];var time=null;if(bMinutePeriod)time=kItem.Time;strText+=kItem.Date+','+time;for(var j=0;j<indexData.AryData.length;++j){var indexItem=indexData.AryData[j];var value=null;if(indexItem.Data)value=indexItem.Data[i];strText+=','+value;}strText+="\r\n";}strText+="\r\n\r\n";return{Title:strTitle,Content:strText,Type:"指标数据"};};}function GetDevicePixelRatio(){if(typeof window=='undefined')return 1;return window.devicePixelRatio||1;}function GetFontHeight(context,font,word){if(!context)return null;if(font)context.font=font;var text='擎';if(IFrameSplitOperator.IsString(word))text=word;var fontInfo=context.measureText(text);var textHeight=fontInfo.fontBoundingBoxAscent+fontInfo.fontBoundingBoxDescent;if(!IFrameSplitOperator.IsNumber(textHeight))textHeight=fontInfo.width+2*GetDevicePixelRatio();return textHeight;}function IsPhoneWeb(){var userAgentInfo=navigator.userAgent;var Agents=new Array("Android","iPhone","SymbianOS","Windows Phone","iPad","iPod");for(var v=0;v<Agents.length;v++){if(userAgentInfo.indexOf(Agents[v])>0)return true;}return false;}function OnKeyDown(e)//键盘事件
@@ -3688,13 +3689,15 @@ for(var i=0;i<indexCount;++i){var item=date[i];if(item>=firstItem.Date){indexSta
 this.FixKData=function(aryKData,period){if(ChartData.IsDayPeriod(period,true)){return this.FixKData_Day(aryKData);}else if(ChartData.IsMinutePeriod(period,true)){return this.FixKData_Minute(aryKData);}return null;};this.FixKData_Day=function(aryKData){var result=[];var nOverlayDataCount=aryKData.length;for(var i=0,j=0;i<this.Data.length;){var kItem=this.Data[i];if(j<nOverlayDataCount){var fItem=aryKData[j];if(fItem.Date>kItem.Date){++i;continue;}}if(j+1<nOverlayDataCount){var fItem=aryKData[j];var fItem2=aryKData[j+1];if(fItem.Date<kItem.Date&&fItem2.Date<=kItem.Date){++j;continue;}}var item=new HistoryData();item.Date=kItem.Date;var index=j<nOverlayDataCount?j:nOverlayDataCount-1;var fItem=aryKData[index];item.Close=fItem.Close;item.High=fItem.High;item.Low=fItem.Low;item.Open=fItem.Open;item.YClose=fItem.YClose;item.Amount=fItem.Amount;item.Vol=fItem.Vol;item.ExDate=fItem.Date;//对应叠加数据的日期 调试用
 result[i]=item;++i;}return result;};this.FixKData_Minute=function(aryKData){var result=[];var nOverlayDataCount=aryKData.length;for(var i=0,j=0;i<this.Data.length;){var kItem=this.Data[i];var kDateTime=ChartData.DateTimeToNumber(kItem);if(j<nOverlayDataCount){var fItem=aryKData[j];var fDateTime=ChartData.DateTimeToNumber(fItem);if(fDateTime>kDateTime){++i;continue;}}if(j+1<nOverlayDataCount){var fItem=aryKData[j];var fItem2=aryKData[j+1];var fDateTime=ChartData.DateTimeToNumber(fItem);var fDateTime2=ChartData.DateTimeToNumber(fItem2);if(fDateTime<kDateTime&&fDateTime2<=kDateTime){++j;continue;}}var item=new HistoryData();item.Date=kItem.Date;item.Time=kItem.Time;var index=j<nOverlayDataCount?j:nOverlayDataCount-1;var fItem=aryKData[index];item.Close=fItem.Close;item.High=fItem.High;item.Low=fItem.Low;item.Open=fItem.Open;item.YClose=fItem.YClose;item.Amount=fItem.Amount;item.Vol=fItem.Vol;item.ExDate=fItem.Date;//对应叠加数据的日期 调试用
 item.ExTime=fItem.Time;//对应叠加数据的日期 调试用
-result[i]=item;++i;}return result;};//获取K线的索引范围 start={ Date, Time };
-this.GetDataRange=function(start,end){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;var firstItem=this.Data[0];var endItem=this.Data[this.Data.length-1];var range={Start:{Index:0,Date:firstItem.Date,Time:firstItem.Time},End:{Index:this.Data.length-1,Date:endItem.Date,Time:endItem.Time}};//{Start:{Date, Time, Index,}, End:{Date, Time, Index}}
+result[i]=item;++i;}return result;};this.GetDataRangeByCount=function(count){if(!IFrameSplitOperator.IsPlusNumber(count))return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;var endItem=this.Data[this.Data.length-1];var endIndex=this.Data.length-1;var startIndex=endIndex-count;if(startIndex<0)startIndex=0;var startItem=this.Data[startIndex];var range={Start:{Index:startIndex,Date:startItem.Date,Time:startItem.Time},End:{Index:endIndex,Date:endItem.Date,Time:endItem.Time}};return range;};this.GetDataRangeByDateTime=function(start,end){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;var firstItem=this.Data[0];var endItem=this.Data[this.Data.length-1];var range={Start:{Index:0,Date:firstItem.Date,Time:firstItem.Time},End:{Index:this.Data.length-1,Date:endItem.Date,Time:endItem.Time}};//{Start:{Date, Time, Index,}, End:{Date, Time, Index}}
 //查找起始位置
 for(var i=0;i<this.Data.length;++i){var item=this.Data[i];var bFind=false;if(IFrameSplitOperator.IsNumber(start.Time))//日期+时间
 {if(item.Date>start.Date||item.Date===start.Date&&item.Time>=start.Time)bFind=true;}else{if(item.Date>=start.Date)bFind=true;}if(bFind){range.Start={Index:i,Date:item.Date};break;}}//查结束位置
 for(var i=this.Data.length-1;i>=0;--i){var item=this.Data[i];var bFind=false;if(IFrameSplitOperator.IsNumber(end.Time))//日期+时间
-{if(item.Date<end.Date||item.Date===end.Date&&item.Time<=end.Time)bFind=true;}else{if(item.Date<=end.Date)bFind=true;}if(bFind){range.End={Index:i,Date:item.Date};break;}}return range;};//导出单数组数据
+{if(item.Date<end.Date||item.Date===end.Date&&item.Time<=end.Time)bFind=true;}else{if(item.Date<=end.Date)bFind=true;}if(bFind){range.End={Index:i,Date:item.Date};break;}}return range;};//获取K线的索引范围 
+// { Date:{ start={ Date, Time }, End:{Date:,Time: } },  //日期范围
+// Count:  最新的几条
+this.GetDataRange=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;if(!option)return null;if(option.Date)return this.GetDataRangeByDateTime(option.Date.Start,option.Date.End);else if(IFrameSplitOperator.IsNumber(option.Count))return this.GetDataRangeByCount(option.Count);return null;};//导出单数组数据
 this.ExportArrayData=function(aryKData,option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;var start=0,end=this.Data.length-1;//限制范围
 if(option&&option.Start&&option.End&&IFrameSplitOperator.IsNumber(option.Start.Index)&&IFrameSplitOperator.IsNumber(option.End.Index)){start=option.Start.Index;end=option.End.Index;}var aryData=[];for(var i=start;i<=end&&i<this.Data.length;++i){aryData[i]=this.Data[i];}return aryData;};this.ExportBoolData=function(aryKData,option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data))return null;var start=0,end=this.Data.length-1;//限制范围
 if(option&&option.Start&&option.End&&IFrameSplitOperator.IsNumber(option.Start.Index)&&IFrameSplitOperator.IsNumber(option.End.Index)){start=option.Start.Index;end=option.End.Index;}var aryValue=[];for(var i=start;i<=end&&i<this.Data.length;++i){var item=this.Data[i];aryValue[i]=false;if(!IFrameSplitOperator.IsPlusNumber(item))continue;aryValue[i]=true;}return aryValue;};//导出K线数据
@@ -5001,12 +5004,12 @@ this.IconSize={Max:g_JSChartResource.DRAWICON.Icon.MaxSize,Min:g_JSChartResource
 Zoom:{Type:g_JSChartResource.DRAWICON.Icon.Zoom.Type,Value:g_JSChartResource.DRAWICON.Icon.Zoom.Value//放大倍数
 }};this.Family;this.Color=g_JSChartResource.DefaultTextColor;this.IsHScreen=false;this.IconRect=[];//0=序号,1=区域
 this.MapCache=null;//key=date/date-time  value={ Data:[] }
-this.GetKValue=ChartData.GetKValue;this.BuildKey=function(item){if(IFrameSplitOperator.IsNumber(item.Time))return item.Date+'-'+item.Time;else return item.Date;};this.BuildCacheData=function(){var mapData=new _map2.default();this.MapCache=mapData;if(!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon))return;for(var i=0;i<this.AryIcon.length;++i){var item=this.AryIcon[i];var key=this.BuildKey(item);if(mapData.has(key)){var mapItem=mapData.get(key);mapItem.Data.push(item);}else{mapData.set(key,{Data:[item]});}}};this.ClipClient=function(isHScreen)//裁剪客户端
+this.GetKValue=ChartData.GetKValue;this.SetOption=function(option){if(!option)return;if(option.IconSize){var item=option.IconSize;if(IFrameSplitOperator.IsNumber(item.Max))this.IconSize.Max=item.Max;if(IFrameSplitOperator.IsNumber(item.Min))this.IconSize.Min=item.Min;if(item.Zoom){var subItem=item.Zoom;if(IFrameSplitOperator.IsNumber(subItem.Type))this.IconSize.Zoom.Type=subItem.Type;if(IFrameSplitOperator.IsNumber(subItem.Value))this.IconSize.Zoom.Value=subItem.Value;}}if(option.Color)this.Color=option.Color;};this.BuildKey=function(item){if(IFrameSplitOperator.IsNumber(item.Time))return item.Date+'-'+item.Time;else return item.Date;};this.BuildCacheData=function(){var mapData=new _map2.default();this.MapCache=mapData;if(!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon))return;for(var i=0;i<this.AryIcon.length;++i){var item=this.AryIcon[i];var key=this.BuildKey(item);if(mapData.has(key)){var mapItem=mapData.get(key);mapItem.Data.push(item);}else{mapData.set(key,{Data:[item]});}}};this.ClipClient=function(isHScreen)//裁剪客户端
 {if(isHScreen==true){var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
 this.Canvas.clip();};this.Draw=function(){this.IconRect=[];if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;//k线数据
 if(!this.Family)return;if(!this.MapCache||this.MapCache.size<=0)return;this.IsHScreen=this.ChartFrame.IsHScreen===true;var xPointCount=this.ChartFrame.XPointCount;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var isMinute=this.IsMinuteFrame();var border=this.GetBorder();if(this.IsHScreen){var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;var chartLeft=border.TopEx;}else{var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var chartLeft=border.LeftEx;}this.Canvas.save();this.ClipClient(this.ChartFrame.IsHScreen);var fontSize=this.GetDynamicIconSize(dataWidth,distanceWidth,this.IconSize.Max,this.IconSize.Min,this.IconSize.Zoom);this.Canvas.font=fontSize+'px '+this.Family;var drawInfo={Left:chartLeft,Right:chartright,FontSize:fontSize,DataWidth:dataWidth,DistanceWidth:distanceWidth};for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var kItem=this.Data.Data[i];var key=this.BuildKey(kItem);if(!this.MapCache.has(key))continue;var mapItem=this.MapCache.get(key);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;}this.DrawItem(mapItem,kItem,x,drawInfo);}this.Canvas.restore();};this.DrawItem=function(groupItem,kItem,x,drawInfo){if(!IFrameSplitOperator.IsNonEmptyArray(groupItem.Data))return;var fontSize=drawInfo.FontSize;var left=drawInfo.Left,right=drawInfo.Right;var dataWidth=drawInfo.DataWidth;//var distanceWidth=drawInfo.DistanceWidth;
-for(var i=0;i<groupItem.Data.length;++i){var item=groupItem.Data[i];var value=item.Value;if(IFrameSplitOperator.IsString(item.Value))value=this.GetKValue(kItem,item.Value);if(!IFrameSplitOperator.IsNumber(value))continue;var y=this.ChartFrame.GetYFromData(value,false);if(item.Image){var imageHeight=item.Image.Height;var imageWidth=item.Image.Width;if(this.IsHScreen){var xImage=x-imageWidth/2,yImage=y;if(item.Baseline==1)yImage=y-imageHeight;else if(item.Baseline==2)yImage=y;else yImage=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){yImage-=item.YMove;y-=item.YMove;}this.Canvas.save();this.Canvas.translate(yImage+imageWidth/2,xImage+imageHeight/2);this.Canvas.rotate(90*Math.PI/180);this.Canvas.drawImage(item.Image.Data,-imageWidth/2,-imageHeight/2,item.Image.Width,item.Image.Height);this.Canvas.restore();}else{var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);if(item.Baseline==1)rtIcon.Y=y;else if(item.Baseline==2)rtIcon.Y=y-imageHeight;else rtIcon.Y=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.drawImage(item.Image.Data,rtIcon.X,rtIcon.Y,item.Image.Width,item.Image.Height);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}else{if(item.Color)this.Canvas.fillStyle=item.Color;else this.Canvas.fillStyle=this.Color;//var textWidth=this.Canvas.measureText(item.Symbol).width;
-this.Canvas.textAlign='center';var rtIcon=new Rect(x-fontSize/2,y-fontSize/2,fontSize,fontSize);if(item.Baseline==1){this.Canvas.textBaseline='top';rtIcon.Y=y;}else if(item.Baseline==2){this.Canvas.textBaseline='bottom';rtIcon.Y=y-fontSize;}else{this.Canvas.textBaseline='middle';rtIcon.Y=y-fontSize/2;}if(this.IsHScreen){this.Canvas.save();this.Canvas.translate(y,x);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(item.Symbol,0,0);this.Canvas.restore();}else{if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.fillText(item.Symbol,x,y);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}if(item.Line){var price=item.Line.KData=="H"?kItem.High:kItem.Low;var yPrice=this.ChartFrame.GetYFromData(price,false);var yText=y;if(Array.isArray(item.Line.Offset)&&item.Line.Offset.length==2){if(yText>yPrice)//文字在下方
+for(var i=0;i<groupItem.Data.length;++i){var item=groupItem.Data[i];var value=item.Value;if(IFrameSplitOperator.IsString(item.Value))value=this.GetKValue(kItem,item.Value);if(!IFrameSplitOperator.IsNumber(value))continue;var y=this.ChartFrame.GetYFromData(value,false);if(item.Image){var imageHeight=item.Image.Height;var imageWidth=item.Image.Width;if(this.IsHScreen){var xImage=x-imageWidth/2,yImage=y;if(item.Baseline==1)yImage=y-imageHeight;else if(item.Baseline==2)yImage=y;else yImage=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){yImage-=item.YMove;y-=item.YMove;}this.Canvas.save();this.Canvas.translate(yImage+imageWidth/2,xImage+imageHeight/2);this.Canvas.rotate(90*Math.PI/180);this.Canvas.drawImage(item.Image.Data,-imageWidth/2,-imageHeight/2,item.Image.Width,item.Image.Height);this.Canvas.restore();}else{var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);if(item.Baseline==1)rtIcon.Y=y;else if(item.Baseline==2)rtIcon.Y=y-imageHeight;else rtIcon.Y=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.drawImage(item.Image.Data,rtIcon.X,rtIcon.Y,item.Image.Width,item.Image.Height);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}else{if(item.Color)this.Canvas.fillStyle=item.Color;else this.Canvas.fillStyle=this.Color;var iconSize=fontSize;if(IFrameSplitOperator.IsNumber(item.Size))iconSize=item.Size;//var textWidth=this.Canvas.measureText(item.Symbol).width;
+this.Canvas.font=iconSize+'px '+this.Family;this.Canvas.textAlign='center';var rtIcon=new Rect(x-iconSize/2,y-iconSize/2,iconSize,iconSize);if(item.Baseline==1){this.Canvas.textBaseline='top';rtIcon.Y=y;}else if(item.Baseline==2){this.Canvas.textBaseline='bottom';rtIcon.Y=y-iconSize;}else{this.Canvas.textBaseline='middle';rtIcon.Y=y-iconSize/2;}if(this.IsHScreen){this.Canvas.save();this.Canvas.translate(y,x);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(item.Symbol,0,0);this.Canvas.restore();}else{if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.fillText(item.Symbol,x,y);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}if(item.Line){var price=item.Line.KData=="H"?kItem.High:kItem.Low;var yPrice=this.ChartFrame.GetYFromData(price,false);var yText=y;if(Array.isArray(item.Line.Offset)&&item.Line.Offset.length==2){if(yText>yPrice)//文字在下方
 {yText-=item.Line.Offset[1];yPrice+=item.Line.Offset[0];}else if(yText<yPrice){yText+=item.Line.Offset[1];yPrice-=item.Line.Offset[0];}}this.Canvas.save();if(item.Line.Dash)this.Canvas.setLineDash(item.Line.Dash);//虚线
 if(item.Line.Width>0)this.Canvas.lineWidth=item.Line.Width;//线宽
 this.Canvas.strokeStyle=item.Line.Color;this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(yText,ToFixedPoint(x));this.Canvas.lineTo(yPrice,ToFixedPoint(x));}else{this.Canvas.moveTo(ToFixedPoint(x),yText);this.Canvas.lineTo(ToFixedPoint(x),yPrice);}this.Canvas.stroke();this.Canvas.restore();}}};this.GetTooltipData=function(x,y,tooltip){if(!IFrameSplitOperator.IsNonEmptyArray(this.IconRect))return false;for(var i=0;i<this.IconRect.length;++i){var item=this.IconRect[i];if(!item.Rect)continue;var rect=item.Rect;if(rect&&rect.PtInRect(x,y)){JSConsole.Chart.Log('[ChartMultiSVGIconV2::GetTooltipData] icon ',item);tooltip.Data=item;tooltip.ChartPaint=this;tooltip.Type=4;//指标
@@ -8131,7 +8134,7 @@ this.Frame.Data=this.ChartPaint[0].Data;for(var i in this.OverlayChartPaint)//
 {var showCount=customShow.PageSize;for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i].Frame;item.XPointCount=showCount;}}if(IFrameSplitOperator.IsNumber(customShow.Position)){var xCount=this.Frame.SubFrame[0].Frame.XPointCount;var moveStep=parseInt(xCount/2);index-=moveStep;if(index<0)index=0;}this.ChartPaint[0].Data.DataOffset=index;this.CursorIndex=0;};this.OnDragSelectRectMouseUp=function(e){var paint=this.GetRectSelectPaint();if(!paint)return;var selectData=paint.GetSelectRectData();if(!selectData)return;var pixelTatio=GetDevicePixelRatio();var corssCursor=this.ChartCorssCursor;//十字光标
 var x=corssCursor.LastPoint.X/pixelTatio;var y=corssCursor.LastPoint.Y/pixelTatio;if(e){var data={Chart:this,X:x,Y:y,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint//区间选择背景
-};e.data=data;}var aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}}];var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAG_SELECT_RECT_MOUSEUP);if(event){var sendData={X:x,Y:y,SelectData:selectData,//区间选择的数据
+};e.data=data;}var aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,selectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[selectData]}},{Name:"区间分析",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_DATA_ANALYZE_ID,Args:[selectData]}}];var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAG_SELECT_RECT_MOUSEUP);if(event){var sendData={X:x,Y:y,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint,//区间选择背景
 AryMenu:null,PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
 aryMenu=sendData.AryMenu;}if(this.IsShowSelectRectDialog())//区间统计
@@ -8770,7 +8773,7 @@ var bShowCorss=false;//十字光标十字线
 var bCorssDrawKLine=false;var bCorssDrawVaildTime=false;var bCorssDrawPoint=false;var bCorssBCClick=false;var bCorssShowIncrease=false;var crossXTextAlign=-1;if(this.ChartCorssCursor){bShowCorss=this.ChartCorssCursor.IsShowCorss;bCorssDrawKLine=this.ChartCorssCursor.IsOnlyDrawKLine&&this.ChartCorssCursor.IsShowClose;bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;bCorssBCClick=this.ChartCorssCursor.EnableDBClick;bCorssShowIncrease=this.ChartCorssCursor.StringFormatX.RangeIncrease.IsShow;crossXTextAlign=this.ChartCorssCursor.BottomConfig.Align;}var bPopMinuteChart=false;if(this.PopMinuteChart)bPopMinuteChart=true;var bRButtonSelectRect=false,bLButtonSelectRect=false;if(this.ChartDragSelectRect){bRButtonSelectRect=this.ChartDragSelectRect.EnableRButton;bLButtonSelectRect=this.ChartDragSelectRect.EnableLButton;}var kItem=null;if(frameID>=0&&option&&IFrameSplitOperator.IsNumber(option.CursorIndex)){var kData=this.GetKData();if(kData&&IFrameSplitOperator.IsNonEmptyArray(kData.Data)){var dataIndex=kData.DataOffset+option.CursorIndex;if(dataIndex>=0&&dataIndex<kData.Data.length)kItem=kData.Data[dataIndex];}}//K线浮框 是否显示指标信息
 var bTooltipDialogShowIndexTitle=false;if(this.DialogTooltip){bTooltipDialogShowIndexTitle=this.DialogTooltip.IndexTitle.Enable;}var bShowMaxMin=false;var klineChart=this.ChartPaint[0];if(klineChart)bShowMaxMin=klineChart.IsShowMaxMinPrice;var aryMenu=[{Name:"分析周期",SubMenu:[{Name:"日线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[0]},Checked:this.Period==0},{Name:"周线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[1]},Checked:this.Period==1},{Name:"双周线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[21]},Checked:this.Period==21},{Name:"月线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[2]},Checked:this.Period==2},{Name:"季线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[9]},Checked:this.Period==9},{Name:"半年",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[22]},Checked:this.Period==22},{Name:"年线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[3]},Checked:this.Period==3},{Name:"1分",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[4]},Checked:this.Period==4},{Name:"5分",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[5]},Checked:this.Period==5},{Name:"15分",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[6]},Checked:this.Period==6},{Name:"30分",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[7]},Checked:this.Period==7},{Name:"60分",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[8]},Checked:this.Period==8},{Name:"2小时",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[11]},Checked:this.Period==11},{Name:"4小时",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[12]},Checked:this.Period==12},{Name:"分笔",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[10]},Checked:this.Period==10},{Name:"自定义周期:3分钟",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[20003]},Checked:this.Period==20003},{Name:"自定义周期:35分钟",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[20035]},Checked:this.Period==20035},{Name:"自定义周期:8日",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID,Args:[40008]},Checked:this.Period==40008}]},{Name:"指标切换",SubMenu:[{Name:"均线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"均线"]}},{Name:"BOLL",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"BOLL"]}},{Name:"MACD",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"MACD"]}},{Name:"MACD(粗)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"MACD2"]}},{Name:"KDJ",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"KDJ"]}},{Name:"VOL",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"VOL"]}},{Name:"RSI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"RSI"]}},{Name:"BRAR",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"BRAR"]}},{Name:"WR",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"WR"]}}]},{Name:"五彩K线",SubMenu:[{Name:"十字星",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-十字星"]}},{Name:"早晨之星",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-早晨之星"]}},{Name:"垂死十字",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-垂死十字"]}},{Name:"三只乌鸦",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-三只乌鸦"]}},{Name:"光脚阴线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-光脚阴线"]}},{Name:"黄昏之星",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID,Args:["五彩K线-黄昏之星"]}}]},{Name:"专家系统",SubMenu:[{Name:"BIAS",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-BIAS"]}},{Name:"CCI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-CCI"]}},{Name:"DMI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-DMI"]}},{Name:"KD",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-KD"]}},{Name:"BOLL",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-BOLL"]}},{Name:"KDJ",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID,Args:["交易系统-KDJ"]}}]},{Name:"信息地雷",SubMenu:[{Name:"公告",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["公告",!aryKLineInfo.includes("AnnouncementInfo")]},Checked:aryKLineInfo.includes("AnnouncementInfo")},{Name:"业绩预告",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["业绩预告",!aryKLineInfo.includes("PforecastInfo")]},Checked:aryKLineInfo.includes("PforecastInfo")},{Name:"调研",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["调研",!aryKLineInfo.includes("ResearchInfo")]},Checked:aryKLineInfo.includes("ResearchInfo")},{Name:"大宗交易",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["大宗交易",!aryKLineInfo.includes("BlockTrading")]},Checked:aryKLineInfo.includes("BlockTrading")},{Name:"龙虎榜",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["龙虎榜",!aryKLineInfo.includes("DragonTigerInfo")]},Checked:aryKLineInfo.includes("DragonTigerInfo")},{Name:"互动易",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["互动易",!aryKLineInfo.includes("InvestorInfo")]},Checked:aryKLineInfo.includes("InvestorInfo")},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"显示位置",SubMenu:[{Name:"底部",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INFO_POSITION_ID,Args:[1]},Checked:infoPosition===1},{Name:"K线上",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INFO_POSITION_ID,Args:[0]},Checked:infoPosition===0}]},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"新闻",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["新闻",!aryKLineInfo.includes("NewsInfo")]},Checked:aryKLineInfo.includes("NewsInfo")},{Name:"除权",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID,Args:["除权",!aryKLineInfo.includes("DividendInfo")]},Checked:aryKLineInfo.includes("DividendInfo")}]},{Name:"缺口提示",SubMenu:[{Name:"显示1个缺口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID,Args:[true,1]},Checked:priceGap.Enable==true&&priceGap.Count==1},{Name:"显示2个缺口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID,Args:[true,2]},Checked:priceGap.Enable==true&&priceGap.Count==2},{Name:"显示3个缺口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID,Args:[true,3]},Checked:priceGap.Enable==true&&priceGap.Count==3},{Name:"隐藏缺口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID,Args:[false]},Checked:priceGap.Enable==false}]},{Name:"叠加品种",SubMenu:[{Name:"上证指数",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["000001.sh",!aryOverlaySymbol.includes("000001.sh")]},Checked:aryOverlaySymbol.includes("000001.sh")},{Name:"深证成指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399001.sz",!aryOverlaySymbol.includes("399001.sz")]},Checked:aryOverlaySymbol.includes("399001.sz")},{Name:"中小板指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399005.sz",!aryOverlaySymbol.includes("399005.sz")]},Checked:aryOverlaySymbol.includes("399005.sz")},{Name:"创业板指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399006.sz",!aryOverlaySymbol.includes("399006.sz")]},Checked:aryOverlaySymbol.includes("399006.sz")},{Name:"沪深300",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["000300.sh",!aryOverlaySymbol.includes("000300.sh")]},Checked:aryOverlaySymbol.includes("000300.sh")}]},{Name:"主图线型",SubMenu:[{Name:"K线(实心)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[0]},Checked:klineType==0},{Name:"K线(空心阳线)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[3]},Checked:klineType==3},{Name:"K线(空心阴线)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[20]},Checked:klineType==20},{Name:"K线(空心)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[6]},Checked:klineType==6},{Name:"美国线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[2,true,{IsThinAKBar:false}]},Checked:klineType==2&&!bThinAKBar},{Name:"美国线(细)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[2,true,{IsThinAKBar:true}]},Checked:klineType==2&&bThinAKBar},{Name:"收盘线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[1]},Checked:klineType==1},{Name:"收盘面积",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[4]},Checked:klineType==4},{Name:"Heikin Ashi",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[11]},Checked:klineType==11},{Name:"Line Break",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[12]},Checked:klineType==12},{Name:"High-low",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[13]},Checked:klineType==13},{Name:"HLC Area",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[15]},Checked:klineType==15},{Name:"HLC Bars",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID,Args:[19]},Checked:klineType==19}]},{Name:"坐标类型",SubMenu:[{Name:"反转坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{IsReverse:coordinateType==0}]},Checked:coordinateType==1},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"普通坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:0}]},Checked:yCoordinateType==0},{Name:"百分比坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:1}]},Checked:yCoordinateType==1},{Name:"对数坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:2}]},Checked:yCoordinateType==2},{Name:"等比坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:3}]},Checked:yCoordinateType==3},{Name:"等分坐标",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:4}]},Checked:yCoordinateType==4},{Name:"黄金分割",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_COORDINATETYPE_ID,Args:[{Type:5}]},Checked:yCoordinateType==5}]},{Name:"指标窗口个数",SubMenu:[{Name:"1个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[2]},Checked:2==windowCount},{Name:"2个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[3]},Checked:3==windowCount},{Name:"3个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[4]},Checked:4==windowCount},{Name:"4个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[5]},Checked:5==windowCount},{Name:"5个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[6]},Checked:6==windowCount}]},{Name:"十字光标",SubMenu:[{Name:"显示",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID,Args:[!bShowCorss]},Checked:bShowCorss},{Name:"显示在K线上",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_ON_KLINE_ID,Args:[!bCorssDrawKLine]},Checked:bCorssDrawKLine},{Name:"画在有效X轴上",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID,Args:[!bCorssDrawVaildTime]},Checked:bCorssDrawVaildTime},{Name:"画圆点",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID,Args:[!bCorssDrawPoint]},Checked:bCorssDrawPoint},{Name:"双击显示/隐藏",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_DBCLICK_ID,Args:[!bCorssBCClick]},Checked:bCorssBCClick},{Name:"至今涨幅显示/隐藏",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_SHOW_INCREASE_ID,Args:[!bCorssShowIncrease]},Checked:bCorssShowIncrease},{Name:"底部文字对齐",SubMenu:[{Name:"居中",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_X_TEXTALIGN_ID,Args:[1]},Checked:crossXTextAlign===1},{Name:"左对齐",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_X_TEXTALIGN_ID,Args:[0]},Checked:crossXTextAlign===0}]}]},{Name:"其他设置",SubMenu:[{Name:"左键区间选择",Data:{ID:JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID,Args:[!bLButtonSelectRect]},Checked:bLButtonSelectRect},{Name:"右键区间选择",Data:{ID:JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID,Args:[!bRButtonSelectRect]},Checked:bRButtonSelectRect},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"背景分割",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID,Args:[!bBGSpit]},Checked:bBGSpit},{Name:"画图工具",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID,Args:[]},Checked:this.IsShowDrawToolDialog()},{Name:"移动筹码图",Data:{ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID,Args:[stockChipConfig.Name,stockChipConfig]},Checked:bShowStockChip},{Name:"双击弹分时图",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_POP_MINUTE_CHART_ID,Args:[!bPopMinuteChart]},Checked:bPopMinuteChart},{Name:"显示走完剩余时间",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_KLINE_DAY_SUMMARY_ID,Args:[!bDaySummary]},Checked:bDaySummary},{Name:"拖动Y轴",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_ZOOM_Y_ID,Args:[{FrameID:0,Enable:!bZoomYCoordinate}]},Checked:bZoomYCoordinate},{Name:"显示最大最小值",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_MAXMIN_ID,Args:[!bShowMaxMin]},Checked:bShowMaxMin},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"鼠标形状",SubMenu:[{Name:"默认",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID,Args:["default"]},Checked:this.DefaultCursor=="default"},{Name:"十字线",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID,Args:["crosshair"]},Checked:this.DefaultCursor=="crosshair"}]},{Name:"语言设置",SubMenu:[{Name:"中文",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["CN"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID},{Name:"英语",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["EN"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID},{Name:"繁体",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["TC"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID}]},{Name:"区间选择样式",SubMenu:[{Name:"样式1(默认)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[0]},Checked:0==this.ChartDragSelectRect.ShowMode},{Name:"样式2",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[1]},Checked:1==this.ChartDragSelectRect.ShowMode},{Name:"样式3",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[2]},Checked:2==this.ChartDragSelectRect.ShowMode}]},{Name:"K线浮动框",SubMenu:[{Name:"禁用",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:false}]},Checked:!this.DialogTooltip},{Name:"样式1",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:true,Style:0}]},Checked:this.DialogTooltip&&this.DialogTooltip.Style===0},{Name:"样式1-指标显示",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:true,IndexTitle:{Enable:!bTooltipDialogShowIndexTitle}}]},Checked:bTooltipDialogShowIndexTitle},{Name:"样式2",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:true,Style:1}]},Checked:this.DialogTooltip&&this.DialogTooltip.Style===1}]},{Name:"K线提示框",SubMenu:[{Name:"启用",Data:{ID:JSCHART_MENU_ID.CMD_KLINE_TOOLTIP_ATTRIBUTE,Args:[{Enable:!this.KLineTooltipConfig.Enable}]},Checked:this.KLineTooltipConfig.Enable},{Name:"键盘左右显示",Data:{ID:JSCHART_MENU_ID.CMD_KLINE_TOOLTIP_ATTRIBUTE,Args:[{EnableKeyDown:!this.KLineTooltipConfig.EnableKeyDown}]},Checked:this.KLineTooltipConfig.EnableKeyDown}]},{Name:"X轴拖动",SubMenu:[{Name:"启动",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID,Args:[!this.EnableXDrag.Bottom]},Checked:this.EnableXDrag.Bottom},{Name:"左键拖动K线",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID,Args:[null,this.EnableXDrag.LButton.Type===1?0:1]},Checked:this.EnableXDrag.LButton.Type===1&&this.EnableXDrag.Bottom},{Name:"左键缩放K线",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID,Args:[null,this.EnableXDrag.LButton.Type===2?0:2]},Checked:this.EnableXDrag.LButton.Type===2&&this.EnableXDrag.Bottom},{Name:"右键拖动K线",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID,Args:[null,null,this.EnableXDrag.RButton.Type===1?0:1]},Checked:this.EnableXDrag.RButton.Type===1&&this.EnableXDrag.Bottom},{Name:"右键缩放K线",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID,Args:[null,null,this.EnableXDrag.RButton.Type===2?0:2]},Checked:this.EnableXDrag.RButton.Type===2&&this.EnableXDrag.Bottom}]},{Name:"K线拖动",SubMenu:[{Name:"禁用",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID,Args:[0]},Checked:0==this.DragMode},{Name:"左键拖拽",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID,Args:[1,false]},Checked:1==(this.DragMode&&!this.KLineDragConfig.EnableShfit)},{Name:"Shift+左键拖拽",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID,Args:[1,true]},Checked:1==(this.DragMode&&this.KLineDragConfig.EnableShfit)}]}]}];//复权
 if(!MARKET_SUFFIX_NAME.IsSHSZIndex(this.Symbol)&&!MARKET_SUFFIX_NAME.IsBIT(this.Symbol)){var rightMenu={Name:"复权处理",SubMenu:[{Name:"不复权",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID,Args:[0]},Checked:0==this.Right},{Name:"前复权",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID,Args:[1]},Checked:1==this.Right},{Name:"后复权",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID,Args:[2]},Checked:2==this.Right}]};aryMenu.splice(1,0,rightMenu);}//删除菜单
-for(var i=0;i<aryMenu.length;++i){var item=aryMenu[i];if(item.Name=="五彩K线"){if(this.ColorIndex){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除五彩K线",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID}});}}else if(item.Name=="专家系统"){if(this.TradeIndex){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除专家系统",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_TRADE_INDEX_ID}});}}else if(item.Name=="叠加品种"){for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"取消叠加",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID}});break;}}}else if(item.Name=="信息地雷"){for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除所有",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_KLINE_INFO_ID}});break;}}}else if(item.Name=="十字光标"){if(kItem){var bLocked=this.IsLockCorssCursor();if(bLocked)item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR},Checked:bLocked});else item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR,Args:[{KItem:{Date:kItem.Date,Time:kItem.Time},Draw:true}]},Checked:bLocked});}}}return aryMenu;};this.PopupSelectRectMenuV2=function(data,e){var _this32=this;var aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,data.SelectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[data.SelectData]}}];var menuData={Menu:aryMenu,Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID};menuData.ClickCallback=function(data){_this32.OnClickRightMenu(data);};var x=data.X,y=data.Y;this.PopupMenuByRClick(menuData,x,y);};//重新加载画图工具(切换股票|周期)
+for(var i=0;i<aryMenu.length;++i){var item=aryMenu[i];if(item.Name=="五彩K线"){if(this.ColorIndex){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除五彩K线",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID}});}}else if(item.Name=="专家系统"){if(this.TradeIndex){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除专家系统",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_TRADE_INDEX_ID}});}}else if(item.Name=="叠加品种"){for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"取消叠加",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID}});break;}}}else if(item.Name=="信息地雷"){for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"删除所有",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_KLINE_INFO_ID}});break;}}}else if(item.Name=="十字光标"){if(kItem){var bLocked=this.IsLockCorssCursor();if(bLocked)item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR},Checked:bLocked});else item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR,Args:[{KItem:{Date:kItem.Date,Time:kItem.Time},Draw:true}]},Checked:bLocked});}}}return aryMenu;};this.PopupSelectRectMenuV2=function(data,e){var _this32=this;var aryMenu=[{Name:"区间统计",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID,Args:[e,data.SelectData]}},{Name:"区间放大",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID,Args:[data.SelectData]}},{Name:"区间分析",Data:{ID:JSCHART_MENU_ID.CMD_SELECTED_DATA_ANALYZE_ID,Args:[selectData]}}];var menuData={Menu:aryMenu,Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID};menuData.ClickCallback=function(data){_this32.OnClickRightMenu(data);};var x=data.X,y=data.Y;this.PopupMenuByRClick(menuData,x,y);};//重新加载画图工具(切换股票|周期)
 this.ReloadChartDrawPicture=function(){this.ChartDrawPicture=[];if(this.SelectChartDrawPicture)this.SelectChartDrawPicture.IsSelected=false;this.SelectChartDrawPicture=null;this.CurrentChartDrawPicture=null;if(this.ChartDrawStorage){this.ChartDrawStorageCache=this.ChartDrawStorage.GetDrawData({Symbol:this.Symbol,Period:this.Period});}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_LOAD_DRAWPICTURE);if(event&&event.Callback){var sendData={Symbol:this.Symbol,Period:this.Period,DrawStorage:this.ChartDrawStorage,ChartDrawStorageCache:this.ChartDrawStorageCache};event.Callback(event,sendData,this);}};this.CreateChartDrawPictureByStorage=function()//把缓存(this.ChartDrawStorageCache) 画图工具创建出来
 {if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartDrawStorageCache))return;for(var i=0;i<this.ChartDrawStorageCache.length;++i){var item=this.ChartDrawStorageCache[i];if(item.FrameID<0||!this.Frame.SubFrame||this.Frame.SubFrame.length<item.FrameID)continue;var drawPicture=IChartDrawPicture.CreateChartDrawPicture(item);if(!drawPicture)continue;drawPicture.Canvas=this.Canvas;drawPicture.Status=10;drawPicture.Frame=this.Frame.SubFrame[item.FrameID].Frame;//绑定框架坐标
 drawPicture.Option=this.ChartDrawOption;drawPicture.HQChart=this;if(drawPicture.ImportStorageData)drawPicture.ImportStorageData(item);if(drawPicture.Period!=this.Period){drawPicture.ChangePeriod(this.Period);}else{drawPicture.UpdateXValue();}drawPicture.ValueToPoint();var self=this;drawPicture.GetActiveDrawPicture=function(){return self.GetActiveDrawPicture();};this.ChartDrawPicture.push(drawPicture);}this.ChartDrawStorageCache=null;//清空缓存
@@ -8920,15 +8923,16 @@ this.LockCorssCursor=function(option){if(option&&option.KItem)//指定日期时
 {var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;var kItem={Date:option.KItem.Date,Time:option.KItem.Time,Index:-1};kData.FindDataIndexByDateTime([kItem]);if(kItem.Index<0)return false;var xItem=this.GlobalOption.LockCorssCursor.X;xItem.KLine={DataIndex:kItem.Index,Date:kItem.Date,Time:kItem.Time};xItem.Enable=true;}else{if(this.CursorIndex<0)return false;var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;var dataIndex=kData.DataOffset+parseInt(this.CursorIndex.toFixed(0));var kItem=kData.Data[dataIndex];if(!kItem)return false;var xItem=this.GlobalOption.LockCorssCursor.X;xItem.KLine={DataIndex:dataIndex,Date:kItem.Date,Time:kItem.Time};xItem.Enable=true;}if(option&&option.Draw)this.Draw();return true;};this.GetCorssCursorPosition=function(){var position={LastPoint:{X:this.LastPoint.X,Y:this.LastPoint.Y},CursorIndex:this.CursorIndex};if(!this.GlobalOption||!this.GlobalOption.LockCorssCursor)return position;var xItem=this.GlobalOption.LockCorssCursor.X;if(xItem.Enable&&xItem.KLine){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return position;position.CursorIndex=xItem.KLine.DataIndex-kData.DataOffset;position.LastPoint.X=this.Frame.GetXFromIndex(position.CursorIndex,false);var border=this.Frame.ChartBorder.GetBorder();if(position.LastPoint.Y<border.Top||position.LastPoint.Y>border.Bottom)//超出图形框子, 调整为收盘价
 {var kItem=kData.Data[xItem.KLine.DataIndex];var y=this.Frame.SubFrame[0].Frame.GetYFromData(kItem.Close);position.LastPoint.Y=y;}}return position;};this.GetDateTimeByPoint=function(x,y){var clientPos=this.PtInClient(x,y);if(clientPos<0)return null;if(!IFrameSplitOperator.IsNumber(x))return;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return null;var frame=this.Frame.SubFrame[0].Frame;if(!frame)return null;var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var index=parseInt(frame.GetXData(x));var dataIndex=index+kData.DataOffset;if(dataIndex<0||dataIndex>=kData.Data.length)return null;var kItem=kData.Data[dataIndex];if(!kItem)return null;var result={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex,Index:index,ClientPos:clientPos};return result;};//修正十字光标位置有效的K线
 this.FixCursorIndexValid=function(){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;var dataIndex=this.CursorIndex+kData.DataOffset;if(dataIndex>=kData.Data.length){this.CursorIndex=kData.Data.length-kData.DataOffset-1;return true;}return false;};//option={ FrameID:, Enable: }
-this.EnableZoomYCoordinate=function(option){if(!option)return false;if(!IFrameSplitOperator.IsNumber(option.FrameID))return false;if(!IFrameSplitOperator.IsBool(option.Enable))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(option.FrameID<0||option.FrameID>this.Frame.SubFrame.length)return false;var item=this.Frame.SubFrame[option.FrameID];if(!item||!item.Frame||!item.Frame.YSplitOperator)return false;var frame=item.Frame;var splitOper=frame.YSplitOperator;if(option.Enable){var max=frame.HorizontalMax,min=frame.HorizontalMin;if(!IFrameSplitOperator.IsNumber(max)||!IFrameSplitOperator.IsNumber(min))return false;splitOper.FixedYMaxMin={Max:max,Min:min};splitOper.EnableZoomUpDown=true;frame.XYSplit=true;this.ChartDragSelectRect.EnableLButton=false;}else{splitOper.FixedYMaxMin=null;splitOper.EnableZoomUpDown=false;frame.XYSplit=true;}this.Draw();};this.GetGraphicsRawDescription=function(option){var strTitle='K线图及其指标数据.\r\n';strTitle+='K\u7EBF\u5468\u671F:'+this.GetPeriodName()+'\r\n';var aryData=[];//K线
+this.EnableZoomYCoordinate=function(option){if(!option)return false;if(!IFrameSplitOperator.IsNumber(option.FrameID))return false;if(!IFrameSplitOperator.IsBool(option.Enable))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(option.FrameID<0||option.FrameID>this.Frame.SubFrame.length)return false;var item=this.Frame.SubFrame[option.FrameID];if(!item||!item.Frame||!item.Frame.YSplitOperator)return false;var frame=item.Frame;var splitOper=frame.YSplitOperator;if(option.Enable){var max=frame.HorizontalMax,min=frame.HorizontalMin;if(!IFrameSplitOperator.IsNumber(max)||!IFrameSplitOperator.IsNumber(min))return false;splitOper.FixedYMaxMin={Max:max,Min:min};splitOper.EnableZoomUpDown=true;frame.XYSplit=true;this.ChartDragSelectRect.EnableLButton=false;}else{splitOper.FixedYMaxMin=null;splitOper.EnableZoomUpDown=false;frame.XYSplit=true;}this.Draw();};this.GetDataRangeDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var startIndex=0,endIndex=kData.Data.length-1;if(option&&option.DataRange)//某一段时间的
+{var range=kData.GetDataRange(option.DataRange);if(!range)return null;startIndex=range.Start.Index;endIndex=range.End.Index;}var endItem=kData.Data[endIndex];var startItem=kData.Data[startIndex];var text=null;var bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);if(bMinutePeriod){text=IFrameSplitOperator.FormatDateString(startItem.Date,"YYYY-MM-DD")+' '+IFrameSplitOperator.FormatTimeString(startItem.Time,"HH:MM")+' - '+IFrameSplitOperator.FormatDateString(endItem.Date,"YYYY-MM-DD")+' '+IFrameSplitOperator.FormatTimeString(endItem.Time,"HH:MM");}else{text=IFrameSplitOperator.FormatDateString(startItem.Date,"YYYY-MM-DD")+' - '+IFrameSplitOperator.FormatDateString(endItem.Date,"YYYY-MM-DD");}return text;};this.GetGraphicsRawDescription=function(option){var strTitle='K线图及其指标数据.\r\n';strTitle+='K\u7EBF\u5468\u671F:'+this.GetPeriodName()+'\r\n';strTitle+='\u6570\u636E\u8303\u56F4:'+this.GetDataRangeDescription(option)+'\r\n';var aryData=[];//K线
 var data=this.GetKDataDescription(option);if(data)aryData.push(data);//指标数据
 var data=this.GetIndexDataDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));//信息地雷
 var data=this.GetMinesInfoDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));//叠加股票 
-var data=this.GetOverlaySymbolDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));return{AryData:aryData,Title:strTitle};};//K线信息
-this.GetKDataDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var startIndex=0,endIndex=kData.Data.length-1;if(option){if(option.Start&&option.End)//某一段时间的
-{var range=kData.GetDataRange(option.Start,option.End);if(!range)return null;startIndex=range.Start.Index;endIndex=range.End.Index;}}var strTitle=this.Name+' '+this.Symbol+' K\u7EBF\u6570\u636E';var strDescription='\u3010'+strTitle+'\u3011\r\n';strDescription+="字段说明\r\n";strDescription+="1. Date:日期 格式YYYYMMDD\r\n";strDescription+="2. Time:时间 格式hhmm\r\n";strDescription+="3. Open:开盘价\r\n";strDescription+="4. Close:收盘价\r\n";strDescription+="5. High:最高价\r\n";strDescription+="6. Low:最低价\r\n";strDescription+="7. Amount:成交金额\r\n";strDescription+="8. Vol:成交量\r\n";strDescription+="原始数据如下\r\n";var bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);strText="Date,Time,Open,High,Low,Close,Vol,Amount\r\n";for(var i=startIndex;i<kData.Data.length&&i<=endIndex;++i){var kItem=kData.Data[i];var time=null;if(bMinutePeriod)time=kItem.Time;strText+=kItem.Date+','+time+','+kItem.Open+','+kItem.High+','+kItem.Low+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+'\r\n';}strDescription+=strText;strDescription+="\r\n\r\n";return{Title:strTitle,Content:strDescription,Type:"K线数据"};};//叠加股票信息
+var data=this.GetOverlaySymbolDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));return{AryData:aryData,Title:strTitle,Period:this.Period,Right:this.Right,ChartType:"KLine"};};//K线信息
+this.GetKDataDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var startIndex=0,endIndex=kData.Data.length-1;if(option){if(option.DataRange)//某一段时间的
+{var range=kData.GetDataRange(option.DataRange);if(!range)return null;startIndex=range.Start.Index;endIndex=range.End.Index;}}var strTitle=this.Name+' '+this.Symbol+' K\u7EBF\u6570\u636E';var strDescription='\u3010'+strTitle+'\u3011\r\n';strDescription+="字段说明\r\n";strDescription+="1. Date:日期 格式YYYYMMDD\r\n";strDescription+="2. Time:时间 格式hhmm\r\n";strDescription+="3. Open:开盘价\r\n";strDescription+="4. Close:收盘价\r\n";strDescription+="5. High:最高价\r\n";strDescription+="6. Low:最低价\r\n";strDescription+="7. Amount:成交金额\r\n";strDescription+="8. Vol:成交量\r\n";strDescription+="原始数据如下\r\n";var bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);strText="Date,Time,Open,High,Low,Close,Vol,Amount\r\n";var count=0;for(var i=startIndex;i<kData.Data.length&&i<=endIndex;++i){var kItem=kData.Data[i];var time=null;if(bMinutePeriod)time=kItem.Time;strText+=kItem.Date+','+time+','+kItem.Open+','+kItem.High+','+kItem.Low+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+'\r\n';++count;}strDescription+=strText;strDescription+="\r\n\r\n";return{Title:strTitle,Content:strDescription,Type:"K线数据",Count:count};};//叠加股票信息
 this.GetOverlaySymbolDescription=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint))return null;var aryData=[];var strDescription="";var bMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item)continue;var kData=item.Data;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))continue;var strTitle=item.Title+' '+item.Symbol+' K\u7EBF\u6570\u636E';var strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 hhmm\r\n";strText+="3. Open:开盘价\r\n";strText+="4. Close:收盘价\r\n";strText+="5. Low:最低价\r\n";strText+="6. High:最高价\r\n";strText+="7. Amount:成交金额\r\n";strText+="8. Vol:成交量\r\n";strText+="原始数据如下\r\n";strText+="Date,Time,Open,High,Low,Close,Vol,Amount\r\n";for(var j=0;j<kData.Data.length;++j){var kItem=kData.Data[j];var time=null;if(bMinutePeriod)time=kItem.Time;strText+=kItem.Date+','+time+','+kItem.Open+','+kItem.High+','+kItem.Low+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"叠加股票"});}return aryData;};//信息地雷
-this.GetMinesInfoDescription=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return null;var aryData=[];var strText="",strTitle="";for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(item.ClassName=="BlockTrading"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u5927\u5B97\u4EA4\u6613\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Price:交易价格\r\n";strText+="3. Vol:交易金额\r\n";strText+="原始数据如下\r\n";strText+="Date,Price,Vol\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!dataItem.ExtendData||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;var price=null,vol=null;var extendData=dataItem.ExtendData;if(IFrameSplitOperator.IsNumber(extendData.Price))price=extendData.Price;if(IFrameSplitOperator.IsNumber(extendData.Vol))vol=extendData.Vol;strText+=dataItem.Date+','+price+','+vol+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"大宗交易"});}else if(item.ClassName=="DragonTigerInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u9F99\u864E\u699C\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:上榜原因\r\n";strText+="3. BuyAmount:机构买入总金额\r\n";strText+="4. SellAmount:机构卖出总金额\r\n";strText+="5. NetBuyAmount:机构买入净金额\r\n";strText+="6. NetBuyRatio:净买金额占总成交比\r\n";strText+="7. Amount:市场总成交金额\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,BuyAmount,SellAmount,NetBuyAmount,NetBuyRatio,Amount\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!dataItem.ExtendData||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;var price=null,vol=null;var extendData=dataItem.ExtendData;strText+=dataItem.Date+','+dataItem.Title+','+extendData.BuyAmount+','+extendData.SellAmount+','+extendData.NetBuyAmount+','+extendData.NetBuyRatio+','+extendData.Amount+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"龙虎榜"});}else if(item.ClassName=="DividendInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u9664\u6743\u9664\u606F\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:除权除息方案\r\n";strText+="原始数据如下\r\n";strText+="Date,Title\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"除权除息"});}else if(item.ClassName=="NewsInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u65B0\u95FB\u5217\u8868\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:标题\r\n";strText+="3. Url:原文链接\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;var url=null;if(dataItem.ExtendData&&dataItem.ExtendData.Url)url=dataItem.ExtendData.Url;strText+=dataItem.Date+','+dataItem.Title+','+url+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"新闻列表"});}else if(item.ClassName=="ResearchInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u516C\u53F8\u8C03\u7814\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:调研内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"公司调研"});}else if(item.ClassName=="PforecastInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u4E1A\u7EE9\u9884\u544A\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. ReportDate:报告日期 格式YYYYMMDD\r\n";strText+="3. Content:内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;var content="";if(dataItem.ExtendData&&IFrameSplitOperator.IsNonEmptyArray(dataItem.ExtendData.AryData)){for(var k=0;k<dataItem.ExtendData.AryData.length;++k){var subItem=dataItem.ExtendData.AryData[k];content+='\u9884\u6D4B\u6307\u6807:'+subItem.Name+' \u9884\u544A\u7C7B\u578B:'+subItem.Text+'.';}}strText+=dataItem.Date+','+dataItem.Title+','+content+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"业绩预告"});}else if(item.ClassName=="AnnouncementInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u516C\u544A\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:公告日期 格式YYYYMMDD\r\n";strText+="2. Title:公告标题\r\n";strText+="原始数据如下\r\n";strText+="Date,Title\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"公告数据"});}}return aryData;};this.GetPeriodName=function(){var mapName=new _map2.default([[0,'日线'],[1,'周线'],[2,'月线'],[3,'年线'],[9,'季线'],[21,'双周'],[22,"半年"],[4,'1分'],[5,'5分'],[6,'15分'],[7,'30分'],[8,'60分'],[11,'2小时'],[12,'4小时']]);if(mapName.has(this.Period))return mapName.get(this.Period);return null;};}//API 返回数据 转化为array[]
+this.GetMinesInfoDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return null;var range=null;if(option&&option.DataRange)range=kData.GetDataRange(option.DataRange);var aryData=[];var strText="",strTitle="";for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(item.ClassName=="BlockTrading"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u5927\u5B97\u4EA4\u6613\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Price:交易价格\r\n";strText+="3. Vol:交易金额\r\n";strText+="原始数据如下\r\n";strText+="Date,Price,Vol\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!dataItem.ExtendData||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;var price=null,vol=null;var extendData=dataItem.ExtendData;if(IFrameSplitOperator.IsNumber(extendData.Price))price=extendData.Price;if(IFrameSplitOperator.IsNumber(extendData.Vol))vol=extendData.Vol;strText+=dataItem.Date+','+price+','+vol+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"大宗交易",Count:count});}else if(item.ClassName=="DragonTigerInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u9F99\u864E\u699C\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:上榜原因\r\n";strText+="3. BuyAmount:机构买入总金额\r\n";strText+="4. SellAmount:机构卖出总金额\r\n";strText+="5. NetBuyAmount:机构买入净金额\r\n";strText+="6. NetBuyRatio:净买金额占总成交比\r\n";strText+="7. Amount:市场总成交金额\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,BuyAmount,SellAmount,NetBuyAmount,NetBuyRatio,Amount\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!dataItem.ExtendData||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;var price=null,vol=null;var extendData=dataItem.ExtendData;strText+=dataItem.Date+','+dataItem.Title+','+extendData.BuyAmount+','+extendData.SellAmount+','+extendData.NetBuyAmount+','+extendData.NetBuyRatio+','+extendData.Amount+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"龙虎榜",Count:count});}else if(item.ClassName=="DividendInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u9664\u6743\u9664\u606F\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:除权除息方案\r\n";strText+="原始数据如下\r\n";strText+="Date,Title\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"除权除息",Count:count});}else if(item.ClassName=="NewsInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u65B0\u95FB\u5217\u8868\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:标题\r\n";strText+="3. Url:原文链接\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;var url=null;if(dataItem.ExtendData&&dataItem.ExtendData.Url)url=dataItem.ExtendData.Url;strText+=dataItem.Date+','+dataItem.Title+','+url+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"新闻列表",Count:count});}else if(item.ClassName=="ResearchInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u516C\u53F8\u8C03\u7814\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Title:调研内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"公司调研",Count:count});}else if(item.ClassName=="PforecastInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u4E1A\u7EE9\u9884\u544A\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. ReportDate:报告日期 格式YYYYMMDD\r\n";strText+="3. Content:内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Title,Url\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;var content="";if(dataItem.ExtendData&&IFrameSplitOperator.IsNonEmptyArray(dataItem.ExtendData.AryData)){for(var k=0;k<dataItem.ExtendData.AryData.length;++k){var subItem=dataItem.ExtendData.AryData[k];content+='\u9884\u6D4B\u6307\u6807:'+subItem.Name+' \u9884\u544A\u7C7B\u578B:'+subItem.Text+'.';}}strText+=dataItem.Date+','+dataItem.Title+','+content+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"业绩预告",Count:count});}else if(item.ClassName=="AnnouncementInfo"){if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u516C\u544A\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:公告日期 格式YYYYMMDD\r\n";strText+="2. Title:公告标题\r\n";strText+="原始数据如下\r\n";strText+="Date,Title\r\n";var count=0;for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;if(range&&(dataItem.Date<range.Start.Date||dataItem.Date>range.End.Date))continue;strText+=dataItem.Date+','+dataItem.Title+'\r\n';++count;}if(count<=0)continue;strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"公告数据",Count:count});}}return aryData;};this.GetPeriodName=function(){var mapName=new _map2.default([[0,'日线'],[1,'周线'],[2,'月线'],[3,'年线'],[9,'季线'],[21,'双周'],[22,"半年"],[4,'1分钟'],[5,'5分钟'],[6,'15分钟'],[7,'30分钟'],[8,'60分钟'],[11,'2小时'],[12,'4小时']]);if(mapName.has(this.Period))return mapName.get(this.Period);return null;};}//API 返回数据 转化为array[]
 KLineChartContainer.JsonDataToHistoryData=function(data){var aryDayData=[];if(!data.data)return aryDayData;var upperSymbol=null;if(data.symbol)upperSymbol=data.symbol.toUpperCase();var isFutures=false;//是否是期货
 if(upperSymbol)isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);var list=data.data;var date=0,yclose=1,open=2,high=3,low=4,close=5,vol=6,amount=7,position=8;var fclose=9,yfclose=10;//结算价, 前结算价
 var bfactor=11,afactor=12;//前, 后复权因子
@@ -9726,12 +9730,12 @@ this.GetLatestBeforeOpenItem=function(){var lastItem=null;if(this.DayCount>1){if
 this.GetLatestAfterCloseItem=function(){var lastItem=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return null;var dayItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.AfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.AfterCloseData.Data))return null;var finder=this.AfterCloseData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};this.IsCallAuctionFrame=function(frameID){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(frameID<0||frameID>=this.Frame.SubFrame.length)return false;var subItem=this.Frame.SubFrame[frameID];if(!subItem||!subItem.Frame)return false;var subFrame=subItem.Frame;for(var i=0;i<this.ChartPaintEx.length;++i){var item=this.ChartPaintEx[i];if(item.ChartFrame&&item.ChartFrame.Guid==subFrame.Guid)return true;}return false;};this.GetGraphicsRawDescription=function(option){var strTitle='分时图及其指标数据.\r\n';var aryData=[];//分钟线
 var data=this.GetMinuteDataDescription(option);if(data)aryData.push(data);//指标数据
 var data=this.GetIndexDataDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));var data=this.GetMinesInfoDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));//叠加股票 
-var data=this.GetOverlaySymbolDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));return{AryData:aryData,Title:strTitle};};//分时数据信息
-this.GetMinuteDataDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var startIndex=0,endIndex=kData.Data.length-1;if(option){if(option.Start&&option.End)//某一段时间的
-{var range=kData.GetDataRange(option.Start,option.End);if(!range)return null;startIndex=range.Start.Index;endIndex=range.End.Index;}}function __Temp_GetNumberValue(value){var defValue=arguments.length>1&&arguments[1]!==undefined?arguments[1]:null;if(IFrameSplitOperator.IsNumber(value))return value;return defValue;}var strTitle=this.Name+' '+this.Symbol+' \u5206\u65F6\u6570\u636E';var strDescription='\u3010'+strTitle+'\u3011\r\n';strDescription+="字段说明\r\n";strDescription+="1. Date:日期 格式YYYYMMDD\r\n";strDescription+="2. Time:时间 格式hhmm\r\n";strDescription+="3. Open:这一分钟起始价格\r\n";strDescription+="4. Close:这一分钟最后的价格\r\n";strDescription+="5. High:这一分钟内最高价\r\n";strDescription+="6. Low:这一分钟内最低价\r\n";strDescription+="7. Amount:这一分钟内总的成交金额\r\n";strDescription+="8. Vol:这一分钟内总的成交量\r\n";strDescription+="9. AvPrice:均价\r\n";strDescription+="10. YClose:昨收价\r\n";strDescription+="11. YClearing:昨结算价\r\n";strDescription+="12. Position:持仓量\r\n";strDescription+="原始数据如下\r\n";strText="Date,Time,Open,High,Low,Close,Vol,Amount,AvPrice,YClose,YClearing,Position,\r\n";for(var i=startIndex;i<kData.Data.length&&i<=endIndex;++i){var kItem=kData.Data[i];strText+=kItem.Date+','+kItem.Time+','+kItem.Open+','+kItem.High+','+kItem.Low+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+','+__Temp_GetNumberValue(kItem.AvPrice)+','+__Temp_GetNumberValue(kItem.YClose)+','+__Temp_GetNumberValue(kItem.YClearing)+','+__Temp_GetNumberValue(kItem.Position)+'\r\n';}strDescription+=strText;strDescription+="\r\n\r\n";return{Title:strTitle,Content:strDescription,Type:"分时数据"};};//叠加股票信息
+var data=this.GetOverlaySymbolDescription(option);if(IFrameSplitOperator.IsNonEmptyArray(data))aryData.push.apply(aryData,(0,_toConsumableArray3.default)(data));return{AryData:aryData,Title:strTitle,DayCount:this.DayCount,ChartType:"Minute"};};//分时数据信息
+this.GetMinuteDataDescription=function(option){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return null;var startIndex=0,endIndex=kData.Data.length-1;if(option){if(option.DataRange)//某一段时间的
+{var range=kData.GetDataRange(option.DataRange);if(!range)return null;startIndex=range.Start.Index;endIndex=range.End.Index;}}function __Temp_GetNumberValue(value){var defValue=arguments.length>1&&arguments[1]!==undefined?arguments[1]:null;if(IFrameSplitOperator.IsNumber(value))return value;return defValue;}var strTitle=this.Name+' '+this.Symbol+' \u5206\u65F6\u6570\u636E';var strDescription='\u3010'+strTitle+'\u3011\r\n';strDescription+="字段说明\r\n";strDescription+="1. Date:日期 格式YYYYMMDD\r\n";strDescription+="2. Time:时间 格式hhmm\r\n";strDescription+="3. Open:这一分钟起始价格\r\n";strDescription+="4. Close:这一分钟最后的价格\r\n";strDescription+="5. High:这一分钟内最高价\r\n";strDescription+="6. Low:这一分钟内最低价\r\n";strDescription+="7. Amount:这一分钟内总的成交金额\r\n";strDescription+="8. Vol:这一分钟内总的成交量\r\n";strDescription+="9. AvPrice:均价\r\n";strDescription+="10. YClose:昨收价\r\n";strDescription+="11. YClearing:昨结算价\r\n";strDescription+="12. Position:持仓量\r\n";strDescription+="原始数据如下\r\n";strText="Date,Time,Open,High,Low,Close,Vol,Amount,AvPrice,YClose,YClearing,Position,\r\n";for(var i=startIndex;i<kData.Data.length&&i<=endIndex;++i){var kItem=kData.Data[i];strText+=kItem.Date+','+kItem.Time+','+kItem.Open+','+kItem.High+','+kItem.Low+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+','+__Temp_GetNumberValue(kItem.AvPrice)+','+__Temp_GetNumberValue(kItem.YClose)+','+__Temp_GetNumberValue(kItem.YClearing)+','+__Temp_GetNumberValue(kItem.Position)+'\r\n';}strDescription+=strText;strDescription+="\r\n\r\n";return{Title:strTitle,Content:strDescription,Type:"分时数据"};};//叠加股票信息
 this.GetOverlaySymbolDescription=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint))return null;var aryData=[];var strDescription="";for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item)continue;var kData=item.Data;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))continue;var strTitle=item.Title+' '+item.Symbol+' \u5206\u65F6\u6570\u636E';var strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 hhmm\r\n";strText+="3. Close:这一分钟最后的价格\r\n";strText+="4. Amount:这一分钟内总的成交金额\r\n";strText+="5. Vol:这一分钟内总的成交量\r\n";strText+="原始数据如下\r\n";strText+="Date,Time,Close,Vol,Amount\r\n";for(var j=0;j<kData.Data.length;++j){var kItem=kData.Data[j];strText+=kItem.Date+','+kItem.Time+','+kItem.Close+','+kItem.Vol+','+kItem.Amount+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"叠加股票"});}return aryData;};//信息地雷
-this.GetMinesInfoDescription=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return null;var aryData=[];for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(!item)continue;if(item.ClassName=="MarketEventInfo")//异动信息
-{if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u5F02\u52A8\u6570\u636E';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 格式hhmm\r\n";strText+="3. Title:异动内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Time,Title\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;strText+=dataItem.Date+','+dataItem.Time+','+dataItem.Title+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"异动数据"});}else if(item.ClassName=="MinuteNewsInfo")//新闻
+this.GetMinesInfoDescription=function(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return null;var aryData=[];var strText="",strText="";for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(!item)continue;if(item.ClassName=="MarketEventInfo")//异动信息
+{if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u5F02\u52A8\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 格式hhmm\r\n";strText+="3. Title:异动内容\r\n";strText+="原始数据如下\r\n";strText+="Date,Time,Title\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;strText+=dataItem.Date+','+dataItem.Time+','+dataItem.Title+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"异动数据"});}else if(item.ClassName=="MinuteNewsInfo")//新闻
 {if(!IFrameSplitOperator.IsNonEmptyArray(item.Data))continue;strTitle=this.Name+' '+this.Symbol+' \u65B0\u95FB\u5217\u8868\u6570\u636E';strText='\u3010'+strTitle+'\u3011\r\n';strText+="字段说明\r\n";strText+="1. Date:日期 格式YYYYMMDD\r\n";strText+="2. Time:时间 格式hhmm\r\n";strText+="3. Title:标题\r\n";strText+="4. Url:原文地址\r\n";strText+="原始数据如下\r\n";strText+="Date,Time,Title,Url\r\n";for(var j=0;j<item.Data.length;++j){var dataItem=item.Data[j];if(!dataItem||!IFrameSplitOperator.IsNumber(dataItem.Date))continue;var url=null;var extendData=dataItem.ExtendData;if(extendData&&extendData.Url)url=extendData.Url;strText+=dataItem.Date+','+dataItem.Time+','+dataItem.Title+','+url+'\r\n';}strText+="\r\n\r\n";aryData.push({Title:strTitle,Content:strText,Type:"新闻列表"});}}return aryData;};}//盘前数据
 MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);var yClose=data.stock[0].yclose;var preClose=data.stock[0].yclose;//前一个数据价格
 var stockData=data.stock[0];var date=stockData.date;//日期
@@ -13101,7 +13105,7 @@ chart.Lines=varItem.Draw.DrawData;if(varItem.Draw.Name)chart.Name=varItem.Draw.N
 chart.PointGroup=varItem.Draw.DrawData;if(varItem.Draw.Name)chart.Name=varItem.Draw.Name;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;var bShowTitle=true;if(varItem.IsShowTitle===false)bShowTitle=false;if(bShowTitle){var titleData=new DynamicTitleData(chart.Data,chart.Name,null);titleData.DataType="ChartMultiPoint";titleData.GetItemCallback=function(kItem){return chart.GetItem(kItem);};hqChart.TitlePaint[titleIndex].Data[i]=titleData;}};this.CreateMultiBar=function(hqChart,windowIndex,varItem,id){var chart=new ChartMultiBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.GetKData();//绑定K线
 chart.Bars=varItem.Draw.DrawData;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;var bShowTitle=true;if(varItem.IsShowTitle===false)bShowTitle=false;if(bShowTitle){var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);titleData.DataType="ChartMultiBar";titleData.GetItemCallback=function(kItem){return chart.GetItem(kItem);};hqChart.TitlePaint[titleIndex].Data[id]=titleData;}};this.CreateMultiText=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiText();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.GetKData();//绑定K线
 chart.Texts=varItem.Draw.DrawData;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateMultiSVGIcon=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiSVGIconV2();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.GetKData();//绑定K线
-chart.Family=varItem.Draw.DrawData.Family;chart.AryIcon=varItem.Draw.DrawData.Icon;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateChartDrawSVG=function(hqChart,windowIndex,varItem,i){var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.GetKData();if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip))chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst))chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;if(IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailNoOverlap))chart.EnalbeDetailNoOverlap=varItem.Draw.EnalbeDetailNoOverlap;if(IFrameSplitOperator.IsBool(varItem.Draw.EnableClick))chart.EnableClick=varItem.Draw.EnableClick;if(varItem.Draw.BuildKeyCallback)chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;chart.Family=varItem.Draw.DrawData.Family;chart.TextFont=varItem.Draw.DrawData.TextFont;chart.Texts=varItem.Draw.DrawData.Data;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateMulitHtmlDom=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiHtmlDom();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+chart.Family=varItem.Draw.DrawData.Family;chart.AryIcon=varItem.Draw.DrawData.Icon;if(varItem.Draw.Config)chart.SetOption(varItem.Draw.Config);chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateChartDrawSVG=function(hqChart,windowIndex,varItem,i){var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.GetKData();if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip))chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst))chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;if(IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailNoOverlap))chart.EnalbeDetailNoOverlap=varItem.Draw.EnalbeDetailNoOverlap;if(IFrameSplitOperator.IsBool(varItem.Draw.EnableClick))chart.EnableClick=varItem.Draw.EnableClick;if(varItem.Draw.BuildKeyCallback)chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;chart.Family=varItem.Draw.DrawData.Family;chart.TextFont=varItem.Draw.DrawData.TextFont;chart.Texts=varItem.Draw.DrawData.Data;chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateMulitHtmlDom=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiHtmlDom();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
 chart.Texts=varItem.Draw.DrawData;chart.DrawCallback=varItem.Draw.Callback;hqChart.ChartPaint.push(chart);};this.CreateStackedBar=function(hqChart,windowIndex,varItem,i){var chart=new ChartStackedBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarColor))chart.BarColor=varItem.Draw.BarColor;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarName))chart.BarName=varItem.Draw.BarName;if(IFrameSplitOperator.IsNumber(varItem.Draw.LineWidth))chart.LineWidth=varItem.Draw.LineWidth;if(IFrameSplitOperator.IsNumber(varItem.Draw.BarType))chart.BarType=varItem.Draw.BarType;hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);titleData.DataType="ChartStackedBar";hqChart.TitlePaint[titleIndex].Data[i]=titleData;};this.CreateKLineTable=function(hqChart,windowIndex,varItem,i){var chart=new ChartKLineTable();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
 chart.AryTableData=varItem.Draw.DrawData;if(IFrameSplitOperator.IsNumber(varItem.Draw.RowCount))chart.RowCount=varItem.Draw.RowCount;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName))chart.AryLabel=varItem.Draw.RowName;var config=varItem.Draw.Config;chart.SetOption(config);chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);var bShowTitle=false;if(config&&IFrameSplitOperator.IsBool(config.IsShowTitle))bShowTitle=config.IsShowTitle;if(bShowTitle){var titleIndex=windowIndex+1;var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);titleData.DataType="ChartKLineTable";hqChart.TitlePaint[titleIndex].Data[i]=titleData;}};this.CreateScatterPlot=function(hqChart,windowIndex,varItem,i){var chart=new ChartScatterPlot();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;chart.Color=varItem.Draw.Color;chart.Radius=varItem.Draw.Radius;hqChart.ChartPaint.push(chart);};this.CreateScatterPlotV2=function(hqChart,windowIndex,varItem,i){var chart=new ChartScatterPlotV2();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
 chart.AryPoint=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.Color)chart.Color=config.Color;if(IFrameSplitOperator.IsNumber(config.Radius))chart.Radius=config.Radius;if(config.TextColor)chart.TextColor=config.TextColor;if(config.Font)chart.Font=config.Font;}chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,i){var chart=new ChartBaseLineBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
@@ -13249,7 +13253,7 @@ chart.Lines=varItem.Draw.DrawData;if(varItem.Draw.LineDash)chart.LineDash=varIte
 chart.PointGroup=varItem.Draw.DrawData;chart.BuildCacheData();var titleIndex=windowIndex+1;var bShowTitle=true;if(varItem.IsShowTitle===false)bShowTitle=false;if(bShowTitle){var titlePaint=hqChart.TitlePaint[titleIndex];var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);titleData.DataType="ChartMultiPoint";titleData.GetItemCallback=function(kItem){return chart.GetItem(kItem);};titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;}this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateBackgroud=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartBackground();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;chart.Color=drawData.Color;chart.ColorAngle=drawData.Angle;if(drawData.Data)chart.Data.Data=drawData.Data;}frame.ChartPaint.push(chart);};this.CreateMultiBar=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();//绑定K线
 chart.Bars=varItem.Draw.DrawData;chart.BuildCacheData();var titleIndex=windowIndex+1;var bShowTitle=true;if(varItem.IsShowTitle===false)bShowTitle=false;if(bShowTitle){var titlePaint=hqChart.TitlePaint[titleIndex];var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);titleData.DataType="ChartMultiBar";titleData.GetItemCallback=function(kItem){return chart.GetItem(kItem);};titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;}this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateMultiText=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiText();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();//绑定K线
 chart.Texts=varItem.Draw.DrawData;chart.BuildCacheData();this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateMultiSVGIcon=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiSVGIconV2();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();//绑定K线
-chart.Family=varItem.Draw.DrawData.Family;chart.AryIcon=varItem.Draw.DrawData.Icon;chart.BuildCacheData();this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateChartDrawSVG=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip))chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst))chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;if(varItem.Draw.BuildKeyCallback)chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;chart.Family=varItem.Draw.DrawData.Family;chart.TextFont=varItem.Draw.DrawData.TextFont;chart.Texts=varItem.Draw.DrawData.Data;if(varItem.Draw.AutoPosition)chart.AutoPosition=varItem.Draw.AutoPosition;if(IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailNoOverlap))chart.EnalbeDetailNoOverlap=varItem.Draw.EnalbeDetailNoOverlap;if(IFrameSplitOperator.IsBool(varItem.Draw.EnableClick))chart.EnableClick=varItem.Draw.EnableClick;this.ReloadChartResource(hqChart,windowIndex,chart);chart.BuildCacheData();this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateMulitHtmlDom=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiHtmlDom();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+chart.Family=varItem.Draw.DrawData.Family;chart.AryIcon=varItem.Draw.DrawData.Icon;if(varItem.Draw.Config)chart.SetOption(varItem.Draw.Config);chart.BuildCacheData();this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateChartDrawSVG=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip))chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;if(IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst))chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;if(varItem.Draw.BuildKeyCallback)chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;chart.Family=varItem.Draw.DrawData.Family;chart.TextFont=varItem.Draw.DrawData.TextFont;chart.Texts=varItem.Draw.DrawData.Data;if(varItem.Draw.AutoPosition)chart.AutoPosition=varItem.Draw.AutoPosition;if(IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailNoOverlap))chart.EnalbeDetailNoOverlap=varItem.Draw.EnalbeDetailNoOverlap;if(IFrameSplitOperator.IsBool(varItem.Draw.EnableClick))chart.EnableClick=varItem.Draw.EnableClick;this.ReloadChartResource(hqChart,windowIndex,chart);chart.BuildCacheData();this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateMulitHtmlDom=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiHtmlDom();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
 chart.Texts=varItem.Draw.DrawData;chart.DrawCallback=varItem.Draw.Callback;frame.ChartPaint.push(chart);};this.CreateSimpleTable=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSimpleTable();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;if(drawData.TableData)chart.Data.Data=drawData.TableData;if(drawData.BGColor)chart.BGColor=drawData.BGColor;if(drawData.BorderColor)chart.BorderColor=drawData.BorderColor;if(drawData.TextFont)chart.TextFontConfig=drawData.TextFont;if(drawData.TextColor)chart.TextColor=drawData.TextColor;if(IFrameSplitOperator.IsNumber(drawData.XOffset))chart.Offset.X=drawData.XOffset;if(IFrameSplitOperator.IsNumber(drawData.YOffset))chart.Offset.Y=drawData.YOffset;}frame.ChartPaint.push(chart);};this.CreateSimplePie=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSimplePie();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;if(drawData.Data)chart.Data.Data=drawData.Data;if(drawData.BorderColor)chart.BorderColor=drawData.BorderColor;if(drawData.TextFont)chart.TextFontConfig=drawData.TextFont;if(drawData.TextColor)chart.TextColor=drawData.TextColor;if(IFrameSplitOperator.IsNumber(drawData.XOffset))chart.Offset.X=drawData.XOffset;if(IFrameSplitOperator.IsNumber(drawData.YOffset))chart.Offset.Y=drawData.YOffset;if(IFrameSplitOperator.IsPlusNumber(drawData.Radius))chart.Radius=drawData.Radius;}frame.ChartPaint.push(chart);};this.CreateSimpleDoughnut=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSimpleDoughnut();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;if(drawData.Data)chart.Data.Data=drawData.Data;if(drawData.BorderColor)chart.BorderColor=drawData.BorderColor;if(drawData.TextFont)chart.TextFontConfig=drawData.TextFont;if(drawData.TextColor)chart.TextColor=drawData.TextColor;if(IFrameSplitOperator.IsNumber(drawData.XOffset))chart.Offset.X=drawData.XOffset;if(IFrameSplitOperator.IsNumber(drawData.YOffset))chart.Offset.Y=drawData.YOffset;if(IFrameSplitOperator.IsPlusNumber(drawData.Radius))chart.Radius=drawData.Radius;if(IFrameSplitOperator.IsPlusNumber(drawData.InnerRadius))chart.InnerRadius=drawData.InnerRadius;}frame.ChartPaint.push(chart);};this.CreateSimpleRadar=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartSimpleRadar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Draw&&varItem.Draw.DrawData){var drawData=varItem.Draw.DrawData;if(drawData.Data)chart.Data.Data=drawData.Data;if(drawData.AryIndex)chart.AryIndex=drawData.AryIndex;if(IFrameSplitOperator.IsPlusNumber(drawData.Radius))chart.Radius=drawData.Radius;if(drawData.BorderColor)chart.BorderColor=drawData.BorderColor;if(drawData.TextFont)chart.TextFontConfig=drawData.TextFont;if(drawData.TextColor)chart.TextColor=drawData.TextColor;if(drawData.BorderColor)chart.BorderColor=drawData.BorderColor;if(IFrameSplitOperator.IsNumber(drawData.XOffset))chart.Offset.X=drawData.XOffset;if(IFrameSplitOperator.IsNumber(drawData.YOffset))chart.Offset.Y=drawData.YOffset;if(IFrameSplitOperator.IsNonEmptyArray(drawData.AryArea))chart.AryAreaConfig=drawData.AryArea;chart.BuildCacheData();}frame.ChartPaint.push(chart);};this.CreateChartVericaltLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartVericaltLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}this.SetChartLineDash(chart,varItem.Draw.DrawData);chart.Data.Data=varItem.Draw.DrawData.Data;frame.ChartPaint.push(chart);};this.CreateChartHorizontalLine=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartHorizontalLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.HQChart=hqChart;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}this.SetChartLineDash(chart,varItem.Draw.DrawData);chart.ExtendType=varItem.Draw.DrawData.Extend;chart.Data.Data=varItem.Draw.DrawData.Data;frame.ChartPaint.push(chart);};//创建K线
 this.CreateSelfKLine=function(hqChart,windowIndex,hisData){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartKLine();chart.Canvas=hqChart.Canvas;chart.Name="Self Kline";chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hisData;chart.IsShowMaxMinPrice=false;chart.IsShowKTooltip=false;chart.DrawType=this.KLineType;frame.ChartPaint.push(chart);};//给一个默认的颜色
 this.GetDefaultColor=function(id){var COLOR_ARRAY=["rgb(24,71,178)","rgb(42,230,215)","rgb(252,96,154)","rgb(0,128,255)","rgb(229,0,79)","rgb(68,114,196)","rgb(255,174,0)","rgb(25,199,255)","rgb(175,95,162)","rgb(236,105,65)"];var number=parseInt(id);return COLOR_ARRAY[number%(COLOR_ARRAY.length-1)];};}//后台执行指标
@@ -13313,7 +13317,7 @@ if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.Br
 {drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWTEXT_FIX"||draw.DrawType=="DRAWNUMBER_FIX"){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Value:null,Text:null};drawItem.DrawData.Value=this.FittingArray(draw.DrawData.Value,date,time,hqChart);drawItem.DrawData.Text=this.FittingArray(draw.DrawData.Text,date,time,hqChart);drawItem.Position=draw.Position;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="VERTLINE")//竖线
 {drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Data:this.FittingArray(draw.DrawData.Data,date,time,hqChart)};outVarItem.Draw=drawItem;if(draw.Config){var config=draw.Config;if(IFrameSplitOperator.IsString(config.LineWidth))outVarItem.LineWidth=config.LineWidth;if(IFrameSplitOperator.IsNumber(config.LineType))drawItem.DrawData.LineType=config.LineType;if(config.Color)outVarItem.Color=config.Color;}result.push(outVarItem);}else if(draw.DrawType=='STICKLINE')//柱子
 {drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.Width=draw.Width;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWBAND"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);drawItem.Color=draw.Color;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_LINE'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);if(IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData)){for(var k=0;k<drawItem.DrawData.length;++k){this.GetKLineData(drawItem.DrawData[k].Point,hqChart);}}outVarItem.Draw=drawItem;if(draw.LineDash)drawItem.LineDash=draw.LineDash;if(IFrameSplitOperator.IsBool(draw.IsFullRangeMaxMin))drawItem.IsFullRangeMaxMin=draw.IsFullRangeMaxMin;if(draw.Arrow)drawItem.Arrow=draw.Arrow;if(IFrameSplitOperator.IsNumber(draw.LineWidth))drawItem.LineWidth=draw.LineWidth;result.push(outVarItem);}else if(draw.DrawType=='MULTI_POINT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_BAR'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.OVERLAY_BARS){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.BarName=draw.BarName;drawItem.BarColor=draw.BarColor;drawItem.LineWidth=draw.LineWidth;drawItem.BarType=draw.BarType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);//默认的值
-drawItem.Color=draw.Color;drawItem.Radius=draw.Radius;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT_V2){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.KLINE_TABLE){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.RowCount=draw.RowCount;drawItem.RowName=draw.RowName;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_TEXT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_SVGICON'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Icon:draw.DrawData.Icon,Family:draw.DrawData.Family};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWSVG'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;if(draw.AutoPosition)drawItem.AutoPosition=draw.AutoPosition;drawItem.EnalbeDetailNoOverlap=draw.EnalbeDetailNoOverlap;drawItem.EnableClick=draw.EnableClick;if(draw.BuildKeyCallback)drawItem.BuildKeyCallback=draw.BuildKeyCallback;drawItem.DrawData={Data:draw.Data,Family:draw.Family,TextFont:draw.TextFont,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWTITLE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="MULTI_HTMLDOM")//外部自己创建dom
+drawItem.Color=draw.Color;drawItem.Radius=draw.Radius;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT_V2){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.KLINE_TABLE){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.RowCount=draw.RowCount;drawItem.RowName=draw.RowName;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_TEXT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_SVGICON'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Icon:draw.DrawData.Icon,Family:draw.DrawData.Family};if(draw.Config)drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWSVG'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;if(draw.AutoPosition)drawItem.AutoPosition=draw.AutoPosition;drawItem.EnalbeDetailNoOverlap=draw.EnalbeDetailNoOverlap;drawItem.EnableClick=draw.EnableClick;if(draw.BuildKeyCallback)drawItem.BuildKeyCallback=draw.BuildKeyCallback;drawItem.DrawData={Data:draw.Data,Family:draw.Family,TextFont:draw.TextFont,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWTITLE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="MULTI_HTMLDOM")//外部自己创建dom
 {drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.Callback=draw.Callback;drawItem.DrawData=this.FittingMultiText(draw.DrawData,date,time,hqChart);this.GetKLineData(drawItem.DrawData,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="COLOR_KLINE"){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;var klineOption=this.FittingMultiText(draw.DrawData.KLine,date,time,hqChart);var mapKLineOption=new _map2.default();for(var i in klineOption){var item=klineOption[i];mapKLineOption.set(item.Index,item);}drawItem.DrawData={KLine:mapKLineOption};if(draw.Color)outVarItem.Color=draw.Color;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="KLINE_BG"){drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={};drawItem.DrawData.Color=draw.Color;drawItem.DrawData.Angle=draw.Angle;if(draw.Ver==2.0)drawItem.DrawData.Data=this.FittingKLineBG_V2(draw.DrawData,hqChart);else drawItem.DrawData.Data=this.FittingKLineBG(draw.DrawData,hqChart);outVarItem.Draw=drawItem;outVarItem.Name=draw.DrawType;result.push(outVarItem);}else if(draw.DrawType=='MULTI_POINT_LINE'){drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={};drawItem.DrawData.Color=draw.Color;drawItem.DrawData.PointRadius=draw.PointRadius;drawItem.DrawData.PointColor=draw.PointColor;drawItem.DrawData.LineWidth=draw.LineWidth;drawItem.DrawData.Data=this.FittingMultiPointLine(draw.DrawData,hqChart);outVarItem.Draw=drawItem;//outVarItem.Name=draw.DrawType;
 result.push(outVarItem);}else if(draw.DrawType=="PARTLINE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;if(IFrameSplitOperator.IsString(draw.LineWidth))outVarItem.LineWidth=draw.LineWidth;if(IFrameSplitOperator.IsBool(draw.IsDotLine))outVarItem.IsDotLine=draw.IsDotLine;if(IFrameSplitOperator.IsNonEmptyArray(draw.LineDash))outVarItem.LineDash=draw.LineDash;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.CLIP_COLOR_STICK){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.Data,date,time,hqChart);outVarItem.Draw=drawItem;if(draw.LineWidth)outVarItem.LineWidth=draw.LineWidth;if(draw.UpColor)outVarItem.UpColor=draw.UpColor;if(draw.DownColor)outVarItem.DownColor=draw.DownColor;result.push(outVarItem);}else if(draw.DrawType=="DRAWCOLORKLINE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;if(draw.Color)drawItem.Color=draw.Color;if(IFrameSplitOperator.IsBool(draw.IsEmptyBar))drawItem.IsEmptyBar=draw.IsEmptyBar;result.push(outVarItem);}else if(draw.DrawType=="DRAWTEXTREL"||draw.DrawType=="DRAWTEXTABS"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;//{ Point: { X: 5,Y: 5 }, Text: "注意(居中):前方高能！！！！！" }
 outVarItem.Draw=drawItem;if(draw.Font)outVarItem.Font=draw.Font;result.push(outVarItem);}else if(draw.DrawType=="DRAWTEXT_LINE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;//{ Price:,  Text:{ Title:text, Color:textcolor }, Line:{ Type:linetype, Color:linecolor } };
@@ -16363,7 +16367,7 @@ if(this.MouseOnItem){if(this.MouseOnItem.Data==item)color=this.TextConfig.MouseO
         */this.Canvas.restore();this.ResizeDataCount(endIndex);};this.ResizeDataCount=function(startIndex){if(!IFrameSplitOperator.IsNumber(startIndex))return;if(startIndex<=0)return;if(this.LimitCount<=0)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.AryText))return;if(this.Data.AryText.length<=this.LimitCount)return;var delCount=this.Data.AryText.length-this.LimitCount;for(var i=0;i<delCount&&i<startIndex;++i){this.Data.AryText.shift();}};this.GetTooltipData=function(x,y,tooltip){var rtClient=this.GetClientRect();if(x>=rtClient.Left&&x<=rtClient.Right){for(var i=0;i<this.AryRect.length;++i){var item=this.AryRect[i];if(Path2DHelper.PtInRect(x,y,item.Rect)){tooltip.Data=item;tooltip.ChartPaint=this;tooltip.Type=1;return true;}}}return false;};this.ScrollStep=function(defaultStep){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.AryText))return false;if(!this.FirstItem)return false;var moveStep=this.MoveStep;if(IFrameSplitOperator.IsNumber(defaultStep))moveStep=defaultStep;var rtClient=this.GetClientRect();var left=rtClient.Left;var right=rtClient.Right;var width=this.FirstItem.Move.Width;var xOffset=this.FirstItem.Move.XOffset+moveStep;if(right-xOffset+width<left){var startIndex=this.GetDataIndex(this.FirstItem);nextIndex=startIndex-1;if(nextIndex<0){var index=this.Data.AryText.length-1;this.FirstItem=this.Data.AryText[index];this.FirstItem.Move={XOffset:0};}else{this.FirstItem=this.Data.AryText[nextIndex];this.FirstItem.Move={XOffset:xOffset-width};}}else{this.FirstItem.Move.XOffset=xOffset;}return true;};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.15752";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.15770";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.15753",
+  "version": "1.1.15771",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -59007,7 +59007,11 @@ HQData.APIIndex_MULTI_SVGICON=function(data, callback)
                     //{ Date:20190909, Value:15.4, Symbol:'\ue615', Color:'rgb(240,100,30)'}
                 ] 
             },
-
+            Config:
+            {
+                //IconSize: {Max:40, Min:20 },
+                //Color:"rgb(200,100,100)"
+            }
            
         } //绘制图标数组
     };
@@ -59106,6 +59110,7 @@ HQData.APIIndex_MULTI_SVGICON=function(data, callback)
             */
         }
 
+        //iconItem.Size=50;
         iconData.Draw.DrawData.Icon.push(iconItem);
         ++j;
     }
@@ -59737,7 +59742,7 @@ HQData.APIIndex_SCATTER_PLOT_V2=function(data, callback)
     {
         var kItem=kData.Data[i];
         
-        var item={ Date:kItem.Date, Time:kItem.Time, Value:kItem.High, Color:"rgb(0,0,0)", IsEmpty:true };
+        var item={ Date:kItem.Date, Time:kItem.Time, Value:kItem.High, Color:"rgb(0,0,0)", IsEmpty:true, Radius2:5 };
         if (kItem.Close>kItem.Open) 
         {
             item.ColorBorder="rgb(0,250,0)";
@@ -59759,6 +59764,7 @@ HQData.APIIndex_SCATTER_PLOT_V2=function(data, callback)
         item.Tooltip=
         [
             {Title:"日期", Text:`${kItem.Date}`},
+            {Title:"Time", Text:`${kItem.Time}`},
             {Title:"最高", Text:`${kItem.High.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
             {Title:"最低", Text:`${kItem.Low.toFixed(2)}`,TextColor:"rgb(0,255,0)" },
         ]

package/src/jscommon/umychart.complier.js

@@ -22917,6 +22917,8 @@ function ScriptIndex(name,script,args,option)
         chart.Data=hqChart.GetKData();//绑定K线
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
+        if (varItem.Draw.Config) chart.SetOption(varItem.Draw.Config);
+
         chart.BuildCacheData();
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
@@ -25137,6 +25139,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.Data=hqChart.GetKData();//绑定K线
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
+        if (varItem.Draw.Config) chart.SetOption(varItem.Draw.Config);
         chart.BuildCacheData();
         this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
@@ -26396,6 +26399,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
                     drawItem.DrawData={ Icon:draw.DrawData.Icon, Family:draw.DrawData.Family };
+                    if (draw.Config) drawItem.Config=draw.Config;
                     outVarItem.Draw=drawItem;
 
                     result.push(outVarItem);