hqchart 1.1.14056 → 1.1.14072

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

@@ -4024,7 +4024,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
     //改参数div
     this.ModifyIndexDialog=new ModifyIndexDialog(divElement);
-    this.ChangeIndexDialog=new ChangeIndexDialog(divElement);
 
     //额外的画布
     this.MapExtraCanvasElement=new Map();   //key=画布名字, value={ Element:, Canvas:}
@@ -4260,7 +4259,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         var pixelRatio=GetDevicePixelRatio();
         
@@ -4713,7 +4711,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
         
         //右键菜单
         if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
@@ -4816,7 +4813,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         var pixelRatio=GetDevicePixelRatio();
 
@@ -5398,7 +5394,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         if (option.ScriptError) chart.ScriptErrorCallback=option.ScriptError;
 
@@ -5695,9 +5690,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             chart.InitalFloatTooltip(option.FloatTooltip);
 
         if (option.SelectRectDialog && option.SelectRectDialog.Enable)
-        {
             chart.InitalSelectRectDialog(option.SelectRectDialog);
-        }
+
+        if (option.SearchIndexDialog && option.SearchIndexDialog.Enable)
+            chart.InitalSearchIndexDialog(option.SearchIndexDialog);
 
         //注册事件
         if (option.EventCallback)
@@ -6412,6 +6408,12 @@ JSChart.GetScrollPosition=function()
     return GetScrollPosition();
 }
 
+//品种小数位数
+JSChart.GetfloatPrecision=function(symbol)
+{
+    return GetfloatPrecision(symbol);
+}
+
 
 
 
@@ -6610,6 +6612,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=
@@ -7014,6 +7017,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogTooltip;     //tooltip信息 
     this.DialogSelectRect;  //区间统计
     this.FloatTooltip;      //浮动tooltip信息
+    this.DialogSearchIndex; //指标搜索
 
 
     this.ClearStockCache=function()
@@ -7074,6 +7078,34 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogSelectRect.Create();
     }
 
+    this.InitalSearchIndexDialog=function(option)
+    {
+        if (this.DialogSearchIndex) return;
+
+        this.DialogSearchIndex=new JSDialogSearchIndex();
+        this.DialogSearchIndex.Inital(this, option);
+        this.DialogSearchIndex.Create();
+    }
+
+    this.ShowChangeIndexDialog=function(data)
+    {
+        if (!data) return;
+        if (!this.DialogSearchIndex) return;
+
+        data.Title=`切换指标 [窗口${data.WindowIndex+1}]`;
+        this.DialogSearchIndex.SetOpData(data);
+        this.DialogSearchIndex.Show();
+    }
+
+    this.ShowAddOverlayIndexDialog=function(data)
+    {
+        if (!data) return;
+        if (!this.DialogSearchIndex) return;
+
+        data.Title=`添加叠加指标 [窗口${data.WindowIndex+1}]`;
+        this.DialogSearchIndex.SetOpData(data);
+        this.DialogSearchIndex.Show();
+    }
     
 
     this.DrawSelectRectDialog=function()
@@ -7172,6 +7204,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.FloatTooltip=null;
     }
 
+    this.DestroySearchIndexDialog=function()
+    {
+        if (!this.DialogSearchIndex) return;
+
+        this.DialogSearchIndex.Destroy();
+        this.DialogSearchIndex=null;
+    }
+
 
 
     //obj={ Element:, Canvas: }
@@ -7225,6 +7265,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.StopAutoUpdate();
         this.DestroyTooltipDialog();
         this.DestroyFloatTooltip();
+        this.DestroySearchIndexDialog();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -10998,7 +11039,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 +11162,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 +11190,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 +11216,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 +11246,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 +11275,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 +11304,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 +11331,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();
@@ -12138,6 +12248,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
         if (this.FloatTooltip) this.FloatTooltip.ReloadResource(option);
         if (this.DialogSelectRect) this.DialogSelectRect.ReloadResource(option);
+        if (this.DialogSearchIndex) this.DialogSearchIndex.ReloadResource(option);
     }
 
     this.ReloadBorder=function(option)  //根据页面缩放调整对应边框的尺长
@@ -14473,7 +14584,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 +17594,7 @@ function AverageWidthFrame()
     {
         if (lineType==-1) return;
 
-        if (lineType==0)
+        if (lineType==0)    //直线
         {
             var pixelRatio=GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;
@@ -17529,7 +17640,7 @@ function AverageWidthFrame()
             }
             this.Canvas.stroke();
         }
-        else
+        else if (lineType==1 || lineType==2)    //虚线
         {
             this.DrawDotLine(left,right,y, color, option);
         }
@@ -17771,7 +17882,6 @@ function MinuteFrame()
     this.OverlayIndex=g_JSChartResource.MinuteToolbar.OverlayIndex;    //是否显示叠加指标
 
     this.ModifyIndexEvent;   //改参数 点击事件
-    this.ChangeIndexEvent;   //换指标 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.IsShowPositionTitle=false; //是否显示持仓标题
 
@@ -20201,7 +20311,6 @@ function KLineFrame()
     this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
 
     this.ModifyIndexEvent;   //改参数 点击事件
-    this.ChangeIndexEvent;   //换指标 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.ReDrawToolbar=false;
 
@@ -43910,203 +44019,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 +44230,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 +44980,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;
             }
         }
@@ -73357,6 +73271,19 @@ function JSChartResource()
         }
     };
 
+    //指标搜索
+    this.DialogSearchIndex=
+    {
+        BGColor:'rgb(250,250,250)',         //背景色
+        BorderColor:'rgb(20,20,20)',        //边框颜色
+        TitleColor:'rgb(250,250,250)',       //标题颜色
+        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+
+        IndexNameColor:"rgb(0,0,0)",             //数值名称
+        GroupNameColor:"rgb(0,0,0)",
+        InputTextColor:"rgb(0,0,0)"
+    };
+
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -74422,6 +74349,20 @@ function JSChartResource()
             }
         }
 
+        if (style.DialogSearchIndex)
+        {
+            var item=style.DialogSearchIndex;
+
+            if (item.BGColor) this.DialogSearchIndex.BGColor=item.BGColor;
+            if (item.BorderColor) this.DialogSearchIndex.BorderColor=item.BorderColor;
+            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
+            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
+            
+            if (item.IndexNameColor) this.DialogSearchIndex.IndexNameColor=item.IndexNameColor;
+            if (item.GroupNameColor) this.DialogSearchIndex.GroupNameColor=item.GroupNameColor;
+            if (item.InputTextColor) this.DialogSearchIndex.InputTextColor=item.InputTextColor;
+        }
+
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -77506,7 +77447,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             frame.GlobalOption=this.GlobalOption;
 
             if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-            if (this.ChangeIndexDialog) frame.ChangeIndexEvent=this.ChangeIndexDialog.DoModal;
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -77591,7 +77531,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         frame.GlobalOption=this.GlobalOption;
 
         if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-        if (this.ChangeIndexDialog) frame.ChangeIndexEvent=this.ChangeIndexDialog.DoModal;
 
         frame.HorizontalMax=20;
         frame.HorizontalMin=10;
@@ -83589,9 +83528,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.CHANGE_INDEX)
         {
             var frame=button.Frame;
+            var sendData={ e:e, WindowIndex:frame.Identify, OpType:1 };
+            this.ShowChangeIndexDialog(sendData);
+            /*
             e.data={ Chart:this, Identify:frame.Identify, IsOverlay:false };
             if (frame.ChangeIndexEvent) 
                 frame.ChangeIndexEvent(e);
+            */
         }
         else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
         {
@@ -83603,9 +83546,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
         {
             var frame=button.Frame;
+            var sendData={ e:e, WindowIndex:frame.Identify, OpType:2 };
+            this.ShowAddOverlayIndexDialog(sendData);
+            /*
             e.data={ Chart:this, Identify:frame.Identify, IsOverlay:true };
             if (frame.ChangeIndexEvent) 
                 frame.ChangeIndexEvent(e);
+            */
         }
         else if (button.ID==JSCHART_BUTTON_ID.MAX_MIN_WINDOW)
         {
@@ -83856,29 +83803,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;
@@ -84441,9 +84365,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.CHANGE_INDEX)
         {
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:frame.Identify, IsOverlay:false };
-            if (frame.ChangeIndexEvent) 
-                frame.ChangeIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, OpType:1 };
+            this.ShowChangeIndexDialog(sendData);
         }
         else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
         {
@@ -84455,9 +84378,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
         {
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:frame.Identify, IsOverlay:true };
-            if (frame.ChangeIndexEvent) 
-                frame.ChangeIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, OpType:2 };
+            this.ShowAddOverlayIndexDialog(sendData);
         }
         else if (button.ID==JSCHART_BUTTON_ID.MAX_MIN_WINDOW)
         {
@@ -86219,7 +86141,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (i>=2)
             {
                 if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-                if (this.ChangeIndexDialog) frame.ChangeIndexEvent=this.ChangeIndexDialog.DoModal;
             }
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
@@ -86311,7 +86232,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (id>=2)
         {
             if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-            if (this.ChangeIndexDialog) frame.ChangeIndexEvent=this.ChangeIndexDialog.DoModal;
         }
 
         var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
@@ -91886,7 +91806,6 @@ function KLineChartHScreenContainer(uielement)
             frame.RightSpaceCount=this.RightSpaceCount; //右边
 
             if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-            if (this.ChangeIndexDialog) frame.ChangeIndexEvent=this.ChangeIndexDialog.DoModal;
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -94716,266 +94635,6 @@ function ModifyIndexDialog(divElement)
     }
 }
 
-//换指标
-function ChangeIndexDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.DivElement=divElement;   //父节点
-    //this.IndexTreeApiUrl="../commonindextree.json";               //数据下载地址
-    //this.OverlayIndexTreeApiUrl="../commonindextree.json";        //叠加指标列表数据下载地址
-    this.IsOverlayIndex=false;
-
-    this.Create=function()
-    {
-        var div=document.createElement('div');
-        div.className='jchart-changeindex-box';
-        div.id=this.ID=Guid();
-        div.innerHTML=
-        '<div class="target-panel">\n' +
-            '            <div class="target-header">\n' +
-            '                <span>换指标</span>\n' +
-            '                <strong class="close-tar icon iconfont icon-close"></strong>\n' +
-            '            </div>\n' +
-            '            <div class="target-content">\n' +
-            '                <div class="target-left">\n' +
-            '                    <input type="text">\n' +
-            '                    <ul></ul>\n' +
-            '                </div>\n' +
-            '                <div class="target-right">\n' +
-            '                    <ul></ul>\n' +
-            '                </div>\n' +
-            '            </div>\n' +
-            '        </div>';
-
-        this.DivElement.appendChild(div);
-    }
-
-    //指标菜单内容
-    this.GetMenuData=function()
-    {
-        var data={
-            "name":"页面通用版指标树",
-            "list":
-            [
-                { 
-                    "node":"超买超卖型",
-                    "list":
-                    [
-                        {"name":"ADTM 动态买卖气指标",      "id":"ADTM"},
-                        {"name":"BIAS 乖离率",              "id":"BIAS"},
-                        {"name":"BIAS36 三六乖离",          "id":"BIAS36"},
-                        {"name":"BIAS_QL 乖离率-传统版",    "id":"BIAS_QL"},
-                        {"name":"CCI 商品路径指标",         "id":"CCI"},
-                        {"name":"FSL 分水岭",               "id":"FSL"},
-                        {"name":"KDJ 随机指标",             "id":"KDJ"},
-                        {"name":"MTM 动量线",               "id":"MTM"},
-                        {"name":"OSC 变动速率线",            "id":"OSC"},
-                        {"name":"RSI 相对强弱指标",           "id":"RSI"},
-                        {"name":"ROC 变动率指标",             "id":"ROC"},
-                        {"name":"WR 威廉指标",                  "id":"WR"}
-                    ]
-                },
-                {
-                    "node":"趋势型",
-                    "list":
-                    [
-                        {"name":"CHO 济坚指数",         "id":"CHO"},
-                        {"name":"DMA 平均差",           "id":"DMA"},
-                        {"name":"DMI 趋向指标",         "id":"DMI"},
-                        {"name":"EMV 简易波动指标",     "id":"EMV"},
-                        {"name":"MACD 平滑异同平均",    "id":"MACD"},
-                        {"name":"TRIX 三重指数平均线",  "id":"TRIX"},
-                        {"name":"UOS 终极指标",         "id":"UOS"},
-                        {"name":"TRIX 三重指数平均线",  "id":"TRIX"}
-                    ]
-                },
-                { 
-                    "node":"成交量型",
-                    "list":
-                    [
-                        {"name":"HSL 换手率",           "id":"HSL"},
-                        {"name":"OBV 累积能量线",       "id":"OBV"},
-                        {"name":"NVI 负成交量",         "id":"NVI"},
-                        {"name":"PVI 正成交量",         "id":"PVI"},
-                        {"name":"VOL 成交量",           "id":"VOL"}
-                    ]
-                },
-                {
-                    "node":"均线型",
-                    "list":
-                    [
-                        {"name":"MA 均线", "id":"均线"},
-                        {"name":"BBI 多空线", "id":"BBI"}
-                    ]
-                },
-                {
-                    "node":"路径型",
-                    "list":
-                    [
-                        {"name":"BOLL 布林线",          "id":"BOLL"},
-                        {"name":"BOLL副图 布林线",      "id":"BOLL副图"},
-                        {"name":"MIKE 麦克支撑压力",    "id":"MIKE"},
-                        {"name":"ENE 轨道线",           "id":"ENE"}
-                    ]
-                },
-                {
-                    "node":"能量型",
-                    "list":
-                    [
-                        {"name":"BRAR 情绪指标",            "id":"BRAR"},
-                        {"name":"CYR 市场强弱",             "id":"CYR"},
-                        {"name":"MASS 梅斯线",              "id":"MASS"},
-                        {"name":"PSY 心理线",               "id":"PSY"},
-                        {"name":"CR 带状能量线",            "id":"CR"},
-                        {"name":"VR 成交量变异率",          "id":"VR"},
-                        {"name":"WAD 威廉多空力度线",        "id":"WAD"}
-                    ]
-                }
-        
-            ]
-        };
-
-        return data;
-    }
-
-    //下载数据 如果上次下载过可以 可以不用下载
-    this.ReqeustData=function()
-    {
-        if($("#" + this.ID + " .target-left ul li").length>0){
-            return false;
-        }
-
-        var res=this.GetMenuData();
-        var item = res.list;
-        changeIndexLeftList(item);   //处理左侧list列表
-        changeIndexRightList(item);  //处理右侧内容列表
-
-        /*
-        var url = this.IndexTreeApiUrl;
-        if (this.IsOverlayIndex==true) url=this.OverlayIndexTreeApiUrl;
-        JSNetwork.HttpRequest({
-            url: url,
-            type: 'get',
-            success: function (res) {
-                var item = res.list;
-                changeIndexLeftList(item);   //处理左侧list列表
-                changeIndexRightList(item);  //处理右侧内容列表
-            }
-        });
-        */
-
-        //处理左侧list列表
-        function changeIndexLeftList(item) {
-            $(".target-left ul").html('');
-            $.each(item,function(i,result){
-                var htmlList;
-                htmlList = '<li>' + result.node + '</li>';
-                $(".target-left ul").append(htmlList);
-            });
-            //默认选中第一项
-            $(".target-left ul li:first-child").addClass("active-list");
-        }
-        //处理右侧内容列表
-        function changeIndexRightList(listNum) {
-            var contentHtml;
-            var conData = [];
-            $.each(listNum,function(index,result){
-                conData.push(result.list);
-            })
-            //页面初始化时显示第一个列表分类下的内容
-            $.each(conData[0],function (i, res) {
-                contentHtml = '<li id='+res.id+'>'+ res.name +'</li>';
-                $(".target-right ul").append(contentHtml);
-            })
-            //切换list
-            $(".target-left ul").delegate("li","click",function () {
-                $(this).addClass("active-list").siblings().removeClass("active-list");
-                var item = $(this).index();
-                $(".target-right ul").html("");
-                $.each(conData[item],function (i, res) {
-                    contentHtml = '<li id='+res.id+'>'+ res.name +'</li>';
-                    $(".target-right ul").append(contentHtml);
-                })
-            })
-        }
-    }
-
-    this.BindClose=function(chart)
-    {
-        //关闭按钮
-        $("#"+this.ID+" .close-tar").click(
-            {
-                Chart:chart,
-            },
-            function(event)
-            {
-                var chart=event.data.Chart;
-                chart.ChangeIndexDialog.Hide();
-            }
-        );
-    }
-
-    //搜索事件
-    this.BindSearch=function(chart)
-    {
-        $(".target-left input").on('input',
-            {
-                Chart:chart
-            },
-            function(event)
-            {
-                let scriptData = new JSIndexScript();
-                let result=scriptData.Search(event.target.value);
-
-                $(".target-right ul").html("");
-                for(var i in result)
-                {
-                    var name=result[i];
-                    var contentHtml = '<li id='+name+'>'+ name +'</li>';
-                    $(".target-right ul").append(contentHtml);
-                }
-                
-            }
-        );
-    }
-
-    this.DoModal=function(event)
-    {
-        var chart=event.data.Chart;
-        var identify=event.data.Identify;
-        var dialog=chart.ChangeIndexDialog;
-        var isOverlay=event.data.IsOverlay; //是否叠加
-
-        if(!dialog) return;
-
-        if (dialog.ID==null) dialog.Create();   //第1次 需要创建div
-        dialog.IsOverlayIndex=isOverlay;
-        dialog.ReqeustData();   //下载数据
-
-        //切换窗口指标类型  每次委托事件执行之前，先用undelegate()解除之前的所有绑定
-        changeIndeWindow();
-        function changeIndeWindow() 
-        {
-            $(".target-right ul").undelegate().delegate("li","click",function () {
-                var idv = $(this).attr("id");
-                if (isOverlay)
-                    chart.AddOverlayIndex({WindowIndex:identify,IndexName:idv});
-                else
-                    chart.ChangeIndex(identify,idv);
-                $(this).addClass("active-list").siblings().removeClass("active-list");
-            });
-        }
-
-        dialog.BindSearch(chart);
-        //关闭弹窗
-        dialog.BindClose(chart);
-        dialog.Show();
-    }
-}
-
 //等待动画窗口
 function WaitDialog(divElement)
 {
@@ -125550,6 +125209,17 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
+        DialogSearchIndex:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+            TitleColor:'rgb(230,230,230)',       //标题颜色
+
+            IndexNameColor:"rgb(210,210,210)",       
+            GroupNameColor:"rgb(210,210,210)",      
+            InputTextColor:"rgb(210,210,210)", 
+        },
+
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -145099,7 +144769,7 @@ function JSDialogTooltip()
         if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
 
         this.UpdateTableDOM();
-    },
+    }
 
 
     /////////////////////////////////////////////////////////////////////////////////////////////
@@ -145385,7 +145055,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 +145070,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 +145228,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 +145323,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 +145516,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 +145535,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 +145657,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 +145676,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);
+        }
+    }
+
 
     /////////////////////////////////////////////////////////////////////////////////////////////
     // 公告数据格式化
@@ -147043,6 +146982,609 @@ function JSDialogSelectRect()
 
 
 
+
+/*
+   Copyright (c) 2018 jones
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   内置指标搜索对话框
+*/
+
+
+function JSDialogSearchIndex()
+{
+    this.DivDialog=null;
+    this.DragTitle=null;
+    this.TitleBox=null; //{ DivTitle, DivName, DivName }
+    this.InputDom=null;
+    this.Style=0;       //样式 预留
+
+    this.HQChart=null;
+
+    //{ WindowIndex:窗口索引, OpType:1=切换主图指标 2=添加叠加指标,  Title: };  
+    this.OpData=null;        
+
+    this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
+    this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
+    this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
+    this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
+    this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
+    this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
+    this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
+
+    this.MaxRowCount=30;    //行
+    this.ColCount=3;        //列
+    this.MaxGroupCount=10;  //分类最多个数
+
+    this.AryData=[];
+    this.AryGroup=[];   //分类
+    this.IndexData=JSDialogSearchIndex.GetDefaultIndexData();
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+            if (option.IndexData) this.IndexData=option.IndexData;
+        }
+    }
+
+    this.Destroy=function()
+    {
+        this.AryData=[];
+        this.AryGroup=[];
+        this.IndexData=null;
+        this.InputDom=null;
+       
+        if (this.DivDialog) 
+        {
+            document.body.removeChild(this.DivDialog);
+            this.DivDialog=null;
+        }
+    }
+
+    this.OnClickColseButton=function(e)
+    {
+        this.Close(e);
+    }
+
+    //设置当前窗口数据
+    this.SetOpData=function(data)
+    {
+        this.OpData=data;
+    }
+
+    this.Close=function(e)
+    {
+        this.OpData=null;
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style.visibility='hidden';
+    }
+
+    this.OnMouseDownTitle=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        var dragData={ X:e.clientX, Y:e.clientY };
+        dragData.YOffset=e.clientX - this.DivDialog.offsetLeft;
+        dragData.XOffset=e.clientY - this.DivDialog.offsetTop;
+        this.DragTitle=dragData;
+
+        document.onmousemove=(e)=>{ this.DocOnMouseMoveTitle(e); }
+        document.onmouseup=(e)=>{ this.DocOnMouseUpTitle(e); }
+    }
+
+    this.DocOnMouseMoveTitle=function(e)
+    {
+        if (!this.DragTitle) return;
+
+        var left = e.clientX - this.DragTitle.YOffset;
+        var top = e.clientY - this.DragTitle.XOffset;
+
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+ this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
+        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+
+        this.DivDialog.style.left = left + 'px';
+        this.DivDialog.style.top = top + 'px';
+
+        if(e.preventDefault) e.preventDefault();
+    }
+
+    this.DocOnMouseUpTitle=function(e)
+    {
+        this.DragTitle=null;
+        this.onmousemove = null;
+        this.onmouseup = null;
+    }
+
+    this.Show=function(x, y, groupID)
+    {
+        if (!this.DivDialog) return;
+
+        if (!groupID) groupID=this.IndexData.Data[0].Group.ID;
+        
+        this.UpdateGroupData();
+        this.ChangeGroup(groupID);
+
+        if (this.OpData && this.OpData.Title) this.TitleBox.DivName.innerText=this.OpData.Title;
+
+        if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y))   //默认居中显示
+        {
+            var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+            x=rtClient.left+(rtClient.right-rtClient.left-this.DivDialog.offsetWidth)/2;
+            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2;
+        }
+
+        this.InputDom.value="";
+
+        this.DivDialog.style.visibility='visible';
+        this.DivDialog.style.top = y + "px";
+        this.DivDialog.style.left = x + "px";
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement("div");
+        divDom.className='UMyChart_SearchIndex_Dialog_Div';
+
+        //对话框标题栏
+        var divTitle=document.createElement("div");
+        divTitle.className='UMyChart_SearchIndex_Title_Div';
+        divTitle.onmousedown=(e)=>{   this.OnMouseDownTitle(e);}
+        divDom.appendChild(divTitle);
+
+        var divName=document.createElement("div");
+        divName.className='UMyChart_SearchIndex_Name_Div';
+        divName.innerText="指标搜索";
+        divTitle.appendChild(divName);
+
+        var divClose=document.createElement("div");
+        divClose.className='UMyChart_SearchIndex_Close_Div';
+        divClose.innerText="x";
+        divClose.onmousedown=(e)=>{ this.OnClickColseButton(e); }
+        divTitle.appendChild(divClose);
+        
+        //整个框子
+        var divFrame=document.createElement("div");
+        divFrame.className="UMyChart_SearchIndex_Frome_Div";
+        divDom.appendChild(divFrame);
+
+        //搜索框
+        var divInput=document.createElement("div");
+        divInput.className="UMyChart_SearchIndex_Input_Div";
+        divFrame.appendChild(divInput);
+
+        var input=document.createElement("input");
+        input.className='UMyChart_SearchIndex_Input';
+        input.type="text";
+        input.placeholder="输入指标名称"
+        input.addEventListener("input", (e)=>{this.OnInputSearch(e); })
+        divInput.appendChild(input);
+        this.InputDom=input;
+
+        //分类+指标内容
+        var divContainer=document.createElement("div");
+        divContainer.className="UMyChart_SearchIndex_Container_Div";
+        divDom.appendChild(divContainer);
+
+        //分类
+        var divGroup=document.createElement("div");
+        divGroup.className="UMyChart_SearchIndex_GroupList_Div";
+        divContainer.appendChild(divGroup);
+
+        for(var i=0, j=0;i<this.MaxGroupCount;++i)
+        {
+            var groupItem={ Div:null, Span:null };
+            var divItem=document.createElement("div");
+            divItem.className="UMyChart_SearchIndex_Group_Div";
+            divGroup.appendChild(divItem);
+            groupItem.Div=divItem;
+
+            var spanDom=document.createElement("span");
+            spanDom.className='UMyChart_SearchIndex_Group_Span';
+            spanDom.innerText='分类名称';
+            divItem.appendChild(spanDom);
+            groupItem.Span=spanDom;
+
+            spanDom.onmousedown=(e)=>{ this.OnClickGroup(e); }
+
+            this.AryGroup.push(groupItem);
+        }
+
+
+        //表格
+        var divTable=document.createElement("div");
+        divTable.className='UMyChart_SearchIndex_Table_Div';
+        divContainer.appendChild(divTable);
+        
+        var table=document.createElement("table");
+        table.className="UMyChart_SearchIndex_Table";
+        divTable.appendChild(table);
+
+        var tbody=document.createElement("tbody");
+        tbody.className="UMyChart_SearchIndex_Tbody";
+        table.appendChild(tbody);
+
+        this.AryData=[];
+       
+        for(var i=0, j=0;i<this.MaxRowCount;++i)
+        {
+            var rowItem={ Tr:null, AryCell:[] };
+
+            var trDom=document.createElement("tr");
+            trDom.className='UMyChart_SearchIndex_Group_Tr';
+            tbody.appendChild(trDom);
+            rowItem.Tr=trDom;
+
+            for(j=0; j<this.ColCount;++j)
+            {
+                var cellItem=this.CreateCellDOM(i,j,trDom);
+                rowItem.AryCell.push(cellItem);
+            }
+
+            this.AryData.push(rowItem);
+        }
+        
+        document.body.appendChild(divDom);
+
+        this.DivName=divName;
+        this.DivDialog=divDom;
+        this.TitleBox={ DivTitle:divTitle, DivName:divName, DivColor:divClose };
+
+        this.UpdateStyle();
+    }
+
+    this.CreateCellDOM=function(rowID, colID, trDom)
+    {
+        var cellItem={ Td:null, Span:null, RowID:rowID, ColID:colID, IndexItem:null };
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_SearchIndex_Text_Td";   //指标名称
+        trDom.appendChild(tdDom);
+        cellItem.Td=tdDom;
+
+        var spanDom=document.createElement("span");
+        spanDom.className='UMyChart_SearchIndex_Text_Span';
+        spanDom.innerText='指标名称';
+        spanDom.onmousedown=(e)=>{ this.OnClickIndex(e, cellItem); }
+        tdDom.appendChild(spanDom);
+        cellItem.Span=spanDom;
+
+        return cellItem;
+    }
+
+
+    this.OnClickIndex=function(e, cellItem)
+    {
+        if (!this.OpData) return;
+        if (!cellItem || !cellItem.IndexItem) return;
+
+        if (this.OpData.OpType==1)
+        {
+            if (!IFrameSplitOperator.IsNumber(this.OpData.WindowIndex)) return;
+            var indexItem=cellItem.IndexItem;
+            if (indexItem.Type==0)  //系统指标
+            {
+                this.HQChart.ChangeIndex(this.OpData.WindowIndex, indexItem.ID );
+            }
+            else if (indexItem.Type==1) //自定义通达性
+            {
+
+            }
+            else if (indexItem.Type==2) //api指标
+            {
+
+            }
+        }
+        else if (this.OpData.OpType==2)
+        {
+            if (!IFrameSplitOperator.IsNumber(this.OpData.WindowIndex)) return;
+            var indexItem=cellItem.IndexItem;
+
+            if (indexItem.Type==0)  //系统指标
+            {
+                var obj={ WindowIndex:this.OpData.WindowIndex, IndexName:indexItem.ID };
+                this.HQChart.AddOverlayIndex(obj);
+            }
+            else if (indexItem.Type==1) //自定义通达性
+            {
+
+            }
+            else if (indexItem.Type==2) //api指标
+            {
+
+            }
+        }
+        
+    }
+
+    this.OnClickGroup=function(e)
+    {
+        if (!e.target) return false;
+        var groupID=e.target.dataset.groupid;
+        if (!groupID) return false;
+
+        this.ChangeGroup(groupID);
+    }
+
+    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;
+
+        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
+        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
+
+        if (this.InputTextColor) this.InputDom.style['color']=this.InputTextColor;
+    };
+
+    this.ChangeGroup=function(groupID)
+    {
+        if (!this.IndexData) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.IndexData.Data)) return;
+
+        var findItem=null;
+        for(var i=0; i<this.IndexData.Data.length; ++i)
+        {
+            var item=this.IndexData.Data[i];
+            if (item.Group.ID==groupID)
+            {
+                findItem=item;
+                break;
+            }
+        }
+
+        if (!findItem) return;
+
+        this.UpdateTableData(findItem);
+    }
+
+    //左侧分类
+    this.UpdateGroupData=function()
+    {
+        var index=0;
+        for(index=0; index<this.IndexData.Data.length && index<this.AryGroup.length; ++index)
+        {
+            var item=this.IndexData.Data[index];
+            var cell=this.AryGroup[index];
+            cell.Span.innerText=item.Group.Name;
+            cell.Span.dataset.groupid=item.Group.ID;
+            cell.Span.dataset.groupname=item.Group.Name;
+            cell.Span.style.color=this.GroupNameColor;
+
+            if (cell.Div.style.display=="none") cell.Div.style.display="";
+        }
+
+        for(; index<this.AryGroup.length; ++index)
+        {
+            var cell=this.AryGroup[index];
+            cell.Div.style.display="none";
+        }
+    }
+
+    this.UpdateTableData=function(data)
+    {   
+        var rowIndex=0;
+        for(var j=0, index=0;rowIndex<this.AryData.length && index<data.AryIndex.length ;++rowIndex)
+        {
+            var row=this.AryData[rowIndex];
+            var cellCount=0;
+            for(j=0;j<row.AryCell.length;++j)
+            {
+                var cell=row.AryCell[j];
+                if (index<data.AryIndex.length)
+                {
+                    var indexItem=data.AryIndex[index];
+                    cell.Span.innerText=indexItem.Name;
+                    cell.Span.style.color=this.IndexNameColor;
+                    if (cell.Td.style.display=="none") cell.Td.style.display="";
+                    cell.IndexItem=indexItem;
+                    ++index;
+                    ++cellCount;
+                }
+                else
+                {
+                    cell.Td.style.display="none";
+                }
+            }
+
+            if (cellCount>0)
+            {
+                if (row.Tr.style.display=="none") row.Tr.style.display="";
+            }
+            else
+            {
+                row.Tr.style.display=="none";
+            }
+        }
+
+        for(; rowIndex<this.AryData.length; ++rowIndex)
+        {
+            var row=this.AryData[rowIndex];
+            row.Tr.style.display="none";
+        }
+    }
+
+    //搜索
+    this.OnInputSearch=function(e)
+    {
+        var strSearh=e.target.value;
+        var aryIndex=[];
+
+        var aryData=this.SeachIndex(strSearh);
+        var setIndex=new Set();
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var key=`${item.ID}-${item.Type}`;
+            setIndex.add(key);
+            aryIndex.push(item);
+        }
+
+        //内置指标
+        var scriptData = new JSIndexScript();
+        var result=scriptData.Search(strSearh);
+        if (IFrameSplitOperator.IsNonEmptyArray(result))
+        {
+            for(var i=0;i<result.length;++i)
+            {
+                var id=result[i];
+                var key=`${id}-0`;
+                if (setIndex.has(key)) continue;
+
+                var item={Name:id, ID:id, Type:0 };
+                aryIndex.push(item);
+            }
+        }
+
+        this.UpdateTableData({ AryIndex:aryIndex })
+    }
+
+    this.SeachIndex=function(strSearch)
+    {
+        if (!this.IndexData || !IFrameSplitOperator.IsNonEmptyArray(this.IndexData.Data)) return [];
+
+        var aryData=[];
+        var upperSearch=strSearch.toUpperCase();
+        for(var i=0,j=0;i<this.IndexData.Data.length;++i)
+        {
+            var groupItem=this.IndexData.Data[i];
+            for(j=0;j<groupItem.AryIndex.length;++j)
+            {
+                var item=groupItem.AryIndex[j];
+                if (item.Name.indexOf(strSearch)>=0 || item.Name.indexOf(upperSearch)>=0)
+                {
+                    aryData.push(item);
+                }
+            }
+        }
+
+        return aryData;
+    }
+
+    //配色修改
+    this.ReloadResource=function(option)
+    {
+        this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
+        this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
+        this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
+        this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
+        this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
+        this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
+        this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
+
+        if (!this.DivDialog) return;
+
+        this.UpdateStyle();
+    }
+
+}
+
+
+JSDialogSearchIndex.GetDefaultIndexData=function()
+{
+    var data=
+    {
+        Name:"内置指标分类",
+        Data:
+        [
+            { 
+                Group:{ ID:"超买超卖型", Name:"超买超卖型"} , 
+                AryIndex:
+                [
+                    {Name:"ADTM 动态买卖气指标", ID:"ADTM", Type:0 },      //Type:0=系统指标 1=自定义通达信脚本 2=api指标
+                    {Name:"BIAS 乖离率", ID:"BIAS", Type:0},
+                    {Name:"BIAS36 三六乖离", ID:"BIAS36", Type:0 },
+                    {Name:"BIAS_QL 乖离率-传统版", ID:"BIAS_QL", Type:0 },
+                    {Name:"CCI 商品路径指标",ID:"CCI", Type:0 },
+                    {Name:"FSL 分水岭",ID:"FSL", Type:0},
+                    {Name:"KDJ 随机指标",ID:"KDJ", Type:0},
+                    {Name:"MTM 动量线", ID:"MTM", Type:0},
+                    {Name:"OSC 变动速率线", ID:"OSC", Type:0},
+                    {Name:"RSI 相对强弱指标", ID:"RSI", Type:0},
+                    {Name:"ROC 变动率指标", ID:"ROC", Type:0},
+                    {Name:"WR 威廉指标", ID:"WR", Type:0}
+                ]
+            },
+
+            {
+                Group:{ ID:"趋势型", Name:"趋势型"}, 
+                AryIndex:
+                [
+                    {Name:"CHO 济坚指数",         ID:"CHO", Type:0 },
+                    {Name:"DMA 平均差",           ID:"DMA", Type:0 },
+                    {Name:"DMI 趋向指标",         ID:"DMI", Type:0 },
+                    {Name:"EMV 简易波动指标",     ID:"EMV", Type:0 },
+                    {Name:"MACD 平滑异同平均",    ID:"MACD", Type:0 },
+                    {Name:"TRIX 三重指数平均线",  ID:"TRIX", Type:0 },
+                    {Name:"UOS 终极指标",         ID:"UOS", Type:0 },
+                    {Name:"TRIX 三重指数平均线",  ID:"TRIX", Type:0 }
+                ]
+            },
+
+            { 
+                Group:{ ID:"成交量型", Name:"成交量型"}, 
+                AryIndex:
+                [
+                    {Name:"HSL 换手率",           ID:"HSL", Type:0},
+                    {Name:"OBV 累积能量线",       ID:"OBV", Type:0},
+                    {Name:"NVI 负成交量",         ID:"NVI", Type:0},
+                    {Name:"PVI 正成交量",         ID:"PVI", Type:0},
+                    {Name:"VOL 成交量",           ID:"VOL", Type:0}
+                ]
+            },
+            {
+                Group:{ ID:"均线型", Name:"均线型"} , 
+                AryIndex:
+                [
+                    {Name:"MA 均线", ID:"MA", Type:0},
+                    {Name:"BBI 多空线", ID:"BBI", Type:0}
+                ]
+            },
+            {
+                Group:{ ID:"路径型", Name:"路径型"} , 
+                AryIndex:
+                [
+                    {Name:"BOLL 布林线",          ID:"BOLL", Type:0},
+                    {Name:"BOLL副图 布林线",      ID:"BOLL副图", Type:0},
+                    {Name:"MIKE 麦克支撑压力",    ID:"MIKE", Type:0},
+                    {Name:"ENE 轨道线",           ID:"ENE", Type:0}
+                ]
+            },
+            {
+                Group:{ ID:"能量型", Name:"能量型"} , 
+                AryIndex:
+                [
+                    {Name:"BRAR 情绪指标",            ID:"BRAR", Type:0},
+                    {Name:"CYR 市场强弱",             ID:"CYR", Type:0},
+                    {Name:"MASS 梅斯线",              ID:"MASS", Type:0},
+                    {Name:"PSY 心理线",               ID:"PSY", Type:0},
+                    {Name:"CR 带状能量线",            ID:"CR", Type:0},
+                    {Name:"VR 成交量变异率",          ID:"VR", Type:0},
+                    {Name:"WAD 威廉多空力度线",        ID:"WAD", Type:0}
+                ]
+            }
+        ]
+       
+    }
+
+    return data;
+}
+
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
@@ -147164,7 +147706,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14055";
+var HQCHART_VERSION="1.1.14071";
 
 function PrintHQChartVersion()
 {