hqchart 1.1.14045 → 1.1.14050

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

@@ -5691,6 +5691,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.TooltipDialog && option.TooltipDialog.Enable)
             chart.InitalTooltipDialog(option.TooltipDialog);
 
+        if (option.FloatTooltip && option.FloatTooltip.Enable)
+            chart.InitalFloatTooltip(option.FloatTooltip);
+
         if (option.SelectRectDialog && option.SelectRectDialog.Enable)
         {
             chart.InitalSelectRectDialog(option.SelectRectDialog);
@@ -6602,9 +6605,11 @@ var JSCHART_EVENT_ID=
     ON_CUSTOM_MINUTE_BG:157,                    //自定义分时图背景颜色
     ON_CLICK_HORIZONTAL_LABEL:158,              //点击Y轴刻度标签
 
-    ON_FORMAT_DIALOG_TOOLTIP_TEXT:159,          //格式化Tooltip对话框显示文字
+    ON_FORMAT_DIALOG_TOOLTIP:159,          //格式化Tooltip对话框显示文字
+
+    ON_CHANGE_KLINE_RIGHT:160,                  //切换复权
 
-    ON_CHANGE_KLINE_RIGHT:160,          //切换复权
+    ON_FORMAT_KLINE_FLOAT_TOOLTIP:161,          //格式化k线浮动框显示文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -7008,6 +7013,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.DialogTooltip;     //tooltip信息 
     this.DialogSelectRect;  //区间统计
+    this.FloatTooltip;      //浮动tooltip信息
 
 
     this.ClearStockCache=function()
@@ -7041,6 +7047,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogTooltip.Create();
     }
 
+    this.InitalFloatTooltip=function(option)
+    {
+        if (this.FloatTooltip) return;
+
+        this.FloatTooltip=new JSFloatTooltip();
+        this.FloatTooltip.Inital(this, option);
+        this.FloatTooltip.Create();
+    }
+
     this.InitalModifyDrawDialog=function()
     {
         if ( this.DialogModifyDraw) return;
@@ -7059,6 +7074,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogSelectRect.Create();
     }
 
+    
+
     this.DrawSelectRectDialog=function()
     {
         
@@ -7132,6 +7149,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogTooltip.Close();
     }
 
+    this.HideFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Hide();
+    }
+
     this.DestroyTooltipDialog=function()
     {
         if (!this.DialogTooltip) return;
@@ -7140,6 +7164,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogTooltip=null;
     }
 
+    this.DestroyFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Destroy();
+        this.FloatTooltip=null;
+    }
+
 
 
     //obj={ Element:, Canvas: }
@@ -7192,6 +7224,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.IsDestroy=true;
         this.StopAutoUpdate();
         this.DestroyTooltipDialog();
+        this.DestroyFloatTooltip();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -10963,6 +10996,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         
     }
 
+    this.DrawFloatTooltip=function(point,toolTip)
+    {
+
+    }
+
+    //更新实时行情到浮动tooltip
+    this.UpdateHQFloatTooltip=function(item)
+    {
+
+    }
+
     this.ShowTooltip=function(x,y,toolTip)
     {
         if (!this.IsShowTooltip) return;
@@ -10974,11 +11018,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.TooltipCache.Data=null;
         this.TooltipCache.X=x;
         this.TooltipCache.Y=y;
-
+        var bHideFloatToolip=true;
         if (toolTip.Type===0) //K线信息
         {
             if (!this.KLineTooltipConfig.Enable) return;
 
+            if (this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+
             var scrollPos=GetScrollPosition();
             var left = x;
             var top = y;
@@ -11172,6 +11223,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Tooltip.innerHTML=format.Text;
             this.Tooltip.style.display = "block";
         }
+
+
+        if (bHideFloatToolip) this.HideFloatTooltip();
     }
 
     this.UpdateDOMTooltip=function(toolTipType, data)
@@ -11208,6 +11262,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.TooltipCache.Data=null;
 
         if (this.Tooltip.style.display!="none") this.Tooltip.style.display = "none";
+
+        this.HideFloatTooltip();
     }
 
     this.UpdateSelectRect=function(start,end)
@@ -12073,6 +12129,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
         if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
+        if (this.FloatTooltip) this.FloatTooltip.ReloadResource(option);
         if (this.DialogSelectRect) this.DialogSelectRect.ReloadResource(option);
     }
 
@@ -14415,6 +14472,8 @@ function CoordinateInfo()
     this.ExtendData;                                            //扩展属性
                                                                 //百分比 { PriceColor:, PercentageColor:, SplitColor:, Font: }
                                                                 //自定义刻度 { Custom:{ Position: 1=强制内部 }}
+    //输出位置的Y轴偏移
+    //this.YOffset;
     this.AreaData;  //区域: { Start:, End:, BGColor:, Position:[0=左, 1=右] }
 
     //不在当前屏范围 （可定义刻度使用)
@@ -73245,8 +73304,20 @@ function JSChartResource()
 
         TextColor:"rgb(0,0,0)",             //数值名称
         ValueColor:"rgb(0,0,0)",            //数值
+    };
 
-       
+    this.FloatTooltip=
+    {
+        BGColor:'rgb(250,250,250)',            //背景色
+        BorderColor:'rgb(20,20,20)',        //边框颜色
+        VolColor:"rgb(255, 185, 15)",       //标题成交量
+        AmountColor:"rgb(79, 79, 79)",      //成交金额
+        DateTimeColor:'rgb(60,60,60)',
+        TurnoverRateColor:'rgb(43,54,69)',       //换手率
+        PositionColor:"rgb(255,0,255)",            //持仓
+
+        TextColor:"rgb(0,0,0)",             //数值名称
+        ValueColor:"rgb(0,0,0)",            //数值
     };
 
     //区间统计
@@ -74295,6 +74366,22 @@ function JSChartResource()
             if (item.ValueColor) this.DialogTooltip.ValueColor=item.ValueColor;
         }
 
+        if (style.FloatTooltip)
+        {
+            var item=style.FloatTooltip;
+            if (item.BGColor) this.FloatTooltip.BGColor=item.BGColor;
+            if (item.BorderColor) this.FloatTooltip.BorderColor=item.BorderColor;
+            
+            if (item.DateTimeColor) this.FloatTooltip.DateTimeColor=item.DateTimeColor;
+            if (item.VolColor) this.FloatTooltip.VolColor=item.VolColor;
+            if (item.AmountColor) this.FloatTooltip.AmountColor=item.AmountColor;
+            if (item.TurnoverRateColor) this.FloatTooltip.TurnoverRateColor=item.TurnoverRateColor;
+            if (item.PositionColor) this.FloatTooltip.PositionColor=item.PositionColor;
+
+            if (item.TextColor) this.FloatTooltip.TextColor=item.TextColor;
+            if (item.ValueColor) this.FloatTooltip.ValueColor=item.ValueColor;
+        }
+
         if (style.DialogSelectRect)
         {
             var item=style.DialogSelectRect;
@@ -75397,7 +75484,26 @@ function JSChartLocalization()
         ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
         ['DialogTooltip-Value', {CN:'数值', EN:'Value', TC:'数值'}],
 
+        ['FloatTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],
+        ['FloatTooltip-Time', {CN:'时间', EN:'Time', TC:'時間'}],
+        ['FloatTooltip-Open', {CN:'开盘价', EN:'Open', TC:'開盤價'}],
+        ['FloatTooltip-High', {CN:'最高价', EN:'High', TC:'最高價'}],
+        ['FloatTooltip-Low', {CN:'最低价', EN:'Low', TC:'最低價'}],
+        ['FloatTooltip-Close', {CN:'收盘价', EN:'Close', TC:'收盤價'}],
+        ['FloatTooltip-YClose', {CN:'昨收价', EN:'YClose', TC:'昨收價'}],
+        ['FloatTooltip-Increase', {CN:'涨幅', EN:'Increase', TC:'漲幅'}],
+        ['FloatTooltip-Risefall', {CN:'涨跌', EN:'Risefall', TC:'漲跌'}],
+        ['FloatTooltip-Vol', {CN:'成交量', EN:'Volume', TC:'數量'}],
+        ['FloatTooltip-Amount', {CN:'成交额', EN:'Amount', TC:'金額'}],
+        ['FloatTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
+        ['FloatTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
+        ['FloatTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['FloatTooltip-AvPrice', {CN:'均价', EN:'AVPrice:', TC:'均價'}],
+        ['FloatTooltip-FClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
+        ['FloatTooltip-YSettlePrice', {CN:"昨结算", EN:'YSettlement', TC:'昨結算'}],
+        ['FloatTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'振幅'}],
 
+       
         ['DialogSelectRect-StartPrice', {CN:'起始价:', EN:'Start Price:', TC:'起始價'}],
         ['DialogSelectRect-EndPrice', {CN:'最终价:', EN:"End Price:", TC:'最终價'}],
         ['DialogSelectRect-High', {CN:'最高价:', EN:'High:', TC:'最高價'}],
@@ -78872,6 +78978,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.SendKLineUpdateEvent(bindData);    
         this.UpdateDOMTooltip(0, bindData);
+        this.UpdateHQFloatTooltip(bindData);
 
         //叠加指标计算
         this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
@@ -79130,6 +79237,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.SendKLineUpdateEvent(bindData);
         this.UpdateDOMTooltip(0, bindData);
+        this.UpdateHQFloatTooltip(bindData);
 
         //更新叠加指标
         this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
@@ -83665,18 +83773,34 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (!this.DialogTooltip) return false;
         if (!this.ChartCorssCursor) return false;
 
+        var dataType=0;
         var kItem=null;
         if (this.ChartCorssCursor.ClientPos>=0)
         {
             var hisData=this.ChartOperator_Temp_GetHistroyData();;
             if (!hisData) return false;  //数据还没有到达
+            if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
     
             var dataIndex=hisData.DataOffset+this.ChartCorssCursor.CursorIndex;
+            if (dataIndex>=hisData.Data.length) dataIndex=hisData.Data.length-1;
             var kItem=hisData.Data[dataIndex];
         }
+        else    //取最后一个数据
+        {   
+            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            if (!hisData) return false;  //数据还没有到达
+            if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
+            var kItem=hisData.Data[hisData.Data.length-1];
+            var dataID={ Symbol:this.Symbol, Date:kItem.Date };
+            if (IFrameSplitOperator.IsNumber(kItem.Time)) dataID.Time=kItem.Time;
+            if (!this.DialogTooltip.IsEqualDataID(dataID)) return false;
+
+            dataType=1;
+        }
 
         var sendData=
         { 
+            DataType:dataType,  //0=全部更新 1=更新实时K线
             ClientPos:this.ChartCorssCursor.ClientPos,  //位置
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             KItem:kItem, 
@@ -83684,7 +83808,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             LastValue:this.ChartCorssCursor.LastValue,
         };
 
-
         this.DialogTooltip.Update(sendData);
 
         return true;
@@ -83725,6 +83848,52 @@ 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;
+        if (!this.FloatTooltip.IsShow()) return;
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+
+        var lastItem=kData.Data[kData.Data.length-1];
+        if (!lastItem) return;
+
+        var dataID={ Symbol:kData.Symbol, Date:lastItem.Date, Time:lastItem.Time };
+        if (!this.FloatTooltip.IsEqualHQID(dataID)) return;
+
+        var sendData=
+        {
+            Data:lastItem,
+            Symbol:this.Symbol,
+            Name:this.Name,
+            DataType:2,
+        };
+
+        this.FloatTooltip.Update(sendData);
+    }
 }
 
 //API 返回数据 转化为array[]
@@ -89551,6 +89720,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (!this.ChartCorssCursor) return false;
 
         var minuteItem=null;    //{ Type:0=连续交易 1=集合竞价, Data:数据 }
+        var dataType=0;     //0=全部更新 2=分时实时数据更新
         if (this.ChartCorssCursor.ClientPos>=0)
         {
             var titlePaint=this.TitlePaint[0];
@@ -89560,21 +89730,32 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 if ((pointInfo.ClientPos==2 || pointInfo.ClientPos==3 ||  (pointInfo.ClientPos>=200&& pointInfo.ClientPos<=299) || (pointInfo.ClientPos>=300&& pointInfo.ClientPos<=399)))
                 {
                     var auctionData=titlePaint.GetCurrentAuctionData();
-                    if (!auctionData) return;
+                    if (!auctionData) return false;
                     minuteItem={ Type:1, Data:auctionData };
                 }
                 else
                 {
                     var minuteData=titlePaint.GetCurrentKLineData();
-                    if (!minuteData) return;
+                    if (!minuteData) return false;
                     minuteItem={ Type:0, Data:minuteData };
                 }
             }
-            
+        }
+        else    //实时数据更新
+        {
+            if (!this.SourceData || !IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)) return false;
+            var minuteData=this.SourceData.Data[this.SourceData.Data.length-1];
+
+            var dataID={ Symbol:this.Symbol, Date:minuteData.Date, Time:minuteData.Time };
+            if (!this.DialogTooltip.IsEqualDataID(dataID)) return false;
+
+            minuteItem={ Type:0, Data:minuteData };
+            dataType=2;
         }
 
         var sendData=
         { 
+            DataType:dataType,
             ClientPos:this.ChartCorssCursor.ClientPos,  //位置
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             MinItem:minuteItem, 
@@ -125334,6 +125515,21 @@ function GetBlackStyle()
             TitleBGColor:"rgb(200, 66, 69)",
         },
 
+        FloatTooltip:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+            
+            VolColor:"rgb(255, 185, 15)",       //标题成交量
+            AmountColor:"rgb(210,210,210)",      //成交金额
+            DateTimeColor:'rgb(210,210,210)',
+            TurnoverRateColor:'rgb(43,54,69)',       //换手率
+            PositionColor:"rgb(255,0,255)",            //持仓
+
+            TextColor:"rgb(210,210,210)",             //数值名称
+            ValueColor:"rgb(210,210,210)",            //数值
+        },
+
         DialogSelectRect:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -144259,8 +144455,9 @@ function JSDialogTooltip()
 
     this.KItemCache=null;
     this.KItemCacheID=null;
-    this.LastValueCache=null;    //最后的鼠标位置对应的数值
-    this.LastValueCacheID=null;
+    this.LastValueCache=null;       //最后的鼠标位置对应的数值
+    this.LastValueCacheID=null;     //鼠标信息
+    this.DataID=null;               //当前显示的数据时间{ Symbol:, Date:, Time: }
 
     this.Inital=function(hqchart, option)
     {
@@ -144300,6 +144497,22 @@ function JSDialogTooltip()
         }
     }
 
+    //data={ Symbol, Date, Time}
+    this.IsEqualDataID=function(data)
+    {
+        if (!this.DataID) return false;
+        if (!data) return false;
+
+        if (this.DataID.Symbol!=data.Symbol) return false;
+        if (this.DataID.Date!=data.Date) return false;
+        if (IFrameSplitOperator.IsNumber(this.DataID.Time))
+        {
+            if (this.DataID.Time!=data.Time) return false;
+        }
+
+        return true;
+    }
+
     this.Create=function()
     {
         var divDom=document.createElement("div");
@@ -144415,9 +144628,72 @@ function JSDialogTooltip()
         this.UpdateStyle();
     }
 
+    //更新实时数据
+    this.UpdateKLineData=function(data)
+    {
+        if (!data.KItem|| !data.IsShowCorss) return;
+
+        this.LanguageID=this.HQChart.LanguageID;
+
+        if (this.HQChart.ClassName=='KLineChartContainer')
+        {
+            var strKItem=JSON.stringify(data.KItem);
+            var bUpdata=false;
+            if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+            {
+                this.KItemCache= JSON.parse(strKItem);
+                this.KItemCacheID=strKItem;
+                bUpdata=true;
+            }
+           
+            if (bUpdata) 
+            {
+                this.UpdateTableDOM();
+            }
+            else
+            {
+                //JSConsole.Chart.Log(`[JSDialogTooltip::Update] save as KItemCache and  KItem`);
+            }
+        }
+    }
+
+    //更新实时分时数据
+    this.UpdateMinuteData=function(data)
+    {
+        if (!data.MinItem || !data.IsShowCorss) return;
+
+        var strKItem=JSON.stringify(data.MinItem);
+        var bUpdata=false;
+        if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+        {
+            this.KItemCache= JSON.parse(strKItem);
+            this.KItemCacheID=strKItem;
+            bUpdata=true;
+        }
+
+        if (bUpdata)
+        {
+            this.UpdateTableDOM();
+        }
+    }
+
     this.Update=function(data)
     {
         if (!this.DivDialog ||  !this.TitleBox) return;
+
+        //实时数据更新
+        if (data.DataType==1)
+        {
+            this.UpdateKLineData(data);
+            return;
+        }
+        else if (data.DataType==2)
+        {
+            this.UpdateMinuteData(data);
+            return;
+        }
+
+
         if ((!data.KItem && !data.MinItem) || !data.IsShowCorss || data.ClientPos<0) return;
 
         this.LanguageID=this.HQChart.LanguageID;
@@ -144442,6 +144718,7 @@ function JSDialogTooltip()
             
             if (bUpdata) 
             {
+                this.UpdateDataID(data);
                 this.UpdateTableDOM();
             }
             else
@@ -144469,6 +144746,7 @@ function JSDialogTooltip()
 
             if (bUpdata)
             {
+                this.UpdateDataID(data);
                 this.UpdateTableDOM();
             }
         }
@@ -144516,6 +144794,31 @@ function JSDialogTooltip()
         }
     }
 
+    this.UpdateDataID=function(data)
+    {
+        if (this.HQChart.ClassName=='KLineChartContainer')
+        {
+            var kItem=data.KItem;
+            this.DataID={ Symbol:data.Symbol, Date:kItem.Date, Time:null };
+            if (IFrameSplitOperator.IsNumber(kItem.Time)) this.DataID.Time=kItem.Time;
+        }
+        else if (this.HQChart.ClassName=='MinuteChartContainer')
+        {
+            var minItem=data.MinItem;
+            if (minItem.Type==0) //连续交易
+            {
+                var item=minItem.Data;
+                if (item) this.DataID={ Symbol:data.Symbol, Date:item.Date, Time:item.Time };
+            }
+            else if (minItem.Type==1)   //集合竞价
+            {
+                var item=minItem.Data.Data;
+                if (item) this.DataID={ Symbol:data.Symbol, Date:item.Date, Time:item.Time };
+            }
+            
+        }
+    }
+
     this.Close=function(e)
     {
         if (!this.DivDialog) return;
@@ -144661,7 +144964,7 @@ function JSDialogTooltip()
             aryText.push(this.ForamtFClose(data.FClose, defaultfloatPrecision, 'DialogTooltip-FClose'));
         }
 
-        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP_TEXT);
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP);
         if (event && event.Callback)
         {
             var sendData={ AryText:aryText, Data:data, Symbol:this.HQChart.Symbol, HQChart:this.HQChart, IsKLine:true };
@@ -144669,7 +144972,7 @@ function JSDialogTooltip()
         }
 
         return aryText;
-    },
+    }
 
     this.GetFormatMinuteTooltipText=function(data)
     {
@@ -144729,7 +145032,7 @@ function JSDialogTooltip()
 
         }
 
-        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP_TEXT);
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP);
         if (event && event.Callback)
         {
             var sendData={ AryText:aryText, Data:data, Symbol:this.HQChart.Symbol, HQChart:this.HQChart, IsMinute:true };
@@ -145044,6 +145347,621 @@ function JSDialogTooltip()
 
 
 }
+
+//浮动K线提示信息
+function JSFloatTooltip()
+{
+    this.DivDialog=null;
+    this.Style=0;       //0=一行一个， 1=2行一个
+
+    this.HQChart=null;
+    this.MaxRowCount=20;
+
+    this.UpColor=g_JSChartResource.UpTextColor;
+    this.DownColor=g_JSChartResource.DownTextColor;
+    this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+
+    this.BGColor=g_JSChartResource.FloatTooltip.BGColor;
+    this.BorderColor=g_JSChartResource.FloatTooltip.BorderColor;
+
+    this.TextColor=g_JSChartResource.FloatTooltip.TextColor;
+    this.ValueColor=g_JSChartResource.FloatTooltip.ValueColor;
+
+    this.VolColor=g_JSChartResource.FloatTooltip.VolColor;
+    this.AmountColor=g_JSChartResource.FloatTooltip.AmountColor;
+    this.TurnoverRateColor=g_JSChartResource.FloatTooltip.TurnoverRateColor;
+    this.PositionColor=g_JSChartResource.FloatTooltip.PositionColor;
+    this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;
+    this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
+
+    this.AryData=[];    //输出文字信息
+    this.AryText=[];    //表格tr
+
+    this.KItemCache=null;   //{ Symbol:, Item:, Name }
+    this.KItemCacheID=null;
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+        }
+    }
+
+    this.Destroy=function()
+    {
+        this.AryData=[];
+        this.AryText=[];
+        this.KItemCache=null;
+        this.KItemCacheID=null;
+
+        if (this.DivDialog) 
+        {
+            document.body.removeChild(this.DivDialog);
+            this.DivDialog=null;
+        }
+    }
+
+    this.Show=function(x, y)
+    {
+        if (!this.DivDialog) return;
+        if (!this.HQChart) return;
+
+        var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+        var left=x+rtClient.left,top=y+rtClient.top;
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=left-this.DivDialog.offsetWidth;
+        if ((bottom+5)>=window.innerHeight) top=0;
+       
+        this.DivDialog.style.top = top + "px";
+        this.DivDialog.style.left = left + "px";
+        
+        if (this.DivDialog.style.visibility!='visible')
+            this.DivDialog.style.visibility='visible';
+    }
+
+    this.Hide=function()
+    {
+        if (!this.DivDialog) return;
+
+        this.KItemCache=null;
+        this.KItemCacheID=null;
+
+        if (this.DivDialog.style.visibility!='hidden') this.DivDialog.style.visibility='hidden';
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement("div");
+        divDom.className='UMyChart_Tooltip_Float_Div';
+
+        var table=document.createElement("table");
+        table.className="UMyChart_Tooltip_Float_Table";
+        divDom.appendChild(table);
+
+        var tbody=document.createElement("tbody");
+        tbody.className="UMyChart_Tooltip_Float_Tbody";
+        table.appendChild(tbody);
+
+        this.AryData=[];
+        
+        for(var i=0;i<this.MaxRowCount;++i)
+        {
+            var rowItem={ Tr:null, TitleSpan:null, TextSpan:null, TitleTd:null, TextTd:null };
+
+            var trDom=document.createElement("tr");
+            trDom.className='UMyChart_Tooltip_Float_Group_Tr';
+            tbody.appendChild(trDom);
+            rowItem.Tr=trDom;
+
+            var tdDom=document.createElement("td");
+            tdDom.className="UMyChart_Tooltip_Float_Title_Td";   //标题
+            trDom.appendChild(tdDom);
+            rowItem.TitleTd=tdDom;
+
+            var spanDom=document.createElement("span");
+            spanDom.className='UMyChart_Tooltip_Float_Title_Span';
+            spanDom.innerText='标题';
+            tdDom.appendChild(spanDom);
+            rowItem.TitleSpan=spanDom;
+
+            var tdDom=document.createElement("td");
+            tdDom.className="UMyChart_Tooltip_Float_Text_Td";    //数值
+            trDom.appendChild(tdDom);
+            rowItem.TextTd=tdDom;
+
+            var spanDom=document.createElement("span");
+            spanDom.className='UMyChart_Tooltip_Float_Text_Span';
+            spanDom.innerText='数值';
+            tdDom.appendChild(spanDom);
+            rowItem.TextSpan=spanDom;
+
+            this.AryData.push(rowItem);
+        }
+        
+        document.body.appendChild(divDom);
+
+        this.DivDialog=divDom;
+        
+        this.UpdateStyle();
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+    //data={ Symbol, Date, Time} 是否是同一条K线
+    this.IsEqualHQID=function(data)
+    {
+        if (!this.KItemCache) return false;
+        if (!data) return false;
+        if (!this.KItemCache.Item) return false;
+
+        var kItem=this.KItemCache.Item;
+        if (this.KItemCache.Symbol!=data.Symbol) return false;
+        if (kItem.Date!=data.Date) return false;
+        if (IFrameSplitOperator.IsNumber(kItem.Time))
+        {
+            if (kItem.Time!=data.Time) return false;
+        }
+
+        return true;
+    }
+
+    this.UpdateStyle=function()
+    {
+        if (!this.DivDialog) return;
+
+        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
+        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
+
+        //this.UpdateTableDOM();
+    }
+
+    //更新数据
+    this.Update=function(data)
+    {
+        if (!this.DivDialog) return;
+        this.LanguageID=this.HQChart.LanguageID;
+
+        if (data.DataType==1)
+        {
+            var tooltipData=data.Tooltip;
+            if (!tooltipData) return;
+    
+            if (tooltipData.Type==0)
+            {
+                this.UpdateKLineToolitp(data);
+            }
+        }
+        else if (data.DataType==2)  //更新实时行情数据
+        {
+            this.UpdateRealtimeHQTooltip(data);
+        }
+    }
+
+    this.UpdateRealtimeHQTooltip=function(data)
+    {
+        if (!this.KItemCache) return;
+
+        var kItem={ Symbol:data.Symbol, Name:this.KItemCache.Name, Item:data.Data, IsOverlay:this.KItemCache.IsOverlay };
+        var strKItem=JSON.stringify(kItem);
+
+        var bUpdata=false;
+        if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+        {
+            this.KItemCache= kItem;
+            this.KItemCacheID=strKItem;
+            bUpdata=true;
+        }
+
+        if (bUpdata) 
+        {
+            this.UpdateTableDOM();
+        }
+    }
+
+    this.UpdateKLineToolitp=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        var symbol=data.Symbol;
+        var name=data.Name;
+        var bOverlay=false; //是否是叠加指标
+        if (tooltipData.ChartPaint.Name=="Overlay-KLine")
+        {
+            symbol=tooltipData.ChartPaint.Symbol;
+            name=tooltipData.ChartPaint.Title;
+            bOverlay=true;
+        }
+
+        var kItem={ Symbol:symbol, Name:name, Item:CloneData(tooltipData.Data), IsOverlay:bOverlay };
+        var strKItem=JSON.stringify(kItem);
+        var bUpdata=false;
+        if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+        {
+            this.KItemCache= kItem;
+            this.KItemCacheID=strKItem;
+            bUpdata=true;
+        }
+        
+        if (bUpdata) 
+        {
+            this.UpdateTableDOM();
+        }
+
+        if (data.Point)
+        {
+            var x=data.Point.X;
+            var y=data.Point.Y+data.Point.YMove;
+            this.Show(x, y);
+        }
+    }
+
+    this.UpdateTableDOM=function()
+    {
+        if (!this.KItemCache) return;
+
+        if (this.HQChart.ClassName=='KLineChartContainer')
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
+        else
+            return;
+
+        var index=0;
+        for(index=0;index<this.AryText.length && index<this.MaxRowCount;++index)
+        {
+            var outItem=this.AryText[index];
+            var item=this.AryData[index];
+
+            item.TitleSpan.innerText=outItem.Title;
+            item.TitleSpan.style.color=this.TextColor;
+            item.TextSpan.innerText=outItem.Text;
+            item.TextSpan.style.color=outItem.Color;
+
+            if (outItem.ClassName) 
+            {
+                item.TextSpan.className=outItem.ClassName;
+            }
+            else
+            {
+                if (item.TextSpan.className!="UMyChart_Tooltip_Float_Text_Span") item.TextSpan.className="UMyChart_Tooltip_Float_Text_Span"
+            }
+           
+            item.Tr.style.display="";
+            if (item.Tr2) item.Tr2.style.display="";
+        }
+
+        for( ; index<this.MaxRowCount; ++index)
+        {
+            var item=this.AryData[index];
+            item.Tr.style.display="none";
+            if (item.Tr2) item.Tr2.style.display="none";
+        }
+    }
+
+    this.GetFormatKLineTooltipText=function(kItem)
+    {
+        var data=kItem.Item;
+        var symbol=kItem.Symbol;
+        var upperSymbol=symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+
+        //日期
+        var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'FloatTooltip-Date' );
+
+        //时间
+        var timeItem=null;
+        if (IFrameSplitOperator.IsNumber(data.Time)) timeItem=this.FormatTime(data.Time, this.HQChart.Period, null, 'FloatTooltip-Time');
+
+        var overlayItem=null;
+        if (kItem.IsOverlay)
+            overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:"UMyChart_Tooltip_Float_Text2_Span" };
+        
+        
+        var yClose=data.YClose; //昨收价|昨结算价
+        var aryText=
+        [
+            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'FloatTooltip-Open'),
+            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'FloatTooltip-High'),
+            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'FloatTooltip-Low'),
+            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'FloatTooltip-Close'),
+            this.ForamtPrice(data.YClose,data.YClose, defaultfloatPrecision,'FloatTooltip-YClose'),
+            this.FormatVol(data.Vol,'FloatTooltip-Vol' ),
+            this.FormatAmount(data.Amount,'FloatTooltip-Amount' ),
+            this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'FloatTooltip-Increase'),
+            this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'FloatTooltip-Amplitude'), 
+        ];
+
+        if (timeItem) aryText.unshift(timeItem);
+        aryText.unshift(dateItem);
+        if (overlayItem) aryText.unshift(overlayItem);
+        
+        //换手率
+        if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
+        {
+            aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'FloatTooltip-Exchange' ));
+        }
+
+        //持仓量 结算价
+        if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol))
+        {
+            aryText.push(this.FormatPosition(data.Position,'FloatTooltip-Position'));
+            aryText.push(this.ForamtFClose(data.FClose, defaultfloatPrecision, 'FloatTooltip-FClose'));
+            aryText.push(this.ForamtFClose(data.YFClose, defaultfloatPrecision, 'FloatTooltip-YSettlePrice'));
+            
+        }
+
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_KLINE_FLOAT_TOOLTIP);
+        if (event && event.Callback)
+        {
+            var sendData={ AryText:aryText, Data:kItem, HQChart:this.HQChart };
+            event.Callback(event, sendData, this);
+        }
+        
+        return aryText;
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////
+    //数据格式化
+    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID, this.LanguageID),
+            Text:"--.--",
+            Color:this.ValueColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price)) return item;
+        
+        item.Text=price.toFixed(defaultfloatPrecision);
+        item.Color=this.GetColor(price, yClose);
+
+        return item;
+    }
+
+    this.ForamtValue=function(value, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.ValueColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(value)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);
+        return item;
+    }
+
+    this.FormatVol=function(vol, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.VolColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(vol)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);
+        
+        return item;
+    }
+
+    this.FormatAmount=function(amount, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.AmountColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(amount)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);
+        
+        return item;
+    }
+
+    this.FormatIncrease=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        //涨幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.ValueColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var diffValue=price-yClose;
+        var value=(price-yClose)/yClose;
+
+        item.Text=`${(value*100).toFixed(2)}%`;
+        item.Color=this.GetColor(value,0);
+
+        return item;
+    }
+
+    this.FormatRisefall=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        //涨跌
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.ValueColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var value=price-yClose;
+        item.Text=`${value.toFixed(defaultfloatPrecision)}`;
+        item.Color=this.GetColor(value,0);
+
+        return item;
+    }
+
+    this.FormatAmplitude=function(high, low, yClose, defaultfloatPrecision, TitleID)
+    {
+        //振幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.ValueColor
+        };
+
+
+        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var diffValue=high-low;
+        var value=(diffValue)/yClose;
+        item.Text=`${(value*100).toFixed(2)}%`;
+        item.Color=this.GetColor(value,0);
+        
+        return item;
+    }
+
+    this.ForamtDate=function(date, format, TitleID)
+    {
+        //日期
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText('DialogTooltip-Date',this.LanguageID), 
+            Text:"----/--/--",
+            Color:this.DateTimeColor
+        }
+
+        if (!IFrameSplitOperator.IsNumber(date)) return item;
+
+        item.Text=IFrameSplitOperator.FormatDateString(date,format);
+
+        return item;
+    }
+
+    this.FormatTime=function(time, period, format, TitleID)
+    {
+        //时间
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--:--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(time)) return item;
+        if (!format)
+        {
+            format="HH:MM";
+            if (ChartData.IsMinutePeriod(period,true)) format='HH:MM'; // 分钟周期
+            else if (ChartData.IsSecondPeriod(period)) format='HH:MM:SS';
+            else if (ChartData.IsMilliSecondPeriod(period)) format='HH:MM:SS.fff';
+        }
+
+        item.Text=IFrameSplitOperator.FormatTimeString(time,format);
+
+        return item;
+    }
+
+    //换手率 成交量/流通股本
+    this.FormatExchange=function(vol, flowCapital, TitleID)
+    {
+        //换手率
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(vol) || !IFrameSplitOperator.IsNumber(flowCapital) || flowCapital==0) return item;
+
+        var value=vol/flowCapital*100;
+        item.Text=value.toFixed(2)+'%';
+
+        return item;
+    }
+
+
+    //持仓
+    this.FormatPosition=function(position, TitleID)
+    {
+        //持仓
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.PositionColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(position)) return item;
+
+        item.Text=position.toFixed(0);
+
+        return item;
+    }
+
+    //结算价
+    this.ForamtFClose=function(value, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(value)) return item;
+
+        item.Text=value.toFixed(defaultfloatPrecision);
+
+        return item;
+    }
+
+    this.GetColor=function(price,yClose)
+    {
+        if(price>yClose) return this.UpColor;
+        else if (price<yClose) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
+
+    //配色修改
+    this.ReloadResource=function(option)
+    {
+        this.UpColor=g_JSChartResource.UpTextColor;
+        this.DownColor=g_JSChartResource.DownTextColor;
+        this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+    
+        this.BGColor=g_JSChartResource.FloatTooltip.BGColor;
+        this.BorderColor=g_JSChartResource.FloatTooltip.BorderColor;
+    
+        this.TextColor=g_JSChartResource.FloatTooltip.TextColor;
+        this.ValueColor=g_JSChartResource.FloatTooltip.ValueColor;
+    
+        this.VolColor=g_JSChartResource.FloatTooltip.VolColor;
+        this.AmountColor=g_JSChartResource.FloatTooltip.AmountColor;
+        this.TurnoverRateColor=g_JSChartResource.FloatTooltip.TurnoverRateColor;
+        this.PositionColor=g_JSChartResource.FloatTooltip.PositionColor;
+        this.DateTimeColor=g_JSChartResource.FloatTooltip.DateTimeColor;
+
+        if (!this.DivDialog) return;
+
+        this.UpdateStyle();
+    }
+}
 /*
    Copyright (c) 2018 jones
  
@@ -146029,7 +146947,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14044";
+var HQCHART_VERSION="1.1.14049";
 
 function PrintHQChartVersion()
 {