hqchart 1.1.13776 → 1.1.13778
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
|
@@ -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);
|
|
@@ -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.13777";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
|
@@ -12249,7 +12249,66 @@ function AverageWidthFrame()
|
|
|
12249
12249
|
|
|
12250
12250
|
if (item.Message[0] && borderLeft>=10)
|
|
12251
12251
|
{
|
|
12252
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
12253
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
12254
|
+
var textWidth=textInfo.MaxWidth;
|
|
12255
|
+
var itemLeft=left-textWidth;
|
|
12256
|
+
var fontHeight=this.GetFontHeight();
|
|
12257
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
12258
|
+
this.Canvas.textAlign = "right";
|
|
12259
|
+
this.Canvas.textBaseline = "middle";
|
|
12260
|
+
|
|
12261
|
+
var yText=null;
|
|
12262
|
+
if (position==1)
|
|
12263
|
+
{
|
|
12264
|
+
yText=border.TopEx;
|
|
12265
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
12266
|
+
}
|
|
12267
|
+
else if (position==2)
|
|
12268
|
+
{
|
|
12269
|
+
yText=border.BottomEx+textHeight;
|
|
12270
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
12271
|
+
}
|
|
12272
|
+
|
|
12273
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
12274
|
+
{
|
|
12275
|
+
var itemText=textInfo.Text[i];
|
|
12276
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
12277
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
12278
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
12252
12279
|
|
|
12280
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
12281
|
+
{
|
|
12282
|
+
var exLine=item.ExtendLine[0];
|
|
12283
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
12284
|
+
{
|
|
12285
|
+
var yLine=rtBG.Bottom;
|
|
12286
|
+
if (position==2) yLine=rtBG.Top;
|
|
12287
|
+
var lineType=item.LineType;
|
|
12288
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
12289
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
12290
|
+
|
|
12291
|
+
rtBG.Left-=exLine.Width;
|
|
12292
|
+
rtBG.Right-=exLine.Width;
|
|
12293
|
+
}
|
|
12294
|
+
|
|
12295
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
12296
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
12297
|
+
if (outRange.Border && outRange.Border.Color)
|
|
12298
|
+
{
|
|
12299
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
12300
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
12301
|
+
|
|
12302
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
12303
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
12304
|
+
}
|
|
12305
|
+
|
|
12306
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
12307
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
12308
|
+
|
|
12309
|
+
yText+=textHeight+1;
|
|
12310
|
+
}
|
|
12311
|
+
}
|
|
12253
12312
|
}
|
|
12254
12313
|
else if (item.Message[1] && borderRight>=10)
|
|
12255
12314
|
{
|
|
@@ -12460,6 +12519,18 @@ function AverageWidthFrame()
|
|
|
12460
12519
|
var textLeft=left-(textWidth-itemText.Width);
|
|
12461
12520
|
}
|
|
12462
12521
|
|
|
12522
|
+
|
|
12523
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
12524
|
+
{
|
|
12525
|
+
var exLine=item.ExtendLine[0];
|
|
12526
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
12527
|
+
{
|
|
12528
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
12529
|
+
textLeft-=exLine.Width;
|
|
12530
|
+
rectLeft-=exLine.Width
|
|
12531
|
+
}
|
|
12532
|
+
}
|
|
12533
|
+
|
|
12463
12534
|
if (emptyBGColor)
|
|
12464
12535
|
{
|
|
12465
12536
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -16174,7 +16174,66 @@ function AverageWidthFrame()
|
|
|
16174
16174
|
|
|
16175
16175
|
if (item.Message[0] && borderLeft>=10)
|
|
16176
16176
|
{
|
|
16177
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
16178
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
16179
|
+
var textWidth=textInfo.MaxWidth;
|
|
16180
|
+
var itemLeft=left-textWidth;
|
|
16181
|
+
var fontHeight=this.GetFontHeight();
|
|
16182
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
16183
|
+
this.Canvas.textAlign = "right";
|
|
16184
|
+
this.Canvas.textBaseline = "middle";
|
|
16185
|
+
|
|
16186
|
+
var yText=null;
|
|
16187
|
+
if (position==1)
|
|
16188
|
+
{
|
|
16189
|
+
yText=border.TopEx;
|
|
16190
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
16191
|
+
}
|
|
16192
|
+
else if (position==2)
|
|
16193
|
+
{
|
|
16194
|
+
yText=border.BottomEx+textHeight;
|
|
16195
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
16196
|
+
}
|
|
16197
|
+
|
|
16198
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
16199
|
+
{
|
|
16200
|
+
var itemText=textInfo.Text[i];
|
|
16201
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
16202
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
16203
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
16177
16204
|
|
|
16205
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16206
|
+
{
|
|
16207
|
+
var exLine=item.ExtendLine[0];
|
|
16208
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16209
|
+
{
|
|
16210
|
+
var yLine=rtBG.Bottom;
|
|
16211
|
+
if (position==2) yLine=rtBG.Top;
|
|
16212
|
+
var lineType=item.LineType;
|
|
16213
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
16214
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
16215
|
+
|
|
16216
|
+
rtBG.Left-=exLine.Width;
|
|
16217
|
+
rtBG.Right-=exLine.Width;
|
|
16218
|
+
}
|
|
16219
|
+
|
|
16220
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
16221
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
16222
|
+
if (outRange.Border && outRange.Border.Color)
|
|
16223
|
+
{
|
|
16224
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
16225
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
16226
|
+
|
|
16227
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
16228
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
16229
|
+
}
|
|
16230
|
+
|
|
16231
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
16232
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
16233
|
+
|
|
16234
|
+
yText+=textHeight+1;
|
|
16235
|
+
}
|
|
16236
|
+
}
|
|
16178
16237
|
}
|
|
16179
16238
|
else if (item.Message[1] && borderRight>=10)
|
|
16180
16239
|
{
|
|
@@ -16385,6 +16444,18 @@ function AverageWidthFrame()
|
|
|
16385
16444
|
var textLeft=left-(textWidth-itemText.Width);
|
|
16386
16445
|
}
|
|
16387
16446
|
|
|
16447
|
+
|
|
16448
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16449
|
+
{
|
|
16450
|
+
var exLine=item.ExtendLine[0];
|
|
16451
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16452
|
+
{
|
|
16453
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
16454
|
+
textLeft-=exLine.Width;
|
|
16455
|
+
rectLeft-=exLine.Width
|
|
16456
|
+
}
|
|
16457
|
+
}
|
|
16458
|
+
|
|
16388
16459
|
if (emptyBGColor)
|
|
16389
16460
|
{
|
|
16390
16461
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -138608,7 +138679,7 @@ function ScrollBarBGChart()
|
|
|
138608
138679
|
|
|
138609
138680
|
|
|
138610
138681
|
|
|
138611
|
-
var HQCHART_VERSION="1.1.
|
|
138682
|
+
var HQCHART_VERSION="1.1.13777";
|
|
138612
138683
|
|
|
138613
138684
|
function PrintHQChartVersion()
|
|
138614
138685
|
{
|
|
@@ -16218,7 +16218,66 @@ function AverageWidthFrame()
|
|
|
16218
16218
|
|
|
16219
16219
|
if (item.Message[0] && borderLeft>=10)
|
|
16220
16220
|
{
|
|
16221
|
+
if (item.Font != null) this.Canvas.font = item.Font;
|
|
16222
|
+
var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
|
|
16223
|
+
var textWidth=textInfo.MaxWidth;
|
|
16224
|
+
var itemLeft=left-textWidth;
|
|
16225
|
+
var fontHeight=this.GetFontHeight();
|
|
16226
|
+
var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
|
|
16227
|
+
this.Canvas.textAlign = "right";
|
|
16228
|
+
this.Canvas.textBaseline = "middle";
|
|
16229
|
+
|
|
16230
|
+
var yText=null;
|
|
16231
|
+
if (position==1)
|
|
16232
|
+
{
|
|
16233
|
+
yText=border.TopEx;
|
|
16234
|
+
if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
|
|
16235
|
+
}
|
|
16236
|
+
else if (position==2)
|
|
16237
|
+
{
|
|
16238
|
+
yText=border.BottomEx+textHeight;
|
|
16239
|
+
if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
|
|
16240
|
+
}
|
|
16241
|
+
|
|
16242
|
+
for(var i=0;i<textInfo.Text.length;++i)
|
|
16243
|
+
{
|
|
16244
|
+
var itemText=textInfo.Text[i];
|
|
16245
|
+
var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
|
|
16246
|
+
rtBG.Top=rtBG.Bottom-rtBG.Height;
|
|
16247
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
16221
16248
|
|
|
16249
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16250
|
+
{
|
|
16251
|
+
var exLine=item.ExtendLine[0];
|
|
16252
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16253
|
+
{
|
|
16254
|
+
var yLine=rtBG.Bottom;
|
|
16255
|
+
if (position==2) yLine=rtBG.Top;
|
|
16256
|
+
var lineType=item.LineType;
|
|
16257
|
+
if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
|
|
16258
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
|
|
16259
|
+
|
|
16260
|
+
rtBG.Left-=exLine.Width;
|
|
16261
|
+
rtBG.Right-=exLine.Width;
|
|
16262
|
+
}
|
|
16263
|
+
|
|
16264
|
+
this.Canvas.fillStyle=outRange.BGColor;
|
|
16265
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
16266
|
+
if (outRange.Border && outRange.Border.Color)
|
|
16267
|
+
{
|
|
16268
|
+
if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
|
|
16269
|
+
this.Canvas.setLineDash(outRange.Border.LineDash); //虚线
|
|
16270
|
+
|
|
16271
|
+
this.Canvas.strokeStyle = outRange.Border.Color;
|
|
16272
|
+
this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
|
|
16273
|
+
}
|
|
16274
|
+
|
|
16275
|
+
this.Canvas.fillStyle = outRange.TextColor;
|
|
16276
|
+
this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
|
|
16277
|
+
|
|
16278
|
+
yText+=textHeight+1;
|
|
16279
|
+
}
|
|
16280
|
+
}
|
|
16222
16281
|
}
|
|
16223
16282
|
else if (item.Message[1] && borderRight>=10)
|
|
16224
16283
|
{
|
|
@@ -16429,6 +16488,18 @@ function AverageWidthFrame()
|
|
|
16429
16488
|
var textLeft=left-(textWidth-itemText.Width);
|
|
16430
16489
|
}
|
|
16431
16490
|
|
|
16491
|
+
|
|
16492
|
+
if (item.ExtendLine && item.ExtendLine[0]) //右侧延长线
|
|
16493
|
+
{
|
|
16494
|
+
var exLine=item.ExtendLine[0];
|
|
16495
|
+
if (IFrameSplitOperator.IsNumber(exLine.Width))
|
|
16496
|
+
{
|
|
16497
|
+
if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
|
|
16498
|
+
textLeft-=exLine.Width;
|
|
16499
|
+
rectLeft-=exLine.Width
|
|
16500
|
+
}
|
|
16501
|
+
}
|
|
16502
|
+
|
|
16432
16503
|
if (emptyBGColor)
|
|
16433
16504
|
{
|
|
16434
16505
|
this.Canvas.fillStyle=emptyBGColor;
|
|
@@ -143164,7 +143235,7 @@ function HQChartScriptWorker()
|
|
|
143164
143235
|
|
|
143165
143236
|
|
|
143166
143237
|
|
|
143167
|
-
var HQCHART_VERSION="1.1.
|
|
143238
|
+
var HQCHART_VERSION="1.1.13777";
|
|
143168
143239
|
|
|
143169
143240
|
function PrintHQChartVersion()
|
|
143170
143241
|
{
|