hqchart 1.1.14313 → 1.1.14330

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

@@ -35898,6 +35898,313 @@ function ChartSimplePie()
     }
 }
 
+
+//雷达图
+function ChartSimpleRadar()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSimpleRadar';    //类名
+    
+    this.AreaColor='rgba(242,154,118,0.4)';    //
+    this.AreaLineColor='rgb(242,154,118)';
+    
+    this.TitleColor=g_JSChartResource.ChartSimpleRadar.TextColor;
+    this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleRadar.TextFont);
+    this.Offset=CloneData(g_JSChartResource.ChartSimpleRadar.Offset);
+    this.BorderColor=g_JSChartResource.ChartSimpleRadar.BorderColor;
+    this.AryBGColor=g_JSChartResource.ChartSimpleRadar.AryBGColor.slice();//背景色
+    this.AryAreaConfig=g_JSChartResource.ChartSimpleRadar.AryArea.slice();  //面积图颜色
+
+    this.StartAngle=270;
+    this.Radius=50;
+    this.AryBorder=[1, 0.75, 0.5, 0.25];
+    this.AryIndex;      //指标{ Name:, Max:100, Min:0 },
+
+    this.CenterPoint={};
+    this.RectClient={ };
+    this.AryIndexCache=[];
+    this.MapDataCache=new Map(); //key=name  value={ Data:[] }
+    this.TextFont;
+
+
+    this.ReloadResource=function(resource)
+    {
+        this.TitleColor=g_JSChartResource.ChartSimpleRadar.TextColor;
+        this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleRadar.TextFont);
+        this.Offset=CloneData(g_JSChartResource.ChartSimpleRadar.Offset);
+        this.BorderColor=g_JSChartResource.ChartSimpleRadar.BorderColor;
+        this.AryBGColor=g_JSChartResource.ChartSimpleRadar.AryBGColor.slice();//背景色
+        this.AryAreaConfig=g_JSChartResource.ChartSimpleRadar.AryArea.slice();  //面积图颜色
+    }
+
+    this.DrawBorder=function()  //画边框
+    {
+        this.Canvas.strokeStyle = this.BorderColor;
+        this.Canvas.font=this.TextFont;
+        for(var i=0;i<this.AryBorder.length;++i)
+        {
+            var rate = this.AryBorder[i];
+            var radius=this.RectClient.Radius*rate;
+            var bFirstDraw=true;
+            for(var j=0;j<this.AryIndexCache.length;++j)
+            {
+                var item=this.AryIndexCache[j];
+                var x = this.CenterPoint.X + radius * Math.cos(item.Angle * Math.PI / 180);
+                var y = this.CenterPoint.Y + radius * Math.sin(item.Angle * Math.PI / 180);
+                if (bFirstDraw)
+                {
+                    this.Canvas.beginPath();
+                    this.Canvas.moveTo(x,y);
+                    bFirstDraw=false;
+                }
+                else
+                {
+                    this.Canvas.lineTo(x,y);
+                }
+            }
+
+            this.Canvas.closePath();
+            this.Canvas.stroke();
+
+            if (IFrameSplitOperator.IsNonEmptyArray(this.AryBGColor))
+            {
+                this.Canvas.fillStyle = this.AryBGColor[i%this.AryBGColor.length];
+                this.Canvas.fill();
+            }
+        }
+
+        this.Canvas.beginPath();
+        for(var i=0;i<this.AryIndexCache.length;++i)
+        {
+            var item=this.AryIndexCache[i];
+            var x = this.CenterPoint.X + item.Radius * Math.cos(item.Angle * Math.PI / 180);
+            var 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(x,y);
+            this.DrawText(item, x, y);
+        }
+        this.Canvas.stroke();
+        
+    }
+
+    this.GetRadarRate=function(indexItem, value)
+    {
+        var range={ Max:100, Min:0 };
+        if (IFrameSplitOperator.IsNumber(indexItem.Max)) range.Max=indexItem.Max;
+        if (IFrameSplitOperator.IsNumber(indexItem.Min)) range.Min=indexItem.Min;
+
+        if (value>range.Max) value=range.Max;
+        else if (value<range.Min) value=range.Min;
+
+        return (value-range.Min)/(range.Max-range.Min);
+    }
+
+    this.DrawArea=function()
+    {
+        if (this.MapDataCache.size<=0) return;
+
+        var index=0;
+        for(var mapItem of this.MapDataCache)
+        {
+            var mapData=mapItem[1].MapData;
+            
+            var bFirstDraw=true;
+            var pointCount=0;
+            for(var i=0;i<this.AryIndexCache.length;++i)
+            {
+                var indexItem=this.AryIndexCache[i];
+                if (!indexItem.Data || !indexItem.Data.Name) continue;
+                if (!mapData.has(indexItem.Data.Name)) continue;
+                var item=mapData.get(indexItem.Data.Name);
+                if (!item.Data && !IFrameSplitOperator.IsNumber(item.Data.Value)) conintue;
+
+                var widthRate=this.GetRadarRate(indexItem, item.Data.Value);
+                var x = this.CenterPoint.X+indexItem.Radius*widthRate*Math.cos(indexItem.Angle * Math.PI / 180);
+                var y = this.CenterPoint.Y+indexItem.Radius*widthRate*Math.sin(indexItem.Angle * Math.PI / 180);
+
+                if (bFirstDraw)
+                {
+                    this.Canvas.beginPath();
+                    this.Canvas.moveTo(x,y);
+                    bFirstDraw=false;
+                    ++pointCount;
+                }
+                else
+                {
+                    this.Canvas.lineTo(x,y);
+                    ++pointCount;
+                }
+            }
+
+            if (pointCount>0)
+            {
+                this.Canvas.closePath();
+
+                var config=this.AryAreaConfig[index%this.AryAreaConfig.length];
+                if (config.Color)
+                {
+                    this.Canvas.fillStyle = config.Color;
+                    this.Canvas.fill();
+                }
+                   
+                if (config.LineColor)
+                {
+                    this.Canvas.strokeStyle = config.LineColor;
+                    this.Canvas.stroke();
+                }
+            }
+
+            ++index;
+        }
+    }
+
+    this.DrawText=function(item, x, y)
+    {
+        if (!item.Data || !item.Data.Name) return;
+          
+        //JSConsole.Chart.Log(item.Text, item.Angle);
+        this.Canvas.fillStyle = this.TitleColor;
+        var xText = x, yText =y;
+
+        var angle=item.Angle%360;
+
+        //显示每个角度的位置
+        if (angle > 0 && angle < 45) {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'middle';
+            xText += 2;
+        }
+        else if (angle >= 45 && angle < 90) {
+            this.Canvas.textAlign = 'left';
+            this.Canvas.textBaseline = 'top';
+            xText += 2;
+        }
+        else if (angle==90)
+        {
+            this.Canvas.textAlign = 'center';
+            this.Canvas.textBaseline = 'top';
+            yText+=2;
+        }
+        else if (angle >= 90 && angle < 135) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'top';
+            xText -= 2;
+        }
+        else if (angle >= 135 && angle < 180) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'top';
+            xText -= 2;
+        }
+        else if (angle >= 180 && angle < 225) {
+            this.Canvas.textAlign = 'right';
+            this.Canvas.textBaseline = 'middle';
+            xText -= 2;
+        }
+        else if (angle >= 225 && angle <= 270) {
+            this.Canvas.textAlign = 'center';
+            this.Canvas.textBaseline = 'bottom';
+        }
+        else if (angle > 270 && 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.Data.Name, xText, yText);
+    }
+
+    this.Draw=function()
+    {
+        this.AryIndexCache=[];
+        this.MapData=new Map();
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIndex)) return;
+
+        this.CalculateSize();
+
+        this.DrawBorder();
+
+        this.DrawArea();
+    }
+
+    this.BuildCacheData=function()
+    {
+        this.MapDataCache=new Map();
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+            if (!this.MapDataCache.has(item.Group))
+            {
+                this.MapDataCache.set(item.Group, { MapData:new Map() })
+            }
+           
+            var mpaItem=this.MapDataCache.get(item.Group);
+            mpaItem.MapData.set(item.Name, { Data:item });
+        }
+    }
+
+    this.CalculateSize=function(data)
+    {
+        var border=this.ChartBorder.GetBorder();
+        var pixelRatio=GetDevicePixelRatio();
+        this.TextFont=`${this.TextFontConfig.Size*pixelRatio}px ${ this.TextFontConfig.Name}`;
+        var fontHeight=this.GetFontHeight(this.TextFont,"擎")+1;
+
+        var maxTextWidth=0;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.AryIndex))
+        {
+            for(var i=0;i<this.AryIndex.length;++i)
+            {
+                var item=this.AryIndex[i];
+                if (!item.Name) continue;
+                var textWidth=this.Canvas.measureText(item.Name).width;
+                if (maxTextWidth<textWidth)  maxTextWidth=textWidth;
+            }
+        }
+        
+        var radius=this.Radius*2*pixelRatio;  //半径     
+        this.RectClient={ Width:radius*2, Height:radius*2, Radius:radius };
+        this.RectClient.Right=border.Right+this.Offset.X-maxTextWidth;
+        this.RectClient.Top=border.TopEx+this.Offset.Y+fontHeight;
+        this.RectClient.Left=this.RectClient.Right-this.RectClient.Width;
+        this.RectClient.Bottom=this.RectClient.Top+this.RectClient.Height;
+
+        var ptCenter={X:this.RectClient.Left+this.RectClient.Width/2, Y:this.RectClient.Top+this.RectClient.Height/2};  //中心点
+       
+        var count=Math.max(5,this.AryIndex.length);
+        var averageAngle=360/count;
+        for(var i=0;i<count;++i)
+        {
+            var angle=i*averageAngle+this.StartAngle;
+
+            var indexItem={ Data:null, Index:i, Angle:angle, Radius:radius };
+            if (this.AryIndex && this.AryIndex[i])
+            {
+                indexItem.Data=this.AryIndex[i];
+            }
+
+            this.AryIndexCache.push(indexItem);
+        }
+
+        this.CenterPoint=ptCenter;
+    }
+
+    //空数据
+    this.DrawEmptyData=function()
+    {
+        JSConsole.Chart.Log('[ChartSimpleRadar::DrawEmptyData]')
+    }
+}
+
 //分钟成交量 支持横屏
 function ChartMinuteVolumBar()
 {
@@ -56525,6 +56832,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 +56888,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 +57147,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 +57163,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 +57758,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 +57772,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 +61048,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 +74727,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=
     { 
@@ -74783,6 +75098,20 @@ function JSChartResource()
         Offset:{ X:-5, Y:5 }
     }
 
+    this.ChartSimpleRadar=
+    {
+        TextFont:{ Family:'微软雅黑' , Size:12 },
+        BorderColor:"rgb(169,169,169)",
+        Offset:{ X:-5, Y:5 },
+        TextColor:"rgb(105,105,105)",
+        AryBGColor:['rgba(255,255,255,0.9)', 'rgba(230, 234, 242,0.9)'],
+        AryArea:
+        [ 
+            { Color:"rgba(242,154,118,0.4)", LineColor:"rgb(242,154,118)"}, 
+            { Color:"rgba(121,197,228,0.4)", LineColor:"rgb(92,165,196)"}, 
+        ],
+    }
+
     //手机端tooltip
     this.TooltipPaint = {
         BGColor:'rgba(250,250,250,0.8)',    //背景色
@@ -75833,6 +76162,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;
@@ -76013,6 +76343,7 @@ function JSChartResource()
 
         if (style.ChartSimpleTable) this.SetChartSimpleTable(style.ChartSimpleTable);
         if (style.ChartSimplePie) this.SetChartSimplePie(style.ChartSimplePie);
+        if (style.ChartSimpleRadar) this.SetChartSimpleRadar(style.ChartSimpleRadar);
         
         if (style.DRAWICON) 
         {
@@ -77106,6 +77437,30 @@ function JSChartResource()
         }
     }
 
+    this.SetChartSimpleRadar=function(style)
+    {
+        var dest=this.ChartSimpleRadar;
+        if (style.TextFont)
+        {
+            var item=style.TextFont;
+            if (item.Name) dest.TextFont.Name=item.Name;
+            if (IFrameSplitOperator.IsNumber(item.Size)) dest.TextFont.Size=item.Size;
+        }
+
+        if (style.BorderColor) dest.BorderColor=style.BorderColor;
+        if (style.TextColor) dest.TextColor=style.TextColor;
+
+        if (style.Offset)
+        {
+            var item=style.Offset;
+            if (IFrameSplitOperator.IsNumber(item.X)) dest.Offset.X=item.X;
+            if (IFrameSplitOperator.IsNumber(item.Y)) dest.Offset.Y=item.Y;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(style.AryBGColor)) dest.AryBGColor=style.AryBGColor.slice();
+        if (IFrameSplitOperator.IsNonEmptyArray(style.AryArea)) dest.AryArea=style.AryArea.slice();
+    }
+
 }
 
 var g_JSChartResource=new JSChartResource();
@@ -89872,12 +90227,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 +90251,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 }} );
-
-        if (this.ShareAfterVol==2)  //盘前， 盘后成交量公用坐标
-        {
-            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;
-            }
-        }
+        this.UpdateMinuteUI(data.stock[0], {FunctionName:"RecvUpdateMinuteData"});
 
-        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)
+        if (data.AutoUpdate===false)    //不执行自动更新
         {
-            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 +90333,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 +90372,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 +90399,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 +90412,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 +90427,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 +112629,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;
@@ -112360,6 +112667,48 @@ function JSDraw(errorHandler,symbolData)
 
         return result={ DrawData:{ Data:aryCell, Radius:radius }, DrawType:"DRAW_SIMPLE_PIE" };
     }
+
+    this.RADAR_CELL=function(name, data, max, min)
+    {
+        var cellItem={ Name:name, Max:100, Min:0, Value:null };
+        if (IFrameSplitOperator.IsNumber(data)) 
+        {
+            cellItem.Value=data;
+        }
+        else if (IFrameSplitOperator.IsString(data)) 
+        {
+            cellItem.Value=parseFloat(data);
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(data))
+        {
+            var lastValue=data[data.length-1];
+            if (IFrameSplitOperator.IsNumber(lastValue)) cellItem.Value=lastValue;
+            else if (IFrameSplitOperator.IsString(lastValue)) cellItem.Value=parseFloat(lastValue);
+        }
+
+        if (IFrameSplitOperator.IsNumber(max)) cellItem.Max=max;
+        if (IFrameSplitOperator.IsNumber(min)) cellItem.Min=min;
+
+        return cellItem;
+    }
+
+    this.DRAWRADAR=function(args)
+    {
+        var radius=args[0];
+        var color=args[1];
+
+        var aryIndex=[];
+        var aryData=[];
+        for(var i=2;i<args.length;++i)
+        {
+            var item=args[i];
+
+            aryIndex.push({ Name:item.Name, Max:item.Max, Min:item.Min });
+            aryData.push({ Value:item.Value, Name:item.Name, Group:"Default"});
+        }
+
+        return result={ DrawData:{ Data:aryData, AryIndex:aryIndex, Radius:radius, AryArea:[{ LineColor:color }] }, DrawType:"DRAW_SIMPLE_RADAR" };
+    }
 }
 
 
@@ -112414,7 +112763,7 @@ JSDraw.prototype.IsDrawFunction=function(name)
         'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2","DRAWGBK_DIV",
         "VERTLINE","HORLINE","TIPICON",
         "BUY","SELL","SELLSHORT","BUYSHORT",
-        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE","DRAWPIE",
+        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE","DRAWPIE","DRAWRADAR",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -119303,6 +119652,14 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWPIE(args);
                 node.Out=[];
                 break;
+            //雷达图
+            case "RADAR_CELL":
+                node.Out=this.Draw.RADAR_CELL(args[0],args[1],args[2],args[3]);
+                break;
+            case "DRAWRADAR":
+                node.Draw=this.Draw.DRAWRADAR(args);
+                node.Out=[];
+                break;
 
             default:
                 node.Out=this.Algorithm.CallFunction(funcName, args, node, this.SymbolData);
@@ -122319,6 +122676,35 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleRadar=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartSimpleRadar();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+
+        if (varItem.Draw && varItem.Draw.DrawData)
+        {
+            var drawData=varItem.Draw.DrawData;
+            if (drawData.Data) chart.Data.Data=drawData.Data;
+            if (drawData.AryIndex) chart.AryIndex=drawData.AryIndex;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.Radius)) chart.Radius=drawData.Radius;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+            if (IFrameSplitOperator.IsNonEmptyArray(drawData.AryArea)) chart.AryAreaConfig=drawData.AryArea;
+
+            chart.BuildCacheData();
+        }
+    
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateTradeIcon=function(hqChart,windowIndex,varItem,id)
     {
         var chart=new ChartTradeIcon();
@@ -123194,6 +123580,10 @@ function ScriptIndex(name,script,args,option)
                         break;
                     case "DRAW_SIMPLE_PIE":
                         this.CreateSimplePie(hqChart,windowIndex,item,i);
+                        break;
+                    case "DRAW_SIMPLE_RADAR":
+                        this.CreateSimpleRadar(hqChart,windowIndex,item,i);
+                        break;
                     case "BUY":
                     case "SELL":
                     case "SELLSHORT":
@@ -123546,7 +123936,10 @@ function OverlayScriptIndex(name,script,args,option)
                         break;
                     case "DRAW_SIMPLE_PIE":
                         this.CreateSimplePie(hqChart,windowIndex,item,i);
-
+                        break;
+                    case "DRAW_SIMPLE_RADAR":
+                        this.CreateSimpleRadar(hqChart,windowIndex,item,i);
+                        break;
                     case "KLINE_BG":
                         this.CreateBackgroud(hqChart,windowIndex,item,i);
                         break;
@@ -124614,6 +125007,39 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleRadar=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartSimpleRadar();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        chart.HQChart=hqChart;
+
+        if (varItem.Draw && varItem.Draw.DrawData)
+        {
+            var drawData=varItem.Draw.DrawData;
+            if (drawData.Data) chart.Data.Data=drawData.Data;
+            if (drawData.AryIndex) chart.AryIndex=drawData.AryIndex;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.Radius)) chart.Radius=drawData.Radius;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+            if (IFrameSplitOperator.IsNonEmptyArray(drawData.AryArea)) chart.AryAreaConfig=drawData.AryArea;
+
+            chart.BuildCacheData();
+        }
+    
+        frame.ChartPaint.push(chart);
+    }
+
     this.CreateChartVericaltLine=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
@@ -125827,6 +126253,17 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAW_SIMPLE_RADAR")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;    //{ AryIndex:[ ], Data:[] };
+ 
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -127443,6 +127880,20 @@ function GetBlackStyle()
             BorderColor:"rgb(220,220,220)",
         },
 
+        ChartSimpleRadar:
+        {
+            //TextFont:{ Family:'微软雅黑' , Size:12 },
+            BorderColor:"rgb(230, 230, 230)",
+            //Offset:{ X:-5, Y:5 },
+            TextColor:"rgb(250, 250, 250)",
+            AryBGColor:['rgba(63,61,82,0.9)','rgba(56,55,80,0.9)'],
+            AryArea:
+            [ 
+                { Color:"rgba(242,154,118,0.4)", LineColor:"rgb(242,154,118)"}, 
+                { Color:"rgba(121,197,228,0.4)", LineColor:"rgb(92,165,196)"}, 
+            ],
+        },
+
         ChartDrawVolProfile:
         {
             BGColor:"rgba(244,250,254,0.3)",
@@ -151582,7 +152033,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14312";
+var HQCHART_VERSION="1.1.14329";
 
 function PrintHQChartVersion()
 {