hqchart 1.1.14050 → 1.1.14056

package/lib/umychart.vue.js

@@ -1923,7 +1923,7 @@ var width=format.Width;this.Tooltip.style.width=width+"px";this.Tooltip.style.he
 //if (toolTip.ChartPaint.Name=="Overlay-KLine")  this.Tooltip.style.height =220+"px";
 this.Tooltip.style.position="absolute";//JSConsole.Chart.Log('[JSChartContainer::ShowTooltip] getBoundingClientRect() ',this.UIElement.getBoundingClientRect())
 if(left+width>this.UIElement.getBoundingClientRect().width)this.Tooltip.style.left=left-width+"px";else this.Tooltip.style.left=left+"px";if(top+xMove+textHeight>this.UIElement.getBoundingClientRect().height-5)this.Tooltip.style.top=top-textHeight+"px";else this.Tooltip.style.top=top+xMove+"px";this.Tooltip.className='jschart-tooltip';this.Tooltip.innerHTML=format.Text;this.Tooltip.style.display="block";this.TooltipCache.IsShow=true;this.TooltipCache.Data={Date:toolTip.Data.Date,Time:toolTip.Data.Time};this.TooltipCache.InnerHTML=format.Text;}else if(toolTip.Type===1)//信息地雷提示信息
-{var scrollPos=GetScrollPosition();var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('KLineInfoDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-klineinfo-tooltip';this.Tooltip.style.position="absolute";if(left+width>this.UIElement.getBoundingClientRect().width){this.Tooltip.style.left=left-width+"px";}else{this.Tooltip.style.left=left+"px";}this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;this.Tooltip.style.display="block";}else if(toolTip.Type==2)//指标信息
+{if(this.FloatTooltip){this.DrawFloatTooltip({X:x,Y:y,YMove:20/pixelTatio},toolTip);bHideFloatToolip=false;return;}var scrollPos=GetScrollPosition();var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('KLineInfoDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-klineinfo-tooltip';this.Tooltip.style.position="absolute";if(left+width>this.UIElement.getBoundingClientRect().width){this.Tooltip.style.left=left-width+"px";}else{this.Tooltip.style.left=left+"px";}this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;this.Tooltip.style.display="block";}else if(toolTip.Type==2)//指标信息
 {var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('KLineTradeDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-klinetrade-tooltip';this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;;this.Tooltip.style.display="block";}else if(toolTip.Type==3)//分时图异动信息
 {var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('MinuteInfoDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-minuteinfo-tooltip';//分时图异动
 this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;;this.Tooltip.style.display="block";}else if(toolTip.Type==4)//icon图标信息
@@ -2438,7 +2438,7 @@ if(!IFrameSplitOperator.IsNonEmptyArray(item.AreaData.Value)||item.AreaData.Valu
 {rtBG.Width=this.YRightTextInfo.MainTextWidth-1;rtBG.Right=rtBG.Left+rtBG.Width;}else{rtBG.Right=border.ChartWidth;rtBG.Width=rtBG.Right-rtBG.Left;}if(IFrameSplitOperator.IsNonEmptyArray(item.AreaData.Width))//指定宽度
 {var bgWidth=item.AreaData.Width[1];if(IFrameSplitOperator.IsNumber(bgWidth)){if(rtBG.Width>bgWidth){rtBG.Width=bgWidth;rtBG.Right=rtBG.Left+rtBG.Width;}}}this.Canvas.fillStyle=item.AreaData.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.DrawCustomAreaText(rtBG,item,1);}};this.DrawCustomAreaText=function(rtBG,item,position)//position 0=左 1=右
 {if(item.Font!=null)this.Canvas.font=item.Font;var fontHeight=this.GetFontHeight();if(rtBG.Height<fontHeight)return;var pixelTatio=GetDevicePixelRatio();var text,xText;if(position==0){if(!item.Message[0])return;this.Canvas.textAlign="right";text=item.Message[0];xText=rtBG.Right-2*pixelTatio;}else if(position==1){if(!item.Message[1])return;this.Canvas.textAlign="left";text=item.Message[1];xText=rtBG.Left+2*pixelTatio;}var yText=rtBG.Top+rtBG.Height/2;this.Canvas.textBaseline="middle";this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(text,xText,yText);};this.SendDrawCountDownEvent=function(sendData){if(!this.GetEventCallback)return false;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_COUNTDOWN);if(!event||!event.Callback)return false;event.Callback(event,sendData,this);return true;};this.DrawDotLine=function(left,right,y,color,option){var pixelTatio=GetDevicePixelRatio();this.Canvas.save();this.Canvas.strokeStyle=color;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth))this.Canvas.lineWidth=option.LineWidth*pixelTatio;if(option.LineDash)this.Canvas.setLineDash(option.LineDash);else this.Canvas.setLineDash([5*pixelTatio,5*pixelTatio]);//虚线
-this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();this.Canvas.restore();};this.DrawLine=function(left,right,y,color,lineType,option){if(lineType==-1)return;if(lineType==0){var pixelRatio=GetDevicePixelRatio();this.Canvas.strokeStyle=color;var bChangeLineWidth=false;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth)){this.Canvas.lineWidth=option.LineWidth*pixelRatio;bChangeLineWidth=true;}this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();if(bChangeLineWidth){this.Canvas.lineWidth=pixelRatio;}}else if(lineType==2)//绘制短线
+this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();this.Canvas.restore();};this.DrawLine=function(left,right,y,color,lineType,option){if(lineType==-1)return;if(lineType==0){var pixelRatio=GetDevicePixelRatio();this.Canvas.strokeStyle=color;var bChangeLineWidth=false;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth)){this.Canvas.lineWidth=option.LineWidth*pixelRatio;bChangeLineWidth=true;}this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();if(bChangeLineWidth){this.Canvas.lineWidth=pixelRatio;}}else if(lineType==3)//绘制短线
 {var lineWidth=10*GetDevicePixelRatio();this.Canvas.strokeStyle=color;this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),left+lineWidth);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(left+lineWidth,ToFixedPoint(y));}this.Canvas.stroke();}else{this.DrawDotLine(left,right,y,color,option);}};this.DrawHScreenText=function(center,data){this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=data.Color;this.Canvas.save();this.Canvas.translate(center.X,center.Y);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(data.Text,data.XOffset,data.YOffset);this.Canvas.restore();};this.RGBToStruct=function(rgb){if(/^(rgb|RGB)/.test(rgb)){var aColor=rgb.replace(/(?:\(|\)|rgb|RGB)*/g,"").split(",");var result={};if(aColor.length!=3)return null;result.R=Number(aColor[0]);result.G=Number(aColor[1]);result.B=Number(aColor[2]);return result;}return null;};this.GetMulitTextMaxWidth=function(aryData){var width=null;for(var i=0;i<aryData.length;++i){var item=aryData[i];var text=item.Text;if(!text)continue;var value=this.Canvas.measureText(text).width;if(width==null)width=value;else if(width<value)width=value;}return width;};this.GetScaleTextWidth=function(){var border=this.ChartBorder.GetBorder();var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 if(this.IsHScreen){var borderTop=this.ChartBorder.Top;var borderBottom=this.ChartBorder.Bottom;var isDrawLeft=borderTop>10*pixelTatio&&this.IsShowYText[0]===true&&this.YTextPosition[0]!=2;var isDrawRight=borderBottom>10*pixelTatio&&this.IsShowYText[1]===true&&this.YTextPosition[1]!=2;}else{var borderRight=this.ChartBorder.Right;var borderLeft=this.ChartBorder.Left;var isDrawLeft=borderLeft>10&&this.IsShowYText[0]===true&&this.YTextPosition[0]!=2;var isDrawRight=borderRight>10&&this.IsShowYText[1]===true&&this.YTextPosition[1]!=2;}if(!isDrawRight&&!isDrawLeft)return null;var width={Left:null,Right:null};var rightExtendWidth=0;var isYPercentage=false;//是否是百分比坐标
 if(this.YSplitOperator&&this.YSplitOperator.CoordinateType==1)isYPercentage=true;var leftExtendLineWidth=0;var rightExtendLineWidth=0;if(IFrameSplitOperator.IsNonEmptyArray(this.YLineExtend)){if(this.YLineExtend[0]&&this.YLineExtend[0].Width>1)leftExtendLineWidth=this.YLineExtend[0].Width;if(this.YLineExtend[1]&&this.YLineExtend[1].Width>1)rightExtendLineWidth=this.YLineExtend[1].Width;}for(var i=0;i<this.HorizontalInfo.length;++i){var textWidth=null;var item=this.HorizontalInfo[i];if(!item)continue;if(item.Font!=null)this.Canvas.font=item.Font;if(item.Message[0]!=null&&isDrawLeft){if(Array.isArray(item.Message[0])){textWidth=this.GetMulitTextMaxWidth(item.Message[0]);}else{textWidth=this.Canvas.measureText(item.Message[0]).width;}if(width.Left==null||width.Left<textWidth)width.Left=textWidth;//JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
@@ -13931,7 +13931,8 @@ this.FormatPosition=function(position,TitleID){//持仓
 var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--.--',Color:this.PositionColor};if(!IFrameSplitOperator.IsNumber(position))return item;item.Text=position.toFixed(0);return item;};//结算价
 this.ForamtFClose=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--.--',Color:this.DateTimeColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=value.toFixed(defaultfloatPrecision);return item;};}//浮动K线提示信息
 function JSFloatTooltip(){this.DivDialog=null;this.Style=0;//0=一行一个， 1=2行一个
-this.HQChart=null;this.MaxRowCount=20;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.BGColor=g_JSChartResource.FloatTooltip.BGColor;this.BorderColor=g_JSChartResource.FloatTooltip.BorderColor;this.TextColor=g_JSChartResource.FloatTooltip.TextColor;this.ValueColor=g_JSChartResource.FloatTooltip.ValueColor;this.VolColor=g_JSChartResource.FloatTooltip.VolColor;this.AmountColor=g_JSChartResource.FloatTooltip.AmountColor;this.TurnoverRateColor=g_JSChartResource.FloatTooltip.TurnoverRateColor;this.PositionColor=g_JSChartResource.FloatTooltip.PositionColor;this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.AryData=[];//输出文字信息
+this.HQChart=null;this.MaxRowCount=25;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.BGColor=g_JSChartResource.FloatTooltip.BGColor;this.BorderColor=g_JSChartResource.FloatTooltip.BorderColor;this.TextColor=g_JSChartResource.FloatTooltip.TextColor;this.ValueColor=g_JSChartResource.FloatTooltip.ValueColor;this.VolColor=g_JSChartResource.FloatTooltip.VolColor;this.AmountColor=g_JSChartResource.FloatTooltip.AmountColor;this.TurnoverRateColor=g_JSChartResource.FloatTooltip.TurnoverRateColor;this.PositionColor=g_JSChartResource.FloatTooltip.PositionColor;this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.ValueAlign={Left:"UMyChart_Tooltip_Float_Text2_Span",//左对齐
+MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',Right:"UMyChart_Tooltip_Float_Text_Span"};this.AryData=[];//输出文字信息
 this.AryText=[];//表格tr
 this.KItemCache=null;//{ Symbol:, Item:, Name }
 this.KItemCacheID=null;this.Inital=function(hqchart,option){this.HQChart=hqchart;if(option){if(IFrameSplitOperator.IsNumber(option.Style))this.Style=option.Style;}};this.Destroy=function(){this.AryData=[];this.AryText=[];this.KItemCache=null;this.KItemCacheID=null;if(this.DivDialog){document.body.removeChild(this.DivDialog);this.DivDialog=null;}};this.Show=function(x,y){if(!this.DivDialog)return;if(!this.HQChart)return;var rtClient=this.HQChart.UIElement.getBoundingClientRect();var left=x+rtClient.left,top=y+rtClient.top;var right=left+this.DivDialog.offsetWidth;var bottom=top+this.DivDialog.offsetHeight;if(right+5>=window.innerWidth)left=left-this.DivDialog.offsetWidth;if(bottom+5>=window.innerHeight)top=0;this.DivDialog.style.top=top+"px";this.DivDialog.style.left=left+"px";if(this.DivDialog.style.visibility!='visible')this.DivDialog.style.visibility='visible';};this.Hide=function(){if(!this.DivDialog)return;this.KItemCache=null;this.KItemCacheID=null;if(this.DivDialog.style.visibility!='hidden')this.DivDialog.style.visibility='hidden';};this.Create=function(){var divDom=document.createElement("div");divDom.className='UMyChart_Tooltip_Float_Div';var table=document.createElement("table");table.className="UMyChart_Tooltip_Float_Table";divDom.appendChild(table);var tbody=document.createElement("tbody");tbody.className="UMyChart_Tooltip_Float_Tbody";table.appendChild(tbody);this.AryData=[];for(var i=0;i<this.MaxRowCount;++i){var rowItem={Tr:null,TitleSpan:null,TextSpan:null,TitleTd:null,TextTd:null};var trDom=document.createElement("tr");trDom.className='UMyChart_Tooltip_Float_Group_Tr';tbody.appendChild(trDom);rowItem.Tr=trDom;var tdDom=document.createElement("td");tdDom.className="UMyChart_Tooltip_Float_Title_Td";//标题
@@ -13939,17 +13940,33 @@ trDom.appendChild(tdDom);rowItem.TitleTd=tdDom;var spanDom=document.createElemen
 trDom.appendChild(tdDom);rowItem.TextTd=tdDom;var spanDom=document.createElement("span");spanDom.className='UMyChart_Tooltip_Float_Text_Span';spanDom.innerText='数值';tdDom.appendChild(spanDom);rowItem.TextSpan=spanDom;this.AryData.push(rowItem);}document.body.appendChild(divDom);this.DivDialog=divDom;this.UpdateStyle();};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};//data={ Symbol, Date, Time} 是否是同一条K线
 this.IsEqualHQID=function(data){if(!this.KItemCache)return false;if(!data)return false;if(!this.KItemCache.Item)return false;var kItem=this.KItemCache.Item;if(this.KItemCache.Symbol!=data.Symbol)return false;if(kItem.Date!=data.Date)return false;if(IFrameSplitOperator.IsNumber(kItem.Time)){if(kItem.Time!=data.Time)return false;}return true;};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;//this.UpdateTableDOM();
 };//更新数据
-this.Update=function(data){if(!this.DivDialog)return;this.LanguageID=this.HQChart.LanguageID;if(data.DataType==1){var tooltipData=data.Tooltip;if(!tooltipData)return;if(tooltipData.Type==0){this.UpdateKLineToolitp(data);}}else if(data.DataType==2)//更新实时行情数据
+this.Update=function(data){if(!this.DivDialog)return;this.LanguageID=this.HQChart.LanguageID;if(data.DataType==1){var tooltipData=data.Tooltip;if(!tooltipData)return;if(tooltipData.Type==0)//K线信息
+{this.UpdateKLineToolitp(data);}else if(tooltipData.Type==1)//信息地雷
+{this.UpdateKLineInfoTooltip(data);}}else if(data.DataType==2)//更新实时行情数据
 {this.UpdateRealtimeHQTooltip(data);}};this.UpdateRealtimeHQTooltip=function(data){if(!this.KItemCache)return;var kItem={Symbol:data.Symbol,Name:this.KItemCache.Name,Item:data.Data,IsOverlay:this.KItemCache.IsOverlay};var strKItem=(0,_stringify2.default)(kItem);var bUpdata=false;if(this.KItemCacheID!=strKItem)//数据变动的才更新
-{this.KItemCache=kItem;this.KItemCacheID=strKItem;bUpdata=true;}if(bUpdata){this.UpdateTableDOM();}};this.UpdateKLineToolitp=function(data){var tooltipData=data.Tooltip;var symbol=data.Symbol;var name=data.Name;var bOverlay=false;//是否是叠加指标
+{this.KItemCache=kItem;this.KItemCacheID=strKItem;this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);bUpdata=true;}if(bUpdata){this.UpdateTableDOM();}};//K线提示信息
+this.UpdateKLineToolitp=function(data){var tooltipData=data.Tooltip;var symbol=data.Symbol;var name=data.Name;var bOverlay=false;//是否是叠加指标
 if(tooltipData.ChartPaint.Name=="Overlay-KLine"){symbol=tooltipData.ChartPaint.Symbol;name=tooltipData.ChartPaint.Title;bOverlay=true;}var kItem={Symbol:symbol,Name:name,Item:CloneData(tooltipData.Data),IsOverlay:bOverlay};var strKItem=(0,_stringify2.default)(kItem);var bUpdata=false;if(this.KItemCacheID!=strKItem)//数据变动的才更新
-{this.KItemCache=kItem;this.KItemCacheID=strKItem;bUpdata=true;}if(bUpdata){this.UpdateTableDOM();}if(data.Point){var x=data.Point.X;var y=data.Point.Y+data.Point.YMove;this.Show(x,y);}};this.UpdateTableDOM=function(){if(!this.KItemCache)return;if(this.HQChart.ClassName=='KLineChartContainer')this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);else return;var index=0;for(index=0;index<this.AryText.length&&index<this.MaxRowCount;++index){var outItem=this.AryText[index];var item=this.AryData[index];item.TitleSpan.innerText=outItem.Title;item.TitleSpan.style.color=this.TextColor;item.TextSpan.innerText=outItem.Text;item.TextSpan.style.color=outItem.Color;if(outItem.ClassName){item.TextSpan.className=outItem.ClassName;}else{if(item.TextSpan.className!="UMyChart_Tooltip_Float_Text_Span")item.TextSpan.className="UMyChart_Tooltip_Float_Text_Span";}item.Tr.style.display="";if(item.Tr2)item.Tr2.style.display="";}for(;index<this.MaxRowCount;++index){var item=this.AryData[index];item.Tr.style.display="none";if(item.Tr2)item.Tr2.style.display="none";}};this.GetFormatKLineTooltipText=function(kItem){var data=kItem.Item;var symbol=kItem.Symbol;var upperSymbol=symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+{this.KItemCache=kItem;this.KItemCacheID=strKItem;this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);bUpdata=true;}if(bUpdata){this.UpdateTableDOM();}if(data.Point){var x=data.Point.X;var y=data.Point.Y+data.Point.YMove;this.Show(x,y);}};this.UpdateTableDOM=function(){var index=0;for(index=0;index<this.AryText.length&&index<this.MaxRowCount;++index){var outItem=this.AryText[index];var item=this.AryData[index];item.TitleSpan.innerText=outItem.Title;item.TitleSpan.style.color=this.TextColor;item.TextSpan.innerText=outItem.Text;item.TextSpan.style.color=outItem.Color;if(outItem.ClassName){item.TextSpan.className=outItem.ClassName;}else{if(item.TextSpan.className!=this.ValueAlign.Right)item.TextSpan.className=this.ValueAlign.Right;}item.Tr.style.display="";if(item.Tr2)item.Tr2.style.display="";}for(;index<this.MaxRowCount;++index){var item=this.AryData[index];item.Tr.style.display="none";if(item.Tr2)item.Tr2.style.display="none";}};this.GetFormatKLineTooltipText=function(kItem){var data=kItem.Item;var symbol=kItem.Symbol;var upperSymbol=symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
 //日期
 var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'FloatTooltip-Date');//时间
-var timeItem=null;if(IFrameSplitOperator.IsNumber(data.Time))timeItem=this.FormatTime(data.Time,this.HQChart.Period,null,'FloatTooltip-Time');var overlayItem=null;if(kItem.IsOverlay)overlayItem={Title:"",Text:kItem.Name,Color:this.TextColor,ClassName:"UMyChart_Tooltip_Float_Text2_Span"};var yClose=data.YClose;//昨收价|昨结算价
+var timeItem=null;if(IFrameSplitOperator.IsNumber(data.Time))timeItem=this.FormatTime(data.Time,this.HQChart.Period,null,'FloatTooltip-Time');var overlayItem=null;if(kItem.IsOverlay)overlayItem={Title:"",Text:kItem.Name,Color:this.TextColor,ClassName:this.ValueAlign.Left};var yClose=data.YClose;//昨收价|昨结算价
 var aryText=[this.ForamtPrice(data.Open,yClose,defaultfloatPrecision,'FloatTooltip-Open'),this.ForamtPrice(data.High,yClose,defaultfloatPrecision,'FloatTooltip-High'),this.ForamtPrice(data.Low,yClose,defaultfloatPrecision,'FloatTooltip-Low'),this.ForamtPrice(data.Close,yClose,defaultfloatPrecision,'FloatTooltip-Close'),this.ForamtPrice(data.YClose,data.YClose,defaultfloatPrecision,'FloatTooltip-YClose'),this.FormatVol(data.Vol,'FloatTooltip-Vol'),this.FormatAmount(data.Amount,'FloatTooltip-Amount'),this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'FloatTooltip-Increase'),this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'FloatTooltip-Amplitude')];if(timeItem)aryText.unshift(timeItem);aryText.unshift(dateItem);if(overlayItem)aryText.unshift(overlayItem);//换手率
 if(MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol)&&data.FlowCapital>0){aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'FloatTooltip-Exchange'));}//持仓量 结算价
-if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)){aryText.push(this.FormatPosition(data.Position,'FloatTooltip-Position'));aryText.push(this.ForamtFClose(data.FClose,defaultfloatPrecision,'FloatTooltip-FClose'));aryText.push(this.ForamtFClose(data.YFClose,defaultfloatPrecision,'FloatTooltip-YSettlePrice'));}var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_KLINE_FLOAT_TOOLTIP);if(event&&event.Callback){var sendData={AryText:aryText,Data:kItem,HQChart:this.HQChart};event.Callback(event,sendData,this);}return aryText;};/////////////////////////////////////////////////////////////////////////////////////////////
+if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)){aryText.push(this.FormatPosition(data.Position,'FloatTooltip-Position'));aryText.push(this.ForamtFClose(data.FClose,defaultfloatPrecision,'FloatTooltip-FClose'));aryText.push(this.ForamtFClose(data.YFClose,defaultfloatPrecision,'FloatTooltip-YSettlePrice'));}var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_KLINE_FLOAT_TOOLTIP);if(event&&event.Callback){var sendData={AryText:aryText,Data:kItem,HQChart:this.HQChart};event.Callback(event,sendData,this);}return aryText;};//信息地雷
+this.UpdateKLineInfoTooltip=function(data){var tooltipData=data.Tooltip;var symbol=data.Symbol;var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+var aryData=tooltipData.Data.Data;var aryText=[];//输出内容
+for(var i=0;i<aryData.length;++i){var item=aryData[i];var infoType=item.InfoType;switch(infoType){case KLINE_INFO_TYPE.BLOCKTRADING:this.FormatBlockTradingText(item,defaultfloatPrecision,aryText);break;case KLINE_INFO_TYPE.TRADEDETAIL:this.FormatTradeDetailText(item,defaultfloatPrecision,aryText);break;case KLINE_INFO_TYPE.RESEARCH:this.FormatResearchText(item,aryText);break;case KLINE_INFO_TYPE.PFORECAST:this.FormatPerformanceForecastText(item,aryText);break;default:this.FormatDefaultKLineInfoText(item,aryText);break;}}this.AryText=aryText;this.UpdateTableDOM();if(data.Point){var x=data.Point.X;var y=data.Point.Y+data.Point.YMove;this.Show(x,y);}};/////////////////////////////////////////////////////////////////////////////////////////////
+// 公告数据格式化
+this.FormatDefaultKLineInfoText=function(item,aryOut){var title;var strDate=IFrameSplitOperator.FormatDateString(item.Date,"YYYY-MM-DD");if(IFrameSplitOperator.IsNumber(item.Time)){var strTime=IFrameSplitOperator.FormatTimeString(item.Time);title=strDate+' '+strTime;}else{title=strDate;}var item={Title:title,//日期
+Text:item.Title,//标题
+Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);};//大宗交易
+this.FormatBlockTradingText=function(data,floatPrecision,aryOut){var item={Title:"",Text:"大宗交易",Color:this.TextColor,ClassName:this.ValueAlign.Left};aryOut.push(item);var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;var item={Title:"成交价:",Text:extendata.Price.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);var item={Title:"收盘价:",Text:extendata.ClosePrice.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);var item={Title:"溢折价率:",Text:extendata.Premium.toFixed(2),Color:this.GetColor(extendata.Premium,0)};aryOut.push(item);var item={Title:"成交量:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.Vol,0,2,this.LanguageID),Color:this.VolColor};aryOut.push(item);};//龙虎榜
+this.FormatTradeDetailText=function(data,floatPrecision,aryOut){if(!data.ExtendData)return;var extendata=data.ExtendData;if(!IFrameSplitOperator.IsNonEmptyArray(extendata.Detail))return;var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);for(var i=0;i<extendata.Detail.length;++i){var resItem=extendata.Detail[i];if(i==0)var item={Title:"上榜原因:",Text:resItem.TypeExplain,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};else var item={Title:"",Text:resItem.TypeExplain,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}if(extendata.FWeek){var value=extendata.FWeek.Week1;if(IFrameSplitOperator.IsNumber(value)){var item={Title:"一周后涨幅:",Text:value.toFixed(2)+'%',Color:this.GetColor(value,0),ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}var value=extendata.FWeek.Week4;if(IFrameSplitOperator.IsNumber(value)){var item={Title:"四周后涨幅:",Text:value.toFixed(2)+'%',Color:this.GetColor(value,0),ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}}};//调研
+this.FormatResearchText=function(data,aryOut){if(!data.ExtendData)return;var extendata=data.ExtendData;var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);if(IFrameSplitOperator.IsNonEmptyArray(extendata.Level)){var strLevel="";for(var i=0;i<extendata.Level.length;++i){var value=extendata.Level[i];if(strLevel.length>0)strLevel+=",";if(value==0)strLevel+="证券代表";else if(value==1)strLevel+="董秘";else if(value==2)strLevel+="总经理";else if(value==3)strLevel+="董事长";}var item={Title:"接待人员:",Text:strLevel,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}else{var item={Title:"接待人员",Text:"----",Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}if(extendata.Type){var item={Title:"",Text:extendata.Type,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);}};//业绩预告
+this.FormatPerformanceForecastText=function(data,aryOut){if(!data.ExtendData)return;var extendata=data.ExtendData;var reportDate=extendata.ReportDate;if(!reportDate)return;var year=parseInt(reportDate/10000);//年份
+var day=reportDate%10000;//日期
+var reportType="----";if(day==1231)reportType='年报';else if(day==331)reportType='一季度报';else if(day==630)reportType="半年度报";else if(day==930)reportType="三季度报";var item={Title:"业绩预告:",Text:data.Title,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);var item={Title:"年份:",Text:''+year,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);var item={Title:"类型:",Text:reportType,Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);};/////////////////////////////////////////////////////////////////////////////////////////////
 //数据格式化
 this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};this.FormatIncrease=function(price,yClose,defaultfloatPrecision,TitleID){//涨幅
 var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=price-yClose;var value=(price-yClose)/yClose;item.Text=(value*100).toFixed(2)+'%';item.Color=this.GetColor(value,0);return item;};this.FormatRisefall=function(price,yClose,defaultfloatPrecision,TitleID){//涨跌
@@ -14006,7 +14023,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.14049";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.14055";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.14050",
+  "version": "1.1.14056",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -945,7 +945,7 @@ function JSFloatTooltip()
     this.Style=0;       //0=一行一个， 1=2行一个
 
     this.HQChart=null;
-    this.MaxRowCount=20;
+    this.MaxRowCount=25;
 
     this.UpColor=g_JSChartResource.UpTextColor;
     this.DownColor=g_JSChartResource.DownTextColor;
@@ -964,6 +964,13 @@ function JSFloatTooltip()
     this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
 
+    this.ValueAlign=
+    {
+        Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
+        MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
+        Right:"UMyChart_Tooltip_Float_Text_Span"
+    }
+
     this.AryData=[];    //输出文字信息
     this.AryText=[];    //表格tr
 
@@ -1125,10 +1132,14 @@ function JSFloatTooltip()
             var tooltipData=data.Tooltip;
             if (!tooltipData) return;
     
-            if (tooltipData.Type==0)
+            if (tooltipData.Type==0)    //K线信息
             {
                 this.UpdateKLineToolitp(data);
             }
+            else if (tooltipData.Type==1)   //信息地雷
+            {
+                this.UpdateKLineInfoTooltip(data);
+            }
         }
         else if (data.DataType==2)  //更新实时行情数据
         {
@@ -1148,6 +1159,7 @@ function JSFloatTooltip()
         {
             this.KItemCache= kItem;
             this.KItemCacheID=strKItem;
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
             bUpdata=true;
         }
 
@@ -1157,6 +1169,7 @@ function JSFloatTooltip()
         }
     }
 
+    //K线提示信息
     this.UpdateKLineToolitp=function(data)
     {
         var tooltipData=data.Tooltip;
@@ -1177,6 +1190,7 @@ function JSFloatTooltip()
         {
             this.KItemCache= kItem;
             this.KItemCacheID=strKItem;
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
             bUpdata=true;
         }
         
@@ -1195,13 +1209,6 @@ function JSFloatTooltip()
 
     this.UpdateTableDOM=function()
     {
-        if (!this.KItemCache) return;
-
-        if (this.HQChart.ClassName=='KLineChartContainer')
-            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
-        else
-            return;
-
         var index=0;
         for(index=0;index<this.AryText.length && index<this.MaxRowCount;++index)
         {
@@ -1219,7 +1226,7 @@ function JSFloatTooltip()
             }
             else
             {
-                if (item.TextSpan.className!="UMyChart_Tooltip_Float_Text_Span") item.TextSpan.className="UMyChart_Tooltip_Float_Text_Span"
+                if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
             }
            
             item.Tr.style.display="";
@@ -1234,6 +1241,7 @@ function JSFloatTooltip()
         }
     }
 
+    
     this.GetFormatKLineTooltipText=function(kItem)
     {
         var data=kItem.Item;
@@ -1250,7 +1258,7 @@ function JSFloatTooltip()
 
         var overlayItem=null;
         if (kItem.IsOverlay)
-            overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:"UMyChart_Tooltip_Float_Text2_Span" };
+            overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:this.ValueAlign.Left };
         
         
         var yClose=data.YClose; //昨收价|昨结算价
@@ -1297,6 +1305,208 @@ function JSFloatTooltip()
     }
 
 
+    //信息地雷
+    this.UpdateKLineInfoTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        var symbol=data.Symbol;
+        var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+
+        var aryData=tooltipData.Data.Data;
+        var aryText=[]; //输出内容
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var infoType=item.InfoType;
+            switch(infoType)
+            {
+                case KLINE_INFO_TYPE.BLOCKTRADING:
+                    this.FormatBlockTradingText(item, defaultfloatPrecision, aryText);
+                    break;
+                case KLINE_INFO_TYPE.TRADEDETAIL:
+                    this.FormatTradeDetailText(item,defaultfloatPrecision,aryText);
+                    break;
+                case KLINE_INFO_TYPE.RESEARCH:
+                    this.FormatResearchText(item, aryText);
+                    break;
+                case KLINE_INFO_TYPE.PFORECAST:
+                    this.FormatPerformanceForecastText(item,aryText);
+                    break;
+                default:
+                    this.FormatDefaultKLineInfoText(item, aryText);
+                    break;
+            }
+        }
+
+        this.AryText=aryText;
+
+        this.UpdateTableDOM();
+
+        if (data.Point)
+        {
+            var x=data.Point.X;
+            var y=data.Point.Y+data.Point.YMove;
+            this.Show(x, y);
+        }
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////
+    // 公告数据格式化
+
+    this.FormatDefaultKLineInfoText=function(item, aryOut)
+    {
+        var title;
+        var strDate=IFrameSplitOperator.FormatDateString(item.Date,"YYYY-MM-DD");
+        if (IFrameSplitOperator.IsNumber(item.Time)) 
+        {
+            var strTime=IFrameSplitOperator.FormatTimeString(item.Time);
+            title=`${strDate} ${strTime}`;
+        }
+        else
+        {
+            title=strDate;
+        }
+
+        var item=
+        { 
+            Title:title,        //日期
+            Text:item.Title,    //标题
+            Color:this.ValueColor,
+            ClassName:this.ValueAlign.MarginLeft
+        };
+
+        aryOut.push(item);
+    }
+
+    //大宗交易
+    this.FormatBlockTradingText=function(data, floatPrecision, aryOut)
+    {
+        var item={ Title:"", Text:"大宗交易", Color:this.TextColor, ClassName:this.ValueAlign.Left };
+        aryOut.push(item);
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var extendata = data.ExtendData;
+        var item={ Title:"成交价:", Text:extendata.Price.toFixed(floatPrecision), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var item={ Title:"收盘价:", Text:extendata.ClosePrice.toFixed(floatPrecision), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var item={ Title:"溢折价率:", Text:extendata.Premium.toFixed(2), Color:this.GetColor(extendata.Premium,0) };
+        aryOut.push(item);
+
+        var item={ Title:"成交量:", Text:IFrameSplitOperator.FormatValueStringV2(extendata.Vol,0,2,this.LanguageID), Color:this.VolColor };
+        aryOut.push(item);
+    }
+
+    //龙虎榜
+    this.FormatTradeDetailText=function(data, floatPrecision, aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(extendata.Detail)) return;
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        for(var i=0;i<extendata.Detail.length;++i)
+        {
+            var resItem=extendata.Detail[i];
+            if (i==0)
+                var item={ Title:"上榜原因:",Text:resItem.TypeExplain, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            else
+                var item={ Title:"",Text:resItem.TypeExplain, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+
+            aryOut.push(item);
+        }
+
+        if (extendata.FWeek)
+        {
+            var value=extendata.FWeek.Week1;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var item={ Title:"一周后涨幅:",Text:`${value.toFixed(2)}%`, Color:this.GetColor(value,0), ClassName:this.ValueAlign.MarginLeft };
+                aryOut.push(item);
+            }
+
+            var value=extendata.FWeek.Week4;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var item={ Title:"四周后涨幅:",Text:`${value.toFixed(2)}%`, Color:this.GetColor(value,0), ClassName:this.ValueAlign.MarginLeft };
+                aryOut.push(item);
+            }
+        }
+    }
+
+    //调研
+    this.FormatResearchText=function(data,aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        if (IFrameSplitOperator.IsNonEmptyArray(extendata.Level))
+        {
+            var strLevel="";
+            for(var i=0;i<extendata.Level.length;++i)
+            {
+                var value=extendata.Level[i];
+                if (strLevel.length>0) strLevel+=",";
+                if(value==0) strLevel+="证券代表";
+                else if(value==1) strLevel+="董秘";
+                else if(value==2) strLevel+="总经理";
+                else if(value==3) strLevel+="董事长";
+            }
+
+            var item={ Title:"接待人员:",Text:strLevel, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+        else
+        {
+            var item={ Title:"接待人员",Text:"----", Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+
+        if (extendata.Type)
+        {
+            var item={ Title:"", Text:extendata.Type, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+        
+    }
+
+    //业绩预告
+    this.FormatPerformanceForecastText=function(data,aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+        var reportDate=extendata.ReportDate;
+        if (!reportDate) return;
+
+        var year=parseInt(reportDate/10000);  //年份
+        var day=reportDate%10000;             //日期
+        var reportType="----";
+        if(day == 1231) reportType = '年报';
+        else if(day == 331) reportType ='一季度报';
+        else if(day == 630) reportType = "半年度报";
+        else if(day == 930) reportType = "三季度报";
+
+        var item={ Title:"业绩预告:",Text:data.Title, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        var item={ Title:"年份:",Text:`${year}`, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        var item={ Title:"类型:",Text:reportType, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+    }
+
+    
     /////////////////////////////////////////////////////////////////////////////////////////////
     //数据格式化
     this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)

package/src/jscommon/umychart.js

@@ -7100,6 +7100,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type===1)   //信息地雷提示信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var scrollPos=GetScrollPosition();
             var left = x;
             var top = y;
@@ -13536,7 +13543,7 @@ function AverageWidthFrame()
                 this.Canvas.lineWidth=pixelRatio;
             }
         }
-        else if (lineType==2)   //绘制短线
+        else if (lineType==3)   //绘制短线
         {
             var lineWidth=10*GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;

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

@@ -1891,6 +1891,7 @@ input[type="color"] {
 .UMyChart_Tooltip_Float_Text_Td
 {
     min-width:80px;
+    max-width: 500px;
 }
 
 .UMyChart_Tooltip_Float_Title_Span
@@ -1907,9 +1908,15 @@ input[type="color"] {
 
 .UMyChart_Tooltip_Float_Text2_Span
 {
-    color: rgb(230,230,230);
+    margin-left: 1px;
+}
+
+.UMyChart_Tooltip_Float_Text3_Span
+{
+    margin-left: 5px;
 }
 
 
 
 
+

package/src/jscommon/umychart.testdata/60000.sh.TradeDetal.js

@@ -48,6 +48,10 @@ var TEST_TRADE_DETAL_DATA={
                         {
                             "type": 6,
                             "typeexplain": "单只标的证券的当日融资买入数量达到当日该证券总交易量的50％以上"
+                        },
+                        {
+                            "type": 3,
+                            "typeexplain": "跌幅偏离值达7%的证券"
                         }
                     ],
                     "fweek": {

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

@@ -11025,6 +11025,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type===1)   //信息地雷提示信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var scrollPos=GetScrollPosition();
             var left = x;
             var top = y;
@@ -17461,7 +17468,7 @@ function AverageWidthFrame()
                 this.Canvas.lineWidth=pixelRatio;
             }
         }
-        else if (lineType==2)   //绘制短线
+        else if (lineType==3)   //绘制短线
         {
             var lineWidth=10*GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;
@@ -139480,7 +139487,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14049";
+var HQCHART_VERSION="1.1.14055";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -11069,6 +11069,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type===1)   //信息地雷提示信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var scrollPos=GetScrollPosition();
             var left = x;
             var top = y;
@@ -17505,7 +17512,7 @@ function AverageWidthFrame()
                 this.Canvas.lineWidth=pixelRatio;
             }
         }
-        else if (lineType==2)   //绘制短线
+        else if (lineType==3)   //绘制短线
         {
             var lineWidth=10*GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;
@@ -145355,7 +145362,7 @@ function JSFloatTooltip()
     this.Style=0;       //0=一行一个， 1=2行一个
 
     this.HQChart=null;
-    this.MaxRowCount=20;
+    this.MaxRowCount=25;
 
     this.UpColor=g_JSChartResource.UpTextColor;
     this.DownColor=g_JSChartResource.DownTextColor;
@@ -145374,6 +145381,13 @@ function JSFloatTooltip()
     this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
 
+    this.ValueAlign=
+    {
+        Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
+        MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
+        Right:"UMyChart_Tooltip_Float_Text_Span"
+    }
+
     this.AryData=[];    //输出文字信息
     this.AryText=[];    //表格tr
 
@@ -145535,10 +145549,14 @@ function JSFloatTooltip()
             var tooltipData=data.Tooltip;
             if (!tooltipData) return;
     
-            if (tooltipData.Type==0)
+            if (tooltipData.Type==0)    //K线信息
             {
                 this.UpdateKLineToolitp(data);
             }
+            else if (tooltipData.Type==1)   //信息地雷
+            {
+                this.UpdateKLineInfoTooltip(data);
+            }
         }
         else if (data.DataType==2)  //更新实时行情数据
         {
@@ -145558,6 +145576,7 @@ function JSFloatTooltip()
         {
             this.KItemCache= kItem;
             this.KItemCacheID=strKItem;
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
             bUpdata=true;
         }
 
@@ -145567,6 +145586,7 @@ function JSFloatTooltip()
         }
     }
 
+    //K线提示信息
     this.UpdateKLineToolitp=function(data)
     {
         var tooltipData=data.Tooltip;
@@ -145587,6 +145607,7 @@ function JSFloatTooltip()
         {
             this.KItemCache= kItem;
             this.KItemCacheID=strKItem;
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
             bUpdata=true;
         }
         
@@ -145605,13 +145626,6 @@ function JSFloatTooltip()
 
     this.UpdateTableDOM=function()
     {
-        if (!this.KItemCache) return;
-
-        if (this.HQChart.ClassName=='KLineChartContainer')
-            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
-        else
-            return;
-
         var index=0;
         for(index=0;index<this.AryText.length && index<this.MaxRowCount;++index)
         {
@@ -145629,7 +145643,7 @@ function JSFloatTooltip()
             }
             else
             {
-                if (item.TextSpan.className!="UMyChart_Tooltip_Float_Text_Span") item.TextSpan.className="UMyChart_Tooltip_Float_Text_Span"
+                if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
             }
            
             item.Tr.style.display="";
@@ -145644,6 +145658,7 @@ function JSFloatTooltip()
         }
     }
 
+    
     this.GetFormatKLineTooltipText=function(kItem)
     {
         var data=kItem.Item;
@@ -145660,7 +145675,7 @@ function JSFloatTooltip()
 
         var overlayItem=null;
         if (kItem.IsOverlay)
-            overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:"UMyChart_Tooltip_Float_Text2_Span" };
+            overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:this.ValueAlign.Left };
         
         
         var yClose=data.YClose; //昨收价|昨结算价
@@ -145707,6 +145722,208 @@ function JSFloatTooltip()
     }
 
 
+    //信息地雷
+    this.UpdateKLineInfoTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        var symbol=data.Symbol;
+        var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+
+        var aryData=tooltipData.Data.Data;
+        var aryText=[]; //输出内容
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var infoType=item.InfoType;
+            switch(infoType)
+            {
+                case KLINE_INFO_TYPE.BLOCKTRADING:
+                    this.FormatBlockTradingText(item, defaultfloatPrecision, aryText);
+                    break;
+                case KLINE_INFO_TYPE.TRADEDETAIL:
+                    this.FormatTradeDetailText(item,defaultfloatPrecision,aryText);
+                    break;
+                case KLINE_INFO_TYPE.RESEARCH:
+                    this.FormatResearchText(item, aryText);
+                    break;
+                case KLINE_INFO_TYPE.PFORECAST:
+                    this.FormatPerformanceForecastText(item,aryText);
+                    break;
+                default:
+                    this.FormatDefaultKLineInfoText(item, aryText);
+                    break;
+            }
+        }
+
+        this.AryText=aryText;
+
+        this.UpdateTableDOM();
+
+        if (data.Point)
+        {
+            var x=data.Point.X;
+            var y=data.Point.Y+data.Point.YMove;
+            this.Show(x, y);
+        }
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////
+    // 公告数据格式化
+
+    this.FormatDefaultKLineInfoText=function(item, aryOut)
+    {
+        var title;
+        var strDate=IFrameSplitOperator.FormatDateString(item.Date,"YYYY-MM-DD");
+        if (IFrameSplitOperator.IsNumber(item.Time)) 
+        {
+            var strTime=IFrameSplitOperator.FormatTimeString(item.Time);
+            title=`${strDate} ${strTime}`;
+        }
+        else
+        {
+            title=strDate;
+        }
+
+        var item=
+        { 
+            Title:title,        //日期
+            Text:item.Title,    //标题
+            Color:this.ValueColor,
+            ClassName:this.ValueAlign.MarginLeft
+        };
+
+        aryOut.push(item);
+    }
+
+    //大宗交易
+    this.FormatBlockTradingText=function(data, floatPrecision, aryOut)
+    {
+        var item={ Title:"", Text:"大宗交易", Color:this.TextColor, ClassName:this.ValueAlign.Left };
+        aryOut.push(item);
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var extendata = data.ExtendData;
+        var item={ Title:"成交价:", Text:extendata.Price.toFixed(floatPrecision), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var item={ Title:"收盘价:", Text:extendata.ClosePrice.toFixed(floatPrecision), Color:this.ValueColor };
+        aryOut.push(item);
+
+        var item={ Title:"溢折价率:", Text:extendata.Premium.toFixed(2), Color:this.GetColor(extendata.Premium,0) };
+        aryOut.push(item);
+
+        var item={ Title:"成交量:", Text:IFrameSplitOperator.FormatValueStringV2(extendata.Vol,0,2,this.LanguageID), Color:this.VolColor };
+        aryOut.push(item);
+    }
+
+    //龙虎榜
+    this.FormatTradeDetailText=function(data, floatPrecision, aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(extendata.Detail)) return;
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        for(var i=0;i<extendata.Detail.length;++i)
+        {
+            var resItem=extendata.Detail[i];
+            if (i==0)
+                var item={ Title:"上榜原因:",Text:resItem.TypeExplain, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            else
+                var item={ Title:"",Text:resItem.TypeExplain, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+
+            aryOut.push(item);
+        }
+
+        if (extendata.FWeek)
+        {
+            var value=extendata.FWeek.Week1;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var item={ Title:"一周后涨幅:",Text:`${value.toFixed(2)}%`, Color:this.GetColor(value,0), ClassName:this.ValueAlign.MarginLeft };
+                aryOut.push(item);
+            }
+
+            var value=extendata.FWeek.Week4;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var item={ Title:"四周后涨幅:",Text:`${value.toFixed(2)}%`, Color:this.GetColor(value,0), ClassName:this.ValueAlign.MarginLeft };
+                aryOut.push(item);
+            }
+        }
+    }
+
+    //调研
+    this.FormatResearchText=function(data,aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+
+        var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        if (IFrameSplitOperator.IsNonEmptyArray(extendata.Level))
+        {
+            var strLevel="";
+            for(var i=0;i<extendata.Level.length;++i)
+            {
+                var value=extendata.Level[i];
+                if (strLevel.length>0) strLevel+=",";
+                if(value==0) strLevel+="证券代表";
+                else if(value==1) strLevel+="董秘";
+                else if(value==2) strLevel+="总经理";
+                else if(value==3) strLevel+="董事长";
+            }
+
+            var item={ Title:"接待人员:",Text:strLevel, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+        else
+        {
+            var item={ Title:"接待人员",Text:"----", Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+
+        if (extendata.Type)
+        {
+            var item={ Title:"", Text:extendata.Type, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            aryOut.push(item);
+        }
+        
+    }
+
+    //业绩预告
+    this.FormatPerformanceForecastText=function(data,aryOut)
+    {
+        if (!data.ExtendData) return;
+        var extendata = data.ExtendData;
+        var reportDate=extendata.ReportDate;
+        if (!reportDate) return;
+
+        var year=parseInt(reportDate/10000);  //年份
+        var day=reportDate%10000;             //日期
+        var reportType="----";
+        if(day == 1231) reportType = '年报';
+        else if(day == 331) reportType ='一季度报';
+        else if(day == 630) reportType = "半年度报";
+        else if(day == 930) reportType = "三季度报";
+
+        var item={ Title:"业绩预告:",Text:data.Title, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        var item={ Title:"年份:",Text:`${year}`, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+
+        var item={ Title:"类型:",Text:reportType, Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+        aryOut.push(item);
+    }
+
+    
     /////////////////////////////////////////////////////////////////////////////////////////////
     //数据格式化
     this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
@@ -146947,7 +147164,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14049";
+var HQCHART_VERSION="1.1.14055";
 
 function PrintHQChartVersion()
 {