hqchart 1.1.14056 → 1.1.14072

package/src/jscommon/umychart.js

@@ -55,7 +55,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:}
@@ -291,7 +290,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         var pixelRatio=GetDevicePixelRatio();
         
@@ -744,7 +742,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
         
         //右键菜单
         if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
@@ -847,7 +844,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         var pixelRatio=GetDevicePixelRatio();
 
@@ -1429,7 +1425,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        chart.ChangeIndexDialog=this.ChangeIndexDialog;
 
         if (option.ScriptError) chart.ScriptErrorCallback=option.ScriptError;
 
@@ -1726,9 +1721,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)
@@ -2443,6 +2439,12 @@ JSChart.GetScrollPosition=function()
     return GetScrollPosition();
 }
 
+//品种小数位数
+JSChart.GetfloatPrecision=function(symbol)
+{
+    return GetfloatPrecision(symbol);
+}
+
 
 
 
@@ -2641,6 +2643,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=
@@ -3045,6 +3048,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogTooltip;     //tooltip信息 
     this.DialogSelectRect;  //区间统计
     this.FloatTooltip;      //浮动tooltip信息
+    this.DialogSearchIndex; //指标搜索
 
 
     this.ClearStockCache=function()
@@ -3105,6 +3109,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()
@@ -3203,6 +3235,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: }
@@ -3256,6 +3296,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.StopAutoUpdate();
         this.DestroyTooltipDialog();
         this.DestroyFloatTooltip();
+        this.DestroySearchIndexDialog();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -7029,7 +7070,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
@@ -7134,6 +7193,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;
             
@@ -7155,6 +7221,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;
 
@@ -7174,8 +7247,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;
 
@@ -7197,6 +7277,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;
 
@@ -7219,6 +7306,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;
 
@@ -7241,6 +7335,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;
 
@@ -7261,6 +7362,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();
@@ -8169,6 +8279,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)  //根据页面缩放调整对应边框的尺长
@@ -10504,7 +10615,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;                                            //扩展属性
@@ -13514,7 +13625,7 @@ function AverageWidthFrame()
     {
         if (lineType==-1) return;
 
-        if (lineType==0)
+        if (lineType==0)    //直线
         {
             var pixelRatio=GetDevicePixelRatio();
             this.Canvas.strokeStyle=color;
@@ -13560,7 +13671,7 @@ function AverageWidthFrame()
             }
             this.Canvas.stroke();
         }
-        else
+        else if (lineType==1 || lineType==2)    //虚线
         {
             this.DrawDotLine(left,right,y, color, option);
         }
@@ -13802,7 +13913,6 @@ function MinuteFrame()
     this.OverlayIndex=g_JSChartResource.MinuteToolbar.OverlayIndex;    //是否显示叠加指标
 
     this.ModifyIndexEvent;   //改参数 点击事件
-    this.ChangeIndexEvent;   //换指标 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.IsShowPositionTitle=false; //是否显示持仓标题
 
@@ -16232,7 +16342,6 @@ function KLineFrame()
     this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
 
     this.ModifyIndexEvent;   //改参数 点击事件
-    this.ChangeIndexEvent;   //换指标 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.ReDrawToolbar=false;
 
@@ -39941,203 +40050,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()
@@ -40349,6 +40261,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)
@@ -41098,6 +41011,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;
             }
         }
@@ -69388,6 +69302,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 微软雅黑',   //字体
@@ -70453,6 +70380,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;
@@ -73537,7 +73478,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;
@@ -73622,7 +73562,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;
@@ -79620,9 +79559,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)
         {
@@ -79634,9 +79577,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)
         {
@@ -79887,29 +79834,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;
@@ -80472,9 +80396,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)
         {
@@ -80486,9 +80409,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)
         {
@@ -82250,7 +82172,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];
@@ -82342,7 +82263,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];
@@ -87917,7 +87837,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;
@@ -90747,266 +90666,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)
 {