hqchart 1.1.13330 → 1.1.13339

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

@@ -3997,7 +3997,11 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         return item;
     }
 
-    this.OnSize=function(option) //{ Type:1 新版本OnSize  Redraw:是否重绘, XYSplit:是否重新计算分割线 }
+    /*
+    { Type: 1=K线柱子宽度不变  2=K线全部显示
+      Redraw:是否重绘, XYSplit:是否重新计算分割线 }
+    */
+    this.OnSize=function(option) 
     {
         //画布大小通过div获取 如果有style里的大小 使用style里的
         if (this.DivElement.style.height && this.DivElement.style.width)
@@ -4058,10 +4062,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             if (option && option.XYSplit===true) this.JSChartContainer.ResetFrameXYSplit();
 
-            if (this.JSChartContainer.OnSize && option && option.Type==1) 
+            if (this.JSChartContainer.OnSize && option && option.Type==1)   //K线宽度不变
             {
                 this.JSChartContainer.OnSize();
             }
+            else if (this.JSChartContainer.ShowAllKLine && option && option.Type==2)
+            {
+                this.JSChartContainer.ShowAllKLine();
+            }
             else
             {
                 if (this.JSChartContainer.Frame) this.JSChartContainer.Frame.SetSizeChage(true);
@@ -13643,6 +13651,16 @@ function IsRecvOverlap(rect1, rect2)
     return Math.max(rect1.Left,rect2.Left) < Math.min(rect1.Right,rect2.Right) && Math.max(rect1.Top,rect2.Top) < Math.min(rect1.Bottom,rect2.Bottom); 
 }
 
+function CopyMerginConfig(dest,src)
+{
+    if (!src || !dest) return;
+
+    if (IFrameSplitOperator.IsNumber(src.Left)) dest.Left=src.Left;
+    if (IFrameSplitOperator.IsNumber(src.Top)) dest.Top=src.Top;
+    if (IFrameSplitOperator.IsNumber(src.Right)) dest.Right=src.Right;
+    if (IFrameSplitOperator.IsNumber(src.Bottom)) dest.Bottom=src.Bottom;
+}
+
 
 function Point()
 {
@@ -15677,6 +15695,7 @@ function AverageWidthFrame()
             {
                 var text=IFrameSplitOperator.FormatDateString(kItem.Date,null);
                 if (ChartData.IsMinutePeriod(option.Period)) text+=" " + IFrameSplitOperator.FormatTimeString(kItem.Time, "HH:MM");
+                else if (ChartData.IsMilliSecondPeriod(option.Period)) text+=" " + IFrameSplitOperator.FormatTimeString(kItem.Time, "HH:MM:SS.fff");
                 var textWidth=this.Canvas.measureText(text).width+2;
 
                 var textLeft=item.X-textWidth/2;
@@ -58294,7 +58313,7 @@ function IChartDrawPicture()
         var isHScreen=this.Frame.IsHScreen;
         if (isHScreen)
         {
-            for(var i in this.Point)
+            for(var i=0; i<this.Point.length; ++i)
             {
                 var item=this.Point[i];
                 var xValue=parseInt(this.Frame.GetXData(item.Y,false))+data.DataOffset;
@@ -58310,7 +58329,7 @@ function IChartDrawPicture()
         }
         else
         {
-            for(var i in this.Point)
+            for(var i=0; i<this.Point.length; ++i)
             {
                 var item=this.Point[i];
                 var xValue=parseInt(this.Frame.GetXData(item.X,false))+data.DataOffset;
@@ -59405,6 +59424,79 @@ function IChartDrawPicture()
     //复制
     //this.CopyData=function() { }
     //this.PtInButtons=function(x, y) { }
+
+
+    //计算标签页大小
+    this.CalculateLabelSize=function(labelInfo)
+    {
+        var config=labelInfo.Config;
+        this.Canvas.font=config.Font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="top";
+        var lineHeight=this.Canvas.measureText("擎").width+2;
+
+        var maxWidth=0, lineCount=0, labelHeight=config.Mergin.Top+config.Mergin.Bottom;
+        for(var i=0;i<labelInfo.AryText.length;++i)
+        {
+            if (i>0) labelHeight+=config.LineSpace;
+
+            var item=labelInfo.AryText[i];
+            item.NameWidth=0;
+            item.TextWidth=0;
+            if (item.Name) item.NameWidth=this.Canvas.measureText(item.Name).width+2;
+            if (item.Text) item.TextWidth=this.Canvas.measureText(item.Text).width+2;
+
+            var itemWidth=item.NameWidth+item.TextWidth;
+            if (maxWidth<itemWidth) maxWidth=itemWidth;
+            ++lineCount;
+
+            labelHeight+=lineHeight;
+        }
+
+        var labelWidth=maxWidth+config.Mergin.Left+config.Mergin.Right;
+
+        labelInfo.Width=labelWidth;
+        labelInfo.Height=labelHeight;
+        labelInfo.LineHeight=lineHeight;
+    }
+
+    this.DrawDefaultLabel=function(labelInfo, rtBG)
+    {
+        var config=labelInfo.Config;
+
+        if (config.BGColor)
+        {
+            this.Canvas.fillStyle=config.BGColor
+            this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height)); 
+        }
+    
+        var xText=rtBG.Left+config.Mergin.Left;
+        var yText=rtBG.Top+config.Mergin.Top;
+        for(var i=0;i<labelInfo.AryText.length;++i)
+        {
+            var item=labelInfo.AryText[i];
+
+            if (i>0) yText+=config.LineSpace;
+
+            if (item.Name)
+            {
+                this.Canvas.fillStyle=item.NameColor;
+                this.Canvas.fillText(item.Name,xText,yText);
+            }
+            
+            if (item.Text)
+            {
+                var xOut=xText+item.NameWidth;
+                if (config.TextAlign==1) //右对齐
+                    xOut=rtBG.Right-config.Mergin.Right-item.TextWidth;
+                
+                this.Canvas.fillStyle=item.TextColor;
+                this.Canvas.fillText(item.Text,xOut ,yText);
+            }
+
+            yText+=labelInfo.LineHeight;
+        }
+    }
 }
 
 IChartDrawPicture.ColorToRGBA=function(color,opacity)
@@ -59543,7 +59635,8 @@ IChartDrawPicture.ArrayDrawPricture=
     { Name:"FibRetracement", ClassName:"ChartFibRetracement", Create:function() { return new ChartFibRetracement(); }},     //斐波那契回测
     { Name:"FibSpeedResistanceFan", ClassName:"ChartFibSpeedResistanceFan", Create:function() { return new ChartFibSpeedResistanceFan(); }}, //斐波那契扇形
     { Name:"PriceRange", ClassName:"ChartPriceRange", Create:function() { return new ChartPriceRange(); }},
-    { Name:"DateRange", ClassName:"ChartDateRange", Create:function() { return new ChartDateRange(); }}
+    { Name:"DateRange", ClassName:"ChartDateRange", Create:function() { return new ChartDateRange(); }},
+    { Name:"InfoLine", ClassName:"ChartInfoLine", Create:function() { return new ChartInfoLine(); }},
 ];
 
 IChartDrawPicture.MapIonFont=new Map(
@@ -64406,9 +64499,33 @@ function ChartDrawMonitorLine()
     this.LabelConfig=
     { 
         Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, 
-        BGColor:"rgb(30,144,255)", YTextOffset:4,
+        BGColor:"rgb(30,144,255)",
         LineColor:"rgba(255,215,0,0.8)",
         LineDash:[3,5],
+
+        Mergin:{ Left:5, Right:5, Top:5, Bottom:4 },
+        LineSpace:5,    //行间距
+        TextAlign:1,    //对齐方式 0=left 1=right
+    }
+
+    this.PointToValue_Backup=this.PointToValue;
+
+    this.PointToValue=function()
+    {
+        if (!this.PointToValue_Backup()) return false;
+
+        if (this.Frame.IsKLineFrame(false))
+        {
+            if (this.Frame.Identify===0)
+            {
+                var dataIndex=this.Value[0].XValue;
+                var data=this.Frame.Data;
+                var kItem=data.Data[dataIndex];
+                this.Value[0].YValue=kItem.Close;   //使用收盘价
+            }
+        }
+
+        return true;
     }
 
     this.SetOption=function(option)
@@ -64422,7 +64539,9 @@ function ChartDrawMonitorLine()
             if (item.BGColor) dest.BGColor=item.BGColor;
             if (item.LineColor) dest.LineColor=item.LineColor;
             if (item.LineDash) dest.LineDash=item.LineDash;
-            if (IFrameSplitOperator.IsNumber(item.YTextOffset)) dest.YTextOffset=item.YTextOffset;
+            if (IFrameSplitOperator.IsNumber(item.LineSpace)) dest.LineSpace=item.LineSpace;
+            if (IFrameSplitOperator.IsNumber(item.TextAlign)) dest.TextAlign=item.TextAlign;
+            if (item.Mergin) CopyMerginConfig(dest.Mergin, item.Mergin);
         }
 
         if (option.FormatLabelTextCallback) this.FormatLabelTextCallback=option.FormatLabelTextCallback;
@@ -64536,6 +64655,7 @@ function ChartDrawMonitorLine()
     this.DrawLabel=function(labelInfo)
     {
         if (!this.FormatLabelTextCallback) return;
+        labelInfo.Config=this.LabelConfig;
         this.FormatLabelTextCallback(labelInfo);
         if (!IFrameSplitOperator.IsNonEmptyArray(labelInfo.AryText)) return;
         if (!IFrameSplitOperator.IsNumber(labelInfo.YValue)) return;
@@ -64552,54 +64672,14 @@ function ChartDrawMonitorLine()
         ]
         */
 
-        var y=this.Frame.GetYFromData(labelInfo.YValue,false);
-        this.Canvas.font=this.LabelConfig.Font;
-        this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="top";
-        var lineHeight=this.Canvas.measureText("擎").width+2;
-        var maxWidth=0, lineCount=0;
-        for(var i=0;i<labelInfo.AryText.length;++i)
-        {
-            var item=labelInfo.AryText[i];
-            item.NameWidth=0;
-            item.TextWidth=0;
-            if (item.Name) item.NameWidth=this.Canvas.measureText(item.Name).width+2;
-            if (item.Text) item.TextWidth=this.Canvas.measureText(item.Text).width+2;
-
-            var itemWidth=item.NameWidth+item.TextWidth;
-            if (maxWidth<itemWidth) maxWidth=itemWidth;
-            ++lineCount;
-        }
+        this.CalculateLabelSize(labelInfo);
 
-        var rtBG={ Left:labelInfo.Left+1, Top:y, Width:maxWidth+4, Height:lineHeight*lineCount+4 };
+        var y=this.Frame.GetYFromData(labelInfo.YValue,false);
+        var rtBG={ Left:labelInfo.Left+1, Top:y, Width:labelInfo.Width, Height:labelInfo.Height };
         rtBG.Right=rtBG.Left+rtBG.Width;
         rtBG.Bottom=rtBG.Top+rtBG.Height;
-        if (this.LabelConfig.BGColor)
-        {
-            this.Canvas.fillStyle=this.LabelConfig.BGColor
-            this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height)); 
-        }
-
-        var xText=rtBG.Left+2;
-        var yText=rtBG.Top+this.LabelConfig.YTextOffset;
-        for(var i=0;i<labelInfo.AryText.length;++i)
-        {
-            var item=labelInfo.AryText[i];
-
-            if (item.Name)
-            {
-                this.Canvas.fillStyle=item.NameColor;
-                this.Canvas.fillText(item.Name,xText,yText);
-            }
-            
-            if (item.Text)
-            {
-                this.Canvas.fillStyle=item.TextColor;
-                this.Canvas.fillText(item.Text,xText+item.NameWidth ,yText);
-            }
-
-            yText+=lineHeight;
-        }
+        
+        this.DrawDefaultLabel(labelInfo, rtBG);
     }
 }
 
@@ -68421,6 +68501,139 @@ function ChartDateRange()
     }
 }
 
+//线段信息统计
+function ChartInfoLine()
+{
+    this.newMethod=IChartDrawPicture;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartInfoLine';
+    this.PointCount=2;
+    this.Font=12*GetDevicePixelRatio() +"px 微软雅黑";
+
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
+    this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.IsShowYCoordinate=false;
+    this.CopyData=this.CopyData_default;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
+
+    this.LabelConfig=
+    { 
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, 
+        BGColor:"rgba(135, 206 ,250,0.95)", 
+        Mergin:{ Left:10, Right:10, Top:10, Bottom:8 },
+        LineSpace:5,    //行间距
+        TextAlign:1,    //对齐方式 0=left 1=right
+    }
+
+    this.FormatLabelTextCallback=null;
+
+    this.SetOption=function(option)
+    {
+        if (option.LineColor) this.LineColor=option.LineColor;
+        if (option.Label)
+        {
+            var item=option.Label;
+            var dest=this.LabelConfig
+            if (item.Font) dest.Font=item.Font;
+            if (item.BGColor) dest.BGColor=item.BGColor;
+            if (IFrameSplitOperator.IsNumber(item.LineSpace)) dest.LineSpace=item.LineSpace;
+            if (IFrameSplitOperator.IsNumber(item.TextAlign)) dest.TextAlign=item.TextAlign;
+            if (item.Mergin) CopyMerginConfig(dest.Mergin, item.Mergin);
+        }
+
+        if (option.FormatLabelTextCallback) this.FormatLabelTextCallback=option.FormatLabelTextCallback;
+    }
+
+    this.Draw=function()
+    {
+        this.LinePoint=[];
+        if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
+        var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:false} );
+        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.beginPath();
+        this.Canvas.moveTo(ptStart.X,ptStart.Y);
+        this.Canvas.lineTo(ptEnd.X,ptEnd.Y);
+        this.Canvas.stroke();
+        this.RestoreLineWidth();
+
+        var line={Start:ptStart, End:ptEnd};
+        this.LinePoint.push(line);
+        
+        this.DrawPoint(drawPoint);  //画点
+
+        var labelInfo={ };
+        labelInfo.Config=this.LabelConfig;
+        labelInfo.PtStart=ptStart;
+        labelInfo.PtEnd=ptEnd;
+
+        this.DrawLabel(labelInfo);
+
+        this.Canvas.restore();
+    }
+
+    this.DrawLabel=function(labelInfo)
+    {
+        if (!this.FormatLabelTextCallback) return;
+
+        labelInfo.AryPoint=this.Point;
+        if (this.Status!=10)
+        {
+            labelInfo.AryValue=this.PointToKLine(this.Point);
+        }
+        else
+        {
+            labelInfo.AryValue=this.Value;
+        }
+
+        labelInfo.Data=this.Frame.Data; //数据
+
+        this.FormatLabelTextCallback(labelInfo);
+        if (!IFrameSplitOperator.IsNonEmptyArray(labelInfo.AryText)) return;
+
+        this.CalculateLabelSize(labelInfo);
+
+        var ptStart=labelInfo.PtStart;
+        var ptEnd=labelInfo.PtEnd;
+        if (ptStart.X>ptEnd.X) 
+        {
+            ptStart=labelInfo.PtEnd;
+            ptEnd=labelInfo.PtStart;
+        }
+
+        var config=labelInfo.Config;
+        var xCenter=labelInfo.PtStart.X+(labelInfo.PtEnd.X-labelInfo.PtStart.X)/2;
+        var yCenter=labelInfo.PtStart.Y+(labelInfo.PtEnd.Y-labelInfo.PtStart.Y)/2;
+        if (ptStart.Y<ptEnd.Y)
+        {
+            var rtBG={ Left:xCenter, Bottom:yCenter, Width:labelInfo.Width, Height:labelInfo.Height };
+            rtBG.Right=rtBG.Left+rtBG.Width;
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+        }
+        else
+        {
+            var rtBG={ Left:xCenter, Top:yCenter, Width:labelInfo.Width, Height:labelInfo.Height };
+            rtBG.Right=rtBG.Left+rtBG.Width;
+            rtBG.Bottom=rtBG.Top+rtBG.Height;
+        }
+
+        this.DrawDefaultLabel(labelInfo, rtBG);
+    }
+}
+
 
 function ChartDrawStorage()
 {
@@ -73149,6 +73362,30 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
+    this.ShowAllKLine=function()
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart) return false;
+        var kData=chart.Data;
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
+        var xCount=kData.Data.length+this.RightSpaceCount;
+        for(var i=0;i<this.Frame.SubFrame.length;++i)
+        {
+            var item =this.Frame.SubFrame[i].Frame;
+            item.XPointCount=xCount;
+        }
+
+        kData.DataOffset=0;
+        this.CursorIndex=0;
+
+        this.UpdataDataoffset();           //更新数据偏移
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Frame.SetSizeChage(true);
+        this.UpdatePointByCursorIndex(2);   //取消十字光标
+        this.Draw();
+    }
+
     this.UpdateMainData=function(hisData, lastDataCount)
     {
         var frameHisdata=null;
@@ -132885,7 +133122,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13329";
+var HQCHART_VERSION="1.1.13338";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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