hqchart 1.1.14320 → 1.1.14330

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

@@ -35907,199 +35907,292 @@ function ChartSimpleRadar()
     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.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.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.DrawBorder=function()  //画边框
+    this.CenterPoint={};
+    this.RectClient={ };
+    this.AryIndexCache=[];
+    this.MapDataCache=new Map(); //key=name  value={ Data:[] }
+    this.TextFont;
+
+
+    this.ReloadResource=function(resource)
     {
-        if (this.BorderPoint.length<=0) return;
+        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.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)
+    this.DrawBorder=function()  //画边框
+    {
+        this.Canvas.strokeStyle = this.BorderColor;
+        this.Canvas.font=this.TextFont;
+        for(var i=0;i<this.AryBorder.length;++i)
         {
-            var rate = aryBorder[j];
-            var isFirstDraw=true;
-            for(let i in this.BorderPoint)
+            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.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)
+                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(item.X,item.Y);
-                    isFirstDraw=false;
+                    this.Canvas.moveTo(x,y);
+                    bFirstDraw=false;
                 }
                 else
                 {
-                    this.Canvas.lineTo(item.X,item.Y);
+                    this.Canvas.lineTo(x,y);
                 }
             }
 
             this.Canvas.closePath();
             this.Canvas.stroke();
-            this.Canvas.fillStyle = this.BGColor[j%2==0?0:1];
-            this.Canvas.fill();
+
+            if (IFrameSplitOperator.IsNonEmptyArray(this.AryBGColor))
+            {
+                this.Canvas.fillStyle = this.AryBGColor[i%this.AryBGColor.length];
+                this.Canvas.fill();
+            }
         }
 
         this.Canvas.beginPath();
-        for(let i in this.BorderPoint)
+        for(var i=0;i<this.AryIndexCache.length;++i)
         {
-            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);
+            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(item.X,item.Y);
-            this.DrawText(item);
+            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.DataPoint || this.DataPoint.length<=0) return;
+        if (this.MapDataCache.size<=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 index=0;
+        for(var mapItem of this.MapDataCache)
         {
-            var item=this.DataPoint[i];
-            if (isFirstDraw)
+            var mapData=mapItem[1].MapData;
+            
+            var bFirstDraw=true;
+            var pointCount=0;
+            for(var i=0;i<this.AryIndexCache.length;++i)
             {
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(item.X,item.Y);
-                isFirstDraw=false;
+                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;
+                }
             }
-            else
+
+            if (pointCount>0)
             {
-                this.Canvas.lineTo(item.X,item.Y);
+                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();
+                }
             }
-        }
 
-        this.Canvas.closePath();
-        this.Canvas.fill();
-        this.Canvas.stroke();
+            ++index;
+        }
     }
 
-    this.DrawText=function(item)
+    this.DrawText=function(item, x, y)
     {
-        if (!item.Text) return;
+        if (!item.Data || !item.Data.Name) return;
           
         //JSConsole.Chart.Log(item.Text, item.Angle);
         this.Canvas.fillStyle = this.TitleColor;
-        var xText = item.X, yText = item.Y;
+        var xText = x, yText =y;
+
+        var angle=item.Angle%360;
 
         //显示每个角度的位置
-        if (item.Angle > 0 && item.Angle < 45) {
+        if (angle > 0 && angle < 45) {
             this.Canvas.textAlign = 'left';
             this.Canvas.textBaseline = 'middle';
             xText += 2;
         }
-        else if (item.Angle >= 0 && item.Angle < 90) {
+        else if (angle >= 45 && angle < 90) {
             this.Canvas.textAlign = 'left';
             this.Canvas.textBaseline = 'top';
             xText += 2;
         }
-        else if (item.Angle >= 90 && item.Angle < 135) {
+        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 (item.Angle >= 135 && item.Angle < 180) {
+        else if (angle >= 135 && angle < 180) {
             this.Canvas.textAlign = 'right';
             this.Canvas.textBaseline = 'top';
             xText -= 2;
         }
-        else if (item.Angle >= 180 && item.Angle < 225) {
+        else if (angle >= 180 && angle < 225) {
             this.Canvas.textAlign = 'right';
             this.Canvas.textBaseline = 'middle';
             xText -= 2;
         }
-        else if (item.Angle >= 225 && item.Angle <= 270) {
+        else if (angle >= 225 && angle <= 270) {
             this.Canvas.textAlign = 'center';
             this.Canvas.textBaseline = 'bottom';
         }
-        else if (item.Angle > 270 && item.Angle < 315) {
+        else if (angle > 270 && angle < 315) {
             this.Canvas.textAlign = 'left';
             this.Canvas.textBaseline = 'bottom';
             xText += 2;
         }
-        else {
+        else 
+        {
             this.Canvas.textAlign = 'left';
             this.Canvas.textBaseline = 'middle';
             xText += 2;
         }
 
-        this.Canvas.fillText(item.Text, xText, yText);
+        this.Canvas.fillText(item.Data.Name, 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.AryIndexCache=[];
+        this.MapData=new Map();
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIndex)) return;
+
+        this.CalculateSize();
 
         this.DrawBorder();
+
         this.DrawArea();
     }
 
-    this.CalculatePoints=function(data)
+    this.BuildCacheData=function()
     {
-        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();
+        this.MapDataCache=new Map();
 
-        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)
+        for(var i=0;i<this.Data.Data.length;++i)
         {
-            let ptBorder = { Index: i, Radius: radius, Angle: i * averageAngle + this.StartAngle };
-            let angle = ptBorder.Angle;
+            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;
 
-            if (data && i<data.length)
+        var maxTextWidth=0;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.AryIndex))
+        {
+            for(var i=0;i<this.AryIndex.length;++i)
             {
-                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);
-                }
+                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;
 
-                this.DataPoint.push(ptData);
+            var indexItem={ Data:null, Index:i, Angle:angle, Radius:radius };
+            if (this.AryIndex && this.AryIndex[i])
+            {
+                indexItem.Data=this.AryIndex[i];
             }
 
-            this.BorderPoint.push(ptBorder);
+            this.AryIndexCache.push(indexItem);
         }
 
         this.CenterPoint=ptCenter;
@@ -36108,7 +36201,7 @@ function ChartSimpleRadar()
     //空数据
     this.DrawEmptyData=function()
     {
-        JSConsole.Chart.Log('[ChartPie::DrawEmptyData]')
+        JSConsole.Chart.Log('[ChartSimpleRadar::DrawEmptyData]')
     }
 }
 
@@ -75005,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)',    //背景色
@@ -76236,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) 
         {
@@ -77329,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();
@@ -112535,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" };
+    }
 }
 
 
@@ -112589,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;
 
@@ -119478,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);
@@ -122494,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();
@@ -123369,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":
@@ -123721,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;
@@ -124789,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;
@@ -126002,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);  //外部挂接
@@ -127618,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)",
@@ -151757,7 +152033,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14319";
+var HQCHART_VERSION="1.1.14329";
 
 function PrintHQChartVersion()
 {