hqchart 1.1.13909 → 1.1.13915

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

@@ -4464,6 +4464,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
             if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
             if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
+            if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
            
         }
 
@@ -4941,6 +4942,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
             if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
             if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
+            if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
         }
 
         if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -5687,6 +5689,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.EnableDrawToolDialogV2===true) chart.InitalDrawToolDialog();
         if (option.EnableModifyDrawDialogV2===true) chart.InitalModifyDrawDialog();
 
+        //K线tooltip
+        if (option.EnableTooltipDialog===true) chart.InitalTooltipDialog();
+
         //注册事件
         if (option.EventCallback)
         {
@@ -6988,6 +6993,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogDrawTool;    //画图工具
     this.DialogModifyDraw;  //画图修改
 
+    this.DialogTooltip;     //tooltip信息 
+
 
     this.ClearStockCache=function()
     {
@@ -7011,6 +7018,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogDrawTool.Create();
     }
 
+    this.InitalTooltipDialog=function()
+    {
+        if (this.DialogTooltip) return;
+
+        this.DialogTooltip=new JSDialogTooltip();
+        this.DialogTooltip.Inital(this);
+        this.DialogTooltip.Create();
+    }
+
     this.InitalModifyDrawDialog=function()
     {
         if ( this.DialogModifyDraw) return;
@@ -7067,6 +7083,22 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogModifyDraw.Close();
     }
 
+    this.IsShowTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return false;
+
+        return  this.DialogTooltip.IsShow();
+    }
+
+    this.CloseTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.DialogTooltip.Close();
+    }
+
+
+
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
     {
@@ -9393,6 +9425,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DrawDrawPictureXYCoordinate(); //绘制画图工具 X,Y轴刻度信息
         
+        var bDrawDialogTooltip=false;
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
         if (this.LastPoint.X!=null || this.LastPoint.Y!=null)
         {
@@ -9436,6 +9469,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 {
                     this.ChartCorssCursor.Canvas=this.Canvas;
                 }
+
+                bDrawDialogTooltip=true;
             }
 
             ptPosition=this.Frame.PtInFrame(this.LastPoint.X, this.LastPoint.Y);
@@ -9516,6 +9551,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
             if (frame && frame.DrawToolbarTooltip) frame.DrawToolbarTooltip(this.LastMouseStatus.MouseOnToolbar);
         }
+
+
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
        
         //发送图形状态给外部
         if (this.mapEvent.has(JSCHART_EVENT_ID.CHART_STATUS))
@@ -9841,7 +9879,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         this.DrawDrawPictureXYCoordinate();
-
+        var bDrawDialogTooltip=false;
         if (this.ChartCorssCursor)
         {
             this.ChartCorssCursor.LastPoint=this.LastPoint;
@@ -9885,6 +9923,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 this.ChartCorssCursor.Canvas=this.Canvas;
             }
+
+            bDrawDialogTooltip=true;
         }
 
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
@@ -9979,6 +10019,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.OffscreenToShowCanvas();
 
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
+
         ++this.TouchDrawCount;
     }
 
@@ -10407,6 +10449,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+        var draw=false;
+        if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
+        {
+            var sendData={ e:e, KeyID:keyID, Draw:false, PreventDefault:false };
+            this.ChartCorssCursor.OnKeyDown(sendData);
+            draw=sendData.Draw;
+        }
+
         switch(keyID)
         {
             case 37: //left
@@ -10549,6 +10600,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 return;
         }
 
+        if (draw) this.DrawDynamicInfo();
+
         //不让滚动条滚动
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
@@ -10856,6 +10909,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.ShowTooltip(this.LastPoint.X/pixelTatio,this.LastPoint.Y/pixelTatio,toolTip);
     }
 
+    this.DrawTooltipDialog=function()
+    {
+        
+    }
+
     this.ShowTooltip=function(x,y,toolTip)
     {
         if (!this.IsShowTooltip) return;
@@ -11965,6 +12023,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         else if (option.Draw==true) this.Draw(); //是否立即重绘
 
         if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
+        if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
     }
 
     this.ReloadBorder=function(option)  //根据页面缩放调整对应边框的尺长
@@ -13954,6 +14013,19 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
         }
     }
+
+    //十字光标状态变动
+    this.OnChangeCorssCursorStatus=function(data, obj)
+    {
+        if (data.Type==1)
+        {
+            if (!data.IsShowCorss)  //十字光标隐藏
+            {
+                this.HideTooltip();
+                this.CloseTooltipDialog();
+            }
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -36935,7 +37007,8 @@ function ChartVolStick()
     this.ClassName='ChartVolStick';
 
     this.BarWidth;                  //固定宽度 目前只支持宽度为1
-    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效
+    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效 
+    this.BarColorType=0;            //0=柱子颜色跟K线走  1=正upcolor 负downcolor
     this.PtInChart=this.PtInBar;
     this.DrawSelectedStatus=this.DrawLinePoint;
 
@@ -36982,7 +37055,7 @@ function ChartVolStick()
                 if (right>chartright) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem,value);
                 var bUp=barColor.IsUp;
                 
                    
@@ -37030,7 +37103,7 @@ function ChartVolStick()
                 if (x>chartright) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem, value);
                 
                 this.Canvas.strokeStyle=barColor.Color;
                 
@@ -37075,7 +37148,7 @@ function ChartVolStick()
                 if (right>chartBottom) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem, value);
                 var bUp=barColor.IsUp;
                 
                 var height=ToFixedRect(y-yBottom);  //高度调整为整数
@@ -37121,7 +37194,7 @@ function ChartVolStick()
                 if (x>chartBottom) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem,value);
 
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
@@ -37161,8 +37234,14 @@ function ChartVolStick()
         return range;
     }
 
-    this.GetBarColor=function(kItem)
+    this.GetBarColor=function(kItem, value)
     {
+        if (this.BarColorType===1)  //更具正负决定柱子颜色
+        {
+            if (value>=0) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
+            else return { Color:this.DownColor, IsUp:false };
+        }
+
         if (kItem.Close>=kItem.Open) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
         else return { Color:this.DownColor, IsUp:false };
     }
@@ -46156,7 +46235,7 @@ function KLineTooltipPaint()
         }
 
         if (this.HQChart.CurrentChartDrawPicture) return false;   //画图工具操作的时候 不显示
-
+       
         return true;
     }
 
@@ -46988,6 +47067,8 @@ function MinuteLeftTooltipPaint()
         var pt=this.HQChart.LastPoint;
         if (!pt) return false;
 
+        if (this.HQChart.ChartCorssCursor && !this.HQChart.ChartCorssCursor.IsShowCorss) return false;
+
         return this.HQChart.IsMouseOnClient(pt.X, pt.Y);
     }
 
@@ -54638,6 +54719,9 @@ function ChartCorssCursor()
     this.IsShowClose=false;     //Y轴始终显示收盘价
     this.ClientPos=-1;
     this.CallAcutionXOperator;
+
+    this.EnableKeyboard=false;   //是否支持键盘隐藏显示
+    this.OnChangeStatusCallback;    //状态切换以后回调
     
 
     this.RightButton=
@@ -55816,6 +55900,29 @@ function ChartCorssCursor()
 
         this.Status=1;
     }
+
+    //data={ e:e, PreventDefault:false, KeyID, Draw:是否需要重绘 }
+    this.OnKeyDown=function(data)
+    {
+        if (!this.EnableKeyboard) return;
+
+        var keyID=data.KeyID;
+        if (keyID==27)  //ESC  隐藏十字线
+        {
+            if (!this.IsShowCorss) return;
+            this.IsShowCorss=false;
+            data.Draw=true;
+            if (this.OnChangeStatusCallback) this.OnChangeStatusCallback({ Type:1, IsShowCorss:this.IsShowCorss }, this);
+        }
+        else if (keyID==37 || keyID==39)    //left, right 显示十字线
+        {
+            if (this.IsShowCorss) return;
+            this.IsShowCorss=true;
+            data.Draw=true;
+            if (this.OnChangeStatusCallback) this.OnChangeStatusCallback({ Type:1, IsShowCorss:this.IsShowCorss }, this);
+        }
+    }
+
 }
 
 
@@ -72866,6 +72973,18 @@ function JSChartResource()
         LineHeight:25   //单行高度
     };
 
+    this.DialogTooltip=
+    {
+        BGColor:'rgb(250,250,250)',            //背景色
+        BorderColor:'rgb(20,20,20)',     //边框颜色
+        TitleColor:'rgb(0,0,0)',       //标题颜色
+        VolColor:"rgb(255, 185, 15)",       //标题成交量
+        AmountColor:"rgb(79, 79, 79)",      //成交金额
+        DateTimeColor:'rgb(60,60,60)',
+        TurnoverRateColor:'rgb(43,54,69)',       //换手率
+        PositionColor:"rgb(43,54,69)"            //持仓
+    }
+
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -73848,6 +73967,21 @@ function JSChartResource()
             if (item.AmountColor) this.PCTooltipPaint.AmountColor=item.AmountColor;
         }
 
+        if (style.DialogTooltip)
+        {
+            var item=style.DialogTooltip;
+            if (item.BGColor) this.DialogTooltip.BGColor=item.BGColor;
+            if (item.BorderColor) this.DialogTooltip.BorderColor=item.BorderColor;
+            if (item.TitleColor) this.DialogTooltip.TitleColor=item.TitleColor;
+            if (item.DateTimeColor) this.DialogTooltip.DateTimeColor=item.DateTimeColor;
+
+            if (item.VolColor) this.DialogTooltip.VolColor=item.VolColor;
+            if (item.AmountColor) this.DialogTooltip.AmountColor=item.AmountColor;
+            if (item.TurnoverRateColor) this.DialogTooltip.TurnoverRateColor=item.TurnoverRateColor;
+            if (item.PositionColor) this.DialogTooltip.PositionColor=item.PositionColor;
+
+        }
+
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -74789,7 +74923,26 @@ function JSChartLocalization()
         ['DivTooltip-Amount', {CN:'金额:', EN:'Amount:', TC:'金額'}],
         ['DivTooltip-Exchange', {CN:'换手:', EN:'Exchange:', TC:'換手'}],
         ['DivTooltip-Position', {CN:'持仓:', EN:'Position:', TC:'持倉'}],
-        ['DivTooltip-Price', {CN:'价格:', EN:'Open:', TC:'價格'}],
+        ['DivTooltip-Price', {CN:'价格:', EN:'Price:', TC:'價格'}],
+
+        ['DialogTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],
+        ['DialogTooltip-Time', {CN:'时间', EN:'Time', TC:'時間'}],
+        ['DialogTooltip-Open', {CN:'开盘价', EN:'Open', TC:'開盤價'}],
+        ['DialogTooltip-High', {CN:'最高价', EN:'High', TC:'最高價'}],
+        ['DialogTooltip-Low', {CN:'最低价', EN:'Low', TC:'最低價'}],
+        ['DialogTooltip-Close', {CN:'收盘价', EN:'Close', TC:'收盤價'}],
+        ['DialogTooltip-Increase', {CN:'涨幅', EN:'Increase', TC:'漲幅'}],
+        ['DialogTooltip-Risefall', {CN:'涨跌', EN:'Risefall', TC:'漲跌'}],
+        ['DialogTooltip-Vol', {CN:'成交量', EN:'Volume', TC:'數量'}],
+        ['DialogTooltip-Amount', {CN:'成交额', EN:'Amount', TC:'金額'}],
+        ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
+        ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
+        ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
+        ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
+        ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
+        ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
+        ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
 
         //走势图PC tooltip
         ['PCTooltip-Date', {CN:'日期', EN:'Date', TC:"日期"}],
@@ -76541,6 +76694,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
         this.ChartCorssCursor.StringFormatY.ExtendChartPaint=this.ExtendChartPaint;
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
 
         //创建等待提示
         this.ChartSplashPaint = new ChartSplashPaint();
@@ -83075,6 +83229,42 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.Draw();
     }
+
+    this.DrawTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.UpdateTooltipDialog();
+    }
+
+    this.UpdateTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return false;
+        if (!this.ChartCorssCursor) return false;
+
+        var kItem=null;
+        if (this.ChartCorssCursor.ClientPos>=0)
+        {
+            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            if (!hisData) return false;  //数据还没有到达
+    
+            var dataIndex=hisData.DataOffset+this.ChartCorssCursor.CursorIndex;
+            var kItem=hisData.Data[dataIndex];
+        }
+
+        var sendData=
+        { 
+            ClientPos:this.ChartCorssCursor.ClientPos,  //位置
+            IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
+            KItem:kItem, 
+            Symbol:this.Symbol, Name:this.Name,
+        };
+
+
+        this.DialogTooltip.Update(sendData);
+
+        return true;
+    }
 }
 
 //API 返回数据 转化为array[]
@@ -84755,6 +84945,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+
+        var draw=false;
+        if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
+        {
+            var sendData={ e:e, KeyID:keyID, Draw:false, PreventDefault:false };
+            this.ChartCorssCursor.OnKeyDown(sendData);
+            draw=sendData.Draw;
+        }
+
         switch(keyID)
         {
             case 37: //left
@@ -84860,10 +85059,20 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     this.ChartOperator(option);
                 }
                 break;
+            case 27:
+                if (this.CurrentChartDrawPicture)
+                {
+                    var drawPicture=this.CurrentChartDrawPicture;
+                    if (drawPicture.Status!=20) //画布移动的时候不能取消
+                        this.CurrentChartDrawPicture=null;
+                }
+                break;
             default:
                 return;
         }
 
+        if (draw) this.DrawDynamicInfo();
+
         //不让滚动条滚动
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
@@ -88810,6 +89019,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return null;
     }
+
+    this.DrawTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.UpdateTooltipDialog();
+    }
+
+    this.UpdateTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return false;
+        if (!this.ChartCorssCursor) return false;
+
+        var minuteItem=null;    //{ Type:0=连续交易 1=集合竞价, Data:数据 }
+        if (this.ChartCorssCursor.ClientPos>=0)
+        {
+            var titlePaint=this.TitlePaint[0];
+            if (titlePaint && titlePaint.PointInfo)
+            {
+                var pointInfo=titlePaint.PointInfo;
+                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;
+                    minuteItem={ Type:1, Data:auctionData };
+                }
+                else
+                {
+                    var minuteData=titlePaint.GetCurrentKLineData();
+                    if (!minuteData) return;
+                    minuteItem={ Type:0, Data:minuteData };
+                }
+            }
+            
+        }
+
+        var sendData=
+        { 
+            ClientPos:this.ChartCorssCursor.ClientPos,  //位置
+            IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
+            MinItem:minuteItem, 
+            Symbol:this.Symbol, Name:this.Name,
+        };
+
+
+        this.DialogTooltip.Update(sendData);
+
+        return true;
+    }
 }
 
 //盘前数据
@@ -119990,6 +120248,7 @@ function ScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -120001,9 +120260,21 @@ function ScriptIndex(name,script,args,option)
         chart.HistoryData=hisData;
         this.ReloadChartResource(hqChart,windowIndex,chart);
 
-        var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
-        hqChart.TitlePaint[titleIndex].Data[id]=titleData;
-        this.SetTitleData(titleData,chart);
+        if (varItem.IsShowTitle===false)    //NOTEXT 不绘制标题
+        {
+
+        }
+        else if (IFrameSplitOperator.IsString(varItem.Name) && varItem.Name.indexOf("NOTEXT")==0) //标题中包含NOTEXT不绘制标题
+        {
+
+        }
+        else
+        {
+            var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
+            hqChart.TitlePaint[titleIndex].Data[id]=titleData;
+            this.SetTitleData(titleData,chart);
+        }
+        
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -121949,6 +122220,7 @@ function OverlayScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -123377,6 +123649,8 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                 if (IFrameSplitOperator.IsBool(item.isDotLine)) outVarItem.IsDotLine = item.isDotLine;
                 if (IFrameSplitOperator.IsNonEmptyArray(item.lineDash)) outVarItem.LineDash=item.lineDash;
                 if (IFrameSplitOperator.IsBool(item.isSingleLine))  outVarItem.IsSingleLine=item.isSingleLine;
+                if (IFrameSplitOperator.IsNumber(item.StickType)) outVarItem.StickType=item.StickType;
+                if (IFrameSplitOperator.IsNumber(item.BarColorType)) outVarItem.BarColorType=item.BarColorType;
 
                 result.push(outVarItem);
             }
@@ -125109,7 +125383,19 @@ function GetBlackStyle()
             VolColor:"rgb(161,154,3)",       //标题成交量
             AmountColor:"rgb(161,154,3)",    //成交金额
         },
-    
+
+        DialogTooltip:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+            TitleColor:'rgb(210,210,210)',       //标题颜色
+            VolColor:"rgb(255, 185, 15)",       //标题成交量
+            AmountColor:"rgb(210,210,210)",      //成交金额
+            DateTimeColor:'rgb(210,210,210)',
+            TurnoverRateColor:'rgb(43,54,69)',       //换手率
+            PositionColor:"rgb(43,54,69)"            //持仓
+        },
+        
         //走势图 信息地雷
         MinuteInfo:
         {
@@ -142942,7 +143228,577 @@ JSPopKeyboard.GetOption=function()
 
 
 
-///////////////////////////////////////////////////////////////////////////////////
+/*
+   Copyright (c) 2018 jones
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   内置K线提示信息
+*/
+
+
+function JSDialogTooltip()
+{
+    this.DivDialog=null;
+    this.DragTitle=null;
+    this.TitleBox=null; //{ DivTitle, DivName, DivName }
+
+    this.HQChart=null;
+
+    this.UpColor=g_JSChartResource.UpTextColor;
+    this.DownColor=g_JSChartResource.DownTextColor;
+    this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+
+    this.TitleColor=g_JSChartResource.DialogTooltip.TitleColor;
+    this.TitleBGColor=g_JSChartResource.DialogTooltip.TitleBGColor;
+    this.BGColor=g_JSChartResource.DialogTooltip.BGColor;
+    this.BorderColor=g_JSChartResource.DialogTooltip.BorderColor;
+
+    this.VolColor=g_JSChartResource.DialogTooltip.VolColor;
+    this.AmountColor=g_JSChartResource.DialogTooltip.AmountColor;
+    this.TurnoverRateColor=g_JSChartResource.DialogTooltip.TurnoverRateColor;
+    this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;
+    this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;
+    this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
+    this.MaxRowCount=10;
+
+    this.AryData=[];
+    this.AryText=[];
+
+    this.KItemCache=null;
+    this.KItemCacheID=null;
+
+    this.Inital=function(hqchart)
+    {
+       this.HQChart=hqchart;
+    }
+
+    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.OnClickColseButton=function(e)
+    {
+        this.Close(e);
+
+        if (this.HQChart && this.HQChart.ChartCorssCursor)
+        {
+            var chart=this.HQChart.ChartCorssCursor;
+            if (!chart.IsShowCorss) return;
+
+            chart.IsShowCorss=false;
+            this.HQChart.Draw();
+            this.HQChart.SetFocus();
+        }
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement("div");
+        divDom.className='UMyChart_Tooltip_Dialog_Div';
+
+        var divTitle=document.createElement("div");
+        divTitle.className='UMyChart_Tooltip_Title_Div';
+        divTitle.onmousedown=(e)=>{   this.OnMouseDownTitle(e);}
+
+        var divName=document.createElement("div");
+        divName.className='UMyChart_Tooltip_Name_Div';
+        divName.innerText="----";
+        divTitle.appendChild(divName);
+
+        var divClose=document.createElement("div");
+        divClose.className='UMyChart_Tooltip_Close_Div';
+        divClose.innerText="x";
+        divClose.onmousedown=(e)=>{ this.OnClickColseButton(e); }
+        divTitle.appendChild(divClose);
+
+        divDom.appendChild(divTitle);
+
+        var table=document.createElement("table");
+        table.className="UMyChart_Tooltip_Table";
+        divDom.appendChild(table);
+
+        var tbody=document.createElement("tbody");
+        tbody.className="UMyChart_Tooltip_Tbody";
+        table.appendChild(tbody);
+
+        this.AryData=[];
+        for(var i=0;i<this.MaxRowCount;++i)
+        {
+            var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
+
+            var trDom=document.createElement("tr");
+            trDom.className='UMyChart_Tooltip_Group_Tr';
+            tbody.appendChild(trDom);
+            rowItem.Tr=trDom;
+
+            var tdDom=document.createElement("td");
+            tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
+            trDom.appendChild(tdDom);
+
+            var spanDom=document.createElement("span");
+            spanDom.className='UMyChart_Tooltip_Title_Span';
+            spanDom.innerText='标题';
+            tdDom.appendChild(spanDom);
+            rowItem.TitleSpan=spanDom;
+
+            var tdDom=document.createElement("td");
+            tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
+            trDom.appendChild(tdDom);
+
+            var spanDom=document.createElement("span");
+            spanDom.className='UMyChart_Tooltip_Text_Span';
+            spanDom.innerText='数值';
+            tdDom.appendChild(spanDom);
+            rowItem.TextSpan=spanDom;
+
+            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.Update=function(data)
+    {
+        if (!this.DivDialog ||  !this.TitleBox) return;
+        if ((!data.KItem && !data.MinItem) || !data.IsShowCorss || data.ClientPos<0) return;
+
+        this.LanguageID=this.HQChart.LanguageID;
+        
+        if (this.HQChart.ClassName=='KLineChartContainer')
+        {
+            var strKItem=JSON.stringify(data.KItem);
+            if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+            {
+                this.KItemCache= JSON.parse(strKItem);
+                this.KItemCacheID=strKItem;
+                this.UpdateTableDOM();
+            }
+            else
+            {
+                //JSConsole.Chart.Log(`[JSDialogTooltip::Update] save as KItemCache and  KItem`);
+            }
+        }
+        else if (this.HQChart.ClassName=='MinuteChartContainer')
+        {
+            var strKItem=JSON.stringify(data.MinItem);
+            if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+            {
+                this.KItemCache= JSON.parse(strKItem);
+                this.KItemCacheID=strKItem;
+                this.UpdateTableDOM();
+            }
+        }
+        else
+        {
+            return;
+        }
+        
+        this.TitleBox.DivName.innerText=data.Name;
+
+       
+        if (!this.IsShow()) this.Show();
+    }
+
+    this.UpdateTableDOM=function()
+    {
+        if (!this.KItemCache) return;
+
+        if (this.HQChart.ClassName=='KLineChartContainer')
+            this.AryText=this.GetFormatKlineTooltipText(this.KItemCache);
+        else if (this.HQChart.ClassName=='MinuteChartContainer')
+            this.AryText=this.GetFormatMinuteTooltipText(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.TitleColor;
+            item.TextSpan.innerText=outItem.Text;
+            item.TextSpan.style.color=outItem.Color;
+            item.Tr.style.display="";
+        }
+
+        for( ; index<this.MaxRowCount; ++index)
+        {
+            var item=this.AryData[index];
+            item.Tr.style.display="none";
+        }
+    }
+
+    this.Close=function(e)
+    {
+        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()
+    {
+        if (!this.DivDialog) return;
+        if (!this.HQChart) return;
+
+        if (!this.DivDialog.style.top || !this.DivDialog.style.left)    //上一次显示的位置
+        {
+            var top=this.HQChart.Frame.ChartBorder.GetTop();
+            var left=this.HQChart.Frame.ChartBorder.GetLeft();
+            var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+    
+            var x=left+rtClient.left+5;
+            var y=top+rtClient.top+10;
+            this.DivDialog.style.top = y + "px";
+            this.DivDialog.style.left = x + "px";
+        }
+
+        this.DivDialog.style.visibility='visible';
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+
+    this.GetFormatKlineTooltipText=function(data)
+    {
+        var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+
+        //日期
+        var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
+
+        //时间
+        var timeItem=null;
+        if (IFrameSplitOperator.IsNumber(data.Time)) timeItem=this.FormatTime(data.Time, this.HQChart.Period, null, 'DialogTooltip-Time');
+        
+        var aryText=
+        [
+            this.ForamtPrice(data.Open,data.YClose, defaultfloatPrecision,'DialogTooltip-Open'),
+            this.ForamtPrice(data.High,data.YClose, defaultfloatPrecision,'DialogTooltip-High'),
+            this.ForamtPrice(data.Low,data.YClose, defaultfloatPrecision,'DialogTooltip-Low'),
+            this.ForamtPrice(data.Close,data.YClose, defaultfloatPrecision,'DialogTooltip-Close'),
+            this.FormatVol(data.Vol,'DialogTooltip-Vol' ),
+            this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
+            this.FormatIncrease(data.Close,data.YClose,'DialogTooltip-Increase'),
+            this.FormatAmplitude(data.High,data.Low,data.YClose,'DialogTooltip-Amplitude'),
+        ];
+
+        if (timeItem) aryText.unshift(timeItem);
+        aryText.unshift(dateItem);
+
+        return aryText;
+    },
+
+    this.GetFormatMinuteTooltipText=function(data)
+    {
+        var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+
+        if (data.Type==0) //连续交易
+        {
+            var item=data.Data;
+            if (!item) item={ };
+
+            var aryText=
+            [
+                this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.FormatTime(item.Time, null, "HH:MM", 'DialogTooltip-Time'),
+                this.ForamtPrice(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Price'),
+                this.FormatRisefall(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Risefall'),
+                this.FormatIncrease(item.Close,item.YClose,'DialogTooltip-Increase'),
+                this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
+                this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
+            ];
+
+            return aryText;
+        }
+        else if (data.Type==1)  //集合竞价
+        {
+            var item=data.Data.Data;
+            if (!item) item={ Vol:[] };
+
+            var timeForamt="HH:MM:SS";
+            if (item.Ver===1) timeForamt="HH:MM"
+            var aryText=
+            [
+                this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
+                this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price'),
+                this.FormatIncrease(item.Price,item.YClose,'DialogTooltip-AC-Increase'),
+                this.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol' ),
+            ];
+
+            return aryText;
+        }
+
+        return [];
+    }
+
+    this.GetColor=function(price,yClose)
+    {
+        if(price>yClose) return this.UpColor;
+        else if (price<yClose) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
+    this.GetPriceColor=function(price, yClose)
+    {
+        var color=this.GetColor(price, yClose);
+        return color;
+    }
+
+    //配色修改
+    this.ReloadResource=function(option)
+    {
+        this.UpColor=g_JSChartResource.UpTextColor;
+        this.DownColor=g_JSChartResource.DownTextColor;
+        this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+
+        this.TitleColor=g_JSChartResource.DialogTooltip.TitleColor;
+        this.TitleBGColor=g_JSChartResource.DialogTooltip.TitleBGColor;
+        this.BGColor=g_JSChartResource.DialogTooltip.BGColor;
+        this.BorderColor=g_JSChartResource.DialogTooltip.BorderColor;
+
+        this.VolColor=g_JSChartResource.DialogTooltip.VolColor;
+        this.AmountColor=g_JSChartResource.DialogTooltip.AmountColor;
+        this.TurnoverRateColor=g_JSChartResource.DialogTooltip.TurnoverRateColor;
+        this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;
+        this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;
+
+        if (!this.DivDialog) return;
+
+        this.UpdateStyle();
+    }
+
+    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;
+
+        this.UpdateTableDOM();
+    },
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////
+    //数据格式化
+    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID, this.LanguageID),
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price)) return item;
+
+        item.Text=price.toFixed(defaultfloatPrecision);
+        item.Color=this.GetColor(price, yClose);
+
+        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.FormatValueString(vol,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, TitleID)
+    {
+        //涨幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        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.TitleColor
+        };
+
+        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, TitleID)
+    {
+        //涨幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+
+        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var value=(high-low)/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)) timeFormat='HH:MM'; // 分钟周期
+            else if (ChartData.IsSecondPeriod(period)) timeFormat='HH:MM:SS';
+            else if (ChartData.IsMilliSecondPeriod(period)) timeFormat='HH:MM:SS.fff';
+        }
+
+        item.Text=IFrameSplitOperator.FormatTimeString(time,format);
+
+        return item;
+    }
+
+}///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
 //
@@ -143063,7 +143919,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13907";
+var HQCHART_VERSION="1.1.13914";
 
 function PrintHQChartVersion()
 {