hqchart 1.1.14299 → 1.1.14307

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

@@ -35688,109 +35688,156 @@ function ChartSimpleTable()
 
 
 //饼图
-function ChartPie()
+function ChartSimplePie()
 {   
     this.newMethod=IChartPainting;   //派生
     this.newMethod();
     delete this.newMethod;
 
-    this.Radius = 100;  //半径默认值
-    this.Width=40;
-    this.Height=50;
-
-    //this.Distance = 30; //指示线超出圆饼的距离
-    //this.txtLine = 20;  // 文本下划线
-    //this.paddingX = 20 / 3;// 设置文本的移动
-
+    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.Draw=function()
+    this.TotalValue=1;
+    this.Radius = 50;  //半径默认值
+    this.TextFont;
+
+
+    this.ReloadResource=function(resource)
     {
-        if (!this.Data || !this.Data.Data || !(this.Data.Data.length>0)) return this.DrawEmptyData();
+        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;
 
 
-        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.RectClient={ Width:this.Radius*2*pixelRatio, Height:this.Radius*2*pixelRatio };
 
-        if(isNaN(this.Radius)){
-            let str = this.Radius.replace("%","");
-            str = str/100;
-            if(width >= height){
-                this.Radius = str*height;
-            }
-            if(width < height) this.Radius = str*width;
+        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.Canvas.save();
-        this.Canvas.translate(width/2,height/2);
+    this.DrawPie=function()
+    {
+        this.Canvas.font=this.TextFont;
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.textAlign = 'left';
 
-        let totalValue=0;   //求和
-        for(let i in this.Data.Data)
+        var aryText=[];
+        var maxTextWidth=0;
+        for(var i=0;i<this.Data.Data.length;++i)
         {
-            totalValue += this.Data.Data[i].Value;
+            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;
         }
-        let start = 0;
-        let end = 0;
-        //画饼图
-        for(let i in this.Data.Data)
+
+        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)
         {
-            let item =this.Data.Data[i];
-            let rate=(item.Value/totalValue).toFixed(2); //占比
-            //JSConsole.Chart.Log('[ChartPie::Draw]', i, rate, item);
+            var item=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsPlusNumber(item.Value)) continue;
+
+            var rate=item.Value/this.TotalValue;
 
             // 绘制扇形
             this.Canvas.beginPath();
-            this.Canvas.moveTo(0,0);
-
+            this.Canvas.moveTo(x,y);
+ 
             end += rate*2*Math.PI;//终止角度
-            this.Canvas.strokeStyle = "white";
+            this.Canvas.strokeStyle = this.BorderColor;
             this.Canvas.fillStyle = item.Color;
-            this.Canvas.arc(0,0,this.Radius,start,end);
+            this.Canvas.arc(x,y,this.Radius,start,end);
             this.Canvas.fill();
             this.Canvas.closePath();
-            this.Canvas.stroke();
-            
-            // 绘制直线
-            this.Canvas.beginPath();
-            this.Canvas.strokeStyle = item.Color;
-            this.Canvas.moveTo(0,0);
-            let x = (this.Radius + this.Distance)*Math.cos(end- (end-start)/2);
-            let y = (this.Radius + this.Distance)*Math.sin(end - (end-start)/2);
-            this.Canvas.lineTo(x,y);
-            // JSConsole.Chart.Log(x,y,"xy")
-            
-            // 绘制横线
-            let txtLine = this.txtLine;
-            let paddingX = this.paddingX;
-            this.Canvas.textAlign = 'left';
-            if( end - (end-start)/2 < 1.5*Math.PI && end - (end-start)/2 > 0.5*Math.PI ){
-                
-                txtLine = - this.txtLine;
-                paddingX = - this.paddingX;
-                this.Canvas.textAlign = 'right';
-            }
-            this.Canvas.lineTo( x + txtLine, y );
             this.Canvas.stroke();
 
-             // 写文字
-             if(item.Text){
-                 this.Canvas.fillText( item.Text, x + txtLine + paddingX, y );
-             }else{
-                 let text = `${item.Name}:${item.Value}`;
-                 this.Canvas.fillText( text, x + txtLine + paddingX, y );
-             }
-            
+            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();
     }
@@ -35798,7 +35845,7 @@ function ChartPie()
     //空数据
     this.DrawEmptyData=function()
     {
-        JSConsole.Chart.Log('[ChartPie::DrawEmptyData]')
+        JSConsole.Chart.Log('[ChartSimplePie::DrawEmptyData]')
     }
 
     this.GetMaxMin=function()
@@ -40364,6 +40411,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)
         {
@@ -43869,8 +43917,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()
@@ -43884,6 +43932,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)
         {
@@ -43913,23 +43965,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()
@@ -45331,6 +45382,7 @@ function ChartDrawSVG()
     this.Family;
     this.TextFont;
     this.Texts=[];  //[ { Index:, Value:, Symbol:, Text:, Size: } ] SVG:图标 Text:文字 Size:图标大小
+    //this.Data;  存K线数据
     this.IsHScreen=false;   //是否横屏
     this.IsDestroy=false;   //是否已销毁
     this.EnableTooltip=true;
@@ -45340,8 +45392,38 @@ function ChartDrawSVG()
 
     this.AryDrawRect=[];    //已经绘制的区域
     this.AutoYOffset=0;
-    
-    //this.Data;  存K线数据
+
+    this.BuildKeyCallback=null;
+    this.MapCache=null;         //key=date/date-time  value={ Data:[] }
+
+    this.BuildKey=function(item)
+    {
+        if (this.BuildKeyCallback) return this.BuildKeyCallback(item);
+
+        if (IFrameSplitOperator.IsNumber(item.Time)) return `${item.Date}-${item.Time}`;
+        else return `${item.Date}`;
+    }
+
+    this.BuildCacheData=function()
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        for(var i=0; i<this.Texts.length;++i)
+        {
+            var item=this.Texts[i];
+            var key=this.BuildKey(item);
+
+            if (mapData.has(key))
+            {
+                var mapItem=mapData.get(key);
+                mapItem.Data.push(item);
+            }
+            else
+            {
+                mapData.set(key,{ Date:item.Date, Time:item.Time, Data:[item] });
+            }
+        }
+    }
 
     this.Draw=function()
     {
@@ -45352,8 +45434,9 @@ function ChartDrawSVG()
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
+        if (!this.MapCache || this.MapCache.size<=0) return;
 
-        this.DrawSVG();
+        this.DrawSVGV2();
     }
 
     this.DrawDetail=function(rtSVG, data, svgItem)
@@ -45582,6 +45665,221 @@ function ChartDrawSVG()
         return false;
     }
 
+    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.DrawSVGV2=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Texts)) return;
+        if (!this.Family) return;
+
+        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
+        if (this.IsHScreen) return;
+
+        var xPointCount=this.ChartFrame.XPointCount;
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var isMinute=this.IsMinuteFrame();
+        var border=this.GetBorder();
+        var pixelRatio = GetDevicePixelRatio();
+
+        if (this.IsHScreen)
+        {
+
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+            var chartLeft=border.LeftEx;
+        }
+
+        var x,y,price;
+        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 (isMinute)
+            {
+                x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                x=left+(right-left)/2;
+            }
+
+            for(var j=0;j<mapItem.Data.length;++j)
+            {
+                var item=mapItem.Data[j];
+
+                if (item.Value=="Top") y=top;
+                else if (item.Value=="Bottom") y=bottom;
+                else 
+                {
+                    if (IFrameSplitOperator.IsString(item.Value)) price=this.GetKValue(kItem,item.Value);
+                    else price=item.Value;
+
+                    y=this.ChartFrame.GetYFromData(price, false);
+                }
+                if (IFrameSplitOperator.IsNumber(item.YOffset)) y+=item.YOffset;    //Y轴偏移
+
+                var svgItem=item.SVG;
+                if (IFrameSplitOperator.IsNumber(svgItem.YOffset)) y+=svgItem.YOffset;
+
+                if (this.AutoPosition) 
+                {
+                    var pt={ X:x, Y:y };
+                    this.CalculateShowPosition(item, pt);   //重新计算位置
+                    x=pt.X;
+                    y=pt.Y;
+                }
+
+                var fontSVG=`${svgItem.Size}px ${this.Family}`;
+                this.Canvas.font=fontSVG;
+                var halfSize=svgItem.Size/2;
+                var textBaseline='bottom';
+                var rtSVG={ Left:x-halfSize, Right:x+halfSize, Top:y-svgItem.Size, Bottom:y, Height:svgItem.Size, Width:svgItem.Size };
+                if (svgItem.VAlign===0) 
+                {
+                    textBaseline="top";
+                    rtSVG.Top=y;
+                    rtSVG.Bottom=rtSVG.Top+svgItem.Size;
+                }
+                else if (svgItem.VAlign===1) 
+                {
+                    textBaseline='middle';
+                    rtSVG.Top=y-svgItem.Size/2;
+                    rtSVG.Bottom=rtSVG.Top+svgItem.Size;
+                }
+
+                if (rtSVG.Top<0) 
+                {
+                    rtSVG.Top=0;
+                    rtSVG.Bottom=svgItem.Size;
+                    y=rtSVG.Bottom;
+                }
+
+                this.Canvas.textBaseline=textBaseline;
+                this.Canvas.textAlign='center';
+                this.Canvas.fillStyle = svgItem.Color;
+                this.Canvas.fillText(svgItem.Symbol, x, y);
+
+                this.AryDrawRect.push( {Left:rtSVG.Left, Top:rtSVG.Top, Right:rtSVG.Right, Bottom:rtSVG.Bottom, Type:"SVG", Data:item } );
+
+                if (this.EnableTooltip) this.TooltipRect.push({ Rect:rtSVG, Index:i, Item:item });
+
+                //文字
+                if (item.Text && item.Text.Content && this.TextFont)
+                {
+                    var textItem=item.Text;
+                    this.Canvas.font=this.TextFont;
+                    this.Canvas.fillStyle=textItem.Color;
+                    var yText=y;
+                    if (IFrameSplitOperator.IsNumber(textItem.YOffset)) yText+=textItem.YOffset;
+                    this.Canvas.fillText(textItem.Content, x, yText);
+                }
+
+                if (item.Detail)
+                {
+                    this.DrawDetail(rtSVG,item.Detail, item);
+                }
+                
+                //连线
+                if (item.Line)
+                {
+                    var lineItem=item.Line;
+                    var price=null, yPrice=null;
+                    if (lineItem.Value=="Bottom")
+                    {
+                        yPrice=bottom;
+                    }
+                    else if (lineItem.Value=="Top")
+                    {
+                        yPrice=top;
+                    }
+                    else  
+                    {
+                        if (IFrameSplitOperator.IsString(lineItem.Value))
+                            price=this.GetKValue(kItem,lineItem.Value);
+
+                        if (!IFrameSplitOperator.IsNumber(price)) continue;
+                        yPrice=this.ChartFrame.GetYFromData(price);
+                    }
+                    
+                    if (yPrice>=rtSVG.Top && yPrice<=rtSVG.Bottom) continue;
+
+                    var yText;
+                    if (yPrice<rtSVG.Top) 
+                    {
+                        yText=rtSVG.Top;
+                        if (IFrameSplitOperator.IsNumber(lineItem.SVGBlank))
+                        {
+                            //yPrice+=lineItem.Blank;
+                            yText-=lineItem.SVGBlank;
+                        }
+                    }
+                    else
+                    {
+                        yText=rtSVG.Bottom;
+                        if (IFrameSplitOperator.IsNumber(lineItem.SVGBlank))
+                        {
+                            //yPrice-=lineItem.Blank;
+                            yText+=lineItem.SVGBlank;
+                        }
+                    }
+
+                    if (lineItem.Dash) this.Canvas.setLineDash(lineItem.Dash);    //虚线
+                    var lineWidth=1*pixelRatio;
+                    if (lineItem.Width>0) lineWidth=lineItem.Width*pixelRatio;
+                    this.Canvas.lineWidth=lineWidth;   //线宽
+                    this.Canvas.strokeStyle = lineItem.Color;
+                    this.Canvas.beginPath();
+
+                    if (this.IsHScreen)
+                    {
+                        this.Canvas.moveTo(yText, ToFixedPoint(x));
+                        this.Canvas.lineTo(yPrice,ToFixedPoint(x));
+                    }
+                    else
+                    {
+                        this.Canvas.moveTo(ToFixedPoint2(lineWidth,x),yText);
+                        this.Canvas.lineTo(ToFixedPoint2(lineWidth,x),yPrice);
+                    }
+                    
+                    this.Canvas.stroke();
+                    this.Canvas.setLineDash([]);
+                }
+            }
+        }
+    }
+
+    /*
     this.DrawSVG=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
@@ -45756,26 +46054,35 @@ function ChartDrawSVG()
             }
         }
     }
+    */
 
     this.GetMaxMin=function()
     {
+        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
         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;
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Texts)) return range;
 
-        for(var i=0; i<this.Texts.length; ++i)
+        for(var i=this.Data.DataOffset,j=0, k=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var item=this.Texts[i];
-            if (!IFrameSplitOperator.IsNumber(item.Index)) continue;
-            if (item.Index>=start && item.Index<end)
+            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(k=0;k<mapItem.Data.length;++k)
             {
-                if(!IFrameSplitOperator.IsNumber(item.Value)) continue;
-                if (range.Max==null) range.Max=item.Value;
-                else if (range.Max<item.Value) range.Max=item.Value;
-                if (range.Min==null) range.Min=item.Value;
-                else if (range.Min>item.Value) range.Min=item.Value;
+                var item=mapItem.Data[k];
+                var value=item.Value;
+                if (IFrameSplitOperator.IsString(item.Value)) value=this.GetKValue(kItem,item.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;
             }
         }
 
@@ -45791,11 +46098,10 @@ function ChartDrawSVG()
             var item=this.TooltipRect[i];
             if (!item.Rect) continue;
             var rect=item.Rect;
-            this.Canvas.beginPath();
-            this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);
-            if (this.Canvas.isPointInPath(x,y))
+           
+            if (x>=rect.Left && x<=rect.Right && y>=rect.Top && y<=rect.Bottom)
             {
-                var data=this.Texts[item.Index];
+                var data=item.Item;
                 JSConsole.Chart.Log('[ChartDrawSVG::GetTooltipData] svg icon.', item);
                 tooltip.Data={ Rect:item.Rect, Item:data, Index:item.Index };
                 tooltip.ChartPaint=this;
@@ -74418,6 +74724,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)',    //背景色
@@ -75647,6 +75960,7 @@ function JSChartResource()
         }
 
         if (style.ChartSimpleTable) this.SetChartSimpleTable(style.ChartSimpleTable);
+        if (style.ChartSimplePie) this.SetChartSimplePie(style.ChartSimplePie);
         
         if (style.DRAWICON) 
         {
@@ -76719,6 +77033,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();
@@ -91647,7 +91982,7 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
     return aryMinuteData;
 }
 
-//分钟增量数据  stock: [ { date:, yclose:， yclearing: , minute:[ [],]}  0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌 11=领先指标 ]
+//分钟增量数据  stock: [ { date:, yclose:， yclearing: , minute:[ [],]}  0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌 11=领先指标 12=持仓 ]
 MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
 {
     if (!data || !data.stock) return null;
@@ -91685,16 +92020,17 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
             if (IFrameSplitOperator.IsNumber(jsData[9])) item.Increase=jsData[9];
             if (IFrameSplitOperator.IsNumber(jsData[10])) item.Risefall=jsData[10];
             if (IFrameSplitOperator.IsNumber(jsData[11])) item.Lead=jsData[11];
-
+            if (IFrameSplitOperator.IsNumber(jsData[12])) item.Position=jsData[12];
 
             if (jsData[extendDataIndex]) item.ExtendData=jsData[extendDataIndex];
-            item.DateTime=item.Date.toString()+" "+item.Time.toString();
+
+            item.DateTime=`${item.Date} ${item.Time}`;
 
             if (IFrameSplitOperator.IsNumber(minuteData.YClose) && item.Close) 
-                item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100; //涨幅 (最新价格-昨收)/昨收*100;
+                item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100;     //涨幅 (最新价格-昨收)/昨收*100;
     
             if (isFutures && minuteData.YClearing && item.Close) 
-            item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
+                item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
 
                 
             minuteData.Data.push(item);
@@ -111948,6 +112284,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" };
+    }
 }
 
 
@@ -112002,7 +112362,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;
 
@@ -118883,6 +119243,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);
@@ -121876,6 +122244,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();
@@ -122082,11 +122473,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 }
                 };
 
@@ -122106,6 +122498,7 @@ function ScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         hqChart.ChartPaint.push(chart);
     }
 
@@ -122329,6 +122722,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);
     }
 
@@ -122744,6 +123139,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":
@@ -123094,6 +123491,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);
@@ -123845,11 +124244,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 }
                 };
 
@@ -123869,6 +124269,7 @@ function OverlayScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         frame.ChartPaint.push(chart);
     }
 
@@ -124080,7 +124481,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);
     }
@@ -124131,6 +124533,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;
@@ -125192,8 +125621,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);
@@ -125333,6 +125761,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);  //外部挂接
@@ -125673,8 +126112,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);
@@ -126944,6 +127382,11 @@ function GetBlackStyle()
             BorderColor:"rgb(90,90,90)",
         },
 
+        ChartSimplePie:
+        {
+            BorderColor:"rgb(220,220,220)",
+        },
+
         ChartDrawVolProfile:
         {
             BGColor:"rgba(244,250,254,0.3)",
@@ -141479,7 +141922,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14298";
+var HQCHART_VERSION="1.1.14306";
 
 function PrintHQChartVersion()
 {