hqchart 1.1.14299 → 1.1.14307

package/package.json

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

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55745,7 +55745,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
-        stockItem.minute.length=50;
+        //stockItem.minute.length=50;
 
         var hqchartData={code:0, stock:[stockItem] };
     
@@ -57374,6 +57374,9 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAWTEXT_LINE(data, callback);
     else if (request.Data.indexname=="API_DRAW_SIMPLE_TABLE")
         HQData.APIIndex_DRAW_SIMPLE_TABLE(data, callback);
+    else if (request.Data.indexname=="API_DRAW_SIMPLE_PIE")
+        HQData.APIIndex_DRAW_SIMPLE_PIE(data, callback);
+    
 }
 
 
@@ -57778,8 +57781,19 @@ HQData.APIIndex_DRAWTEXT_LINE=function(data, callback)
             DrawData: 
             {
                 Price:price,
-                Text:{ Title:`价格:${price.toFixed(2)}`, Color:"rgb(255, 165, 0)" }, 
-                Line:{ Type:1, Color:"rgb(200,200,0)" },    //Type 0=不画 1=直线 2=虚线
+                Text:
+                { 
+                    Title:`价格:${price.toFixed(2)}`, 
+                    Color:"rgb(255, 165, 0)",
+                }, 
+
+                Line:
+                { 
+                    Type:1,  //Type 0=不画 1=直线 2=虚线
+                    //LineDash:[10,10],
+                    Color:"rgb(200,200,0)", 
+                    //Width:1,
+                },   
             }
         } 
     };
@@ -57841,3 +57855,50 @@ HQData.APIIndex_DRAW_SIMPLE_TABLE=function(data, callback)
 }
 
 
+HQData.APIIndex_DRAW_SIMPLE_PIE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_PIE', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_PIE', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(110,110,110)",
+                //TextColor:"rgb(0,191,255)",
+                Data:
+                [
+                    { Value:10, Text:"数据1:10", Color:"rgba(255,182,193,0.8)", TextColor:"rgb(250,250,250)", LineColor:"rgb(255,182,193)"},
+                    { Value:70, Text:"数据2:70", Color:"rgba(255,0,255,0.8)",TextColor:"rgb(250,250,250)", LineColor:"rgb(255,0,255)"},
+                    { Value:110, Text:"数据3:110", Color:"rgba(72,61,139,0.8)",TextColor:"rgb(250,250,250)", LineColor:"rgb(72,61,139)"},
+                    { Value:210, Text:"数据4:210", Color:"rgba(0,191,255,0.8)",TextColor:"rgb(250,250,250)", LineColor:"rgb(0,191,255)"},
+                    { Value:310, Text:"数据5:310", Color:"rgba(255,140,0,0.8)",TextColor:"rgb(250,250,250)", LineColor:"rgb(255,140,0)"},
+                ],
+
+                //TextFont:{ Size:16, Name:"微软雅黑"},
+                //XOffset:-10,
+                //YOffset:-15,
+                Radius:80,
+            }
+        } 
+    };
+
+    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_PIE] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -11540,6 +11540,30 @@ function JSDraw(errorHandler,symbolData)
 
         return result={ DrawData:{ TableData:tableData }, DrawType:'DRAW_SIMPLE_TABLE' };
     }
+
+    //饼图
+    this.PIE_CELL=function(value, color, text, textColor, lineColor)
+    {
+        var cellItem={ Value:value, Color:color };
+        if (text) cellItem.Text=text;
+        if (textColor) cellItem.TextColor=textColor;
+        if (lineColor) cellItem.LineColor=lineColor;
+
+        return cellItem
+    }
+
+    //0=Radius半径 
+    this.DRAWPIE=function(aryData)
+    {
+        var radius=aryData[0];
+        var aryCell=[];
+        for(var i=1;i<aryData.length;++i)
+        {
+            aryCell.push(aryData[i]);
+        }
+
+        return result={ DrawData:{ Data:aryCell, Radius:radius }, DrawType:"DRAW_SIMPLE_PIE" };
+    }
 }
 
 
@@ -11594,7 +11618,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",
+        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE","DRAWPIE",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -18475,6 +18499,14 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWTABLE(args);
                 node.Out=[];
                 break;
+            //饼图
+            case "PIE_CELL":
+                node.Out=this.Draw.PIE_CELL(args[0],args[1],args[2],args[3],args[4]);
+                break;
+            case "DRAWPIE":
+                node.Draw=this.Draw.DRAWPIE(args);
+                node.Out=[];
+                break;
 
             default:
                 node.Out=this.Algorithm.CallFunction(funcName, args, node, this.SymbolData);
@@ -21468,6 +21500,29 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateSimplePie=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartSimplePie();
+        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.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.Radius)) chart.Radius=drawData.Radius;
+        }
+
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateTradeIcon=function(hqChart,windowIndex,varItem,id)
     {
         var chart=new ChartTradeIcon();
@@ -21674,11 +21729,12 @@ function ScriptIndex(name,script,args,option)
             for(var j=0;j<drawData.length;++j)
             {
                 var item=drawData[j];
+                var kItem=chart.Data.Data[j];
                 if (!IFrameSplitOperator.IsNumber(item)) continue;
 
                 var svgItem=
                 { 
-                    Index:j, Value:item, 
+                    Value:item, Date:kItem.Date, Time:kItem.Time,
                     SVG:{ Symbol:varItem.Draw.Icon.Symbol, Size:svgSize, Color:svgColor, YOffset:svgYOffset, VAlign:svgVAlign }
                 };
 
@@ -21698,6 +21754,7 @@ function ScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         hqChart.ChartPaint.push(chart);
     }
 
@@ -21921,6 +21978,8 @@ function ScriptIndex(name,script,args,option)
         chart.Family=varItem.Draw.DrawData.Family;
         chart.TextFont=varItem.Draw.DrawData.TextFont;
         chart.Texts= varItem.Draw.DrawData.Data;
+        chart.BuildCacheData();
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -22336,6 +22395,8 @@ function ScriptIndex(name,script,args,option)
                     case "DRAW_SIMPLE_TABLE":
                         this.CreateSimpleTable(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAW_SIMPLE_PIE":
+                        this.CreateSimplePie(hqChart,windowIndex,item,i);
                     case "BUY":
                     case "SELL":
                     case "SELLSHORT":
@@ -22686,6 +22747,8 @@ function OverlayScriptIndex(name,script,args,option)
                     case "DRAW_SIMPLE_TABLE":
                         this.CreateSimpleTable(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAW_SIMPLE_PIE":
+                        this.CreateSimplePie(hqChart,windowIndex,item,i);
 
                     case "KLINE_BG":
                         this.CreateBackgroud(hqChart,windowIndex,item,i);
@@ -23437,11 +23500,12 @@ function OverlayScriptIndex(name,script,args,option)
             for(var j=0;j<drawData.length;++j)
             {
                 var item=drawData[j];
+                var kItem=chart.Data.Data[j];
                 if (!IFrameSplitOperator.IsNumber(item)) continue;
 
                 var svgItem=
                 { 
-                    Index:j, Value:item, 
+                    Value:item, Date:kItem.Date, Time:kItem.Time,
                     SVG:{ Symbol:varItem.Draw.Icon.Symbol, Size:svgSize, Color:svgColor, YOffset:svgYOffset, VAlign:svgVAlign }
                 };
 
@@ -23461,6 +23525,7 @@ function OverlayScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         frame.ChartPaint.push(chart);
     }
 
@@ -23672,7 +23737,8 @@ function OverlayScriptIndex(name,script,args,option)
         if (varItem.Draw.AutoPosition) chart.AutoPosition=varItem.Draw.AutoPosition;
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
-        
+
+        chart.BuildCacheData();
         this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
@@ -23723,6 +23789,33 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateSimplePie=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartSimplePie();
+        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.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.Radius)) chart.Radius=drawData.Radius;
+        }
+
+        frame.ChartPaint.push(chart);
+    }
+
     this.CreateChartVericaltLine=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
@@ -24784,8 +24877,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
                     if (draw.AutoPosition) drawItem.AutoPosition=draw.AutoPosition;
-                    drawItem.DrawData={ Data:this.FittingMultiText(draw.Data,date,time,hqChart), Family:draw.Family, TextFont:draw.TextFont, EnableTooltip:draw.EnableTooltip, IsDrawFirst:draw.IsDrawFirst };
-                    this.GetKLineData(drawItem.DrawData.Data, hqChart);
+                    drawItem.DrawData={ Data:draw.Data, Family:draw.Family, TextFont:draw.TextFont, EnableTooltip:draw.EnableTooltip, IsDrawFirst:draw.IsDrawFirst };
                     outVarItem.Draw=drawItem;
 
                     result.push(outVarItem);
@@ -24925,6 +25017,17 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAW_SIMPLE_PIE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;    //{ Data:[ {Value, Color, Text: }, ], BorderColor:， TextFont:{ Size:, Name: } };
+ 
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -25265,8 +25368,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
                     if (draw.AutoPosition) drawItem.AutoPosition=draw.AutoPosition;
-                    drawItem.DrawData={ Data:this.FittingMultiText(draw.Data,date,time,hqChart), Family:draw.Family, TextFont:draw.TextFont ,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst };
-                    this.GetKLineData(drawItem.DrawData.Data, hqChart);
+                    drawItem.DrawData={ Data:draw.Data, Family:draw.Family, TextFont:draw.TextFont , EnableTooltip:draw.EnableTooltip, IsDrawFirst:draw.IsDrawFirst };
                     outVarItem.Draw=drawItem;
 
                     result.push(outVarItem);