hqchart 1.1.14538 → 1.1.14552

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

@@ -4545,6 +4545,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
                 if (IFrameSplitOperator.IsNumber(item.PriceGap.Count)) klineChart.PriceGap.Count=item.PriceGap.Count;
             }
+
+            if (IFrameSplitOperator.IsBool(item.EnablePrediction)) klineChart.PredictionConfig.Enable=item.EnablePrediction;
         }
 
         if(option.KLineTitle)
@@ -7392,6 +7394,51 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogSearchIndex=null;
     }
 
+    this.DestroyDialogDrawTool=function()
+    {
+        if (!this.DialogDrawTool) return;
+
+        this.DialogDrawTool.Destroy();
+        this.DialogDrawTool=null;
+    }
+
+    this.DestroyDialogModifyIndexParam=function()
+    {
+        if (this.DialogModifyIndexParam) return;
+
+        this.DialogModifyIndexParam.Destroy();
+        this.DialogModifyIndexParam=null;
+    }
+
+    this.DestroyDialogSelectRect=function()
+    {
+        if (!this.DialogSelectRect) return;
+
+        this.DialogSelectRect.Destroy();
+        this.DialogSelectRect=null;
+    }
+
+    this.DestroyDialogModifyDraw=function()
+    {
+        if (!this.DialogModifyDraw) return;
+
+        this.DialogModifyDraw.Destroy();
+        this.DialogModifyDraw=null;
+    }
+
+    //隐藏内置的弹框div
+    this.HideAllPopDiv=function()
+    {
+        this.HideFloatTooltip();
+        this.CloseTooltipDialog();
+
+        if (this.DialogDrawTool) this.DialogDrawTool.Close();
+        this.CloseModifyDrawDialog();
+
+        if (this.DialogSelectRect) this.DialogSelectRect.Close();
+        if (this.DialogSearchIndex) this.DialogSearchIndex.Close();
+        if (this.DialogModifyIndexParam) this.DialogModifyIndexParam.Close();
+    }
 
 
     //obj={ Element:, Canvas: }
@@ -7443,9 +7490,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
         this.DestroyTooltipDialog();
         this.DestroyFloatTooltip();
+
         this.DestroySearchIndexDialog();
+        this.DestroyDialogModifyIndexParam();
+
+        this.DestroyDialogDrawTool();
+        this.DestroyDialogModifyDraw();
+
+        this.DestroyDialogSelectRect();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -27829,7 +27884,7 @@ function ChartData()
         return result;
     }
 
-    this.MergeMinuteData=function(data) //合并数据
+    this.MergeMinuteData=function(data, period) //合并数据
     {
         if (!this.Data || this.Data.length<=0)
         {
@@ -27837,6 +27892,7 @@ function ChartData()
             return true;
         }
 
+        var bDayPeriod=ChartData.IsDayPeriod(period, true);
         var sourceFirstItem=this.Data[0];
         var firstItemID=0;
         var firstItem=null;
@@ -27850,11 +27906,23 @@ function ChartData()
                 break;
             }
 
-            if (item.Date==sourceFirstItem.Date && item.Time>=sourceFirstItem.Time)
+            if (bDayPeriod)
             {
-                firstItemID=i;
-                firstItem=item;
-                break;
+                if (item.Date==sourceFirstItem.Date)
+                {
+                    firstItemID=i;
+                    firstItem=item;
+                    break;
+                }
+            }
+            else
+            {
+                if (item.Date==sourceFirstItem.Date && item.Time>=sourceFirstItem.Time)
+                {
+                    firstItemID=i;
+                    firstItem=item;
+                    break;
+                }
             }
         }
 
@@ -27867,11 +27935,23 @@ function ChartData()
             var date=this.Data[i].Date;
             var time=this.Data[i].Time;
 
-            if (firstItem.Date>date || (firstItem.Date==date  &&  firstItem.Time>=time) )
+            if (bDayPeriod)
             {
-                index=i;
-                if (firstItem.Date==date && firstItem.Time==time) bFind=true;
-                break;
+                if (firstItem.Date>date || firstItem.Date==date)
+                {
+                    index=i;
+                    if (firstItem.Date==date) bFind=true;
+                    break;
+                }
+            }
+            else
+            {
+                if (firstItem.Date>date || (firstItem.Date==date  &&  firstItem.Time>=time) )
+                {
+                    index=i;
+                    if (firstItem.Date==date && firstItem.Time==time) bFind=true;
+                    break;
+                }
             }
         }
 
@@ -29785,9 +29865,30 @@ function ChartKLine()
         DownAreaColor:g_JSChartResource.HLCArea.DownAreaColor,
     }
 
-    //虚线柱子
+    //虚线柱子 (非交易日)
     this.VirtualBarConfig={ Color:g_JSChartResource.VirtualKLine.Color, LineDash:g_JSChartResource.VirtualKLine.LineDash };
 
+    //预测线配置
+    this.PredictionConfig=
+    { 
+        Line:
+        { 
+            Color:g_JSChartResource.PredictionKLine.Line.Color, 
+            LineDash:g_JSChartResource.PredictionKLine.Line.LineDash, 
+            LineWidth:g_JSChartResource.PredictionKLine.Line.LineWidth 
+        },
+
+        Bar:
+        { 
+            UpColor:g_JSChartResource.PredictionKLine.Bar.UpColor,
+            DownColor:g_JSChartResource.PredictionKLine.Bar.DownColor, 
+            UnchangeColor:g_JSChartResource.PredictionKLine.Bar.UnchangeColor , 
+            DrawType:g_JSChartResource.PredictionKLine.Bar.DrawType
+        },
+        Enable:false,     //是否启动
+    };
+    this.AryPredictionCache=[]; //预测数据
+
     //DrawType==14 自定义图形
     this.FFKChart;
 
@@ -29925,6 +30026,22 @@ function ChartKLine()
         this.OrderFlow.UnchagneColor= { BG:g_JSChartResource.OrderFlow.UnchagneColor.BG, Border:g_JSChartResource.OrderFlow.UnchagneColor.Border };
         this.OrderFlow.Text={ Color: g_JSChartResource.OrderFlow.Text.Color , Family:g_JSChartResource.OrderFlow.Text.Family, FontMaxSize:g_JSChartResource.OrderFlow.Text.FontMaxSize, MaxValue:g_JSChartResource.OrderFlow.Text.MaxValue };
         this.OrderFlow.Line={ UpDownColor: g_JSChartResource.OrderFlow.Line.UpDownColor, MiddleColor:g_JSChartResource.OrderFlow.Line.MiddleColor };
+
+        this.PredictionConfig.Line=
+        {  
+            Color:g_JSChartResource.PredictionKLine.Line.Color, 
+            LineDash:g_JSChartResource.PredictionKLine.Line.LineDash, 
+            LineWidth:g_JSChartResource.PredictionKLine.Line.LineWidth 
+        };
+
+        this.PredictionConfig.Bar=
+        { 
+            UpColor:g_JSChartResource.PredictionKLine.Bar.UpColor,
+            DownColor:g_JSChartResource.PredictionKLine.Bar.DownColor, 
+            UnchangeColor:g_JSChartResource.PredictionKLine.Bar.UnchangeColor, 
+            DrawType:g_JSChartResource.PredictionKLine.Bar.DrawType
+        };
+            
     }
 
     this.ClearCustomKLine=function()
@@ -30295,6 +30412,8 @@ function ChartKLine()
         this.DrawKRange.Start=this.Data.DataOffset;
 
         var preKItemInfo=null;
+        var prePoint=null;
+        var xEnd=null;  //最后一个点
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth),++this.ShowRange.DataCount)
         {
             var data=this.Data.Data[i];
@@ -30308,6 +30427,13 @@ function ChartKLine()
             var yClose=this.GetYFromData(data.Close,false);
             this.DrawKRange.End=i;
 
+            if (data.IsVirtual && this.PredictionConfig.Enable)    //预测数据|虚拟数据
+            {
+                this.AryPredictionCache.push({ PrePoint:prePoint, Point:{ X:x, Y:yClose }});
+                prePoint={ X:x, Y:yClose};
+                continue;
+            }
+
             if (bFirstPoint)
             {
                 if (isHScreen) 
@@ -30328,6 +30454,9 @@ function ChartKLine()
                 else this.Canvas.lineTo(x,yClose);
             }
 
+            xEnd=x;
+            prePoint={ X:x, Y:yClose};
+
             if (i==this.Data.Data.length-1)
             {
                 ptLast={ X:x, Y:yClose, XLeft:left, XRight:right, KItem:data, ChartRight:chartright };
@@ -30359,12 +30488,12 @@ function ChartKLine()
         this.Canvas.stroke();
         if (isHScreen)
         {
-            this.Canvas.lineTo(border.Left,x);
+            this.Canvas.lineTo(border.Left,xEnd);
             this.Canvas.lineTo(border.Left,firstPoint.Y);
         }
         else
         {
-            this.Canvas.lineTo(x,border.Bottom);
+            this.Canvas.lineTo(xEnd,border.Bottom);
             this.Canvas.lineTo(firstPoint.X,border.Bottom);
         }
         this.Canvas.closePath();
@@ -30427,11 +30556,12 @@ function ChartKLine()
         var mapBreakPoint=this.BuildBreakPoint();   //断点
 
         var preKItemInfo=null;
+        var prePoint=null;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth),++this.ShowRange.DataCount)
         {
             var data=this.Data.Data[i];
             this.ShowRange.End=i;
-            if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+            if (!data || data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
 
             var left=xOffset;
             var right=xOffset+dataWidth;
@@ -30440,6 +30570,13 @@ function ChartKLine()
             var yClose=this.GetYFromData(data.Close,false);
             this.DrawKRange.End=i;
 
+            if (data.IsVirtual && this.PredictionConfig.Enable)    //预测数据|虚拟数据
+            {
+                this.AryPredictionCache.push({ PrePoint:prePoint, Point:{ X:x, Y:yClose }});
+                prePoint={ X:x, Y:yClose};
+                continue;
+            }
+
             if (bFirstPoint)
             {
                 if (isHScreen) this.Canvas.moveTo(yClose,x);
@@ -30453,6 +30590,8 @@ function ChartKLine()
             }
             ++drawCount;
 
+            prePoint={ X:x, Y:yClose};
+
             if (this.PriceGap.Enable)
             {
                 var yLow=this.GetYFromData(data.Low, false);
@@ -30527,6 +30666,7 @@ function ChartKLine()
         }
 
         var preKItemInfo=null;
+        var prePoint=null;  //上一个点的位置
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth),++this.ShowRange.DataCount)
         {
             var data=this.Data.Data[i];
@@ -30576,6 +30716,10 @@ function ChartKLine()
             {
                 this.DrawVirtualBar(data, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
             }
+            else if (data.IsVirtual && this.PredictionConfig.Enable)
+            {
+                this.DrawPredictionBar(data, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
+            }
             else if (kLineOption)
             {
                 var barColor=kLineOption.Color;
@@ -30657,6 +30801,8 @@ function ChartKLine()
                 if (value>0)
                     this.AryPriceGapCache.push({ Data:[preKItemInfo, kItemInfo], Type:value });
             }
+
+            prePoint={ X:x, Y:yClose }; //上一个点
     
             preKItemInfo=kItemInfo;
         }
@@ -31528,6 +31674,82 @@ function ChartKLine()
         this.Canvas.setLineDash([]);
     }
 
+    this.DrawPredictionBar=function(data, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen)
+    {
+        var config=this.PredictionConfig.Bar;
+        var drawType=this.DrawType;
+        if (IFrameSplitOperator.IsNumber(config.DrawType)) drawType=config.DrawType;
+        
+        if (data.Open<data.Close)       //阳线
+        {
+            this.DrawKBar_Up(data, dataWidth, config.UpColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
+        }
+        else if (data.Open>data.Close)  //阴线
+        {
+            this.DrawKBar_Down(data, dataWidth, config.DownColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
+        }
+        else
+        {
+            this.DrawKBar_Unchagne(data, dataWidth, config.UnchangeColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
+        }
+    }
+
+    this.DrawPredictionLine=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryPredictionCache)) return;
+
+        this.Canvas.save();
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var bFirstPoint=true;
+        var drawCount=0;
+        for(var i=0;i<this.AryPredictionCache.length;++i)
+        {
+            var item=this.AryPredictionCache[i];
+            if (bFirstPoint)
+            {
+                bFirstPoint=false;
+                this.Canvas.beginPath();
+                if (item.PrePoint)
+                {
+                    var pt=item.PrePoint;
+                    if (bHScreen) this.Canvas.moveTo(pt.Y,pt.X);  //横屏坐标轴对调
+                    else this.Canvas.moveTo(pt.X,pt.Y);
+
+                    var pt=item.Point;
+                    if (bHScreen) this.Canvas.lineTo(pt.Y,pt.X);
+                    else this.Canvas.lineTo(pt.X,pt.Y);
+                }
+                else if (item.Point)
+                {
+                    var pt=item.Point;
+                    if (bHScreen) this.Canvas.moveTo(pt.Y,pt.X);  //横屏坐标轴对调
+                    else this.Canvas.moveTo(pt.X,pt.Y);
+                }
+            }
+            else
+            {
+                var pt=item.Point;
+                if (bHScreen) this.Canvas.lineTo(pt.Y,pt.X);
+                else this.Canvas.lineTo(pt.X,pt.Y);
+            }
+
+            ++drawCount;
+        }
+
+        if (drawCount>0) 
+        {
+            var pixelRatio=GetDevicePixelRatio();
+            var config=this.PredictionConfig.Line;
+            this.Canvas.strokeStyle=config.Color;
+            if (IFrameSplitOperator.IsNumber(config.LineWidth)) this.Canvas.lineWidth=config.LineWidth*pixelRatio;
+            if (IFrameSplitOperator.IsNonEmptyArray(config.LineDash)) this.Canvas.setLineDash(config.LineDash)
+            this.Canvas.stroke();
+        }
+
+        this.Canvas.restore();
+    }
+
     this.DrawRenkoCandle=function() //砖型K线
     {
         var isHScreen=(this.ChartFrame.IsHScreen===true);
@@ -32344,6 +32566,7 @@ function ChartKLine()
         this.PtMin={X:null,Y:null,Value:null,Align:'left'}; //清空最小
         this.DrawKRange={ Start:null, End:null }; 
         this.AryPriceGapCache=[];
+        this.AryPredictionCache=[];
 
         this.ChartFrame.ChartKLine={Max:null, Min:null };   //保存K线上 显示最大最小值坐标
 
@@ -32384,6 +32607,7 @@ function ChartKLine()
         {
             this.DrawCloseLine();
             this.Canvas.restore();
+            this.DrawPredictionLine();
             if (this.PriceGap.Enable) this.DrawPriceGap();
             return;
         }
@@ -32456,6 +32680,7 @@ function ChartKLine()
 
         this.Canvas.restore();
 
+        this.DrawPredictionLine();
         if (this.PriceGap.Enable) this.DrawPriceGap();
 
         if (this.IsShowMaxMinPrice)     //标注最大值最小值
@@ -39235,6 +39460,7 @@ function ChartVolStick()
                 var value=this.Data.Data[i];
                 var kItem=this.HistoryData.Data[i];
                 if (value==null || kItem==null) continue;
+                if (!IFrameSplitOperator.IsNumber(value)) continue;
                 if (value==0) continue;
 
                 var left=xOffset;
@@ -39824,23 +40050,22 @@ function ChartStickLine()
     delete this.newMethod;
 
     this.ClassName='ChartStickLine';    //类名
-    this.Color="rgb(255,193,37)";               //线段颜色
-    this.BarType=0;                     //柱子类型 0=实心 1=空心 -1=画虚线空心柱
-    this.LineDotted=[3,3];              //虚线设置
-    this.Width=0;                       //柱子宽度 0=1 3,50=k线宽度 101=K线宽度+间距宽度
+    this.Color="rgb(255,193,37)";                //线段颜色
+    this.BarType=0;                                 //柱子类型 0=实心 1=空心 -1=画虚线空心柱
+    this.LineDotted=[3,3];                          //虚线设置
+    this.Width=0;                                   //柱子宽度 0=1 3,50=k线宽度 101=K线宽度+间距宽度
+    this.IsHScreen=false;
+    
+    this.EmptyBGColor=null;             //空心柱子背景色(缓存)
+    this.BarCache={ };                  //Type:1=线段 2=柱子
 
     this.SetEmptyBar=function()         //设置空心柱子
     {
         if (this.BarType!=1 && this.BarType!=-1) return false;
 
-        this.Canvas.lineWidth=GetDevicePixelRatio();
-        this.Canvas.strokeStyle=this.Color;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
-        if (emptyBGColor) this.Canvas.fillStyle=emptyBGColor;
-        if (this.BarType==-1)   //虚线
-        {
-            this.Canvas.setLineDash(this.LineDotted);   //虚线
-        }
+        if (emptyBGColor) this.BarCache.EmptyBGColor=emptyBGColor;
+        if (this.BarType==-1) this.BarCache.LineDotted=this.LineDotted;
 
         return true;
     }
@@ -39850,13 +40075,6 @@ function ChartStickLine()
         return (this.BarType==1 || this.BarType==-1);
     }
 
-    this.CalculateBarHeight=function(y,y2)
-    {
-        var barHeight=Math.abs(y-y2);
-        if (barHeight<=0) barHeight=1;
-        return barHeight;
-    }
-
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
@@ -39871,81 +40089,93 @@ function ChartStickLine()
 
         if (!this.Data || !this.Data.Data) return;
 
-        var isHScreen=(this.ChartFrame.IsHScreen===true);
+        var pixelRatio=GetDevicePixelRatio();
+        this.BarCache={ Color:this.Color, EmptyBGColor:null, Width:1*pixelRatio, Type:0, LineDotted:null };
+
+        this.IsHScreen=(this.ChartFrame.IsHScreen===true);;
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var chartright=this.ChartBorder.GetRight();
-        var zoomIndex=this.ChartFrame.ZoomIndex;
-        if (isHScreen) chartright=this.ChartBorder.GetBottom();
         var xPointCount=this.ChartFrame.XPointCount;
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
-        if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        if (this.IsHScreen) 
+        {
+            chartright=this.ChartBorder.GetBottom();
+            xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
 
         var isMinute=this.IsMinuteFrame();
         
-        this.Canvas.save();
-        var bFillBar=false;
-        var bFillKLine=false;
-        var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
-
         if (isMinute)
         {
-            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
-            else this.Canvas.lineWidth=GetDevicePixelRatio();
-            this.Canvas.strokeStyle=this.Color;
+            if (this.Width>1) this.BarCache.Width=2*pixelRatio;
+            this.BarCache.Type=1;
         }
-        else if(this.Width==0)  //宽度时0，使用宽度1
+        else if(this.Width<=0)  //宽度时0，使用宽度1
         {
+            this.BarCache.Type=1;
             this.SetEmptyBar();
-            this.Canvas.lineWidth=GetDevicePixelRatio();
-            this.Canvas.strokeStyle=this.Color;
         }
         else if (this.Width==3 || this.Width==50)   //3和50 K线宽度
         {
+            this.BarCache.Type=1;
             if (dataWidth>=4)
             {
-                bFillKLine=true; 
+                this.BarCache.Type=2;
+                this.BarCache.Width=dataWidth;
                 this.SetEmptyBar();
-                if (!this.IsEmptyBar()) this.Canvas.fillStyle=this.Color; 
-                this.Canvas.strokeStyle=this.Color;
             }
-            else    //太细了 画竖线
-            {
-                this.Canvas.lineWidth=GetDevicePixelRatio();
-                this.Canvas.strokeStyle=this.Color;
-            }  
         }
-        else if (this.Width==101)
+        else if (this.Width==101)   //柱子+间距
         {
-            var lineWidth=dataWidth+distanceWidth+1*GetDevicePixelRatio();
-            this.Canvas.lineWidth=lineWidth;
-            this.Canvas.strokeStyle=this.Color;
+            this.BarCache.Type=1;
+            var lineWidth=dataWidth+distanceWidth+1*pixelRatio;
+            if (lineWidth>=4)
+            {
+                this.BarCache.Type=2;
+                this.BarCache.Width=lineWidth
+                this.SetEmptyBar();
+            }
         }
         else if (this.Width<=3)
         {
-            var minWidth=2*GetDevicePixelRatio();
+            var minWidth=2*pixelRatio;
             var barWidth=dataWidth*(this.Width/3);
             if (barWidth<minWidth) barWidth=minWidth;
-            this.SetEmptyBar();
-            if (!this.IsEmptyBar()) this.Canvas.fillStyle=this.Color;
-            bFillBar=true;
+            this.BarCache.Type=1;
+            if (barWidth>=4)
+            {
+                this.BarCache.Type=2;
+                this.BarCache.Width=barWidth;
+                this.SetEmptyBar();
+            }
         }
         else
         {
-            var barWidth=this.Width*GetDevicePixelRatio()+dataWidth;
+            var barWidth=this.Width*pixelRatio+dataWidth;
+            this.BarCache.Type=2;
+            this.BarCache.Width=barWidth;
             this.SetEmptyBar();
-            if (!this.IsEmptyBar()) this.Canvas.fillStyle=this.Color;
-            bFillBar=true;
         }
 
+        this.Canvas.save();
+        this.ClipClient(this.IsHScreen);
+
+        this.Canvas.strokeStyle=this.BarCache.Color;
+        if (this.BarCache.EmptyBGColor) this.Canvas.fillStyle=this.BarCache.EmptyBGColor;   //空心柱子
+        else this.Canvas.fillStyle=this.BarCache.Color;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.BarCache.LineDotted)) this.Canvas.setLineDash(this.BarCache.LineDotted);   //虚线
+        if (this.BarCache.Type==1) this.Canvas.lineWidth=this.BarCache.Width;
+
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var value=this.Data.Data[i];
-            if (value==null) continue;
+            if (!value) continue;
+            if (!IFrameSplitOperator.IsNumber(value.Value)) continue;
 
             var price=value.Value;
-            var price2=value.Value2;
-            if (price2==null) price2=0;
+            var price2=0;
+            if (IFrameSplitOperator.IsNumber(value.Value2)) price2=value.Value2;
 
             if (isMinute)
             {
@@ -39958,103 +40188,79 @@ function ChartStickLine()
                 var x=left+(right-left)/2;
             }
 
-            var y=this.ChartFrame.GetYFromData(price);
-            var y2=this.ChartFrame.GetYFromData(price2);
+            var y=this.ChartFrame.GetYFromData(price,false);
+            var y2=this.ChartFrame.GetYFromData(price2,false);
 
             if (x>chartright) break;
 
-            if (bFillBar)
-            {
-                if (isHScreen)
-                {
-                    var left=x-barWidth/2;
-                    var width=barWidth;
-                    if (this.IsEmptyBar()) //空心
-                    {
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(Math.min(y,y2)),ToFixedPoint(left),ToFixedRect(Math.abs(y-y2)),ToFixedRect(width));
-                        this.Canvas.stroke();
-                    }
-                    else
-                    {
-                        this.Canvas.fillRect(ToFixedRect(Math.min(y,y2)),ToFixedRect(left),ToFixedRect(Math.abs(y-y2)),ToFixedRect(width));
-                    }
-                }
-                else
-                {
-                    var left=x-barWidth/2;
-                    var width=barWidth;
-                    if (left+width>chartright) width=chartright-left; //不要超过右边框子
-                    if (this.IsEmptyBar()) //空心
-                    {
-                        if (emptyBGColor)
-                            this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(Math.abs(y-y2)));
+            var xCenter=x;
+            var yTop=Math.min(y,y2);
+            var barHeight=Math.abs(y-y2);   //柱子高度
 
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(Math.abs(y-y2)));
-                        this.Canvas.stroke();
-                    }
-                    else
-                    {
-                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(this.CalculateBarHeight(y,y2)));
-                    }
-                }
+            this.DrawBar(xCenter, yTop, barHeight);
+        }
+            
+        this.Canvas.restore();
+    }
+
+    this.DrawBar=function(xCenter, ytop, barHeight)
+    {
+        if (barHeight<1) barHeight=1;
+
+        if (this.BarCache.Type==1)  //线段
+        {
+            if (this.IsHScreen)
+            {
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(ytop,ToFixedPoint(xCenter));
+                this.Canvas.lineTo(ytop+barHeight,ToFixedPoint(xCenter));
+                this.Canvas.stroke();
+            }
+            else
+            {
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(ToFixedPoint(xCenter),ytop);
+                this.Canvas.lineTo(ToFixedPoint(xCenter),ytop+barHeight);  
+                this.Canvas.stroke();
             }
-            else if (bFillKLine)
+        }
+        else if (this.BarCache.Type==2) //柱子
+        {
+            if (this.IsHScreen)
             {
-                if (this.IsEmptyBar())    //空心
+                var xLeft=xCenter-this.BarCache.Width/2;
+                if (this.IsEmptyBar()) //空心
                 {
-                    if (isHScreen)
-                    {
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(Math.min(y,y2)),ToFixedPoint(xOffset),ToFixedRect(Math.abs(y-y2)),ToFixedRect(dataWidth));
-                        this.Canvas.stroke();
-                    }
-                    else
-                    {
-                        if (emptyBGColor)
-                            this.Canvas.fillRect(ToFixedRect(xOffset),ToFixedRect(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(y-y2)));
+                    if (this.BarCache.EmptyBGColor) //背景色填充
+                        this.Canvas.fillRect(ToFixedRect(ytop),ToFixedRect(xLeft),ToFixedRect(barHeight),ToFixedRect(this.BarCache.Width));
 
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(xOffset),ToFixedPoint(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(y-y2)));
-                        this.Canvas.stroke();
-                    }
+                    this.Canvas.beginPath();
+                    this.Canvas.rect(ToFixedPoint(ytop),ToFixedPoint(xLeft),ToFixedRect(barHeight),ToFixedRect(this.BarCache.Width));
+                    this.Canvas.stroke();
                 }
                 else
                 {
-                    if (isHScreen) 
-                    {
-                        this.Canvas.fillRect(ToFixedRect(Math.min(y,y2)),ToFixedRect(xOffset),ToFixedRect(Math.abs(y-y2)),ToFixedRect(dataWidth));
-                    }
-                    else 
-                    {
-                        this.Canvas.fillRect(ToFixedRect(xOffset),ToFixedRect(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(this.CalculateBarHeight(y,y2)));
-                    }
-                        
+                    this.Canvas.fillRect(ToFixedRect(ytop),ToFixedRect(xLeft),ToFixedRect(barHeight),ToFixedRect(this.BarCache.Width));
                 }
             }
             else
             {
-                if (isHScreen)
+                var xLeft=xCenter-this.BarCache.Width/2;
+                if (this.IsEmptyBar()) //空心
                 {
+                    if (this.BarCache.EmptyBGColor) //背景色填充
+                        this.Canvas.fillRect(ToFixedRect(xLeft),ToFixedRect(ytop),ToFixedRect(this.BarCache.Width),ToFixedRect(barHeight));
+
                     this.Canvas.beginPath();
-                    this.Canvas.moveTo(y,ToFixedPoint(x));
-                    this.Canvas.lineTo(y2,ToFixedPoint(x));
+                    this.Canvas.rect(ToFixedPoint(xLeft),ToFixedPoint(ytop),ToFixedRect(this.BarCache.Width),ToFixedRect(barHeight));
                     this.Canvas.stroke();
                 }
                 else
                 {
-                    var xFix=parseInt(x.toString())+0.5;
-                    this.Canvas.beginPath();
-                    this.Canvas.moveTo(xFix,y);
-                    if (Math.abs(y-y2)>0) this.Canvas.lineTo(xFix,y2);
-                    else this.Canvas.lineTo(xFix,y+1);  //太窄了，就画一个像素的宽度
-                    this.Canvas.stroke();
+                    this.Canvas.fillRect(ToFixedRect(xLeft),ToFixedRect(ytop),ToFixedRect(this.BarCache.Width),ToFixedRect(barHeight));
                 }
             }
         }
-
-        this.Canvas.restore();
     }
 
     this.GetMaxMin=function()
@@ -76172,6 +76378,24 @@ function JSChartResource()
         LineDash:[2,2]
     };
 
+    this.PredictionKLine=
+    {
+        Line:
+        {
+            Color:"rgb(100,100,100)", 
+            LineDash:[3,5],
+            LineWidth:2,
+        },
+
+        Bar:
+        {
+            UpColor:"rgb(65,105,225)",
+            DownColor:"rgb(65,105,225)", 
+            UnchangeColor:"rgb(65,105,225s)" , 
+            DrawType:3
+        }
+    };
+
     this.PriceGapStyple=
     { 
         Line:{ Color:"rgb(186,186,186)" }, 
@@ -77572,6 +77796,28 @@ function JSChartResource()
             if (item.LineDash) this.VirtualKLine.LineDash=item.LineDash;
         }
 
+        if (style.PredictionKLine)
+        {
+            if (style.PredictionKLine.Line)
+            {
+                var item=style.PredictionKLine.Line;
+                var dest=this.PredictionKLine.Line;
+                if (item.Color) dest.Color=item.Color;
+                if (item.LineDash) dest.LineDash=item.LineDash;
+                if (IFrameSplitOperator.IsNumber(item.LineWidth)) dest.LineWidth=item.LineWidth;
+            }
+
+            if (style.PredictionKLine.Bar)
+            {
+                var item=style.PredictionKLine.Bar;
+                var dest=this.PredictionKLine.Bar;
+                if (item.UpColor) dest.UpColor=item.UpColor;
+                if (item.DownColor) dest.DownColor=item.DownColor;
+                if (item.UnchangeColor) dest.UnchangeColor=item.UnchangeColor;
+                if (IFrameSplitOperator.IsNumber(item.DrawType) || item.DrawType===null)  dest.DrawType=item.DrawType;
+            }
+        }
+
         if (style.PriceGapStyple)
         {
             var item=style.PriceGapStyple;
@@ -82451,9 +82697,90 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         });
     }
 
+
+    this.RecvRealtimeDataV2=function(data)
+    {
+        var aryRealtimeData=KLineChartContainer.JsonDataToRealtimeDataV2(data,this.Symbol);
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryRealtimeData)) return;
+
+        var lastDataCount=this.GetHistoryDataCount();   //保存下上一次的数据个数
+        var lastSourceDataCount=this.SourceData.Data.length;
+        if (!this.SourceData.MergeMinuteData(aryRealtimeData, this.Period)) return;
+
+        var bindData=new ChartData();
+        bindData.Data=this.SourceData.Data;
+        bindData.Period=this.Period;
+        bindData.Right=this.Right;
+        bindData.DataType=this.SourceData.DataType;
+        bindData.Symbol=this.Symbol;
+
+        //if (bindData.Right>0 && ChartData.IsDayPeriod(bindData.Period,true) && MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && !this.IsApiPeriod)    //复权(A股日线数据才复权)
+        if (bindData.Right>0 && MARKET_SUFFIX_NAME.IsEnableRight(bindData.Period,this.Symbol,this.RightFormula) && !this.IsApiPeriod && ChartData.IsDayPeriod(bindData.Period,true)) //复权
+        {
+            var rightData=bindData.GetRightData(bindData.Right,{ AlgorithmType: this.RightFormula });
+            bindData.Data=rightData;
+        }
+
+        if (!this.IsApiPeriod)
+        {
+            if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据 (0= 日线,4=1分钟线 不需要处理)
+            {
+                var periodData=bindData.GetPeriodData(bindData.Period);
+                bindData.Data=periodData;
+            }
+        }
+
+        var kLineCalculate=this.GetKLineCalulate();
+        if (kLineCalculate) //额外的K线图形计算
+        {
+            var newBindData=kLineCalculate.RecvHistoryData(bindData, { Symbol:this.Symbol, Function:"RecvRealtimeData" });
+            bindData=newBindData;
+            this.FlowCapitalReady=true;
+        }
+
+        this.UpdateMainData(bindData,lastDataCount);//更新主图数据
+        this.UpdateOverlayRealtimeDataV2(data);       //更新叠加股票数据
+        this.BindInstructionIndexData(bindData);    //执行指示脚本
+
+        for(var i=0; i<this.Frame.SubFrame.length; ++i)
+        {
+            this.BindIndexData(i,bindData, { CheckRunCount:true });
+        }
+
+        this.BindAllOverlayIndexData(bindData, {  CheckRunCount:true, SyncExecute:true });   //同步模式叠加指标
+
+        //刷新画图
+        this.UpdataDataoffset();           //更新数据偏移
+        this.UpdatePointByCursorIndex(1);  //更新十字光标位子
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Frame.SetSizeChage(true);
+        this.Draw();
+
+        this.SendKLineUpdateEvent(bindData);    
+        this.UpdateDOMTooltip(0, bindData);
+        this.UpdateHQFloatTooltip(bindData);
+
+        //叠加指标计算
+        this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
+
+        if (this.mapEvent.has(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA))
+        {
+            var event=this.mapEvent.get(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA);
+            var data={ HistoryData:bindData, Stock:{Symbol:this.Symbol, Name:this.Name } }
+            event.Callback(event,data,this);
+        }
+    }
+
     this.RecvRealtimeData=function(data)
     {
         if (this.IsOnTouch==true) return;   //正在操作中不更新数据
+
+        if (data.Ver==3.0)
+        {
+            this.RecvRealtimeDataV2(data);
+            return;
+        }
+
         var realtimeData=KLineChartContainer.JsonDataToRealtimeData(data,this.Symbol);
         if (!realtimeData) return;
 
@@ -82634,6 +82961,47 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
+    this.UpdateOverlayRealtimeDataV2=function(data)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)) return;
+
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            if (!item.Symbol) continue;
+            if (!item.MainData) continue;   //等待主图股票数据未下载完
+            if (item.Status!=OVERLAY_STATUS_ID.STATUS_FINISHED_ID) continue;
+            var aryRealtimeData=KLineChartContainer.JsonDataToRealtimeDataV2(data,item.Symbol);  //获取叠加股票的最新数据
+            if (!aryRealtimeData) continue;
+            var sourceData=item.SourceData; //叠加股票的所有数据
+            sourceData.MergeMinuteData(aryRealtimeData, this.Period);
+
+            var bindData=new ChartData();
+            bindData.Data=sourceData.Data;
+            bindData.Period=this.Period;
+            bindData.Right=this.Right;
+            bindData.DataType=0;
+
+            //if (bindData.Right>0 && MARKET_SUFFIX_NAME.IsSHSZStockA(data.symbol) && !this.IsApiPeriod)    //复权数据 ,A股才有有复权
+            if (bindData.Right>0 && MARKET_SUFFIX_NAME.IsEnableRight(bindData.Right, data.Symbol) && !this.IsApiPeriod)
+            {
+                var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                bindData.Data=rightData;
+            }
+
+            var aryOverlayData=this.SourceData.GetOverlayData(bindData.Data, this.IsApiPeriod);      //和主图数据拟合以后的数据
+            bindData.Data=aryOverlayData;
+
+            if (ChartData.IsDayPeriod(bindData.Period,false) && !this.IsApiPeriod)   //周期数据
+            {
+                var periodData=bindData.GetPeriodData(bindData.Period);
+                bindData.Data=periodData;
+            }
+
+            item.Data=bindData;
+        }
+    }
+
     this.RequestMinuteRealtimeData=function()
     {
         var self=this;
@@ -82755,7 +83123,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (this.IsApiPeriod) this.ReduceSourceData();  //减少数据
         var lastDataCount=this.GetHistoryDataCount();   //保存下上一次的数据个数
         if (!this.SourceData) return;
-        if (!this.SourceData.MergeMinuteData(aryMinuteData)) return;
+        if (!this.SourceData.MergeMinuteData(aryMinuteData, this.Period)) return;
 
         JSConsole.Chart.Log(`[KLineChartContainer::RecvMinuteRealtimeDataV2] update kline by 1 minute data [${lastDataCount}->${this.SourceData.Data.length}], IsAutoSyncDataOffset=${this.IsAutoSyncDataOffset}`);
 
@@ -82838,7 +83206,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (this.IsApiPeriod) this.ReduceSourceData();  //减少数据
         var lastDataCount=this.GetHistoryDataCount();   //保存下上一次的数据个数
         var lastSourceDataCount=this.SourceData.Data.length;
-        if (!this.SourceData.MergeMinuteData(realtimeData)) return;
+        if (!this.SourceData.MergeMinuteData(realtimeData, this.Period)) return;
 
         JSConsole.Chart.Log(`[KLineChartContainer::RecvMinuteRealtimeData] update kline by 1 minute data [${lastSourceDataCount}->${this.SourceData.Data.length}]`);
 
@@ -82909,7 +83277,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 var realtimeData=KLineChartContainer.JsonDataToMinuteRealtimeData(data,item.Symbol);  //获取叠加股票的最新数据
             if (!realtimeData) continue;
             var sourceData=item.SourceData; //叠加股票的所有数据
-            if (!sourceData.MergeMinuteData(realtimeData)) return;
+            if (!sourceData.MergeMinuteData(realtimeData,this.Period)) return;
 
             var bindData=new ChartData();
             bindData.Data=sourceData.Data;
@@ -87740,6 +88108,27 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
     return aryDayData;
 }
 
+
+KLineChartContainer.JsonDataToRealtimeDataV2=function(data, symbol)
+{
+    if (!IFrameSplitOperator.IsNonEmptyArray(data.stock)) return null;
+    
+    var finder=null;
+    for(var i=0;i<data.stock.length;++i)
+    {
+        var item=data.stock[i];
+        if (item.symbol==symbol)
+        {
+            finder=item;
+            break;
+        }
+    }
+
+    if (!finder) return null;
+
+    return KLineChartContainer.JsonDataToHistoryData(finder);
+}
+
 KLineChartContainer.JsonDataToRealtimeData=function(data, symbol)
 {
     if (!data.stock) return null;
@@ -129420,6 +129809,23 @@ function GetBlackStyle()
             LineDash:[2,2]
         },
 
+        PredictionKLine:
+        {
+            Line:
+            {
+                Color:"rgb(220,220,220)", 
+                LineDash:[3*GetDevicePixelRatio(),3*GetDevicePixelRatio()]
+            },
+
+            Bar:
+            {
+                UpColor:"rgb(30,144,255)",
+                DownColor:"rgb(30,144,255)", 
+                UnchangeColor:"rgb(30,144,255)" , 
+                DrawType:3
+            }
+        },
+
         PriceGapStyple:
         { 
             Line:{ Color:"rgb(128,128,128)" }, 
@@ -149193,6 +149599,10 @@ function JSDialogModifyDraw()
             bShowLineColor=false;
             bAdvanced=true;
         }
+        else if (chart.ClassName=="ChartDrawPictureIconFont")
+        {
+            bShowFontZoom=true;
+        }
         
         if (this.ColorButton)
         {
@@ -154786,7 +155196,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14536";
+var HQCHART_VERSION="1.1.14551";
 
 function PrintHQChartVersion()
 {