hqchart 1.1.14295 → 1.1.14305

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

@@ -55763,6 +55763,8 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
+        //stockItem.minute.length=50;
+
         var hqchartData={code:0, stock:[stockItem] };
     
 
@@ -57388,6 +57390,11 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_SVGICON(data, callback);
     else if (request.Data.indexname=="API-DRAWTEXT_LINE")
         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);
+    
 }
 
 
@@ -57792,8 +57799,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,
+                },   
             }
         } 
     };
@@ -57810,6 +57828,97 @@ HQData.APIIndex_DRAWTEXT_LINE=function(data, callback)
     callback(apiData);
 }
 
+HQData.APIIndex_DRAW_SIMPLE_TABLE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_TABLE', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_TABLE', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(0,0,255)",
+                //TextColor:"rgb(0,191,255)",
+                TableData:
+                [
+                    { AryCell:[{ Text:"股票代码"}, { Text:"主营业务", TextAlign:'center'}, { Text:"每股收益(元)"}] },
+                    { AryCell:[{ Text:"美丽生态"}, { Text:"园林绿化"}, { Text:"13.5", Color:"rgb(139,0,139)"}] },
+                    { AryCell:[{ Text:"深物业A"}, { Text:"房地产及相关业务", BGColor:"rgb(200,200,200)"}, { Text:"0.12"}] },
+                    { AryCell:[{ Text:"深科技"}, { Text:"计算机硬件、通讯设备等"}, { Text:"5.4"}] },
+                ],
+
+                //TextFont:{ Size:16, Name:"微软雅黑"},
+                //XOffset:-10,
+                //YOffset:-15,
+            }
+        } 
+    };
+
+    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_TABLE] apiData ', apiData);
+    callback(apiData);
+}
+
+
+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.vue/umychart.vue.js

@@ -35730,6 +35730,174 @@ function ChartSimpleTable()
     }
 }
 
+
+//饼图
+function ChartSimplePie()
+{   
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSimplePie';    //类名
+    
+    this.BorderColor=g_JSChartResource.ChartSimplePie.BorderColor;
+    this.Offset=CloneData(g_JSChartResource.ChartSimplePie.Offset);
+    this.LineExtendWidth=10;
+    this.TextFontConfig=CloneData(g_JSChartResource.ChartSimplePie.TextFont);
+
+    this.RectClient={ };
+    this.TotalValue=1;
+    this.Radius = 50;  //半径默认值
+    this.TextFont;
+
+
+    this.ReloadResource=function(resource)
+    {
+        this.BorderColor=g_JSChartResource.ChartSimplePie.BorderColor;
+        this.Offset=CloneData(g_JSChartResource.ChartSimplePie.Offset);
+        this.TextFontConfig=CloneData(g_JSChartResource.ChartSimplePie.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 start=0, end=0;
+        var x=this.RectClient.Left+this.Radius;
+        var y=this.RectClient.Top+this.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();
+            this.Canvas.moveTo(x,y);
+ 
+            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.fill();
+            this.Canvas.closePath();
+            this.Canvas.stroke();
+
+            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;
+
+                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 ChartMinuteVolumBar()
 {
@@ -40287,6 +40455,7 @@ function ChartMinutePriceLine()
         var pointCount=0;
         
         this.Canvas.save();
+        this.ClipClient(isHScreen);
         if (IFrameSplitOperator.IsPlusNumber(this.LineWidth>0)) this.Canvas.lineWidth=this.LineWidth;
         for(var i=data.DataOffset,j=0;i<data.Data.length && j<xPointCount;++i,++j)
         {
@@ -43792,8 +43961,8 @@ function ChartTextLine()
 
     this.ClassName="ChartTextLine";
 
-    this.Text;  //Text=内容 Color
-    this.Line;  //Type=线段类型 0=不画 1=直线 2=虚线, Color
+    this.Text;  //{ Title:内容, Color:  YOffset:, }
+    this.Line;  //{ Type=线段类型 0=不画 1=直线 2=虚线, Color:, Width:,  LineDash:[] }
     this.Price;
 
     this.Draw=function()
@@ -43807,6 +43976,10 @@ function ChartTextLine()
         var bottom=this.ChartBorder.GetBottomEx();
         var top=this.ChartBorder.GetTopEx();
         var y=this.ChartFrame.GetYFromData(this.Price);
+
+        this.Canvas.save();
+        this.ClipClient(this.IsHScreen);
+
         var textWidth=0;
         if (this.Text.Title)
         {
@@ -43836,23 +44009,22 @@ function ChartTextLine()
         {
             if (this.Line.Type==2)  //虚线
             {
-                this.Canvas.save();
-                this.Canvas.setLineDash([3,5]);   //虚线
+                if (IFrameSplitOperator.IsNonEmptyArray(this.Line.LineDash)) this.Canvas.setLineDash(this.Line.LineDash)
+                else this.Canvas.setLineDash([3,5]);   //虚线
             }
 
+            if (IFrameSplitOperator.IsNumber(this.Line.Width)) this.Canvas.lineWidth=this.Line.Width;
+
             var x=left+textWidth;
             this.Canvas.strokeStyle=this.Line.Color;
             this.Canvas.beginPath();
             this.Canvas.moveTo(x,ToFixedPoint(y));
             this.Canvas.lineTo(right,ToFixedPoint(y));
             this.Canvas.stroke();
-
-            if (this.Line.Type==2)
-            {
-                this.Canvas.restore();
-            }
         }
 
+
+        this.Canvas.restore();
     }
 
     this.GetMaxMin=function()
@@ -74341,6 +74513,13 @@ function JSChartResource()
         BorderColor:"rgb(217,217,217)",
     }
 
+    this.ChartSimplePie=
+    {
+        TextFont:{ Family:'微软雅黑' , Size:12 },
+        BorderColor:"rgb(169,169,169)",
+        Offset:{ X:-5, Y:5 }
+    }
+
     //手机端tooltip
     this.TooltipPaint = {
         BGColor:'rgba(250,250,250,0.8)',    //背景色
@@ -75570,6 +75749,7 @@ function JSChartResource()
         }
 
         if (style.ChartSimpleTable) this.SetChartSimpleTable(style.ChartSimpleTable);
+        if (style.ChartSimplePie) this.SetChartSimplePie(style.ChartSimplePie);
         
         if (style.DRAWICON) 
         {
@@ -76642,6 +76822,27 @@ function JSChartResource()
         }
     }
 
+    this.SetChartSimplePie=function(style)
+    {
+        var dest=this.ChartSimplePie;
+
+        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;
+        }
+    }
+
 }
 
 var g_JSChartResource=new JSChartResource();
@@ -86503,6 +86704,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
                 {
                     var index=parseInt(position.CursorIndex.toFixed(0));
+                    if (index>=kData.Data.length) index=kData.Data.length-1;    //未开盘的时间，取最后一个数据的收盘价
                     var item=kData.Data[index];
                     if (item && IFrameSplitOperator.IsNumber(item.Close))
                     {
@@ -111870,6 +112072,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" };
+    }
 }
 
 
@@ -111924,7 +112150,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;
 
@@ -118805,6 +119031,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);
@@ -119703,6 +119937,10 @@ function JSExplainer(ast,option)
             ["L2_VOLNUM", { Name:"L2_VOLNUM", Param:{ Count:2 }, ToString:function(args) { return `单数分档`; } }],
             ["L2_VOL", { Name:"L2_VOL", Param:{ Count:2 }, ToString:function(args) { return `成交量分档`; } }],
             ["L2_AMO", { Name:"L2_AMO", Param:{ Count:2 }, ToString:function(args) { return `成交额分档`; } }],
+
+            ["TABLE_CELL", { Name:"TABLE_CELL",Param:{ Dynamic:true }, ToString:function(args) { return `创建表格单元格`; } }],
+            ["TABLE_ROW", { Name:"TABLE_ROW",Param:{ Dynamic:true }, ToString:function(args) { return `创建表格行`; } }],
+            ["DRAWTABLE", { Name:"DRAWTABLE",Param:{ Dynamic:true }, ToString:function(args) { return `绘制表格`; } }]
             
         ]
     );
@@ -121794,6 +122032,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();
@@ -122662,6 +122923,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":
@@ -123012,6 +123275,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);
@@ -124049,6 +124314,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;
@@ -125251,6 +125543,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);  //外部挂接
@@ -126862,6 +127165,11 @@ function GetBlackStyle()
             BorderColor:"rgb(90,90,90)",
         },
 
+        ChartSimplePie:
+        {
+            BorderColor:"rgb(220,220,220)",
+        },
+
         ChartDrawVolProfile:
         {
             BGColor:"rgba(244,250,254,0.3)",
@@ -146633,7 +146941,7 @@ function JSPopKeyboard()
             }
         }
     
-        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122) || code==8)
+        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=96 && code<=122) || code==8)
         {
             var strText=this.InputDOM.value;
             strText=strText.toUpperCase();
@@ -146731,7 +147039,7 @@ function JSPopKeyboard()
         var code=event.keyCode;
         if (code==116) return;  //F5不处理
 
-        if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122))
+        if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=96 && code<=122))
         {
             this.Show();
             this.InputDOM.focus();
@@ -151001,7 +151309,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14294";
+var HQCHART_VERSION="1.1.14304";
 
 function PrintHQChartVersion()
 {