hqchart 1.1.12879 → 1.1.12884

package/lib/umychart.vue.js

@@ -2335,9 +2335,9 @@ if(item.Message[0]!=null&&isDrawLeft){if(item.Font!=null)this.Canvas.font=item.F
 this.DrawVertical=function(){var border=this.GetBorder();var top=border.TopTitle;var bottom=border.Bottom;var right=border.RightEx;var pixelRatio=GetDevicePixelRatio();//获取设备的分辨率
 //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
 if(this.ChartBorder.Bottom<=5*GetDevicePixelRatio())return;//高度不够 不显示
-var bottomTextExtend=null;if(this.XTextExtend){bottomTextExtend=this.XTextExtend[0];}var bottomLineExtend=null;if(this.XLineExtend){bottomLineExtend=this.XLineExtend[0];}var xPrev=null;//上一个坐标x的值
+var mapX=null;if(this.GetVerticalXCache)mapX=this.GetVerticalXCache();var bottomTextExtend=null;if(this.XTextExtend){bottomTextExtend=this.XTextExtend[0];}var bottomLineExtend=null;if(this.XLineExtend){bottomLineExtend=this.XLineExtend[0];}var xPrev=null;//上一个坐标x的值
 var textRightPrev=null;//上一次刻度输出右边x坐标
-for(var i=0;i<this.VerticalInfo.length;++i){var x=this.GetXFromIndex(this.VerticalInfo[i].Value);if(x>right)break;if(xPrev!=null&&Math.abs(x-xPrev)<this.MinXDistance)continue;var item=this.VerticalInfo[i];var xFixed=ToFixedPoint(x);if(this.IsShowXLine){if(item.LineType==2)//虚线
+for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];var x=null;if(mapX&&mapX.has(item.Value))x=mapX.get(item.Value);else x=this.GetXFromIndex(item.Value);if(x>right)break;if(xPrev!=null&&Math.abs(x-xPrev)<this.MinXDistance)continue;var item=this.VerticalInfo[i];var xFixed=ToFixedPoint(x);if(this.IsShowXLine){if(item.LineType==2)//虚线
 {this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;if(item.LineDash)this.Canvas.setLineDash(item.LineDash);else this.Canvas.setLineDash([5*pixelRatio,5*pixelRatio]);this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();this.Canvas.setLineDash([]);}else if(item.LineType==3){}else if(item.LineType>0)//实线
 {if(g_JSChartResource.FrameXLineDash){this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.setLineDash(g_JSChartResource.FrameXLineDash);//虚线
 this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();this.Canvas.setLineDash([]);}else{this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();}}}if(item.BG&&item.BG.Color){var bgItem=item.BG;this.Canvas.fillStyle=bgItem.Color;var xStart=this.GetXFromIndex(bgItem.Index.Start);var xEnd=this.GetXFromIndex(bgItem.Index.End);var bgHeight=this.ChartBorder.Bottom;if(IFrameSplitOperator.IsNumber(bgItem.Height))bgHeight=bgItem.Height;var rtBG={Left:xStart,Width:xEnd-xStart,Top:border.Bottom,Height:bgHeight};this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}if(this.VerticalInfo[i].Message[0]!=null){if(this.VerticalInfo[i].Font)this.Canvas.font=this.VerticalInfo[i].Font;var textLeft=0;this.Canvas.strokeStyle=item.TextColor;var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;var textHeight=this.Canvas.measureText("擎").width;if(bottomTextExtend&&bottomTextExtend.Align==1){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";textLeft=x;}else{if(x<testWidth/2){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";textLeft=x;}else if(x+testWidth/2>=this.ChartBorder.GetChartWidth()){this.Canvas.textAlign="right";this.Canvas.textBaseline="top";textLeft=x-testWidth;}else{this.Canvas.textAlign="center";this.Canvas.textBaseline="top";textLeft=x-testWidth/2;}}if(textRightPrev==null||textLeft>textRightPrev){var yText=bottom;if(item.LineType==3){var lineLength=this.ShortXLineLength*pixelRatio;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,yText);this.Canvas.lineTo(xFixed,yText+lineLength);this.Canvas.stroke();yText+=lineLength+2*pixelRatio;}if(bottomLineExtend){if(bottomLineExtend.Mode===1){if(item.Value>1){if(bottomLineExtend.Color)this.Canvas.strokeStyle=bottomLineExtend.Color;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,bottom);this.Canvas.lineTo(xFixed,border.ChartHeight);this.Canvas.stroke();x+=1;}}else if(bottomLineExtend.Mode===2){if(bottomLineExtend.Width>=1){var lineLength=bottomLineExtend.Width;if(bottomLineExtend.Color)this.Canvas.strokeStyle=bottomLineExtend.Color;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,yText);this.Canvas.lineTo(xFixed,yText+lineLength);this.Canvas.stroke();yText+=lineLength+2;}}}//item.TextBGColor="rgb(0,255,0)";
@@ -2572,7 +2572,8 @@ this.Canvas.strokeStyle=item.Data.Line.Color;this.Canvas.beginPath();if(item.IsH
 }else{this.Canvas.strokeRect(left,top,right-left-1,height);//少一个像素让边框显示出来
 }};//是否在X轴坐标上
 //this.PtInVertical=function(x,y) { return false; }
-}function OverlayKLineFrame(){this.newMethod=KLineFrame;//派生
+//缓存X轴坐标刻度
+this.GetVerticalXCache=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.VerticalInfo))return null;var dataWidth=this.DataWidth;var distanceWidth=this.DistanceWidth;var xPointCount=this.XPointCount;var setIndex=new _set2.default();for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];setIndex.add(item.Value);}if(this.IsHScreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;}var mapX=new _map2.default();for(var i=0;i<xPointCount;++i,xOffset+=dataWidth+distanceWidth){var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;if(setIndex.has(i)){mapX.set(i,x);}}return mapX;};}function OverlayKLineFrame(){this.newMethod=KLineFrame;//派生
 this.newMethod();delete this.newMethod;this.ClassName='OverlayKLineFrame';this.MainFrame=null;//主框架
 this.IsShareY=false;//使用和主框架公用Y轴
 this.IsCalculateYMaxMin=true;//是否计算Y最大最小值
@@ -2628,9 +2629,9 @@ 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;//两个坐标在近了 就不画了
 //坐标信息 左边 间距小于10 画在内部
 if(item.Message[0]!=null&&isDrawLeft){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="left";if(y>=right-2)this.Canvas.textBaseline='top';else if(y<=left+2)this.Canvas.textBaseline='bottom';else this.Canvas.textBaseline="middle";var textObj={X:left,Y:y,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:item.Message[0]}};var xText=y,yText=top;this.Canvas.save();this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(item.Message[0],-2,0);this.Canvas.restore();}if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="right";if(y>=right-2)this.Canvas.textBaseline='top';else if(y<=left+2)this.Canvas.textBaseline='bottom';else this.Canvas.textBaseline="middle";if(Array.isArray(item.Message[1]))var text=item.Message[1][0];else var text=item.Message[1];var textWidth=this.Canvas.measureText(text).width;var textObj={X:right-textWidth,Y:y,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:text}};var xText=y,yText=bottom;this.Canvas.save();this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(text,-2,0);this.Canvas.restore();}yPrev=y;}}};this.GetXFromIndex=function(index,isLimit){if(isLimit===false){var border=this.ChartBorder.GetHScreenBorder();if(index>=0){var offset=border.TopEx+g_JSChartResource.FrameLeftMargin+this.DistanceWidth/2+this.DataWidth/2;for(var i=1;i<=index;++i){offset+=this.DistanceWidth+this.DataWidth;}}else{var offset=border.TopEx-(this.DistanceWidth/2+this.DataWidth+this.DistanceWidth);var absIndex=Math.abs(index);for(var i=1;i<absIndex;++i){offset-=this.DistanceWidth+this.DataWidth;}}}else{if(index<0)index=0;if(index>this.xPointCount-1)index=this.xPointCount-1;var border=this.ChartBorder.GetHScreenBorder();var offset=border.TopEx+g_JSChartResource.FrameLeftMargin+this.DistanceWidth/2+this.DataWidth/2;for(var i=1;i<=index;++i){offset+=this.DistanceWidth+this.DataWidth;}}return offset;};//画X轴
-this.DrawVertical=function(){var border=this.ChartBorder.GetHScreenBorder();var left=border.Left;var right=border.RightTitle;var bottom=border.Bottom;var pixelRatio=GetDevicePixelRatio();//获取设备的分辨率
+this.DrawVertical=function(){var mapX=null;if(this.GetVerticalXCache)mapX=this.GetVerticalXCache();var border=this.ChartBorder.GetHScreenBorder();var left=border.Left;var right=border.RightTitle;var bottom=border.Bottom;var pixelRatio=GetDevicePixelRatio();//获取设备的分辨率
 var xPrev=null;//上一个坐标x的值
-for(var i in this.VerticalInfo){var x=this.GetXFromIndex(this.VerticalInfo[i].Value);if(x>=bottom)break;if(xPrev!=null&&Math.abs(x-xPrev)<80)continue;var item=this.VerticalInfo[i];if(item.LineType==2){this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.setLineDash([5*pixelRatio,5*pixelRatio]);//虚线
+for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];var x=null;if(mapX&&mapX.has(item.Value))x=mapX.get(item.Value);else x=this.GetXFromIndex(item.Value);if(x>=bottom)break;if(xPrev!=null&&Math.abs(x-xPrev)<80)continue;if(item.LineType==2){this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.setLineDash([5*pixelRatio,5*pixelRatio]);//虚线
 this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lineTo(right,ToFixedPoint(x));this.Canvas.stroke();this.Canvas.setLineDash([]);}else if(item.LineType>0){this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;if(g_JSChartResource.FrameXLineDash){this.Canvas.setLineDash(g_JSChartResource.FrameXLineDash);//虚线
 this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lineTo(right,ToFixedPoint(x));this.Canvas.stroke();this.Canvas.setLineDash([]);}else//实线
 {this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lineTo(right,ToFixedPoint(x));this.Canvas.stroke();}}if(this.VerticalInfo[i].Message[0]!=null){if(this.VerticalInfo[i].Font!=null)this.Canvas.font=this.VerticalInfo[i].Font;this.Canvas.fillStyle=this.VerticalInfo[i].TextColor;var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;if(x<testWidth/2){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";}else{this.Canvas.textAlign="center";this.Canvas.textBaseline="top";}var xText=left,yText=x;this.Canvas.save();this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(this.VerticalInfo[i].Message[0],0,this.XBottomOffset);this.Canvas.restore();}xPrev=x;}};//Y坐标转y轴数值
@@ -4164,9 +4165,9 @@ tooltip.Data=item;tooltip.ChartPaint=this;tooltip.Type=3;//异动信息
 return true;}}return false;};}//MACD森林线 支持横屏
 function ChartMACD(){this.newMethod=IChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName="ChartMACD";this.UpColor=g_JSChartResource.UpBarColor;this.DownColor=g_JSChartResource.DownBarColor;this.LineWidth=1;this.DrawSelectedStatus=this.DrawLinePoint;this.ExportData=this.ExportArrayData;this.PtInChart=function(x,y){var dataWidth=this.ChartFrame.DataWidth;var barWidth=this.LineWidth*GetDevicePixelRatio();if(this.barWidth==50)barWidth=null;else if(barWidth>dataWidth)barWidth=dataWidth;if(barWidth<4)barWidth=4;//宽度太小了点不到
-return this.PtInBar(x,y,{BarWidth:barWidth});};this.DrawBars=function(lineWidth,bUpBar){var isMinute=this.IsMinuteFrame();var border=this.ChartBorder.GetBorder();var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var lockRect=this.GetLockRect();if(lockRect)chartright=lockRect.Left;if(bUpBar)this.Canvas.strokeStyle=this.UpColor;else this.Canvas.strokeStyle=this.DownColor;var yBottom=this.ChartFrame.GetYFromData(0);this.Canvas.beginPath();var drawCount=0;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];if(value==null)continue;if(bUpBar){if(value<0)continue;}else{if(value>=0)continue;}if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;}if(x>chartright)break;var y=this.ChartFrame.GetYFromData(value);var xFix=ToFixedPoint2(lineWidth,x);//毛边修正
-this.Canvas.moveTo(xFix,yBottom);this.Canvas.lineTo(xFix,y);++drawCount;}if(drawCount>0)this.Canvas.stroke();};this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw();return;}var dataWidth=this.ChartFrame.DataWidth;var lineWidth=this.LineWidth*GetDevicePixelRatio();if(this.LineWidth==50)lineWidth=dataWidth;else if(lineWidth>dataWidth)lineWidth=dataWidth;var backupLineWidth=this.Canvas.lineWidth;this.Canvas.lineWidth=lineWidth;//上下分开画
-this.DrawBars(lineWidth,true);this.DrawBars(lineWidth,false);this.Canvas.lineWidth=backupLineWidth;};this.HScreenDraw=function(){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetHScreenBorder();var chartright=border.BottomEx;var xPointCount=this.ChartFrame.XPointCount;var lockRect=this.GetLockRect();if(lockRect)chartright=lockRect.Top;var yBottom=this.ChartFrame.GetYFromData(0);var lineWidth=this.LineWidth*GetDevicePixelRatio();if(this.LineWidth==50)lineWidth=dataWidth;else if(lineWidth>dataWidth)lineWidth=dataWidth;var backupLineWidth=this.Canvas.lineWidth;this.Canvas.lineWidth=lineWidth;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(value==null)continue;var x=this.ChartFrame.GetXFromIndex(j);var y=this.ChartFrame.GetYFromData(value);if(x>chartright)break;this.Canvas.beginPath();this.Canvas.moveTo(yBottom,ToFixedPoint(x));this.Canvas.lineTo(y,ToFixedPoint(x));if(value>=0)this.Canvas.strokeStyle=this.UpColor;else this.Canvas.strokeStyle=this.DownColor;this.Canvas.stroke();this.Canvas.closePath();}this.Canvas.lineWidth=backupLineWidth;};this.GetItemData=function(indexData){if(!indexData)return null;if(!IFrameSplitOperator.IsNumber(indexData.Index))return null;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=indexData.Index;if(index<0||index>=this.Data.Data.length)return null;var item=this.Data.Data[index];return[{Value:item,Color:item>0?this.UpColor:this.DownColor,Name:this.Name}];};}//柱子
+return this.PtInBar(x,y,{BarWidth:barWidth});};this.DrawBars=function(lineWidth,bUpBar){var isMinute=this.IsMinuteFrame();var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;var isHSCreen=this.ChartFrame.IsHScreen===true;if(isHSCreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;var lockRect=this.GetLockRect();if(lockRect)chartright=lockRect.Top;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var lockRect=this.GetLockRect();if(lockRect)chartright=lockRect.Left;}if(bUpBar)this.Canvas.strokeStyle=this.UpColor;else this.Canvas.strokeStyle=this.DownColor;var yBottom=this.ChartFrame.GetYFromData(0);this.Canvas.beginPath();var drawCount=0;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];if(value==null)continue;if(bUpBar){if(value<0)continue;}else{if(value>=0)continue;}if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;}if(x>chartright)break;var y=this.ChartFrame.GetYFromData(value);var xFix=ToFixedPoint2(lineWidth,x);//毛边修正
+if(isHSCreen){this.Canvas.moveTo(yBottom,ToFixedPoint(x));this.Canvas.lineTo(y,ToFixedPoint(x));}else{this.Canvas.moveTo(xFix,yBottom);this.Canvas.lineTo(xFix,y);}++drawCount;}if(drawCount>0)this.Canvas.stroke();};this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}var dataWidth=this.ChartFrame.DataWidth;var lineWidth=this.LineWidth*GetDevicePixelRatio();if(this.LineWidth==50)lineWidth=dataWidth;else if(lineWidth>dataWidth)lineWidth=dataWidth;var backupLineWidth=this.Canvas.lineWidth;this.Canvas.lineWidth=lineWidth;//上下分开画
+this.DrawBars(lineWidth,true);this.DrawBars(lineWidth,false);this.Canvas.lineWidth=backupLineWidth;};this.GetItemData=function(indexData){if(!indexData)return null;if(!IFrameSplitOperator.IsNumber(indexData.Index))return null;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=indexData.Index;if(index<0||index>=this.Data.Data.length)return null;var item=this.Data.Data[index];return[{Value:item,Color:item>0?this.UpColor:this.DownColor,Name:this.Name}];};}//柱子
 function ChartBar(){this.newMethod=IChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName="ChartBar";this.UpBarColor=g_JSChartResource.UpBarColor;this.DownBarColor=g_JSChartResource.DownBarColor;this.Draw=function(){if(this.ChartFrame.IsMinSize)return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var bFirstPoint=true;var drawCount=0;var yBottom=this.ChartFrame.GetYFromData(0);if(dataWidth>=4){yBottom=ToFixedRect(yBottom);//调整为整数
 for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];if(value==null||value==0)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=this.ChartFrame.GetXFromIndex(j);var y=this.ChartFrame.GetYFromData(value);if(value>0)this.Canvas.fillStyle=this.UpBarColor;else this.Canvas.fillStyle=this.DownBarColor;//高度调整为整数
@@ -11888,7 +11889,8 @@ var aryPoint=[];for(var i in sourceData){var item=sourceData[i];for(var j in ite
 sourceData.sort(function(a,b){return a.Date-b.Date;});kdata.GetDateIndex(sourceData);return sourceData;}else if(ChartData.IsMinutePeriod(hqChart.Period,true)||ChartData.IsTickPeriod(hqChart.Period)||ChartData.IsSecondPeriod(hqChart.Period)||ChartData.IsMilliSecondPeriod(hqChart.Period))//分钟线
 {var kdata=hqChart.ChartPaint[0].Data;//K线
 sourceData.sort(function(a,b){if(a.Date==b.Date)return a.Time-b.Time;return a.Date-b.Date;});kdata.GetDateTimeIndex(sourceData);return sourceData;}else if(this.HQDataType==HQ_DATA_TYPE.MINUTE_ID||this.HQDataType==HQ_DATA_TYPE.MULTIDAY_MINUTE_ID){var minuteData=hqChart.SourceData;sourceData.sort(function(a,b){if(a.Date==b.Date)return a.Time-b.Time;return a.Date-b.Date;});minuteData.GetDateTimeIndex(sourceData);return sourceData;}return null;};this.FittingData=function(jsonData,hqChart){var outVar=jsonData.outvar;var date=jsonData.date;var time=jsonData.time;var kdata=hqChart.ChartPaint[0].Data;//把数据拟合到kdata上
-var result=[];if(!outVar)return result;for(var i=0;i<outVar.length;++i){var item=outVar[i];var indexData=[];var outVarItem={Name:item.name,Type:item.type};if(item.color)outVarItem.Color=item.color;if(item.data){outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(IFrameSplitOperator.IsBool(item.isshow))outVarItem.IsShow=item.isshow;//是否绘制线段
+var result=[];if(!outVar)return result;for(var i=0;i<outVar.length;++i){var item=outVar[i];var indexData=[];var outVarItem={Name:item.name,Type:item.type};if(item.color)outVarItem.Color=item.color;if(IFrameSplitOperator.IsBool(item.IsShowTitle))outVarItem.IsShowTitle=item.IsShowTitle;//是否显示指标标题
+if(item.data){outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(IFrameSplitOperator.IsBool(item.isshow))outVarItem.IsShow=item.isshow;//是否绘制线段
 if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;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.FittingArray(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.FittingArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='STICKLINE')//柱子
@@ -13034,7 +13036,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.12878";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12883";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

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

package/src/jscommon/umychart.complier.js

@@ -23621,6 +23621,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             var indexData=[];
             var outVarItem={Name:item.name,Type:item.type};
             if (item.color) outVarItem.Color=item.color;
+            if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle;  //是否显示指标标题
             if (item.data)
             {
                 outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);

package/src/jscommon/umychart.js

@@ -10643,6 +10643,9 @@ function AverageWidthFrame()
         //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
         if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return;   //高度不够 不显示
 
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var bottomTextExtend=null;
         if (this.XTextExtend)
         {
@@ -10659,7 +10662,10 @@ function AverageWidthFrame()
         var textRightPrev=null; //上一次刻度输出右边x坐标
         for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
             if (x>right) break;
             if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
             
@@ -14995,6 +15001,49 @@ function KLineFrame()
 
     //是否在X轴坐标上
     //this.PtInVertical=function(x,y) { return false; }
+
+    //缓存X轴坐标刻度
+    this.GetVerticalXCache=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.VerticalInfo)) return null;
+        
+        var dataWidth=this.DataWidth;
+        var distanceWidth=this.DistanceWidth;
+        var xPointCount=this.XPointCount;
+
+        var setIndex=new Set();
+        for(var i=0; i<this.VerticalInfo.length; ++i)
+        {
+            var item=this.VerticalInfo[i];
+            setIndex.add(item.Value);
+        }
+
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+
+        var mapX=new Map();
+        for(var i=0;i<xPointCount;++i, xOffset+=(dataWidth+distanceWidth))
+        {
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            var x=left+(right-left)/2;
+
+            if (setIndex.has(i))
+            {
+                mapX.set(i, x);
+            }
+        }
+
+        return mapX;
+    }
 }
 
 function OverlayKLineFrame()
@@ -16034,19 +16083,25 @@ function KLineHScreenFrame()
     //画X轴
     this.DrawVertical=function()
     {
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var border=this.ChartBorder.GetHScreenBorder();
         var left=border.Left;
         var right=border.RightTitle;
         var bottom=border.Bottom;
         var pixelRatio = GetDevicePixelRatio(); //获取设备的分辨率
         var xPrev=null; //上一个坐标x的值
-        for(var i in this.VerticalInfo)
+        for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
+
             if (x>=bottom) break;
             if (xPrev!=null && Math.abs(x-xPrev)<80) continue;
 
-            var item=this.VerticalInfo[i];
             if (item.LineType==2)
             {
                 this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;
@@ -33559,15 +33614,30 @@ function ChartMACD()
     this.DrawBars=function(lineWidth, bUpBar)
     {
         var isMinute=this.IsMinuteFrame();
-        var border=this.ChartBorder.GetBorder();
+        
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var xPointCount=this.ChartFrame.XPointCount;
-        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+
+        if (isHSCreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.BottomEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+            var chartright=border.RightEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Left;
+        }
 
-        var chartright=border.RightEx;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Left;
 
         if (bUpBar) this.Canvas.strokeStyle=this.UpColor;
         else this.Canvas.strokeStyle=this.DownColor;
@@ -33604,8 +33674,18 @@ function ChartMACD()
 
             var y=this.ChartFrame.GetYFromData(value);
             var xFix=ToFixedPoint2(lineWidth, x); //毛边修正
-            this.Canvas.moveTo(xFix,yBottom);
-            this.Canvas.lineTo(xFix,y);
+
+            if (isHSCreen)
+            {
+                this.Canvas.moveTo(yBottom,ToFixedPoint(x));
+                this.Canvas.lineTo(y,ToFixedPoint(x));
+            }
+            else
+            {
+                this.Canvas.moveTo(xFix,yBottom);
+                this.Canvas.lineTo(xFix,y);
+            }
+            
             ++drawCount;
         }
 
@@ -33624,12 +33704,6 @@ function ChartMACD()
             return;
         }
 
-        if (this.ChartFrame.IsHScreen===true)
-        {
-            this.HScreenDraw();
-            return;
-        }
-
         var dataWidth=this.ChartFrame.DataWidth;
         var lineWidth=this.LineWidth*GetDevicePixelRatio();
         if (this.LineWidth==50) lineWidth=dataWidth;
@@ -33645,48 +33719,6 @@ function ChartMACD()
         this.Canvas.lineWidth=backupLineWidth;
     }
 
-    this.HScreenDraw=function()
-    {
-        var dataWidth=this.ChartFrame.DataWidth;
-        var distanceWidth=this.ChartFrame.DistanceWidth;
-        var border=this.ChartBorder.GetHScreenBorder();
-        var chartright=border.BottomEx;
-        var xPointCount=this.ChartFrame.XPointCount;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Top;
-
-        var yBottom=this.ChartFrame.GetYFromData(0);
-
-        var lineWidth=this.LineWidth*GetDevicePixelRatio();
-        if (this.LineWidth==50) lineWidth=dataWidth;
-        else if (lineWidth>dataWidth) lineWidth=dataWidth;
-
-        var backupLineWidth=this.Canvas.lineWidth;
-        this.Canvas.lineWidth=lineWidth;
-        
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
-        {
-            var value=this.Data.Data[i];
-            if (value==null) continue;
-
-            var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(value);
-
-            if (x>chartright) break;
-
-            this.Canvas.beginPath();
-            this.Canvas.moveTo(yBottom,ToFixedPoint(x));
-            this.Canvas.lineTo(y,ToFixedPoint(x));
-
-            if (value>=0) this.Canvas.strokeStyle=this.UpColor;
-            else this.Canvas.strokeStyle=this.DownColor;
-            this.Canvas.stroke();
-            this.Canvas.closePath();
-        }
-
-        this.Canvas.lineWidth=backupLineWidth;
-    }
-
     this.GetItemData=function(indexData)
     {
         if (!indexData) return null;

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

@@ -14810,6 +14810,9 @@ function AverageWidthFrame()
         //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
         if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return;   //高度不够 不显示
 
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var bottomTextExtend=null;
         if (this.XTextExtend)
         {
@@ -14826,7 +14829,10 @@ function AverageWidthFrame()
         var textRightPrev=null; //上一次刻度输出右边x坐标
         for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
             if (x>right) break;
             if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
             
@@ -19162,6 +19168,49 @@ function KLineFrame()
 
     //是否在X轴坐标上
     //this.PtInVertical=function(x,y) { return false; }
+
+    //缓存X轴坐标刻度
+    this.GetVerticalXCache=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.VerticalInfo)) return null;
+        
+        var dataWidth=this.DataWidth;
+        var distanceWidth=this.DistanceWidth;
+        var xPointCount=this.XPointCount;
+
+        var setIndex=new Set();
+        for(var i=0; i<this.VerticalInfo.length; ++i)
+        {
+            var item=this.VerticalInfo[i];
+            setIndex.add(item.Value);
+        }
+
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+
+        var mapX=new Map();
+        for(var i=0;i<xPointCount;++i, xOffset+=(dataWidth+distanceWidth))
+        {
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            var x=left+(right-left)/2;
+
+            if (setIndex.has(i))
+            {
+                mapX.set(i, x);
+            }
+        }
+
+        return mapX;
+    }
 }
 
 function OverlayKLineFrame()
@@ -20201,19 +20250,25 @@ function KLineHScreenFrame()
     //画X轴
     this.DrawVertical=function()
     {
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var border=this.ChartBorder.GetHScreenBorder();
         var left=border.Left;
         var right=border.RightTitle;
         var bottom=border.Bottom;
         var pixelRatio = GetDevicePixelRatio(); //获取设备的分辨率
         var xPrev=null; //上一个坐标x的值
-        for(var i in this.VerticalInfo)
+        for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
+
             if (x>=bottom) break;
             if (xPrev!=null && Math.abs(x-xPrev)<80) continue;
 
-            var item=this.VerticalInfo[i];
             if (item.LineType==2)
             {
                 this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;
@@ -37726,15 +37781,30 @@ function ChartMACD()
     this.DrawBars=function(lineWidth, bUpBar)
     {
         var isMinute=this.IsMinuteFrame();
-        var border=this.ChartBorder.GetBorder();
+        
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var xPointCount=this.ChartFrame.XPointCount;
-        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+
+        if (isHSCreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.BottomEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+            var chartright=border.RightEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Left;
+        }
 
-        var chartright=border.RightEx;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Left;
 
         if (bUpBar) this.Canvas.strokeStyle=this.UpColor;
         else this.Canvas.strokeStyle=this.DownColor;
@@ -37771,8 +37841,18 @@ function ChartMACD()
 
             var y=this.ChartFrame.GetYFromData(value);
             var xFix=ToFixedPoint2(lineWidth, x); //毛边修正
-            this.Canvas.moveTo(xFix,yBottom);
-            this.Canvas.lineTo(xFix,y);
+
+            if (isHSCreen)
+            {
+                this.Canvas.moveTo(yBottom,ToFixedPoint(x));
+                this.Canvas.lineTo(y,ToFixedPoint(x));
+            }
+            else
+            {
+                this.Canvas.moveTo(xFix,yBottom);
+                this.Canvas.lineTo(xFix,y);
+            }
+            
             ++drawCount;
         }
 
@@ -37791,12 +37871,6 @@ function ChartMACD()
             return;
         }
 
-        if (this.ChartFrame.IsHScreen===true)
-        {
-            this.HScreenDraw();
-            return;
-        }
-
         var dataWidth=this.ChartFrame.DataWidth;
         var lineWidth=this.LineWidth*GetDevicePixelRatio();
         if (this.LineWidth==50) lineWidth=dataWidth;
@@ -37812,48 +37886,6 @@ function ChartMACD()
         this.Canvas.lineWidth=backupLineWidth;
     }
 
-    this.HScreenDraw=function()
-    {
-        var dataWidth=this.ChartFrame.DataWidth;
-        var distanceWidth=this.ChartFrame.DistanceWidth;
-        var border=this.ChartBorder.GetHScreenBorder();
-        var chartright=border.BottomEx;
-        var xPointCount=this.ChartFrame.XPointCount;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Top;
-
-        var yBottom=this.ChartFrame.GetYFromData(0);
-
-        var lineWidth=this.LineWidth*GetDevicePixelRatio();
-        if (this.LineWidth==50) lineWidth=dataWidth;
-        else if (lineWidth>dataWidth) lineWidth=dataWidth;
-
-        var backupLineWidth=this.Canvas.lineWidth;
-        this.Canvas.lineWidth=lineWidth;
-        
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
-        {
-            var value=this.Data.Data[i];
-            if (value==null) continue;
-
-            var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(value);
-
-            if (x>chartright) break;
-
-            this.Canvas.beginPath();
-            this.Canvas.moveTo(yBottom,ToFixedPoint(x));
-            this.Canvas.lineTo(y,ToFixedPoint(x));
-
-            if (value>=0) this.Canvas.strokeStyle=this.UpColor;
-            else this.Canvas.strokeStyle=this.DownColor;
-            this.Canvas.stroke();
-            this.Canvas.closePath();
-        }
-
-        this.Canvas.lineWidth=backupLineWidth;
-    }
-
     this.GetItemData=function(indexData)
     {
         if (!indexData) return null;
@@ -119229,6 +119261,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             var indexData=[];
             var outVarItem={Name:item.name,Type:item.type};
             if (item.color) outVarItem.Color=item.color;
+            if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle;  //是否显示指标标题
             if (item.data)
             {
                 outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
@@ -132046,7 +132079,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12878";
+var HQCHART_VERSION="1.1.12883";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -14854,6 +14854,9 @@ function AverageWidthFrame()
         //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
         if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return;   //高度不够 不显示
 
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var bottomTextExtend=null;
         if (this.XTextExtend)
         {
@@ -14870,7 +14873,10 @@ function AverageWidthFrame()
         var textRightPrev=null; //上一次刻度输出右边x坐标
         for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
             if (x>right) break;
             if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
             
@@ -19206,6 +19212,49 @@ function KLineFrame()
 
     //是否在X轴坐标上
     //this.PtInVertical=function(x,y) { return false; }
+
+    //缓存X轴坐标刻度
+    this.GetVerticalXCache=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.VerticalInfo)) return null;
+        
+        var dataWidth=this.DataWidth;
+        var distanceWidth=this.DistanceWidth;
+        var xPointCount=this.XPointCount;
+
+        var setIndex=new Set();
+        for(var i=0; i<this.VerticalInfo.length; ++i)
+        {
+            var item=this.VerticalInfo[i];
+            setIndex.add(item.Value);
+        }
+
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+
+        var mapX=new Map();
+        for(var i=0;i<xPointCount;++i, xOffset+=(dataWidth+distanceWidth))
+        {
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            var x=left+(right-left)/2;
+
+            if (setIndex.has(i))
+            {
+                mapX.set(i, x);
+            }
+        }
+
+        return mapX;
+    }
 }
 
 function OverlayKLineFrame()
@@ -20245,19 +20294,25 @@ function KLineHScreenFrame()
     //画X轴
     this.DrawVertical=function()
     {
+        var mapX=null;
+        if (this.GetVerticalXCache) mapX=this.GetVerticalXCache();
+
         var border=this.ChartBorder.GetHScreenBorder();
         var left=border.Left;
         var right=border.RightTitle;
         var bottom=border.Bottom;
         var pixelRatio = GetDevicePixelRatio(); //获取设备的分辨率
         var xPrev=null; //上一个坐标x的值
-        for(var i in this.VerticalInfo)
+        for(var i=0; i<this.VerticalInfo.length; ++i)
         {
-            var x=this.GetXFromIndex(this.VerticalInfo[i].Value);
+            var item=this.VerticalInfo[i];
+            var x=null;
+            if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
+            else x=this.GetXFromIndex(item.Value);
+
             if (x>=bottom) break;
             if (xPrev!=null && Math.abs(x-xPrev)<80) continue;
 
-            var item=this.VerticalInfo[i];
             if (item.LineType==2)
             {
                 this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;
@@ -37770,15 +37825,30 @@ function ChartMACD()
     this.DrawBars=function(lineWidth, bUpBar)
     {
         var isMinute=this.IsMinuteFrame();
-        var border=this.ChartBorder.GetBorder();
+        
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var xPointCount=this.ChartFrame.XPointCount;
-        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+
+        if (isHSCreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.BottomEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+            var chartright=border.RightEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Left;
+        }
 
-        var chartright=border.RightEx;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Left;
 
         if (bUpBar) this.Canvas.strokeStyle=this.UpColor;
         else this.Canvas.strokeStyle=this.DownColor;
@@ -37815,8 +37885,18 @@ function ChartMACD()
 
             var y=this.ChartFrame.GetYFromData(value);
             var xFix=ToFixedPoint2(lineWidth, x); //毛边修正
-            this.Canvas.moveTo(xFix,yBottom);
-            this.Canvas.lineTo(xFix,y);
+
+            if (isHSCreen)
+            {
+                this.Canvas.moveTo(yBottom,ToFixedPoint(x));
+                this.Canvas.lineTo(y,ToFixedPoint(x));
+            }
+            else
+            {
+                this.Canvas.moveTo(xFix,yBottom);
+                this.Canvas.lineTo(xFix,y);
+            }
+            
             ++drawCount;
         }
 
@@ -37835,12 +37915,6 @@ function ChartMACD()
             return;
         }
 
-        if (this.ChartFrame.IsHScreen===true)
-        {
-            this.HScreenDraw();
-            return;
-        }
-
         var dataWidth=this.ChartFrame.DataWidth;
         var lineWidth=this.LineWidth*GetDevicePixelRatio();
         if (this.LineWidth==50) lineWidth=dataWidth;
@@ -37856,48 +37930,6 @@ function ChartMACD()
         this.Canvas.lineWidth=backupLineWidth;
     }
 
-    this.HScreenDraw=function()
-    {
-        var dataWidth=this.ChartFrame.DataWidth;
-        var distanceWidth=this.ChartFrame.DistanceWidth;
-        var border=this.ChartBorder.GetHScreenBorder();
-        var chartright=border.BottomEx;
-        var xPointCount=this.ChartFrame.XPointCount;
-        var lockRect=this.GetLockRect();
-        if (lockRect) chartright=lockRect.Top;
-
-        var yBottom=this.ChartFrame.GetYFromData(0);
-
-        var lineWidth=this.LineWidth*GetDevicePixelRatio();
-        if (this.LineWidth==50) lineWidth=dataWidth;
-        else if (lineWidth>dataWidth) lineWidth=dataWidth;
-
-        var backupLineWidth=this.Canvas.lineWidth;
-        this.Canvas.lineWidth=lineWidth;
-        
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
-        {
-            var value=this.Data.Data[i];
-            if (value==null) continue;
-
-            var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(value);
-
-            if (x>chartright) break;
-
-            this.Canvas.beginPath();
-            this.Canvas.moveTo(yBottom,ToFixedPoint(x));
-            this.Canvas.lineTo(y,ToFixedPoint(x));
-
-            if (value>=0) this.Canvas.strokeStyle=this.UpColor;
-            else this.Canvas.strokeStyle=this.DownColor;
-            this.Canvas.stroke();
-            this.Canvas.closePath();
-        }
-
-        this.Canvas.lineWidth=backupLineWidth;
-    }
-
     this.GetItemData=function(indexData)
     {
         if (!indexData) return null;
@@ -119273,6 +119305,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             var indexData=[];
             var outVarItem={Name:item.name,Type:item.type};
             if (item.color) outVarItem.Color=item.color;
+            if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle;  //是否显示指标标题
             if (item.data)
             {
                 outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
@@ -132204,7 +132237,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12878";
+var HQCHART_VERSION="1.1.12883";
 
 function PrintHQChartVersion()
 {