hqchart 1.1.14056 → 1.1.14064

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

@@ -6610,6 +6610,7 @@ var JSCHART_EVENT_ID=
     ON_CHANGE_KLINE_RIGHT:160,                  //切换复权
 
     ON_FORMAT_KLINE_FLOAT_TOOLTIP:161,          //格式化k线浮动框显示文字
+    ON_FORMAT_KLINE_INFO_FLOAT_TOOLTIP:162,     //格式化信息地雷显示文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -10998,7 +10999,25 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.DrawFloatTooltip=function(point,toolTip)
     {
+        if (!this.FloatTooltip) return;
+
+        this.UpdateFloatTooltip(point, toolTip)
+    }
+
+    this.UpdateFloatTooltip=function(point, toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        var sendData=
+        {
+            Tooltip:toolTip,
+            Point:point,
+            Symbol:this.Symbol,
+            Name:this.Name,
+            DataType:1,
+        };
 
+        this.FloatTooltip.Update(sendData);
     }
 
     //更新实时行情到浮动tooltip
@@ -11103,6 +11122,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type==2)   //指标信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
             
@@ -11124,6 +11150,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type==3)   //分时图异动信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
 
@@ -11143,8 +11176,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Tooltip.innerHTML=format.Text;;
             this.Tooltip.style.display = "block";
         }
-        else if (toolTip.Type==4)   //icon图标信息
+        else if (toolTip.Type==4)   //ChartMultiSVGIconV2 图标信息
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
 
@@ -11166,6 +11206,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type==5)
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
 
@@ -11188,6 +11235,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type==6)   //散点图
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
 
@@ -11210,6 +11264,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (toolTip.Type==7)   //ChartDrawSVG
         {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var left = x;
             var top = y;
 
@@ -11230,6 +11291,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Tooltip.innerHTML=format.Text;
             this.Tooltip.style.display = "block";
         }
+        else if (toolTip.Type==8)   //ChartDrawSVG 新版本
+        {
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+        }
 
 
         if (bHideFloatToolip) this.HideFloatTooltip();
@@ -14473,7 +14543,7 @@ function CoordinateInfo()
     this.Font=g_JSChartResource.FrameSplitTextFont;             //字体
     this.LineColor=g_JSChartResource.FrameSplitPen;             //线段颜色
     this.LineDash=null;                                         //当线段类型==2时 可以设置虚线样式
-    this.LineType=1;                                            //线段类型 -1=不画线段 2=虚线, 8,9=集合竞价坐标
+    this.LineType=1;                                            //线段类型 -1=不画线段 0=虚线 1,2=虚线, 3=短线 8,9=集合竞价坐标
     this.LineWidth;                                             //线段宽度
     this.ExtendLine;                                            //延长线长度[ ] { Width:长度 } [0]=左 [1]=右  实例: [null, { Width: 50}];  
     this.ExtendData;                                            //扩展属性
@@ -17483,7 +17553,7 @@ function AverageWidthFrame()
     {
         if (lineType==-1) return;
 
-        if (lineType==0)
+        if (lineType==0)    //直线
         {
             var pixelRatio=GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;
@@ -17529,7 +17599,7 @@ function AverageWidthFrame()
             }
             this.Canvas.stroke();
         }
-        else
+        else if (lineType==1 || lineType==2)    //虚线
         {
             this.DrawDotLine(left,right,y, color, option);
         }
@@ -43910,203 +43980,6 @@ function ChartMultiText()
     }
 }
 
-// 图标集合 支持横屏
-function ChartMultiSVGIcon()
-{
-    this.newMethod=IChartPainting;   //派生
-    this.newMethod();
-    delete this.newMethod;
-
-    this.ClassName="ChartMultiSVGIcon";
-    this.Icon;  //[ {Index:, Value:, Symbol:, Color:, Baseline:, Line:{ Color:, Dash:[虚线点], KData:"H/L", Offset:[5,10], Width:线粗细 } } ]
-    this.IconSize={ Max: g_JSChartResource.DRAWICON.Icon.MaxSize, Min:g_JSChartResource.DRAWICON.Icon.MinSize ,    //图标的最大最小值
-        Zoom:{ Type:g_JSChartResource.DRAWICON.Icon.Zoom.Type , Value:g_JSChartResource.DRAWICON.Icon.Zoom.Value } //放大倍数
-    }; 
-    this.Family;
-    this.Color=g_JSChartResource.DefaultTextColor;
-    this.IsHScreen=false;
-    this.IconRect=[];   //0=序号,1=区域
-
-    this.Draw=function()
-    {
-        this.IconRect=[];
-        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
-        if (this.IsShowIndexTitleOnly()) return;
-        if (this.IsHideScriptIndex()) return;
-        if (!this.Data || this.Data.length<=0) return;
-        if (!this.Family || !this.Icon) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Icon)) return;
-
-        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
-        var xPointCount=this.ChartFrame.XPointCount;
-        var offset=this.Data.DataOffset;
-        this.DataWidth=this.ChartFrame.DataWidth;
-        this.DistanceWidth=this.ChartFrame.DistanceWidth;
-
-        var border=this.GetBorder();
-        if (this.IsHScreen)
-        {
-            var left=border.TopEx;
-            var right=border.BottomEx;
-        }
-        else
-        {
-            var left=border.LeftEx;
-            var right=border.RightEx;
-        }
-
-        var fontSize=this.GetDynamicIconSize(this.DataWidth,this.DistanceWidth,this.IconSize.Max,this.IconSize.Min,this.IconSize.Zoom);
-        this.Canvas.font=fontSize+'px '+this.Family;
-
-        for(var i=0; i<this.Icon.length; ++i)
-        {
-            var item=this.Icon[i];
-            if (!IFrameSplitOperator.IsNumber(item.Index)) continue;
-
-            var index=item.Index-offset;
-            if (index>=0 && index<xPointCount)
-            {
-                var x=this.ChartFrame.GetXFromIndex(index);
-                var y=this.ChartFrame.GetYFromData(item.Value);
-
-                if (item.Color)  this.Canvas.fillStyle = item.Color;
-                else this.Canvas.fillStyle = this.Color;
-
-                var textWidth=this.Canvas.measureText(item.Symbol).width;
-                this.Canvas.textAlign='center';
-                var rtIcon=new Rect(x-fontSize/2,y-fontSize/2,fontSize,fontSize);
-                if (x+textWidth/2>=right) 
-                {
-                    this.Canvas.textAlign='right';
-                    x+=this.DataWidth/2;
-                    rtIcon.X=x-fontSize;
-                }
-                else if (x-textWidth/2<left)
-                {
-                    this.Canvas.textAlign = 'left';
-                    x-=this.DataWidth/2;
-                    rtIcon.X=x;
-                }
-
-                if (item.Baseline==1) 
-                {
-                    this.Canvas.textBaseline='top';
-                    rtIcon.Y=y;
-                }
-                else if (item.Baseline==2) 
-                {
-                    this.Canvas.textBaseline='bottom';
-                    rtIcon.Y=y-fontSize;
-                }
-                else 
-                {
-                    this.Canvas.textBaseline = 'middle';
-                    rtIcon.Y=y-fontSize/2;
-                }
-
-                if (this.IsHScreen)
-                {
-                    this.Canvas.save(); 
-                    this.Canvas.translate(y, x);
-                    this.Canvas.rotate(90 * Math.PI / 180);
-                    this.Canvas.fillText(item.Symbol,0,0);
-                    this.Canvas.restore();
-                }
-                else
-                {
-                    if (IFrameSplitOperator.IsNumber(item.YMove)) y+=item.YMove;
-                    this.Canvas.fillText(item.Symbol, x, y);
-                    if (item.Text) this.IconRect.push({ Index:i, Rect:rtIcon , Item:item });
-                }
-
-                if (item.Line)
-                {
-                    var kItem=this.Data.Data[item.Index];
-                    var price=item.Line.KData=="H"? kItem.High:kItem.Low;
-                    var yPrice=this.ChartFrame.GetYFromData(price);
-                    var yText=y;
-                    if (Array.isArray(item.Line.Offset) && item.Line.Offset.length==2)
-                    {
-                        if (yText>yPrice) //文字在下方
-                        {
-                            yText-=item.Line.Offset[1];
-                            yPrice+=item.Line.Offset[0]
-                        }
-                        else if (yText<yPrice)
-                        {
-                            yText+=item.Line.Offset[1];
-                            yPrice-=item.Line.Offset[0]
-                        }
-                    }
-                    this.Canvas.save();
-                    if (item.Line.Dash) this.Canvas.setLineDash(item.Line.Dash);    //虚线
-                    if (item.Line.Width>0) this.Canvas.lineWidth=item.Line.Width;   //线宽
-                    this.Canvas.strokeStyle = item.Line.Color;
-                    this.Canvas.beginPath();
-                    if (this.IsHScreen)
-                    {
-                        this.Canvas.moveTo(yText, ToFixedPoint(x));
-                        this.Canvas.lineTo(yPrice,ToFixedPoint(x));
-                    }
-                    else
-                    {
-                        this.Canvas.moveTo(ToFixedPoint(x),yText);
-                        this.Canvas.lineTo(ToFixedPoint(x),yPrice);
-                    }
-                    
-                    this.Canvas.stroke();
-                    this.Canvas.restore();
-                }
-            }
-        }
-    }
-
-    this.GetTooltipData=function(x,y,tooltip)
-    {
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.IconRect)) return false;
-        for(var i=0; i<this.IconRect.length; ++i)
-        {
-            var item=this.IconRect[i];
-            if (!item.Rect) continue;
-            var rect=item.Rect;
-            this.Canvas.beginPath();
-            this.Canvas.rect(rect.X,rect.Y,rect.Width,rect.Height);
-            if (this.Canvas.isPointInPath(x,y))
-            {
-                JSConsole.Chart.Log('[ChartMultiSVGIcon::GetTooltipData] icon ', item);
-                tooltip.Data=item;
-                tooltip.ChartPaint=this;
-                tooltip.Type=4; //指标
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    this.GetMaxMin=function()
-    {
-        var range={ Min:null, Max:null };
-        var xPointCount=this.ChartFrame.XPointCount;
-        var start=this.Data.DataOffset;
-        var end=start+xPointCount;
-
-        for(var i in this.Icon)
-        {
-            var item=this.Icon[i];
-            if (item.Index>=start && item.Index<end)
-            {
-                if (range.Max==null) range.Max=item.Value;
-                else if (range.Max<item.Value) range.Max=item.Value;
-                if (range.Min==null) range.Min=item.Value;
-                else if (range.Min>item.Value) range.Min=item.Value;
-            }
-        }
-
-        return range;
-    }
-}
-
 
 //图标集合(2.0) 支持横屏
 function ChartMultiSVGIconV2()
@@ -44318,6 +44191,7 @@ function ChartMultiSVGIconV2()
                 if (IFrameSplitOperator.IsNumber(item.YMove)) y+=item.YMove;
                 this.Canvas.fillText(item.Symbol, x, y);
                 if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
+                else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
             }
 
             if (item.Line)
@@ -45067,6 +44941,7 @@ function ChartDrawSVG()
                 tooltip.Data={ Rect:item.Rect, Item:data, Index:item.Index };
                 tooltip.ChartPaint=this;
                 tooltip.Type=7; //drawsvg
+                if (data.Tooltip && data.Tooltip.Ver==2.0) tooltip.Type=8; //drawsvg 新本版
                 return true;
             }
         }
@@ -83856,29 +83731,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.DialogSelectRect.Update(sendData);
     }
 
-    this.DrawFloatTooltip=function(point,toolTip)
-    {
-        if (!this.FloatTooltip) return;
-
-        this.UpdateFloatTooltip(point, toolTip)
-    }
-
-    this.UpdateFloatTooltip=function(point, toolTip)
-    {
-        if (!this.FloatTooltip) return;
-
-        var sendData=
-        {
-            Tooltip:toolTip,
-            Point:point,
-            Symbol:this.Symbol,
-            Name:this.Name,
-            DataType:1,
-        };
-
-        this.FloatTooltip.Update(sendData);
-    }
-
     this.UpdateHQFloatTooltip=function(kData)
     {
         if (!this.FloatTooltip) return;
@@ -145385,7 +145237,7 @@ function JSFloatTooltip()
     {
         Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
         MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
-        Right:"UMyChart_Tooltip_Float_Text_Span"
+        Right:"UMyChart_Tooltip_Float_Text_Span",
     }
 
     this.AryData=[];    //输出文字信息
@@ -145400,6 +145252,7 @@ function JSFloatTooltip()
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+            if (IFrameSplitOperator.IsNumber(option.MaxRowCount)) this.MaxRowCount=option.MaxRowCount;
         }
     }
 
@@ -145557,6 +145410,34 @@ function JSFloatTooltip()
             {
                 this.UpdateKLineInfoTooltip(data);
             }
+            else if (tooltipData.Type==2)   //交易指标
+            {
+                this.UpdateTradeIndexTooltip(data);
+            }
+            else if (tooltipData.Type==3)   //分时图异动信息
+            {
+                this.UpdateMinuteInfoTooltip(data);
+            }
+            else if (tooltipData.Type==4)   //ChartMultiSVGIconV2 图标信息
+            {
+                this.UpdatMultiSVGIconV2Tooltip(data);
+            }
+            else if (tooltipData.Type==5)   //ChartOX 信息
+            {
+                this.UpdatChartOXTooltip(data);
+            }
+            else if (tooltipData.Type==6)   //散点图
+            {
+                this.UpdatChartScatterPlotTooltip(data);
+            }
+            else if (tooltipData.Type==7)   //ChartDrawSVG 老版本 单行
+            {
+                this.UpdateChartDrawSVGTooltip(data);
+            }
+            else if (tooltipData.Type==8)   //ChartDrawSVG 新版本
+            {
+                this.UpdateChartDrawSVGV2Tooltip(data);
+            }
         }
         else if (data.DataType==2)  //更新实时行情数据
         {
@@ -145624,6 +145505,191 @@ function JSFloatTooltip()
         }
     }
 
+    //ChartDrawSVG 老版本 单行
+    this.UpdateChartDrawSVGTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Item || !tooltipData.Data.Item.Tooltip) return;
+        var item=tooltipData.Data.Item.Tooltip;
+
+        var aryText=[]
+        var rowItem={ Text:"", HTMLTitle:item.Text, Color:this.ValueColor, IsMergeCell:true };
+        aryText.push(rowItem);
+
+        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);
+        }
+    }
+
+    //ChartDrawSVG 新版本
+    this.UpdateChartDrawSVGV2Tooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Item || !tooltipData.Data.Item.Tooltip) return;
+        var aryData=tooltipData.Data.Item.Tooltip.AryText;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryData)) return;
+        var aryText=[];
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var rowItem={ Title:"", Text:"", Color:this.ValueColor, ClassName:this.ValueAlign.MarginLeft };
+            if (item.TextColor) rowItem.Color=item.TextColor;
+            if (item.Title) rowItem.Title=item.Title;
+            if (item.Text) rowItem.Text=item.Text;
+
+            aryText.push(rowItem);
+        }
+
+        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.UpdateTradeIndexTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Data) return;
+
+        var item=tooltipData.Data.Data;
+        var kItem=item.KData;
+        var aryText=[];
+
+        var rowItem={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(kItem.Date,"YYYY-MM-DD"), Color:this.ValueColor };
+        aryText.push(rowItem);
+
+        if (IFrameSplitOperator.IsNumber(kItem.Time))
+        {
+            var format="HH:MM";
+            var rowItem={ Title:"时间",Text:IFrameSplitOperator.FormatTimeString(kItem.Time,format), Color:this.ValueColor };
+            aryText.push(rowItem);
+        }
+
+        var rowItem={ Title:"指标名称:", Text:`${item.Name}${item.Param}`, Color:this.ValueColor };
+        aryText.push(rowItem);
+
+        var rowItem={ Title:"买卖方向:", Text:`${item.Type==1?"买入":"卖出"}`, Color:item.Type==1?this.UpColor:this.DownColor };
+        aryText.push(rowItem);
+
+        var rowItem={  };
+        
+        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.UpdateMinuteInfoTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Data || !tooltipData.Data.Data.Item) return;
+        var item=tooltipData.Data.Data.Item;
+
+        var aryText=[];
+        var rowItem={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(item.Date,"YYYY-MM-DD"), Color:this.ValueColor };
+        aryText.push(rowItem);
+
+        var format="HH:MM";
+        var rowItem={ Title:"时间",Text:IFrameSplitOperator.FormatTimeString(item.Time,format), Color:this.ValueColor };
+        aryText.push(rowItem);
+
+        var rowItem={ Title:"异动", Text:item.Title, Color:this.ValueColor };
+        aryText.push(rowItem);
+        
+        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);
+        }
+    }
+
+    //ChartMultiSVGIconV2 图标信息
+    this.UpdatMultiSVGIconV2Tooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Item) return;
+
+        var item=tooltipData.Data.Item;
+        var aryText=[];
+
+        var rowItem={ Text:"", HTMLTitle:item.Text, Color:this.ValueColor, IsMergeCell:true };
+        aryText.push(rowItem);
+
+        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);
+        }
+    }
+
+    //ChartOX 信息
+    this.UpdatChartOXTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Data) return;
+
+        var item=tooltipData.Data.Data;
+        var period=this.HQChart.Period;
+        var aryText=[];
+        if (ChartData.IsDayPeriod(period, true))
+        {
+            var strStartDate=IFrameSplitOperator.FormatDateString(item.Start.Date,"YYYY-MM-DD");
+            var strEndDate=IFrameSplitOperator.FormatDateString(item.End.Date,"YYYY-MM-DD");
+           
+            aryText.push({ Title:"起始时间",Text:strStartDate, Color:this.ValueColor });
+            aryText.push({ Title:"结束时间",Text:strEndDate, Color:this.ValueColor });
+        }
+        else if (ChartData.IsMinutePeriod(period, true))
+        {
+            var strStartDate=IFrameSplitOperator.FormatDateString(item.Start.Date);
+            var strStartTime=IFrameSplitOperator.FormatTimeString(item.Start.Time,"HH:MM");
+
+            var strEndDate=IFrameSplitOperator.FormatDateString(item.End.Date);
+            var strEndTime=IFrameSplitOperator.FormatTimeString(item.End.Time,"HH:MM");
+
+            aryText.push({ Title:"起始时间",Text:`${strStartDate} ${strStartTime}`, Color:this.ValueColor });
+            aryText.push({ Title:"结束时间",Text:`${strEndDate} ${strEndTime}`, Color:this.ValueColor });
+        }
+
+        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.UpdateTableDOM=function()
     {
         var index=0;
@@ -145632,10 +145698,16 @@ function JSFloatTooltip()
             var outItem=this.AryText[index];
             var item=this.AryData[index];
 
-            item.TitleSpan.innerText=outItem.Title;
+            if (outItem.HTMLTitle) item.TitleSpan.innerHTML=outItem.HTMLTitle
+            else item.TitleSpan.innerText=outItem.Title;
+
             item.TitleSpan.style.color=this.TextColor;
-            item.TextSpan.innerText=outItem.Text;
+
+            if (outItem.HTMLText) item.TextSpan.innerHTML=outItem.HTMLText
+            else item.TextSpan.innerText=outItem.Text;
+
             item.TextSpan.style.color=outItem.Color;
+            item.TextTd.style.color=outItem.Color;
 
             if (outItem.ClassName) 
             {
@@ -145645,9 +145717,21 @@ function JSFloatTooltip()
             {
                 if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
             }
+
+            if (outItem.IsMergeCell)    //合并单元格
+            {
+                item.TitleTd.colspan=2;
+                item.TextTd.style.display="none";
+            }
+            else
+            {
+                if (item.TitleTd.colspan!=1) item.TitleTd.colspan=1;
+                item.TextTd.style.display="";
+            }
            
             item.Tr.style.display="";
-            if (item.Tr2) item.Tr2.style.display="";
+            if (item.Tr2) item.Tr2.style.display="none";
+
         }
 
         for( ; index<this.MaxRowCount; ++index)
@@ -145755,6 +145839,13 @@ function JSFloatTooltip()
             }
         }
 
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_KLINE_INFO_FLOAT_TOOLTIP);
+        if (event && event.Callback)
+        {
+            var sendData={ AryText:aryText, Data:data, HQChart:this.HQChart };
+            event.Callback(event, sendData, this);
+        }
+
         this.AryText=aryText;
 
         this.UpdateTableDOM();
@@ -145767,6 +145858,36 @@ function JSFloatTooltip()
         }
     }
 
+    this.UpdatChartScatterPlotTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !tooltipData.Data.Data || !tooltipData.Data.Data.Tooltip) return;
+        var aryData=tooltipData.Data.Data.Tooltip;
+        var aryText=[]; //输出内容
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (!item.Text && !item.Title) continue;
+            var rowItem={ Title:"", Text:"", Color:this.ValueColor };
+            if (item.Title) rowItem.Title=item.Title;
+            if (item.Text) rowItem.Text=item.Text;
+            if (item.TextColor) rowItem.Color=item.TextColor;
+
+            aryText.push(rowItem);
+        }
+
+        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);
+        }
+    }
+
 
     /////////////////////////////////////////////////////////////////////////////////////////////
     // 公告数据格式化
@@ -147164,7 +147285,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14055";
+var HQCHART_VERSION="1.1.14063";
 
 function PrintHQChartVersion()
 {