hqchart 1.1.14617 → 1.1.14621

package/src/jscommon/umychart.complier.js

@@ -20256,7 +20256,9 @@ var SCRIPT_CHART_NAME=
 {
     OVERLAY_BARS:"OVERLAY_BARS",     //叠加柱子图
     KLINE_TABLE:"KLINE_TABLE",
-    SCATTER_PLOT:"SCATTER_PLOT",     //散点图
+    SCATTER_PLOT:"SCATTER_PLOT",            //散点图
+    SCATTER_PLOT_V2:"SCATTER_PLOT_V2",      //散点图V2
+
 
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
 
@@ -22263,6 +22265,34 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateScatterPlotV2=function(hqChart,windowIndex,varItem,i)
+    {
+        var chart=new ChartScatterPlotV2();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        chart.HQChart=hqChart;
+        chart.Identify=this.Guid;
+
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryPoint=varItem.Draw.DrawData;
+
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.Color) chart.Color=config.Color;
+            if (IFrameSplitOperator.IsNumber(config.Radius)) chart.Radius=config.Radius;
+            if (config.TextColor) chart.TextColor=config.TextColor;
+            if (config.Font) chart.Font=config.Font;
+        }
+        
+        chart.BuildCacheData();
+
+        hqChart.ChartPaint.push(chart);
+    }
+
+
     this.CreateClipColorStick=function(hqChart,windowIndex,varItem,id)
     {
         var chart=new ChartClipColorStick();
@@ -22625,6 +22655,9 @@ function ScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.SCATTER_PLOT:
                         this.CreateScatterPlot(hqChart,windowIndex,item,i);
                         break;
+                    case SCRIPT_CHART_NAME.SCATTER_PLOT_V2:
+                        this.CreateScatterPlotV2(hqChart,windowIndex,item,i);
+                        break;
                     case SCRIPT_CHART_NAME.CLIP_COLOR_STICK:
                         this.CreateClipColorStick(hqChart,windowIndex,item,i);
                         break;
@@ -25186,6 +25219,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT_V2)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    drawItem.Config=draw.Config;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType==SCRIPT_CHART_NAME.KLINE_TABLE)
                 {
                     drawItem.Name=draw.Name;

package/src/jscommon/umychart.js

@@ -11515,6 +11515,14 @@ function ToFixed(number, precision)
     return s;
 }
 
+function IsRectOverlap(rt, rt2)
+{
+    if (Math.max(rt.Left,rt2.Left)<Math.min(rt.Right,rt2.Right) && Math.max(rt.Top,rt2.Top)<Math.min(rt.Bottom, rt2.Bottom)) 
+        return true;
+
+    return false;
+}
+
 Number.prototype.toFixed2=Number.prototype.toFixed; //备份下老的
 Number.prototype.toFixed = function( precision )
 {
@@ -34808,6 +34816,326 @@ function ChartScatterPlot()
    
 }
 
+//散点图
+function ChartScatterPlotV2()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartScatterPlotV2';      //类名
+
+    //默认点配置
+    this.Color=g_JSChartResource.ChartScatterPlotV2.Color;           //点颜色
+    this.TextColor=g_JSChartResource.ChartScatterPlotV2.TextColor;
+    this.Radius=g_JSChartResource.ChartScatterPlotV2.Radius;   
+    this.Font=g_JSChartResource.ChartScatterPlotV2.Font;                          //半径
+
+    this.TooltipData=[];
+    this.MapCache=null; //key=date/date-time  value={ Data:[] }
+    this.AryPoint=[ ];  //[{ Value:, Radius:半径(可选), Color:颜色(可选),ColorBorder:边框颜色(可选), 
+                        //  Text:{ Text:显示文字, Color:"rgb(0,30,100)", BaseLine:1, YOffset:5, Align:2 };  }]
+                        //  BaseLine: 0=圆点上面 1=圆点下面 Align: 2=居中 1=左 3=右 
+    
+    this.GetKValue=ChartData.GetKValue;
+    this.TextHeight=10;
+    this.AryDrawRect=[];
+
+    this.ReloadResource=function(resource)
+    {
+        this.Color=g_JSChartResource.ChartScatterPlotV2.Color;           //点颜色
+        this.TextColor=g_JSChartResource.ChartScatterPlotV2.TextColor;
+        this.Radius=g_JSChartResource.ChartScatterPlotV2.Radius;   
+        this.Font=g_JSChartResource.ChartScatterPlotV2.Font;    
+    }
+
+    this.BuildCacheData=function()
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryPoint)) return;
+
+        for(var i=0;i<this.AryPoint.length;++i)
+        {
+            var item=this.AryPoint[i];
+            var key=this.BuildKey(item);
+            if (mapData.has(key))
+            {
+                var mapItem=mapData.get(key);
+                mapItem.Data.push(item);
+            }
+            else
+            {
+                mapData.set(key,{ Data:[item] });
+            }
+        }
+    }
+
+    this.Draw=function()
+    {
+        this.TooltipData=[];
+        this.AryDrawRect=[];
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryPoint)) return;
+        if (!this.MapCache || this.MapCache.size<=0) return;
+        if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+
+        this.DrawScatterPlot();
+        this.AryDrawRect=[];
+    }
+
+    this.DrawScatterPlot=function()
+    {
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var isMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+
+        if (bHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+        }
+
+        var lockRect=this.GetLockRect();
+        if (lockRect)
+        {
+            if (bHScreen) chartright=lockRect.Top;
+            else chartright=lockRect.Left;
+        }
+
+        this.Canvas.save();
+        this.ClipClient(bHScreen);
+
+        this.Canvas.font=this.Font;
+        this.Canvas.textAlign = "left";
+        this.Canvas.textBaseline = "bottom";
+        this.TextHeight=this.GetFontHeight();
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
+
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+            var mapItem=this.MapCache.get(key);
+            if (!IFrameSplitOperator.IsNonEmptyArray(mapItem.Data)) continue;
+
+            if (isMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+
+            if (x>chartright) break;
+
+            for(var k=0;k<mapItem.Data.length;++k)
+            {
+                var item=mapItem.Data[k];
+                this.DrawItem(kItem, item, x);
+            }
+        }
+
+        this.Canvas.restore();
+    }
+
+    this.DrawItem=function(kItem, item, x)
+    {
+        var dataWidth=this.ChartFrame.DataWidth;
+        var maxRadius=dataWidth/2;
+        if (!item) return;
+        var price=item.Value;
+        if (IFrameSplitOperator.IsString(item.Value)) price=this.GetKValue(kItem,item.Value);
+        if (!IFrameSplitOperator.IsNumber(price)) return;
+
+        var y=this.GetYFromData(price,false);
+
+        var radius=this.Radius;
+        if (item.Radius) radius=item.Radius;
+        if (!IFrameSplitOperator.IsNumber(radius)) return;
+        if (radius>maxRadius) radius=maxRadius;
+
+        this.Canvas.beginPath();
+        this.Canvas.arc(x, y, radius, 0, 2 * Math.PI);
+
+        var color=this.Color;
+        if (item.Color) color=item.Color;
+        if (color)
+        {
+            this.Canvas.fillStyle=color;
+            this.Canvas.fill();
+        }
+
+        if (item.ColorBorder) 
+        {
+            this.Canvas.strokeStyle=item.ColorBorder;
+            this.Canvas.stroke()
+        }
+
+        if (dataWidth>this.TextHeight)
+        {
+            this.DrawText(item.Text,x,y,radius);
+        }
+
+        var itemTooltip={ X:x, Y:y, Radius:radius, Data:item };
+        this.TooltipData.push(itemTooltip);
+    }
+
+    this.DrawText=function(item, x, y, radius)
+    {
+        if (!item || !item.Text) return;
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        if (bHScreen) return;
+
+        var text=item.Text;
+        var textWidth=this.Canvas.measureText(text).width;
+
+        var baseLine=1; //1=上 2=下
+        var align=2;
+        var yOffset=2;
+        var xText=x;
+        if (IFrameSplitOperator.IsNumber(item.YOffset)) yOffset=item.YOffset;   //Y偏移
+        if (IFrameSplitOperator.IsNumber(item.BaseLine)) baseLine=item.BaseLine;
+        var yText=y-radius-yOffset;
+        if (baseLine==2) yText=y+radius+this.TextHeight+yOffset; //下
+
+        if (IFrameSplitOperator.IsNumber(item.Align)) align=item.Align;   //左中右
+        if (align==1) xText=x-textWidth;
+        else if (align==2) xText=x-textWidth/2;
+
+        var rtText=null;
+        if (item.BG && item.BG.Color)
+        {
+            var bgItem=item.BG;
+            var marginLeft=2, marginRight=2, yBGOffset=1, marginBottom=0, marginTop=0;
+            if (IFrameSplitOperator.IsNumber(bgItem.MarginLeft)) marginLeft=bgItem.MarginLeft;
+            if (IFrameSplitOperator.IsNumber(bgItem.MarginRight)) marginRight=bgItem.MarginRight;
+            if (IFrameSplitOperator.IsNumber(bgItem.MarginBottom)) marginBottom=bgItem.MarginBottom;
+            if (IFrameSplitOperator.IsNumber(bgItem.MarginTop)) marginTop=bgItem.MarginTop;
+            if (IFrameSplitOperator.IsNumber(bgItem.YOffset)) yBGOffset=bgItem.YOffset;
+
+            var rtBG={ Left:xText-marginLeft, Bottom:yText+yBGOffset+marginBottom, Width:textWidth+marginLeft+marginRight, Height:this.TextHeight+marginBottom+marginTop };
+            rtBG.Right=rtBG.Left+rtBG.Width;
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+
+            if (this.IsTextOverlap(rtBG)) return;
+
+            this.Canvas.fillStyle=bgItem.Color;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+
+            rtText=rtBG;
+        }
+        else
+        {
+            rtText={ Left:xText, Bottom:yText, Width:textWidth, Height:this.TextHeight };
+            rtText.Right=rtText.Left+rtText.Width;
+            rtText.Top=rtText.Bottom-rtText.Height;
+
+            if (this.IsTextOverlap(rtText)) return;
+        }
+        
+        if (item.Color) this.Canvas.fillStyle=item.Color; 
+        else this.Canvas.fillStyle=this.TextColor;
+        this.Canvas.fillText(text, xText, yText);
+
+        this.AryDrawRect.push(rtText);
+    }
+
+    this.IsTextOverlap=function(rtText)
+    {
+        for(var i=0; i<this.AryDrawRect.length; ++i)
+        {
+            var item=this.AryDrawRect[i];
+            if (IsRectOverlap(rtText,item)) return true;
+        }
+
+        return false;
+    }
+
+    this.GetMaxMin=function()
+    {
+        var range={Min:null, Max:null };
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryPoint)) return range;
+        if (!this.MapCache || this.MapCache.size<=0) return range;
+        if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return range;
+
+        var xPointCount=this.ChartFrame.XPointCount;
+        var start=this.Data.DataOffset;
+        if (this.ChartFrame.GlobalOption && this.ChartFrame.GlobalOption.IsValueFullRange)
+        {
+            start=0;
+            xPointCount=this.Data.Data.length;
+        }
+
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        {
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
+
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+            var mapItem=this.MapCache.get(key);
+            if (!IFrameSplitOperator.IsNonEmptyArray(mapItem.Data)) continue;
+
+            for(k=0;k<mapItem.Data.length;++k)
+            {
+                var item=mapItem.Data[k];
+                var value=item.Value;
+                if (IFrameSplitOperator.IsString(item.Value)) value=this.GetKValue(kItem,item.Value);
+                if (!IFrameSplitOperator.IsNumber(value)) continue;
+
+                if (range.Max==null) range.Max=value;
+                else if (range.Max<value) range.Max=value;
+                if (range.Min==null) range.Min=value;
+                else if (range.Min>value) range.Min=value;
+            }
+        }
+
+        return range;
+    }
+
+    this.GetTooltipData=function(x,y,tooltip)
+    {
+        if (!this.IsShow) return false;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipData)) return false;
+        
+        for(var i=this.TooltipData.length-1; i>=0; --i)
+        {
+            var item=this.TooltipData[i];
+            
+            this.Canvas.beginPath();
+            this.Canvas.arc(item.X, item.Y, item.Radius, 0, 2 * Math.PI);
+            if (this.Canvas.isPointInPath(x,y))
+            {
+                JSConsole.Chart.Log('[ChartScatterPlotV2::GetTooltipData] point', item);
+                tooltip.Data=item;
+                tooltip.ChartPaint=this;
+                tooltip.Type=6; //散点图
+                return true;
+            }
+        }
+    }
+   
+}
+
 //子线段
 function ChartSubLine()
 {
@@ -73548,6 +73876,14 @@ function JSChartResource()
         DiffValueBGColor:"rgb(251,140,1)"
     }
 
+    this.ChartScatterPlotV2=
+    {
+        Color:"rgb(0,0,255)",
+        TextColor:"rgb(0,0,0)",
+        Radius:3,
+        Font:`${10*GetDevicePixelRatio()}px 微软雅黑`
+    }
+
     //筹码分布图
     this.StockChip=
     {
@@ -74948,6 +75284,7 @@ function JSChartResource()
         if (style.KLineToolbar) this.SetKLineToolbar(style.KLineToolbar);
 
         if (style.IndexLock) this.SetIndexLock(style.IndexLock);
+        if (style.ChartScatterPlotV2) this.SetChartScatterPlotV2(style.ChartScatterPlotV2);
     }
 
 
@@ -75646,6 +75983,17 @@ function JSChartResource()
         if (item.Title) dest.Title=item.Title;
     }
 
+    this.SetChartScatterPlotV2=function(style)
+    {
+        var item=style;
+        var dest=this.ChartScatterPlotV2;
+
+        if (item.Color) dest.Color=item.Color;
+        if (item.TextColor) dest.TextColor=item.TextColor;
+        if (item.Font) dest.Font=item.Font;
+        if (IFrameSplitOperator.IsNumber(item.Radius)) dest.Radius=item.Radius
+    }
+
 }
 
 var g_JSChartResource=new JSChartResource();

package/src/jscommon/umychart.report.js

@@ -192,6 +192,14 @@ function JSReportChart(divElement)
         if (IFrameSplitOperator.IsBool(option.EnableDragHeader)) chart.EnableDragHeader=option.EnableDragHeader;
         if (IFrameSplitOperator.IsNumber(option.WheelPageType)) chart.WheelPageType=option.WheelPageType;
         if (IFrameSplitOperator.IsBool(option.PageUpDownCycle)) chart.PageUpDownCycle=option.PageUpDownCycle;
+
+        //数据下载提示信息
+        if (IFrameSplitOperator.IsObject(option.SplashTitle)) 
+        {
+            var item=option.SplashTitle;
+            if (item) chart.SplashTitle.StockList=item.StockList;
+            if (item) chart.SplashTitle.MemberList=item.MemberList;
+        }
        
         
         if (option.VScrollbar) chart.SetVScrollbar(option.VScrollbar);

package/src/jscommon/umychart.testdata.js

@@ -2013,6 +2013,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAWKLINE(data, callback);
     else if (request.Data.indexname=="API_TITLE")
         HQData.APIIndex_TITLE(data, callback);
+    else if (request.Data.indexname=="API_SCATTER_PLOT_V2")
+        HQData.APIIndex_SCATTER_PLOT_V2(data, callback);
 }
 
 
@@ -3013,6 +3015,67 @@ HQData.APIIndex_TITLE=function(data, callback)
     callback(apiData);
 }
 
+HQData.APIIndex_SCATTER_PLOT_V2=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var pointData=
+    { 
+        name:"SCATTER_PLOT_V2", type:1, 
+        Draw:
+        { 
+            Name:"SCATTER_PLOT_V2",
+            DrawType:"SCATTER_PLOT_V2",
+            DrawData:[],
+            Config:{  Color:"rgb(100,100,0)", Radius:5 },
+        },
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        
+        var item={ Date:kItem.Date, Time:kItem.Time, Value:kItem.High, Color:"rgb(0,0,0)", IsEmpty:true };
+        if (kItem.Close>kItem.Open) 
+        {
+            item.ColorBorder="rgb(0,250,0)";
+            item.Text={ Text:`${kItem.High.toFixed(2)}`, Color:"rgb(250,250,250)", BaseLine:1, YOffset:8, Align:2, BG:{ Color:"rgb(255,140,0)", MarginLeft:5, MarginRight:5, YOffset:5, MarginTop:8, MarginBottom:1 }};
+        }
+        else  
+        {
+            item.ColorBorder="rgb(250,0,0)";
+            item.Text=
+            { 
+                Text:`${kItem.High.toFixed(2)}`, Color:"rgb(178,34,34)", BaseLine:2, YOffset:10, Align:2,
+                //BG:{ Color:"rgb(255,255,0)" }
+            };
+        }
+
+
+        item.Tooltip=
+        [
+            {Title:"日期", Text:`${kItem.Date}`},
+            {Title:"最高", Text:`${kItem.High.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
+            {Title:"最低", Text:`${kItem.Low.toFixed(2)}`,TextColor:"rgb(0,255,0)" },
+        ]
+        pointData.Draw.DrawData.push(item);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ pointData] },
+
+        //error: { message:"无权限查看指标“测试指标1”" }
+    };
+
+    console.log('[HQData.APIIndex_SCATTER_PLOT_V2] apiData ', apiData);
+    callback(apiData);
+}
+
 
 HQData.RequestVolumeProfileData=function(data, callback)
 {