hqchart 1.1.15654 → 1.1.15665

package/lib/umychart.vue.js

@@ -1421,7 +1421,8 @@ this.DeleteOverlaySymbol=function(symbol){if(this.JSChartContainer&&typeof this.
 this.SetFirstShowDate=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.SetFirstShowDate=='function')this.JSChartContainer.SetFirstShowDate(obj);};//K线切换类型 0=实心K线 1=收盘价线 2=美国线 3=空心K线 4=面积图 5=订单流
 this.ChangeKLineDrawType=function(drawType,isDraw,option){if(this.JSChartContainer&&typeof this.JSChartContainer.ChangeKLineDrawType=='function')this.JSChartContainer.ChangeKLineDrawType(drawType,isDraw,option);};//指标窗口个数
 this.ChangeIndexWindowCount=function(count,option){if(this.JSChartContainer&&typeof this.JSChartContainer.ChangeIndexWindowCount=='function'){this.JSChartContainer.ChangeIndexWindowCount(count,option);}};//取消叠加
-this.ClearOverlaySymbol=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearOverlaySymbol=='function'){this.JSChartContainer.ClearOverlaySymbol();}};this.DeleteKLineInfo=function(infoName){if(this.JSChartContainer&&typeof this.JSChartContainer.DeleteKLineInfo=='function'){this.JSChartContainer.DeleteKLineInfo(infoName);}};this.ClearKLineInfo=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearKLineInfo=='function'){this.JSChartContainer.ClearKLineInfo();}};this.AddKLineInfo=function(infoName,bUpdate){if(this.JSChartContainer&&typeof this.JSChartContainer.AddKLineInfo=='function'){this.JSChartContainer.AddKLineInfo(infoName,bUpdate);}};this.AddOverlayIndex=function(obj)//{WindowIndex:窗口ID, IndexName:指标ID, Identify:叠加指标ID(可选), API}
+this.ClearOverlaySymbol=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearOverlaySymbol=='function'){this.JSChartContainer.ClearOverlaySymbol();}};this.DeleteKLineInfo=function(infoName){if(this.JSChartContainer&&typeof this.JSChartContainer.DeleteKLineInfo=='function'){this.JSChartContainer.DeleteKLineInfo(infoName);}};this.ClearKLineInfo=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearKLineInfo=='function'){this.JSChartContainer.ClearKLineInfo();}};this.AddKLineInfo=function(infoName,bUpdate){if(this.JSChartContainer&&typeof this.JSChartContainer.AddKLineInfo=='function'){this.JSChartContainer.AddKLineInfo(infoName,bUpdate);}};//手动更新信息地雷
+this.UpdateKLineInfo=function(infoName,option){if(this.JSChartContainer&&typeof this.JSChartContainer.UpdateKLineInfo=='function')this.JSChartContainer.UpdateKLineInfo(infoName,option);};this.AddOverlayIndex=function(obj)//{WindowIndex:窗口ID, IndexName:指标ID, Identify:叠加指标ID(可选), API}
 {if(this.JSChartContainer&&typeof this.JSChartContainer.AddOverlayIndex=='function')this.JSChartContainer.AddOverlayIndex(obj);};this.MoveOverlayIndex=function(src,dest,option){if(this.JSChartContainer&&typeof this.JSChartContainer.MoveOverlayIndex=='function')this.JSChartContainer.MoveOverlayIndex(src,dest,option);};this.MoveOverlayIndexToNewWindow=function(src,option){if(this.JSChartContainer&&typeof this.JSChartContainer.MoveOverlayIndexToNewWindow=='function')this.JSChartContainer.MoveOverlayIndexToNewWindow(src,option);};this.DeleteOverlayWindowsIndex=function(identify){if(this.JSChartContainer&&typeof this.JSChartContainer.DeleteOverlayWindowsIndex=='function')this.JSChartContainer.DeleteOverlayWindowsIndex(identify);};this.StopAutoUpdate=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.StopAutoUpdate=='function')this.JSChartContainer.StopAutoUpdate();};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};this.ChartDestory=this.ChartDestroy;//版本写错了,继续使用
 //设置深度图数据 depthData=[ {ID:深度图ID, Data:数据},]   option={ Draw: true/false }
 this.SetDepthMapData=function(depthData,option){if(this.JSChartContainer&&typeof this.JSChartContainer.SetDepthMapData=='function')this.JSChartContainer.SetDepthMapData(depthData,option);};//设置强制横屏
@@ -3544,7 +3545,8 @@ NEWS:11,//新闻
 DIVIDEND:12,//除权
 POLICY:20,//策略信息
 //公告预留类型
-ANNOUNCEMENT_EX_START:100,ANNOUNCEMENT_EX_END:200};function KLineInfoData(){this.ID;this.Date;this.Time;//时间
+ANNOUNCEMENT_EX_START:100,ANNOUNCEMENT_EX_END:200,//扩展信息
+EXTEND_INFO_START:301,EXTEND_INFO_END:399};function KLineInfoData(){this.ID;this.Date;this.Time;//时间
 this.Title;this.InfoType;this.ExtendData;//扩展数据
 }//外部数据计算方法接口
 function DataPlus(){this.PeriodCallback=new _map2.default();//key=周期id value={ Period, Callback(period,data,self): }
@@ -4909,7 +4911,7 @@ this.newMethod();delete this.newMethod;this.IsDrawFirst=true;this.ClassName="Cha
 this.PointCount=0;this.DataWidth=0;this.DistanceWidth=0;this.ChartRight=0;//可以绘制的最右边
 this.LineColor='RGB(255,0,0)';this.LineDotted=[3,3];this.AreaColor='RGB(255,222,173)';this.LineWidth=1;this.CalculateData=function()//把数据通过nul值分割开, 并计算坐标
 {var data=[];var lineData=[];for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<this.PointCount;++i,++j){var item=this.Data.Data[i];if(!item||!IFrameSplitOperator.IsNumber(item.Value)||!IFrameSplitOperator.IsNumber(item.Value2)){if(lineData.length>0){data.push(lineData);lineData=[];//创建新的一组数据
-}continue;}var x=this.ChartFrame.GetXFromIndex(j);if(x>this.ChartRight)break;var y=this.ChartFrame.GetYFromData(item.Value);var y2=this.ChartFrame.GetYFromData(item.Value2);lineData.push({X:x,Y:y,Y2:y2});}if(lineData.length>0)data.push(lineData);return data;};this.DrawArea=function(lineData){if(lineData.length<=0)return;this.Canvas.beginPath();var drawCount=0;var firstItem=lineData[0];if(this.IsHScreen)this.Canvas.moveTo(firstItem.Y,firstItem.X);else this.Canvas.moveTo(firstItem.X,firstItem.Y);for(var i=1;i<lineData.length;++i){var item=lineData[i];if(this.IsHScreen)this.Canvas.lineTo(item.Y,item.X);else this.Canvas.lineTo(item.X,item.Y);++drawCount;}for(var i=lineData.length-1;i>=0;--i){var item=lineData[i];if(this.IsHScreen)this.Canvas.lineTo(item.Y2,item.X);else this.Canvas.lineTo(item.X,item.Y2);++drawCount;}this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();};this.DrawLine=function(lineData){this.Canvas.strokeStyle=this.LineColor;for(var k=0;k<2;++k){var bFirstPoint=true;var drawCount=0;for(var i=0;i<lineData.length;++i){var item=lineData[i];if(bFirstPoint){this.Canvas.beginPath();if(this.IsHScreen)this.Canvas.moveTo(k===0?item.Y:item.Y2,item.X);else this.Canvas.moveTo(item.X,k===0?item.Y:item.Y2);bFirstPoint=false;}else{if(this.IsHScreen)this.Canvas.lineTo(k===0?item.Y:item.Y2,item.X);else this.Canvas.lineTo(item.X,k===0?item.Y:item.Y2);}++drawCount;}if(drawCount>0)this.Canvas.stroke();}};this.Draw=function(){if(this.ChartFrame.IsMinSize)return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}this.IsHScreen=this.ChartFrame.IsHScreen===true;this.PointCount=this.ChartFrame.XPointCount;this.DataWidth=this.ChartFrame.DataWidth;this.DistanceWidth=this.ChartFrame.DistanceWidth;if(this.IsHScreen)this.ChartRight=this.ChartBorder.GetBottom();else this.ChartRight=this.ChartBorder.GetRight();var drawData=this.CalculateData();if(!drawData||drawData.length<=0)return;this.Canvas.save();this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();this.Canvas.setLineDash(this.LineDotted);//虚线
+}continue;}var x=this.ChartFrame.GetXFromIndex(j);if(x>this.ChartRight)break;var y=this.ChartFrame.GetYFromData(item.Value);var y2=this.ChartFrame.GetYFromData(item.Value2);lineData.push({X:x,Y:y,Y2:y2});}if(lineData.length>0)data.push(lineData);return data;};this.DrawArea=function(lineData){if(lineData.length<=0)return;this.Canvas.beginPath();var drawCount=0;var firstItem=lineData[0];if(this.IsHScreen)this.Canvas.moveTo(firstItem.Y,firstItem.X);else this.Canvas.moveTo(firstItem.X,firstItem.Y);for(var i=1;i<lineData.length;++i){var item=lineData[i];if(this.IsHScreen)this.Canvas.lineTo(item.Y,item.X);else this.Canvas.lineTo(item.X,item.Y);++drawCount;}for(var i=lineData.length-1;i>=0;--i){var item=lineData[i];if(this.IsHScreen)this.Canvas.lineTo(item.Y2,item.X);else this.Canvas.lineTo(item.X,item.Y2);++drawCount;}this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();};this.DrawLine=function(lineData){if(!this.LineColor)return;this.Canvas.strokeStyle=this.LineColor;for(var k=0;k<2;++k){var bFirstPoint=true;var drawCount=0;for(var i=0;i<lineData.length;++i){var item=lineData[i];if(bFirstPoint){this.Canvas.beginPath();if(this.IsHScreen)this.Canvas.moveTo(k===0?item.Y:item.Y2,item.X);else this.Canvas.moveTo(item.X,k===0?item.Y:item.Y2);bFirstPoint=false;}else{if(this.IsHScreen)this.Canvas.lineTo(k===0?item.Y:item.Y2,item.X);else this.Canvas.lineTo(item.X,k===0?item.Y:item.Y2);}++drawCount;}if(drawCount>0)this.Canvas.stroke();}};this.Draw=function(){if(this.ChartFrame.IsMinSize)return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}this.IsHScreen=this.ChartFrame.IsHScreen===true;this.PointCount=this.ChartFrame.XPointCount;this.DataWidth=this.ChartFrame.DataWidth;this.DistanceWidth=this.ChartFrame.DistanceWidth;if(this.IsHScreen)this.ChartRight=this.ChartBorder.GetBottom();else this.ChartRight=this.ChartBorder.GetRight();var drawData=this.CalculateData();if(!drawData||drawData.length<=0)return;this.Canvas.save();this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();if(IFrameSplitOperator.IsNonEmptyArray())this.Canvas.setLineDash(this.LineDotted);//虚线
 for(var i=0;i<drawData.length;++i){var lineData=drawData[i];this.DrawArea(lineData);this.DrawLine(lineData);}this.Canvas.restore();};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={Min:null,Max:null};for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(value==null||value.Value==null||value.Value2==null)continue;var maxData=value.Value>value.Value2?value.Value:value.Value2;var minData=value.Value<value.Value2?value.Value:value.Value2;if(range.Max==null)range.Max=maxData;else if(range.Max<maxData)range.Max=maxData;if(range.Min==null)range.Min=minData;else if(range.Min>minData)range.Min=minData;}return range;};}//填充背景 支持横屏
 function ChartBackground(){this.newMethod=IChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName="ChartBackground";this.Color=null;this.ColorAngle=0;//0 竖向 1 横向
@@ -4943,7 +4945,7 @@ this.newMethod();delete this.newMethod;this.ClassName="ChartRectangle";this.Colo
 function ChartTextLine(){this.newMethod=IChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName="ChartTextLine";this.Text;//{ Title:内容, Color:  YOffset:, }
 this.Line;//{ Type=线段类型 0=不画 1=直线 2=虚线, Color:, Width:,  LineDash:[] }
-this.Price;this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize)return;if(!this.Text||!this.Line||!IFrameSplitOperator.IsNumber(this.Price))return;this.IsHScreen=this.ChartFrame.IsHScreen===true;var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var bottom=this.ChartBorder.GetBottomEx();var top=this.ChartBorder.GetTopEx();var y=this.ChartFrame.GetYFromData(this.Price);this.Canvas.save();this.ClipClient(this.IsHScreen);var textWidth=0;if(this.Text.Title){var x=left+2*GetDevicePixelRatio();var yText=y;this.Canvas.textAlign='left';this.Canvas.textBaseline='middle';var offsetY=8*GetDevicePixelRatio();if(y-offsetY<top){this.Canvas.textBaseline='top';yText=top;}else if(y+offsetY>bottom){this.Canvas.textBaseline='bottom';yText=bottom;}this.Canvas.fillStyle=this.Text.Color;this.Canvas.font=this.Text.Font;this.Canvas.fillText(this.Text.Title,x,yText);textWidth=this.Canvas.measureText(this.Text.Title).width+4*GetDevicePixelRatio();}if(this.Line.Type>0){if(this.Line.Type==2)//虚线
+this.Price;this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize)return;if(!this.Text||!this.Line||!IFrameSplitOperator.IsNumber(this.Price))return;this.IsHScreen=this.ChartFrame.IsHScreen===true;var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var bottom=this.ChartBorder.GetBottomEx();var top=this.ChartBorder.GetTopEx();var y=this.ChartFrame.GetYFromData(this.Price);var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;this.Canvas.save();this.ClipClient(this.IsHScreen);var textWidth=0;if(this.Text.Title){var xOffset=2*GetDevicePixelRatio();if(IFrameSplitOperator.IsNumber(this.Text.XOffset))xOffset=this.Text.XOffset;if(this.Text.KLineXOffset=="KLine")xOffset+=distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;else if(this.Text.KLineXOffset=="KLineCenter")xOffset+=distanceWidth/2.0+dataWidth/2+g_JSChartResource.FrameLeftMargin;var x=left+xOffset;var yText=y;this.Canvas.textAlign='left';this.Canvas.textBaseline='middle';var offsetY=8*GetDevicePixelRatio();if(y-offsetY<top){this.Canvas.textBaseline='top';yText=top;}else if(y+offsetY>bottom){this.Canvas.textBaseline='bottom';yText=bottom;}this.Canvas.fillStyle=this.Text.Color;this.Canvas.font=this.Text.Font;this.Canvas.fillText(this.Text.Title,x,yText);textWidth=this.Canvas.measureText(this.Text.Title).width+4*GetDevicePixelRatio()+xOffset;}if(this.Line.Type>0){if(this.Line.Type==2)//虚线
 {if(IFrameSplitOperator.IsNonEmptyArray(this.Line.LineDash))this.Canvas.setLineDash(this.Line.LineDash);else this.Canvas.setLineDash([3,5]);//虚线
 }if(IFrameSplitOperator.IsNumber(this.Line.Width))this.Canvas.lineWidth=this.Line.Width;var x=left+textWidth;this.Canvas.strokeStyle=this.Line.Color;this.Canvas.beginPath();this.Canvas.moveTo(x,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));this.Canvas.stroke();}this.Canvas.restore();};this.GetMaxMin=function(){var range={Min:null,Max:null};if(IFrameSplitOperator.IsNumber(this.Price)){range.Min=this.Price;range.Max=this.Price;}return range;};}// 柱子集合  支持横屏
 function ChartMultiBar(){this.newMethod=IChartPainting;//派生
@@ -5825,7 +5827,7 @@ IFrameSplitOperator.IsNumberV2=function(){for(var _len=arguments.length,aryValue
 IFrameSplitOperator.IsPlusNumber=function(value){if(value==null)return false;if(isNaN(value))return false;return value>0;};//>=0
 IFrameSplitOperator.IsGTEZero=function(value){if(value==null)return false;if(isNaN(value))return false;return value>=0;};//是否是整形
 IFrameSplitOperator.IsInteger=function(x){return typeof x==='number'&&x%1===0;};//判断字段是否存在
-IFrameSplitOperator.IsObjectExist=function(obj){if(obj===undefined)return false;if(obj==null)return false;return true;};//是否时bool
+IFrameSplitOperator.IsObjectExist=function(obj){if(obj===undefined)return false;if(obj==null)return false;return true;};IFrameSplitOperator.IsObjectDefined=function(obj){if(obj===undefined)return false;return true;};//是否时bool
 IFrameSplitOperator.IsBool=function(value){if(value===true||value===false)return true;return false;};IFrameSplitOperator.IsString=function(value){var type=typeof value==='undefined'?'undefined':(0,_typeof3.default)(value);if(type=='string')return true;return false;};//是否是非空的数组
 IFrameSplitOperator.IsNonEmptyArray=function(ary){if(!ary)return false;if(!Array.isArray(ary))return false;return ary.length>0;};IFrameSplitOperator.IsArray=function(ary){if(!ary)return false;if(!Array.isArray(ary))return false;return true;};IFrameSplitOperator.IsFloat=function(value){if(value===undefined)return false;if(value==null)return false;if(isNaN(value))return false;return value!=parseInt(value);};//是否有效
 IFrameSplitOperator.IsVaild=function(value){if(isNaN(value))return false;if(value==null)return false;if(value===undefined)return false;return true;};IFrameSplitOperator.IsUndefined=function(value){return value===undefined;};IFrameSplitOperator.IsObject=function(value){return value instanceof Object;};IFrameSplitOperator.RemoveZero=function(strValue){while(strValue.length>0){var index=strValue.length-1;var ch=strValue[index];if(ch=="0"){strValue=strValue.substr(0,index);}else if(ch=="."){strValue=strValue.substr(0,index);break;}else{break;}}return strValue;};//移除代码市场后缀
@@ -7604,8 +7606,11 @@ IconFont2:{Family:'iconfont',Text:'\uE634',HScreenText:'\uE686',Color:'#ed7520'}
 {IconFont:{Family:'iconfont',Text:'\uE697',HScreenText:'\uE697',Color:'rgb(255,0,255)',Size:5*GetDevicePixelRatio(),Position:2,IsShowNumber:false//SVG 文本
 }},Dividend://除权
 {IconFont:{Family:'iconfont',Text:'\uE6EB',HScreenText:'\uF0CA',Color:'rgb(220,20,60)',Size:10*GetDevicePixelRatio(),Position:1,IsShowNumber:false//SVG 文本
-}},//扩展图标库
-IconLibrary:{Family:'iconfont',Icon:[{Text:'\uE630',HScreenText:'\uE689',Color:'#f39f7c'},{Text:'\uE632',HScreenText:'\uE688',Color:'#19b1b7'},{Text:'\uE62F',HScreenText:'\uE68A',Color:'#b22626'},{Text:'\uE634',HScreenText:'\uE686',Color:'#ed7520'}]},MinSize:12*GetDevicePixelRatio(),MaxSize:18*GetDevicePixelRatio()},NumIcon:{Color:'rgb(251,80,80)',Family:'iconfont',Text:['\uE649','\uE63B','\uE640','\uE63D','\uE63F','\uE645','\uE641','\uE647','\uE648','\uE646','\uE636','\uE635','\uE637','\uE638','\uE639','\uE63A','\uE63C','\uE63E','\uE642','\uE644','\uE643']},TradeIcon://交易指标 图标
+}},ExtendInfo://扩展信息
+{//默认值
+Default:{Family:'iconfont',Text:'\uE6BD',HScreenText:'\uE6BD',Color:'rgb(148,0,211)'},//自定义值
+AryIconFont:[{Family:'iconfont',Text:'\uE6C3',HScreenText:'\uE6C3',Color:'rgb(255,165,0)'},{Family:'iconfont',Text:'\uE6C5',HScreenText:'\uE6C5',Color:'rgb(0,191,255)'},{Family:'iconfont',Text:'\uE6C6',HScreenText:'\uEE6C6',Color:'rgb(	152,251,152)'}]},//公告扩展图标库信息
+AnnouncementEx:{Default:{Family:'iconfont',Text:'\uE633',HScreenText:'\uE685',Color:'#f5a521'},AryIconFont:[{Family:'iconfont',Text:'\uE630',HScreenText:'\uE689',Color:'#f39f7c'},{Family:'iconfont',Text:'\uE632',HScreenText:'\uE688',Color:'#19b1b7'},{Family:'iconfont',Text:'\uE62F',HScreenText:'\uE68A',Color:'#b22626'},{Family:'iconfont',Text:'\uE634',HScreenText:'\uE686',Color:'#ed7520'}]},MinSize:12*GetDevicePixelRatio(),MaxSize:18*GetDevicePixelRatio()},NumIcon:{Color:'rgb(251,80,80)',Family:'iconfont',Text:['\uE649','\uE63B','\uE640','\uE63D','\uE63F','\uE645','\uE641','\uE647','\uE648','\uE646','\uE636','\uE635','\uE637','\uE638','\uE639','\uE63A','\uE63C','\uE63E','\uE642','\uE644','\uE643']},TradeIcon://交易指标 图标
 {Family:'iconfont',Buy:{Color:'rgb(255,15,4)',Text:'\uE683',HScreenText:'\uE682'},Sell:{Color:'rgb(64,122,22)',Text:'\uE681',HScreenText:'\uE680'}}};this.VirtualKLine={Color:'rgb(100,100,100)',LineDash:[2,2]};this.PredictionKLine={Line:{Color:"rgb(100,100,100)",LineDash:[3,5],LineWidth:2},Bar:{UpColor:"rgb(65,105,225)",DownColor:"rgb(65,105,225)",UnchangeColor:"rgb(65,105,225s)",DrawType:3}};this.PriceGapStyple={Line:{Color:"rgb(186,186,186)"},Text:{Color:"rgb(105,105,105)",Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1'}};this.DaySummaryKLine={Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',TextColor:"rgb(105,105,105)",LeftMargin:2*GetDevicePixelRatio()//订单流配置
 };this.OrderFlow={UpColor:{BG:'rgb(223,191,180)',Border:"rgb(196,84,86)"},//阳线
 DownColor:{BG:"rgb(176,212,184)",Border:'rgb(66,94,74)'},//阴线
@@ -8694,8 +8699,10 @@ this.SetKLineInfo=function(aryInfo,bUpdate){this.ChartInfo=[];//先清空
 for(var i in aryInfo){var infoItem=JSKLineInfoMap.Get(aryInfo[i]);if(!infoItem)continue;var item=infoItem.Create();item.MaxRequestDataCount=this.MaxRequestDataCount;this.ChartInfo.push(item);}if(bUpdate==true)this.ReqeustKLineInfoData({FunctionName:"SetKLineInfo"});};//添加信息地雷
 this.AddKLineInfo=function(infoName,bUpdate){var classInfo=JSKLineInfoMap.GetClassInfo(infoName);if(!classInfo){console.warn("[KLineChartContainer::AddKLineInfo] can't find infoname=",infoName);return;}for(var i in this.ChartInfo){var item=this.ChartInfo[i];if(item.ClassName==classInfo.ClassName)//已经存在
 return;}var infoItem=JSKLineInfoMap.Get(infoName);if(!infoItem)return;var item=infoItem.Create();item.MaxRequestDataCount=this.MaxRequestDataCount;this.ChartInfo.push(item);if(bUpdate==true){item.RequestData(this);//信息地雷信息
-}};//删除信息地理
-this.DeleteKLineInfo=function(infoName){var classInfo=JSKLineInfoMap.GetClassInfo(infoName);if(!classInfo){console.warn("[KLineChartContainer::DeleteKLineInfo] can't find infoname=",infoName);return;}for(var i in this.ChartInfo){var item=this.ChartInfo[i];if(item.ClassName==classInfo.ClassName){this.ChartInfo.splice(i,1);this.UpdataChartInfo();this.Draw();break;}}};//清空所有的信息地理
+}};//更新信息地雷数据  Option :{ InsertNew:,  如果没有找到对应的地雷，是否插入新的地雷, Update:是否立即请求数据  }
+this.UpdateKLineInfo=function(infoName,option){var classInfo=JSKLineInfoMap.GetClassInfo(infoName);if(!classInfo){console.warn("[KLineChartContainer::UpdateKLineInfo] can't find infoname=",infoName);return;}var bInsertNew=false,bUpdate=false;if(option){if(IFrameSplitOperator.IsBoolean(option.InsertNew))bInsertNew=option.InsertNew;if(IFrameSplitOperator.IsBoolean(option.Update))bUpdate=option.Update;}var finder=null;for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(item.ClassName==classInfo.ClassName){finder=item;break;}}if(!finder){if(bInsertNew===true){var infoItem=JSKLineInfoMap.Get(infoName);if(!infoItem)return;var item=infoItem.Create();item.MaxRequestDataCount=this.MaxRequestDataCount;this.ChartInfo.push(item);finder=item;}else{return;}}if(bUpdate==true)finder.RequestData(this);//信息地雷信息
+};//删除信息地理
+this.DeleteKLineInfo=function(infoName){var classInfo=JSKLineInfoMap.GetClassInfo(infoName);if(!classInfo){console.warn("[KLineChartContainer::DeleteKLineInfo] can't find infoname=",infoName);return;}for(var i=0;i<this.ChartInfo.length;++i){var item=this.ChartInfo[i];if(item.ClassName==classInfo.ClassName){this.ChartInfo.splice(i,1);this.UpdataChartInfo();this.Draw();break;}}};//清空所有的信息地理
 this.ClearKLineInfo=function(){if(!this.ChartInfo||this.ChartInfo.length<=0)return;this.ChartInfo=[];var klinePaint=this.ChartPaint[0];klinePaint.InfoData=null;this.Draw();};//增加叠加股票
 this.OverlaySymbol=function(symbol,option){for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];if(item.Symbol===symbol){console.warn('[KLineChartContainer::OverlaySymbol] overlay symbol='+symbol+' exist.');return false;}}var paint=new ChartOverlayKLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-KLine";paint.DrawType=this.KLineDrawType;paint.Symbol=symbol;paint.Identify='Overlay-KLine-'+symbol;if(option&&option.Color)paint.Color=option.Color;else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];paint.SetOption(option);++g_JSChartResource.OverlaySymbol.Random;if(this.ChartPaint[0]&&this.ChartPaint[0].Data&&this.SourceData)paint.MainData=this.ChartPaint[0].Data;//绑定主图数据
 this.OverlayChartPaint.push(paint);if(ChartData.IsDayPeriod(this.Period,true))this.RequestOverlayHistoryData();//请求日线数据
@@ -10058,8 +10065,9 @@ PyScriptIndex.prototype.GetDefaultColor=function(id){var COLOR_ARRAY=["rgb(255,1
     信息地雷
 *//*
     信息地雷列表
-*/function JSKLineInfoMap(){}JSKLineInfoMap.Get=function(id){var infoMap=new _map2.default([["互动易",{Create:function Create(){return new InvestorInfo();}}],["公告",{Create:function Create(){return new AnnouncementInfo();}}],["业绩预告",{Create:function Create(){return new PforecastInfo();}}],["调研",{Create:function Create(){return new ResearchInfo();}}],["大宗交易",{Create:function Create(){return new BlockTrading();}}],["龙虎榜",{Create:function Create(){return new DragonTigerInfo();}}],["新闻",{Create:function Create(){return new NewsInfo();}}],['除权',{Create:function Create(){return new DividendInfo();}}]]);return infoMap.get(id);};JSKLineInfoMap.GetClassInfo=function(id){var infoMap=new _map2.default([["互动易",{ClassName:"InvestorInfo"}],["公告",{ClassName:"AnnouncementInfo"}],["业绩预告",{ClassName:"PforecastInfo"}],["调研",{ClassName:"ResearchInfo"}],["大宗交易",{ClassName:"BlockTrading"}],["龙虎榜",{ClassName:"DragonTigerInfo"}],["新闻",{ClassName:"NewsInfo"}],['除权',{ClassName:"DividendInfo"}]]);return infoMap.get(id);};JSKLineInfoMap.GetIconUrl=function(type){switch(type){case KLINE_INFO_TYPE.INVESTOR:return g_JSChartResource.KLine.Info.Investor.Icon;break;case KLINE_INFO_TYPE.PFORECAST:return g_JSChartResource.KLine.Info.Pforecast.Icon;case KLINE_INFO_TYPE.ANNOUNCEMENT:return g_JSChartResource.KLine.Info.Announcement.Icon;case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_1:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_2:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_3:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_4:return g_JSChartResource.KLine.Info.Announcement.IconQuarter;case KLINE_INFO_TYPE.RESEARCH:return g_JSChartResource.KLine.Info.Research.Icon;case KLINE_INFO_TYPE.BLOCKTRADING:return g_JSChartResource.KLine.Info.BlockTrading.Icon;case KLINE_INFO_TYPE.DRAGON_TIGER:return g_JSChartResource.KLine.Info.DragonTiger.Icon;case KLINE_INFO_TYPE.NEWS:return g_JSChartResource.KLine.Info.News.Icon;case KLINE_INFO_TYPE.DIVIDEND:return g_JSChartResource.KLine.Info.Dividend.Icon;default:return g_JSChartResource.KLine.Info.Announcement.Icon;}};JSKLineInfoMap.GetIconLibrary=function(index){var iconLib=g_JSChartResource.KLine.Info.IconLibrary;if(!iconLib||!iconLib.Icon)return g_JSChartResource.KLine.Info.Announcement.IconFont;if(index>=0&&index<iconLib.Icon.length){var item=iconLib.Icon[index];var obj={Text:item.Text,HScreenText:item.HScreenText,Color:item.Color,Family:iconLib.Family};return obj;}return g_JSChartResource.KLine.Info.Announcement.IconFont;};JSKLineInfoMap.GetIconFont=function(type){//公告扩展数据
-if(type>=KLINE_INFO_TYPE.ANNOUNCEMENT_EX_START&&type<=KLINE_INFO_TYPE.ANNOUNCEMENT_EX_END){var index=type-KLINE_INFO_TYPE.ANNOUNCEMENT_EX_START;return JSKLineInfoMap.GetIconLibrary(index);}switch(type){case KLINE_INFO_TYPE.INVESTOR:return g_JSChartResource.KLine.Info.Investor.IconFont;break;case KLINE_INFO_TYPE.PFORECAST:return g_JSChartResource.KLine.Info.Pforecast.IconFont;case KLINE_INFO_TYPE.ANNOUNCEMENT:return g_JSChartResource.KLine.Info.Announcement.IconFont;case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_1:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_2:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_3:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_4:return g_JSChartResource.KLine.Info.Announcement.IconFont2;case KLINE_INFO_TYPE.RESEARCH:return g_JSChartResource.KLine.Info.Research.IconFont;case KLINE_INFO_TYPE.BLOCKTRADING:return g_JSChartResource.KLine.Info.BlockTrading.IconFont;case KLINE_INFO_TYPE.DRAGON_TIGER:return g_JSChartResource.KLine.Info.DragonTiger.IconFont;case KLINE_INFO_TYPE.NEWS:return g_JSChartResource.KLine.Info.News.IconFont;case KLINE_INFO_TYPE.DIVIDEND:return g_JSChartResource.KLine.Info.Dividend.IconFont;default:return g_JSChartResource.KLine.Info.Announcement.IconFont;}};function IKLineInfo(){this.MaxRequestDataCount=1000;this.StartDate=20160101;this.Data;this.ClassName='IKLineInfo';this.Explain="IKLineInfo";this.GetToday=function(){var date=new Date();var today=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();return today;};this.GetRequestData=function(hqChart){var obj={Symbol:hqChart.Symbol,MaxRequestDataCount:hqChart.MaxRequestDataCount,//日线数据个数
+*/function JSKLineInfoMap(){}JSKLineInfoMap.Get=function(id){var infoMap=new _map2.default([["互动易",{Create:function Create(){return new InvestorInfo();}}],["公告",{Create:function Create(){return new AnnouncementInfo();}}],["业绩预告",{Create:function Create(){return new PforecastInfo();}}],["调研",{Create:function Create(){return new ResearchInfo();}}],["大宗交易",{Create:function Create(){return new BlockTrading();}}],["龙虎榜",{Create:function Create(){return new DragonTigerInfo();}}],["新闻",{Create:function Create(){return new NewsInfo();}}],['除权',{Create:function Create(){return new DividendInfo();}}],["扩展信息",{Create:function Create(){return new ExtendInfo();}}]]);return infoMap.get(id);};JSKLineInfoMap.GetClassInfo=function(id){var infoMap=new _map2.default([["互动易",{ClassName:"InvestorInfo"}],["公告",{ClassName:"AnnouncementInfo"}],["业绩预告",{ClassName:"PforecastInfo"}],["调研",{ClassName:"ResearchInfo"}],["大宗交易",{ClassName:"BlockTrading"}],["龙虎榜",{ClassName:"DragonTigerInfo"}],["新闻",{ClassName:"NewsInfo"}],['除权',{ClassName:"DividendInfo"}],["扩展信息",{ClassName:"ExtendInfo"}]]);return infoMap.get(id);};JSKLineInfoMap.GetIconUrl=function(type){switch(type){case KLINE_INFO_TYPE.INVESTOR:return g_JSChartResource.KLine.Info.Investor.Icon;break;case KLINE_INFO_TYPE.PFORECAST:return g_JSChartResource.KLine.Info.Pforecast.Icon;case KLINE_INFO_TYPE.ANNOUNCEMENT:return g_JSChartResource.KLine.Info.Announcement.Icon;case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_1:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_2:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_3:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_4:return g_JSChartResource.KLine.Info.Announcement.IconQuarter;case KLINE_INFO_TYPE.RESEARCH:return g_JSChartResource.KLine.Info.Research.Icon;case KLINE_INFO_TYPE.BLOCKTRADING:return g_JSChartResource.KLine.Info.BlockTrading.Icon;case KLINE_INFO_TYPE.DRAGON_TIGER:return g_JSChartResource.KLine.Info.DragonTiger.Icon;case KLINE_INFO_TYPE.NEWS:return g_JSChartResource.KLine.Info.News.Icon;case KLINE_INFO_TYPE.DIVIDEND:return g_JSChartResource.KLine.Info.Dividend.Icon;default:return g_JSChartResource.KLine.Info.Announcement.Icon;}};JSKLineInfoMap.GetIconFont=function(type){//公告扩展数据
+if(type>=KLINE_INFO_TYPE.ANNOUNCEMENT_EX_START&&type<=KLINE_INFO_TYPE.ANNOUNCEMENT_EX_END){var index=type-KLINE_INFO_TYPE.ANNOUNCEMENT_EX_START;var value=g_JSChartResource.KLine.Info.AnnouncementEx.Defalut;var aryData=g_JSChartResource.KLine.Info.AnnouncementEx.AryIconFont;if(IFrameSplitOperator.IsNonEmptyArray(aryData)&&aryData[index])value=aryData[index];return value;}if(type>=KLINE_INFO_TYPE.EXTEND_INFO_START&&type<=KLINE_INFO_TYPE.EXTEND_INFO_END){var index=type-KLINE_INFO_TYPE.EXTEND_INFO_START;var value=g_JSChartResource.KLine.Info.ExtendInfo.Default;var aryData=g_JSChartResource.KLine.Info.ExtendInfo.AryIconFont;if(IFrameSplitOperator.IsNonEmptyArray(aryData)&&aryData[index])value=aryData[index];return value;}switch(type){case KLINE_INFO_TYPE.INVESTOR:return g_JSChartResource.KLine.Info.Investor.IconFont;break;case KLINE_INFO_TYPE.PFORECAST:return g_JSChartResource.KLine.Info.Pforecast.IconFont;case KLINE_INFO_TYPE.ANNOUNCEMENT:return g_JSChartResource.KLine.Info.Announcement.IconFont;case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_1:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_2:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_3:case KLINE_INFO_TYPE.ANNOUNCEMENT_QUARTER_4:return g_JSChartResource.KLine.Info.Announcement.IconFont2;case KLINE_INFO_TYPE.RESEARCH:return g_JSChartResource.KLine.Info.Research.IconFont;case KLINE_INFO_TYPE.BLOCKTRADING:return g_JSChartResource.KLine.Info.BlockTrading.IconFont;case KLINE_INFO_TYPE.DRAGON_TIGER:return g_JSChartResource.KLine.Info.DragonTiger.IconFont;case KLINE_INFO_TYPE.NEWS:return g_JSChartResource.KLine.Info.News.IconFont;case KLINE_INFO_TYPE.DIVIDEND:return g_JSChartResource.KLine.Info.Dividend.IconFont;default:return g_JSChartResource.KLine.Info.Announcement.IconFont;}};function IKLineInfo(){this.MaxRequestDataCount=1000;this.StartDate=20160101;this.Data;this.ClassName='IKLineInfo';this.Explain="IKLineInfo";this.GetToday=function(){var date=new Date();var today=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();return today;};this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
+JSConsole.Chart.Warn('[IKLineInfo::RequestData] '+this.ClassName+' NetworkFilter error.');};this.GetRequestData=function(hqChart){var obj={Symbol:hqChart.Symbol,MaxRequestDataCount:hqChart.MaxRequestDataCount,//日线数据个数
 MaxRequestMinuteDayCount:hqChart.MaxRequestMinuteDayCount,//分钟数据请求的天数
 Period:hqChart.Period//周期
 };//K线数据范围
@@ -10068,8 +10076,7 @@ Explain:this.Explain,Request:this.GetRequestData(hqChart),Self:this,HQChart:hqCh
 }hqChart.NetworkFilter(obj,function(data){self.RecvData(data,param);});if(obj.PreventDefault==true)return true;//已被上层替换,不调用默认的网络请求
 return false;};this.ReadArrayText=function(infoData,recv){if(!IFrameSplitOperator.IsNonEmptyArray(recv.aryText))return;if(!infoData.ExtendData)infoData.ExtendData={};if(!Array.isArray(infoData.ExtendData.AryText))infoData.ExtendData.AryText=[];for(var i=0;i<recv.aryText.length;++i){var item=recv.aryText[i];infoData.ExtendData.AryText.push({Name:item.name,Value:item.value,Type:item.type});}};}//互动易
 function InvestorInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='InvestorInfo';this.Explain='互动易';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[InvestorInfo::RequestData] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.INVESTOR;this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//公告 支持增量更新
+this.newMethod();delete this.newMethod;this.ClassName='InvestorInfo';this.Explain='互动易';this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.INVESTOR;this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//公告 支持增量更新
 function AnnouncementInfo(){this.newMethod=IKLineInfo;//派生
 this.newMethod();delete this.newMethod;this.ClassName='AnnouncementInfo';this.Explain='公告';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};if(obj&&obj.Update===true)//更新模式 不清内存数据
 {}else{this.Data=[];}if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
@@ -10079,37 +10086,32 @@ this.UpdateData=function(aryData){if(!aryData||aryData.length<=0)return;var setK
 for(var i in this.Data){var item=this.Data[i];var strKey=item.Date+'-'+item.Time+'-'+item.InfoType+'-'+item.Title;setKeys.add(strKey);}var count=0;for(var i in aryData){var item=aryData[i];var strKey=item.Date+'-'+item.Time+'-'+item.InfoType+'-'+item.Title;if(setKeys.has(strKey))continue;this.Data.push(item);++count;}JSConsole.Chart.Log('[AnnouncementInfo::UpdateData] add new count='+count);};this.RecvError=function(http,e,param){console.warn("[AnnouncementInfo::RecvError] error, http ",e,http);//if (param.HQChart.ScriptErrorCallback) param.HQChart.ScriptErrorCallback(e);
 };}//业绩预告 2.0
 function PforecastInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='PforecastInfo';this.Explain='业绩预告';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[PforecastInfo::RequestData] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.ReportDate=item.reportDate;infoData.InfoType=KLINE_INFO_TYPE.PFORECAST;infoData.ExtendData={AryData:[],AryText:[]};for(var j=0;j<item.aryData.length;++j){var dataItem=item.aryData[j];infoData.ExtendData.AryData.push({Name:dataItem.name,Text:dataItem.text,Content:dataItem.Content});}this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//投资者关系 (调研) 2.0
+this.newMethod();delete this.newMethod;this.ClassName='PforecastInfo';this.Explain='业绩预告';this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.ReportDate=item.reportDate;infoData.InfoType=KLINE_INFO_TYPE.PFORECAST;infoData.ExtendData={AryData:[],AryText:[]};for(var j=0;j<item.aryData.length;++j){var dataItem=item.aryData[j];infoData.ExtendData.AryData.push({Name:dataItem.name,Text:dataItem.text,Content:dataItem.Content});}this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//投资者关系 (调研) 2.0
 function ResearchInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='ResearchInfo';this.Explain='调研';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[ResearchInfo::RequestData] NetworkFilter error.");return true;};this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.RESEARCH;infoData.ExtendData={Researcher:item.researcher,//调研人员 
+this.newMethod();delete this.newMethod;this.ClassName='ResearchInfo';this.Explain='调研';this.RecvData=function(recvData,param){if(!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.RESEARCH;infoData.ExtendData={Researcher:item.researcher,//调研人员 
 Place:item.place,//地点
 Count:item.count,//机构个数
 Receptionist:item.receptionist,//接待人会员
 Date:item.startDate,//调研日期
 AryText:[]};this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//大宗交易 2.0
 function BlockTrading(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='BlockTrading';this.Explain='大宗交易';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[ResearchInfo::BlockTrading] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.BLOCKTRADING;infoData.ExtendData={Price:item.price,//交易价格
+this.newMethod();delete this.newMethod;this.ClassName='BlockTrading';this.Explain='大宗交易';this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.BLOCKTRADING;infoData.ExtendData={Price:item.price,//交易价格
 Premium:item.premium,//溢价 （百分比%)
 Vol:item.vol,//交易金额单位（万元)
 ClosePrice:item.close//收盘价
 };this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//龙虎榜 2.0
 function DragonTigerInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='DragonTigerInfo';this.Explain='龙虎榜';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[DragonTigerInfo::RequestData] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.DRAGON_TIGER;infoData.ExtendData={BuyAmount:item.buyAmount,//机构买入总额
+this.newMethod();delete this.newMethod;this.ClassName='DragonTigerInfo';this.Explain='龙虎榜';this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=item.title;infoData.InfoType=KLINE_INFO_TYPE.DRAGON_TIGER;infoData.ExtendData={BuyAmount:item.buyAmount,//机构买入总额
 SellAmount:item.sellAmount,//机构卖出总额
 NetBuyAmount:item.netBuyAmount,//机构买入净额
 NetBuyRatio:item.netBuyRatio,//净买额占总成交比
 Amount:item.amount//市场总成交额
 };this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//新闻 2.0
 function NewsInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='NewsInfo';this.Explain='新闻';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[NewsInfo::RequestData] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.NEWS;infoData.Title=item.title;infoData.ExtendData={Type:item.type,url:item.url};this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//除权 2.0
+this.newMethod();delete this.newMethod;this.ClassName='NewsInfo';this.Explain='新闻';this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.NEWS;infoData.Title=item.title;infoData.ExtendData={Type:item.type,url:item.url};this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//除权 2.0
 function DividendInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='DividendInfo';this.Explain='除权';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
-JSConsole.Chart.Warn("[DividendInfo::RequestData] NetworkFilter error.");};this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.DIVIDEND;infoData.Title=item.title;infoData.ExtendData={Type:item.type,url:item.url};this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}function JSMinuteInfoMap(){}JSMinuteInfoMap.InfoMap=new _map2.default([["大盘异动",{Create:function Create(){return new MarketEventInfo();}}]]);JSMinuteInfoMap.Get=function(id){return JSMinuteInfoMap.InfoMap.get(id);};function IMinuteInfo(){this.Data;this.ClassName='IMinuteInfo';}//////////////////////////////////////////////////////////////////////
+this.newMethod();delete this.newMethod;this.ClassName='DividendInfo';this.Explain='除权';this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.DIVIDEND;infoData.Title=item.title;infoData.ExtendData={Type:item.type,url:item.url};this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}function ExtendInfo(){this.newMethod=IKLineInfo;//派生
+this.newMethod();delete this.newMethod;this.ClassName='ExtendInfo';this.Explain='扩展信息';this.RecvData=function(recvData,param){if(!recvData||!IFrameSplitOperator.IsNonEmptyArray(recvData.list))return;for(var i=0;i<recvData.list.length;++i){var item=recvData.list[i];var infoType=KLINE_INFO_TYPE.EXTEND_INFO_START;if(IFrameSplitOperator.IsNumber(item.infoType)){infoType=KLINE_INFO_TYPE.EXTEND_INFO_START+item.infoType;if(infoType>KLINE_INFO_TYPE.EXTEND_INFO_END)infoType=KLINE_INFO_TYPE.EXTEND_INFO_END;}var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.date;infoData.InfoType=infoType;infoData.Title=item.title;infoData.ExtendData={Type:item.type,Data:item.data};this.ReadArrayText(infoData,item);this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}function JSMinuteInfoMap(){}JSMinuteInfoMap.InfoMap=new _map2.default([["大盘异动",{Create:function Create(){return new MarketEventInfo();}}]]);JSMinuteInfoMap.Get=function(id){return JSMinuteInfoMap.InfoMap.get(id);};function IMinuteInfo(){this.Data;this.ClassName='IMinuteInfo';}//////////////////////////////////////////////////////////////////////
 //  大盘异动
 // 结构 {Date:日期 Time:时间, Title:标题, Type:0 }
 ////////////////////////////////////////////////////////////////////
@@ -12926,7 +12928,7 @@ var SCRIPT_CHART_NAME={OVERLAY_BARS:"OVERLAY_BARS",//叠加柱子图
 KLINE_TABLE:"KLINE_TABLE",SCATTER_PLOT:"SCATTER_PLOT",//散点图
 SCATTER_PLOT_V2:"SCATTER_PLOT_V2",//散点图V2
 CLIP_COLOR_STICK:"CLIP_COLOR_STICK",//上下柱子 裁剪
-DRAW_KLINE:"DRAWKLINE",BASELINE_BAR:"BASELINE_BAR"// 外部对接API指标数据及图形
+DRAW_KLINE:"DRAWKLINE",BASELINE_BAR:"BASELINE_BAR",DRAW_CHANNEL:"DRAWCHANNEL"// 外部对接API指标数据及图形
 };function ScriptIndexChartFactory(){this.DataMap=new _map2.default();//["图形名字", {} ]
 this.Add=function(name,option){this.DataMap.set(name,{MinuteFittingCallback:option.MinuteFittingCallback,KLineFittingCallback:option.KLineFittingCallback,CreateChartCallback:option.CreateChartCallback,FormatTitleCallback:option.FormatTitleCallback});};this.Get=function(name){if(!this.DataMap.has(name))return null;return this.DataMap.get(name);};this.Has=function(name){return this.DataMap.has(name);};}var g_ScriptIndexChartFactory=new ScriptIndexChartFactory();//脚本指标
 //name=指标名字 args=参数名字 参数值
@@ -13061,7 +13063,7 @@ this.SetChartIndexName(chartText);hqChart.ChartPaint.push(chartText);};this.Crea
 chart.Family=varItem.Draw.Icon.Family;chart.TextFont=g_JSChartResource.TIPICON.TextFont;var svgSize=g_JSChartResource.TIPICON.Size;var svgColor=g_JSChartResource.TIPICON.Color;var svgYOffset=0;var svgVAlign=2;//上下对齐方式
 if(IFrameSplitOperator.IsNumber(varItem.YOffset))svgYOffset=varItem.YOffset;if(varItem.Color)svgColor=this.GetColor(varItem.Color);if(varItem.DrawFontSize>0)svgSize=varItem.DrawFontSize;if(varItem.DrawVAlign>=0)svgVAlign=varItem.DrawVAlign;if(varItem.Draw&&IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.DrawData)&&varItem.Draw.Icon){var drawData=varItem.Draw.DrawData;var aryData=[];var isArrayTip=Array.isArray(varItem.Draw.Text);var singleTip=null;if(!isArrayTip&&varItem.Draw.Text)singleTip={Text:varItem.Draw.Text};for(var j=0;j<drawData.length;++j){var item=drawData[j];var kItem=chart.Data.Data[j];if(!IFrameSplitOperator.IsNumber(item))continue;var svgItem={Value:item,Date:kItem.Date,Time:kItem.Time,SVG:{Symbol:varItem.Draw.Icon.Symbol,Size:svgSize,Color:svgColor,YOffset:svgYOffset,VAlign:svgVAlign}};if(isArrayTip){var text=varItem.Draw.Text[j];if(text)svgItem.Tooltip={Text:text};}else{svgItem.Tooltip=singleTip;}aryData.push(svgItem);}chart.Texts=aryData;}chart.BuildCacheData();hqChart.ChartPaint.push(chart);};this.CreateDrawLastBarText=function(hqChart,windowIndex,varItem,id){var chart=new ChartDrawLastBarText();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(hqChart.ChartPaint[0].IsMinuteFrame())chart.Data=hqChart.SourceData;else chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
 var lastItem=varItem.Draw.DrawData;if(lastItem){if(lastItem.Color)lastItem.Color=this.GetColor(lastItem.Color);else lastItem.Color=this.GetDefaultColor(id);if(varItem.Color)lastItem.Color=this.GetColor(varItem.Color);if(varItem.DrawVAlign>=0){if(varItem.DrawVAlign==0)lastItem.TextBaseline='top';else if(varItem.DrawVAlign==1)lastItem.TextBaseline='middle';else if(varItem.DrawVAlign==2)lastItem.TextBaseline='bottom';}if(varItem.DrawAlign>=0){if(varItem.DrawAlign==0)lastItem.TextAlign="left";else if(varItem.DrawAlign==1)lastItem.TextAlign="center";else if(varItem.DrawAlign==2)lastItem.TextAlign='right';}if(IFrameSplitOperator.IsNumber(varItem.YOffset))lastItem.YOffset=varItem.YOffset;if(IFrameSplitOperator.IsNumber(varItem.XOffset))lastItem.XOffset=varItem.XOffset;if(varItem.DrawFontSize>0)lastItem.FontSize=varItem.DrawFontSize;}chart.LastBarItem=lastItem;hqChart.ChartPaint.push(chart);};//创建通道
-this.CreateChannel=function(hqChart,windowIndex,varItem,id){var chart=new ChartChannel();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Draw.AreaColor)chart.AreaColor=varItem.Draw.AreaColor;else if(varItem.Color)chart.AreaColor=this.GetColor(varItem.Color);else chart.AreaColor=this.GetDefaultColor(id);if(varItem.Draw.Border.Color)chart.LineColor=varItem.Draw.Border.Color;else chart.LineColor=null;if(varItem.Draw.Border.Dotted)chart.LineDotted=varItem.Draw.Border.Dotted;if(varItem.Draw.Border.Width>0)chart.LineWidth=varItem.Draw.Border.Width;//let titleIndex=windowIndex+1;
+this.CreateChannel=function(hqChart,windowIndex,varItem,id){var chart=new ChartChannel();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Draw.Config){var item=varItem.Draw.Config;if(IFrameSplitOperator.IsObjectDefined(item.AreaColor))chart.AreaColor=item.AreaColor;if(IFrameSplitOperator.IsObjectDefined(item.LineColor))chart.LineColor=item.LineColor;if(IFrameSplitOperator.IsObjectDefined(item.LineDotted))chart.LineDotted=item.LineDotted;if(IFrameSplitOperator.IsNumber(item.LineWidth))chart.LineWidth=item.LineWidth;}else{if(varItem.Draw.AreaColor)chart.AreaColor=varItem.Draw.AreaColor;else if(varItem.Color)chart.AreaColor=this.GetColor(varItem.Color);else chart.AreaColor=this.GetDefaultColor(id);if(varItem.Draw.Border){if(varItem.Draw.Border.Color)chart.LineColor=varItem.Draw.Border.Color;else chart.LineColor=null;if(varItem.Draw.Border.Dotted)chart.LineDotted=varItem.Draw.Border.Dotted;if(varItem.Draw.Border.Width>0)chart.LineWidth=varItem.Draw.Border.Width;}}//let titleIndex=windowIndex+1;
 chart.Data.Data=varItem.Draw.DrawData;hqChart.ChartPaint.push(chart);};this.CreatePartLine=function(hqChart,windowIndex,varItem,i){var chart=new ChartPartLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(IFrameSplitOperator.IsPlusNumber(width))chart.LineWidth=width;}if(IFrameSplitOperator.IsBool(varItem.IsDotLine))chart.IsDotLine=varItem.IsDotLine;if(IFrameSplitOperator.IsNonEmptyArray(varItem.LineDash))chart.LineDash=varItem.LineDash;chart.Data.Data=varItem.Draw.DrawData;this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateMultiLine=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiLine();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.ChartPaint[0].Data;//绑定K线
 chart.Lines=varItem.Draw.DrawData;if(varItem.Draw.Name)chart.Name=varItem.Draw.Name;if(varItem.Draw.LineDash)chart.LineDash=varItem.Draw.LineDash;if(IFrameSplitOperator.IsNumber(varItem.Draw.LineWidth))chart.LineWidth=varItem.Draw.LineWidth;if(IFrameSplitOperator.IsBool(varItem.Draw.IsFullRangeMaxMin))chart.IsFullRangeMaxMin=varItem.Draw.IsFullRangeMaxMin;if(varItem.Draw.Arrow)//箭头配置
 {var item=varItem.Draw.Arrow;if(item.Start==true)chart.Arrow.Start=true;if(item.End==true)chart.Arrow.End=true;if(IFrameSplitOperator.IsNumber(item.Angle))chart.ArrawAngle=item.Angle;if(IFrameSplitOperator.IsNumber(item.Length))chart.ArrawLength=item.Length;if(IFrameSplitOperator.IsNumber(item.LineWidth))chart.ArrawLineWidth=item.LineWidth;}this.ReloadChartResource(hqChart,windowIndex,chart);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="ChartMultiLine";titleData.Lines=chart.Lines;hqChart.TitlePaint[titleIndex].Data[i]=titleData;}};this.CreateMultiPoint=function(hqChart,windowIndex,varItem,i){var chart=new ChartMultiPoint();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线
@@ -13283,7 +13285,7 @@ outVarItem.Draw=drawItem;if(draw.Font)outVarItem.Font=draw.Font;result.push(outV
 outVarItem.Draw=drawItem;if(draw.Font)outVarItem.Font=draw.Font;result.push(outVarItem);}else if(draw.DrawType=="DRAW_SIMPLE_TABLE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;//{ TableData:[ [ {AryCell:[{Text:, Color: }]}, ], ], BGColor:， TextFont:{ Size:, Name: } };
 outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAW_SIMPLE_PIE"||draw.DrawType=="DRAW_SIMPLE_DOUGHNUT"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;//{ Data:[ {Value, Color, Text: }, ], BorderColor:， TextFont:{ Size:, Name: } };
 outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAW_SIMPLE_RADAR"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;//{ AryIndex:[ ], Data:[] };
-outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.DRAW_KLINE){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else{var find=g_ScriptIndexChartFactory.Get(draw.DrawType);//外部挂接
+outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.DRAW_KLINE){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.DRAW_CHANNEL){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else{var find=g_ScriptIndexChartFactory.Get(draw.DrawType);//外部挂接
 if(find&&find.KLineFittingCallback){if(find.KLineFittingCallback(item,outVarItem,{Date:date,Time:time,HQChart:hqChart},this))result.push(outVarItem);}}}}return result;};// h, high, low l. c, close
 this.GetKLineData=function(data,hqChart){if(!data)return;if(!Array.isArray(data))return;if(this.HQDataType==HQ_DATA_TYPE.MINUTE_ID||this.HQDataType==HQ_DATA_TYPE.MULTIDAY_MINUTE_ID)var kData=hqChart.SourceData;//走势图分钟数据
 else var kData=hqChart.ChartPaint[0].Data;//K线
@@ -13482,7 +13484,10 @@ IconFont2:{Family:'iconfont',Text:'\uE634',HScreenText:'\uE686',Color:'#ed7520'/
 {IconFont:{Family:'iconfont',Text:'\uE697',HScreenText:'\uE697',Color:'rgb(255,0,255)',Size:5*GetDevicePixelRatio(),Position:2,IsShowNumber:false//SVG 文本
 }},Dividend://除权
 {IconFont:{Family:'iconfont',Text:'\uE6EB',HScreenText:'\uF0CA',Color:'rgb(220,20,60)',Size:10*GetDevicePixelRatio(),Position:1,IsShowNumber:false//SVG 文本
-}},MinSize:12*GetDevicePixelRatio(),MaxSize:18*GetDevicePixelRatio()},NumIcon:{Color:'rgb(251,80,80)',Family:'iconfont',Text:['\uE649','\uE63B','\uE640','\uE63D','\uE63F','\uE645','\uE641','\uE647','\uE648','\uE646','\uE636','\uE635','\uE637','\uE638','\uE639','\uE63A','\uE63C','\uE63E','\uE642','\uE644','\uE643']},TradeIcon://交易指标 图标
+}},ExtendInfo://扩展信息
+{//默认值
+Default:{Family:'iconfont',Text:'\uE6BD',HScreenText:'\uE6BD',Color:'rgb(148,0,211)'},//自定义值
+AryIconFont:[{Family:'iconfont',Text:'\uE6C3',HScreenText:'\uE6C3',Color:'rgb(255,215,0)'},{Family:'iconfont',Text:'\uE6C5',HScreenText:'\uE6C5',Color:'rgb(0,191,255)'},{Family:'iconfont',Text:'\uE6C6',HScreenText:'\uEE6C6',Color:'rgb(	152,251,152)'}]},AnnouncementEx:{Default:{Family:'iconfont',Text:'\uE633',HScreenText:'\uE685',Color:'#f5a521'},AryIconFont:[{Family:'iconfont',Text:'\uE630',HScreenText:'\uE689',Color:'#f39f7c'},{Family:'iconfont',Text:'\uE632',HScreenText:'\uE688',Color:'#19b1b7'},{Family:'iconfont',Text:'\uE62F',HScreenText:'\uE68A',Color:'#b22626'},{Family:'iconfont',Text:'\uE634',HScreenText:'\uE686',Color:'#ed7520'}]},MinSize:12*GetDevicePixelRatio(),MaxSize:18*GetDevicePixelRatio()},NumIcon:{Color:'rgb(251,80,80)',Family:'iconfont',Text:['\uE649','\uE63B','\uE640','\uE63D','\uE63F','\uE645','\uE641','\uE647','\uE648','\uE646','\uE636','\uE635','\uE637','\uE638','\uE639','\uE63A','\uE63C','\uE63E','\uE642','\uE644','\uE643']},TradeIcon://交易指标 图标
 {Family:'iconfont',Buy:{Color:'rgb(255,15,4)',Text:'\uE683',HScreenText:'\uE682'},Sell:{Color:'rgb(64,122,22)',Text:'\uE681',HScreenText:'\uE680'}}},VirtualKLine:{Color:'rgb(119,136,153)',LineDash:[2,2]},PredictionKLine:{Line:{Color:"rgb(220,220,220)",LineDash:[3*GetDevicePixelRatio(),3*GetDevicePixelRatio()]},Bar:{UpColor:"rgb(30,144,255)",DownColor:"rgb(30,144,255)",UnchangeColor:"rgb(30,144,255)",DrawType:3}},PriceGapStyple:{Line:{Color:"rgb(128,128,128)"},Text:{Color:"rgb(219,220,220)",Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1'}},DaySummaryKLine:{//Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
 TextColor:"rgb(255,165,0)"},//指标锁
 IndexLock:{BGColor:"rgb(105,105,105)",TextColor:"rgb(255,0,0)"},Index:{LineColor://指标线段颜色
@@ -16308,7 +16313,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.15653";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.15664";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.15654",
+  "version": "1.1.15665",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {