hqchart 1.1.14406 → 1.1.14412

package/lib/umychart.vue.js

@@ -2352,7 +2352,7 @@ this.YTextPosition=[0,0],//是坐标否强制画在内部 [0=左侧] [1=右侧]
 this.YTextPadding=[g_JSChartResource.Frame.YTextPadding[0],g_JSChartResource.Frame.YTextPadding[1]],//Y轴文字和边框间距 [0=左侧] [1=右侧]
 this.IsShowXLine=true;//是否显示X轴刻度线
 this.IsShowYLine=true;this.YInsideOffset=0;this.YTextBaseline=0;//0=居中 1=上部 (目前就支持内部刻度)
-this.MultiTextFormat=0;//多行刻度信息显示模式 0=显示第1行 1=价格/百分比 2=显示2行
+this.MultiTextFormat=0;//多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
 this.RightTextMaxWidth=0;this.ShortYLineLength=5;this.ShortXLineLength=5;this.BeforeDrawXYCallback;//坐标绘制前回调,绘制深度图
 this.GetEventCallback;//事件回调
 //工具栏的按钮样式
@@ -2377,7 +2377,7 @@ var leftExtendLine=null;//左侧延长线
 if(IFrameSplitOperator.IsNonEmptyArray(this.YLineExtend)){rightExtendLine=this.YLineExtend[1];leftExtendLine=this.YLineExtend[0];}var rightExtendText=null;//右侧文字设置
 var leftExtendText=null;//左侧文字设置
 if(IFrameSplitOperator.IsNonEmptyArray(this.YTextExtend)){leftExtendText=this.YTextExtend[0];rightExtendText=this.YTextExtend[1];}var yPrev=null;//上一个坐标y的值
-var pixelRatio=GetDevicePixelRatio();var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;var aryMultiText=[];var rtPreRight,rtRight,rtLeft,rtPreLeft;var textBaseline=0;//0=上 1=中 2=下
+var pixelRatio=GetDevicePixelRatio();var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;var aryMultiText=[];var aryLeftMulitText=[];var rtPreRight,rtRight,rtLeft,rtPreLeft;var textBaseline=0;//0=上 1=中 2=下
 for(var i=this.HorizontalInfo.length-1;i>=0;--i)//从上往下画分割线
 {var item=this.HorizontalInfo[i];if(!IFrameSplitOperator.IsNumber(item.Value))continue;if(NumberCompare.GT(item.Value,this.HorizontalMax)||NumberCompare.LT(item.Value,this.HorizontalMin))continue;var y=this.GetYFromData(item.Value);if(y!=null&&yPrev!=null&&Math.abs(y-yPrev)<this.MinYDistance)continue;//两个坐标在近了 就不画了
 var yFixed=ToFixedPoint(y);//绘制刻度线
@@ -2388,23 +2388,30 @@ this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(right
 {}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){var yOffset=0;if(IFrameSplitOperator.IsNonEmptyArray(item.YOffset))//文字Y轴偏移
-{var offsetItem=item.YOffset[0];if(offsetItem&&IFrameSplitOperator.IsNumber(offsetItem.Offset))yOffset=offsetItem.Offset;}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+yOffset);}else{this.Canvas.textAlign="right";this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText+yOffset);rtPreLeft=rtLeft;}}}}//右边 坐标信息  间距小于10 不画坐标
+{var offsetItem=item.YOffset[0];if(offsetItem&&IFrameSplitOperator.IsNumber(offsetItem.Offset))yOffset=offsetItem.Offset;}if(Array.isArray(item.Message[0])){if(this.MultiTextFormat==1)//显示1行 格式如:价格/百分比
+{var textData=this.CreateMulitCoordinateItem(item.Message[0],left-2,yText,this.Canvas.textBaseline,item);aryLeftMulitText.push(textData);}else 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+yOffset);}else{this.Canvas.textAlign="right";this.Canvas.fillText(item.Message[0],xText-this.YTextPadding[0],yText+yOffset);rtPreLeft=rtLeft;}}}}//右边 坐标信息  间距小于10 不画坐标
 if(item.Message[1]!=null&&isDrawRight){var yOffset=0;if(IFrameSplitOperator.IsNonEmptyArray(item.YOffset))//文字Y轴偏移
 {var offsetItem=item.YOffset[1];if(offsetItem&&IFrameSplitOperator.IsNumber(offsetItem.Offset))yOffset=offsetItem.Offset;}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行
+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行 格式如:价格/百分比
+{var textData=this.CreateMulitCoordinateItem(item.Message[1],xText+2,yText,this.Canvas.textBaseline,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 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行
 {var text=item.Message[1][0];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(text,xRight,yText);}else{this.Canvas.fillText(text,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+yOffset);}else{this.Canvas.fillText(item.Message[1],xText+this.YTextPadding[1],yText+yOffset);}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.Canvas.textAlign="right";var xRight=this.YRightTextInfo.MainTextWidth+right-this.YTextPadding[1];this.Canvas.fillText(item.Message[1],xRight,yText+yOffset);}else{this.Canvas.fillText(item.Message[1],xText+this.YTextPadding[1],yText+yOffset);}rtPreRight=rtRight;}}}yPrev=y;}if(IFrameSplitOperator.IsNonEmptyArray(aryLeftMulitText)&&this.MultiTextFormat==1)this.DrawMultiCoordinateLeftText(aryLeftMulitText);if(IFrameSplitOperator.IsNonEmptyArray(aryMultiText)&&this.MultiTextFormat==1)this.DrawMultiCoordinateRightText(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();}}};this.CreateMulitCoordinateItem=function(aryData,x,y,textBaseline,data){var coordinateItem={AryText:[],X:x,Y:y,TextBaseline:textBaseline,Item:data};for(var i=0;i<aryData.length;++i){var item=aryData[i];if(item.Font)this.Canvas.font=item.Font;var textWidth=0;if(item.Text)textWidth=this.Canvas.measureText(item.Text).width;coordinateItem.AryText.push({Width:textWidth,Item:item});}return coordinateItem;};this.GetMulitCoordinateItemTextWidth=function(aryData){var total=0;for(var i=0;i<aryData.length;++i){var item=aryData[i];if(item.Font)this.Canvas.font=item.Font;var width=this.Canvas.measureText(item.Text).width;total+=width;}return total;};//多行文字刻度输出 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=item.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.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.DrawMultiCoordinateLeftText=function(aryText){var aryMaxWidth=[];for(var i=0,j=0;i<aryText.length;++i){var item=aryText[i];for(var j=0;j<item.AryText.length;++j){var textItem=item.AryText[j];if(!IFrameSplitOperator.IsNumber(aryMaxWidth[j])||aryMaxWidth[j]<textItem.Width)aryMaxWidth[j]=textItem.Width;}}this.Canvas.textAlign="right";for(var i=0;i<aryText.length;++i){var item=aryText[i];var message=item.Item;var x=item.X;this.Canvas.textBaseline=item.TextBaseline;for(var j=0;j<item.AryText.length;++j){var textItem=item.AryText[j];var subText=textItem.Item;if(subText&&subText.Text){if(subText.Font)this.Canvas.font=subText.Font;//字体
+else if(message.Font)this.Canvas.font=message.Font;if(subText.Color)this.Canvas.fillStyle=subText.Color;//颜色
+else this.Canvas.fillStyle=message.TextColor;this.Canvas.fillText(subText.Text,x,item.Y);}x-=aryMaxWidth[j];}}};//绘制多重坐标刻度文字 右侧
+this.DrawMultiCoordinateRightText=function(aryText){var aryMaxWidth=[];for(var i=0,j=0;i<aryText.length;++i){var item=aryText[i];for(var j=0;j<item.AryText.length;++j){var textItem=item.AryText[j];if(!IFrameSplitOperator.IsNumber(aryMaxWidth[j])||aryMaxWidth[j]<textItem.Width)aryMaxWidth[j]=textItem.Width;}}this.Canvas.textAlign="right";for(var i=0;i<aryText.length;++i){var item=aryText[i];var message=item.Item;var x=item.X;this.Canvas.textBaseline=item.TextBaseline;for(var j=0;j<item.AryText.length;++j){var textItem=item.AryText[j];var subText=textItem.Item;if(subText&&subText.Text){if(subText.Font)this.Canvas.font=subText.Font;//字体
+else if(message.Font)this.Canvas.font=message.Font;if(subText.Color)this.Canvas.fillStyle=subText.Color;//颜色
+else this.Canvas.fillStyle=message.TextColor;x+=aryMaxWidth[j];this.Canvas.fillText(subText.Text,x,item.Y);}}}};//画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)//从上往下画分割线
 {var item=this.HorizontalInfo[i];var y=this.GetYFromData(item.Value);if(y!=null&&yPrev!=null&&Math.abs(y-yPrev)<this.MinYDistance)continue;//两个坐标在近了 就不画了
@@ -2471,10 +2478,9 @@ this.Canvas.beginPath();if(this.IsHScreen){this.Canvas.moveTo(ToFixedPoint(y),le
 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;
 var isDrawRight=this.IsShowRightHorizontal();}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;
 var isDrawRight=this.IsShowRightHorizontal();}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){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&&IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))//显示1行 格式:价格/百分比
-{if(item.ExtendData&&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行
+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])){if(this.MultiTextFormat==1)textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[0]);else 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行 格式:价格/百分比
+{textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);}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 if(this.MultiTextFormat==3){textWidth=this.GetMulitTextMaxWidth(item.Message[1]);}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';};this.GetMainOverlayFrame=function(){if(!this.FrameData||!this.FrameData.SubFrameItem)return null;var subFrame=this.FrameData.SubFrameItem;var leftFrame=null,rightFrame=null;for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];var overlayFrame=item.Frame;if(overlayFrame.IsShowMainFrame==2)rightFrame=overlayFrame;else if(overlayFrame.IsShowMainFrame==1)leftFrame=overlayFrame;}if(!leftFrame&&!rightFrame)return null;return[leftFrame,rightFrame];};}function MinuteFrame(){this.newMethod=AverageWidthFrame;//派生
 this.newMethod();delete this.newMethod;this.ClassName="MinuteFrame";this.DataWidth=1*GetDevicePixelRatio();this.DistanceWidth=1*GetDevicePixelRatio();this.MinuteCount=243;//每天的分钟个数
@@ -5491,51 +5497,13 @@ var spacePrice=5*pixelTatio*(max-min)/height;max+=spacePrice;min-=spacePrice;if(
 {var coordinate=new CoordinateInfo();coordinate.Value=this.YClose;coordinate.LineType=2;//中间的线画虚线
 if(g_JSChartResource.FrameDotSplitPen)coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;var strPrice=this.YClose.toFixed(defaultfloatPrecision);//价格刻度字符串
 if(this.IsShowLeftText)coordinate.Message[0]=strPrice;if(this.IsShowRightText){if(this.RightTextFormat==1)coordinate.Message[1]=strPrice;else coordinate.Message[1]='0.00%';//百分比
-}this.Frame.HorizontalInfo.push(coordinate);}this.Frame.HorizontalInfo.sort(function(a,b){return a.Value-b.Value;});this.Frame.HorizontalMax=max;this.Frame.HorizontalMin=min;};this.DefaultSplit=function(range,isFixedMaxMin){var max=range.Max;var min=range.Min;if(!isFixedMaxMin){if(this.YClose==max&&this.YClose==min){max=this.YClose+this.YClose*0.1;min=this.YClose-this.YClose*0.1;}else{var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));max=this.YClose+distanceValue;min=this.YClose-distanceValue;if(min<0)min=range.Min;}}var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
+}this.Frame.HorizontalInfo.push(coordinate);}this.Frame.HorizontalInfo.sort(function(a,b){return a.Value-b.Value;});this.Frame.HorizontalMax=max;this.Frame.HorizontalMin=min;};this.DefaultSplit=function(range,isFixedMaxMin){var max=range.Max;var min=range.Min;if(!isFixedMaxMin){if(this.YClose==max&&this.YClose==min){max=this.YClose+this.YClose*0.1;min=this.YClose-this.YClose*0.1;}else{var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));max=this.YClose+distanceValue;min=this.YClose-distanceValue;//if (min<0) min=range.Min;
+}}var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 var width=this.Frame.ChartBorder.GetChartWidth();//画布的宽度
 var isPhoneModel=width<450*pixelTatio;JSConsole.Chart.Log('[FrameSplitMinutePriceY]'+'max='+max+' min='+min+' isPhoneModel='+isPhoneModel);var showCount=this.SplitCount;var distance=(max-min)/(showCount-1);var minDistance=[1,0.1,0.01,0.001,0.0001];var defaultfloatPrecision=GetfloatPrecision(this.Symbol);if(isPhoneModel&&MARKET_SUFFIX_NAME.IsSHSZIndex(this.Symbol))defaultfloatPrecision=0;//手机端指数不显示小数位数,太长了
-if(distance<minDistance[defaultfloatPrecision]&&!isFixedMaxMin){distance=minDistance[defaultfloatPrecision];max=this.YClose+distance*(showCount-1)/2;min=this.YClose-distance*(showCount-1)/2;}var aryCoordinate=[];var extendValue=distance*0.5;for(var price=this.YClose,i=0;price<=max+extendValue&&i<30;price+=distance,++i){var coordinate=new CoordinateInfo();coordinate.Value=price;this.FormatCoordinate(coordinate,defaultfloatPrecision);aryCoordinate.push(coordinate);}for(var price=this.YClose-distance,i=0;price>=min-extendValue&&i<30;price-=distance,++i){var coordinate=new CoordinateInfo();coordinate.Value=price;this.FormatCoordinate(coordinate,defaultfloatPrecision);aryCoordinate.push(coordinate);}aryCoordinate.sort(function(left,right){return left.Value-right.Value;});/*
-        for(var i=0;i<showCount;++i)
-        {
-            var price=min+(distance*i);
-            var coordinate=new CoordinateInfo();
-            this.Frame.HorizontalInfo[i]=coordinate
-            coordinate.Value=price;
-            var strPrice=price.toFixed(defaultfloatPrecision);  //价格刻度字符串
-            if (this.IsShowLeftText) coordinate.Message[0]=strPrice
-
-            if (IFrameSplitOperator.IsNumber(this.YClose) && this.YClose!=0)
-            {
-                var per=(price/this.YClose-1)*100;
-                if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
-                else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-                var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
-                if (this.IsShowRightText) 
-                {
-                    if (this.RightTextFormat==1)  
-                    {
-                        coordinate.Message[1]=strPrice;
-                    }
-                    else if (this.RightTextFormat==2) //价格/百分比
-                    {
-                        coordinate.Message[1]=[strPer,strPrice];
-                    }
-                    else 
-                    {
-                        coordinate.Message[1]=strPer; //百分比
-                    }
-                }
-
-                if (Math.abs(price-this.YClose) <0.00000000001) //小数有精度问题 使用差值
-                {
-                    coordinate.LineType=2;//中间的线画虚线
-                    coordinate.TextColor=g_JSChartResource.UnchagneTextColor;
-                    if (g_JSChartResource.FrameDotSplitPen) coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;
-                }
-            }
-        }*/this.Frame.HorizontalInfo=aryCoordinate;this.Frame.HorizontalMax=max;this.Frame.HorizontalMin=min;};this.FormatCoordinate=function(coordinate,defaultfloatPrecision){var price=coordinate.Value;var strPrice=price.toFixed(defaultfloatPrecision);//价格刻度字符串
+if(distance<minDistance[defaultfloatPrecision]&&!isFixedMaxMin){distance=minDistance[defaultfloatPrecision];max=this.YClose+distance*(showCount-1)/2;min=this.YClose-distance*(showCount-1)/2;}var aryCoordinate=[];var extendValue=distance*0.5;for(var price=this.YClose,i=0;price<=max+extendValue&&i<30;price+=distance,++i){var coordinate=new CoordinateInfo();coordinate.Value=price;this.FormatCoordinate(coordinate,defaultfloatPrecision);aryCoordinate.push(coordinate);}for(var price=this.YClose-distance,i=0;price>=min-extendValue&&i<30;price-=distance,++i){var coordinate=new CoordinateInfo();coordinate.Value=price;this.FormatCoordinate(coordinate,defaultfloatPrecision);aryCoordinate.push(coordinate);}aryCoordinate.sort(function(left,right){return left.Value-right.Value;});this.Frame.HorizontalInfo=aryCoordinate;this.Frame.HorizontalMax=max;this.Frame.HorizontalMin=min;};this.FormatCoordinate=function(coordinate,defaultfloatPrecision){var price=coordinate.Value;var strPrice=price.toFixed(defaultfloatPrecision);//价格刻度字符串
 if(this.IsShowLeftText)coordinate.Message[0]=strPrice;if(IFrameSplitOperator.IsNumber(this.YClose)&&this.YClose!=0){var per=(price/this.YClose-1)*100;if(per>0)coordinate.TextColor=g_JSChartResource.UpTextColor;else if(per<0)coordinate.TextColor=g_JSChartResource.DownTextColor;var strPer=IFrameSplitOperator.FormatValueString(per,2)+'%';if(this.IsShowRightText){if(this.RightTextFormat==1){coordinate.Message[1]=strPrice;}else if(this.RightTextFormat==2)//价格/百分比
-{coordinate.Message[1]=[strPer,strPrice];}else{coordinate.Message[1]=strPer;//百分比
+{coordinate.Message[1]=[{Text:strPrice},{Text:"/"},{Text:strPer}];}else{coordinate.Message[1]=strPer;//百分比
 }}if(Math.abs(price-this.YClose)<0.00000000001)//小数有精度问题 使用差值
 {coordinate.LineType=2;//中间的线画虚线
 coordinate.TextColor=g_JSChartResource.UnchagneTextColor;if(g_JSChartResource.FrameDotSplitPen)coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;}}};}function FrameSplitMinuteX(){this.newMethod=IFrameSplitOperator;//派生
@@ -12050,7 +12018,7 @@ var result=[];if(ChartData.IsDayPeriod(hqChart.Period,true))//日线
 var result=[];if(ChartData.IsDayPeriod(hqChart.Period,true))//日线
 {var bFill=false;for(var i=0,j=0;i<kData.Data.length;++i){result[i]=0;var kItem=kData.Data[i];var date=kItem.Date;for(j=0;j<data.length;++j){var rangeItem=data[j];if(date>=rangeItem.Start.Date&&date<=rangeItem.End.Date){result[i]=1;bFill=true;break;}}}if(bFill)return result;}else if(ChartData.IsMinutePeriod(hqChart.Period,true))//分钟线
 {var aryRange=[];for(var i=0;i<data.length;++i){var item=data[i];var startDatetime=item.Start.Date*10000;if(IFrameSplitOperator.IsNumber(item.Start.Time))startDatetime+=item.Start.Time;var endDatetime=item.End.Date*10000;if(IFrameSplitOperator.IsNumber(item.End.Time))endDatetime+=item.End.Time;aryRange.push({Start:startDatetime,End:endDatetime});}var bFill=false;for(var i=0,j=0;i<kData.Data.length;++i){result[i]=0;var kItem=kData.Data[i];var date=kItem.Date*10000+kItem.Time;for(j=0;j<aryRange.length;++j){var rangeItem=aryRange[j];if(date>=rangeItem.Start&&date<=rangeItem.End){result[i]=1;bFill=true;break;}}}if(bFill)return result;}return null;};this.FittingMinuteData=function(jsonData,hqChart){var outVar=jsonData.outvar;var date=jsonData.date;var time=jsonData.time;var result=[];for(var i=0;i<outVar.length;++i){var item=outVar[i];var outVarItem={Name:item.name,Type:item.type};if(IFrameSplitOperator.IsBool(item.IsShowTitle))outVarItem.IsShowTitle=item.IsShowTitle;//是否显示指标标题
-if(item.data){outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth>=1)outVarItem.LineWidth=item.linewidth;if(item.isshow==false)outVarItem.IsShow=false;if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;if(item.UpColor)outVarItem.UpColor=item.UpColor;if(item.DownColor)outVarItem.DownColor=item.DownColor;if(IFrameSplitOperator.IsBool(item.isDotLine))outVarItem.IsDotLine=item.isDotLine;if(IFrameSplitOperator.IsNonEmptyArray(item.lineDash))outVarItem.LineDash=item.lineDash;if(IFrameSplitOperator.IsBool(item.isSingleLine))outVarItem.IsSingleLine=item.isSingleLine;if(IFrameSplitOperator.IsNonEmptyArray(item.AryBreakPoint))outVarItem.AryBreakPoint=item.AryBreakPoint;result.push(outVarItem);}else if(item.Draw){var draw=item.Draw;var drawItem={};if(draw.DrawType=='DRAWICON')//图标
+if(item.data){outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(item.isshow==false)outVarItem.IsShow=false;if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;if(item.UpColor)outVarItem.UpColor=item.UpColor;if(item.DownColor)outVarItem.DownColor=item.DownColor;if(IFrameSplitOperator.IsBool(item.isDotLine))outVarItem.IsDotLine=item.isDotLine;if(IFrameSplitOperator.IsNonEmptyArray(item.lineDash))outVarItem.LineDash=item.lineDash;if(IFrameSplitOperator.IsBool(item.isSingleLine))outVarItem.IsSingleLine=item.isSingleLine;if(IFrameSplitOperator.IsNonEmptyArray(item.AryBreakPoint))outVarItem.AryBreakPoint=item.AryBreakPoint;result.push(outVarItem);}else if(item.Draw){var draw=item.Draw;var drawItem={};if(draw.DrawType=='DRAWICON')//图标
 {drawItem.Icon=draw.Icon;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMinuteArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWTEXT')//文本
 {drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMinuteArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='STICKLINE')//柱子
 {drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.Width=draw.Width;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMinuteArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.OVERLAY_BARS){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.BarName=draw.BarName;drawItem.BarColor=draw.BarColor;drawItem.LineWidth=draw.LineWidth;drawItem.DrawData=this.FittingMinuteArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.CLIP_COLOR_STICK){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMinuteArray(draw.Data,date,time,hqChart);outVarItem.Draw=drawItem;if(draw.Option)outVarItem.Option=draw.Option;result.push(outVarItem);}else if(draw.DrawType=='MULTI_LINE'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);for(var k in drawItem.DrawData){this.GetKLineData(drawItem.DrawData[k].Point,hqChart);}outVarItem.Draw=drawItem;if(draw.LineDash)drawItem.LineDash=draw.LineDash;if(draw.Arrow)drawItem.Arrow=draw.Arrow;result.push(outVarItem);}else if(draw.DrawType=='MULTI_POINT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_TEXT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_SVGICON'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Icon:draw.DrawData.Icon,Family:draw.DrawData.Family};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWSVG'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;if(draw.AutoPosition)drawItem.AutoPosition=draw.AutoPosition;if(draw.BuildKeyCallback)drawItem.BuildKeyCallback=draw.BuildKeyCallback;drawItem.DrawData={Data:draw.Data,Family:draw.Family,TextFont:draw.TextFont,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="MULTI_HTMLDOM")//外部自己创建dom
@@ -14360,7 +14328,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.14405";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();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.14410";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();//把给外界调用的方法暴露出来
 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.14406",
+  "version": "1.1.14412",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.complier.js

@@ -25470,7 +25470,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             {
                 outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);
                 if (item.color) outVarItem.Color=item.color;
-                if (item.linewidth>=1) outVarItem.LineWidth=item.linewidth;
+                if (item.linewidth) outVarItem.LineWidth=item.linewidth;
                 if (item.isshow==false) outVarItem.IsShow = false;
                 if (item.isexdata==true) outVarItem.IsExData = true;
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;

package/src/jscommon/umychart.js

@@ -11712,7 +11712,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=价格/百分比 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -12047,6 +12047,7 @@ function AverageWidthFrame()
         var pixelRatio=GetDevicePixelRatio();
         var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;
         var aryMultiText=[];
+        var aryLeftMulitText=[];
         var rtPreRight, rtRight, rtLeft, rtPreLeft;
         var textBaseline=0; //0=上 1=中 2=下
         for(var i=this.HorizontalInfo.length-1; i>=0; --i)  //从上往下画分割线
@@ -12153,7 +12154,12 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[0]))
                 {
-                    if (this.MultiTextFormat==3)
+                    if (this.MultiTextFormat==1)    //显示1行 格式如:价格/百分比
+                    {
+                        var textData=this.CreateMulitCoordinateItem(item.Message[0], left-2, yText, this.Canvas.textBaseline, item);
+                        aryLeftMulitText.push(textData);
+                    }
+                    else 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);
@@ -12239,25 +12245,9 @@ function AverageWidthFrame()
                 this.Canvas.textAlign="left";
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1)    //显示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
-                        }
+                        var textData=this.CreateMulitCoordinateItem(item.Message[1], xText+2, yText, this.Canvas.textBaseline, item);
                         aryMultiText.push(textData);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
@@ -12314,7 +12304,9 @@ function AverageWidthFrame()
             yPrev=y;
         }
 
-        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawHorizontalMuText(aryMultiText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryLeftMulitText) && this.MultiTextFormat==1) this.DrawMultiCoordinateLeftText(aryLeftMulitText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawMultiCoordinateRightText(aryMultiText);
+        
 
         if (isDrawRight && this.IsDrawRightBorder && this.YRightTextInfo)
         {  
@@ -12343,6 +12335,41 @@ function AverageWidthFrame()
         }
     }
 
+    this.CreateMulitCoordinateItem=function(aryData, x, y, textBaseline, data)
+    {
+        var coordinateItem=
+        { 
+            AryText:[], X:x,Y:y, TextBaseline:textBaseline, Item:data
+        };
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var textWidth=0;
+            if (item.Text) textWidth=this.Canvas.measureText(item.Text).width;
+
+            coordinateItem.AryText.push({ Width:textWidth, Item:item });
+        }
+
+        return coordinateItem;
+    }
+
+    this.GetMulitCoordinateItemTextWidth=function(aryData)
+    {
+        var total=0;
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var width=this.Canvas.measureText(item.Text).width;
+
+            total+=width;
+        }
+
+        return total;
+    }
+
     //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
     this.DrawMultiLineText=function(obj)
     {
@@ -12433,53 +12460,86 @@ function AverageWidthFrame()
         return rtRight;
     }
 
-    this.DrawHorizontalMuText=function(aryText)
+    //绘制多重坐标刻度文字 左侧
+    this.DrawMultiCoordinateLeftText=function(aryText)
     {
-        var maxWidth=[null,null];
-        for(var i=0;i<aryText.length;++i)
+        var aryMaxWidth=[];
+        for(var i=0, j=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 j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
+            
         }
 
+        this.Canvas.textAlign="right";
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
             var message=item.Item;
-
+            var x=item.X;
             this.Canvas.textBaseline=item.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;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    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);
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
 
-            if (message.ExtendData && message.ExtendData.SplitColor) this.Canvas.fillStyle=message.ExtendData.SplitColor;
-            else this.Canvas.fillStyle=message.TextColor;
+                x-=aryMaxWidth[j];
+            }
+        }
+    }
 
-            this.Canvas.textAlign="left";
-            var splitWidth=this.Canvas.measureText('/').width;
-            this.Canvas.fillText('/',x,item.Y);
+    //绘制多重坐标刻度文字 右侧
+    this.DrawMultiCoordinateRightText=function(aryText)
+    {
+        var aryMaxWidth=[];
+        for(var i=0, j=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
             
-            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);
+        this.Canvas.textAlign="right";
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            var message=item.Item;
+            var x=item.X;
+            this.Canvas.textBaseline=item.TextBaseline;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    else this.Canvas.fillStyle=message.TextColor;
 
-            var textWidth=maxWidth[1]+maxWidth[0]+splitWidth*4;
-            if (this.RightTextMaxWidth<textWidth) this.RightTextMaxWidth=textWidth;
+                    x+=aryMaxWidth[j];
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
+            }
         }
     }
 
@@ -14057,7 +14117,8 @@ function AverageWidthFrame()
             {
                 if (Array.isArray(item.Message[0]))
                 {
-                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    if (this.MultiTextFormat==1) textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[0]);
+                    else textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
                 }
                 else
                 {
@@ -14076,17 +14137,9 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1 && IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
                     {
-                        if (item.ExtendData && 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}`);
+                        textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
                     {
@@ -52840,7 +52893,7 @@ function FrameSplitMinutePriceY()
                 var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));
                 max=this.YClose+distanceValue;
                 min=this.YClose-distanceValue;
-                if (min<0) min=range.Min;
+                //if (min<0) min=range.Min;
             }
         }
 
@@ -52881,47 +52934,6 @@ function FrameSplitMinutePriceY()
 
         aryCoordinate.sort((left,right)=>{ return left.Value-right.Value; })
 
-        /*
-        for(var i=0;i<showCount;++i)
-        {
-            var price=min+(distance*i);
-            var coordinate=new CoordinateInfo();
-            this.Frame.HorizontalInfo[i]=coordinate
-            coordinate.Value=price;
-            var strPrice=price.toFixed(defaultfloatPrecision);  //价格刻度字符串
-            if (this.IsShowLeftText) coordinate.Message[0]=strPrice
-
-            if (IFrameSplitOperator.IsNumber(this.YClose) && this.YClose!=0)
-            {
-                var per=(price/this.YClose-1)*100;
-                if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
-                else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-                var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
-                if (this.IsShowRightText) 
-                {
-                    if (this.RightTextFormat==1)  
-                    {
-                        coordinate.Message[1]=strPrice;
-                    }
-                    else if (this.RightTextFormat==2) //价格/百分比
-                    {
-                        coordinate.Message[1]=[strPer,strPrice];
-                    }
-                    else 
-                    {
-                        coordinate.Message[1]=strPer; //百分比
-                    }
-                }
-
-                if (Math.abs(price-this.YClose) <0.00000000001) //小数有精度问题 使用差值
-                {
-                    coordinate.LineType=2;//中间的线画虚线
-                    coordinate.TextColor=g_JSChartResource.UnchagneTextColor;
-                    if (g_JSChartResource.FrameDotSplitPen) coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;
-                }
-            }
-        }*/
-
         this.Frame.HorizontalInfo=aryCoordinate;
         this.Frame.HorizontalMax=max;
         this.Frame.HorizontalMin=min;
@@ -52948,7 +52960,7 @@ function FrameSplitMinutePriceY()
                 }
                 else if (this.RightTextFormat==2) //价格/百分比
                 {
-                    coordinate.Message[1]=[strPer,strPrice];
+                    coordinate.Message[1]=[ {Text:strPrice}, {Text:"/"}, { Text:strPer} ];
                 }
                 else 
                 {

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

@@ -15637,7 +15637,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=价格/百分比 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -15972,6 +15972,7 @@ function AverageWidthFrame()
         var pixelRatio=GetDevicePixelRatio();
         var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;
         var aryMultiText=[];
+        var aryLeftMulitText=[];
         var rtPreRight, rtRight, rtLeft, rtPreLeft;
         var textBaseline=0; //0=上 1=中 2=下
         for(var i=this.HorizontalInfo.length-1; i>=0; --i)  //从上往下画分割线
@@ -16078,7 +16079,12 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[0]))
                 {
-                    if (this.MultiTextFormat==3)
+                    if (this.MultiTextFormat==1)    //显示1行 格式如:价格/百分比
+                    {
+                        var textData=this.CreateMulitCoordinateItem(item.Message[0], left-2, yText, this.Canvas.textBaseline, item);
+                        aryLeftMulitText.push(textData);
+                    }
+                    else 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);
@@ -16164,25 +16170,9 @@ function AverageWidthFrame()
                 this.Canvas.textAlign="left";
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1)    //显示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
-                        }
+                        var textData=this.CreateMulitCoordinateItem(item.Message[1], xText+2, yText, this.Canvas.textBaseline, item);
                         aryMultiText.push(textData);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
@@ -16239,7 +16229,9 @@ function AverageWidthFrame()
             yPrev=y;
         }
 
-        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawHorizontalMuText(aryMultiText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryLeftMulitText) && this.MultiTextFormat==1) this.DrawMultiCoordinateLeftText(aryLeftMulitText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawMultiCoordinateRightText(aryMultiText);
+        
 
         if (isDrawRight && this.IsDrawRightBorder && this.YRightTextInfo)
         {  
@@ -16268,6 +16260,41 @@ function AverageWidthFrame()
         }
     }
 
+    this.CreateMulitCoordinateItem=function(aryData, x, y, textBaseline, data)
+    {
+        var coordinateItem=
+        { 
+            AryText:[], X:x,Y:y, TextBaseline:textBaseline, Item:data
+        };
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var textWidth=0;
+            if (item.Text) textWidth=this.Canvas.measureText(item.Text).width;
+
+            coordinateItem.AryText.push({ Width:textWidth, Item:item });
+        }
+
+        return coordinateItem;
+    }
+
+    this.GetMulitCoordinateItemTextWidth=function(aryData)
+    {
+        var total=0;
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var width=this.Canvas.measureText(item.Text).width;
+
+            total+=width;
+        }
+
+        return total;
+    }
+
     //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
     this.DrawMultiLineText=function(obj)
     {
@@ -16358,53 +16385,86 @@ function AverageWidthFrame()
         return rtRight;
     }
 
-    this.DrawHorizontalMuText=function(aryText)
+    //绘制多重坐标刻度文字 左侧
+    this.DrawMultiCoordinateLeftText=function(aryText)
     {
-        var maxWidth=[null,null];
-        for(var i=0;i<aryText.length;++i)
+        var aryMaxWidth=[];
+        for(var i=0, j=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 j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
+            
         }
 
+        this.Canvas.textAlign="right";
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
             var message=item.Item;
-
+            var x=item.X;
             this.Canvas.textBaseline=item.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;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    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);
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
 
-            if (message.ExtendData && message.ExtendData.SplitColor) this.Canvas.fillStyle=message.ExtendData.SplitColor;
-            else this.Canvas.fillStyle=message.TextColor;
+                x-=aryMaxWidth[j];
+            }
+        }
+    }
 
-            this.Canvas.textAlign="left";
-            var splitWidth=this.Canvas.measureText('/').width;
-            this.Canvas.fillText('/',x,item.Y);
+    //绘制多重坐标刻度文字 右侧
+    this.DrawMultiCoordinateRightText=function(aryText)
+    {
+        var aryMaxWidth=[];
+        for(var i=0, j=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
             
-            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);
+        this.Canvas.textAlign="right";
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            var message=item.Item;
+            var x=item.X;
+            this.Canvas.textBaseline=item.TextBaseline;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    else this.Canvas.fillStyle=message.TextColor;
 
-            var textWidth=maxWidth[1]+maxWidth[0]+splitWidth*4;
-            if (this.RightTextMaxWidth<textWidth) this.RightTextMaxWidth=textWidth;
+                    x+=aryMaxWidth[j];
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
+            }
         }
     }
 
@@ -17982,7 +18042,8 @@ function AverageWidthFrame()
             {
                 if (Array.isArray(item.Message[0]))
                 {
-                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    if (this.MultiTextFormat==1) textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[0]);
+                    else textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
                 }
                 else
                 {
@@ -18001,17 +18062,9 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1 && IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
                     {
-                        if (item.ExtendData && 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}`);
+                        textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
                     {
@@ -56765,7 +56818,7 @@ function FrameSplitMinutePriceY()
                 var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));
                 max=this.YClose+distanceValue;
                 min=this.YClose-distanceValue;
-                if (min<0) min=range.Min;
+                //if (min<0) min=range.Min;
             }
         }
 
@@ -56806,47 +56859,6 @@ function FrameSplitMinutePriceY()
 
         aryCoordinate.sort((left,right)=>{ return left.Value-right.Value; })
 
-        /*
-        for(var i=0;i<showCount;++i)
-        {
-            var price=min+(distance*i);
-            var coordinate=new CoordinateInfo();
-            this.Frame.HorizontalInfo[i]=coordinate
-            coordinate.Value=price;
-            var strPrice=price.toFixed(defaultfloatPrecision);  //价格刻度字符串
-            if (this.IsShowLeftText) coordinate.Message[0]=strPrice
-
-            if (IFrameSplitOperator.IsNumber(this.YClose) && this.YClose!=0)
-            {
-                var per=(price/this.YClose-1)*100;
-                if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
-                else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-                var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
-                if (this.IsShowRightText) 
-                {
-                    if (this.RightTextFormat==1)  
-                    {
-                        coordinate.Message[1]=strPrice;
-                    }
-                    else if (this.RightTextFormat==2) //价格/百分比
-                    {
-                        coordinate.Message[1]=[strPer,strPrice];
-                    }
-                    else 
-                    {
-                        coordinate.Message[1]=strPer; //百分比
-                    }
-                }
-
-                if (Math.abs(price-this.YClose) <0.00000000001) //小数有精度问题 使用差值
-                {
-                    coordinate.LineType=2;//中间的线画虚线
-                    coordinate.TextColor=g_JSChartResource.UnchagneTextColor;
-                    if (g_JSChartResource.FrameDotSplitPen) coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;
-                }
-            }
-        }*/
-
         this.Frame.HorizontalInfo=aryCoordinate;
         this.Frame.HorizontalMax=max;
         this.Frame.HorizontalMin=min;
@@ -56873,7 +56885,7 @@ function FrameSplitMinutePriceY()
                 }
                 else if (this.RightTextFormat==2) //价格/百分比
                 {
-                    coordinate.Message[1]=[strPer,strPrice];
+                    coordinate.Message[1]=[ {Text:strPrice}, {Text:"/"}, { Text:strPer} ];
                 }
                 else 
                 {
@@ -127428,7 +127440,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             {
                 outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);
                 if (item.color) outVarItem.Color=item.color;
-                if (item.linewidth>=1) outVarItem.LineWidth=item.linewidth;
+                if (item.linewidth) outVarItem.LineWidth=item.linewidth;
                 if (item.isshow==false) outVarItem.IsShow = false;
                 if (item.isexdata==true) outVarItem.IsExData = true;
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
@@ -143392,7 +143404,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14405";
+var HQCHART_VERSION="1.1.14410";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -15681,7 +15681,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=价格/百分比 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -16016,6 +16016,7 @@ function AverageWidthFrame()
         var pixelRatio=GetDevicePixelRatio();
         var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;
         var aryMultiText=[];
+        var aryLeftMulitText=[];
         var rtPreRight, rtRight, rtLeft, rtPreLeft;
         var textBaseline=0; //0=上 1=中 2=下
         for(var i=this.HorizontalInfo.length-1; i>=0; --i)  //从上往下画分割线
@@ -16122,7 +16123,12 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[0]))
                 {
-                    if (this.MultiTextFormat==3)
+                    if (this.MultiTextFormat==1)    //显示1行 格式如:价格/百分比
+                    {
+                        var textData=this.CreateMulitCoordinateItem(item.Message[0], left-2, yText, this.Canvas.textBaseline, item);
+                        aryLeftMulitText.push(textData);
+                    }
+                    else 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);
@@ -16208,25 +16214,9 @@ function AverageWidthFrame()
                 this.Canvas.textAlign="left";
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1)    //显示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
-                        }
+                        var textData=this.CreateMulitCoordinateItem(item.Message[1], xText+2, yText, this.Canvas.textBaseline, item);
                         aryMultiText.push(textData);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
@@ -16283,7 +16273,9 @@ function AverageWidthFrame()
             yPrev=y;
         }
 
-        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawHorizontalMuText(aryMultiText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryLeftMulitText) && this.MultiTextFormat==1) this.DrawMultiCoordinateLeftText(aryLeftMulitText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawMultiCoordinateRightText(aryMultiText);
+        
 
         if (isDrawRight && this.IsDrawRightBorder && this.YRightTextInfo)
         {  
@@ -16312,6 +16304,41 @@ function AverageWidthFrame()
         }
     }
 
+    this.CreateMulitCoordinateItem=function(aryData, x, y, textBaseline, data)
+    {
+        var coordinateItem=
+        { 
+            AryText:[], X:x,Y:y, TextBaseline:textBaseline, Item:data
+        };
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var textWidth=0;
+            if (item.Text) textWidth=this.Canvas.measureText(item.Text).width;
+
+            coordinateItem.AryText.push({ Width:textWidth, Item:item });
+        }
+
+        return coordinateItem;
+    }
+
+    this.GetMulitCoordinateItemTextWidth=function(aryData)
+    {
+        var total=0;
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var width=this.Canvas.measureText(item.Text).width;
+
+            total+=width;
+        }
+
+        return total;
+    }
+
     //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
     this.DrawMultiLineText=function(obj)
     {
@@ -16402,53 +16429,86 @@ function AverageWidthFrame()
         return rtRight;
     }
 
-    this.DrawHorizontalMuText=function(aryText)
+    //绘制多重坐标刻度文字 左侧
+    this.DrawMultiCoordinateLeftText=function(aryText)
     {
-        var maxWidth=[null,null];
-        for(var i=0;i<aryText.length;++i)
+        var aryMaxWidth=[];
+        for(var i=0, j=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 j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
+            
         }
 
+        this.Canvas.textAlign="right";
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
             var message=item.Item;
-
+            var x=item.X;
             this.Canvas.textBaseline=item.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;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    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);
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
 
-            if (message.ExtendData && message.ExtendData.SplitColor) this.Canvas.fillStyle=message.ExtendData.SplitColor;
-            else this.Canvas.fillStyle=message.TextColor;
+                x-=aryMaxWidth[j];
+            }
+        }
+    }
 
-            this.Canvas.textAlign="left";
-            var splitWidth=this.Canvas.measureText('/').width;
-            this.Canvas.fillText('/',x,item.Y);
+    //绘制多重坐标刻度文字 右侧
+    this.DrawMultiCoordinateRightText=function(aryText)
+    {
+        var aryMaxWidth=[];
+        for(var i=0, j=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
             
-            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);
+        this.Canvas.textAlign="right";
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            var message=item.Item;
+            var x=item.X;
+            this.Canvas.textBaseline=item.TextBaseline;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    else this.Canvas.fillStyle=message.TextColor;
 
-            var textWidth=maxWidth[1]+maxWidth[0]+splitWidth*4;
-            if (this.RightTextMaxWidth<textWidth) this.RightTextMaxWidth=textWidth;
+                    x+=aryMaxWidth[j];
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
+            }
         }
     }
 
@@ -18026,7 +18086,8 @@ function AverageWidthFrame()
             {
                 if (Array.isArray(item.Message[0]))
                 {
-                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    if (this.MultiTextFormat==1) textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[0]);
+                    else textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
                 }
                 else
                 {
@@ -18045,17 +18106,9 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1 && IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
                     {
-                        if (item.ExtendData && 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}`);
+                        textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
                     {
@@ -56809,7 +56862,7 @@ function FrameSplitMinutePriceY()
                 var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));
                 max=this.YClose+distanceValue;
                 min=this.YClose-distanceValue;
-                if (min<0) min=range.Min;
+                //if (min<0) min=range.Min;
             }
         }
 
@@ -56850,47 +56903,6 @@ function FrameSplitMinutePriceY()
 
         aryCoordinate.sort((left,right)=>{ return left.Value-right.Value; })
 
-        /*
-        for(var i=0;i<showCount;++i)
-        {
-            var price=min+(distance*i);
-            var coordinate=new CoordinateInfo();
-            this.Frame.HorizontalInfo[i]=coordinate
-            coordinate.Value=price;
-            var strPrice=price.toFixed(defaultfloatPrecision);  //价格刻度字符串
-            if (this.IsShowLeftText) coordinate.Message[0]=strPrice
-
-            if (IFrameSplitOperator.IsNumber(this.YClose) && this.YClose!=0)
-            {
-                var per=(price/this.YClose-1)*100;
-                if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
-                else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-                var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
-                if (this.IsShowRightText) 
-                {
-                    if (this.RightTextFormat==1)  
-                    {
-                        coordinate.Message[1]=strPrice;
-                    }
-                    else if (this.RightTextFormat==2) //价格/百分比
-                    {
-                        coordinate.Message[1]=[strPer,strPrice];
-                    }
-                    else 
-                    {
-                        coordinate.Message[1]=strPer; //百分比
-                    }
-                }
-
-                if (Math.abs(price-this.YClose) <0.00000000001) //小数有精度问题 使用差值
-                {
-                    coordinate.LineType=2;//中间的线画虚线
-                    coordinate.TextColor=g_JSChartResource.UnchagneTextColor;
-                    if (g_JSChartResource.FrameDotSplitPen) coordinate.LineColor=g_JSChartResource.FrameDotSplitPen;
-                }
-            }
-        }*/
-
         this.Frame.HorizontalInfo=aryCoordinate;
         this.Frame.HorizontalMax=max;
         this.Frame.HorizontalMin=min;
@@ -56917,7 +56929,7 @@ function FrameSplitMinutePriceY()
                 }
                 else if (this.RightTextFormat==2) //价格/百分比
                 {
-                    coordinate.Message[1]=[strPer,strPrice];
+                    coordinate.Message[1]=[ {Text:strPrice}, {Text:"/"}, { Text:strPer} ];
                 }
                 else 
                 {
@@ -127472,7 +127484,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             {
                 outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);
                 if (item.color) outVarItem.Color=item.color;
-                if (item.linewidth>=1) outVarItem.LineWidth=item.linewidth;
+                if (item.linewidth) outVarItem.LineWidth=item.linewidth;
                 if (item.isshow==false) outVarItem.IsShow = false;
                 if (item.isexdata==true) outVarItem.IsExData = true;
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
@@ -153187,7 +153199,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14405";
+var HQCHART_VERSION="1.1.14410";
 
 function PrintHQChartVersion()
 {