hqchart 1.1.13746 → 1.1.13758

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

@@ -34590,6 +34590,7 @@ function ChartLine()
     this.LineWidth;                 //线段宽度
     this.DrawType=0;                //画图方式  0=无效数平滑  1=无效数不画断开
     this.IsDotLine=false;           //虚线
+    this.LineDash=g_JSChartResource.DOTLINE.LineDash;
     this.BreakPoint;                //断开的点索引 Set();
 
 
@@ -34635,7 +34636,7 @@ function ChartLine()
         
         this.Canvas.save();
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
         var bFirstPoint=true;
         var drawCount=0;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
@@ -34702,7 +34703,7 @@ function ChartLine()
         this.ClipClient(bHScreen);
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         this.Canvas.strokeStyle=this.Color;
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
 
         var bFirstPoint=true;
         var ptFirst=null;;    //第1个点
@@ -34799,7 +34800,7 @@ function ChartLine()
         this.ClipClient(bHScreen);
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         this.Canvas.strokeStyle=this.Color;
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
 
         var bFirstPoint=true;
         var ptFirst=null;;    //第1个点
@@ -40109,7 +40110,9 @@ function ChartClipColorStick()
         var yBottom=this.ChartFrame.GetYFromData(this.BaseValue);
         var aryBar=[], aryDiffBar=[], aryText=[];
         var preValue=null;
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        var start=this.Data.DataOffset;
+        if (start-1>0) preValue=this.Data.Data[start-1];    //上一个数值
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var value=this.Data.Data[i];
             if (value==null) continue;
@@ -62473,7 +62476,7 @@ function ChartDrawHLine()
     this.ButtonBGColor='rgb(190,190,190)';
     this.ButtonSpace=3;
     
-    this.TextMargin={ Left:0, Right:0 };
+    this.TextMargin={ Left:0, Right:0, Top:0, Bottom:0, YOffset:4*GetDevicePixelRatio() };
 
     this.AlwaysShowLab=false;        //总是显示标签
 
@@ -62497,7 +62500,9 @@ function ChartDrawHLine()
             `${12*GetDevicePixelRatio()}px 微软雅黑`,
             `${12*GetDevicePixelRatio()}px 微软雅黑`,
         ],
-    };  
+    }; 
+
+    this.LableInfo; //{ Position:2=右侧外部 }
 
     //内部变量
     this.ColseButtonSize=0;
@@ -62505,7 +62510,7 @@ function ChartDrawHLine()
     this.ButtonBGWidth=0;
     this.VerticalButtonInfo={ Width:0, Height:0 };  //垂直按钮信息
    
-
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
 
     this.SetOption=function(option)
     {
@@ -62566,6 +62571,9 @@ function ChartDrawHLine()
                 var item=option.TextMargin;
                 if (IFrameSplitOperator.IsNumber(item.Left)) this.TextMargin.Left=item.Left;
                 if (IFrameSplitOperator.IsNumber(item.Right)) this.TextMargin.Right=item.Right;
+                if (IFrameSplitOperator.IsNumber(item.Top)) this.TextMargin.Top=item.Top;
+                if (IFrameSplitOperator.IsNumber(item.Bottom)) this.TextMargin.Bottom=item.Bottom;
+                if (IFrameSplitOperator.IsNumber(item.YOffset)) this.TextMargin.YOffset=item.YOffset;
             }
         }
     }
@@ -62582,10 +62590,6 @@ function ChartDrawHLine()
         return storageData;
     }
 
-   
-    this.IsPointIn=this.IsPointIn_XYValue_Line;
-    
-
     /*
     this.GetXYCoordinate=function()
     {
@@ -62642,7 +62646,7 @@ function ChartDrawHLine()
         this.ColseButtonSize=0;
         this.SettingButtonSize=0;
         this.ButtonBGWidth=0;
-
+        this.LableInfo=null;
         this.VerticalButtonInfo.Width=0;
         this.VerticalButtonInfo.Height=0;
 
@@ -62705,7 +62709,7 @@ function ChartDrawHLine()
         }
         this.LinePoint.push(line);
 
-        if (bVisibleRange)
+        if (bVisibleRange)  //在可视范围内
         {
             var yValue=this.Frame.GetYData(drawPoint[0].Y, false);
             var strPrice=yValue.toFixed(this.Precision);
@@ -62719,15 +62723,11 @@ function ChartDrawHLine()
                 this.DrawPriceText(strPrice, line.Start, line.End, 1);
             }
         }
-        
-        var labInfo;
-        if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
+       
+        if (this.GetLabelCallback) this.LableInfo=this.GetLabelCallback(this);
 
         this.AryShowButton=this.GetShowButton();    //获取按钮
-
-        //框架内的描述信息
-        if (labInfo && bVisibleRange)
-            this.DrawLab(labInfo, drawPoint[0].Y);
+        if (bVisibleRange) this.DrawInternalLabel(drawPoint[0].Y);  //内部价格标签
 
         //画中心点
         if (bVisibleRange)
@@ -62744,11 +62744,12 @@ function ChartDrawHLine()
         {
             var rtDraw={ };
             this.CalculateButtonSize();
-            this.DrawValueText(drawPoint[0].Y, rtDraw, labInfo); 
-            if (labInfo) this.DrawRightLab(labInfo, rtDraw);
-            if (labInfo && bVisibleRange) this.DrawCustomHLine(labInfo, drawPoint[0].Y);
+            this.DrawValueText(drawPoint[0].Y, rtDraw); 
+            this.DrawRightLabel(rtDraw);
+            if (bVisibleRange) this.DrawCustomHLine(drawPoint[0].Y);
         }
 
+
         //鼠标是否在按钮上
         if (moveonPoint && mouseStatus)
         {
@@ -62796,113 +62797,130 @@ function ChartDrawHLine()
             ++lineCount;
         }
 
-        var size={ Width:maxWidth, Height: lineCount*(lineHeight+lineSpace)+lineSpace, NameWidth:maxNameWidth, TextWidth:maxTextWidth, LineHeight:lineHeight };
+        var size={ Width:maxWidth, Height:lineCount*lineHeight+(lineCount-1)*lineSpace, NameWidth:maxNameWidth, TextWidth:maxTextWidth, LineHeight:lineHeight };
+        if (labInfo.LabelMargin)
+        {
+            var item=labInfo.LabelMargin;
+            if (IFrameSplitOperator.IsNumber(item.Left)) size.Width+=item.Left;
+            if (IFrameSplitOperator.IsNumber(item.Right)) size.Width+=item.Right;
+            if (IFrameSplitOperator.IsNumber(item.Top)) size.Height+=item.Top;
+            if (IFrameSplitOperator.IsNumber(item.Bottom)) size.Height+=item.Bottom;
+        }
 
         return size;
     }
 
-    this.DrawLab=function(labInfo, y)
+    //绘制窗口内部标签
+    this.DrawInternalLabel=function(y)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText)) return;
-        if (labInfo.Position===2) return;
+        if (!this.LableInfo || !IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryText)) return;
+        if (this.LableInfo.Position==2) return; 
 
-        var left=this.Frame.ChartBorder.GetLeft();
-        var right=this.Frame.ChartBorder.GetRight();
-        var labSize=this.CalculateLabSize(labInfo);
+        var border=this.Frame.GetBorder();
+        var left=border.Left;
+        var right=border.Right;
+        var labSize=this.CalculateLabSize(this.LableInfo);
         var drawLeft=right-labSize.Width;
+        var drawRight=drawLeft+labSize.Width;
         var drawTop=y-labSize.Height-1;
+        if (drawTop<=border.TopEx) drawTop=y+1;
+
+        var rtLabel={ Left:drawLeft, Right:drawRight, Top:drawTop, Width:labSize.Width, Height:labSize.Height };
+        rtLabel.Bottom=rtLabel.Top+rtLabel.Height;
 
+        this.DrawLabel(this.LableInfo, labSize, rtLabel);
+    }
+
+    //绘制标签页
+    this.DrawLabel=function(labelInfo, labelSize, rtLabel)
+    {
         //背景色
-        if (labInfo.BGColor)
+        if (labelInfo.BGColor)
         {
-            this.Canvas.fillStyle=labInfo.BGColor;
-            var rtTop=y-labSize.Height-4;
-            this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(right+drawLeft),ToFixedRect(y-rtTop)); 
+            this.Canvas.fillStyle=labelInfo.BGColor;
+            this.Canvas.fillRect(ToFixedRect(rtLabel.Left),ToFixedRect(rtLabel.Top),ToFixedRect(rtLabel.Width),ToFixedRect(rtLabel.Height)); 
         }
 
-        var yText=drawTop;
-        for(var i=0;i<labInfo.AryText.length;++i)
+        var labelMargin=labelInfo.LabelMargin;
+        var lineSpace=0;
+        if (IFrameSplitOperator.IsNumber(labelInfo.LineSpace)) lineSpace=labelInfo.LineSpace;
+        
+        var yText=rtLabel.Top;
+        var xText=rtLabel.Left;
+        var yRightText=rtLabel.Right;
+
+        if (labelMargin)
         {
-            var item=labInfo.AryText[i];
+            if (IFrameSplitOperator.IsNumber(labelMargin.Left)) xText+=labelMargin.Left;
+            if (IFrameSplitOperator.IsNumber(labelMargin.Right)) yRightText-=labelMargin.Right;
+            if (IFrameSplitOperator.IsNumber(labelMargin.Top)) yText+=labelMargin.Top;
+            
+        }
+
+        this.Canvas.font=this.TextFont;
+        this.Canvas.textBaseline="top";
+        for(var i=0;i<labelInfo.AryText.length;++i)
+        {
+            if (i>0) yText+=lineSpace;
+            var item=labelInfo.AryText[i];
             if (item.Name)
             {
+                this.Canvas.textAlign="left";
                 this.Canvas.fillStyle=item.NameColor;
-                this.Canvas.fillText(item.Name,drawLeft+1,yText+1);
+                this.Canvas.fillText(item.Name,xText,yText);
             }
             
             if (item.Text)
             {
+                this.Canvas.textAlign="right";
                 this.Canvas.fillStyle=item.TextColor;
-                this.Canvas.fillText(item.Text,drawLeft+labSize.NameWidth+1,yText+1);
+                this.Canvas.fillText(item.Text,yRightText,yText);
             }
 
-            yText+=labSize.LineHeight;
+            yText+=labelSize.LineHeight;
         }
     }
 
-    this.DrawRightLab=function(labInfo, rtLeftDraw)
+    this.DrawRightLabel=function(rtLeftDraw)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText)) return;
-        if (labInfo.Position!=2) return;
-        var labSize=this.CalculateLabSize(labInfo);
+        if (!this.LableInfo || !IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryText)) return;
+        if (this.LableInfo.Position!=2) return;
+
+        var labSize=this.CalculateLabSize(this.LableInfo);
+        var border=this.Frame.GetBorder();
 
         var drawLeft=rtLeftDraw.Right-labSize.Width;
         if (drawLeft<rtLeftDraw.Left) drawLeft=rtLeftDraw.Left;
         var drawRight=drawLeft+labSize.Width;
+
         var drawTop=rtLeftDraw.Bottom;
-        var lineSpace=0;
-        if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
 
-        //背景色
-        var rtLab={ Left:drawLeft, Top:drawTop, Width:labSize.Width, Height:labSize.Height }
-        rtLab.Right=rtLab.Left+rtLab.Width;
-        rtLab.Bottom=rtLab.Top+rtLab.Height;
-        if (labInfo.BGColor)
+        var rtLabel={ Left:drawLeft, Right:drawRight, Top:drawTop, Width:labSize.Width, Height:labSize.Height };
+        rtLabel.Bottom=rtLabel.Top+rtLabel.Height;
+        if (rtLabel.Bottom>border.Bottom)   //标签页超过窗口底部 绘制到价格标签上面
         {
-            this.Canvas.fillStyle=labInfo.BGColor;
-            this.Canvas.fillRect(ToFixedRect(rtLab.Left),ToFixedRect(rtLab.Top),ToFixedRect(rtLab.Width),ToFixedRect(rtLab.Height));  
-        }
-
-        var yText=drawTop+1+lineSpace;
-        this.Canvas.textBaseline="top";
-        for(var i=0;i<labInfo.AryText.length;++i)
-        {
-            var item=labInfo.AryText[i];
-            if (item.Name)
-            {
-                this.Canvas.textAlign="left";
-                this.Canvas.fillStyle=item.NameColor;
-                this.Canvas.fillText(item.Name,drawLeft+1,yText+1);
-            }
-            
-            if (item.Text)
-            {
-                this.Canvas.textAlign="right";
-                this.Canvas.fillStyle=item.TextColor;
-                this.Canvas.fillText(item.Text,drawRight-1,yText+1);
-            }
-
-            yText+=labSize.LineHeight+lineSpace;
+            rtLabel.Bottom=rtLeftDraw.Top;
+            rtLabel.Top=rtLabel.Bottom-rtLabel.Height;
         }
 
-        this.DrawVerticalButton(rtLab);
+        this.DrawLabel(this.LableInfo, labSize, rtLabel);
+       
+        this.DrawVerticalButton(rtLabel);
     }
 
-    this.DrawCustomHLine=function(labInfo, yLine)
+    this.DrawCustomHLine=function(yLine)
     {
-        if (!labInfo) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryLine)) return;
+        if (!this.LableInfo) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.LableInfo.AryLine)) return;
 
         var left=this.Frame.ChartBorder.GetLeft();
         var right=this.Frame.ChartBorder.GetRight();
         var pixelRatio=GetDevicePixelRatio();
 
         var yMax=yLine, yMin=yLine;
-        for(var i=0;i<labInfo.AryLine.length;++i)
+        for(var i=0;i<this.LableInfo.AryLine.length;++i)
         {
-            var item=labInfo.AryLine[i];
+            var item=this.LableInfo.AryLine[i];
             if (!IFrameSplitOperator.IsNumber(item.Value)) continue;
             if (item.Width<0) continue;
 
@@ -62927,9 +62945,9 @@ function ChartDrawHLine()
             if (yMin>yFixed) yMin=yFixed;
         }
 
-        if (yMax!=yMin && labInfo.VLine)
+        if (yMax!=yMin && this.LableInfo.VLine)
         {
-            var item=labInfo.VLine;
+            var item=this.LableInfo.VLine;
             var x=left+20*pixelRatio;
             if (IFrameSplitOperator.IsNumber(item.XOffset)) x=left+item.XOffset*pixelRatio;
             x=ToFixedPoint(x);
@@ -62943,14 +62961,14 @@ function ChartDrawHLine()
         }
     }
 
-    this.DrawValueText=function(y, rtDraw, labInfo)
+    this.DrawValueText=function(y, rtDraw)
     {
         var left=this.Frame.ChartBorder.GetLeft();
         var right=this.Frame.ChartBorder.GetRight();
         var top=this.Frame.ChartBorder.GetTopEx();
         var bottom=this.Frame.ChartBorder.GetBottomEx();
         var pixelTatio = GetDevicePixelRatio();
-
+        var labInfo=this.LabelInfo;
         if (labInfo && IFrameSplitOperator.IsNumber(labInfo.TopOffset)) top-=labInfo.TopOffset;
         if (labInfo && IFrameSplitOperator.IsNumber(labInfo.BottomOffset)) bottom+=labInfo.BottomOffset;
 
@@ -62985,12 +63003,15 @@ function ChartDrawHLine()
         this.Canvas.font=this.Font;
         var textWidth=this.Canvas.measureText(strValue).width;
         var lineHeight=this.GetFontHeight();
-        var rtBG={ Left:right+this.RightSpaceWidth, Top:y- lineHeight/2, Width:textWidth+4, Height:lineHeight };
-        //rtBG.Right=rtBG.Left+rtBG.Width;
-        rtBG.Bottom=rtBG.Top+rtBG.Height;
+        var rtBG={ Left:right+this.RightSpaceWidth, YCenter:y, Width:textWidth, Height:lineHeight };
+        rtBG.Height+=(this.TextMargin.Top+this.TextMargin.Bottom);
         rtBG.Width+=(this.TextMargin.Left+this.TextMargin.Right);
         rtBG.Right=rtBG.Left+rtBG.Width;
-        var xText=rtBG.Left+this.TextMargin.Left+2;
+        rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+        
+        var xText=rtBG.Left+this.TextMargin.Left;
+        var yText=rtBG.Top+this.TextMargin.Top+this.TextMargin.YOffset;
 
         if (this.ButtonPosition==1)
         {
@@ -63003,8 +63024,8 @@ function ChartDrawHLine()
 
         this.Canvas.fillStyle=this.ValueTextColor
         this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="middle";
-        this.Canvas.fillText(strValue,xText,y);
+        this.Canvas.textBaseline="top";
+        this.Canvas.fillText(strValue,xText,yText);
 
         rtDraw.Left=rtBG.Left;
         rtDraw.Top=rtBG.Top;
@@ -109090,6 +109111,12 @@ function JSDraw(errorHandler,symbolData)
         return offset;
     }
 
+    this.LINEDASH=function(aryData)
+    {
+        if (IFrameSplitOperator.IsNonEmptyArray(aryData)) return aryData.slice();
+        return [];
+    }
+
     this.KLINETYPE=function(type)
     {
         return type;
@@ -115961,6 +115988,7 @@ function JSExecute(ast,option)
                 var isFirstDraw=null;
                 let xOffset=null, yOffset=null;
                 var klineType=null;
+                var lineDash=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
                     let itemExpression=item.Expression.Expression[j];
@@ -116089,6 +116117,11 @@ function JSExecute(ast,option)
                             {
                                 yOffset=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="LINEDASH")
+                            {
+                                if (IFrameSplitOperator.IsNonEmptyArray(itemExpression.Out))
+                                    lineDash=itemExpression.Out.slice();
+                            }
                             else if (itemExpression.Callee.Name=="FIRSTDRAW")
                             {
                                 if (itemExpression.Out===0) isFirstDraw=false;
@@ -116253,6 +116286,7 @@ function JSExecute(ast,option)
                     if (isShow == false) value.IsShow = false;
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) value.LineDash=lineDash;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
                     if (isSingleLine==true) value.IsSingleLine=true;
                     if (isNoneName==true) value.NoneName=true;
@@ -116265,6 +116299,7 @@ function JSExecute(ast,option)
                     var outVar={Name:draw.Name, Draw:draw, Type:1};
                     if (color) outVar.Color=color;
                     if (isDotLine==true) outVar.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) outVar.LineDash=lineDash;
                     if (lineWidth) outVar.LineWidth=lineWidth;
                     if (isDrawAbove) outVar.IsDrawAbove=true;
                     if (isDrawCenter) outVar.IsDrawCenter=true;
@@ -116289,6 +116324,7 @@ function JSExecute(ast,option)
                     if (isShow==false) value.IsShow=false;
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) value.LineDash=lineDash;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
                     if (isSingleLine==true) value.IsSingleLine=true;
                     if (isShowTitle==false) value.IsShowTitle=false;
@@ -116776,6 +116812,9 @@ function JSExecute(ast,option)
             case "YMOVE":
                 node.Out=this.Draw.YMOVE(args[0]);
                 break;
+            case "LINEDASH":
+                node.Out=this.Draw.LINEDASH(args);
+                break;
             case "FIRSTDRAW":
                 node.Out=this.Draw.FIRSTDRAW(args[0]);
                 break;
@@ -119035,7 +119074,15 @@ function ScriptIndex(name,script,args,option)
             if (!isNaN(width) && width>0) line.LineWidth=width;
         }
 
-        if (varItem.IsDotLine) line.IsDotLine=true; //虚线
+        if (varItem.IsDotLine) 
+        {
+            line.IsDotLine=true; //虚线
+            line.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
+
+        //虚线设置
+        if (IFrameSplitOperator.IsNonEmptyArray(varItem.LineDash)) line.LineDash=varItem.LineDash;
+
         if (varItem.IsShow==false) line.IsShow=false;
         
         let titleIndex=windowIndex+1;
@@ -138585,7 +138632,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13745";
+var HQCHART_VERSION="1.1.13757";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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