hqchart 1.1.14632 → 1.1.14639

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

@@ -12192,6 +12192,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 return;
             }
         }
+        else if (toolTip.Type==9)   //ChartKLineTable
+        {
+            if (toolTip.Data.Item && toolTip.Data.Item.Tooltip && this.FloatTooltip)
+            {
+                this.DrawFloatTooltip({X:x, Y:y, YMove:20/pixelTatio}, toolTip);
+                bHideFloatToolip=false;
+                return;
+            }
+        }
 
 
         if (bHideFloatToolip) this.HideFloatTooltip();
@@ -36753,6 +36762,7 @@ function ChartKLineTable()
     this.AryTableData=[];
     this.MapCache=null; //key=date/date-time  value={ Date:, Time:, Data:[ ] }
     this.GetKValue=ChartData.GetKValue;
+    this.AryCellRect=[];    //保存单元格信息
     
     this.BuildCacheData=function()
     {
@@ -36812,6 +36822,7 @@ function ChartKLineTable()
 
     this.Draw=function()
     {
+        this.AryCellRect=[];
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -36925,7 +36936,7 @@ function ChartKLineTable()
 
         if (this.BGColor)
         {
-            var rtRightBG={Left:border.RightEx, Top:border.TopTitle, Right:border.ChartWidth, Bottom:border.Bottom };
+            var rtRightBG={Left:border.RightEx, Top:border.Top, Right:border.ChartWidth, Bottom:border.Bottom };
             rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
             rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
             this.Canvas.fillStyle=this.BGColor;
@@ -36966,9 +36977,11 @@ function ChartKLineTable()
         var x=left,y=top, width=right-left;
         var yOffset=3;
         if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
-        for(var i=0;i<data.Data.length;++i)
+        for(var i=0; i<data.Data.length; ++i, y+=this.RowHeight)
         {
             var item=data.Data[i];
+            if (!item) continue;
+
             var rtBG={Left:x, Top:y, Right:right, Height:this.RowHeight, Width:width };
             rtBG.Bottom=rtBG.Top+this.RowHeight;
 
@@ -37013,20 +37026,27 @@ function ChartKLineTable()
                         }
                     }
 
+                    if (rtBG.Width>5)
+                    {
+                        this.AryCellRect.push({ Item:{ Cell:item, Colunm:data, RowIndex:i, SubCell:subItem, SubIndex:j, Tooltip:subItem.Tooltip, Type:2 }, Rect:rtSubBG });
+                    }
+
                     xCell+=subCellWidth;
                 }
             }
             else
             {
-                if (item && item.BGColor)
+                if (item.BGColor)
                 {
                     this.Canvas.fillStyle=item.BGColor;
                     this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
                 }
     
-                if (item && item.Color && rtBG.Width>10)
+                if (item.Text && rtBG.Width>10)
                 {
-                    this.Canvas.fillStyle=item.Color;
+                    if (item.Color) this.Canvas.fillStyle=item.Color;
+                    else this.Canvas.fillStyle=this.TextColor;
+
                     this.Canvas.textBaseline='bottom';
                     var yText=rtBG.Bottom-yOffset;
     
@@ -37046,9 +37066,14 @@ function ChartKLineTable()
                         this.Canvas.fillText(item.Text,rtBG.Left+2,yText, width-4);
                     }
                 }
+
+                if (rtBG.Width>5)
+                {
+                    this.AryCellRect.push({ Item:{ Cell:item, Colunm:data, RowIndex:i, Tooltip:item.Tooltip, Type:1 }, Rect:rtBG });
+                }
             }
 
-            y+=this.RowHeight;
+           
         }
     }
 
@@ -37082,6 +37107,30 @@ function ChartKLineTable()
     {
         return {Min:0, Max:this.RowCount};
     }
+
+    this.GetTooltipData=function(x,y,tooltip)
+    {
+        if (!this.IsShow) return false;
+
+        for(var i=0;i<this.AryCellRect.length;++i)
+        {
+            var item=this.AryCellRect[i];
+            if (!item.Rect) continue;
+
+            var rect=item.Rect;
+            if (x>=rect.Left && x<=rect.Right && y>=rect.Top && y<=rect.Bottom)
+            {
+                var data=item.Item;
+                JSConsole.Chart.Log('[ChartKLineTable::GetTooltipData] cell', item);
+                tooltip.Data={ Rect:item.Rect, Item:data };
+                tooltip.ChartPaint=this;
+                tooltip.Type=9; //ChartKLineTable
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
 
 //表格
@@ -38909,7 +38958,7 @@ function ChartArea()
     }
 }
 
-//散点图
+//散点图 建议使用新版本 ChartScatterPlotV2
 function ChartScatterPlot()
 {
     this.newMethod=IChartPainting;   //派生
@@ -39114,7 +39163,7 @@ function ChartScatterPlot()
    
 }
 
-//散点图
+//散点图 2.0
 function ChartScatterPlotV2()
 {
     this.newMethod=IChartPainting;   //派生
@@ -48091,6 +48140,9 @@ function ChartDrawSVG()
     this.BuildKeyCallback=null;
     this.MapCache=null;         //key=date/date-time  value={ Data:[] }
 
+    this.AryDrawDetail=[];              //需要绘制的文字信息
+    this.EnalbeDetailOnVerlap=false;     //详情重叠不显示
+
     this.BuildKey=function(item)
     {
         if (this.BuildKeyCallback) return this.BuildKeyCallback(item);
@@ -48125,6 +48177,7 @@ function ChartDrawSVG()
     {
         this.TooltipRect=[];
         this.AryDrawRect=[];
+        this.AryDrawDetail=[];
         this.AutoYOffset=0;
 
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
@@ -48133,6 +48186,10 @@ function ChartDrawSVG()
         if (!this.MapCache || this.MapCache.size<=0) return;
 
         this.DrawSVGV2();
+
+        if (this.EnalbeDetailOnVerlap) this.DrawOnVerlapDetail();
+
+        this.AryDrawDetail=[];
     }
 
     this.DrawDetail=function(rtSVG, data, svgItem)
@@ -48199,6 +48256,21 @@ function ChartDrawSVG()
             }
         }
 
+        if (this.EnalbeDetailOnVerlap)  //启动重叠不会 先不画只计算位置, 后面统一画
+        {
+            this.AryDrawDetail.push({ Rect:rtBorder, AryText:aryText, Data:svgItem });
+            return;
+        }
+
+        this.DrawDetailText(data,aryText,rtBorder);
+
+        this.AryDrawRect.push( {Left:rtBorder.Left, Top:rtBorder.Top, Right:rtBorder.Right, Bottom:rtBorder.Bottom, Type:"Detail", Data:svgItem } );
+    }
+
+    this.DrawDetailText=function(data, aryText, rtBorder)
+    {
+        if (!data) return;
+
         if (data.BGColor)
         {
             this.Canvas.fillStyle=data.BGColor;
@@ -48215,12 +48287,27 @@ function ChartDrawSVG()
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
-           
+            
             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", Data:svgItem } );
+    this.DrawOnVerlapDetail=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryDrawDetail)) return;
+
+        for(var i=this.AryDrawDetail.length-1;i>=0; --i)
+        {
+            var drawItem=this.AryDrawDetail[i];
+            var rtBorder=drawItem.Rect;
+
+            if (this.IsRectOverlap(rtBorder)) continue;
+
+            this.DrawDetailText(drawItem.Data.Detail, drawItem.AryText, rtBorder);
+
+            this.AryDrawRect.push( {Left:rtBorder.Left, Top:rtBorder.Top, Right:rtBorder.Right, Bottom:rtBorder.Bottom, Type:"Detail", Data:drawItem.Data } );
+        }
     }
 
     this.GetDetailPosition=function(rtSVG, data)
@@ -48582,183 +48669,6 @@ function ChartDrawSVG()
         }
     }
 
-    /*
-    this.DrawSVG=function()
-    {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Texts)) return;
-        if (!this.Family) return;
-
-        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
-        var xPointCount=this.ChartFrame.XPointCount;
-        var offset=this.Data.DataOffset;
-        var top=this.ChartBorder.GetTopEx();
-        var bottom=this.ChartBorder.GetBottomEx();
-        var pixelRatio = GetDevicePixelRatio();
-        
-        var x=0,y=0;
-        for(var i=0; i<this.Texts.length; ++i)
-        {
-            var item=this.Texts[i];
-
-            if (!item.SVG || !item.SVG.Symbol) continue;
-            if (!IFrameSplitOperator.IsNumber(item.Index)) continue;
-
-            var isMinuteFrame=this.IsMinuteFrame();
-            var index=item.Index-offset;
-            var kItem=this.Data.Data[item.Index];
-            if (index<0 || index>=xPointCount) continue;
-            
-            x=this.ChartFrame.GetXFromIndex(index);
-            if (item.Value=="Top") y=top;
-            else if (item.Value=="Bottom") y=bottom;
-            else y=this.ChartFrame.GetYFromData(item.Value, false);
-            if (IFrameSplitOperator.IsNumber(item.YOffset)) y+=item.YOffset;    //Y轴偏移
-
-            var svgItem=item.SVG;
-            if (IFrameSplitOperator.IsNumber(svgItem.YOffset)) y+=svgItem.YOffset;
-
-            if (this.AutoPosition) 
-            {
-                var pt={ X:x, Y:y };
-                this.CalculateShowPosition(item, pt);   //重新计算位置
-                x=pt.X;
-                y=pt.Y;
-            }
-
-
-            var fontSVG=`${svgItem.Size}px ${this.Family}`;
-            this.Canvas.font=fontSVG;
-            var halfSize=svgItem.Size/2;
-            var textBaseline='bottom';
-            var rtSVG={ Left:x-halfSize, Right:x+halfSize, Top:y-svgItem.Size, Bottom:y, Height:svgItem.Size, Width:svgItem.Size };
-            if (svgItem.VAlign===0) 
-            {
-                textBaseline="top";
-                rtSVG.Top=y;
-                rtSVG.Bottom=rtSVG.Top+svgItem.Size;
-            }
-            else if (svgItem.VAlign===1) 
-            {
-                textBaseline='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;
-            }
-
-            this.Canvas.textBaseline=textBaseline;
-            this.Canvas.textAlign='center';
-            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", Data:item } );
-
-            if (this.EnableTooltip) this.TooltipRect.push({ Rect:rtSVG,Index:i });
-
-            //文字
-            if (item.Text && item.Text.Content && this.TextFont)
-            {
-                var textItem=item.Text;
-                this.Canvas.font=this.TextFont;
-                this.Canvas.fillStyle=textItem.Color;
-                var yText=y;
-                if (IFrameSplitOperator.IsNumber(textItem.YOffset)) yText+=textItem.YOffset;
-                this.Canvas.fillText(textItem.Content, x, yText);
-            }
-
-            if (item.Detail)
-            {
-                this.DrawDetail(rtSVG,item.Detail, item);
-            }
-              
-            //连线
-            if (item.Line)
-            {
-                var lineItem=item.Line;
-                var price=null, yPrice=null;
-                var kItem=this.Data.Data[item.Index];
-                if (lineItem.Value=="Bottom")
-                {
-                    yPrice=bottom;
-                }
-                else if (lineItem.Value=="Top")
-                {
-                    yPrice=top;
-                }
-                else
-                {
-                    switch(lineItem.Value)
-                    {
-                        case "C":
-                            price=kItem.Close;
-                            break;
-                        case "H":
-                            price=kItem.High;
-                            break;
-                        case "L":
-                            price=kItem.Low;
-                            break;    
-                    }
-    
-                    if (!IFrameSplitOperator.IsNumber(price)) continue;
-                    
-                    yPrice=this.ChartFrame.GetYFromData(price);
-                }
-                
-                if (yPrice>=rtSVG.Top && yPrice<=rtSVG.Bottom) continue;
-
-                var yText;
-                if (yPrice<rtSVG.Top) 
-                {
-                    yText=rtSVG.Top;
-                    if (IFrameSplitOperator.IsNumber(lineItem.SVGBlank))
-                    {
-                        //yPrice+=lineItem.Blank;
-                        yText-=lineItem.SVGBlank;
-                    }
-                }
-                else
-                {
-                    yText=rtSVG.Bottom;
-                    if (IFrameSplitOperator.IsNumber(lineItem.SVGBlank))
-                    {
-                        //yPrice-=lineItem.Blank;
-                        yText+=lineItem.SVGBlank;
-                    }
-                }
-
-                if (lineItem.Dash) this.Canvas.setLineDash(lineItem.Dash);    //虚线
-                var lineWidth=1*pixelRatio;
-                if (lineItem.Width>0) lineWidth=lineItem.Width*pixelRatio;
-                this.Canvas.lineWidth=lineWidth;   //线宽
-                this.Canvas.strokeStyle = lineItem.Color;
-                this.Canvas.beginPath();
-
-                if (this.IsHScreen)
-                {
-                    this.Canvas.moveTo(yText, ToFixedPoint(x));
-                    this.Canvas.lineTo(yPrice,ToFixedPoint(x));
-                }
-                else
-                {
-                    this.Canvas.moveTo(ToFixedPoint2(lineWidth,x),yText);
-                    this.Canvas.lineTo(ToFixedPoint2(lineWidth,x),yPrice);
-                }
-                
-                this.Canvas.stroke();
-                this.Canvas.setLineDash([]);
-            }
-        }
-    }
-    */
-
     this.GetMaxMin=function()
     {
         this.IsHScreen=(this.ChartFrame.IsHScreen===true);
@@ -126667,6 +126577,7 @@ function ScriptIndex(name,script,args,option)
         chart.Data=hqChart.GetKData()
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip)) chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst)) chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;
+        if (IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailOnVerlap)) chart.EnalbeDetailOnVerlap=varItem.Draw.EnalbeDetailOnVerlap;
         if (varItem.Draw.BuildKeyCallback) chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;
         chart.Family=varItem.Draw.DrawData.Family;
         chart.TextFont=varItem.Draw.DrawData.TextFont;
@@ -126737,6 +126648,7 @@ function ScriptIndex(name,script,args,option)
             if (config.TextColor) chart.TextColor=config.TextColor;
             if (config.BorderColor) chart.BorderColor=config.BorderColor;
             if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
+            if (IFrameSplitOperator.IsNumber(config.RowHeightType)) chart.RowHeightType=config.RowHeightType;
 
             if (config.ItemMergin)
             {
@@ -128577,6 +128489,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.TextFont=varItem.Draw.DrawData.TextFont;
         chart.Texts= varItem.Draw.DrawData.Data;
         if (varItem.Draw.AutoPosition) chart.AutoPosition=varItem.Draw.AutoPosition;
+        if (IFrameSplitOperator.IsBool(varItem.Draw.EnalbeDetailOnVerlap)) chart.EnalbeDetailOnVerlap=varItem.Draw.EnalbeDetailOnVerlap;
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
 
@@ -129783,6 +129696,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
                     if (draw.AutoPosition) drawItem.AutoPosition=draw.AutoPosition;
+                    drawItem.EnalbeDetailOnVerlap=draw.EnalbeDetailOnVerlap;
                     if (draw.BuildKeyCallback) drawItem.BuildKeyCallback=draw.BuildKeyCallback;
                     drawItem.DrawData={ Data:draw.Data, Family:draw.Family, TextFont:draw.TextFont, EnableTooltip:draw.EnableTooltip, IsDrawFirst:draw.IsDrawFirst };
                     outVarItem.Draw=drawItem;
@@ -154150,6 +154064,10 @@ function JSFloatTooltip()
             {
                 this.UpdateChartDrawSVGV2Tooltip(data);
             }
+            else if (tooltipData.Type==9)   //ChartKLineTable
+            {
+                this.UpdateChartKLineTableTooltip(data);
+            }
            
         }
         else if (data.DataType==2)  //更新实时行情数据
@@ -154295,6 +154213,12 @@ function JSFloatTooltip()
 
         this.ShowTooltip(data);
     }
+    
+
+    this.UpdateChartKLineTableTooltip=function(data)
+    {
+        this.UpdateChartDrawSVGV2Tooltip(data);
+    }
 
     //交易指标
     this.UpdateTradeIndexTooltip=function(data)
@@ -157343,7 +157267,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14631";
+var HQCHART_VERSION="1.1.14638";
 
 function PrintHQChartVersion()
 {