hqchart 1.1.12396 → 1.1.12414

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

@@ -5064,6 +5064,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData)) chart.IsTitleShowLatestData=item.IsTitleShowLatestData;
             if(IFrameSplitOperator.IsBool(item.IsAlwaysShowLastData)) chart.TitlePaint[0].IsAlwaysShowLastData=item.IsAlwaysShowLastData;
             if(IFrameSplitOperator.IsNumber(item.ShowLastDataFormat)) chart.TitlePaint[0].ShowLastDataFormat=item.ShowLastDataFormat;
+            if (IFrameSplitOperator.IsNumber(item.TitleBaseLine)) chart.TitlePaint[0].TitleBaseLine=item.TitleBaseLine;
             if (item.TimeFormat) chart.TitlePaint[0].TimeFormat=item.TimeFormat;
         }
 
@@ -24638,10 +24639,11 @@ function IChartPainting()
         if (Array.isArray(color))
         {
             let gradient = this.Canvas.createLinearGradient(x0, y0, x1, y1);
-            var offset=1/(color.length);
-            for(var i in color)
+            var offset=1/(color.length-1);
+            for(var i=0; i<color.length; ++i)
             {
-                gradient.addColorStop(i*offset, color[i]);
+                var value=i*offset;
+                gradient.addColorStop(value, color[i]);
             }
             this.Canvas.fillStyle=gradient;
         }
@@ -39088,12 +39090,20 @@ function ChartDrawSVG()
     this.IsDestroy=false;   //是否已销毁
     this.EnableTooltip=true;
     this.TooltipRect=[];
+    this.ExcludeArea=null;  //排除区域 { Left, Top, Width, Height, Type:0 }
+    this.AutoPosition=null; //{ Direction:0, MaxYOffset:40 }    //自动调整Y轴偏移，防止文字重叠
+
+    this.AryDrawRect=[];    //已经绘制的区域
+    this.AutoYOffset=0;
     
     //this.Data;  存K线数据
 
     this.Draw=function()
     {
         this.TooltipRect=[];
+        this.AryDrawRect=[];
+        this.AutoYOffset=0;
+
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -39185,6 +39195,145 @@ function ChartDrawSVG()
             this.Canvas.fillStyle = item.Data.Color;
             this.Canvas.fillText(item.Data.Text, item.X, item.Y);
         }
+
+        this.AryDrawRect.push( {Left:rtBorder.Left, Top:rtBorder.Top, Right:rtBorder.Right, Bottom:rtBorder.Bottom, Type:"Detail" } );
+    }
+
+    this.GetDetailPosition=function(rtSVG, data)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Content)) return null;
+        
+        var lefMargin=2;
+        var rightMargin=2;
+        var itemSpace=2;
+        var rtBorder={ Left:rtSVG.Right, Right:rtSVG.Right, Bottom:rtSVG.Bottom };
+        var rightBorder=0;  //右边的边界 0=div的宽度 1=图形框架边框
+        if (IFrameSplitOperator.IsNumber(data.ItemSpace)) itemSpace=data.ItemSpace;
+        if (IFrameSplitOperator.IsNumber(data.YOffset)) rtBorder.Bottom+=data.YOffset;
+        if (IFrameSplitOperator.IsNumber(data.XOffset)) rtBorder.Left+=data.XOffset;
+
+        if (IFrameSplitOperator.IsNumber(data.LeftMargin)) lefMargin=data.LeftMargin;
+        if (IFrameSplitOperator.IsNumber(data.RightMargin)) rightMargin=data.RightMargin;
+
+        if (IFrameSplitOperator.IsNumber(data.RightBorder)) rightBorder=data.RightBorder;
+
+        if (data.Font)  this.Canvas.font=data.Font;
+        else  this.Canvas.font=this.TextFont;
+
+        var textHeight=this.Canvas.measureText("擎").width+2;
+        rtBorder.Height=textHeight+5;
+        var yText=rtBorder.Bottom-(rtBorder.Height-textHeight)/2;
+        var xText=rtBorder.Left+lefMargin;
+
+        var bFrist=true;
+        for(var i=0;i<data.Content.length;++i)
+        {
+            if (!bFrist) xText+=itemSpace;
+
+            var item=data.Content[i];
+            if (!item.Text) continue;
+
+            var textWidth=this.Canvas.measureText(item.Text).width+2;
+            
+            xText+=textWidth;
+            rtBorder.Right=xText;
+            bFrist=false;
+        }
+
+        rtBorder.Right+=rightMargin;
+        rtBorder.Width=rtBorder.Right-rtBorder.Left;
+        rtBorder.Top=rtBorder.Bottom-rtBorder.Height;
+
+        var right=this.ChartBorder.GetChartWidth()-1;
+        if (rightBorder==1) right=this.ChartBorder.GetRight();
+        if (rtBorder.Right>right)   //右边显示不下,显示在左边
+        {
+            rtBorder.Right=rtSVG.Left;
+            if (IFrameSplitOperator.IsNumber(data.XOffset)) rtBorder.Right-=data.XOffset;
+            rtBorder.Left=rtBorder.Right-rtBorder.Width;
+        }
+
+        return rtBorder;
+    }
+
+    this.CalculateShowPosition=function(item, pt)
+    {
+        var x=pt.X, y=pt.Y;
+        var svgItem=item.SVG;
+        if (IFrameSplitOperator.IsNumber(svgItem.YOffset)) y+=svgItem.YOffset;
+        var fontSVG=`${svgItem.Size}px ${this.Family}`;
+        this.Canvas.font=fontSVG;
+        var halfSize=svgItem.Size/2;
+        var rtSVG={ Left:x-halfSize, Right:x+halfSize, Top:y-svgItem.Size, Bottom:y, Height:svgItem.Size, Width:svgItem.Size };
+
+        if (svgItem.VAlign===0) //top
+        {
+            rtSVG.Top=y;
+            rtSVG.Bottom=rtSVG.Top+svgItem.Size;
+        }
+        else if (svgItem.VAlign===1) //middle
+        {
+            rtSVG.Top=y-svgItem.Size/2;
+            rtSVG.Bottom=rtSVG.Top+svgItem.Size;
+        }
+
+        if (rtSVG.Top<0) 
+        {
+            rtSVG.Top=0;
+            rtSVG.Bottom=svgItem.Size;
+            y=rtSVG.Bottom;
+        }
+
+        var rtContent=null;
+        if (item.Detail)
+            rtContent=this.GetDetailPosition(rtSVG,item.Detail);
+        
+
+        var yOffset=0, yMoveStep=-5;
+        for(var i=0;i<20;++i)
+        {
+            if (rtSVG && !rtContent)
+            {
+                if (!this.IsRectOverlap(rtSVG))
+                    break;
+            }
+            else if (rtSVG && rtContent)
+            {
+                if (!this.IsRectOverlap(rtSVG) && !this.IsRectOverlap(rtContent))
+                break;
+            }
+
+            yOffset+=yMoveStep;
+
+            if (Math.abs(yOffset)>=this.AutoPosition.MaxYOffset) break;
+
+            rtSVG.Top+=yMoveStep;
+            rtSVG.Bottom+=yMoveStep;
+            if (rtContent)
+            {
+                rtContent.Top+=yMoveStep;
+                rtContent.Bottom+=yMoveStep;
+            }
+        }
+
+        pt.X=x;
+        pt.Y=y+yOffset;
+       
+    }
+
+    this.IsRectOverlap=function(rect)
+    {
+        for(var i=0; i<this.AryDrawRect.length; ++i)
+        {
+            var item=this.AryDrawRect[i];
+            if ( ((rect.Left>=item.Left && rect.Left<=item.Right) || (rect.Right>=item.Left && rect.Right<=item.Right)) &&
+                 ((rect.Top>=item.Top && rect.Top<=item.Bottom) || (rect.Bottom>=item.Top && rect.Bottom<=item.Bottom)) )
+            {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     this.DrawSVG=function()
@@ -39219,6 +39368,14 @@ function ChartDrawSVG()
             else if (item.Value=="Bottom") y=bottom;
             else y=this.ChartFrame.GetYFromData(item.Value);
             if (IFrameSplitOperator.IsNumber(item.YOffset)) y+=item.YOffset;    //Y轴偏移
+
+            if (this.AutoPosition) 
+            {
+                var pt={ X:x, Y:y };
+                this.CalculateShowPosition(item, pt);   //重新计算位置
+                x=pt.X;
+                y=pt.Y;
+            }
             
 
             var svgItem=item.SVG;
@@ -39253,6 +39410,8 @@ function ChartDrawSVG()
             this.Canvas.fillStyle = svgItem.Color;
             this.Canvas.fillText(svgItem.Symbol, x, y);
 
+            this.AryDrawRect.push( {Left:rtSVG.Left, Top:rtSVG.Top, Right:rtSVG.Right, Bottom:rtSVG.Bottom, Type:"SVG" } );
+
             if (this.EnableTooltip) this.TooltipRect.push({ Rect:rtSVG,Index:i });
 
             //文字
@@ -52066,119 +52225,6 @@ function DynamicMinuteTitlePainting()
             }
         }
 
-        /*
-        if(this.IsShowName)
-        {
-            if (!this.DrawText(this.Name,this.NameColor,position)) return;
-        }
-
-        if (this.IsShowDate || this.IsShowTime)
-        {
-            var bShowUpdateTime=false;  //是否显示了更新时间
-            if (isLastOne && this.ShowLastDataFormat==1)
-            {
-                if (this.Data && this.Data.UpdateTime && IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date) && IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time))
-                {
-                    var text=IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time, "HH:MM:SS");
-                    if (!this.DrawText(text,this.DateTimeColor,position)) return;
-                    bShowUpdateTime=true;
-                }
-            }
-            
-            if (!bShowUpdateTime)
-            {
-                if (this.TimeFormat)    //指定时间格式
-                {
-                    var strDate=null, strTime=null, text=null;
-                    if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD", item.Date);
-                    if (this.IsShowTime) strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);
-                    if (strDate && strTime) text=`${strDate} ${strTime}`;
-                    else if (strDate) text=strDate;
-                    else if (strTime) text=strTime;
-                    if (text) if (!this.DrawText(text,this.DateTimeColor,position)) return;
-                }
-                else
-                {
-                    var text=IFrameSplitOperator.FormatDateTimeString(item.DateTime,this.IsShowDate, this.IsShowTime);
-                    if (!this.DrawText(text,this.DateTimeColor,position)) return;
-                }
-            }
-        }
-        
-        var close=item.Close;
-        var increase=item.Increase;
-        var vol=item.Vol;
-        var amount=item.Amount;
-        if (item.Before)    //读取盘前数据
-        {
-            close=item.Before.Close;
-            increase=item.Before.Increase;
-            vol=item.Before.Vol;
-            amount=item.Before.Amount;
-        }
-
-        if (close)
-        {
-            var color=this.GetColor(close,this.YClose);
-            var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);
-            if (!this.DrawText(text,color,position)) return;
-        }
-
-        if (increase!=null)
-        {
-            var color=this.GetColor(increase,0);
-            var text=g_JSChartLocalization.GetText('MTitle-Increase',this.LanguageID)+increase.toFixed(2)+'%';
-            if (!this.DrawText(text,color,position)) return;
-        }
-
-        var isShowAvPrice=true;
-        var upperSymbol=this.Symbol.toUpperCase();
-        if (MARKET_SUFFIX_NAME.IsET(upperSymbol) && !MARKET_SUFFIX_NAME.IsETShowAvPrice(upperSymbol)) isShowAvPrice=false;
-        else if (MARKET_SUFFIX_NAME.IsShowAvPrice && !MARKET_SUFFIX_NAME.IsShowAvPrice(upperSymbol)) isShowAvPrice=false;
-
-        if (item.AvPrice && isShowAvPrice && this.IsShowAveragePrice)
-        {
-            var color=this.GetColor(item.AvPrice,this.YClose);
-            var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
-            if (!this.DrawText(text,color,position)) return;
-        }
-
-        var text=g_JSChartLocalization.GetText('MTitle-Vol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID);
-        if (!this.DrawText(text,this.VolColor,position)) return;
-
-        if (IFrameSplitOperator.IsNumber(amount))
-        {
-            var text=g_JSChartLocalization.GetText('MTitle-Amount',this.LanguageID)+IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);
-            if (!this.DrawText(text,this.AmountColor,position)) return;
-        }
-
-        if (IFrameSplitOperator.IsNumber(item.Position))
-        {
-            var text=g_JSChartLocalization.GetText('MTitle-Position',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Position,2,this.LanguageID);
-            if (!this.DrawText(text,this.VolColor,position)) return;
-        }
-
-        if (isLastOne && this.ShowLastDataFormat==0)  //显示数据最后的更新时间
-        {
-            if (this.Data && this.Data.UpdateTime && IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date) && IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time))
-            {
-                var text=g_JSChartLocalization.GetText('MTitle-UpdateTime',this.LanguageID)+IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time, "HH:MM:SS");
-                if (!this.DrawText(text,this.DateTimeColor,position)) return;
-            }
-        }
-
-        //叠加股票的名字
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            if (!item.Symbol || !item.Title) continue;
-
-            var name=item.Title;
-            var clrText=item.Color;
-            var text='['+name+']';
-            if (!this.DrawText(text,clrText,position)) return;
-        }
-        */
     }
 
     //盘前 盘后数据格式化
@@ -107991,7 +108037,7 @@ function JSExecute(ast,option)
         ["ISEQUAL",null], ["ISUP",null],["ISDOWN"], //ISUP=收阳 ISEQUAL=平盘 ISDOWN=收阴
 
         //日期类
-        ['DATE',null],['YEAR',null],['MONTH',null],['PERIOD', null],['WEEK',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],
+        ['DATE',null],['YEAR',null],['MONTH',null],['PERIOD', null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],
         ["WEEKOFYEAR", null],["DAYSTOTODAY", null],
 
         //大盘数据
@@ -108273,6 +108319,7 @@ function JSExecute(ast,option)
             case 'MONTH':
                 return this.SymbolData.MONTH();
             case 'WEEK':
+            case "WEEKDAY":
                 return this.SymbolData.WEEK();
             case "DAY":
                 return this.SymbolData.DAY();
@@ -113006,6 +113053,11 @@ function OverlayScriptIndex(name,script,args,option)
                         this.CreatePartLine(hqChart,windowIndex,item,i);
                         break;
 
+                    case "DRAWTEXTABS":
+                    case "DRAWTEXTREL":
+                        this.CreateDrawText(hqChart,windowIndex,item,i);
+                        break;
+
                     case SCRIPT_CHART_NAME.OVERLAY_BARS:
                         this.CreateStackedBar(hqChart,windowIndex,item,i);
                         break;
@@ -113183,6 +113235,30 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateDrawText=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartSingleText();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        chart.ReloadResource();
+
+        if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
+        else chart.Color=this.GetDefaultColor(id);
+
+        if (varItem.IsDrawAbove) chart.Direction=1;
+        else chart.Direction=0;
+
+        chart.DrawData=varItem.Draw.DrawData;
+        if (varItem.DrawFontSize>0) chart.TextFont=`${varItem.DrawFontSize*GetDevicePixelRatio()}px 微软雅黑`;    //临时用下吧
+
+        frame.ChartPaint.push(chart);
+    }
+
     //DRAWTEXT
     this.CreateDrawTextV2=function(hqChart,windowIndex,varItem,id)
     {
@@ -113834,6 +113910,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.Family=varItem.Draw.DrawData.Family;
         chart.TextFont=varItem.Draw.DrawData.TextFont;
         chart.Texts= varItem.Draw.DrawData.Data;
+        if (varItem.Draw.AutoPosition) chart.AutoPosition=varItem.Draw.AutoPosition;
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
         
@@ -114905,6 +114982,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
+                    if (draw.AutoPosition) drawItem.AutoPosition=draw.AutoPosition;
                     drawItem.DrawData={ Data:this.FittingMultiText(draw.Data,date,time,hqChart), Family:draw.Family, TextFont:draw.TextFont, EnableTooltip:draw.EnableTooltip, IsDrawFirst:draw.IsDrawFirst };
                     this.GetKLineData(drawItem.DrawData.Data, hqChart);
                     outVarItem.Draw=drawItem;
@@ -115305,6 +115383,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
+                    if (draw.AutoPosition) drawItem.AutoPosition=draw.AutoPosition;
                     drawItem.DrawData={ Data:this.FittingMultiText(draw.Data,date,time,hqChart), Family:draw.Family, TextFont:draw.TextFont ,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst };
                     this.GetKLineData(drawItem.DrawData.Data, hqChart);
                     outVarItem.Draw=drawItem;
@@ -127432,7 +127511,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12395";
+var HQCHART_VERSION="1.1.12413";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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