hqchart 1.1.14320 → 1.1.14336

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14320",
+  "version": "1.1.14336",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57376,6 +57376,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAW_SIMPLE_TABLE(data, callback);
     else if (request.Data.indexname=="API_DRAW_SIMPLE_PIE")
         HQData.APIIndex_DRAW_SIMPLE_PIE(data, callback);
+    else if (request.Data.indexname=="API_DRAW_SIMPLE_RADAR")
+        HQData.APIIndex_DRAW_SIMPLE_RADAR(data, callback);
     
 }
 
@@ -57402,13 +57404,14 @@ HQData.APIIndex_MULTI_POINT=function(data, callback)
         BGColor:"rgb(255,215,0)",
         PointRadius:10,
         LineWidth:2,
+        Name:"最低价",
         Point:[ ] 
     };
 
     for(var i=kData.Data.length-1, j=0; i>=0 && j<6; i-=5, ++j)
     {
         var item=kData.Data[i];
-        point.Point.push({Date:item.Date, Time:item.Time, Value:item.Low});
+        point.Point.push({Date:item.Date, Time:item.Time, Value:"LOW"});
     }
 
     pointData.Draw.DrawData.push(point);
@@ -57420,6 +57423,7 @@ HQData.APIIndex_MULTI_POINT=function(data, callback)
         BGColor:"rgb(30,144,255)",
         PointRadius:5,
         LineWidth:1,
+        Name:"中间价",
         Point:[ ] 
     };
 
@@ -57902,3 +57906,73 @@ HQData.APIIndex_DRAW_SIMPLE_PIE=function(data, callback)
 }
 
 
+HQData.APIIndex_DRAW_SIMPLE_RADAR=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_RADAR', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_RADAR', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(110,110,110)",
+                //TextColor:"rgb(0,191,255)",
+                Data:
+                [
+                    { Value:10, Name:"1月", Group:"组1"},
+                    { Value:70, Name:"2月", Group:"组1"},
+                    { Value:80, Name:"3月", Group:"组1"},
+                    { Value:10, Name:"4月", Group:"组1"},
+                    { Value:40, Name:"5月", Group:"组1"},
+                    { Value:60, Name:"6月", Group:"组1"},
+                    { Value:66, Name:"7月", Group:"组1"},
+                    { Value:69, Name:"8月", Group:"组1"},
+                    { Value:80, Name:"9月", Group:"组1"},
+                    { Value:30, Name:"10月", Group:"组1"},
+                    { Value:20, Name:"11月", Group:"组1"},
+                    { Value:68, Name:"12月", Group:"组1"},
+                ],
+
+                AryIndex:
+                [
+                    { Name:"1月" },
+                    { Name:"2月" },
+                    { Name:"3月" },
+                    { Name:"4月" },
+                    { Name:"5月" },
+                    { Name:"6月" },
+                    { Name:"7月" },
+                    { Name:"8月" },
+                    { Name:"9月" },
+                    { Name:"10月" },
+                    { Name:"11月" },
+                    { Name:"12月" },
+                ],
+
+                //TextFont:{ Size:16, Name:"微软雅黑"},
+                //XOffset:-10,
+                //YOffset:-15,
+                Radius:50,
+            }
+        } 
+    };
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime() , outvar:[tableData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_DRAW_SIMPLE_RADAR] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -11580,6 +11580,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" };
+    }
 }
 
 
@@ -11634,7 +11676,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;
 
@@ -18523,6 +18565,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);
@@ -21539,6 +21589,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();
@@ -21913,16 +21992,18 @@ function ScriptIndex(name,script,args,option)
         chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
         chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.ChartPaint[0].Data;      //绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
         if (varItem.Draw.Name) chart.Name=varItem.Draw.Name;
+        chart.BuildCacheData();
+
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
 
-         var titleIndex=windowIndex+1;
+        var titleIndex=windowIndex+1;
         var titleData=new DynamicTitleData(chart.Data,chart.Name, null);
         titleData.DataType="ChartMultiPoint";
-        titleData.PointGroup=chart.PointGroup;
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
         hqChart.TitlePaint[titleIndex].Data[i]=titleData;
     }
 
@@ -22414,6 +22495,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":
@@ -22766,7 +22851,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;
@@ -23630,7 +23718,7 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
-    this.CreateMultiPoint=function(hqChart,windowIndex,varItem,i)
+    this.CreateMultiPoint=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
         var frame=overlayIndex.Frame;
@@ -23643,6 +23731,17 @@ function OverlayScriptIndex(name,script,args,option)
 
         chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
+        chart.BuildCacheData();
+
+        var titleIndex=windowIndex+1;
+        var titlePaint=hqChart.TitlePaint[titleIndex];
+        var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);
+        titleData.DataType="ChartMultiPoint";
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
+        titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
+
+        this.SetChartIndexName(chart);
+        
         frame.ChartPaint.push(chart);
     }
 
@@ -23834,6 +23933,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;
@@ -24806,14 +24938,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);
-                    if (IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData))
-                    {
-                        for(var k=0; k<drawItem.DrawData.length; ++k)
-                        {
-                            this.GetKLineData(drawItem.DrawData[k].Point, hqChart);
-                        }
-                    }
+                    drawItem.DrawData=draw.DrawData;
                     
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
@@ -25047,6 +25172,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);  //外部挂接
@@ -25349,14 +25485,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);
-                    if (IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData))
-                    {
-                        for(var k=0; k<drawItem.DrawData.length; ++k)
-                        {
-                            this.GetKLineData(drawItem.DrawData[k].Point, hqChart);
-                        }
-                    }
+                    drawItem.DrawData=draw.DrawData;
                     
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);