hqchart 1.1.12898 → 1.1.12900

package/lib/umychart.vue.js

@@ -2308,13 +2308,19 @@ this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(right
 {}else if(item.LineType==8||item.LineType==9)//集合竞价不画线
 {}else if(item.LineType>0){if(g_JSChartResource.FrameYLineDash){this.Canvas.save();this.Canvas.setLineDash(g_JSChartResource.FrameYLineDash);//虚线
 this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(right,yFixed);this.Canvas.stroke();this.Canvas.setLineDash([]);this.Canvas.restore();}else{this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(right,yFixed);this.Canvas.stroke();}}if(bChangeLineWidth){this.Canvas.lineWidth=pixelRatio;}}var yText=y;if(y>=bottom-2){this.Canvas.textBaseline='bottom';textBaseline=2;}else if(y<=top+2){this.Canvas.textBaseline='top';yText+=this.YTextTopOffset;textBaseline=0;}else{this.Canvas.textBaseline="middle";textBaseline=1;}//左边 坐标信息  间距小于10 不画坐标
-this.Canvas.strokeStyle=item.TextColor;this.Canvas.fillStyle=item.TextColor;if(item.Message[0]!=null&&isDrawLeft){if(item.Font!=null)this.Canvas.font=item.Font;var xText=left;if(leftExtendLine&&leftExtendLine.Width>1){var lineLength=leftExtendLine.Width;if(leftExtendLine.Color)this.Canvas.strokeStyle=leftExtendLine.Color;else this.Canvas.strokeStyle=item.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(xText,yFixed);this.Canvas.lineTo(xText-lineLength,yFixed);this.Canvas.stroke();xText-=lineLength;}rtLeft=this.GetTextTopBottom(textBaseline,yText);if(!rtPreLeft||rtLeft&&!this.IsTextTopBottomOverlap(rtLeft,rtPreLeft)){if(leftExtendText&&leftExtendText.Align===1){this.Canvas.textAlign="left";this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);}else{this.Canvas.textAlign="right";this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);rtPreLeft=rtLeft;}}}//右边 坐标信息  间距小于10 不画坐标
+this.Canvas.strokeStyle=item.TextColor;this.Canvas.fillStyle=item.TextColor;if(item.Message[0]!=null&&isDrawLeft){if(Array.isArray(item.Message[0])){if(this.MultiTextFormat==3){var obj={Data:item.Message[0],X:left,Y:yText,TextBaseLine:textBaseline,IsLeft:true,Item:item,TextPadding:this.YTextPadding[0]};this.DrawMultiLineText(obj);}}else{if(item.Font!=null)this.Canvas.font=item.Font;var xText=left;if(leftExtendLine&&leftExtendLine.Width>1){var lineLength=leftExtendLine.Width;if(leftExtendLine.Color)this.Canvas.strokeStyle=leftExtendLine.Color;else this.Canvas.strokeStyle=item.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(xText,yFixed);this.Canvas.lineTo(xText-lineLength,yFixed);this.Canvas.stroke();xText-=lineLength;}rtLeft=this.GetTextTopBottom(textBaseline,yText);if(!rtPreLeft||rtLeft&&!this.IsTextTopBottomOverlap(rtLeft,rtPreLeft)){if(leftExtendText&&leftExtendText.Align===1){this.Canvas.textAlign="left";this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);}else{this.Canvas.textAlign="right";this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);rtPreLeft=rtLeft;}}}}//右边 坐标信息  间距小于10 不画坐标
 if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;var xText=right;if(item.LineType==3){var lineLength=this.ShortYLineLength*GetDevicePixelRatio();this.Canvas.beginPath();this.Canvas.moveTo(xText,yFixed);this.Canvas.lineTo(xText+lineLength,yFixed);this.Canvas.stroke();xText+=lineLength;}//右侧延长线
 if(rightExtendLine&&rightExtendLine.Width>1){var lineLength=rightExtendLine.Width;if(rightExtendLine.Color)this.Canvas.strokeStyle=rightExtendLine.Color;else this.Canvas.strokeStyle=item.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(xText,yFixed);this.Canvas.lineTo(xText+lineLength,yFixed);this.Canvas.stroke();xText+=lineLength+2;}this.Canvas.textAlign="left";if(Array.isArray(item.Message[1])){if(this.MultiTextFormat==1)//显示1行 格式:价格/百分比
 {if(item.ExtendData){if(item.ExtendData.Font)this.Canvas.font=item.ExtendData.Font;}var textData={Text:[{Text:item.Message[1][0],Width:this.Canvas.measureText(item.Message[1][0]).width},{Text:item.Message[1][1],Width:this.Canvas.measureText(item.Message[1][1]).width}],X:xText+2,Y:yText,TextBaseline:this.Canvas.textBaseline,Item:item};aryMultiText.push(textData);}else if(this.MultiTextFormat==2)//显示2行
-{this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);var lineHeight=this.Canvas.measureText('M').width;if(itemHeight>lineHeight*2)this.Canvas.fillText(item.Message[1][1],xText+this.YTextPadding[1],yText+lineHeight);}else//显示第1行
+{this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);var lineHeight=this.Canvas.measureText('M').width;if(itemHeight>lineHeight*2)this.Canvas.fillText(item.Message[1][1],xText+this.YTextPadding[1],yText+lineHeight);}else if(this.MultiTextFormat==3){var obj={Data:item.Message[1],X:xText,Y:yText,TextBaseLine:textBaseline,IsLeft:false,Item:item,TextPadding:this.YTextPadding[1]};this.DrawMultiLineText(obj);}else//显示第1行
 {this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);}}else{//计算显示的区域
-rtRight=this.GetTextTopBottom(textBaseline,yText);if(!rtPreRight||rtRight&&!this.IsTextTopBottomOverlap(rtRight,rtPreRight)){if(item.TextColor2)this.Canvas.fillStyle=item.TextColor2;if(rightExtendText&&rightExtendText.Align===2&&this.YRightTextInfo){this.Canvas.textAlign="right";var xRight=this.YRightTextInfo.MainTextWidth+right-this.YTextPadding[1];this.Canvas.fillText(item.Message[1],xRight,yText);}else{this.Canvas.fillText(item.Message[1],xText+this.YTextPadding[1],yText);}rtPreRight=rtRight;}}}yPrev=y;}if(IFrameSplitOperator.IsNonEmptyArray(aryMultiText)&&this.MultiTextFormat==1)this.DrawHorizontalMuText(aryMultiText);if(isDrawRight&&this.IsDrawRightBorder&&this.YRightTextInfo){var xRight=this.YRightTextInfo.MainTextWidth+right;xLine=ToFixedPoint(xRight);this.Canvas.strokeStyle=this.PenBorder;this.Canvas.beginPath();this.Canvas.moveTo(xLine,top);this.Canvas.lineTo(xLine,bottom);this.Canvas.stroke();if(IFrameSplitOperator.IsNonEmptyArray(this.YRightTextInfo.AryOverlayWidth)){this.Canvas.beginPath();for(var i=0;i<this.YRightTextInfo.AryOverlayWidth.length;++i){var width=this.YRightTextInfo.AryOverlayWidth[i];xRight+=width;xLine=ToFixedPoint(xRight);this.Canvas.moveTo(xLine,top);this.Canvas.lineTo(xLine,bottom);}this.Canvas.stroke();}}};//上下区域是否重叠
+rtRight=this.GetTextTopBottom(textBaseline,yText);if(!rtPreRight||rtRight&&!this.IsTextTopBottomOverlap(rtRight,rtPreRight)){if(item.TextColor2)this.Canvas.fillStyle=item.TextColor2;if(rightExtendText&&rightExtendText.Align===2&&this.YRightTextInfo){this.Canvas.textAlign="right";var xRight=this.YRightTextInfo.MainTextWidth+right-this.YTextPadding[1];this.Canvas.fillText(item.Message[1],xRight,yText);}else{this.Canvas.fillText(item.Message[1],xText+this.YTextPadding[1],yText);}rtPreRight=rtRight;}}}yPrev=y;}if(IFrameSplitOperator.IsNonEmptyArray(aryMultiText)&&this.MultiTextFormat==1)this.DrawHorizontalMuText(aryMultiText);if(isDrawRight&&this.IsDrawRightBorder&&this.YRightTextInfo){var xRight=this.YRightTextInfo.MainTextWidth+right;xLine=ToFixedPoint(xRight);this.Canvas.strokeStyle=this.PenBorder;this.Canvas.beginPath();this.Canvas.moveTo(xLine,top);this.Canvas.lineTo(xLine,bottom);this.Canvas.stroke();if(IFrameSplitOperator.IsNonEmptyArray(this.YRightTextInfo.AryOverlayWidth)){this.Canvas.beginPath();for(var i=0;i<this.YRightTextInfo.AryOverlayWidth.length;++i){var width=this.YRightTextInfo.AryOverlayWidth[i];xRight+=width;xLine=ToFixedPoint(xRight);this.Canvas.moveTo(xLine,top);this.Canvas.lineTo(xLine,bottom);}this.Canvas.stroke();}}};//多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
+this.DrawMultiLineText=function(obj){var lineSpacing=2;var lineHeight=this.Canvas.measureText('擎').width;var lineCount=obj.Data.length;var textHeight=lineHeight*lineCount+lineSpacing*(lineCount-1);var yText=obj.Y;if(obj.Item.Font!=null)this.Canvas.font=obj.Item.Font;if(obj.IsLeft){this.Canvas.textAlign="right";var xText=obj.X-obj.TextPadding;}else{this.Canvas.textAlign="left";var xText=obj.X+obj.TextPadding;}var textBaseline=this.Canvas.textBaseline;//备份下原来的对齐方式
+this.Canvas.textBaseline='top';if(obj.TextBaseLine==1)//middle
+{yText-=textHeight/2;}else if(obj.TextBaseLine==0)//top
+{}else if(obj.TextBaseLine==2)//bottom
+{yText-=textHeight;}for(var i=0;i<obj.Data.length;++i){var item=obj.Data[i];var text=item.Text;var backupTextColor=null;if(item.Color){backupTextColor=this.Canvas.fillStyle;this.Canvas.fillStyle=item.Color;}this.Canvas.fillText(text,xText,yText);yText+=lineHeight+lineSpacing;if(backupTextColor)this.Canvas.fillStyle=backupTextColor;}this.Canvas.textBaseline=textBaseline;//还原对齐方式
+};//上下区域是否重叠
 this.IsTextTopBottomOverlap=function(rt,rt2){if(rt2.Top>=rt.Top&&rt2.Top<=rt.Bottom)return true;if(rt2.Bottom>=rt.Top&&rt2.Bottom<=rt.Bottom)return true;return false;};this.GetTextTopBottom=function(textBaseline,yText){var rtRight=null;var textHeight=this.Canvas.measureText('擎').width;if(textBaseline==0){rtRight={Top:yText,Bottom:yText+textHeight};}else if(textBaseline==1){rtRight={Top:yText-textHeight/2};rtRight.Bottom=rtRight.Top+textHeight;}else if(textBaseline==2){rtRight={Bottom:yText};rtRight.Top=rtRight.Bottom-textHeight;}return rtRight;};this.DrawHorizontalMuText=function(aryText){var maxWidth=[null,null];for(var i=0;i<aryText.length;++i){var item=aryText[i];var width=item.Text[0].Width;if(!IFrameSplitOperator.IsNumber(maxWidth[0]))maxWidth[0]=width;else if(maxWidth[0]<width)maxWidth[0]=width;width=item.Text[1].Width;if(!IFrameSplitOperator.IsNumber(maxWidth[1]))maxWidth[1]=width;else if(maxWidth[1]<width)maxWidth[1]=width;}for(var i=0;i<aryText.length;++i){var item=aryText[i];var message=item.Item;this.Canvas.textBaseline=message.TextBaseline;if(message.ExtendData&&message.ExtendData.Font)this.Canvas.font=message.ExtendData.Font;else if(message.Font)this.Canvas.font=message.Font;if(message.ExtendData&&message.ExtendData.PriceColor)this.Canvas.fillStyle=message.ExtendData.PriceColor;else this.Canvas.fillStyle=message.TextColor;this.Canvas.textAlign="right";var x=item.X+maxWidth[1];this.Canvas.fillText(item.Text[1].Text,x,item.Y);if(message.ExtendData&&message.ExtendData.SplitColor)this.Canvas.fillStyle=message.ExtendData.SplitColor;else this.Canvas.fillStyle=message.TextColor;this.Canvas.textAlign="left";var splitWidth=this.Canvas.measureText('/').width;this.Canvas.fillText('/',x,item.Y);if(message.ExtendData&&message.ExtendData.PercentageColor)this.Canvas.fillStyle=message.ExtendData.PercentageColor;else this.Canvas.fillStyle=message.TextColor;this.Canvas.textAlign="right";var x=item.X+maxWidth[1]+maxWidth[0]+splitWidth;this.Canvas.fillText(item.Text[0].Text,x,item.Y);var textWidth=maxWidth[1]+maxWidth[0]+splitWidth*4;if(this.RightTextMaxWidth<textWidth)this.RightTextMaxWidth=textWidth;}};//画Y轴Message[2,3]两个内部刻度
 this.DrawInsideClientHorizontal=function(){var border=this.GetBorder();if(border.DayBorder&&IFrameSplitOperator.IsNonEmptyArray(border.DayBorder)){var item=border.DayBorder[0];var left=item.LeftEx;var item=border.DayBorder[border.DayBorder.length-1];var right=item.RightEx;var bottom=border.Bottom;var top=border.TopTitle;}else{var left=border.LeftEx;var right=border.RightEx;var bottom=border.Bottom;var top=border.TopTitle;}var pixelTatio=GetDevicePixelRatio();var yPrev=null;//上一个坐标y的值
 var yInsideText=null;for(var i=this.HorizontalInfo.length-1;i>=0;--i)//从上往下画分割线
@@ -2350,13 +2356,13 @@ var yText=y;for(var i=0;i<textInfo.Text.length;++i){var itemText=textInfo.Text[i
 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);
 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(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,Left:right,Right:this.ChartBorder.GetChartWidth(),Height:null,IsShow:true,BGColor:item.LineColor,TextColor:item.TextColor,PixelTatio:pixelTatio,Position:"Right",IsInside:false};if(this.SendDrawCountDownEvent(sendData)){if(IFrameSplitOperator.IsPlusNumber(sendData.Height))yText+=textHeight+1*pixelTatio;}}}else{var bgTop=yText-textHeight/2-1*pixelTatio;if(i==0){var textLeft=right;rtText.Left=textLeft;if(preTextRect&&bgTop<preTextRect.Rect.Bottom){yText=preTextRect.Rect.Bottom;bgTop=yText-textHeight/2-1*pixelTatio;}}else{var textLeft=right+textWidth-itemText.Width;}if(emptyBGColor){this.Canvas.fillStyle=emptyBGColor;this.Canvas.fillRect(textLeft,bgTop,itemText.Width+1,textHeight);this.Canvas.strokeStyle=item.LineColor;this.Canvas.strokeRect(ToFixedPoint(textLeft),ToFixedPoint(bgTop),ToFixedRect(itemText.Width+1),ToFixedRect(textHeight));this.Canvas.fillStyle=item.LineColor;this.Canvas.fillText(itemText.Text,textLeft+2*pixelTatio,yText);}else{this.Canvas.fillStyle=item.LineColor;this.Canvas.fillRect(textLeft,bgTop,itemText.Width,textHeight);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,right,y,item.LineColor,item.LineType,item);yText+=textHeight+1*pixelTatio;rtText.Bottom=yText;}}}if(mapTextRect&&IFrameSplitOperator.IsNumber(rtText.Left)&&IFrameSplitOperator.IsNumber(rtText.Bottom)){mapTextRect.set(3,{Rect:rtText,Item:item});}if(item.Type==3||item.Type==4){if(item.Title){var bgColor=item.LineColor;var rgb=this.RGBToStruct(item.LineColor);if(rgb)bgColor='rgba('+rgb.R+', '+rgb.G+', '+rgb.B+', '+g_JSChartResource.FrameLatestPrice.BGAlpha+')';//内部刻度 背景增加透明度
 var width=this.Canvas.measureText(item.Title).width+2*pixelTatio;if(this.IsHScreen){var bgTop=bottom-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-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);}}}}}};this.SendDrawCountDownEvent=function(sendData){if(!this.GetEventCallback)return false;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_COUNTDOWN);if(!event||!event.Callback)return false;event.Callback(event,sendData,this);return true;};this.DrawDotLine=function(left,right,y,color,option){var pixelTatio=GetDevicePixelRatio();this.Canvas.save();this.Canvas.strokeStyle=color;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth))this.Canvas.lineWidth=option.LineWidth*pixelTatio;if(option.LineDash)this.Canvas.setLineDash(option.LineDash);else this.Canvas.setLineDash([5*pixelTatio,5*pixelTatio]);//虚线
-this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();this.Canvas.restore();};this.DrawLine=function(left,right,y,color,lineType,option){if(lineType==-1)return;if(lineType==0){var pixelRatio=GetDevicePixelRatio();this.Canvas.strokeStyle=color;var bChangeLineWidth=false;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth)){this.Canvas.lineWidth=option.LineWidth*pixelRatio;bChangeLineWidth=true;}this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();if(bChangeLineWidth){this.Canvas.lineWidth=pixelRatio;}}else{this.DrawDotLine(left,right,y,color,option);}};this.DrawHScreenText=function(center,data){this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=data.Color;this.Canvas.save();this.Canvas.translate(center.X,center.Y);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(data.Text,data.XOffset,data.YOffset);this.Canvas.restore();};this.RGBToStruct=function(rgb){if(/^(rgb|RGB)/.test(rgb)){var aColor=rgb.replace(/(?:\(|\)|rgb|RGB)*/g,"").split(",");var result={};if(aColor.length!=3)return null;result.R=Number(aColor[0]);result.G=Number(aColor[1]);result.B=Number(aColor[2]);return result;}return null;};this.GetScaleTextWidth=function(){var border=this.ChartBorder.GetBorder();var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
+this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();this.Canvas.restore();};this.DrawLine=function(left,right,y,color,lineType,option){if(lineType==-1)return;if(lineType==0){var pixelRatio=GetDevicePixelRatio();this.Canvas.strokeStyle=color;var bChangeLineWidth=false;if(option&&IFrameSplitOperator.IsPlusNumber(option.LineWidth)){this.Canvas.lineWidth=option.LineWidth*pixelRatio;bChangeLineWidth=true;}this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),left);this.Canvas.lineTo(ToFixedPoint(y),right);}else{this.Canvas.moveTo(left,ToFixedPoint(y));this.Canvas.lineTo(right,ToFixedPoint(y));}this.Canvas.stroke();if(bChangeLineWidth){this.Canvas.lineWidth=pixelRatio;}}else{this.DrawDotLine(left,right,y,color,option);}};this.DrawHScreenText=function(center,data){this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=data.Color;this.Canvas.save();this.Canvas.translate(center.X,center.Y);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(data.Text,data.XOffset,data.YOffset);this.Canvas.restore();};this.RGBToStruct=function(rgb){if(/^(rgb|RGB)/.test(rgb)){var aColor=rgb.replace(/(?:\(|\)|rgb|RGB)*/g,"").split(",");var result={};if(aColor.length!=3)return null;result.R=Number(aColor[0]);result.G=Number(aColor[1]);result.B=Number(aColor[2]);return result;}return null;};this.GetMulitTextMaxWidth=function(aryData){var width=null;for(var i=0;i<aryData.length;++i){var item=aryData[i];var text=item.Text;if(!text)continue;var value=this.Canvas.measureText(text).width;if(width==null)width=value;else if(width<value)width=value;}return width;};this.GetScaleTextWidth=function(){var border=this.ChartBorder.GetBorder();var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 if(this.IsHScreen){var borderTop=this.ChartBorder.Top;var borderBottom=this.ChartBorder.Bottom;var isDrawLeft=borderTop>10*pixelTatio&&this.IsShowYText[0]===true&&this.YTextPosition[0]!=2;var isDrawRight=borderBottom>10*pixelTatio&&this.IsShowYText[1]===true&&this.YTextPosition[1]!=2;}else{var borderRight=this.ChartBorder.Right;var borderLeft=this.ChartBorder.Left;var isDrawLeft=borderLeft>10&&this.IsShowYText[0]===true&&this.YTextPosition[0]!=2;var isDrawRight=borderRight>10&&this.IsShowYText[1]===true&&this.YTextPosition[1]!=2;}if(!isDrawRight&&!isDrawLeft)return null;var width={Left:null,Right:null};var rightExtendWidth=0;var isYPercentage=false;//是否是百分比坐标
-if(this.YSplitOperator&&this.YSplitOperator.CoordinateType==1)isYPercentage=true;var leftExtendLineWidth=0;var rightExtendLineWidth=0;if(IFrameSplitOperator.IsNonEmptyArray(this.YLineExtend)){if(this.YLineExtend[0]&&this.YLineExtend[0].Width>1)leftExtendLineWidth=this.YLineExtend[0].Width;if(this.YLineExtend[1]&&this.YLineExtend[1].Width>1)rightExtendLineWidth=this.YLineExtend[1].Width;}for(var i=0;i<this.HorizontalInfo.length;++i){var textWidth=null;var item=this.HorizontalInfo[i];if(!item)continue;if(item.Font!=null)this.Canvas.font=item.Font;if(item.Message[0]!=null&&isDrawLeft){textWidth=this.Canvas.measureText(item.Message[0]).width;if(width.Left==null||width.Left<textWidth)width.Left=textWidth;//JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
+if(this.YSplitOperator&&this.YSplitOperator.CoordinateType==1)isYPercentage=true;var leftExtendLineWidth=0;var rightExtendLineWidth=0;if(IFrameSplitOperator.IsNonEmptyArray(this.YLineExtend)){if(this.YLineExtend[0]&&this.YLineExtend[0].Width>1)leftExtendLineWidth=this.YLineExtend[0].Width;if(this.YLineExtend[1]&&this.YLineExtend[1].Width>1)rightExtendLineWidth=this.YLineExtend[1].Width;}for(var i=0;i<this.HorizontalInfo.length;++i){var textWidth=null;var item=this.HorizontalInfo[i];if(!item)continue;if(item.Font!=null)this.Canvas.font=item.Font;if(item.Message[0]!=null&&isDrawLeft){if(Array.isArray(item.Message[0])){textWidth=this.GetMulitTextMaxWidth(item.Message[0]);}else{textWidth=this.Canvas.measureText(item.Message[0]).width;}if(width.Left==null||width.Left<textWidth)width.Left=textWidth;//JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
 }if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;if(Array.isArray(item.Message[1])){if(this.MultiTextFormat==1)//显示1行 格式:价格/百分比
 {if(item.ExtendData){if(item.ExtendData.Font)this.Canvas.font=item.ExtendData.Font;var width1=this.Canvas.measureText(item.Message[1][0]).width;var width2=this.Canvas.measureText(item.Message[1][1]).width;var width3=this.Canvas.measureText('/').width;textWidth=width1+width3;if(rightExtendWidth<width2)rightExtendWidth=width2;//JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[1][1]}/${item.Message[1][0]} ${textWidth}, ${rightExtendWidth}`);
 }}else if(this.MultiTextFormat==2)//显示2行
-{textWidth=this.Canvas.measureText(item.Message[1][0]).width;var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;if(textWidth<textWidth2)textWidth=textWidth2;}else//显示第1行
+{textWidth=this.Canvas.measureText(item.Message[1][0]).width;var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;if(textWidth<textWidth2)textWidth=textWidth2;}else if(this.MultiTextFormat==3){textWidth=this.GetMulitTextMaxWidth(item.Message[0]);}else//显示第1行
 {textWidth=this.Canvas.measureText(item.Message[1][0]).width;if(isYPercentage){var perTextWidth=this.Canvas.measureText("-00.00%").width;if(perTextWidth>textWidth)textWidth=perTextWidth;}}}else{textWidth=this.Canvas.measureText(item.Message[1]).width;}if(width.Right==null||width.Right<textWidth)width.Right=textWidth;}}if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=rightExtendWidth;if(IFrameSplitOperator.IsNumber(width.Left))width.Left+=this.YTextPadding[0]+leftExtendLineWidth;if(IFrameSplitOperator.IsNumber(width.Right))width.Right+=this.YTextPadding[1]+rightExtendLineWidth;return{TextWidth:width};};this.ClearToolbar=function(){if(!this.ToolbarID)return;var divToolbar=document.getElementById(this.ToolbarID);if(!divToolbar)return;this.ChartBorder.UIElement.parentNode.removeChild(divToolbar);this.ToolbarRect=null;};this.HideToolbar=function(){if(!this.ToolbarID)return;this.ToolbarRect=null;var divToolbar=document.getElementById(this.ToolbarID);if(!divToolbar)return;if(divToolbar.style.display!='none')divToolbar.style.display='none';};}function MinuteFrame(){this.newMethod=AverageWidthFrame;//派生
 this.newMethod();delete this.newMethod;this.ClassName="MinuteFrame";this.DataWidth=1*GetDevicePixelRatio();this.DistanceWidth=1*GetDevicePixelRatio();this.MinuteCount=243;//每天的分钟个数
 this.BeforeBGColor=g_JSChartResource.Minute.Before.BGColor;//集合竞价背景
@@ -12789,7 +12795,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 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);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12897";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12899";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.12898",
+  "version": "1.1.12900",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -10093,35 +10093,46 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                if (item.Font!=null) this.Canvas.font=item.Font;
-
-                var xText=left;
-                if (leftExtendLine && leftExtendLine.Width>1)
+                if (Array.isArray(item.Message[0]))
                 {
-                    var lineLength=leftExtendLine.Width;
-                    if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
-                    else this.Canvas.strokeStyle=item.LineColor;
-                    this.Canvas.beginPath();
-                    this.Canvas.moveTo(xText,yFixed);
-                    this.Canvas.lineTo(xText-lineLength,yFixed);
-                    this.Canvas.stroke();
-
-                    xText-=lineLength;
+                    if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[0], X:left, Y:yText, TextBaseLine:textBaseline, IsLeft:true, Item:item, TextPadding:this.YTextPadding[0] };
+                        this.DrawMultiLineText(obj);
+                    }
                 }
-
-                rtLeft=this.GetTextTopBottom(textBaseline,yText);
-                if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
+                else
                 {
-                    if (leftExtendText && leftExtendText.Align===1)
+                    if (item.Font!=null) this.Canvas.font=item.Font;
+
+                    var xText=left;
+                    if (leftExtendLine && leftExtendLine.Width>1)
                     {
-                        this.Canvas.textAlign="left";
-                        this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        var lineLength=leftExtendLine.Width;
+                        if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
+                        else this.Canvas.strokeStyle=item.LineColor;
+                        this.Canvas.beginPath();
+                        this.Canvas.moveTo(xText,yFixed);
+                        this.Canvas.lineTo(xText-lineLength,yFixed);
+                        this.Canvas.stroke();
+
+                        xText-=lineLength;
                     }
-                    else
+
+                    rtLeft=this.GetTextTopBottom(textBaseline,yText);
+                    if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
                     {
-                        this.Canvas.textAlign="right";
-                        this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
-                        rtPreLeft=rtLeft;
+                        if (leftExtendText && leftExtendText.Align===1)
+                        {
+                            this.Canvas.textAlign="left";
+                            this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        }
+                        else
+                        {
+                            this.Canvas.textAlign="right";
+                            this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
+                            rtPreLeft=rtLeft;
+                        }
                     }
                 }
             }
@@ -10188,6 +10199,11 @@ function AverageWidthFrame()
                         var lineHeight=this.Canvas.measureText('M').width;
                         if (itemHeight>lineHeight*2) this.Canvas.fillText(item.Message[1][1],xText+this.YTextPadding[1],yText+lineHeight);
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[1], X:xText, Y:yText, TextBaseLine:textBaseline, IsLeft:false, Item:item, TextPadding:this.YTextPadding[1] };
+                        this.DrawMultiLineText(obj);
+                    }
                     else    //显示第1行
                     {
                         this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);
@@ -10248,6 +10264,65 @@ function AverageWidthFrame()
         }
     }
 
+    //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
+    this.DrawMultiLineText=function(obj)
+    {
+        var lineSpacing=2;
+        var lineHeight=this.Canvas.measureText('擎').width;
+        var lineCount=obj.Data.length;
+        var textHeight=lineHeight*lineCount+(lineSpacing*(lineCount-1));
+        var yText=obj.Y;
+
+        if (obj.Item.Font!=null) this.Canvas.font=obj.Item.Font;
+
+        if (obj.IsLeft)
+        {
+            this.Canvas.textAlign="right";
+            var xText=obj.X-obj.TextPadding;
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            var xText=obj.X+obj.TextPadding;
+        }
+
+        var textBaseline=this.Canvas.textBaseline;  //备份下原来的对齐方式
+        this.Canvas.textBaseline='top';
+        if (obj.TextBaseLine==1)    //middle
+        {
+            yText-=textHeight/2;
+        }
+        else if (obj.TextBaseLine==0)   //top
+        {
+
+        }
+        else if (obj.TextBaseLine==2)   //bottom
+        {
+            yText-=textHeight;
+        }
+       
+        
+        for(var i=0;i<obj.Data.length;++i)
+        {
+            var item=obj.Data[i];
+            var text=item.Text;
+
+            var backupTextColor=null;
+            if (item.Color) 
+            {
+                backupTextColor=this.Canvas.fillStyle;
+                this.Canvas.fillStyle=item.Color;
+            }
+
+            this.Canvas.fillText(text,xText,yText);
+            yText+=lineHeight+lineSpacing;
+
+            if (backupTextColor) this.Canvas.fillStyle=backupTextColor;
+        }
+
+        this.Canvas.textBaseline=textBaseline;  //还原对齐方式
+    }
+
     //上下区域是否重叠
     this.IsTextTopBottomOverlap=function(rt, rt2)
     {
@@ -11457,6 +11532,24 @@ function AverageWidthFrame()
         return null;
     }
 
+    this.GetMulitTextMaxWidth=function(aryData)
+    {
+        var width=null;
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var text=item.Text;
+            if (!text) continue;
+
+            var value=this.Canvas.measureText(text).width;
+            if (width==null) width=value;
+            else if(width<value) width=value;
+        }
+
+        return width;
+    }
+
     this.GetScaleTextWidth=function()
     {
         var border=this.ChartBorder.GetBorder();
@@ -11502,10 +11595,18 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                textWidth=this.Canvas.measureText(item.Message[0]).width;
+                if (Array.isArray(item.Message[0]))
+                {
+                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                }
+                else
+                {
+                    textWidth=this.Canvas.measureText(item.Message[0]).width;
+                }
+
                 if (width.Left==null || width.Left<textWidth)
                     width.Left=textWidth;
-
+                
                 //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
             }
 
@@ -11536,6 +11637,10 @@ function AverageWidthFrame()
                         var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;
                         if (textWidth<textWidth2) textWidth=textWidth2;
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    }
                     else    //显示第1行
                     {
                         textWidth=this.Canvas.measureText(item.Message[1][0]).width;

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

@@ -14260,35 +14260,46 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                if (item.Font!=null) this.Canvas.font=item.Font;
-
-                var xText=left;
-                if (leftExtendLine && leftExtendLine.Width>1)
+                if (Array.isArray(item.Message[0]))
                 {
-                    var lineLength=leftExtendLine.Width;
-                    if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
-                    else this.Canvas.strokeStyle=item.LineColor;
-                    this.Canvas.beginPath();
-                    this.Canvas.moveTo(xText,yFixed);
-                    this.Canvas.lineTo(xText-lineLength,yFixed);
-                    this.Canvas.stroke();
-
-                    xText-=lineLength;
+                    if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[0], X:left, Y:yText, TextBaseLine:textBaseline, IsLeft:true, Item:item, TextPadding:this.YTextPadding[0] };
+                        this.DrawMultiLineText(obj);
+                    }
                 }
-
-                rtLeft=this.GetTextTopBottom(textBaseline,yText);
-                if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
+                else
                 {
-                    if (leftExtendText && leftExtendText.Align===1)
+                    if (item.Font!=null) this.Canvas.font=item.Font;
+
+                    var xText=left;
+                    if (leftExtendLine && leftExtendLine.Width>1)
                     {
-                        this.Canvas.textAlign="left";
-                        this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        var lineLength=leftExtendLine.Width;
+                        if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
+                        else this.Canvas.strokeStyle=item.LineColor;
+                        this.Canvas.beginPath();
+                        this.Canvas.moveTo(xText,yFixed);
+                        this.Canvas.lineTo(xText-lineLength,yFixed);
+                        this.Canvas.stroke();
+
+                        xText-=lineLength;
                     }
-                    else
+
+                    rtLeft=this.GetTextTopBottom(textBaseline,yText);
+                    if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
                     {
-                        this.Canvas.textAlign="right";
-                        this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
-                        rtPreLeft=rtLeft;
+                        if (leftExtendText && leftExtendText.Align===1)
+                        {
+                            this.Canvas.textAlign="left";
+                            this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        }
+                        else
+                        {
+                            this.Canvas.textAlign="right";
+                            this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
+                            rtPreLeft=rtLeft;
+                        }
                     }
                 }
             }
@@ -14355,6 +14366,11 @@ function AverageWidthFrame()
                         var lineHeight=this.Canvas.measureText('M').width;
                         if (itemHeight>lineHeight*2) this.Canvas.fillText(item.Message[1][1],xText+this.YTextPadding[1],yText+lineHeight);
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[1], X:xText, Y:yText, TextBaseLine:textBaseline, IsLeft:false, Item:item, TextPadding:this.YTextPadding[1] };
+                        this.DrawMultiLineText(obj);
+                    }
                     else    //显示第1行
                     {
                         this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);
@@ -14415,6 +14431,65 @@ function AverageWidthFrame()
         }
     }
 
+    //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
+    this.DrawMultiLineText=function(obj)
+    {
+        var lineSpacing=2;
+        var lineHeight=this.Canvas.measureText('擎').width;
+        var lineCount=obj.Data.length;
+        var textHeight=lineHeight*lineCount+(lineSpacing*(lineCount-1));
+        var yText=obj.Y;
+
+        if (obj.Item.Font!=null) this.Canvas.font=obj.Item.Font;
+
+        if (obj.IsLeft)
+        {
+            this.Canvas.textAlign="right";
+            var xText=obj.X-obj.TextPadding;
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            var xText=obj.X+obj.TextPadding;
+        }
+
+        var textBaseline=this.Canvas.textBaseline;  //备份下原来的对齐方式
+        this.Canvas.textBaseline='top';
+        if (obj.TextBaseLine==1)    //middle
+        {
+            yText-=textHeight/2;
+        }
+        else if (obj.TextBaseLine==0)   //top
+        {
+
+        }
+        else if (obj.TextBaseLine==2)   //bottom
+        {
+            yText-=textHeight;
+        }
+       
+        
+        for(var i=0;i<obj.Data.length;++i)
+        {
+            var item=obj.Data[i];
+            var text=item.Text;
+
+            var backupTextColor=null;
+            if (item.Color) 
+            {
+                backupTextColor=this.Canvas.fillStyle;
+                this.Canvas.fillStyle=item.Color;
+            }
+
+            this.Canvas.fillText(text,xText,yText);
+            yText+=lineHeight+lineSpacing;
+
+            if (backupTextColor) this.Canvas.fillStyle=backupTextColor;
+        }
+
+        this.Canvas.textBaseline=textBaseline;  //还原对齐方式
+    }
+
     //上下区域是否重叠
     this.IsTextTopBottomOverlap=function(rt, rt2)
     {
@@ -15624,6 +15699,24 @@ function AverageWidthFrame()
         return null;
     }
 
+    this.GetMulitTextMaxWidth=function(aryData)
+    {
+        var width=null;
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var text=item.Text;
+            if (!text) continue;
+
+            var value=this.Canvas.measureText(text).width;
+            if (width==null) width=value;
+            else if(width<value) width=value;
+        }
+
+        return width;
+    }
+
     this.GetScaleTextWidth=function()
     {
         var border=this.ChartBorder.GetBorder();
@@ -15669,10 +15762,18 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                textWidth=this.Canvas.measureText(item.Message[0]).width;
+                if (Array.isArray(item.Message[0]))
+                {
+                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                }
+                else
+                {
+                    textWidth=this.Canvas.measureText(item.Message[0]).width;
+                }
+
                 if (width.Left==null || width.Left<textWidth)
                     width.Left=textWidth;
-
+                
                 //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
             }
 
@@ -15703,6 +15804,10 @@ function AverageWidthFrame()
                         var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;
                         if (textWidth<textWidth2) textWidth=textWidth2;
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    }
                     else    //显示第1行
                     {
                         textWidth=this.Canvas.measureText(item.Message[1][0]).width;
@@ -129154,7 +129259,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12897";
+var HQCHART_VERSION="1.1.12899";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -14304,35 +14304,46 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                if (item.Font!=null) this.Canvas.font=item.Font;
-
-                var xText=left;
-                if (leftExtendLine && leftExtendLine.Width>1)
+                if (Array.isArray(item.Message[0]))
                 {
-                    var lineLength=leftExtendLine.Width;
-                    if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
-                    else this.Canvas.strokeStyle=item.LineColor;
-                    this.Canvas.beginPath();
-                    this.Canvas.moveTo(xText,yFixed);
-                    this.Canvas.lineTo(xText-lineLength,yFixed);
-                    this.Canvas.stroke();
-
-                    xText-=lineLength;
+                    if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[0], X:left, Y:yText, TextBaseLine:textBaseline, IsLeft:true, Item:item, TextPadding:this.YTextPadding[0] };
+                        this.DrawMultiLineText(obj);
+                    }
                 }
-
-                rtLeft=this.GetTextTopBottom(textBaseline,yText);
-                if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
+                else
                 {
-                    if (leftExtendText && leftExtendText.Align===1)
+                    if (item.Font!=null) this.Canvas.font=item.Font;
+
+                    var xText=left;
+                    if (leftExtendLine && leftExtendLine.Width>1)
                     {
-                        this.Canvas.textAlign="left";
-                        this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        var lineLength=leftExtendLine.Width;
+                        if (leftExtendLine.Color) this.Canvas.strokeStyle=leftExtendLine.Color;
+                        else this.Canvas.strokeStyle=item.LineColor;
+                        this.Canvas.beginPath();
+                        this.Canvas.moveTo(xText,yFixed);
+                        this.Canvas.lineTo(xText-lineLength,yFixed);
+                        this.Canvas.stroke();
+
+                        xText-=lineLength;
                     }
-                    else
+
+                    rtLeft=this.GetTextTopBottom(textBaseline,yText);
+                    if (!rtPreLeft || (rtLeft && !this.IsTextTopBottomOverlap(rtLeft, rtPreLeft)))
                     {
-                        this.Canvas.textAlign="right";
-                        this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
-                        rtPreLeft=rtLeft;
+                        if (leftExtendText && leftExtendText.Align===1)
+                        {
+                            this.Canvas.textAlign="left";
+                            this.Canvas.fillText(item.Message[0],this.YTextPadding[0],yText);
+                        }
+                        else
+                        {
+                            this.Canvas.textAlign="right";
+                            this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText);
+                            rtPreLeft=rtLeft;
+                        }
                     }
                 }
             }
@@ -14399,6 +14410,11 @@ function AverageWidthFrame()
                         var lineHeight=this.Canvas.measureText('M').width;
                         if (itemHeight>lineHeight*2) this.Canvas.fillText(item.Message[1][1],xText+this.YTextPadding[1],yText+lineHeight);
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        var obj={ Data:item.Message[1], X:xText, Y:yText, TextBaseLine:textBaseline, IsLeft:false, Item:item, TextPadding:this.YTextPadding[1] };
+                        this.DrawMultiLineText(obj);
+                    }
                     else    //显示第1行
                     {
                         this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);
@@ -14459,6 +14475,65 @@ function AverageWidthFrame()
         }
     }
 
+    //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
+    this.DrawMultiLineText=function(obj)
+    {
+        var lineSpacing=2;
+        var lineHeight=this.Canvas.measureText('擎').width;
+        var lineCount=obj.Data.length;
+        var textHeight=lineHeight*lineCount+(lineSpacing*(lineCount-1));
+        var yText=obj.Y;
+
+        if (obj.Item.Font!=null) this.Canvas.font=obj.Item.Font;
+
+        if (obj.IsLeft)
+        {
+            this.Canvas.textAlign="right";
+            var xText=obj.X-obj.TextPadding;
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            var xText=obj.X+obj.TextPadding;
+        }
+
+        var textBaseline=this.Canvas.textBaseline;  //备份下原来的对齐方式
+        this.Canvas.textBaseline='top';
+        if (obj.TextBaseLine==1)    //middle
+        {
+            yText-=textHeight/2;
+        }
+        else if (obj.TextBaseLine==0)   //top
+        {
+
+        }
+        else if (obj.TextBaseLine==2)   //bottom
+        {
+            yText-=textHeight;
+        }
+       
+        
+        for(var i=0;i<obj.Data.length;++i)
+        {
+            var item=obj.Data[i];
+            var text=item.Text;
+
+            var backupTextColor=null;
+            if (item.Color) 
+            {
+                backupTextColor=this.Canvas.fillStyle;
+                this.Canvas.fillStyle=item.Color;
+            }
+
+            this.Canvas.fillText(text,xText,yText);
+            yText+=lineHeight+lineSpacing;
+
+            if (backupTextColor) this.Canvas.fillStyle=backupTextColor;
+        }
+
+        this.Canvas.textBaseline=textBaseline;  //还原对齐方式
+    }
+
     //上下区域是否重叠
     this.IsTextTopBottomOverlap=function(rt, rt2)
     {
@@ -15668,6 +15743,24 @@ function AverageWidthFrame()
         return null;
     }
 
+    this.GetMulitTextMaxWidth=function(aryData)
+    {
+        var width=null;
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            var text=item.Text;
+            if (!text) continue;
+
+            var value=this.Canvas.measureText(text).width;
+            if (width==null) width=value;
+            else if(width<value) width=value;
+        }
+
+        return width;
+    }
+
     this.GetScaleTextWidth=function()
     {
         var border=this.ChartBorder.GetBorder();
@@ -15713,10 +15806,18 @@ function AverageWidthFrame()
 
             if (item.Message[0]!=null && isDrawLeft)
             {
-                textWidth=this.Canvas.measureText(item.Message[0]).width;
+                if (Array.isArray(item.Message[0]))
+                {
+                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                }
+                else
+                {
+                    textWidth=this.Canvas.measureText(item.Message[0]).width;
+                }
+
                 if (width.Left==null || width.Left<textWidth)
                     width.Left=textWidth;
-
+                
                 //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[0]} ${textWidth}`);
             }
 
@@ -15747,6 +15848,10 @@ function AverageWidthFrame()
                         var textWidth2=this.Canvas.measureText(item.Message[1][1]).width;
                         if (textWidth<textWidth2) textWidth=textWidth2;
                     }
+                    else if (this.MultiTextFormat==3)
+                    {
+                        textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    }
                     else    //显示第1行
                     {
                         textWidth=this.Canvas.measureText(item.Message[1][0]).width;
@@ -129312,7 +129417,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12897";
+var HQCHART_VERSION="1.1.12899";
 
 function PrintHQChartVersion()
 {