hqchart 1.1.14367 → 1.1.14372

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -15043,7 +15043,7 @@ function ChartFrameFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -28344,7 +28344,7 @@ function ChartPaintFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -35795,10 +35795,11 @@ function ChartSimplePie()
         this.RectClient.Left-=xOffset;
         this.RectClient.Right-=xOffset;
 
-
+        var pixelRatio=GetDevicePixelRatio();
+        var radius=this.Radius*pixelRatio;
         var start=0, end=0;
-        var x=this.RectClient.Left+this.Radius;
-        var y=this.RectClient.Top+this.Radius;
+        var x=this.RectClient.Left+radius;
+        var y=this.RectClient.Top+radius;
 
         for(var i=0;i<this.Data.Data.length;++i)
         {
@@ -35814,7 +35815,178 @@ function ChartSimplePie()
             end += rate*2*Math.PI;//终止角度
             this.Canvas.strokeStyle = this.BorderColor;
             this.Canvas.fillStyle = item.Color;
-            this.Canvas.arc(x,y,this.Radius,start,end);
+            this.Canvas.arc(x,y,radius,start,end);
+            this.Canvas.fill();
+            this.Canvas.closePath();
+            this.Canvas.stroke();
+
+            if (item.Text)
+            {
+                // 绘制直线
+                var xLine=radius*Math.cos(end- (end-start)/2)+x;
+                var yLine=radius*Math.sin(end - (end-start)/2)+y;
+                var xEnd = (radius + this.LineExtendWidth)*Math.cos(end- (end-start)/2)+x;
+                var yEnd = (radius + this.LineExtendWidth)*Math.sin(end - (end-start)/2)+y;
+
+                this.Canvas.beginPath();
+                if (item.LineColor) this.Canvas.strokeStyle =item.LineColor;
+                else this.Canvas.strokeStyle = item.Color;
+                this.Canvas.moveTo(xLine,yLine);
+                this.Canvas.lineTo(xEnd,yEnd);
+
+                var textWidth=aryText[i].Width;
+                var yText=xEnd;
+                if( end - (end-start)/2 < 1.5*Math.PI && end - (end-start)/2 > 0.5*Math.PI )
+                {
+                    this.Canvas.lineTo( xEnd - textWidth, yEnd );
+                    yText=xEnd - textWidth;
+                }
+                else
+                {
+                    this.Canvas.lineTo( xEnd + textWidth, yEnd );
+                }
+                this.Canvas.stroke();
+
+                if (item.TextColor)  this.Canvas.fillStyle = item.TextColor;
+                else this.Canvas.fillStyle=item.Color;
+                this.Canvas.fillText(item.Text, yText, yEnd);
+            }
+
+            start += rate*2*Math.PI;//起始角度
+        }
+    }
+    
+    this.Draw=function()
+    {
+        if (!this.Data || !this.Data.Data || !(this.Data.Data.length>0)) return this.DrawEmptyData();
+
+        this.CalculateTotalValue();
+        if (!IFrameSplitOperator.IsPlusNumber(this.TotalValue)) this.DrawEmptyData();
+        this.CalculateSize();
+
+        this.Canvas.save();
+
+        this.DrawPie();
+
+        this.Canvas.restore();
+    }
+
+    //空数据
+    this.DrawEmptyData=function()
+    {
+        JSConsole.Chart.Log('[ChartSimplePie::DrawEmptyData]')
+    }
+
+    this.GetMaxMin=function()
+    {
+        return { Min:null, Max:null };
+    }
+}
+
+
+//圆环
+function ChartSimpleDoughnut()
+{   
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSimpleDoughnut';    //类名
+    
+    this.BorderColor=g_JSChartResource.ChartSimpleDoughnut.BorderColor;
+    this.Offset=CloneData(g_JSChartResource.ChartSimpleDoughnut.Offset);
+    this.LineExtendWidth=10;
+    this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleDoughnut.TextFont);
+
+    this.RectClient={ };
+    this.TotalValue=1;
+    this.Radius = 50;       //外圈半径默认值
+    this.InnerRadius=30;    //内圈半径
+    this.TextFont;
+
+
+    this.ReloadResource=function(resource)
+    {
+        this.BorderColor=g_JSChartResource.ChartSimpleDoughnut.BorderColor;
+        this.Offset=CloneData(g_JSChartResource.ChartSimpleDoughnut.Offset);
+        this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleDoughnut.TextFont);
+    }
+
+    this.CalculateSize=function()
+    {
+        var border=this.ChartFrame.GetBorder();
+        var pixelRatio=GetDevicePixelRatio();
+        this.TextFont=`${this.TextFontConfig.Size*pixelRatio}px ${ this.TextFontConfig.Name}`;
+        this.LineExtendWidth=this.GetFontHeight(this.TextFont,"擎")+1;
+
+
+        this.RectClient={ Width:this.Radius*2*pixelRatio, Height:this.Radius*2*pixelRatio };
+
+        this.RectClient.Right=border.Right+this.Offset.X;
+        this.RectClient.Top=border.TopEx+this.Offset.Y;
+        this.RectClient.Left=this.RectClient.Right-this.RectClient.Width;
+        this.RectClient.Bottom=this.RectClient.Top+this.RectClient.Height;
+    }
+
+    this.CalculateTotalValue=function()
+    {
+        var totalValue=0;
+        for(var i=0; i<this.Data.Data.length; ++i)
+        {
+            var item=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsPlusNumber(item.Value)) continue;
+            totalValue += item.Value;
+        }
+
+        this.TotalValue=totalValue;
+    }
+
+    this.DrawPie=function()
+    {
+        this.Canvas.font=this.TextFont;
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.textAlign = 'left';
+
+        var aryText=[];
+        var maxTextWidth=0;
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsPlusNumber(item.Value)) continue;
+            if (!item.Text) continue;
+            var textWidth=this.Canvas.measureText(item.Text).width;
+
+            aryText[i]={ Width:textWidth };
+
+            if (maxTextWidth<textWidth)  maxTextWidth=textWidth;
+        }
+
+        var xOffset=maxTextWidth+this.LineExtendWidth;
+        this.RectClient.Left-=xOffset;
+        this.RectClient.Right-=xOffset;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var radius=this.Radius*pixelRatio;
+        var innerRadius=this.InnerRadius*pixelRatio;
+        var start=0, end=0;
+        var x=this.RectClient.Left+radius;
+        var y=this.RectClient.Top+radius;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsPlusNumber(item.Value)) continue;
+
+            var rate=item.Value/this.TotalValue;
+
+            // 绘制扇形
+            this.Canvas.beginPath();
+ 
+            end += rate*2*Math.PI;//终止角度
+            this.Canvas.strokeStyle = this.BorderColor;
+            this.Canvas.fillStyle = item.Color;
+            this.Canvas.arc(x,y,radius,start,end);
+            this.Canvas.arc(x,y,innerRadius,end-2*Math.PI,start-2*Math.PI, true);
             this.Canvas.fill();
             this.Canvas.closePath();
             this.Canvas.stroke();
@@ -35822,10 +35994,10 @@ function ChartSimplePie()
             if (item.Text)
             {
                 // 绘制直线
-                var xLine=this.Radius*Math.cos(end- (end-start)/2)+x;
-                var yLine=this.Radius*Math.sin(end - (end-start)/2)+y;
-                var xEnd = (this.Radius + this.LineExtendWidth)*Math.cos(end- (end-start)/2)+x;
-                var yEnd = (this.Radius + this.LineExtendWidth)*Math.sin(end - (end-start)/2)+y;
+                var xLine=radius*Math.cos(end- (end-start)/2)+x;
+                var yLine=radius*Math.sin(end - (end-start)/2)+y;
+                var xEnd = (radius + this.LineExtendWidth)*Math.cos(end- (end-start)/2)+x;
+                var yEnd = (radius + this.LineExtendWidth)*Math.sin(end - (end-start)/2)+y;
 
                 this.Canvas.beginPath();
                 if (item.LineColor) this.Canvas.strokeStyle =item.LineColor;
@@ -75389,6 +75561,13 @@ function JSChartResource()
         Offset:{ X:-5, Y:5 }
     }
 
+    this.ChartSimpleDoughnut=
+    {
+        TextFont:{ Family:'微软雅黑' , Size:12 },
+        BorderColor:"rgb(169,169,169)",
+        Offset:{ X:-5, Y:5 }
+    }
+
     this.ChartSimpleRadar=
     {
         TextFont:{ Family:'微软雅黑' , Size:12 },
@@ -76634,6 +76813,8 @@ function JSChartResource()
 
         if (style.ChartSimpleTable) this.SetChartSimpleTable(style.ChartSimpleTable);
         if (style.ChartSimplePie) this.SetChartSimplePie(style.ChartSimplePie);
+        if (style.ChartSimpleDoughnut) this.SetChartSimpleDoughnut(style.ChartSimpleDoughnut);
+        
         if (style.ChartSimpleRadar) this.SetChartSimpleRadar(style.ChartSimpleRadar);
         
         if (style.DRAWICON) 
@@ -77728,6 +77909,27 @@ function JSChartResource()
         }
     }
 
+    this.SetChartSimpleDoughnut=function(style)
+    {
+        var dest=this.ChartSimpleDoughnut;
+
+        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.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;
+        }
+    }
+
     this.SetChartSimpleRadar=function(style)
     {
         var dest=this.ChartSimpleRadar;
@@ -96864,7 +97066,7 @@ function DialogFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[DialogFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -113043,6 +113245,18 @@ function JSDraw(errorHandler,symbolData)
 
         return result={ DrawData:{ Data:aryData, AryIndex:aryIndex, Radius:radius, AryArea:[{ LineColor:color }] }, DrawType:"DRAW_SIMPLE_RADAR" };
     }
+
+    this.DRAWDOUGHNUT=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 , InnerRadius:radius/2 }, DrawType:"DRAW_SIMPLE_DOUGHNUT" };
+    }
 }
 
 
@@ -113097,7 +113311,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","DRAWRADAR",
+        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE","DRAWPIE","DRAWRADAR","DRAWDOUGHNUT",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -119986,6 +120200,10 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWPIE(args);
                 node.Out=[];
                 break;
+            case "DRAWDOUGHNUT":
+                node.Draw=this.Draw.DRAWDOUGHNUT(args);
+                node.Out=[];
+                break;
             //雷达图
             case "RADAR_CELL":
                 node.Out=this.Draw.RADAR_CELL(args[0],args[1],args[2],args[3]);
@@ -123039,6 +123257,30 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleDoughnut=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartSimpleDoughnut();
+        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;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.InnerRadius)) chart.InnerRadius=drawData.InnerRadius;
+        }
+    
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateTradeIcon=function(hqChart,windowIndex,varItem,id)
     {
         var chart=new ChartTradeIcon();
@@ -123921,6 +124163,9 @@ function ScriptIndex(name,script,args,option)
                     case "DRAW_SIMPLE_RADAR":
                         this.CreateSimpleRadar(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAW_SIMPLE_DOUGHNUT":
+                        this.CreateSimpleDoughnut(hqChart,windowIndex,item,i);
+                        break;
                     case "BUY":
                     case "SELL":
                     case "SELLSHORT":
@@ -124274,6 +124519,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case "DRAW_SIMPLE_PIE":
                         this.CreateSimplePie(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAW_SIMPLE_DOUGHNUT":
+                        this.CreateSimpleDoughnut(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAW_SIMPLE_RADAR":
                         this.CreateSimpleRadar(hqChart,windowIndex,item,i);
                         break;
@@ -125352,6 +125600,34 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleDoughnut=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartSimpleDoughnut();
+        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;
+            if (IFrameSplitOperator.IsPlusNumber(drawData.InnerRadius)) chart.InnerRadius=drawData.InnerRadius;
+        }
+
+        frame.ChartPaint.push(chart);
+    }
+
     this.CreateSimpleRadar=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
@@ -126579,7 +126855,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
-                else if (draw.DrawType=="DRAW_SIMPLE_PIE")
+                else if (draw.DrawType=="DRAW_SIMPLE_PIE" || draw.DrawType=="DRAW_SIMPLE_DOUGHNUT")
                 {
                     drawItem.Name=draw.Name;
                     drawItem.Type=draw.Type;
@@ -128219,6 +128495,11 @@ function GetBlackStyle()
             BorderColor:"rgb(220,220,220)",
         },
 
+        ChartSimpleDoughnut:
+        {
+            BorderColor:"rgb(220,220,220)",
+        },
+
         ChartSimpleRadar:
         {
             //TextFont:{ Family:'微软雅黑' , Size:12 },
@@ -142768,7 +143049,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14366";
+var HQCHART_VERSION="1.1.14371";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.14366";
+var HQCHART_VERSION="1.1.14371";
 
 function PrintHQChartVersion()
 {

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

@@ -57394,6 +57394,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_DOUGHNUT")
+        HQData.APIIndex_DRAW_SIMPLE_DOUGHNUT(data, callback);
     else if (request.Data.indexname=="API_DRAW_SIMPLE_RADAR")
         HQData.APIIndex_DRAW_SIMPLE_RADAR(data, callback);
     else if (request.Data.indexname=="API_MULTI_BAR")
@@ -57927,6 +57929,52 @@ HQData.APIIndex_DRAW_SIMPLE_PIE=function(data, callback)
     callback(apiData);
 }
 
+HQData.APIIndex_DRAW_SIMPLE_DOUGHNUT=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_DOUGHNUT', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_DOUGHNUT', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(110,110,110)",
+                //TextColor:"rgb(0,191,255)",
+                Data:
+                [
+                    { Value:100, 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);
+}
+
 
 HQData.APIIndex_DRAW_SIMPLE_RADAR=function(data, callback)
 {