hqchart 1.1.12516 → 1.1.12522

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

@@ -33139,6 +33139,7 @@ function ChartStick()
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -33164,6 +33165,8 @@ function ChartLineStick()
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -43692,7 +43695,7 @@ function DrawToolsButton()
                     { HTML: { Title: 'M头W底', IClass: 'iconfont icon-draw_wavemw', ID: 'icon-wavemw' }, Name: 'M头W底' },
                     { HTML: { Title: '头肩型', IClass: 'iconfont icon-draw_head_shoulders_bt', ID: 'icon-Head-Shoulders' }, Name: '头肩型' },
                     { HTML: { Title: '波浪尺', IClass: 'iconfont icon-waveruler', ID: 'icon-wave-ruler' }, Name: '波浪尺' },
-                    { HTML: { Title: 'AB波浪尺', IClass: 'iconfont icon-waveruler', ID: 'icon-wave-ruler' }, Name: 'AB波浪尺' },
+                    { HTML: { Title: 'AB波浪尺', IClass: 'iconfont icon-waveruler', ID: 'icon-wave-ruler2' }, Name: 'AB波浪尺' },
                     { HTML: { Title: '箱型线', IClass: 'iconfont icon-draw_box', ID: 'icon-drawbox' }, Name: '箱型线' },
                     { HTML: { Title: '涂鸦线段', IClass: 'iconfont icon-draw_line', ID: 'icon-segment2' }, Name: '涂鸦线段' },
 
@@ -52675,7 +52678,8 @@ function DynamicMinuteTitlePainting()
 
         if (beforeItem && dataItem) //盘前数据
         {
-            if (beforeItem.Date>dataItem.Date || (beforeItem.Date==dataItem.Date && beforeItem.Time>dataItem.Time && afterDataVer==1.0) ) 
+            if (beforeItem.Date>dataItem.Date || (beforeItem.Date==dataItem.Date && beforeItem.Time>dataItem.Time && beforeDataVer==1.0) 
+                || (beforeItem.Date==dataItem.Date && parseInt(beforeItem.Time>dataItem.Time) && beforeDataVer==2.0)) 
                 return { Type:2, Data:beforeItem, Ver: beforeDataVer,  Explain:beforeExplain};
         }
 
@@ -56089,7 +56093,9 @@ IChartDrawPicture.ArrayDrawPricture=
     { Name:"AnchoredText", ClassName:"ChartDrawAnchoredText", Create:function() { return new ChartDrawAnchoredText();} },
     { Name:"PriceLabel", ClassName:"ChartDrawPriceLabel", Create:function() { return new ChartDrawPriceLabel();} },
     { Name:"PriceNote", ClassName:"ChartDrawPriceNote", Create:function() { return new ChartDrawPriceNote();} },
-    { Name:"FibWedge", ClassName:"ChartDrawFibWedge", Create:function(){ return new ChartDrawFibWedge(); }}
+    { Name:"FibWedge", ClassName:"ChartDrawFibWedge", Create:function(){ return new ChartDrawFibWedge(); }},
+    { Name:"FibRetracement", ClassName:"ChartFibRetracement", Create:function() { return new ChartFibRetracement(); }},     //斐波那契回测
+    { Name:"FibSpeedResistanceFan", ClassName:"ChartFibSpeedResistanceFan", Create:function() { return new ChartFibSpeedResistanceFan(); }} //斐波那契扇形
 ];
 
 IChartDrawPicture.MapIonFont=new Map(
@@ -58360,7 +58366,7 @@ function ChartDrawPictureParallelChannel()
                 var ptCenter=new Point();
                 ptCenter.X=linePoint.Start.X+(linePoint.End.X-linePoint.Start.X)/2;
                 ptCenter.Y=linePoint.Start.Y+(linePoint.End.Y-linePoint.Start.Y)/2;
-                drawPoint[3]=ptCenter;
+                drawPoint[2]=ptCenter;
 
                 this.Point[2]=ptCenter;
                 var xValue=parseInt(this.Frame.GetXData(ptCenter.X))+data.DataOffset;
@@ -58793,6 +58799,7 @@ function ChartDrawPictureGannFan()
         else return 3;
     }
 
+
     //isDotline 是否是虚线
     this.DrawLine=function(ptStart,ptEnd,isDottedline)
     {
@@ -63572,6 +63579,423 @@ function ChartDrawFibWedge()
 
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// 斐波那契回测
+//
+function ChartFibRetracement()
+{
+    this.newMethod=IChartDrawPicture;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartFibRetracement';
+    this.PointCount=2;
+    this.Font=12*GetDevicePixelRatio() +"px 微软雅黑";
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
+    this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.PointToValue_Default=this.PointToValue;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
+    this.LineDash=[6,3];
+    this.LineWidth=1;
+    this.EnableBGColor=true;
+    this.ExtendLine={ Left:false, Right: false }; //延长线
+
+    this.AreaConfig=
+    { 
+        AryData:
+        [
+            { Value: 0, Color:"rgb(128,128,128)", Enable:true },
+            { Value: 0.236, Color:"rgb(242,52,69)", Enable:true },
+            { Value: 0.382, Color:"rgb(255,152,0)",Enable:true },
+            { Value: 0.5, Color:"rgb(76,175,80)", Enable:true },
+            { Value: 0.618, Color:"rgb(8,153,129)", Enable:true },
+            { Value: 0.786, Color:"rgb(0,188,212)" ,Enable:true },
+            { Value: 1, Color:"rgb(120,123,134)", Enable:true },
+            { Value: 1.618, Color:"rgb(41,98,255)",Enable:true },
+            { Value: 2.618, Color:"rgb(242,54,69)",Enable:false },
+        ],
+
+        Opacity:0.3
+    }
+
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (option.Font) this.Font=option.Font;
+        if (option.LineWidth) this.LineWidth=option.LineWidth;
+        if (option.LineDash) this.LineDash=option.LineDash;
+        if (IFrameSplitOperator.IsBool(option.EnableBGColor)) this.EnableBGColor=option.EnableBGColor;
+        if (option.ExtendLine) 
+        {
+            var item=option.ExtendLine;
+            if (IFrameSplitOperator.IsBool(item.Left)) this.ExtendLine.Left=item.Left;
+            if (IFrameSplitOperator.IsBool(item.Right)) this.ExtendLine.Left=item.Right;
+        }
+
+        if (option.AreaConfig) this.AreaConfig=option.AreaConfig;
+    }
+
+    //导出成存储格式
+    this.ExportStorageData=function()
+    {
+        var storageData=this.ExportBaseData();
+
+        storageData.Value=[];
+        for(var i=0;i<this.Value.length && i<this.PointCount;++i)
+        {
+            var item=this.Value[i];
+            storageData.Value.push( { XValue:item.XValue, YValue:item.YValue } );
+        }
+    
+        storageData.Font=this.Font;
+        storageData.EnableBGColor=this.EnableBGColor;
+        storageData.LineDash=this.LineDash;
+        storageData.ExtendLine={ Left:this.ExtendLine.Left, Right:this.ExtendLine.Right };
+        storageData.AreaConfig=CloneData(this.AreaConfig);
+
+        return storageData;
+    }
+
+    this.ImportStorageData=function(storageData)
+    {
+        if (storageData.Font) this.Font=storageData.Font;
+        if (storageData.LineDash) this.LineDash=storageData.LineDash;
+        if (IFrameSplitOperator.IsBool(storageData.EnableBGColor))  this.EnableBGColor=storageData.EnableBGColor;
+        if (storageData.ExtendLine) this.ExtendLine=storageData.ExtendLine;
+        if (storageData.AreaConfig) this.AreaConfig=storageData.AreaConfig;
+    }
+
+    this.Draw=function()
+    {
+        this.LinePoint=[];
+        if (this.IsFrameMinSize()) return;
+        var bCheckXY=true;
+        if (this.ExtendLine.Left || this.ExtendLine.Right) bCheckXY=false;
+        var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
+        if (!drawPoint) return;
+        if (drawPoint.length!=2) return;
+
+        this.ClipFrame();
+
+        var ptStart=drawPoint[0];
+        var ptEnd=drawPoint[1];
+
+        this.SetLineWidth();
+        this.Canvas.strokeStyle=this.LineColor;
+        this.Canvas.setLineDash(this.LineDash);
+        this.Canvas.beginPath();
+        this.Canvas.moveTo(ptStart.X,ptStart.Y);
+        this.Canvas.lineTo(ptEnd.X,ptEnd.Y);
+        this.Canvas.stroke();
+        this.Canvas.setLineDash([]);
+
+        this.DrawBlock(ptStart, ptEnd);
+
+        this.RestoreLineWidth();
+
+        var line={Start:ptStart, End:ptEnd};
+        this.LinePoint.push(line);
+        
+        this.DrawPoint(drawPoint);  //画点
+        this.Canvas.restore();
+    }
+
+    this.GetArrayAreaConfig=function()
+    {
+        var aryArea=[];
+        for(var i=0;i<this.AreaConfig.AryData.length;++i)
+        {
+            var item=this.AreaConfig.AryData[i];
+            if (item.Enable) aryArea.push(item);
+        }
+
+        aryArea.sort((left,right)=>{ return right.Value-left.Value; })
+
+        return aryArea;
+    }
+
+    this.DrawBlock=function(ptStart, ptEnd)
+    {
+        var yTop=Math.min(ptStart.Y, ptEnd.Y);
+        var yBottom=Math.max(ptStart.Y, ptEnd.Y);
+        var xLeft=Math.min(ptStart.X, ptEnd.X);
+        var xRight=Math.max(ptStart.X, ptEnd.X);
+        var height=yBottom-yTop;
+        //var baseValue=Math.min(this.Value[0].YValue, this.Value[1].YValue);
+        //var diffValue=Math.abs(this.Value[0].YValue-this.Value[1].YValue);  //差值
+
+        if (this.ExtendLine.Right) xRight=this.Frame.ChartBorder.GetRight();
+        if (this.ExtendLine.Left) xLeft=this.Frame.ChartBorder.GetLeft();
+
+        var aryArea=this.GetArrayAreaConfig();
+        var yPre=null;      //上一个点
+        var clrArea=null;
+        this.Canvas.font=this.Font;
+        if (this.ExtendLine.Left) this.Canvas.textAlign="left";
+        else this.Canvas.textAlign="right";
+        this.Canvas.textBaseline="bottom";
+
+        for(var i=0;i<aryArea.length;++i)
+        {
+            var item=aryArea[i];
+            var y=yBottom-height*item.Value;
+            //var yValue=baseValue+diffValue*item.Value;
+            yValue=this.Frame.GetYData(y,false);
+            y=ToFixedPoint(y);
+            if (this.EnableBGColor && IFrameSplitOperator.IsNumber(yPre))
+            {
+                var rtBG={ Left:xLeft, Right:xRight, Top:yPre, Bottom:y };
+                rtBG.Width=rtBG.Right-rtBG.Left;
+                rtBG.Height=rtBG.Bottom-rtBG.Top;
+                this.Canvas.fillStyle=clrArea;
+                this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+            }
+
+            this.Canvas.strokeStyle=item.Color;
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(xLeft,y);
+            this.Canvas.lineTo(xRight,y);
+            this.Canvas.stroke();
+
+            var line={ Start:{X:xLeft, Y:y}, End:{X:xRight, Y:y} };
+            this.LinePoint.push(line);
+
+            //文字
+            var text=`${item.Value} (${yValue.toFixed(2)})`;
+            this.Canvas.fillStyle=item.Color;
+            if (this.ExtendLine.Left)
+                this.Canvas.fillText(text,xLeft+2,y-2);
+            else 
+                this.Canvas.fillText(text,xLeft-2,y-2);
+
+            yPre=y;
+            clrArea=IChartDrawPicture.ColorToRGBA(item.Color, this.AreaConfig.Opacity);
+        }
+    }
+
+}
+
+
+function ChartFibSpeedResistanceFan()
+{
+    this.newMethod=IChartDrawPicture;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartFibSpeedResistanceFan';
+    this.PointCount=2;
+    this.Font=12*GetDevicePixelRatio() +"px 微软雅黑";
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
+    this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.PointToValue_Default=this.PointToValue;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
+    this.LineWidth=1;
+    this.EnableBGColor=true;
+
+    this.AreaConfig=
+    { 
+        AryYData:
+        [
+            { Value: 0, Color:"rgb(128,128,128)", Enable:true },
+            { Value: 0.25, Color:"rgb(242,52,69)", Enable:true },
+            { Value: 0.382, Color:"rgb(255,152,0)",Enable:true },
+            { Value: 0.5, Color:"rgb(76,175,80)", Enable:true },
+            { Value: 0.618, Color:"rgb(8,153,129)", Enable:true },
+            { Value: 0.75, Color:"rgb(0,188,212)" ,Enable:true },
+            { Value: 1, Color:"rgb(120,123,134)", Enable:true },
+           
+        ],
+
+        AryXData:
+        [
+            { Value: 0, Color:"rgb(128,128,128)", Enable:true },
+            { Value: 0.25, Color:"rgb(242,52,69)", Enable:true },
+            { Value: 0.382, Color:"rgb(255,152,0)",Enable:true },
+            { Value: 0.5, Color:"rgb(76,175,80)", Enable:true },
+            { Value: 0.618, Color:"rgb(8,153,129)", Enable:true },
+            { Value: 0.75, Color:"rgb(0,188,212)" ,Enable:true },
+            { Value: 1, Color:"rgb(120,123,134)", Enable:true },
+        ],
+
+        Opacity:0.3
+    }
+
+    this.Draw=function()
+    {
+        this.LinePoint=[];
+        if (this.IsFrameMinSize()) return;
+        var bCheckXY=false;
+        var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
+        if (!drawPoint) return;
+        if (drawPoint.length!=2) return;
+
+        this.ClipFrame();
+
+        var ptStart=drawPoint[0];
+        var ptEnd=drawPoint[1];
+
+        this.SetLineWidth();
+        this.DrawBlock(ptEnd, ptStart);
+        this.RestoreLineWidth();
+
+        this.DrawPoint(drawPoint);  //画点
+        this.Canvas.restore();
+    }
+
+    //获取在第几象限
+    this.GetQuadrant=function(ptStart,ptEnd)
+    {
+        if (ptStart.X<ptEnd.X && ptStart.Y>ptEnd.Y) return 1;
+        else if (ptStart.X>ptEnd.X && ptStart.Y>ptEnd.Y) return 2;
+        else if (ptStart.X<ptEnd.X && ptStart.Y< ptEnd.Y) return 4;
+        else return 3;
+    }
+
+    this.DrawBlock=function(ptStart, ptEnd)
+    {
+        var center=ptEnd;
+        var xDiff=ptEnd.X-ptStart.X;
+        var yDiff=ptEnd.Y-ptStart.Y;
+        var quadrant=this.GetQuadrant(center,ptStart);   //象限
+
+        var aryYData=this.GetArrayAreaConfig(this.AreaConfig.AryYData);
+        var ptPre=null; //上一个点
+        var clrArea=null;
+        this.Canvas.font=this.Font;
+        var textOffset=4;
+        if (quadrant==1 || quadrant==4) 
+        {
+            this.Canvas.textAlign="right";
+            textOffset=-4;
+        }
+        else 
+        {
+            this.Canvas.textAlign="left";
+            textOffset=4;
+        }
+        this.Canvas.textBaseline="middle";
+        for(var i=0;i<aryYData.length;++i)
+        {
+            var item=aryYData[i];
+            var y=item.Value*yDiff+ptStart.Y;
+
+            var pt=this.CalculateExtendLineEndPoint([center, {X:ptStart.X, Y:y}]);
+
+            if (ptPre)
+            {
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(center.X,center.Y);
+                this.Canvas.lineTo(ptPre.X,ptPre.Y);
+                this.Canvas.lineTo(pt.X,pt.Y);
+                this.Canvas.closePath();
+                this.Canvas.fillStyle=clrArea;
+                this.Canvas.fill();
+            }
+
+            this.Canvas.strokeStyle=item.Color;
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(center.X,center.Y);
+            this.Canvas.lineTo(pt.X,pt.Y);
+            this.Canvas.stroke();
+
+            this.LinePoint.push({Start:center, End:pt});
+
+            if (item.Value!=1)
+            {
+                this.Canvas.strokeStyle=this.LineColor;
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(center.X,y);
+                this.Canvas.lineTo(ptStart.X,y);
+                this.Canvas.stroke();
+            }
+
+            ptPre=pt;
+            clrArea=IChartDrawPicture.ColorToRGBA(item.Color, this.AreaConfig.Opacity);
+            
+            //文字
+            var text=`${item.Value}`;
+            this.Canvas.fillStyle=item.Color;
+            this.Canvas.fillText(text,center.X+textOffset,y);
+        }
+
+        var aryXData=this.GetArrayAreaConfig(this.AreaConfig.AryXData);
+        var ptPre=null;
+        this.Canvas.textAlign="center";
+        if (quadrant==3 || quadrant==4) 
+        {
+            this.Canvas.textBaseline="bottom";
+            textOffset=-5;
+        }
+        else
+        {
+            this.Canvas.textBaseline="top";
+            textOffset=5;
+        }
+            
+        for(var i=0;i<aryXData.length;++i)
+        {
+            var item=aryXData[i];
+            var x=item.Value*xDiff+ptStart.X;
+
+            var pt=this.CalculateExtendLineEndPoint([center, {X:x, Y:ptStart.Y}]);
+
+            if (ptPre)  //面积
+            {
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(center.X,center.Y);
+                this.Canvas.lineTo(ptPre.X,ptPre.Y);
+                this.Canvas.lineTo(pt.X,pt.Y);
+                this.Canvas.closePath();
+                this.Canvas.fillStyle=clrArea;
+                this.Canvas.fill();
+            }
+
+            this.Canvas.strokeStyle=item.Color;
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(center.X,center.Y);
+            this.Canvas.lineTo(pt.X,pt.Y);
+            this.Canvas.stroke();
+
+            this.LinePoint.push({Start:center, End:pt});
+
+            if (item.Value!=1)
+            {
+                this.Canvas.strokeStyle=this.LineColor;
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(x,center.Y);
+                this.Canvas.lineTo(x,ptStart.Y);
+                this.Canvas.stroke();
+            }
+
+            ptPre=pt;
+            clrArea=IChartDrawPicture.ColorToRGBA(item.Color, this.AreaConfig.Opacity);
+
+            //文字
+            var text=`${item.Value}`;
+            this.Canvas.fillStyle=item.Color;
+            this.Canvas.fillText(text,x,center.Y+textOffset);
+        }
+    }
+
+    this.GetArrayAreaConfig=function(aryData)
+    {
+        var aryArea=[];
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Enable) aryArea.push(item);
+        }
+
+        aryArea.sort((left,right)=>{ return right.Value-left.Value; })
+
+        return aryArea;
+    }
+
+}
+
 function ChartDrawStorage()
 {
     this.DrawData=new Map();    //画图工具数据 key=symbol-Period, value=Map() Key:Guid, Value:{Guid, Symbol, Period, ClassName, Value}
@@ -128616,7 +129040,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12515";
+var HQCHART_VERSION="1.1.12521";
 
 function PrintHQChartVersion()
 {

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

@@ -98,6 +98,7 @@ function IChartPainting()
     this.Name;                          //名称
     this.ClassName = 'IChartPainting';    //类名
     this.Data = new ChartData();          //数据区
+    this.Script;                        //图形对应的指标脚本 (只有指标图形才有)
 
     this.NotSupportMessage = null;
     this.MessageFont = g_JSChartPaintResource.Index.NotSupport.Font;
@@ -123,6 +124,13 @@ function IChartPainting()
         return isMinute
     }
 
+    //是否隐藏指标
+    this.IsHideScriptIndex=function()
+    {
+        if (this.Script && this.Script.IsShow==false) return true;
+        return false;
+    }
+
     this.DrawNotSupportmessage = function () 
     {
         this.Canvas.font = this.MessageFont;
@@ -3303,6 +3311,7 @@ function ChartLine()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -3804,6 +3813,7 @@ function ChartStick()
     this.DrawLine = function () 
     {
         if (this.ChartFrame.IsMinSize) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || !this.Data.Data) return;
 
         var isHScreen = (this.ChartFrame.IsHScreen === true);
@@ -3915,7 +3925,7 @@ function ChartLineStick()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage) 
         {
             this.DrawNotSupportmessage();
@@ -5936,6 +5946,7 @@ function ChartMACD()
     this.Draw = function () 
     {
         if (this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage) 
         {
             this.DrawNotSupportmessage();
@@ -7010,6 +7021,7 @@ function ChartVolStick()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.ChartFrame.IsHScreen === true) 
         {
             this.HScreenDraw();

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

@@ -216,6 +216,8 @@ function ScriptIndex(name, script, args, option)
     this.TitleFont=g_JSChartResource.DynamicTitleFont;      //标题字体
     this.IsShortTitle=false;                                //是否显示指标参数
 
+    this.IsShow=true;       //是否显示图形
+
     if (option) 
     {
         if (option.FloatPrecision >= 0) this.FloatPrecision = option.FloatPrecision;
@@ -1476,6 +1478,10 @@ function ScriptIndex(name, script, args, option)
     {
         if (this.Name) chart.IndexName=this.Name;
         else if (this.ID) chart.IndexName==this.ID;
+
+        if (this.ID) chart.IndexID=this.ID;
+        
+        chart.Script=this;  //指标内容绑定上去
     }
 }