hqchart 1.1.14305 → 1.1.14307

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

@@ -45382,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;
@@ -45391,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()
     {
@@ -45403,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)
@@ -45633,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;
@@ -45807,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;
             }
         }
 
@@ -45842,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;
@@ -91727,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;
@@ -91765,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);
@@ -122217,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 }
                 };
 
@@ -122241,6 +122498,7 @@ function ScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         hqChart.ChartPaint.push(chart);
     }
 
@@ -122464,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);
     }
 
@@ -123984,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 }
                 };
 
@@ -124008,6 +124269,7 @@ function OverlayScriptIndex(name,script,args,option)
             chart.Texts= aryData;
         }
 
+        chart.BuildCacheData();
         frame.ChartPaint.push(chart);
     }
 
@@ -124219,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);
     }
@@ -125358,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);
@@ -125850,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);
@@ -141661,7 +141922,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14304";
+var HQCHART_VERSION="1.1.14306";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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