hqchart 1.1.14320 → 1.1.14336

package/src/jscommon/umychart.js

@@ -2846,6 +2846,9 @@ var JSCHART_MENU_ID=
     CMD_MODIFY_INDEX_PARAM:45,          //指标删除修改  [windowIndex, ]
     CMD_MODIFY_OVERLAY_INDEX_PARAM:46,  //叠加指标修改  [windowIndex, ID ]
 
+    CMD_LOCK_CROSSCURSOR:47,              //锁十字光标
+    CMD_UNLOCK_CROSSCURSOR:48,                  //解锁十字光标
+
 
     CMD_REPORT_CHANGE_BLOCK_ID:100,      //报价列表 切换板块ID
     CMD_REPORT_COLUMN_SORT_ID:101,       //报价列表 表头排序  Arg[列序号, 排序方向]
@@ -10187,6 +10190,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var sendData={ e:null, WindowIndex:param, Type:2, Identify:aryArgs[1] };
                 this.ShowModifyIndexParamDialog(sendData);
                 break;
+            case JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR:
+                if (srcParam) this.LockCorssCursor(srcParam);
+                break;
+            case JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR:
+                if (this.IsLockCorssCursor()) this.UnlockCorssCursor({ Draw:true })
+                break;
         }
     }
 
@@ -10273,13 +10282,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!this.JSPopMenu) return;
         var x=data.X, y=data.Y;
         var frameID=data.FrameID;
-        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        var menuData={ Menu:this.GetRightMenuData(frameID, data), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
         menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);
         if (event && event.Callback)
         {
-            var sendData={ MenuData:menuData, FrameID:frameID };
+            var sendData={ MenuData:menuData, FrameID:frameID, Data:data };
             event.Callback(event, sendData, this);
         }
 
@@ -20696,9 +20705,9 @@ function HQTradeFrame()
         return null;
     }
 
-    this.GetXFromIndex=function(index)
+    this.GetXFromIndex=function(index,isLimit)
     {
-        return this.SubFrame[0].Frame.GetXFromIndex(index);
+        return this.SubFrame[0].Frame.GetXFromIndex(index,isLimit);
     }
 
     this.GetYFromData=function(value)
@@ -23698,15 +23707,15 @@ function ChartData()
     this.FindDataIndexByDateTime=function(aryDateTime) //aryDateTime=[ { Date:, Time:, Index:-1 }, ......]
     {
         var findCount=0;
-        for(var i in aryDateTime)
+        for(var i=0;i<aryDateTime.length;++i)
         {
             aryDateTime[i].Index=-1;
         }
 
-        for(var i in this.Data)
+        for(var i=0;i<this.Data.length;++i)
         {
             var item=this.Data[i];
-            for(var j in aryDateTime)
+            for(var j=0;j<aryDateTime.length;++j)
             {
                 var findItem=aryDateTime[j];
                 if (findItem.Index>=0) continue;
@@ -23715,7 +23724,7 @@ function ChartData()
                 {
                     if (findItem.Date==item.Date && findItem.Time==item.Time)
                     {
-                        findItem.Index=parseInt(i);
+                        findItem.Index=i;
                         ++findCount;
                         break;
                     }
@@ -23724,7 +23733,7 @@ function ChartData()
                 {
                     if (findItem.Date==item.Date)
                     {
-                        findItem.Index=parseInt(i);
+                        findItem.Index=i;
                         ++findCount;
                         break;
                     }
@@ -24348,6 +24357,30 @@ ChartData.GetPeriodName=function(period)
 }
 
 
+ChartData.GetKValue=function(kItem, valueName)
+{
+    if (!kItem) return null;
+
+    switch(valueName)
+    {
+        case "HIGH":
+        case "H":
+            return kItem.High;
+        case "L":
+        case "LOW":
+            return kItem.Low;
+        case "C":
+        case "CLOSE":
+            return kItem.Close;
+        case "O":
+        case "OPEN":
+            return KItem.Open;
+        default:
+            return null;
+    }
+}
+
+
 
 function TooltipData()              //提示信息
 {
@@ -31938,199 +31971,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;
@@ -32139,7 +32265,7 @@ function ChartSimpleRadar()
     //空数据
     this.DrawEmptyData=function()
     {
-        JSConsole.Chart.Log('[ChartPie::DrawEmptyData]')
+        JSConsole.Chart.Log('[ChartSimpleRadar::DrawEmptyData]')
     }
 }
 
@@ -40795,98 +40921,219 @@ function ChartMultiPoint()
     delete this.newMethod;
     
     this.ClassName="ChartMultiPoint";
-    this.PointGroup=[];   // [ {Point:[ {Index, Value }, ], Color:  }, ] 
+    this.PointGroup=[];   // [ {Point:[ {Date, Time, Value }, ], Color:  }, ] 
 
 
     this.IsHScreen=false;
     this.LineWidth=1;
     this.PointRadius=5;
 
+    this.MapCache=null; //key=date/date-time  value={ Data:[] }
+    this.GetKValue=ChartData.GetKValue;
+
+    this.BuildKey=function(item)
+    {
+        if (IFrameSplitOperator.IsNumber(item.Time)) return `${item.Date}-${item.Time}`;
+        else return item.Date;
+    }
+
+    this.GetItem=function(kItem)
+    {
+        if (!this.MapCache || this.MapCache.size<=0) return null;
+
+        var key=this.BuildKey(kItem);
+        if (!this.MapCache.has(key)) return null;
+
+        return this.MapCache.get(key);
+    }
+
+    this.BuildCacheData=function()
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.PointGroup)) return;
+
+        for(var i=0; i<this.PointGroup.length; ++i)
+        {
+            var groupItem=this.PointGroup[i];
+            if (!groupItem || !IFrameSplitOperator.IsNonEmptyArray(groupItem.Point)) continue;
+
+            var clrConfig= { Color:groupItem.Color, BGColor:groupItem.BGColor, LineWidth:this.LineWidth, Radius:this.PointRadius, Name:groupItem.Name };
+            if (IFrameSplitOperator.IsNumber(groupItem.PointRadius)) clrConfig.Radius=groupItem.PointRadius;
+
+            for(var j=0; j<groupItem.Point.length; ++j)
+            {
+                var point=groupItem.Point[j];
+                var key=this.BuildKey(point);
+                
+                var item={ Data:point, ColorConfig:clrConfig }
+                if (mapData.has(key))
+                {
+                    var mapItem=mapData.get(key);
+                    mapItem.Data.push(item);
+                }
+                else
+                {
+                    mapData.set(key,{ Data:[item] });
+                }
+            }
+        }
+    }
+
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-        if (!this.Data || this.Data.length<=0) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return; //k线数据
         if (!IFrameSplitOperator.IsNonEmptyArray(this.PointGroup)) return;
+        if (!this.MapCache || this.MapCache.size<=0) return;
 
         this.IsHScreen=(this.ChartFrame.IsHScreen===true);
         var xPointCount=this.ChartFrame.XPointCount;
-        var offset=this.Data.DataOffset;
-        var pixel=GetDevicePixelRatio();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var isMinute=this.IsMinuteFrame();
+        
+        var border=this.GetBorder();
+        if (this.IsHScreen)
+        {
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.BottomEx;
+            var chartLeft=border.TopEx;
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+            var chartLeft=border.LeftEx;
+        }
+
+        //计算所有的点位置
+        var mapPoint=new Map();
+        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];
+            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;
+            }
+
+            this.CalculateItem(mapItem, kItem, x, mapPoint);
+        }
+
+        if (mapPoint.size<=0) return;
 
         this.Canvas.save();
         this.ClipClient(this.IsHScreen);
-        
-        for(var i=0; i<this.PointGroup.length; ++i)
+
+        this.DrawAllPoint(mapPoint);
+
+        this.Canvas.restore();
+    }
+
+    this.CalculateItem=function(groupItem, kItem, x, mapPoint)
+    {
+        for(var i=0; i<groupItem.Data.length; ++i)
         {
-            var item=this.PointGroup[i];
-            var color=item.Color;
-            var bgColor=item.BGColor;
-            var lineWidth=this.LineWidth;
-            var radius=this.PointRadius;
-            if (IFrameSplitOperator.IsNumber(item.LineWidth)) lineWidth=item.LineWidth;
-            if (IFrameSplitOperator.IsNumber(item.PointRadius)) radius=item.PointRadius;
+            var item=groupItem.Data[i];
+            var value=item.Data.Value;
+            if (IFrameSplitOperator.IsString(item.Data.Value)) value=this.GetKValue(kItem,item.Data.Value);
+            if (!IFrameSplitOperator.IsNumber(value)) continue;
+
+            var y=this.ChartFrame.GetYFromData(value,false);
+
+            var strConfig=JSON.stringify(item.ColorConfig);
+            if (!mapPoint.has(strConfig)) mapPoint.set(strConfig, { AryPoint:[]});
+            var mapItem=mapPoint.get(strConfig);
+
+            mapItem.AryPoint.push({ X:x, Y:y, Data:item });
+        }
+    }
+
+    this.DrawAllPoint=function(mapPoint)
+    {
+        var pixelRatio=GetDevicePixelRatio();
+
+        for(var mapItem of mapPoint)
+        {
+            var aryPoint=mapItem[1].AryPoint;
+            if (!IFrameSplitOperator.IsNonEmptyArray(aryPoint)) continue;
+            var config=null;
             var path=new Path2D();
             var count=0;
-
-            for(var j=0; j<item.Point.length; ++j)
+            for(var i=0;i<aryPoint.length;++i)
             {
-                var point=item.Point[j];
-                if (!IFrameSplitOperator.IsNumber(point.Index)) continue;
-
-                var index=point.Index-offset;
-                if (index>=0 && index<xPointCount)
-                {
-                    var x=this.ChartFrame.GetXFromIndex(index);
-                    var y=this.ChartFrame.GetYFromData(point.Value, false);
+                var item=aryPoint[i];
+                if (!config) config=item.Data.ColorConfig;
 
-                    var pointPath = new Path2D();
-                    if (this.IsHScreen) 
-                        pointPath.arc(y,x,radius*pixel,0,360,false);
-                    else
-                        pointPath.arc(x,y,radius*pixel,0,360,false);
+                var pointPath = new Path2D();
+                if (this.IsHScreen) 
+                    pointPath.arc(item.Y,item.X,config.Radius*pixelRatio,0,360,false);
+                else
+                    pointPath.arc(item.X,item.Y,config.Radius**pixelRatio,0,360,false);
 
-                    path.addPath(pointPath);
-                    ++count;
-                }
+                path.addPath(pointPath);
+                ++count;
             }
 
-            if (count>0 && (bgColor || color))
+            if (count>0 && config)
             {
-                this.Canvas.lineWidth=lineWidth*pixel;
-                this.Canvas.fillStyle=bgColor;      //背景填充颜色
-                this.Canvas.strokeStyle=color;
+                if (config.BGColor) 
+                {
+                    this.Canvas.fillStyle=config.BGColor;      //背景填充颜色
+                    this.Canvas.fill(path);
+                }
 
-                if (bgColor) this.Canvas.fill(path);
-                if (color) this.Canvas.stroke(path);
+                if (config.Color) 
+                {
+                    this.Canvas.lineWidth=config.LineWidth*pixelRatio;
+                    this.Canvas.strokeStyle=config.Color;
+                    this.Canvas.stroke(path);
+                }
             }
-                
         }
-
-        this.Canvas.restore();
     }
 
     this.GetMaxMin=function()
     {
         var range={ Min:null, Max:null };
+        if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return range;
+        if (!this.MapCache || this.MapCache.size<=0) return;
         var xPointCount=this.ChartFrame.XPointCount;
-        var start=this.Data.DataOffset;
-        var end=start+xPointCount;
 
-        for(var i=0; i<this.PointGroup.length; ++i)
+        for(var i=this.Data.DataOffset,j=0, k=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var item=this.PointGroup[i];
-            if (!IFrameSplitOperator.IsNonEmptyArray(item.Point)) continue;
+            var kItem=this.Data.Data[i];
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+            var mapItem=this.MapCache.get(key);
+            if (!IFrameSplitOperator.IsNonEmptyArray(mapItem.Data)) continue;
 
-            for(var j=0; j<item.Point.length; ++j)
+            for(k=0;k<mapItem.Data.length;++k)
             {
-                var point=item.Point[j];
-                if (point.Index>=start && point.Index<end)
-                {
-                    if (range.Max==null) range.Max=point.Value;
-                    else if (range.Max<point.Value) range.Max=point.Value;
-                    if (range.Min==null) range.Min=point.Value;
-                    else if (range.Min>point.Value) range.Min=point.Value;
-                }
+                var item=mapItem.Data[k];
+                var value=item.Data.Value;
+                if (IFrameSplitOperator.IsString(item.Data.Value)) value=this.GetKValue(kItem,item.Data.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;
             }
         }
 
@@ -41153,6 +41400,8 @@ function ChartMultiSVGIconV2()
     this.IconRect=[];   //0=序号,1=区域
 
     this.MapCache=null; //key=date/date-time  value={ Data:[] }
+    this.GetKValue=ChartData.GetKValue;
+
 
     this.BuildKey=function(item)
     {
@@ -41267,28 +41516,7 @@ function ChartMultiSVGIconV2()
 
         this.Canvas.restore();
     }
-
-    this.GetKValue=function(kItem, valueName)
-    {
-        switch(valueName)
-        {
-            case "HIGH":
-            case "H":
-                return kItem.High;
-            case "L":
-            case "LOW":
-                return kItem.Low;
-            case "C":
-            case "CLOSE":
-                return kItem.Close;
-            case "O":
-            case "OPEN":
-                return KItem.Open;
-            default:
-                return null;
-        }
-    }
-
+    
     this.DrawItem=function(groupItem, kItem, x, drawInfo)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(groupItem.Data)) return;
@@ -57244,24 +57472,29 @@ function DynamicChartTitlePainting()
 
     this.ForamtMultiPointTitle=function(dataIndex, dataInfo)
     {
-        if (!IFrameSplitOperator.IsNonEmptyArray(dataInfo.PointGroup)) return null;
+        if (!dataInfo.GetItemCallback) return null;
+        if (!dataInfo.Data || !IFrameSplitOperator.IsNonEmptyArray(dataInfo.Data.Data)) return null;
+        var kItem=dataInfo.Data.Data[dataIndex];
+        if (!kItem) return null;
+
+        var group=dataInfo.GetItemCallback(kItem);
+        if (!group || !IFrameSplitOperator.IsNonEmptyArray(group.Data)) return null;
 
         var aryText=[];
-        for(var i=0;i<dataInfo.PointGroup.length;++i)
+        for(var i=0;i<group.Data.length;++i)
         {
-            var groupItem=dataInfo.PointGroup[i];
-            for(var j=0;j<groupItem.Point.length;++j)
-            {
-                var item=groupItem.Point[j];
-                if (item.Index==dataIndex)
-                {
-                    var item={ Text:item.Value.toFixed(2)};
-                    if (aryText.length==0) item.Name=dataInfo.Name;
-                    item.Color=groupItem.BGColor;
-                    aryText.push(item);
-                    break;
-                }
-            }
+            var item=group.Data[i];
+            var config=item.ColorConfig;
+
+            var color=null;
+            if (config.BGColor) color=config.BGColor;
+            else if (config.Color) color=config.Color;
+
+            if (config.Name) aryText.push({ Text:`${config.Name}:`, Color:color });
+
+            var value=item.Data.Value;
+            if (IFrameSplitOperator.IsString(item.Data.Value))  value=ChartData.GetKValue(kItem, item.Data.Value);
+            aryText.push({ Text:this.FormatValue(value, dataInfo), Color:color});
         }
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryText)) return null;
@@ -58032,6 +58265,11 @@ function DynamicChartTitlePainting()
                         aryText=this.FromatStackedBarTitle(value, item);
                         if (!aryText) continue;
                     }
+                    else if (item.DataType=="ChartMultiPoint")
+                    {
+                        aryText=this.ForamtMultiPointTitle(dataIndex, item);
+                        if (!aryText) continue;
+                    }
                     else
                     {
                         valueText=this.FormatValue(value,item);
@@ -71036,6 +71274,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)',    //背景色
@@ -72267,6 +72519,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) 
         {
@@ -73360,6 +73613,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();
@@ -79973,18 +80250,18 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     {
         var pixelTatio = GetDevicePixelRatio(); //x,y 需要乘以放大倍速
         var frameId=this.Frame.PtInFrame(x*pixelTatio,y*pixelTatio);
-        this.PopupRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId}, e);
+        this.PopupRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId, CursorIndex:this.CursorIndex, Point:{ X:x*pixelTatio, Y:y*pixelTatio}}, e);
         
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CONTEXT_MENU);
         if (event)
         {
-            var data={ X:x, Y:y, Event:e, FrameID:frameId };
+            var data={ X:x, Y:y, Event:e, FrameID:frameId, Point:{ X:x*pixelTatio, Y:y*pixelTatio}, CursorIndex:this.CursorIndex, };
             event.Callback(event,data,this);
         }
     }
 
     //右键菜单数据
-    this.GetRightMenuData=function(frameID)
+    this.GetRightMenuData=function(frameID, option)
     {
         var windowCount=this.Frame.SubFrame.length; //窗口个数
         var klineChart=this.ChartPaint[0];
@@ -80027,6 +80304,17 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var bPopMinuteChart=false;
         if (this.PopMinuteChart) bPopMinuteChart=true;
 
+        var kItem=null;
+        if (frameID>=0 && option && IFrameSplitOperator.IsNumber(option.CursorIndex))
+        {
+            var kData=this.GetKData();
+            if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
+            {
+                var dataIndex=kData.DataOffset+option.CursorIndex;
+                if (dataIndex>=0 && dataIndex<kData.Data.length) kItem=kData.Data[dataIndex];
+            }
+        }
+
         var aryMenu=
         [
             { 
@@ -80309,6 +80597,17 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     }
                 }
             }
+            else if (item.Name=="其他设置")
+            {
+                if (kItem)
+                {
+                    var bLocked=this.IsLockCorssCursor();
+                    if (bLocked)
+                        item.SubMenu.push({ Name:"锁十字光标", Data:{ ID: JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR }, Checked:bLocked });
+                    else  
+                        item.SubMenu.push({ Name:"锁十字光标", Data:{ ID: JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR, Args:[{ KItem:{Date:kItem.Date, Time:kItem.Time}, Draw:true }] }, Checked:bLocked });
+                }
+            }
         }
 
         return aryMenu;
@@ -81912,19 +82211,36 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (option && option.Draw) this.Draw();
     }
 
+    //option={ KItem:{ Date:, Time:}}
     this.LockCorssCursor=function(option)
     {
-        if (this.CursorIndex<0) return false;
-        var kData=this.GetKData();
-        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+        if (option && option.KItem) //指定日期时间
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
 
-        var dataIndex=kData.DataOffset+parseInt(this.CursorIndex.toFixed(0));
-        var kItem=kData.Data[dataIndex];
-        if (!kItem) return false;
+            var kItem={ Date:option.KItem.Date, Time:option.KItem.Time, Index:-1};
+            kData.FindDataIndexByDateTime([kItem]);
+            if (kItem.Index<0) return false;
 
-        var xItem=this.GlobalOption.LockCorssCursor.X;
-        xItem.KLine={ DataIndex:dataIndex, Date:kItem.Date, Time:kItem.Time };
-        xItem.Enable=true;
+            var xItem=this.GlobalOption.LockCorssCursor.X;
+            xItem.KLine={ DataIndex:kItem.Index, Date:kItem.Date, Time:kItem.Time };
+            xItem.Enable=true;
+        }
+        else
+        {
+            if (this.CursorIndex<0) return false;
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+    
+            var dataIndex=kData.DataOffset+parseInt(this.CursorIndex.toFixed(0));
+            var kItem=kData.Data[dataIndex];
+            if (!kItem) return false;
+    
+            var xItem=this.GlobalOption.LockCorssCursor.X;
+            xItem.KLine={ DataIndex:dataIndex, Date:kItem.Date, Time:kItem.Time };
+            xItem.Enable=true;
+        }
 
         if (option && option.Draw) this.Draw();
         return true;
@@ -81947,7 +82263,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return position;
 
             position.CursorIndex=xItem.KLine.DataIndex-kData.DataOffset;
-            position.LastPoint.X=this.Frame.GetXFromIndex(position.CursorIndex);
+            position.LastPoint.X=this.Frame.GetXFromIndex(position.CursorIndex, false);
 
             var border=this.Frame.ChartBorder.GetBorder();
             if (position.LastPoint.Y<border.Top || position.LastPoint.Y>border.Bottom)  //超出图形框子, 调整为收盘价
@@ -84020,18 +84336,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         var pixelTatio = GetDevicePixelRatio(); //x,y 需要乘以放大倍速
         var frameId=this.Frame.PtInFrame(x*pixelTatio,y*pixelTatio);
-        this.PopupRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId}, e);
+        this.PopupRightMenuV2({X:e.offsetX, Y:e.offsetY, FrameID:frameId, CursorIndex:this.CursorIndex, Point:{ X:x*pixelTatio, Y:y*pixelTatio} }, e);
         
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CONTEXT_MENU);
         if (event)
         {
-            var data={ X:x, Y:y, Event:e, FrameID:frameId };
+            var data={ X:x, Y:y, Event:e, FrameID:frameId, CursorIndex:this.CursorIndex, Point:{ X:x*pixelTatio, Y:y*pixelTatio} };
             event.Callback(event,data,this);
         }
     }
 
     //右键菜单数据
-    this.GetRightMenuData=function(frameID)
+    this.GetRightMenuData=function(frameID, option)
     {
         var windowCount=this.Frame.SubFrame.length; //窗口个数
 
@@ -84158,11 +84474,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
 
         
-        //删除菜单
+        
         for(var i=0;i<aryMenu.length;++i)
         {
             var item=aryMenu[i];
-            if (item.Name=="叠加品种")
+            if (item.Name=="叠加品种")  //删除菜单
             {
                 for(var j=0;j<item.SubMenu.length;++j)
                 {
@@ -84174,6 +84490,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                 }
             }
+            else if (item.Name=="其他设置")
+            {
+
+            }
         }
 
         return aryMenu;