hqchart 1.1.14313 → 1.1.14320

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

@@ -35898,6 +35898,220 @@ function ChartSimplePie()
     }
 }
 
+
+//雷达图
+function ChartSimpleRadar()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSimpleRadar';    //类名
+    this.BorderPoint=[];    //边框点
+    this.DataPoint=[];      //数据点
+    this.CenterPoint={};
+    this.StartAngle=0;
+    this.Color='rgb(198,198,198)';
+    this.AreaColor='rgba(242,154,118,0.4)';    //面积图颜色
+    this.AreaLineColor='rgb(242,154,118)';
+    this.TitleFont=24*GetDevicePixelRatio()+'px 微软雅黑';
+    this.TitleColor='rgb(102,102,102)';
+    this.BGColor = ['rgb(255,255,255)', 'rgb(224,224,224)']//背景色
+
+    this.DrawBorder=function()  //画边框
+    {
+        if (this.BorderPoint.length<=0) return;
+
+        this.Canvas.font=this.TitleFont;
+        this.Canvas.strokeStyle = this.Color;
+        const aryBorder=[1,0.8,0.6,0.4,0.2];
+        for (let j in aryBorder)
+        {
+            var rate = aryBorder[j];
+            var isFirstDraw=true;
+            for(let i in this.BorderPoint)
+            {
+                var item=this.BorderPoint[i];
+                item.X = this.CenterPoint.X + item.Radius * Math.cos(item.Angle * Math.PI / 180) * rate;
+                item.Y = this.CenterPoint.Y + item.Radius * Math.sin(item.Angle * Math.PI / 180) * rate;
+                if (isFirstDraw)
+                {
+                    this.Canvas.beginPath();
+                    this.Canvas.moveTo(item.X,item.Y);
+                    isFirstDraw=false;
+                }
+                else
+                {
+                    this.Canvas.lineTo(item.X,item.Y);
+                }
+            }
+
+            this.Canvas.closePath();
+            this.Canvas.stroke();
+            this.Canvas.fillStyle = this.BGColor[j%2==0?0:1];
+            this.Canvas.fill();
+        }
+
+        this.Canvas.beginPath();
+        for(let i in this.BorderPoint)
+        {
+            var item=this.BorderPoint[i];
+            item.X = this.CenterPoint.X + item.Radius * Math.cos(item.Angle * Math.PI / 180);
+            item.Y = this.CenterPoint.Y + item.Radius * Math.sin(item.Angle * Math.PI / 180);
+            this.Canvas.moveTo(this.CenterPoint.X,this.CenterPoint.Y);
+            this.Canvas.lineTo(item.X,item.Y);
+            this.DrawText(item);
+        }
+        this.Canvas.stroke();
+    }
+
+    this.DrawArea=function()
+    {
+        if (!this.DataPoint || this.DataPoint.length<=0) return;
+
+        this.Canvas.fillStyle = this.AreaColor;
+        this.Canvas.strokeStyle = this.AreaLineColor;
+        this.Canvas.beginPath();
+        var isFirstDraw=true;
+        for(let i in this.DataPoint)
+        {
+            var item=this.DataPoint[i];
+            if (isFirstDraw)
+            {
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(item.X,item.Y);
+                isFirstDraw=false;
+            }
+            else
+            {
+                this.Canvas.lineTo(item.X,item.Y);
+            }
+        }
+
+        this.Canvas.closePath();
+        this.Canvas.fill();
+        this.Canvas.stroke();
+    }
+
+    this.DrawText=function(item)
+    {
+        if (!item.Text) return;
+          
+        //JSConsole.Chart.Log(item.Text, item.Angle);
+        this.Canvas.fillStyle = this.TitleColor;
+        var xText = item.X, yText = item.Y;
+
+        //显示每个角度的位置
+        if (item.Angle > 0 && item.Angle < 45) {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'middle';
+            xText += 2;
+        }
+        else if (item.Angle >= 0 && item.Angle < 90) {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'top';
+            xText += 2;
+        }
+        else if (item.Angle >= 90 && item.Angle < 135) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'top';
+            xText -= 2;
+        }
+        else if (item.Angle >= 135 && item.Angle < 180) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'top';
+            xText -= 2;
+        }
+        else if (item.Angle >= 180 && item.Angle < 225) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'middle';
+            xText -= 2;
+        }
+        else if (item.Angle >= 225 && item.Angle <= 270) {
+            this.Canvas.textAlign = 'center';
+            this.Canvas.textBaseline = 'bottom';
+        }
+        else if (item.Angle > 270 && item.Angle < 315) {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'bottom';
+            xText += 2;
+        }
+        else {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'middle';
+            xText += 2;
+        }
+
+        this.Canvas.fillText(item.Text, xText, yText);
+    }
+
+    this.Draw=function()
+    {
+        this.BorderPoint=[];
+        this.DataPoint=[];
+        this.CenterPoint={};
+        if (!this.Data || !this.Data.Data || !(this.Data.Data.length>0))
+            this.CalculatePoints(null);
+        else 
+            this.CalculatePoints(this.Data.Data);
+
+        this.DrawBorder();
+        this.DrawArea();
+    }
+
+    this.CalculatePoints=function(data)
+    {
+        let left=this.ChartBorder.GetLeft();
+        let right=this.ChartBorder.GetRight();
+        let top=this.ChartBorder.GetTop();
+        let bottom=this.ChartBorder.GetBottom();
+        let width=this.ChartBorder.GetWidth();
+        let height=this.ChartBorder.GetHeight();
+
+        let ptCenter={X:left+width/2, Y:top+height/2};  //中心点
+        let radius=Math.min(width/2,height/2)-2         //半径
+        let count=Math.max(5,data?data.length:0);
+        let averageAngle=360/count;
+        for(let i=0;i<count;++i)
+        {
+            let ptBorder = { Index: i, Radius: radius, Angle: i * averageAngle + this.StartAngle };
+            let angle = ptBorder.Angle;
+
+            if (data && i<data.length)
+            {
+                var item=data[i];
+                let ptData={Index:i,Text:item.Text};
+                ptBorder.Text=item.Name;
+                if (!item.Value)
+                {
+                    ptData.X=ptCenter.X;
+                    ptData.Y=ptCenter.Y;
+                } 
+                else
+                {
+                    var value=item.Value;
+                    if (value>=1) value=1;
+                    var dataRadius=radius*value;
+                    ptData.X=ptCenter.X+dataRadius*Math.cos(angle*Math.PI/180);
+                    ptData.Y=ptCenter.Y+dataRadius*Math.sin(angle*Math.PI/180);
+                }
+
+                this.DataPoint.push(ptData);
+            }
+
+            this.BorderPoint.push(ptBorder);
+        }
+
+        this.CenterPoint=ptCenter;
+    }
+
+    //空数据
+    this.DrawEmptyData=function()
+    {
+        JSConsole.Chart.Log('[ChartPie::DrawEmptyData]')
+    }
+}
+
 //分钟成交量 支持横屏
 function ChartMinuteVolumBar()
 {
@@ -56525,6 +56739,7 @@ function ChartCorssCursor()
     this.TextBGColor=g_JSChartResource.CorssCursorBGColor;      //文本背景色
     this.BorderColor=g_JSChartResource.CorssCursorBorderColor;  //边框颜色
     this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
+    this.LineDash=g_JSChartResource.CorssCursorLineDash.slice();    //虚线
     this.TextHeight=20;                                         //文本字体高度
     this.LastPoint;
     this.LastValue; //{ Y:{ Value:, Extend: } }
@@ -56580,6 +56795,7 @@ function ChartCorssCursor()
         this.TextBGColor=g_JSChartResource.CorssCursorBGColor;      //文本背景色
         this.BorderColor=g_JSChartResource.CorssCursorBorderColor;  //边框颜色
         this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
+        this.LineDash=g_JSChartResource.CorssCursorLineDash.slice();    //虚线
     }
 
     this.GetCloseYPoint=function(index)
@@ -56838,10 +57054,10 @@ function ChartCorssCursor()
             }
 
             var pixel=GetDevicePixelRatio();
-            if (this.HPenType==1 || this.HPenType==0)   //0=实线 1=虚线
+            if (this.HPenType==1 || this.HPenType==0)   //0=虚线 1=实线
             {
                 this.Canvas.strokeStyle=this.HPenColor;
-                if (this.HPenType==0) this.Canvas.setLineDash([3*pixel,2*pixel]);   //虚线
+                if (this.HPenType==0) this.Canvas.setLineDash(this.LineDash);   //虚线
                 //this.Canvas.lineWidth=0.5
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(left,ToFixedPoint(y));
@@ -56854,7 +57070,7 @@ function ChartCorssCursor()
             this.Canvas.strokeStyle=this.VPenColor;
             if (this.VPenType==0) 
             {
-                this.Canvas.setLineDash([3*pixel,2*pixel]);   //虚线
+                this.Canvas.setLineDash(this.LineDash);   //虚线
             }
             else if (this.VPenType==2) 
             {
@@ -57449,7 +57665,7 @@ function ChartCorssCursor()
             var pixel=GetDevicePixelRatio();
             this.Canvas.save();
             this.Canvas.strokeStyle=this.HPenColor;
-            if (this.HPenType==0) this.Canvas.setLineDash([3*pixel,2*pixel]);   //虚线
+            if (this.HPenType==0) this.Canvas.setLineDash(this.LineDash);   //虚线
 
             //画竖线
             this.Canvas.beginPath();
@@ -57463,7 +57679,7 @@ function ChartCorssCursor()
             this.Canvas.strokeStyle=this.VPenColor;
             if (this.VPenType==0) 
             {
-                this.Canvas.setLineDash([3*pixel,2*pixel]);   //虚线
+                this.Canvas.setLineDash(this.LineDash);   //虚线
             }
             else if (this.VPenType==2) 
             {
@@ -60739,7 +60955,12 @@ function DynamicChartTitlePainting()
     {
         this.Font=g_JSChartResource.TitleFont;
         this.TitleColor=g_JSChartResource.DefaultTextColor;
+        this.SelectedColor=g_JSChartResource.IndexTitleSelectedColor;
         this.OverlayIndexType.BGColor=g_JSChartResource.OverlayIndexTitleBGColor;
+
+        this.BGColor=g_JSChartResource.IndexTitleBGColor;
+        this.BGBorderColor=g_JSChartResource.IndexTitleBorderColor;
+        this.BGBorderMoveOnColor=g_JSChartResource.IndexTitleBorderMoveOnColor;
     }
 
     this.SetDynamicTitleData=function(outName, args, data)
@@ -74413,6 +74634,7 @@ function JSChartResource()
     this.CorssCursorHPenColor="rgb(130,130,130)";          //十字光标线段颜色(水平)
     this.CorssCursorVPenColor="rgb(130,130,130)";          //十字光标线段颜色(垂直)
     this.CorssCursorXRangeBGColor="rgba(100,149,237,0.3)";  //十字光标X轴访问背景色
+    this.CorssCursorLineDash=[3*GetDevicePixelRatio(),2*GetDevicePixelRatio()];            //十字光标虚线
 
     this.CorssCursor=
     { 
@@ -75833,6 +76055,7 @@ function JSChartResource()
         if (style.CorssCursorHPenColor) this.CorssCursorHPenColor = style.CorssCursorHPenColor;
         if (style.CorssCursorBorderColor) this.CorssCursorBorderColor=style.CorssCursorBorderColor;
         if (style.CorssCursorXRangeBGColor) this.CorssCursorXRangeBGColor=style.CorssCursorXRangeBGColor;
+        if (style.CorssCursorLineDash) this.CorssCursorLineDash=style.CorssCursorLineDash.slice();
         if (style.CorssCursor && style.CorssCursor.RightButton)
         {
             var item=style.CorssCursor.RightButton;
@@ -89872,12 +90095,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.CaclutateCallCationYRange();
     }
 
+    //增量更新
     this.RecvUpdateMinuteData=function(data)
     {
         var minuteData=MinuteChartContainer.JsonDataToUpdateMinuteData(data);
         var aryColorData=MinuteChartContainer.JsonDataToMinuteLineColorData(data);
-        this.BeforeOpenData=null;
-        this.AfterCloseData=null;
+        
         var beforeOpenData=MinuteChartContainer.JsonDataToBeforeOpenData(data);
         var afterCloseData=MinuteChartContainer.JsonDataToAfterCloseData(data);
         var updateTime=MinuteChartContainer.JsonDataToMinuteLastUpdateTime(data);   //数据最后的更新时间
@@ -89896,92 +90119,22 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             return;
         }
 
-        //原始数据
+        if (this.IsBeforeData && beforeOpenData) this.BeforeOpenData=beforeOpenData;
+        if (this.IsAfterData && afterCloseData) this.AfterCloseData=afterCloseData;
 
+        //原始数据
         this.UpdateLatestMinuteDataV2(minuteData);
-        var sourceData=this.SourceData;
-        var aryMinuteData=this.SourceData.Data;
-        this.ColorLineData=aryColorData;
-        this.TradeDate=data.stock[0].date;
-        this.Frame.SetDayCount(1);  //单日数据
-        this.SourceData.UpdateTime=updateTime;
-        this.Symbol=minuteData.Symbol;
-        this.Name=minuteData.Name;
-
-        this.SetCallCationDataBorder( { Left:this.IsBeforeData, Right:this.IsAfterData , MultiDay:{ Left:false, Right:false }} );
+        this.UpdateMinuteUI(data.stock[0], {FunctionName:"RecvUpdateMinuteData"});
 
-        if (this.ShareAfterVol==2)  //盘前， 盘后成交量公用坐标
+        if (data.AutoUpdate===false)    //不执行自动更新
         {
-            if (this.BeforeOpenData && this.AfterCloseData)
-            {
-                var max=Math.max(this.BeforeOpenData.VolMax, this.AfterCloseData.VolMax);
-                var min=Math.min(this.BeforeOpenData.VolMin, this.AfterCloseData.VolMin);
-                this.BeforeOpenData.VolMax=this.AfterCloseData.VolMax=max;
-                this.BeforeOpenData.VolMin=this.AfterCloseData.VolMin=min;
-            }
-        }
 
-        var yClose=minuteData.YClose;
-        var upperSymbol=this.Symbol.toUpperCase();
-        var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);
-        if (minuteData.YClearing>0 && isFutures) yClose=minuteData.YClearing; //期货使用前结算价
-        this.CaclutateLimitPrice(yClose, minuteData.LimitPrice); //计算涨停价格
-        var extendData=null;
-        if (minuteData.High>0 && minuteData.Low>0) extendData={ High:minuteData.High, Low:minuteData.Low };
-        this.BindMainData(sourceData,yClose, extendData);
-
-        if (this.Frame.SubFrame.length>2)
-        {
-            var bindData=new ChartData();
-            bindData.Data=aryMinuteData;
-            for(var i=2; i<this.Frame.SubFrame.length; ++i)
-            {
-                this.BindIndexData(i,bindData);
-            }
-        }
-
-        for(let i=0; i<this.Frame.SubFrame.length; ++i)
+        }   
+        else
         {
-            var item=this.Frame.SubFrame[i];
-            item.Frame.XSplitOperator.Symbol=this.Symbol;
-            item.Frame.XSplitOperator.DayCount=1;
-            item.Frame.XSplitOperator.Operator();   //调整X轴个数
-            item.Frame.YSplitOperator.Symbol=this.Symbol;
-
-            if (IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex))
-            {
-                for(var j=0;j<item.OverlayIndex.length; ++j) //子坐标X轴个数同步
-                {
-                    var overlayItem=item.OverlayIndex[j];
-                    overlayItem.Frame.XPointCount=item.Frame.XPointCount;
-                    overlayItem.Frame.MinuteCount=item.Frame.MinuteCount;
-                }
-            }
+            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvUpdateMinuteData");
+            this.AutoUpdate();
         }
-
-        this.ChartCorssCursor.StringFormatY.Symbol=this.Symbol;
-        this.ChartCorssCursor.StringFormatX.Symbol=this.Symbol;
-
-        if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) this.TitlePaint[0].IsShowDate=false;
-
-        if (data.stock[0].IsHistoryMinute==true) this.TitlePaint[0].IsShowDate=true;
-
-        var chartInfo=this.GetChartMinuteInfo();
-        if (chartInfo) chartInfo.SourceData=this.SourceData;    //数据绑定到信息地雷上
-
-        this.RecvMinuteDataEvent( {FunctionName:"RecvUpdateMinuteData"} );
-        this.RequestMinuteInfoData();
-        this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
-        this.CreateChartDrawPictureByStorage(); //创建画图工具
-
-        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
-        this.Frame.SetSizeChage(true);
-        this.Draw();
-
-        this.BindAllOverlayIndexData(this.SourceData);
-        
-        this.AutoUpdateEvent(true, "MinuteChartContainer::RecvUpdateMinuteData");
-        this.AutoUpdate();
     }
 
     this.RecvMinuteData=function(data)
@@ -90048,15 +90201,31 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var sourceData=new ChartData();
         sourceData.Data=aryMinuteData;
         sourceData.UpdateTime=updateTime;
+        this.SourceData=sourceData;
 
         this.ColorLineData=aryColorData;
 
-        this.TradeDate=data.stock[0].date;
+        this.UpdateMinuteUI(data.stock[0],  {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} });
+
+        if (data.AutoUpdate===false)    //不执行自动更新
+        {
+
+        }   
+        else
+        {
+            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
+            this.AutoUpdate();
+        }
+    }
+
+    //更新单日分时图
+    this.UpdateMinuteUI=function(stockData, eventData)
+    {
+        this.TradeDate=stockData.date;
         this.Frame.SetDayCount(1);  //单日数据
 
-        this.SourceData=sourceData;
-        this.Symbol=data.stock[0].symbol;
-        this.Name=data.stock[0].name;
+        this.Symbol=stockData.symbol;
+        this.Name=stockData.name;
 
         this.SetCallCationDataBorder( { Left:this.IsBeforeData, Right:this.IsAfterData , MultiDay:{ Left:false, Right:false }} );
 
@@ -90071,26 +90240,26 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             }
         }
 
-        var yClose=data.stock[0].yclose;
+        var yClose=stockData.yclose;
         var upperSymbol=this.Symbol.toUpperCase();
         var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);
-        if (data.stock[0].yclearing>0 && isFutures) yClose=data.stock[0].yclearing; //期货使用前结算价
-        this.CaclutateLimitPrice(yClose, data.stock[0].limitprice); //计算涨停价格
+        if (stockData.yclearing>0 && isFutures) yClose=stockData.yclearing; //期货使用前结算价
+        this.CaclutateLimitPrice(yClose, stockData.limitprice); //计算涨停价格
         var extendData=null;
-        if (data.stock[0].high>0 && data.stock[0].low>0) extendData={ High:data.stock[0].high, Low:data.stock[0].low };
-        this.BindMainData(sourceData,yClose, extendData);
+        if (stockData.high>0 && stockData.low>0) extendData={ High:stockData.high, Low:stockData.low };
+        this.BindMainData(this.SourceData,yClose, extendData);
 
         if (this.Frame.SubFrame.length>2)
         {
             var bindData=new ChartData();
-            bindData.Data=aryMinuteData;
+            bindData.Data=this.SourceData.Data;
             for(var i=2; i<this.Frame.SubFrame.length; ++i)
             {
                 this.BindIndexData(i,bindData);
             }
         }
 
-        for(let i in this.Frame.SubFrame)
+        for(var i=0, j=0; i<this.Frame.SubFrame.length; ++i)
         {
             var item=this.Frame.SubFrame[i];
             item.Frame.XSplitOperator.Symbol=this.Symbol;
@@ -90098,7 +90267,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             item.Frame.XSplitOperator.Operator();   //调整X轴个数
             item.Frame.YSplitOperator.Symbol=this.Symbol;
 
-            for(var j in item.OverlayIndex) //子坐标X轴个数同步
+            for(j=0;j<item.OverlayIndex.length;++j) //子坐标X轴个数同步
             {
                 var overlayItem=item.OverlayIndex[j];
                 overlayItem.Frame.XPointCount=item.Frame.XPointCount;
@@ -90111,12 +90280,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) this.TitlePaint[0].IsShowDate=false;
 
-        if (data.stock[0].IsHistoryMinute==true) this.TitlePaint[0].IsShowDate=true;
+        if (stockData.IsHistoryMinute==true) this.TitlePaint[0].IsShowDate=true;
 
         var chartInfo=this.GetChartMinuteInfo();
         if (chartInfo) chartInfo.SourceData=this.SourceData;    //数据绑定到信息地雷上
 
-        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
+        if (eventData) this.RecvMinuteDataEvent( eventData );
         this.RequestMinuteInfoData();
         this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
         this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -90126,16 +90295,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.Draw();
 
         this.BindAllOverlayIndexData(this.SourceData);
-        
-        if (data.AutoUpdate===false)    //不执行自动更新
-        {
-
-        }   
-        else
-        {
-            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
-            this.AutoUpdate();
-        }
     }
 
     this.CaclutateLimitPrice=function(yClose, limitData)
@@ -112338,8 +112497,24 @@ function JSDraw(errorHandler,symbolData)
     }
 
     //饼图
-    this.PIE_CELL=function(value, color, text, textColor, lineColor)
+    this.PIE_CELL=function(data, color, text, textColor, lineColor)
     {
+        var value=null;
+        if (IFrameSplitOperator.IsNumber(data)) 
+        {
+            value=data;
+        }
+        else if (IFrameSplitOperator.IsString(data))
+        {
+            value=parseFloat(data);
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(data))
+        {
+            var lastValue=data[data.length-1];
+            if (IFrameSplitOperator.IsNumber(lastValue)) value=lastValue;
+            else if (IFrameSplitOperator.IsString(lastValue)) value=parseFloat(lastValue);
+        }
+
         var cellItem={ Value:value, Color:color };
         if (text) cellItem.Text=text;
         if (textColor) cellItem.TextColor=textColor;
@@ -151582,7 +151757,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14312";
+var HQCHART_VERSION="1.1.14319";
 
 function PrintHQChartVersion()
 {