hqchart 1.1.12655 → 1.1.12674

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -121,6 +121,7 @@ function JSIndexScript()
             ['EMPTY', this.EMPTY],  //什么都不显示的指标
             ['神奇九转', this.NineTurns],
             ['EMA', this.EMA3], ['EMA4', this.EMA4], ['EMA5', this.EMA5],['EMA6', this.EMA6],
+            ["ICHIMOKU",this.ICHIMOKU],["CDP-STD", this.CDP_STD],["TBP-STD",this.TBP_STD],
 
             //通达信特色指标
             ["散户线", this.ShareholderCount],["NXTS", this.NXTS],["FKX", this.FKX],["两融资金", this.Margin4],
@@ -4061,6 +4062,69 @@ DRAWTEXT(D9,H*1.010,'9'),COLORGREEN;"
     return data;
 }
 
+JSIndexScript.prototype.ICHIMOKU=function()
+{
+    let data =
+    {
+        Name: 'ICHIMOKU', Description: '一目均衡图', IsMainIndex: true,
+        Args: [{ Name: 'SHORT', Value: 7 },{ Name: 'MID', Value: 22 },{ Name: 'LONG', Value: 44 }],
+        Script: //脚本
+"转换线:(HHV(H,SHORT)+LLV(L,SHORT))/2,COLORRED,LINETHICK2;\n\
+基准线:(HHV(H,MID)+LLV(L,MID))/2,COLORFF8040,LINETHICK2;\n\
+迟行带:REFXV(C,MID),COLORGRAY,LINETHICK2;\n\
+A:=REF((转换线+基准线)/2,MID);\n\
+B:=REF((HHV(H,LONG)+LLV(L,LONG))/2,MID);\n\
+STICKLINE(A<B,A,B,2,1),COLOR339933;\n\
+STICKLINE(A>=B,A,B,2,1),COLOR0033CC;\n\
+先行带A:PLOYLINE(1,A),COLORBROWN;\n\
+先行带B:PLOYLINE(1,B),COLORLIGREEN;"
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.CDP_STD=function()
+{
+    let data =
+    {
+        Name: 'CDP-STD', Description: '逆势操作', IsMainIndex: true,
+        Script: //脚本
+"CH:=REF(H,1);\n\
+CL:=REF(L,1);\n\
+CC:=REF(C,1);\n\
+CDP:(CH+CL+CC)/3;\n\
+AH:2*CDP+CH-2*CL;\n\
+NH:CDP+CDP-CL;\n\
+NL:CDP+CDP-CH;\n\
+AL:2*CDP-2*CH+CL;"
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.TBP_STD=function()
+{
+    let data =
+    {
+        Name: 'TBP-STD', Description: '趋势平衡点', IsMainIndex: true,
+        Script: //脚本
+"APX:=(H+L+C)/3;\n\
+TR0:=MAX(H-L,MAX(ABS(H-REF(C,1)),ABS(L-REF(C,1))));\n\
+MF0:=C-REF(C,2);\n\
+MF1:=REF(MF0,1);\n\
+MF2:=REF(MF0,2);\n\
+DIRECT1:=BARSLAST(MF0>MF1 AND MF0>MF2);\n\
+DIRECT2:=BARSLAST(MF0<MF1 AND MF0<MF2);\n\
+DIRECT0:=IF(DIRECT1<DIRECT2,100,-100);\n\
+TBP:REF(REF(C,1)+IF(DIRECT0>50,MIN(MF0,MF1),MAX(MF0,MF1)),1);\n\
+多头获利:REF(IF(DIRECT0>50,APX*2-L,DRAWNULL),1),NODRAW;\n\
+多头停损:REF(IF(DIRECT0>50,APX-TR0,DRAWNULL),1),NODRAW;\n\
+空头回补:REF(IF(DIRECT0<-50,APX*2-H,DRAWNULL),1),NODRAW;\n\
+空头停损:REF(IF(DIRECT0<-50,APX+TR0,DRAWNULL),1),NODRAW;"
+    };
+
+    return data;
+}
 
 
 JSIndexScript.prototype.TEST = function () 
@@ -5310,6 +5374,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             this.CanvasElement.onmouseleave=(e)=>{  }
         }
 
+        if (option.ExtendChart)
+        {
+            for(var i=0;i<option.ExtendChart.length;++i)
+            {
+                var item=option.ExtendChart[i];
+                chart.CreateExtendChart(item.Name, item);
+            }
+        }
+
         return chart;
         
     }
@@ -29564,57 +29637,122 @@ function ChartKLine()
                 var item=orderFlow.Order[i];
                 var yPrice=this.GetYFromData(item.Price, false);
                 if (!item.Vol) continue;
-                if (!IFrameSplitOperator.IsNumber(item.Vol.Value)) continue;
-    
-                var barWidth=xKLine.Right-xKLine.Left;
-                var volWidth=barWidth*(item.Vol.Value-min)/(max-min);
-                var rect={ Left:xKLine.Left, Right:xKLine.Right, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
-                rect.Right=rect.Left+volWidth;
 
-                if (preItem && item.Price>preItem.Price)
+                if (IFrameSplitOperator.IsNonEmptyArray(item.AryVol))
                 {
-                    rect.Bottom=preItem.Rect.Top-volBarSpace;
-                }
+                    var barWidth=xKLine.Right-xKLine.Left;
 
-                rect.Width=rect.Right-rect.Left;
-                rect.Height=rect.Bottom-rect.Top;
-                
-                
-                var rtDraw={ Left:ToFixedRect(rect.Left), Top:ToFixedRect(rect.Top), Width:ToFixedRect(rect.Width), Height:ToFixedRect(rect.Height) };
-                rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
-                rtDraw.Right=rtDraw.Left+rtDraw.Width;
-                if (rtDraw.Width<1) rtDraw.Width=1;
+                    var xVolLeft=xKLine.Left;
+                    var xVolRight=xVolLeft;
+                    var totalVol=0;
+                    var rtDraw={ Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                    for(var j=0;j<item.AryVol.length;++j)
+                    {
+                        var itemVol=item.AryVol[j];
+                        if (!IFrameSplitOperator.IsNumber(itemVol.Value)) continue;
+                        totalVol+=itemVol.Value;
+                        xVolRight=barWidth*(totalVol-min)/(max-min)+xKLine.Left;
+                        var rtBar={ Left:xVolLeft, Right:xVolRight, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                        if (preItem && item.Price>preItem.Price)
+                        {
+                            rtBar.Bottom=preItem.Rect.Top-volBarSpace;
+                        }
+                        rtBar.Width=rtBar.Right-rtBar.Left;
+                        rtBar.Height=rtBar.Bottom-rtBar.Top;
 
-                if (item.Vol.BG)    //背景色
-                {
-                    this.Canvas.fillStyle=item.Vol.BG;
-                    this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
-                }
+                        rtDraw={ Left:ToFixedRect(rtBar.Left), Top:ToFixedRect(rtBar.Top), Width:ToFixedRect(rtBar.Width), Height:ToFixedRect(rtBar.Height) };
+                        rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
+                        rtDraw.Right=rtDraw.Left+rtDraw.Width;
+                        if (rtDraw.Width<1) rtDraw.Width=1;
 
-                if (item.Vol.BorderColor)   //边框
-                {
-                    this.Canvas.strokeStyle = item.Vol.BorderColor;
-                    this.Canvas.strokeRect(ToFixedPoint(rtDraw.Left), ToFixedPoint(rtDraw.Top), rtDraw.Width, rtDraw.Height);
-                }
+                        if (itemVol.BG)    //背景色
+                        {
+                            this.Canvas.fillStyle=itemVol.BG;
+                            this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+                        }
 
-                if (item.Vol.Text &&  this.IsShowOrderText) //文字
-                {
-                    this.Canvas.fillStyle=item.Vol.Color;
+                        xVolLeft=rtDraw.Right;
+                    }
 
-                    if (item.Vol.Font)
+                    rtDraw.Left=xKLine.Left;
+                    rtDraw.Width=rtDraw.Right-rtDraw.Left;
+                    if (item.Vol.Text &&  this.IsShowOrderText) //文字
                     {
-                        var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
-                        this.Canvas.font=itemFont;
-                        this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
-                        this.Canvas.font=textFont;
+                        this.Canvas.fillStyle=item.Vol.Color;
+    
+                        if (item.Vol.Font)
+                        {
+                            var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
+                            this.Canvas.font=itemFont;
+                            this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
+                            this.Canvas.font=textFont;
+                        }
+                        else
+                        {
+                            this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        }
                     }
-                    else
+
+                    preItem={ Price: item.Price, Rect:rtDraw };
+                }
+                else if (IFrameSplitOperator.IsNumber(item.Vol.Value)) 
+                {
+                    var barWidth=xKLine.Right-xKLine.Left;
+                    var volWidth=barWidth*(item.Vol.Value-min)/(max-min);
+                    var rect={ Left:xKLine.Left, Right:xKLine.Right, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                    rect.Right=rect.Left+volWidth;
+    
+                    if (preItem && item.Price>preItem.Price)
                     {
-                        this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        rect.Bottom=preItem.Rect.Top-volBarSpace;
                     }
+    
+                    rect.Width=rect.Right-rect.Left;
+                    rect.Height=rect.Bottom-rect.Top;
+                    
+                    
+                    var rtDraw={ Left:ToFixedRect(rect.Left), Top:ToFixedRect(rect.Top), Width:ToFixedRect(rect.Width), Height:ToFixedRect(rect.Height) };
+                    rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
+                    rtDraw.Right=rtDraw.Left+rtDraw.Width;
+                    if (rtDraw.Width<1) rtDraw.Width=1;
+    
+                    if (item.Vol.BG)    //背景色
+                    {
+                        this.Canvas.fillStyle=item.Vol.BG;
+                        this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+                    }
+    
+                    if (item.Vol.BorderColor)   //边框
+                    {
+                        this.Canvas.strokeStyle = item.Vol.BorderColor;
+                        this.Canvas.strokeRect(ToFixedPoint(rtDraw.Left), ToFixedPoint(rtDraw.Top), rtDraw.Width, rtDraw.Height);
+                    }
+    
+                    if (item.Vol.Text &&  this.IsShowOrderText) //文字
+                    {
+                        this.Canvas.fillStyle=item.Vol.Color;
+    
+                        if (item.Vol.Font)
+                        {
+                            var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
+                            this.Canvas.font=itemFont;
+                            this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
+                            this.Canvas.font=textFont;
+                        }
+                        else
+                        {
+                            this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        }
+                    }
+    
+                    preItem={ Price: item.Price, Rect:rtDraw };
                 }
-
-                preItem={ Price: item.Price, Rect:rtDraw };
+                else
+                {
+                    continue;
+                }
+    
+                
             }
         }
     }
@@ -98075,6 +98213,50 @@ function JSAlgorithm(errorHandler,symbolData)
         return result;
     }
 
+
+
+    //STDDEV(X,N) 返回标准偏差
+    //将标准差除以样本大小N的平方根即可得出标准误差。标准误差 = σ/sqrt(n)
+    this.STDDEV=function(data,n)
+    {
+        var result=[];
+        
+        if (!Array.isArray(data)) return result;
+        var nStart=this.GetFirstVaildIndex(data);
+        if (!IFrameSplitOperator.IsNumber(n)) return result;
+        if(nStart+n>data.length || n<1) return result;
+
+        var i=nStart, j=0, bFirst=true, dTotal=0, dAvg=0;
+        for(i+=n-1;i<data.length;++i)
+        {
+            dTotal = 0;
+            if(bFirst)
+            {
+                bFirst = false;
+                for(j=i-n+1;j<=i;++j)
+                {
+                    dAvg += data[j];
+                }
+                    
+                dAvg /= n;
+            }
+            else
+            {
+                dAvg += (data[i]-data[i-n])/n;
+            }
+
+            for(j=i-n+1;j<=i;++j)
+            {
+                dTotal += (data[j]-dAvg)*(data[j]-dAvg);
+            }
+			
+
+		    result[i] = Math.sqrt(dTotal/(n-1))/Math.sqrt(n);
+        }
+
+        return result;
+    }
+
     //平均绝对方差
     this.AVEDEV=function(data,n)
     {
@@ -102886,6 +103068,8 @@ function JSAlgorithm(errorHandler,symbolData)
                 return this.AVEDEV(args[0], args[1]);
             case 'STD':
                 return this.STD(args[0], args[1]);
+            case "STDDEV":
+                return this.STDDEV(args[0], args[1]);
             case 'IF':
             case 'IFF':
             case "IFELSE":
@@ -130199,7 +130383,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12654";
+var HQCHART_VERSION="1.1.12673";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12654";
+var HQCHART_VERSION="1.1.12673";
 
 function PrintHQChartVersion()
 {

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

@@ -165,6 +165,7 @@ function JSIndexScript()
             ['EMPTY', this.EMPTY],  //什么都不显示的指标
             ['神奇九转', this.NineTurns],
             ['EMA', this.EMA3], ['EMA4', this.EMA4], ['EMA5', this.EMA5],['EMA6', this.EMA6],
+            ["ICHIMOKU",this.ICHIMOKU],["CDP-STD", this.CDP_STD],["TBP-STD",this.TBP_STD],
 
             //通达信特色指标
             ["散户线", this.ShareholderCount],["NXTS", this.NXTS],["FKX", this.FKX],["两融资金", this.Margin4],
@@ -4105,6 +4106,69 @@ DRAWTEXT(D9,H*1.010,'9'),COLORGREEN;"
     return data;
 }
 
+JSIndexScript.prototype.ICHIMOKU=function()
+{
+    let data =
+    {
+        Name: 'ICHIMOKU', Description: '一目均衡图', IsMainIndex: true,
+        Args: [{ Name: 'SHORT', Value: 7 },{ Name: 'MID', Value: 22 },{ Name: 'LONG', Value: 44 }],
+        Script: //脚本
+"转换线:(HHV(H,SHORT)+LLV(L,SHORT))/2,COLORRED,LINETHICK2;\n\
+基准线:(HHV(H,MID)+LLV(L,MID))/2,COLORFF8040,LINETHICK2;\n\
+迟行带:REFXV(C,MID),COLORGRAY,LINETHICK2;\n\
+A:=REF((转换线+基准线)/2,MID);\n\
+B:=REF((HHV(H,LONG)+LLV(L,LONG))/2,MID);\n\
+STICKLINE(A<B,A,B,2,1),COLOR339933;\n\
+STICKLINE(A>=B,A,B,2,1),COLOR0033CC;\n\
+先行带A:PLOYLINE(1,A),COLORBROWN;\n\
+先行带B:PLOYLINE(1,B),COLORLIGREEN;"
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.CDP_STD=function()
+{
+    let data =
+    {
+        Name: 'CDP-STD', Description: '逆势操作', IsMainIndex: true,
+        Script: //脚本
+"CH:=REF(H,1);\n\
+CL:=REF(L,1);\n\
+CC:=REF(C,1);\n\
+CDP:(CH+CL+CC)/3;\n\
+AH:2*CDP+CH-2*CL;\n\
+NH:CDP+CDP-CL;\n\
+NL:CDP+CDP-CH;\n\
+AL:2*CDP-2*CH+CL;"
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.TBP_STD=function()
+{
+    let data =
+    {
+        Name: 'TBP-STD', Description: '趋势平衡点', IsMainIndex: true,
+        Script: //脚本
+"APX:=(H+L+C)/3;\n\
+TR0:=MAX(H-L,MAX(ABS(H-REF(C,1)),ABS(L-REF(C,1))));\n\
+MF0:=C-REF(C,2);\n\
+MF1:=REF(MF0,1);\n\
+MF2:=REF(MF0,2);\n\
+DIRECT1:=BARSLAST(MF0>MF1 AND MF0>MF2);\n\
+DIRECT2:=BARSLAST(MF0<MF1 AND MF0<MF2);\n\
+DIRECT0:=IF(DIRECT1<DIRECT2,100,-100);\n\
+TBP:REF(REF(C,1)+IF(DIRECT0>50,MIN(MF0,MF1),MAX(MF0,MF1)),1);\n\
+多头获利:REF(IF(DIRECT0>50,APX*2-L,DRAWNULL),1),NODRAW;\n\
+多头停损:REF(IF(DIRECT0>50,APX-TR0,DRAWNULL),1),NODRAW;\n\
+空头回补:REF(IF(DIRECT0<-50,APX*2-H,DRAWNULL),1),NODRAW;\n\
+空头停损:REF(IF(DIRECT0<-50,APX+TR0,DRAWNULL),1),NODRAW;"
+    };
+
+    return data;
+}
 
 
 JSIndexScript.prototype.TEST = function () 
@@ -5354,6 +5418,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             this.CanvasElement.onmouseleave=(e)=>{  }
         }
 
+        if (option.ExtendChart)
+        {
+            for(var i=0;i<option.ExtendChart.length;++i)
+            {
+                var item=option.ExtendChart[i];
+                chart.CreateExtendChart(item.Name, item);
+            }
+        }
+
         return chart;
         
     }
@@ -29608,57 +29681,122 @@ function ChartKLine()
                 var item=orderFlow.Order[i];
                 var yPrice=this.GetYFromData(item.Price, false);
                 if (!item.Vol) continue;
-                if (!IFrameSplitOperator.IsNumber(item.Vol.Value)) continue;
-    
-                var barWidth=xKLine.Right-xKLine.Left;
-                var volWidth=barWidth*(item.Vol.Value-min)/(max-min);
-                var rect={ Left:xKLine.Left, Right:xKLine.Right, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
-                rect.Right=rect.Left+volWidth;
 
-                if (preItem && item.Price>preItem.Price)
+                if (IFrameSplitOperator.IsNonEmptyArray(item.AryVol))
                 {
-                    rect.Bottom=preItem.Rect.Top-volBarSpace;
-                }
+                    var barWidth=xKLine.Right-xKLine.Left;
 
-                rect.Width=rect.Right-rect.Left;
-                rect.Height=rect.Bottom-rect.Top;
-                
-                
-                var rtDraw={ Left:ToFixedRect(rect.Left), Top:ToFixedRect(rect.Top), Width:ToFixedRect(rect.Width), Height:ToFixedRect(rect.Height) };
-                rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
-                rtDraw.Right=rtDraw.Left+rtDraw.Width;
-                if (rtDraw.Width<1) rtDraw.Width=1;
+                    var xVolLeft=xKLine.Left;
+                    var xVolRight=xVolLeft;
+                    var totalVol=0;
+                    var rtDraw={ Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                    for(var j=0;j<item.AryVol.length;++j)
+                    {
+                        var itemVol=item.AryVol[j];
+                        if (!IFrameSplitOperator.IsNumber(itemVol.Value)) continue;
+                        totalVol+=itemVol.Value;
+                        xVolRight=barWidth*(totalVol-min)/(max-min)+xKLine.Left;
+                        var rtBar={ Left:xVolLeft, Right:xVolRight, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                        if (preItem && item.Price>preItem.Price)
+                        {
+                            rtBar.Bottom=preItem.Rect.Top-volBarSpace;
+                        }
+                        rtBar.Width=rtBar.Right-rtBar.Left;
+                        rtBar.Height=rtBar.Bottom-rtBar.Top;
 
-                if (item.Vol.BG)    //背景色
-                {
-                    this.Canvas.fillStyle=item.Vol.BG;
-                    this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
-                }
+                        rtDraw={ Left:ToFixedRect(rtBar.Left), Top:ToFixedRect(rtBar.Top), Width:ToFixedRect(rtBar.Width), Height:ToFixedRect(rtBar.Height) };
+                        rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
+                        rtDraw.Right=rtDraw.Left+rtDraw.Width;
+                        if (rtDraw.Width<1) rtDraw.Width=1;
 
-                if (item.Vol.BorderColor)   //边框
-                {
-                    this.Canvas.strokeStyle = item.Vol.BorderColor;
-                    this.Canvas.strokeRect(ToFixedPoint(rtDraw.Left), ToFixedPoint(rtDraw.Top), rtDraw.Width, rtDraw.Height);
-                }
+                        if (itemVol.BG)    //背景色
+                        {
+                            this.Canvas.fillStyle=itemVol.BG;
+                            this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+                        }
 
-                if (item.Vol.Text &&  this.IsShowOrderText) //文字
-                {
-                    this.Canvas.fillStyle=item.Vol.Color;
+                        xVolLeft=rtDraw.Right;
+                    }
 
-                    if (item.Vol.Font)
+                    rtDraw.Left=xKLine.Left;
+                    rtDraw.Width=rtDraw.Right-rtDraw.Left;
+                    if (item.Vol.Text &&  this.IsShowOrderText) //文字
                     {
-                        var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
-                        this.Canvas.font=itemFont;
-                        this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
-                        this.Canvas.font=textFont;
+                        this.Canvas.fillStyle=item.Vol.Color;
+    
+                        if (item.Vol.Font)
+                        {
+                            var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
+                            this.Canvas.font=itemFont;
+                            this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
+                            this.Canvas.font=textFont;
+                        }
+                        else
+                        {
+                            this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        }
                     }
-                    else
+
+                    preItem={ Price: item.Price, Rect:rtDraw };
+                }
+                else if (IFrameSplitOperator.IsNumber(item.Vol.Value)) 
+                {
+                    var barWidth=xKLine.Right-xKLine.Left;
+                    var volWidth=barWidth*(item.Vol.Value-min)/(max-min);
+                    var rect={ Left:xKLine.Left, Right:xKLine.Right, Bottom:yPrice+cellHeight/2, Top:yPrice-cellHeight/2 };
+                    rect.Right=rect.Left+volWidth;
+    
+                    if (preItem && item.Price>preItem.Price)
                     {
-                        this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        rect.Bottom=preItem.Rect.Top-volBarSpace;
                     }
+    
+                    rect.Width=rect.Right-rect.Left;
+                    rect.Height=rect.Bottom-rect.Top;
+                    
+                    
+                    var rtDraw={ Left:ToFixedRect(rect.Left), Top:ToFixedRect(rect.Top), Width:ToFixedRect(rect.Width), Height:ToFixedRect(rect.Height) };
+                    rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
+                    rtDraw.Right=rtDraw.Left+rtDraw.Width;
+                    if (rtDraw.Width<1) rtDraw.Width=1;
+    
+                    if (item.Vol.BG)    //背景色
+                    {
+                        this.Canvas.fillStyle=item.Vol.BG;
+                        this.Canvas.fillRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+                    }
+    
+                    if (item.Vol.BorderColor)   //边框
+                    {
+                        this.Canvas.strokeStyle = item.Vol.BorderColor;
+                        this.Canvas.strokeRect(ToFixedPoint(rtDraw.Left), ToFixedPoint(rtDraw.Top), rtDraw.Width, rtDraw.Height);
+                    }
+    
+                    if (item.Vol.Text &&  this.IsShowOrderText) //文字
+                    {
+                        this.Canvas.fillStyle=item.Vol.Color;
+    
+                        if (item.Vol.Font)
+                        {
+                            var itemFont=this.GetDynamicOrderFlowFont(cellHeight, barWidth/2, item.Vol.Font);
+                            this.Canvas.font=itemFont;
+                            this.Canvas.fillText(text,xKLine.Center+textXOffset,yPrice);
+                            this.Canvas.font=textFont;
+                        }
+                        else
+                        {
+                            this.Canvas.fillText(item.Vol.Text,rtDraw.Left+2,yPrice);
+                        }
+                    }
+    
+                    preItem={ Price: item.Price, Rect:rtDraw };
                 }
-
-                preItem={ Price: item.Price, Rect:rtDraw };
+                else
+                {
+                    continue;
+                }
+    
+                
             }
         }
     }
@@ -98119,6 +98257,50 @@ function JSAlgorithm(errorHandler,symbolData)
         return result;
     }
 
+
+
+    //STDDEV(X,N) 返回标准偏差
+    //将标准差除以样本大小N的平方根即可得出标准误差。标准误差 = σ/sqrt(n)
+    this.STDDEV=function(data,n)
+    {
+        var result=[];
+        
+        if (!Array.isArray(data)) return result;
+        var nStart=this.GetFirstVaildIndex(data);
+        if (!IFrameSplitOperator.IsNumber(n)) return result;
+        if(nStart+n>data.length || n<1) return result;
+
+        var i=nStart, j=0, bFirst=true, dTotal=0, dAvg=0;
+        for(i+=n-1;i<data.length;++i)
+        {
+            dTotal = 0;
+            if(bFirst)
+            {
+                bFirst = false;
+                for(j=i-n+1;j<=i;++j)
+                {
+                    dAvg += data[j];
+                }
+                    
+                dAvg /= n;
+            }
+            else
+            {
+                dAvg += (data[i]-data[i-n])/n;
+            }
+
+            for(j=i-n+1;j<=i;++j)
+            {
+                dTotal += (data[j]-dAvg)*(data[j]-dAvg);
+            }
+			
+
+		    result[i] = Math.sqrt(dTotal/(n-1))/Math.sqrt(n);
+        }
+
+        return result;
+    }
+
     //平均绝对方差
     this.AVEDEV=function(data,n)
     {
@@ -102930,6 +103112,8 @@ function JSAlgorithm(errorHandler,symbolData)
                 return this.AVEDEV(args[0], args[1]);
             case 'STD':
                 return this.STD(args[0], args[1]);
+            case "STDDEV":
+                return this.STDDEV(args[0], args[1]);
             case 'IF':
             case 'IFF':
             case "IFELSE":
@@ -130357,7 +130541,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12654";
+var HQCHART_VERSION="1.1.12673";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.chartpaint.wechat.js

@@ -8543,6 +8543,7 @@ function ChartCorssCursor()
 
     this.IsShow = true;       //是否显示
     this.ShowTextMode = { Left: 1, Right: 1, Bottom: 1 }; //0=不显示  1=显示在框架外 2=显示在框架内
+    this.TextFormat= { Right:0 };               //0=默认 1=价格显示(分时图才有用)
     this.IsShowCorss = true;    //是否显示十字光标
     this.IsShowClose = false;     //Y轴始终显示收盘价
     this.IsFixXLastTime=false;    //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
@@ -8726,6 +8727,15 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text, left + 2, y, textWidth);
             }
 
+            if (this.StringFormatY.PercentageText)
+            {
+                if (this.TextFormat.Right==0)
+                {
+                    text=this.StringFormatY.PercentageText+'%';
+                    var textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
+                }
+            }
+
             if (this.StringFormatY.RText) 
             {
                 text = this.StringFormatY.RText;