hqchart 1.1.13776 → 1.1.13781
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/umychart.vue.js
CHANGED
|
@@ -1915,7 +1915,7 @@ this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.To
|
|
|
1915
1915
|
{var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('ScatterPlotDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.Period=this.Period;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-charscatterplot-tooltip';//OX指标数据
|
|
1916
1916
|
this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;;this.Tooltip.style.display="block";}else if(toolTip.Type==7)//ChartDrawSVG
|
|
1917
1917
|
{var left=x;var top=y;var format=g_DivTooltipDataForamt.Create('ChartDrawSVGDataStringFormat');format.Value=toolTip;format.Symbol=this.Symbol;format.Period=this.Period;format.LanguageID=this.LanguageID;if(!format.Operator())return;var width=format.Width;this.Tooltip.className='jchart-chartdrawsvg-tooltip';//ChartDrawSVG指标数据
|
|
1918
|
-
this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;this.Tooltip.style.display="block";}};this.UpdateDOMTooltip=function(toolTipType,data){var _this12=this;if(!this.TooltipCache.IsShow)return;if(this.TooltipCache.Type!=toolTipType)return;if(!this.TooltipCache.Data)return;if(this.TooltipCache.Type===0){if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.Data))return;var lastItem=data.Data[data.Data.length-1];if(lastItem.Date!=this.TooltipCache.Data.Date)return;if(IFrameSplitOperator.IsNumber(lastItem.Time)&&lastItem.Time!=this.TooltipCache.Data.Time)return;var klinePaint=this.ChartPaint[0];var format=g_DivTooltipDataForamt.Create('HistoryDataStringFormat');format.Value={Data:lastItem,ChartPaint:klinePaint,Type:this.TooltipCache.Type};format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;format.GetEventCallback=function(id){return _this12.GetEventCallback(id);};if(!format.Operator())return;if(format.Text==this.TooltipCache.InnerHTML)return;this.Tooltip.innerHTML=format.Text;this.TooltipCache.InnerHTML=format.Text;}};this.HideTooltip=function(){this.TooltipCache.IsShow=false;this.TooltipCache.Type=null;this.TooltipCache.InnerHTML=null;this.TooltipCache.Data=null;if(this.Tooltip.style.display!="none")this.Tooltip.style.display="none";};this.UpdateSelectRect=function(start,end){if(!this.ChartPaint[0].Data)return;var paint=this.GetRectSelectPaint();if(!paint)return;var data=this.ChartPaint[0].Data;var startItem=data.Data[start];var endItem=data.Data[end];JSConsole.Chart.Log('[JSChartContainer::UpdateSelectRect]',startItem,endItem);paint.SetPoint(startItem,{Index:0,DataIndex:start});paint.SetPoint(endItem,{Index:1,DataIndex:end});this.Draw();};this.HideSelectRect=function(){this.ClearDragSelectRect();};this.ResetFrameXYSplit=function(){if(typeof this.Frame.ResetXYSplit=='function')this.Frame.ResetXYSplit();};this.ResetFrameXSplit=function(){if(typeof this.Frame.ResetXSplit=='function')this.Frame.ResetXSplit();};this.UpdateFrameMaxMinV2=function(){var mapFrame=new _map2.default();//key=frameid, value:{ ChartPaint:[] }
|
|
1918
|
+
this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.Tooltip.style.top=top+xMove+"px";this.Tooltip.style.width=width+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=format.Text;this.Tooltip.style.display="block";}};this.UpdateDOMTooltip=function(toolTipType,data){var _this12=this;if(!this.TooltipCache.IsShow)return;if(this.TooltipCache.Type!=toolTipType)return;if(!this.TooltipCache.Data)return;if(this.TooltipCache.Type===0){if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.Data))return;var lastItem=data.Data[data.Data.length-1];if(lastItem.Date!=this.TooltipCache.Data.Date)return;if(IFrameSplitOperator.IsNumber(lastItem.Time)&&lastItem.Time!=this.TooltipCache.Data.Time)return;var klinePaint=this.ChartPaint[0];var format=g_DivTooltipDataForamt.Create('HistoryDataStringFormat');format.Value={Data:lastItem,ChartPaint:klinePaint,Type:this.TooltipCache.Type};format.Symbol=this.Symbol;format.LanguageID=this.LanguageID;format.GetEventCallback=function(id){return _this12.GetEventCallback(id);};if(!format.Operator())return;if(format.Text==this.TooltipCache.InnerHTML)return;this.Tooltip.innerHTML=format.Text;this.TooltipCache.InnerHTML=format.Text;}};this.HideTooltip=function(){this.TooltipCache.IsShow=false;this.TooltipCache.Type=null;this.TooltipCache.InnerHTML=null;this.TooltipCache.Data=null;if(this.Tooltip.style.display!="none")this.Tooltip.style.display="none";};this.UpdateSelectRect=function(start,end){if(!this.ChartPaint[0].Data)return;var paint=this.GetRectSelectPaint();if(!paint)return;var data=this.ChartPaint[0].Data;var startItem=data.Data[start];var endItem=data.Data[end];JSConsole.Chart.Log('[JSChartContainer::UpdateSelectRect]',startItem,endItem);paint.SetPoint(startItem,{Index:0,DataIndex:start});paint.SetPoint(endItem,{Index:1,DataIndex:end});this.Draw();};this.HideSelectRect=function(){this.ClearDragSelectRect();};this.ResetFrameXYSplit=function(){if(typeof this.Frame.ResetXYSplit=='function')this.Frame.ResetXYSplit();};this.ResetFrameXSplit=function(){if(typeof this.Frame.ResetXSplit=='function')this.Frame.ResetXSplit();};this.ResetFrameYCustomSplit=function(){if(typeof this.Frame.ResetYCustomSplit=='function')this.Frame.ResetYCustomSplit();};this.UpdateFrameMaxMinV2=function(){var mapFrame=new _map2.default();//key=frameid, value:{ ChartPaint:[] }
|
|
1919
1919
|
for(var i=0;i<this.Frame.SubFrame.length;++i){var subItem=this.Frame.SubFrame[i];if(!subItem||!subItem.Frame)continue;var frame=subItem.Frame;//自定义刻度每次都调用
|
|
1920
1920
|
frame.YCustomSplit=true;var key=frame.Identify;var item={ID:key,Frame:frame,ChartPaint:[],Max:null,Min:null,OverlayFrame:[],//共享坐标
|
|
1921
1921
|
SingleOverlay:[],//独立坐标
|
|
@@ -2350,12 +2350,15 @@ this.GetYData=function(y,isLimit){if(this.Logarithmic&&this.GetYLogarithmicFromD
|
|
|
2350
2350
|
this.GetXData=function(x){if(x<=this.ChartBorder.GetLeft())return 0;if(x>=this.ChartBorder.GetRight())return this.XPointCount;return(x-this.ChartBorder.GetLeft())*(this.XPointCount*1.0/this.ChartBorder.GetWidth());};//选中的画图工具X,Y轴坐标信息
|
|
2351
2351
|
this.DrawPictureXCoordinate=function(drawPicture,range,option){if(this.IsHScreen)return;if(!range)return;if(!IFrameSplitOperator.IsNonEmptyArray(range.Points))return;var border=this.GetBorder();var left=border.Left;var right=border.Right;this.Canvas.font=this.DrawPicture.Font;var fontHeight=this.GetFontHeight();this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";if(range.X){var xRange=range.X;var xLeft=xRange.Min.X;var xRight=xRange.Max.X;if(xLeft<left)xLeft=left;if(xRight>right)xRight=right;this.Canvas.fillStyle=this.DrawPicture.BGColor;this.Canvas.fillRect(xLeft,border.Bottom,xRight-xLeft,fontHeight);}for(var i=0;i<range.Points.length;++i){var item=range.Points[i];if(item.X<left||item.X>right)continue;var index=this.GetXData(item.X,false);var index=Math.round(index);var kItem=this.GetKItem(index);if(kItem){var text=IFrameSplitOperator.FormatDateString(kItem.Date,null);if(ChartData.IsMinutePeriod(option.Period))text+=" "+IFrameSplitOperator.FormatTimeString(kItem.Time,"HH:MM");else if(ChartData.IsMilliSecondPeriod(option.Period))text+=" "+IFrameSplitOperator.FormatTimeString(kItem.Time,"HH:MM:SS.fff");var textWidth=this.Canvas.measureText(text).width+2;var textLeft=item.X-textWidth/2;if(textLeft<left)textLeft=left;this.Canvas.fillStyle=this.DrawPicture.TextBGColor;this.Canvas.fillRect(textLeft,border.Bottom,textWidth,fontHeight);this.Canvas.fillStyle=this.DrawPicture.TextColor;var yCenter=border.Bottom+fontHeight;this.Canvas.fillText(text,textLeft+1,yCenter);}}};this.GetKItem=function(currentIndex){if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=this.Data.DataOffset+currentIndex;return this.Data.Data[index];};this.DrawPictureYCoordinate=function(drawPicture,range,option){if(this.IsHScreen)return;if(!range)return;if(!IFrameSplitOperator.IsNonEmptyArray(range.Points))return;var border=this.GetBorder();var top=border.TopEx;var bottom=border.BottomEx;var right=border.Right;this.Canvas.font=this.DrawPicture.Font;var fontHeight=this.GetFontHeight();this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var defaultfloatPrecision=2;if(option&&option.Symbol)defaultfloatPrecision=GetfloatPrecision(option.Symbol);var textWidth=0;for(var i=0;i<range.Points.length;++i){var item=range.Points[i];var Value=this.GetYData(item.Y);var text=Value.toFixed(defaultfloatPrecision);var value=this.Canvas.measureText(text).width;if(textWidth<value)textWidth=value;range.Points[i].Text=text;}textWidth+=this.YTextPadding[1]+2;if(range.Y){var yRange=range.Y;var yTop=yRange.Min.Y;var yBottom=yRange.Max.Y;if(yRange.Min.Y<top)yTop=top;if(yRange.Max.Y>bottom)yBottom=bottom;this.Canvas.fillStyle=this.DrawPicture.BGColor;this.Canvas.fillRect(right,yTop,textWidth+5,yBottom-yTop);}for(var i=0;i<range.Points.length;++i){var item=range.Points[i];if(item.Y<top||item.Y>bottom)continue;this.Canvas.fillStyle=this.DrawPicture.TextBGColor;this.Canvas.fillRect(right,item.Y-fontHeight/2,textWidth,fontHeight);this.Canvas.fillStyle=this.DrawPicture.TextColor;var yText=item.Y+fontHeight/2;this.Canvas.fillText(item.Text,right+this.YTextPadding[1],yText);}};this.DrawPicturePointYCoordinate=function(drawPicture,option){if(this.IsHScreen)return;if(!drawPicture.GetYCoordinatePoint)return;var aryPoint=drawPicture.GetYCoordinatePoint();if(!IFrameSplitOperator.IsNonEmptyArray(aryPoint))return;var border=this.GetBorder();var top=border.TopEx;var bottom=border.BottomEx;var right=border.Right;this.Canvas.font=this.DrawPicture.Font;var fontHeight=this.GetFontHeight();this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var defaultfloatPrecision=2;if(option&&option.Symbol)defaultfloatPrecision=GetfloatPrecision(option.Symbol);for(var i=0;i<aryPoint.length;++i){var item=aryPoint[i];if(!item)continue;if(item.Y<top||item.Y>bottom)continue;var text=item.YValue.toFixed(defaultfloatPrecision);var textWidth=this.Canvas.measureText(text).width+2;textWidth+=this.YTextPadding[1];this.Canvas.fillStyle=this.DrawPicture.TextBGColor;this.Canvas.fillRect(right,item.Y-fontHeight/2,textWidth,fontHeight);this.Canvas.fillStyle=this.DrawPicture.TextColor;var yText=item.Y+fontHeight/2;this.Canvas.fillText(text,right+this.YTextPadding[1],yText);}};//字体外部设置好
|
|
2352
2352
|
this.GetCustomItemTextInfo=function(item,bLeft,pixelTatio){var text=bLeft?item.Message[0]:item.Message[1];var aryText=[];var width=0;if(Array.isArray(text)){for(var i=0;i<text.length;++i){var item=text[i];if(item.Type===1){aryText.push({Type:item.Type});}else{var value=this.Canvas.measureText(text[i].Text).width;if(value>width)width=value;var outItem={Text:text[i].Text,Width:value+2*pixelTatio};if(item.TextColor)outItem.TextColor=item.TextColor;aryText.push(outItem);}}if(width>0)width+=2*pixelTatio;}else{width=this.Canvas.measureText(text).width+2*pixelTatio;aryText.push({Text:text,Width:width});}return{MaxWidth:width,Text:aryText};};this.DrawOutRangeCustomItem=function(item,mapTextRect){if(this.IsHScreen===true)return;if(!this.IsShow&&!this.IsYDrawMainFrame)return;if(!item.Message[1]&&!item.Message[0])return;if(!item.OutRange)return;var position=0;//1=top 2=bottom
|
|
2353
|
-
if(item.Value>this.HorizontalMax)position=1;else if(item.Value<this.HorizontalMin)position=2;else return;this.Canvas.save();var outRange=item.OutRange;var border=this.GetBorder();var left=border.Left;var right=border.Right;var bottom=border.Bottom;var top=border.Top;var borderRight=this.ChartBorder.Right;var borderLeft=this.ChartBorder.Left;var titleHeight=this.ChartBorder.TitleHeight;if(this.IsHScreen){borderLeft=this.ChartBorder.Top;borderRight=this.ChartBorder.Bottom;top=border.Top;bottom=border.Bottom;}var pixelTatio=GetDevicePixelRatio();var defaultTextHeight=18*pixelTatio;var textHeight=defaultTextHeight;if(item.Message[0]&&borderLeft>=10){
|
|
2353
|
+
if(item.Value>this.HorizontalMax)position=1;else if(item.Value<this.HorizontalMin)position=2;else return;this.Canvas.save();var outRange=item.OutRange;var border=this.GetBorder();var left=border.Left;var right=border.Right;var bottom=border.Bottom;var top=border.Top;var borderRight=this.ChartBorder.Right;var borderLeft=this.ChartBorder.Left;var titleHeight=this.ChartBorder.TitleHeight;if(this.IsHScreen){borderLeft=this.ChartBorder.Top;borderRight=this.ChartBorder.Bottom;top=border.Top;bottom=border.Bottom;}var pixelTatio=GetDevicePixelRatio();var defaultTextHeight=18*pixelTatio;var textHeight=defaultTextHeight;if(item.Message[0]&&borderLeft>=10){if(item.Font!=null)this.Canvas.font=item.Font;var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);var textWidth=textInfo.MaxWidth;var itemLeft=left-textWidth;var fontHeight=this.GetFontHeight();var textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;this.Canvas.textAlign="right";this.Canvas.textBaseline="middle";var yText=null;if(position==1){yText=border.TopEx;if(IFrameSplitOperator.IsNumber(outRange.TopYOffset))yText+=outRange.TopYOffset;}else if(position==2){yText=border.BottomEx+textHeight;if(IFrameSplitOperator.IsNumber(outRange.BottomYOffset))yText+=outRange.BottomYOffset;}for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];var rtBG={Left:itemLeft,Width:itemText.Width,Bottom:yText,Height:textHeight};rtBG.Top=rtBG.Bottom-rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;if(item.ExtendLine&&item.ExtendLine[0])//右侧延长线
|
|
2354
|
+
{var exLine=item.ExtendLine[0];if(IFrameSplitOperator.IsNumber(exLine.Width)){var yLine=rtBG.Bottom;if(position==2)yLine=rtBG.Top;var lineType=item.LineType;if(IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type))lineType=outRange.ExtendLine.Type;if(i==0)this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);rtBG.Left-=exLine.Width;rtBG.Right-=exLine.Width;}}this.Canvas.fillStyle=outRange.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);if(outRange.Border&&outRange.Border.Color){if(IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))this.Canvas.setLineDash(outRange.Border.LineDash);//虚线
|
|
2355
|
+
this.Canvas.strokeStyle=outRange.Border.Color;this.Canvas.strokeRect(ToFixedPoint(rtBG.Left),ToFixedPoint(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));}this.Canvas.fillStyle=outRange.TextColor;this.Canvas.fillText(itemText.Text,rtBG.Right-1*pixelTatio,rtBG.Top+rtBG.Height/2+1*pixelTatio);yText+=textHeight+1;}}else if(item.Message[1]&&borderRight>=10){if(item.Font!=null)this.Canvas.font=item.Font;var textInfo=this.GetCustomItemTextInfo(item,false,pixelTatio);var textWidth=textInfo.MaxWidth;var itemRight=right+textWidth;var fontHeight=this.GetFontHeight();var textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";var yText=null;if(position==1){yText=border.TopEx;if(IFrameSplitOperator.IsNumber(outRange.TopYOffset))yText+=outRange.TopYOffset;}else if(position==2){yText=border.BottomEx+textHeight;if(IFrameSplitOperator.IsNumber(outRange.BottomYOffset))yText+=outRange.BottomYOffset;}for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];var rtBG={Right:itemRight,Width:itemText.Width,Bottom:yText,Height:textHeight};rtBG.Top=rtBG.Bottom-rtBG.Height;rtBG.Left=rtBG.Right-rtBG.Width;if(item.ExtendLine&&item.ExtendLine[1])//右侧延长线
|
|
2354
2356
|
{var exLine=item.ExtendLine[1];if(IFrameSplitOperator.IsNumber(exLine.Width)){var yLine=rtBG.Bottom;if(position==2)yLine=rtBG.Top;var lineType=item.LineType;if(IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type))lineType=outRange.ExtendLine.Type;if(i==0)this.DrawLine(right,right+exLine.Width,yLine,item.LineColor,lineType,item);rtBG.Left+=exLine.Width;rtBG.Right+=exLine.Width;}}this.Canvas.fillStyle=outRange.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);if(outRange.Border&&outRange.Border.Color){if(IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))this.Canvas.setLineDash(outRange.Border.LineDash);//虚线
|
|
2355
2357
|
this.Canvas.strokeStyle=outRange.Border.Color;this.Canvas.strokeRect(ToFixedPoint(rtBG.Left),ToFixedPoint(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));}this.Canvas.fillStyle=outRange.TextColor;this.Canvas.fillText(itemText.Text,rtBG.Left+1*pixelTatio,rtBG.Top+rtBG.Height/2+1*pixelTatio);yText+=textHeight+1;}}this.Canvas.restore();};this.DrawCustomItem=function(item,mapTextRect)//显示自定义Y刻度
|
|
2356
2358
|
{if(!item.Message[1]&&!item.Message[0])return;if(item.Value>this.HorizontalMax||item.Value<this.HorizontalMin){this.DrawOutRangeCustomItem(item,mapTextRect);this.SendDrawCountDownEvent({IsShow:false});return;}var border=this.GetBorder();var left=border.Left;var right=border.Right;var bottom=border.Bottom;var top=border.Top;var borderRight=this.ChartBorder.Right;var borderLeft=this.ChartBorder.Left;var titleHeight=this.ChartBorder.TitleHeight;if(this.IsHScreen){borderLeft=this.ChartBorder.Top;borderRight=this.ChartBorder.Bottom;top=border.Top;bottom=border.Bottom;}var pixelTatio=GetDevicePixelRatio();var defaultTextHeight=18*pixelTatio;var textHeight=defaultTextHeight;var y;if(item.Value=="TopEx")y=border.TopEx;else if(item.Value=="TopTitle")y=border.TopTitle;else if(item.Value=="Top")y=border.Top;else if(item.Value=="BottomEx")y=border.BottomEx;else if(item.Value=="Bottom")y=border.Bottom;else y=this.GetYFromData(item.Value);if(IFrameSplitOperator.IsNumber(item.YOffset))y+=item.YOffset;var position=0;var emptyBGColor;if(item.ExtendData&&item.ExtendData.Custom){var customItem=item.ExtendData.Custom;if(IFrameSplitOperator.IsNumber(customItem.Position))position=customItem.Position;if(customItem.EmptyBGColor)emptyBGColor=customItem.EmptyBGColor;}if(item.Message[0])// 左
|
|
2357
2359
|
{if(borderLeft<10||position==1){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);var textWidth=textInfo.MaxWidth;var fontHeight=this.GetFontHeight();textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;var bgColor=item.LineColor;var rgb=this.RGBToStruct(item.LineColor);if(rgb)bgColor='rgba('+rgb.R+', '+rgb.G+', '+rgb.B+', '+g_JSChartResource.FrameLatestPrice.BGAlpha+')';//内部刻度 背景增加透明度
|
|
2358
|
-
var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){var bgTop=top;var textLeft=yText-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,itemText.Width);this.DrawHScreenText({X:yText,Y:bgTop},{Text:itemText.Text,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});if(i==0)this.DrawLine(bgTop+itemText.Width,bottom,yText,item.LineColor,item.LineType,item);yText-=textHeight+1*pixelTatio;}else{if(itemText.Type===1){}else{var bgTop=yText-textHeight/2-1*pixelTatio;var textLeft=left+1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,itemText.Width,textHeight);this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(itemText.Text,textLeft+1*pixelTatio,yText);if(i==0)this.DrawLine(textLeft+itemText.Width,right,yText,item.LineColor,item.LineType,item);yText+=textHeight+1*pixelTatio;}}}}else{if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.textAlign="right";this.Canvas.textBaseline="middle";var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);var textWidth=textInfo.MaxWidth;var fontHeight=this.GetFontHeight();textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){if(i==0)var bgTop=top-itemText.Width;else var bgTop=top-textWidth;var textLeft=yText-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=item.LineColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,itemText.Width);this.DrawHScreenText({X:yText,Y:bgTop},{Text:itemText.Text,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});if(i==0)this.DrawLine(bgTop+itemText.Width,bottom,yText,item.LineColor,item.LineType,item);yText-=textHeight+1*pixelTatio;}else{var bgTop=yText-textHeight/2-1*pixelTatio;if(i==0){var rectLeft=left-itemText.Width;var textLeft=left;}else{var rectLeft=left-textWidth;var textLeft=left-(textWidth-itemText.Width);}if(
|
|
2360
|
+
var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){var bgTop=top;var textLeft=yText-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,itemText.Width);this.DrawHScreenText({X:yText,Y:bgTop},{Text:itemText.Text,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});if(i==0)this.DrawLine(bgTop+itemText.Width,bottom,yText,item.LineColor,item.LineType,item);yText-=textHeight+1*pixelTatio;}else{if(itemText.Type===1){}else{var bgTop=yText-textHeight/2-1*pixelTatio;var textLeft=left+1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,itemText.Width,textHeight);this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(itemText.Text,textLeft+1*pixelTatio,yText);if(i==0)this.DrawLine(textLeft+itemText.Width,right,yText,item.LineColor,item.LineType,item);yText+=textHeight+1*pixelTatio;}}}}else{if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.textAlign="right";this.Canvas.textBaseline="middle";var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);var textWidth=textInfo.MaxWidth;var fontHeight=this.GetFontHeight();textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){if(i==0)var bgTop=top-itemText.Width;else var bgTop=top-textWidth;var textLeft=yText-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=item.LineColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,itemText.Width);this.DrawHScreenText({X:yText,Y:bgTop},{Text:itemText.Text,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});if(i==0)this.DrawLine(bgTop+itemText.Width,bottom,yText,item.LineColor,item.LineType,item);yText-=textHeight+1*pixelTatio;}else{var bgTop=yText-textHeight/2-1*pixelTatio;if(i==0){var rectLeft=left-itemText.Width;var textLeft=left;}else{var rectLeft=left-textWidth;var textLeft=left-(textWidth-itemText.Width);}if(item.ExtendLine&&item.ExtendLine[0])//右侧延长线
|
|
2361
|
+
{var exLine=item.ExtendLine[0];if(IFrameSplitOperator.IsNumber(exLine.Width)){if(i==0)this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);textLeft-=exLine.Width;rectLeft-=exLine.Width;}}if(emptyBGColor){this.Canvas.fillStyle=emptyBGColor;this.Canvas.fillRect(rectLeft-1,bgTop,itemText.Width+1,textHeight);this.Canvas.strokeStyle=item.LineColor;this.Canvas.strokeRect(ToFixedPoint(rectLeft-1),ToFixedPoint(bgTop),ToFixedPoint(itemText.Width+1),ToFixedPoint(textHeight));this.Canvas.fillStyle=item.LineColor;this.Canvas.fillText(itemText.Text,textLeft-1*pixelTatio,yText);}else{this.Canvas.fillStyle=item.LineColor;this.Canvas.fillRect(rectLeft,bgTop,itemText.Width,textHeight);this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(itemText.Text,textLeft-1*pixelTatio,yText);}if(i==0)this.DrawLine(left,right,yText,item.LineColor,item.LineType,item);yText+=textHeight+1*pixelTatio;}}}}else if(item.Message[1])//右
|
|
2359
2362
|
{if(borderRight<10||position==1){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";var textInfo=this.GetCustomItemTextInfo(item,false,pixelTatio);var textWidth=textInfo.MaxWidth;var fontHeight=this.GetFontHeight();textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;var bgColor=item.LineColor;var rgb=this.RGBToStruct(item.LineColor);if(rgb)bgColor='rgba('+rgb.R+', '+rgb.G+', '+rgb.B+', '+g_JSChartResource.FrameLatestPrice.BGAlpha+')';//内部刻度 背景增加透明度
|
|
2360
2363
|
var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){var bgTop=bottom-itemText.Width;var textLeft=yText-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,itemText.Width);this.DrawHScreenText({X:yText,Y:bgTop},{Text:itemText.Text,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});if(i==0)this.DrawLine(top,bgTop,yText,item.LineColor,item.LineType,item);yText-=textHeight+1*pixelTatio;}else{if(itemText.Type===1){if(this.GetEventCallback){var bgTop=yText-textHeight/2-1*pixelTatio;var sendData={Top:bgTop,Right:right,Height:null,IsShow:true,BGColor:item.LineColor,TextColor:item.TextColor,PixelTatio:pixelTatio,Position:"Right",IsInside:true};if(this.SendDrawCountDownEvent(sendData)){if(IFrameSplitOperator.IsPlusNumber(sendData.Height))yText+=textHeight+1*pixelTatio;}}}else{var bgTop=yText-textHeight/2-1*pixelTatio;var textLeft=right-itemText.Width;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,itemText.Width,textHeight);//文本背景区域
|
|
2361
2364
|
if(itemText.TextColor)this.Canvas.fillStyle=itemText.TextColor;else this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(itemText.Text,textLeft+1*pixelTatio,yText);if(i==0)this.DrawLine(left,textLeft,yText,item.LineColor,item.LineType,item);yText+=textHeight+1*pixelTatio;}}}if(item.Type==3||item.Type==4){if(item.Title){var width=this.Canvas.measureText(item.Title).width+2*pixelTatio;if(this.IsHScreen){var bgTop=bottom-itemText.Width-width;var textLeft=y-textHeight/2-1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,textHeight,width);this.DrawHScreenText({X:y,Y:bgTop},{Text:item.Title,Color:item.TextColor,XOffset:1*pixelTatio,YOffset:2*pixelTatio});}else{var bgTop=y-textHeight/2-1*pixelTatio;var textLeft=right-textWidth-width-1*pixelTatio;this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(textLeft,bgTop,width,textHeight);this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Title,textLeft+1*pixelTatio,y);}}}}else{if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";var textInfo=this.GetCustomItemTextInfo(item,false,pixelTatio);var textWidth=textInfo.MaxWidth;var fontHeight=this.GetFontHeight();textHeight=fontHeight>defaultTextHeight?fontHeight:defaultTextHeight;var preTextRect=null;if(mapTextRect&&mapTextRect.has(3))preTextRect=mapTextRect.get(3);var yText=y;var rtText={};for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i];if(this.IsHScreen){var bgTop=bottom;//bgTop+=(textWidth-itemText.Width);
|
|
@@ -2934,7 +2937,7 @@ if(x>=left&&x<=right&&y>bottom&&y<chartHeight)return-3;return-1;};this.PtInChart
|
|
|
2934
2937
|
{for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];var left=item.Frame.ChartBorder.GetLeft();var top=item.Frame.ChartBorder.GetTopEx();var width=item.Frame.ChartBorder.GetWidth();var height=item.Frame.ChartBorder.GetHeightEx();item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(left,top,width,height);if(item.Frame.Canvas.isPointInPath(x,y)){return i;//转成整形
|
|
2935
2938
|
}}return-1;};this.PtInButtons=function(x,y){for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(item.Height<=0)continue;var button=item.Frame.PtInButtons(x,y);if(button){button.Frame=item.Frame;button.FrameID=i;return button;}for(var j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];var overlayFrame=overlayItem.Frame;if(!overlayFrame||!overlayFrame.PtInButtons)continue;var button=overlayFrame.PtInButtons(x,y);if(button){button.IndexID=overlayItem.Identify;button.FrameID=i;button.OverlayFrame=overlayFrame;button.Frame=item.Frame;return button;}}}return null;};//是否在X轴坐标上
|
|
2936
2939
|
this.PtInFrameBottom=function(x,y){var left=this.ChartBorder.GetLeft();var top=this.ChartBorder.GetBottom();var width=this.ChartBorder.GetWidth();var height=this.ChartBorder.Bottom;this.Canvas.beginPath();this.Canvas.rect(left,top,width,height);if(this.Canvas.isPointInPath(x,y))return true;return false;};this.PtInFrameVertical=function(x,y){for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(item.Height<=0)continue;if(!item.Frame.PtInVertical)continue;if(item.Frame.PtInVertical(x,y)){return{Frame:item.Frame};}}return null;};this.GetXFromIndex=function(index){return this.SubFrame[0].Frame.GetXFromIndex(index);};this.GetYFromData=function(value){return this.SubFrame[0].Frame.GetYFromData(value);};this.ZoomUp=function(cursorIndex){var result=this.SubFrame[0].Frame.ZoomUp(cursorIndex);this.UpdateAllFrame();return result;};this.ZoomDown=function(cursorIndex,option){var result=this.SubFrame[0].Frame.ZoomDown(cursorIndex,option);this.UpdateAllFrame();return result;};this.SetXShowCount=function(showCount){var result=this.SubFrame[0].Frame.SetXShowCount(showCount);this.UpdateAllFrame();return result;};this.GetXShowCount=function(){var xPointcount=-1;if(!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame))return xPointcount;var subFrame=this.SubFrame[0];if(!subFrame.Frame)return xPointcount;xPointcount=subFrame.Frame.XPointCount;return xPointcount;};this.XCoordinateZoom=function(step,isMoveLeft){var result=this.SubFrame[0].Frame.XCoordinateZoom(step,isMoveLeft);this.UpdateAllFrame();return result;};//设置重新计算刻度坐标
|
|
2937
|
-
this.ResetXYSplit=function(){for(var _i in this.SubFrame){this.SubFrame[_i].Frame.XYSplit=true;}};this.ResetXSplit=function(){for(var _i2 in this.SubFrame){this.SubFrame[_i2].Frame.XSplit=true;}};//清空Y轴坐标的最大最小值
|
|
2940
|
+
this.ResetXYSplit=function(){for(var _i in this.SubFrame){this.SubFrame[_i].Frame.XYSplit=true;}};this.ResetXSplit=function(){for(var _i2 in this.SubFrame){this.SubFrame[_i2].Frame.XSplit=true;}};this.ResetYCustomSplit=function(windowIndex){if(!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame))return;if(IFrameSplitOperator.IsNumber(windowIndex)&&windowIndex>=0){var item=this.SubFrame[windowIndex];if(item.Frame)item.Frame.YCustomSplit=true;}else{for(var i=0;i<this.SubFrame.length;++i){this.SubFrame[i].Frame.YCustomSplit=true;}}};//清空Y轴坐标的最大最小值
|
|
2938
2941
|
this.ClearYCoordinateMaxMin=function(windowIndex){if(IFrameSplitOperator.IsNumber(windowIndex)){var subItem=this.SubFrame[windowIndex];if(!subItem||!subItem.Frame)return;var frame=subItem.Frame;if(frame.YMaxMin){frame.YMaxMin.Max=null;frame.YMaxMin.Min=null;}}else{for(var i=0;i<this.SubFrame.length;++i){var subItem=this.SubFrame[i];var frame=subItem.Frame;if(frame.YMaxMin){frame.YMaxMin.Max=null;frame.YMaxMin.Min=null;}}}};this.SetLanguage=function(languageID){for(var _i3 in this.SubFrame){var item=this.SubFrame[_i3];if(item&&item.Frame){if(item.Frame.YSplitOperator)item.Frame.YSplitOperator.LanguageID=languageID;if(item.Frame.XSplitOperator)item.Frame.XSplitOperator.LanguageID=languageID;}}};this.GetCurrentPageSize=function()//获取当前页显示的数据个数
|
|
2939
2942
|
{if(this.SubFrame.length<=0)return null;var item=this.SubFrame[0];if(!item||!item.Frame)return null;return item.Frame.XPointCount;};this.OnSize=function(){var obj={};this.SubFrame[0].Frame.OnSize(obj);this.UpdateAllFrame();return obj;};this.SetDataWidth=function(dataWidth){var obj=this.SubFrame[0].Frame.SetDataWidth(dataWidth);this.UpdateAllFrame();return obj;};this.UpdateAllFrame=function(){var mainFrame=this.SubFrame[0].Frame;for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(i>0)//第1个窗口主坐标已经算好了
|
|
2940
2943
|
{item.Frame.XPointCount=mainFrame.XPointCount;item.Frame.ZoomIndex=mainFrame.ZoomIndex;item.Frame.DataWidth=mainFrame.DataWidth;item.Frame.DistanceWidth=mainFrame.DistanceWidth;item.Frame.LastCalculateStatus.Width=mainFrame.LastCalculateStatus.Width;item.Frame.LastCalculateStatus.XPointCount=mainFrame.LastCalculateStatus.XPointCount;}for(var j in item.OverlayIndex){var overlayItem=this.SubFrame[i].OverlayIndex[j];overlayItem.Frame.XPointCount=mainFrame.XPointCount;overlayItem.Frame.ZoomIndex=mainFrame.ZoomIndex;overlayItem.Frame.DataWidth=mainFrame.DataWidth;overlayItem.Frame.DistanceWidth=mainFrame.DistanceWidth;overlayItem.Frame.LastCalculateStatus.Width=mainFrame.LastCalculateStatus.Width;overlayItem.Frame.LastCalculateStatus.XPointCount=mainFrame.LastCalculateStatus.XPointCount;}}};//鼠标是否在边框上
|
|
@@ -13768,7 +13771,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13768
13771
|
this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
|
|
13769
13772
|
* 版本信息输出
|
|
13770
13773
|
*
|
|
13771
|
-
*/var HQCHART_VERSION="1.1.
|
|
13774
|
+
*/var HQCHART_VERSION="1.1.13780";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13772
13775
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13773
13776
|
// BaseIndex:BaseIndex,
|
|
13774
13777
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -7096,6 +7096,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7096
7096
|
this.Frame.ResetXSplit();
|
|
7097
7097
|
}
|
|
7098
7098
|
|
|
7099
|
+
this.ResetFrameYCustomSplit=function()
|
|
7100
|
+
{
|
|
7101
|
+
if (typeof(this.Frame.ResetYCustomSplit)=='function')
|
|
7102
|
+
this.Frame.ResetYCustomSplit();
|
|
7103
|
+
}
|
|
7104
|
+
|
|
7099
7105
|
this.UpdateFrameMaxMinV2=function()
|
|
7100
7106
|
{
|
|
7101
7107
|
var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
|
|
@@ -12249,7 +12255,67 @@ function AverageWidthFrame()
|
|
|
12249
12255
|
|
|
12250
12256
|
if (item.Message[0] && borderLeft>=10)
|
|
12251
12257
|
{
|
|
12258
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
12259
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
12260
|
+
var textWidth=textInfo.MaxWidth;
|
|
12261
|
+
var itemLeft=left-textWidth;
|
|
12262
|
+
var fontHeight=this.GetFontHeight();
|
|
12263
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
12264
|
+
this.Canvas.textAlign = "right";
|
|
12265
|
+
this.Canvas.textBaseline = "middle";
|
|
12266
|
+
|
|
12267
|
+
var yText=null;
|
|
12268
|
+
if (position==1)
|
|
12269
|
+
{
|
|
12270
|
+
yText=border.TopEx;
|
|
12271
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
12272
|
+
}
|
|
12273
|
+
else if (position==2)
|
|
12274
|
+
{
|
|
12275
|
+
yText=border.BottomEx+textHeight;
|
|
12276
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
12277
|
+
}
|
|
12278
|
+
|
|
12279
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
12280
|
+
{
|
|
12281
|
+
var itemText=textInfo.Text[i];
|
|
12282
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
12283
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
12284
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
12252
12285
|
|
|
12286
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
12287
|
+
{
|
|
12288
|
+
var exLine=item.ExtendLine[0];
|
|
12289
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
12290
|
+
{
|
|
12291
|
+
var yLine=rtBG.Bottom;
|
|
12292
|
+
if (position==2) yLine=rtBG.Top;
|
|
12293
|
+
var lineType=item.LineType;
|
|
12294
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
12295
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
12296
|
+
|
|
12297
|
+
rtBG.Left-=exLine.Width;
|
|
12298
|
+
rtBG.Right-=exLine.Width;
|
|
12299
|
+
}
|
|
12300
|
+
}
|
|
12301
|
+
|
|
12302
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
12303
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
12304
|
+
if (outRange.Border && outRange.Border.Color)
|
|
12305
|
+
{
|
|
12306
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
12307
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
12308
|
+
|
|
12309
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
12310
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
12311
|
+
}
|
|
12312
|
+
|
|
12313
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
12314
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
12315
|
+
|
|
12316
|
+
yText+=textHeight+1;
|
|
12317
|
+
}
|
|
12318
|
+
|
|
12253
12319
|
}
|
|
12254
12320
|
else if (item.Message[1] && borderRight>=10)
|
|
12255
12321
|
{
|
|
@@ -12460,6 +12526,18 @@ function AverageWidthFrame()
|
|
|
12460
12526
|
var textLeft=left-(textWidth-itemText.Width);
|
|
12461
12527
|
}
|
|
12462
12528
|
|
|
12529
|
+
|
|
12530
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
12531
|
+
{
|
|
12532
|
+
var exLine=item.ExtendLine[0];
|
|
12533
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
12534
|
+
{
|
|
12535
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
12536
|
+
textLeft-=exLine.Width;
|
|
12537
|
+
rectLeft-=exLine.Width
|
|
12538
|
+
}
|
|
12539
|
+
}
|
|
12540
|
+
|
|
12463
12541
|
if (emptyBGColor)
|
|
12464
12542
|
{
|
|
12465
12543
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -19659,6 +19737,24 @@ function HQTradeFrame()
|
|
|
19659
19737
|
}
|
|
19660
19738
|
}
|
|
19661
19739
|
|
|
19740
|
+
this.ResetYCustomSplit=function(windowIndex)
|
|
19741
|
+
{
|
|
19742
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame)) return;
|
|
19743
|
+
|
|
19744
|
+
if (IFrameSplitOperator.IsNumber(windowIndex) && windowIndex>=0)
|
|
19745
|
+
{
|
|
19746
|
+
var item=this.SubFrame[windowIndex];
|
|
19747
|
+
if (item.Frame) item.Frame.YCustomSplit=true;
|
|
19748
|
+
}
|
|
19749
|
+
else
|
|
19750
|
+
{
|
|
19751
|
+
for(var i=0;i<this.SubFrame.length;++i)
|
|
19752
|
+
{
|
|
19753
|
+
this.SubFrame[i].Frame.YCustomSplit=true;
|
|
19754
|
+
}
|
|
19755
|
+
}
|
|
19756
|
+
}
|
|
19757
|
+
|
|
19662
19758
|
//清空Y轴坐标的最大最小值
|
|
19663
19759
|
this.ClearYCoordinateMaxMin=function(windowIndex)
|
|
19664
19760
|
{
|
|
@@ -11021,6 +11021,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11021
11021
|
this.Frame.ResetXSplit();
|
|
11022
11022
|
}
|
|
11023
11023
|
|
|
11024
|
+
this.ResetFrameYCustomSplit=function()
|
|
11025
|
+
{
|
|
11026
|
+
if (typeof(this.Frame.ResetYCustomSplit)=='function')
|
|
11027
|
+
this.Frame.ResetYCustomSplit();
|
|
11028
|
+
}
|
|
11029
|
+
|
|
11024
11030
|
this.UpdateFrameMaxMinV2=function()
|
|
11025
11031
|
{
|
|
11026
11032
|
var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
|
|
@@ -16174,7 +16180,67 @@ function AverageWidthFrame()
|
|
|
16174
16180
|
|
|
16175
16181
|
if (item.Message[0] && borderLeft>=10)
|
|
16176
16182
|
{
|
|
16183
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
16184
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
16185
|
+
var textWidth=textInfo.MaxWidth;
|
|
16186
|
+
var itemLeft=left-textWidth;
|
|
16187
|
+
var fontHeight=this.GetFontHeight();
|
|
16188
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
16189
|
+
this.Canvas.textAlign = "right";
|
|
16190
|
+
this.Canvas.textBaseline = "middle";
|
|
16191
|
+
|
|
16192
|
+
var yText=null;
|
|
16193
|
+
if (position==1)
|
|
16194
|
+
{
|
|
16195
|
+
yText=border.TopEx;
|
|
16196
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
16197
|
+
}
|
|
16198
|
+
else if (position==2)
|
|
16199
|
+
{
|
|
16200
|
+
yText=border.BottomEx+textHeight;
|
|
16201
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
16202
|
+
}
|
|
16203
|
+
|
|
16204
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
16205
|
+
{
|
|
16206
|
+
var itemText=textInfo.Text[i];
|
|
16207
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
16208
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
16209
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
16177
16210
|
|
|
16211
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16212
|
+
{
|
|
16213
|
+
var exLine=item.ExtendLine[0];
|
|
16214
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16215
|
+
{
|
|
16216
|
+
var yLine=rtBG.Bottom;
|
|
16217
|
+
if (position==2) yLine=rtBG.Top;
|
|
16218
|
+
var lineType=item.LineType;
|
|
16219
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
16220
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
16221
|
+
|
|
16222
|
+
rtBG.Left-=exLine.Width;
|
|
16223
|
+
rtBG.Right-=exLine.Width;
|
|
16224
|
+
}
|
|
16225
|
+
}
|
|
16226
|
+
|
|
16227
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
16228
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
16229
|
+
if (outRange.Border && outRange.Border.Color)
|
|
16230
|
+
{
|
|
16231
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
16232
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
16233
|
+
|
|
16234
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
16235
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
16236
|
+
}
|
|
16237
|
+
|
|
16238
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
16239
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
16240
|
+
|
|
16241
|
+
yText+=textHeight+1;
|
|
16242
|
+
}
|
|
16243
|
+
|
|
16178
16244
|
}
|
|
16179
16245
|
else if (item.Message[1] && borderRight>=10)
|
|
16180
16246
|
{
|
|
@@ -16385,6 +16451,18 @@ function AverageWidthFrame()
|
|
|
16385
16451
|
var textLeft=left-(textWidth-itemText.Width);
|
|
16386
16452
|
}
|
|
16387
16453
|
|
|
16454
|
+
|
|
16455
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16456
|
+
{
|
|
16457
|
+
var exLine=item.ExtendLine[0];
|
|
16458
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16459
|
+
{
|
|
16460
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
16461
|
+
textLeft-=exLine.Width;
|
|
16462
|
+
rectLeft-=exLine.Width
|
|
16463
|
+
}
|
|
16464
|
+
}
|
|
16465
|
+
|
|
16388
16466
|
if (emptyBGColor)
|
|
16389
16467
|
{
|
|
16390
16468
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -23584,6 +23662,24 @@ function HQTradeFrame()
|
|
|
23584
23662
|
}
|
|
23585
23663
|
}
|
|
23586
23664
|
|
|
23665
|
+
this.ResetYCustomSplit=function(windowIndex)
|
|
23666
|
+
{
|
|
23667
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame)) return;
|
|
23668
|
+
|
|
23669
|
+
if (IFrameSplitOperator.IsNumber(windowIndex) && windowIndex>=0)
|
|
23670
|
+
{
|
|
23671
|
+
var item=this.SubFrame[windowIndex];
|
|
23672
|
+
if (item.Frame) item.Frame.YCustomSplit=true;
|
|
23673
|
+
}
|
|
23674
|
+
else
|
|
23675
|
+
{
|
|
23676
|
+
for(var i=0;i<this.SubFrame.length;++i)
|
|
23677
|
+
{
|
|
23678
|
+
this.SubFrame[i].Frame.YCustomSplit=true;
|
|
23679
|
+
}
|
|
23680
|
+
}
|
|
23681
|
+
}
|
|
23682
|
+
|
|
23587
23683
|
//清空Y轴坐标的最大最小值
|
|
23588
23684
|
this.ClearYCoordinateMaxMin=function(windowIndex)
|
|
23589
23685
|
{
|
|
@@ -138608,7 +138704,7 @@ function ScrollBarBGChart()
|
|
|
138608
138704
|
|
|
138609
138705
|
|
|
138610
138706
|
|
|
138611
|
-
var HQCHART_VERSION="1.1.
|
|
138707
|
+
var HQCHART_VERSION="1.1.13780";
|
|
138612
138708
|
|
|
138613
138709
|
function PrintHQChartVersion()
|
|
138614
138710
|
{
|
|
@@ -11065,6 +11065,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11065
11065
|
this.Frame.ResetXSplit();
|
|
11066
11066
|
}
|
|
11067
11067
|
|
|
11068
|
+
this.ResetFrameYCustomSplit=function()
|
|
11069
|
+
{
|
|
11070
|
+
if (typeof(this.Frame.ResetYCustomSplit)=='function')
|
|
11071
|
+
this.Frame.ResetYCustomSplit();
|
|
11072
|
+
}
|
|
11073
|
+
|
|
11068
11074
|
this.UpdateFrameMaxMinV2=function()
|
|
11069
11075
|
{
|
|
11070
11076
|
var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
|
|
@@ -16218,7 +16224,67 @@ function AverageWidthFrame()
|
|
|
16218
16224
|
|
|
16219
16225
|
if (item.Message[0] && borderLeft>=10)
|
|
16220
16226
|
{
|
|
16227
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
16228
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
16229
|
+
var textWidth=textInfo.MaxWidth;
|
|
16230
|
+
var itemLeft=left-textWidth;
|
|
16231
|
+
var fontHeight=this.GetFontHeight();
|
|
16232
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
16233
|
+
this.Canvas.textAlign = "right";
|
|
16234
|
+
this.Canvas.textBaseline = "middle";
|
|
16235
|
+
|
|
16236
|
+
var yText=null;
|
|
16237
|
+
if (position==1)
|
|
16238
|
+
{
|
|
16239
|
+
yText=border.TopEx;
|
|
16240
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
16241
|
+
}
|
|
16242
|
+
else if (position==2)
|
|
16243
|
+
{
|
|
16244
|
+
yText=border.BottomEx+textHeight;
|
|
16245
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
16246
|
+
}
|
|
16247
|
+
|
|
16248
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
16249
|
+
{
|
|
16250
|
+
var itemText=textInfo.Text[i];
|
|
16251
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
16252
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
16253
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
16221
16254
|
|
|
16255
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16256
|
+
{
|
|
16257
|
+
var exLine=item.ExtendLine[0];
|
|
16258
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16259
|
+
{
|
|
16260
|
+
var yLine=rtBG.Bottom;
|
|
16261
|
+
if (position==2) yLine=rtBG.Top;
|
|
16262
|
+
var lineType=item.LineType;
|
|
16263
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
16264
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
16265
|
+
|
|
16266
|
+
rtBG.Left-=exLine.Width;
|
|
16267
|
+
rtBG.Right-=exLine.Width;
|
|
16268
|
+
}
|
|
16269
|
+
}
|
|
16270
|
+
|
|
16271
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
16272
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
16273
|
+
if (outRange.Border && outRange.Border.Color)
|
|
16274
|
+
{
|
|
16275
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
16276
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
16277
|
+
|
|
16278
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
16279
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
16280
|
+
}
|
|
16281
|
+
|
|
16282
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
16283
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
16284
|
+
|
|
16285
|
+
yText+=textHeight+1;
|
|
16286
|
+
}
|
|
16287
|
+
|
|
16222
16288
|
}
|
|
16223
16289
|
else if (item.Message[1] && borderRight>=10)
|
|
16224
16290
|
{
|
|
@@ -16429,6 +16495,18 @@ function AverageWidthFrame()
|
|
|
16429
16495
|
var textLeft=left-(textWidth-itemText.Width);
|
|
16430
16496
|
}
|
|
16431
16497
|
|
|
16498
|
+
|
|
16499
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16500
|
+
{
|
|
16501
|
+
var exLine=item.ExtendLine[0];
|
|
16502
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16503
|
+
{
|
|
16504
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
16505
|
+
textLeft-=exLine.Width;
|
|
16506
|
+
rectLeft-=exLine.Width
|
|
16507
|
+
}
|
|
16508
|
+
}
|
|
16509
|
+
|
|
16432
16510
|
if (emptyBGColor)
|
|
16433
16511
|
{
|
|
16434
16512
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -23628,6 +23706,24 @@ function HQTradeFrame()
|
|
|
23628
23706
|
}
|
|
23629
23707
|
}
|
|
23630
23708
|
|
|
23709
|
+
this.ResetYCustomSplit=function(windowIndex)
|
|
23710
|
+
{
|
|
23711
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame)) return;
|
|
23712
|
+
|
|
23713
|
+
if (IFrameSplitOperator.IsNumber(windowIndex) && windowIndex>=0)
|
|
23714
|
+
{
|
|
23715
|
+
var item=this.SubFrame[windowIndex];
|
|
23716
|
+
if (item.Frame) item.Frame.YCustomSplit=true;
|
|
23717
|
+
}
|
|
23718
|
+
else
|
|
23719
|
+
{
|
|
23720
|
+
for(var i=0;i<this.SubFrame.length;++i)
|
|
23721
|
+
{
|
|
23722
|
+
this.SubFrame[i].Frame.YCustomSplit=true;
|
|
23723
|
+
}
|
|
23724
|
+
}
|
|
23725
|
+
}
|
|
23726
|
+
|
|
23631
23727
|
//清空Y轴坐标的最大最小值
|
|
23632
23728
|
this.ClearYCoordinateMaxMin=function(windowIndex)
|
|
23633
23729
|
{
|
|
@@ -143164,7 +143260,7 @@ function HQChartScriptWorker()
|
|
|
143164
143260
|
|
|
143165
143261
|
|
|
143166
143262
|
|
|
143167
|
-
var HQCHART_VERSION="1.1.
|
|
143263
|
+
var HQCHART_VERSION="1.1.13780";
|
|
143168
143264
|
|
|
143169
143265
|
function PrintHQChartVersion()
|
|
143170
143266
|
{
|