hqchart 1.1.14670 → 1.1.14683

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

@@ -7608,7 +7608,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.DestroyDialogModifyIndexParam=function()
     {
-        if (this.DialogModifyIndexParam) return;
+        if (!this.DialogModifyIndexParam) return;
 
         this.DialogModifyIndexParam.Destroy();
         this.DialogModifyIndexParam=null;
@@ -15942,7 +15942,7 @@ function CoordinateInfo()
     //不在当前屏范围 （可定义刻度使用)
     //this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
     //Y轴文字偏移
-    //this.YOffset=[{ Offset:5}, { Offset:10}] //目前只对框子外的刻度文字生效
+    //this.YOffset=[{ Offset:5}, { Offset:10} ] //目前只对框子外的刻度文字生效 0=外左 1=外右 2=内左 3=内右
 }
 
 
@@ -17652,10 +17652,18 @@ function AverageWidthFrame()
                     this.Canvas.textBaseline = "middle";
                 }
 
-                var textObj={ X:left, Y:yText, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[0]}} ;
+                var yOffset=0;
+                if (IFrameSplitOperator.IsNonEmptyArray(item.YOffset))  //文字Y轴偏移
+                {
+                    var offsetItem=item.YOffset[2];
+                    if (offsetItem && IFrameSplitOperator.IsNumber(offsetItem.Offset))
+                        yOffset=offsetItem.Offset;
+                }
+
+                var textObj={ X:left, Y:yText+yOffset, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[0]}} ;
                 if (!this.IsOverlayMaxMin || !this.IsOverlayMaxMin(textObj))
                 {
-                    this.Canvas.fillText(item.Message[2], left + 1*pixelTatio, yText);
+                    this.Canvas.fillText(item.Message[2], left + 1*pixelTatio, yText+yOffset);
                     if (yInsideText==null || yInsideText>yText)
                     {
                         this.YInsideOffset=this.Canvas.measureText(item.Message[2]).width+4*GetDevicePixelRatio();
@@ -17684,10 +17692,19 @@ function AverageWidthFrame()
                 {
                     this.Canvas.textBaseline = "middle";
                 }
+
+                var yOffset=0;
+                if (IFrameSplitOperator.IsNonEmptyArray(item.YOffset))  //文字Y轴偏移
+                {
+                    var offsetItem=item.YOffset[3];
+                    if (offsetItem && IFrameSplitOperator.IsNumber(offsetItem.Offset))
+                        yOffset=offsetItem.Offset;
+                }
+
                 var textWidth = this.Canvas.measureText(item.Message[3]).width;
-                var textObj={ X:right-textWidth, Y:yText, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[1]}} ;
+                var textObj={ X:right-textWidth, Y:yText+yOffset, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[1]}} ;
                 if (!this.IsOverlayMaxMin || !this.IsOverlayMaxMin(textObj))
-                    this.Canvas.fillText(item.Message[3], right - 1*pixelTatio, yText);
+                    this.Canvas.fillText(item.Message[3], right - 1*pixelTatio, yText+yOffset);
             }
             yPrev = y;
         }
@@ -17750,10 +17767,18 @@ function AverageWidthFrame()
                         else this.Canvas.textBaseline = "middle";
                     }
 
-                    var textObj={ X:left, Y:yText, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[0]}} ;
+                    var yOffset=0;
+                    if (IFrameSplitOperator.IsNonEmptyArray(item.YOffset))  //文字Y轴偏移
+                    {
+                        var offsetItem=item.YOffset[0];
+                        if (offsetItem && IFrameSplitOperator.IsNumber(offsetItem.Offset))
+                            yOffset=offsetItem.Offset;
+                    }
+
+                    var textObj={ X:left, Y:yText+yOffset, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[0]}} ;
                     if (!this.IsOverlayMaxMin || !this.IsOverlayMaxMin(textObj))
                     {
-                        this.Canvas.fillText(item.Message[0], left + 1*pixelTatio, yText);
+                        this.Canvas.fillText(item.Message[0], left + 1*pixelTatio, yText+yOffset);
                         if (yInsideText==null || yInsideText>yText)
                         {
                             this.YInsideOffset=this.Canvas.measureText(item.Message[0]).width+4*GetDevicePixelRatio();
@@ -17788,10 +17813,18 @@ function AverageWidthFrame()
                     if (Array.isArray(item.Message[1])) var text=item.Message[1][0];
                     else var text=item.Message[1];
 
+                    var yOffset=0;
+                    if (IFrameSplitOperator.IsNonEmptyArray(item.YOffset))  //文字Y轴偏移
+                    {
+                        var offsetItem=item.YOffset[1];
+                        if (offsetItem && IFrameSplitOperator.IsNumber(offsetItem.Offset))
+                            yOffset=offsetItem.Offset;
+                    }
+
                     var textWidth = this.Canvas.measureText(text).width;
-                    var textObj={ X:right-textWidth, Y:yText, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[1]}} ;
+                    var textObj={ X:right-textWidth, Y:yText+yOffset, Text:{ BaseLine:this.Canvas.textBaseline, TextAlign: this.Canvas.textAlign, Font:this.Canvas.font, Value:item.Message[1]}} ;
                     if (!this.IsOverlayMaxMin || !this.IsOverlayMaxMin(textObj))
-                        this.Canvas.fillText(text, right - 1*pixelTatio, yText);
+                        this.Canvas.fillText(text, right - 1*pixelTatio, yText+yOffset);
                 }
                 yPrev = y;
             }
@@ -29796,7 +29829,7 @@ function IChartPainting()
         if (isHScreen==true)
         {
             var left=this.ChartBorder.GetLeftEx();
-            var right=this.ChartBorder.GetRightEx();
+            var right=this.ChartBorder.GetRightEx()+1;
             var top=this.ChartBorder.GetTop();
             var bottom=this.ChartBorder.GetBottom();
         }
@@ -29804,7 +29837,7 @@ function IChartPainting()
         {
             var left=this.ChartBorder.GetLeft();
             var right=this.ChartBorder.GetRight();
-            var top=this.ChartBorder.GetTopEx();
+            var top=this.ChartBorder.GetTopEx()-1;
             var bottom=this.ChartBorder.GetBottomEx();
         }
 
@@ -30739,7 +30772,8 @@ function ChartKLine()
     this.DaySummaryConfig=
     {
         Font: g_JSChartResource.DaySummaryKLine.Font,
-        TextColor: g_JSChartResource.DaySummaryKLine.TextColor
+        TextColor: g_JSChartResource.DaySummaryKLine.TextColor,
+        LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
     }
 
     this.AddToDaySummary=function(kItem)
@@ -30821,7 +30855,8 @@ function ChartKLine()
         this.DaySummaryConfig=
         {
             Font: g_JSChartResource.DaySummaryKLine.Font,
-            TextColor: g_JSChartResource.DaySummaryKLine.TextColor
+            TextColor: g_JSChartResource.DaySummaryKLine.TextColor,
+            LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
         }
             
     }
@@ -30925,6 +30960,7 @@ function ChartKLine()
             var yOpen=this.GetYFromData(data.Open,false);
             var yClose=this.GetYFromData(data.Close,false);
             this.DrawKRange.End=i;
+            this.AddToDaySummary(data);
 
             var kItemInfo={ Data:data, Coordinate:{ X:x, Low:yLow, High:yHigh, Close:yClose, Open:yOpen, Left:left, Right:right }};
 
@@ -31208,6 +31244,7 @@ function ChartKLine()
             var x=left+(right-left)/2;
             var yClose=this.GetYFromData(data.Close,false);
             this.DrawKRange.End=i;
+            this.AddToDaySummary(data);
 
             if (data.IsVirtual && this.PredictionConfig.Enable)    //预测数据|虚拟数据
             {
@@ -31351,6 +31388,7 @@ function ChartKLine()
             var x=left+(right-left)/2;
             var yClose=this.GetYFromData(data.Close,false);
             this.DrawKRange.End=i;
+            this.AddToDaySummary(data);
 
             if (data.IsVirtual && this.PredictionConfig.Enable)    //预测数据|虚拟数据
             {
@@ -31455,7 +31493,7 @@ function ChartKLine()
             this.ShowRange.End=i;
             if (!data || data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
 
-            this.AddToDaySummary(data);
+            
 
             var left=xOffset;
             var right=xOffset+dataWidth;
@@ -31469,6 +31507,7 @@ function ChartKLine()
 
             var kItemInfo={ Data:data, Coordinate:{ X:x, Low:yLow, High:yHigh, Close:yClose, Open:yOpen, Left:left, Right:right }};
 
+            this.AddToDaySummary(data);
             this.DrawKRange.End=i;
             if (ptMax.Value==null || ptMax.Value<data.High)     //求最大值
             {
@@ -35775,7 +35814,7 @@ function ChartKLine()
         this.Canvas.textBaseline = 'bottom';
 
         var border=this.ChartBorder.GetBorder();
-        var xText=border.Left+1;
+        var xText=border.Left+this.DaySummaryConfig.LeftMargin;
         var yText=border.Bottom;
 
         var textSize=GetTextSize(this.Canvas,text);
@@ -39077,6 +39116,32 @@ function ChartIndexTitle()
     delete this.newMethod;
 
     this.ClassName='ChartIndexTitle';    //类名
+    this.AryTitle=[];  //{ Date, Time, AryText:[ ] }
+    this.MapCache=null; //key=date/date-time  value={ Data:[] }
+
+    this.BuildCacheData=function()
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryTitle)) return;
+
+        for(var i=0;i<this.AryTitle.length;++i)
+        {
+            var item=this.AryTitle[i];
+            var key=this.BuildKey(item);
+            
+            mapData.set(key,{ Data:item });
+        }
+    }
+
+    this.GetItem=function(kItem)
+    {
+        if (!this.MapCache || this.MapCache.size<=0) return null;
+        var key=this.BuildKey(kItem);
+        if (!this.MapCache.has(key)) return null;
+
+        return this.MapCache.get(key);
+    }
 
     this.Draw=function()
     {
@@ -59969,44 +60034,39 @@ function ChartCorssCursor()
             var textSize={ Width:textWidth+4, Height:this.TextHeight, Text:[] };
             var buttonData={Y:y, YValue:yValue, FrameID:yValueExtend.FrameID };
 
-            if (this.Frame.ChartBorder.Left>=30)    //左边
+            var margin=this.LeftConfig.Margin;
+            var textOffset=this.LeftConfig.TextOffset;
+            var rtBG=null;
+            if (this.Frame.ChartBorder.Left>=30 && this.ShowTextMode.Left==1)    //左边
             {
-                var margin=this.LeftConfig.Margin;
-                var textOffset=this.LeftConfig.TextOffset;
-
-                var rtBG=null;
-                if (this.ShowTextMode.Left==1)
-                {
-                    var rtBG={ Right:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
-                    rtBG.Left=rtBG.Right-rtBG.Width;
-                    rtBG.Top=rtBG.YCenter-rtBG.Height/2;
-                    rtBG.Bottom=rtBG.Top+rtBG.Height;
+                var rtBG={ Right:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
+                rtBG.Left=rtBG.Right-rtBG.Width;
+                rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+                rtBG.Bottom=rtBG.Top+rtBG.Height;
 
-                    if (rtBG.Left<0) 
-                    {
-                        rtBG.Left=0;
-                        rtBG.Right=rtBG.Left+rtBG.Width;
-                    }
-                }
-                else if (this.ShowTextMode.Left==2) //在框架内显示
+                if (rtBG.Left<0) 
                 {
-                    var rtBG={ Left:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
+                    rtBG.Left=0;
                     rtBG.Right=rtBG.Left+rtBG.Width;
-                    rtBG.Top=rtBG.YCenter-rtBG.Height/2;
-                    rtBG.Bottom=rtBG.Top+rtBG.Height;
-                }
-
-                if (rtBG)
-                {
-                    this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
-                    this.Canvas.textAlign="left";
-                    this.Canvas.textBaseline="bottom";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
                 }
+                
+            }
+            else if (this.ShowTextMode.Left==2) //在框架内显示
+            {
+                var rtBG={ Left:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
+                rtBG.Right=rtBG.Left+rtBG.Width;
+                rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+                rtBG.Bottom=rtBG.Top+rtBG.Height;
             }
 
-            
+            if (rtBG)
+            {
+                this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+                this.Canvas.textAlign="left";
+                this.Canvas.textBaseline="bottom";
+                this.Canvas.fillStyle=this.TextColor;
+                this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
+            }
 
             var complexText=
             { 
@@ -60196,7 +60256,7 @@ function ChartCorssCursor()
                 this.Canvas.textBaseline="bottom";
                 this.Canvas.fillStyle=this.TextColor;
                 this.Canvas.fillText(text,rtBG.Left+textOffset.X,rtBG.Bottom+textOffset.Y,textWidth);
-        }
+            }
         }
 
         //子坐标Y轴
@@ -64171,33 +64231,40 @@ function DynamicChartTitlePainting()
         return aryText;
     }
 
-    this.FormatIndexTitle=function(value, dataInfo)
+    this.FormatIndexTitle=function(kItem, dataInfo)
     {
-        if (!value) return null;
+        var result=null;
+        var aryText=[];
+        if (dataInfo.Name) 
+        {
+            aryText.push({ Text:dataInfo.Name, Color:dataInfo.Color});
+            result={  Text:null, ArrayText:aryText };
+        }
 
-        if (IFrameSplitOperator.IsString(value)) return { Text:value, ArrayText:null };
+        if (!kItem) return result;
+        if (!dataInfo.Chart) return result;
+        
+        var titleItem=dataInfo.Chart.GetItem(kItem);
+        if (!titleItem || !titleItem.Data) return result;
+        if (!IFrameSplitOperator.IsNonEmptyArray(titleItem.Data.AryText)) return result;
 
-        if (IFrameSplitOperator.IsNonEmptyArray(value))
+        if (!result) result={ Text:null, ArrayText:aryText };
+        
+        for(var i=0;i<titleItem.Data.AryText.length;++i)
         {
-            var aryText=[];
-            for(var i=0;i<value.length;++i)
-            {
-                var item=value[i];
-                if (!item) continue;
-
-                var textItem={ Name:null, Text:null };
-                if (item.Name) textItem.Name=item.Name;
-                if (item.Text) textItem.Text=item.Text;
-                if (item.Color) textItem.Color=item.Color;
-                if (IFrameSplitOperator.IsNumber(item.LeftSpace))  textItem.LeftSpace=item.LeftSpace;
+            var item=titleItem.Data.AryText[i];
+            if (!item) continue;
 
-                aryText.push(textItem);
-            }
+            var textItem={ Name:null, Text:null };
+            if (item.Name) textItem.Name=item.Name;
+            if (item.Text) textItem.Text=item.Text;
+            if (item.Color) textItem.Color=item.Color;
+            if (IFrameSplitOperator.IsNumber(item.LeftSpace))  textItem.LeftSpace=item.LeftSpace;
 
-            return {  Text:null, ArrayText:aryText }
+            aryText.push(textItem);
         }
 
-        return null;
+        return result;
     }
 
     this.GetColor=function(price,yClose)
@@ -77918,7 +77985,8 @@ function JSChartResource()
     this.DaySummaryKLine=
     {
         Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
-        TextColor:"rgb(105,105,105)"
+        TextColor:"rgb(105,105,105)",
+        LeftMargin:2*GetDevicePixelRatio(),
     }
 
     //订单流配置
@@ -79378,6 +79446,7 @@ function JSChartResource()
             var dest=this.DaySummaryKLine;
             if (item.Font) dest.Font=item.Font;
             if (item.TextColor) dest.TextColor=item.TextColor;
+            if (IFrameSplitOperator.IsNumber(item.LeftMargin)) dest.LeftMargin=item.LeftMargin;
         }
 
         if (style.Index) 
@@ -125732,13 +125801,16 @@ function ScriptIndex(name,script,args,option)
         chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
         chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
         chart.Identify=this.Guid;
+        chart.Data=hqChart.GetKData();                  //绑定K线
         if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
         else chart.Color=this.GetDefaultColor(id);
-        chart.Data.Data=varItem.Data;
+        chart.AryTitle=varItem.Draw.DrawData.AryTitle;
+        chart.BuildCacheData();
         
         var titleIndex=windowIndex+1;
         var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
         titleData.DataType="ChartIndexTitle";
+        titleData.Chart=chart;
         hqChart.TitlePaint[titleIndex].Data[id]=titleData;
 
         this.SetChartIndexName(chart);
@@ -127556,6 +127628,9 @@ function ScriptIndex(name,script,args,option)
                     case "DRAWSVG":
                         this.CreateChartDrawSVG(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWTITLE":
+                        this.CreateTitle(hqChart,windowIndex,item,i);
+                        break;
                     case "MULTI_HTMLDOM":
                         this.CreateMulitHtmlDom(hqChart,windowIndex,item,i);
                         break;
@@ -127649,11 +127724,7 @@ function ScriptIndex(name,script,args,option)
             {
                 this.CreateArea(hqChart,windowIndex,item,i);
             }
-            else if (item.Type==10) //标题
-            {
-                this.CreateTitle(hqChart,windowIndex,item,i);
-            }
-
+        
             var titlePaint=hqChart.TitlePaint[windowIndex+1];
             if (titlePaint &&  titlePaint.Data && i<titlePaint.Data.length) //设置标题数值 小数位数和格式
             {
@@ -127930,6 +128001,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case "DRAWSVG":
                         this.CreateChartDrawSVG(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWTITLE":
+                        this.CreateTitle(hqChart,windowIndex,item,i);
+                        break;
                     case "MULTI_HTMLDOM":
                         this.CreateMulitHtmlDom(hqChart,windowIndex,item,i);
                         break;
@@ -128003,11 +128077,6 @@ function OverlayScriptIndex(name,script,args,option)
             {
                 this.CreateLine(hqChart,windowIndex,item,i, item.Type);
             }
-            else if (item.Type==10)
-            {
-                this.CreateTitle(hqChart,windowIndex,item,i);
-            }
-
             
 
             var titleData=titleInfo.Data[i];
@@ -128592,22 +128661,25 @@ function OverlayScriptIndex(name,script,args,option)
     {
         var overlayIndex=this.OverlayIndex;
         var frame=overlayIndex.Frame;
-        let chart=new ChartIndexTitle();
+        var chart=new ChartIndexTitle();
         chart.Canvas=hqChart.Canvas;
 
         chart.Name=varItem.Name;
         chart.ChartBorder=frame.Frame.ChartBorder;
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
-        
+        chart.Data=hqChart.GetKData();                  //绑定K线
+
         if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
         else chart.Color=this.GetDefaultColor(id);
-        chart.Data.Data=varItem.Data;
+        chart.AryTitle=varItem.Draw.DrawData.AryTitle;
+        chart.BuildCacheData();
 
         var titleIndex=windowIndex+1;
         var titlePaint=hqChart.TitlePaint[titleIndex];
         var titleData=new DynamicTitleData(chart.Data,chart.Name,chart.Color);
         titleData.DataType="ChartIndexTitle";
+        titleData.Chart=chart;
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
         
         this.SetChartIndexName(chart);
@@ -130223,6 +130295,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTITLE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+
+                    outVarItem.Draw=drawItem;
+                    
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=="MULTI_HTMLDOM")    //外部自己创建dom
                 {
                     drawItem.Text=draw.Text;
@@ -130781,6 +130865,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTITLE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+
+                    outVarItem.Draw=drawItem;
+                    
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -157899,7 +157995,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14669";
+var HQCHART_VERSION="1.1.14682";
 
 function PrintHQChartVersion()
 {