hqchart 1.1.12822 → 1.1.12829

package/lib/umychart.vue.js

@@ -1794,7 +1794,7 @@ var bDraw=false;if(drawPictureActive.Select.Guid&&drawPictureActive.Select.Chart
 this.SelectChartDrawPicture.DragInfo={Click:{X:e.clientX,Y:e.clientY}};}else{this.CurrentChartDrawPicture=null;this.SelectChartDrawPicture=null;}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_DRAWPICTURE);//选中画图工具事件
 if(event&&event.Callback){var sendData={DrawPicture:drawPictrueData.ChartDrawPicture};event.Callback(event,sendData,this);}else{this.OnSelectChartPicture(drawPictrueData.ChartDrawPicture);//选中画图工具事件
 }}else{if(this.ClickChartTimer!=null){clearTimeout(this.ClickChartTimer);this.ClickChartTimer=null;}var self=this;var ptClick={X:this.ClickDownPoint.X,Y:this.ClickDownPoint.Y};this.ClickChartTimer=setTimeout(function(){self.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_CHART_PAINT,ptClick,e);},250);var bSelectedChartChanged=false;if(this.SelectedChart.EnableSelected){var selectChart=this.PtInChart(x,y);if(selectChart){if(this.SelectedChart.Selected.Identify!=selectChart.Identify){this.SelectedChart.Selected.Identify=selectChart.Identify;this.SelectedChart.Selected.Chart=selectChart.Chart;bSelectedChartChanged=true;}if(this.EnableIndexChartDrag){this.IndexChartDrag={SelectedChart:selectChart,LastMove:{X:x,Y:y},Click:{X:x,Y:y}};this.IndexChartDrag.Info=this.GetSelectedChartInfo(selectChart);if(this.IndexChartDrag.Info)this.IndexChartDrag.Info.FrameID=this.Frame.PtInFrame(x,y);}}else{if(this.SelectedChart.Selected.Identify){this.SelectedChart.Selected.Identify=null;this.SelectedChart.Selected.Chart=null;bSelectedChartChanged=true;}}}else{if(this.SelectedChart.Selected.Identify){this.SelectedChart.Selected.Identify=null;bSelectedChartChanged=true;}}if(drawPictureActive.Select.Guid!=null&&this.SelectChartDrawPicture==null||bSelectedChartChanged){var drawType=0;if(drawPictureActive.Select.Guid&&drawPictureActive.Select.Chart&&drawPictureActive.Select.Chart.IsDrawMain)drawType=1;if(bSelectedChartChanged){var chart=selectedChart.Chart;if(chart&&chart.SetSelectedStatus){chart.SetSelectedStatus(0);drawType=1;}chart=this.SelectedChart.Selected.Chart;if(chart&&chart.SetSelectedStatus){chart.SetSelectedStatus(1);drawType=1;}}if(drawType==1)this.Draw();else this.DrawDynamicInfo();}else if(bDrawDynamicInfo){this.DrawDynamicInfo();}}}document.onmousemove=function(e){_this7.DocOnMouseMove(e);};document.onmouseup=function(e){_this7.DocOnMouseUp(e);};};this.DocOnMouseMove=function(e){//加载数据中,禁用鼠标事件
-if(this.ChartSplashPaint&&this.IsEnableSplash==true)return;var drag=this.MouseDrag;if(!drag)return;var moveSetp=Math.abs(drag.LastMove.X-e.clientX);var moveSetpY=Math.abs(drag.LastMove.Y-e.clientY);var isDragSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Index>=0;var isDragSubSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Type==4;if(drag.CurrentMove){drag.CurrentMove.X=e.clientX;drag.CurrentMove.Y=e.clientY;}if(this.BorderDrag&&this.BorderDrag.Index>=0)//边框拖动
+if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash)return;var drag=this.MouseDrag;if(!drag)return;var moveSetp=Math.abs(drag.LastMove.X-e.clientX);var moveSetpY=Math.abs(drag.LastMove.Y-e.clientY);var isDragSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Index>=0;var isDragSubSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Type==4;if(drag.CurrentMove){drag.CurrentMove.X=e.clientX;drag.CurrentMove.Y=e.clientY;}if(this.BorderDrag&&this.BorderDrag.Index>=0)//边框拖动
 {if(Math.abs(drag.LastMove.Y-e.clientY)<5)return;var yMove=e.clientY-drag.LastMove.Y;this.OnMoveFromeBorder(this.BorderDrag.Index,yMove);drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;}else if(this.YDrag&&this.YDrag.Index>=0)//Y轴缩放
 {if(moveSetpY<5)return;var yMove=e.clientY-drag.LastMove.Y;//this.UIElement.style.cursor="n-resize";
 JSConsole.Chart.Log("[JSChartContainer::DocOnMouseMove] YDrag ",this.YDrag,yMove);this.OnZoomUpDownFrameY(this.YDrag,yMove);drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;}else if(this.IndexChartDrag&&this.IndexChartDrag.SelectedChart){if(Math.abs(drag.LastMove.Y-e.clientY)<2&&Math.abs(drag.LastMove.X-e.clientX)<2)return;var chartMove=this.GetExtendChartByClassName("DragMovePaint");if(chartMove&&chartMove.Chart){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;chartMove.Chart.Point={X:x,Y:y};chartMove.Chart.IsShow=true;chartMove.Chart.Info=this.IndexChartDrag.Info;this.DrawDynamicInfo();}this.IndexChartDrag.LastMove.X=x;this.IndexChartDrag.LastMove.Y=y;drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;}else if(this.CustomChartDrag){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var sendData={X:x,Y:y,e:e,ChartDrag:this.CustomChartDrag,Drag:drag};this.TryDragMove_CustomChartDrag(sendData);}else if(this.CurrentChartDrawPicture){var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==1||drawPicture.Status==2){if(Math.abs(drag.LastMove.X-e.clientX)<5&&Math.abs(drag.LastMove.Y-e.clientY)<5)return;if(this.SetChartDrawPictureSecondPoint(e.clientX,e.clientY)){this.DrawDynamicInfo();}}else if(drawPicture.Status==3){if(this.SetChartDrawPictureThirdPoint(e.clientX,e.clientY)){this.DrawDynamicInfo();}}else if(drawPicture.Status==20)//画图工具移动
@@ -1805,7 +1805,7 @@ this.SetCursor({Cursor:"default"});var x=drag.Click.X-uielement.getBoundingClien
 this.SetCursor({Cursor:"pointer"});if(this.OnUpDonwFrameY(this.UpDownDrag,yMove)){bNeedDraw=true;bUpDownY=true;}drag.LastMove.Y=e.clientY;}}if(moveSetp>=5){if(this.RectSelectDrag){if(this.RectSelectDrag.Index>=0){var obj={X:e.clientX,Y:e.clientY,PointIndex:this.RectSelectDrag.Index,Name:"MoveRectSelectLine"};if(this.MoveRectSelectPoint(obj))bNeedDraw=true;}else if(this.RectSelectDrag.Type===4){var obj={X:e.clientX};if(!this.GetXDataIndex(obj))return;if(obj.DataIndex==this.RectSelectDrag.DataIndex)return;var step=obj.DataIndex-this.RectSelectDrag.DataIndex;var isLeft=true;if(step>0)isLeft=false;if(!this.MoveSubRectSelect({Step:Math.abs(step),IsLeft:isLeft,X:e.clientX,Y:e.clientY}))return;this.RectSelectDrag.DataIndex=obj.DataIndex;this.RectSelectDrag.X=e.clientX;bNeedDraw=true;}}else{var isLeft=true;if(drag.LastMove.X<e.clientX)isLeft=false;//右移数据
 var cursorStatus="pointer";if(drag.Click.IsInFrameBottom)cursorStatus="ew-resize";var oneStepWidth=this.GetMoveOneStepWidth();if(moveSetp<oneStepWidth){//this.UIElement.style.cursor=cursorStatus;
 this.SetCursor({Cursor:cursorStatus});if(bNeedDraw)this.Draw();return;}else{if(drag.Click&&drag.Click.IsInFrameBottom){if(this.XCoordinateZoom(moveSetp,isLeft)){this.UpdataDataoffset();this.UpdateFrameMaxMin();this.ResetFrameXYSplit();bNeedDraw=true;}}else if(this.DataMove(moveSetp,isLeft)){this.UpdataDataoffset();//this.UpdatePointByCursorIndex(); //推拽数据的时候不需要把鼠标位置更新到K线上
-this.UpdateFrameMaxMin();this.ResetFrameXYSplit();bNeedDraw=true;}else if(!bUpDownY){if(this.DragDownloadData)this.DragDownloadData();}}//this.UIElement.style.cursor=cursorStatus;
+this.UpdateFrameMaxMin();this.ResetFrameXYSplit();bNeedDraw=true;}else if(!bUpDownY){if(this.DragDownloadData){this.DragDownloadData();if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash)return;}}}//this.UIElement.style.cursor=cursorStatus;
 this.SetCursor({Cursor:cursorStatus});}drag.LastMove.X=e.clientX;}if(bNeedDraw){this.Draw();this.OnKLinePageChange("datamove");}};this.GetXDataIndex=function(obj){if(!this.ChartPaint[0]||!this.ChartPaint[0].Data)return false;var kData=this.ChartPaint[0].Data;if(!this.Frame.SubFrame[0])return false;var subFrame=this.Frame.SubFrame[0].Frame;if(!subFrame)false;var pixelTatio=GetDevicePixelRatio();var x=(obj.X-uielement.getBoundingClientRect().left)*pixelTatio;var index=subFrame.GetXData(x);index=parseInt(index.toFixed(0));var dataIndex=index+kData.DataOffset;if(dataIndex>=kData.Data.length)dataIndex=kData.Data.length-1;var item=kData.Data[dataIndex];obj.DataIndex=dataIndex;obj.Item=item;//JSConsole.Chart.Log("[JSChartContainer::GetXDataIndex] point, item", obj.PointIndex, item);
 return true;};this.DocOnMouseUp=function(e){//清空事件
 document.onmousemove=null;document.onmouseup=null;var IsMinuteChart=this.ClassName=="MinuteChartContainer"||this.ClassName=="MinuteChartHScreenContainer"?true:false;var isDragSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Index>=0;var isDragSubSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Type==4;var bClearDrawPicture=true;if(this.CurrentChartDrawPicture){var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==2||drawPicture.Status==1||drawPicture.Status==3){drawPicture.PointStatus=drawPicture.Status;if(this.FinishChartDrawPicturePoint())this.DrawDynamicInfo();else bClearDrawPicture=false;}else if(drawPicture.Status==20){if(this.FinishMoveChartDrawPicture())this.DrawDynamicInfo();}}else if(this.IndexChartDrag&&this.IndexChartDrag.SelectedChart){var chartMove=this.GetExtendChartByClassName("DragMovePaint");if(chartMove&&chartMove.Chart)chartMove.Chart.Clear();if(!this.OnDragChart(this.IndexChartDrag))this.DrawDynamicInfo();//this.UIElement.style.cursor="default";
@@ -3927,7 +3927,7 @@ if(range.Max==null)range.Max=value;if(range.Min==null)range.Min=value;if(range.M
 function ChartPartLine(){this.newMethod=IChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName='ChartPartLine';//类名
 this.LineWidth;//线段宽度            
-this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(!this.Data||!this.Data.Data)return;this.DrawLine();};this.DrawLine=function(){var bHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var chartright=this.ChartBorder.GetRight();if(bHScreen)chartright=this.ChartBorder.GetBottom();var xPointCount=this.ChartFrame.XPointCount;this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bFirstPoint=true;var drawCount=0;var lastColor;var lastPoint={X:null,Y:null};var isPerNull=false;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var item=this.Data.Data[i];if(item==null||item.Value==null){lastPoint.X=null;lastPoint.Y=null;isPerNull=true;continue;}var value=item.Value;var color=item.RGB;var x=this.ChartFrame.GetXFromIndex(j);var y=this.ChartFrame.GetYFromData(value);if(x>chartright)break;if(color!=lastColor||isPerNull==true){if(lastColor&&drawCount>0)this.Canvas.stroke();drawCount=0;lastColor=color;this.Canvas.strokeStyle=color;this.Canvas.beginPath();if(lastPoint.X!=null&&lastPoint.Y!=null)//接着上一个点连线
+this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(!this.Data||!this.Data.Data)return;this.DrawLine();};this.DrawLine=function(){var bHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;if(bHScreen){var border=this.ChartBorder.GetHScreenBorder();var chartright=border.BottomEx;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 chartright=border.RightEx;}var xPointCount=this.ChartFrame.XPointCount;var isMinute=this.IsMinuteFrame();this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bFirstPoint=true;var drawCount=0;var lastColor;var lastPoint={X:null,Y:null};var isPerNull=false;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var item=this.Data.Data[i];if(item==null||item.Value==null){lastPoint.X=null;lastPoint.Y=null;isPerNull=true;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;}var value=item.Value;var color=item.RGB;var y=this.ChartFrame.GetYFromData(value);if(x>chartright)break;if(color!=lastColor||isPerNull==true){if(lastColor&&drawCount>0)this.Canvas.stroke();drawCount=0;lastColor=color;this.Canvas.strokeStyle=color;this.Canvas.beginPath();if(lastPoint.X!=null&&lastPoint.Y!=null)//接着上一个点连线
 {if(bHScreen)this.Canvas.moveTo(lastPoint.Y,lastPoint.X);//横屏坐标轴对调
 else this.Canvas.moveTo(lastPoint.X,lastPoint.Y);if(bHScreen)this.Canvas.lineTo(y,x);else this.Canvas.lineTo(x,y);++drawCount;}else{if(bHScreen)this.Canvas.moveTo(y,x);//横屏坐标轴对调
 else this.Canvas.moveTo(x,y);}}else{if(bHScreen)this.Canvas.lineTo(y,x);else this.Canvas.lineTo(x,y);++drawCount;}lastPoint.X=x;lastPoint.Y=y;isPerNull=false;}if(drawCount>0)this.Canvas.stroke();this.Canvas.restore();};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var item=this.Data.Data[i];if(!item||!item.Value)continue;if(range.Max==null||range.Max<item.Value)range.Max=item.Value;if(range.Min==null||range.Min>item.Value)range.Min=item.Value;}return range;};this.ExportData=function(aryKData,option){var aryValue=[],aryColor=[];if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)){var start=0,end=this.Data.length-1;//限制范围
@@ -4173,7 +4173,7 @@ for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++
 var height=ToFixedRect(Math.abs(yBottom-y));if(yBottom-y>0)y=yBottom-height;else y=yBottom+height;this.Canvas.fillRect(ToFixedRect(left),y,ToFixedRect(dataWidth),height);}}else//太细了 直接画柱子
 {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.strokeStyle=this.UpBarColor;else this.Canvas.strokeStyle=this.DownBarColor;this.Canvas.beginPath();this.Canvas.moveTo(ToFixedPoint(x),y);this.Canvas.lineTo(ToFixedPoint(x),yBottom);this.Canvas.stroke();}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=0;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(range.Max==null)range.Max=value;if(range.Max<value)range.Max=value;}return range;};}// 面积图 支持横屏
 function ChartBand(){this.newMethod=IChartPainting;//派生
-this.newMethod();delete this.newMethod;this.IsDrawFirst=true;this.ClassName="ChartBand";this.FirstColor=g_JSChartResource.Index.LineColor[0];this.SecondColor=g_JSChartResource.Index.LineColor[1];this.Draw=function(){if(this.ChartFrame.IsMinSize)return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}var isHScreen=this.ChartFrame.IsHScreen;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var x=0;var y=0;var y2=0;var firstlinePoints=[];var secondlinePoints=[];for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){firstlinePoints=[];secondlinePoints=[];for(;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];if(value==null||value.Value==null||value.Value2==null)break;x=this.ChartFrame.GetXFromIndex(j);y=this.ChartFrame.GetYFromData(value.Value);y2=this.ChartFrame.GetYFromData(value.Value2);if(isHScreen){firstlinePoints.push({x:y,y:x});secondlinePoints.push({x:y2,y:x});}else{firstlinePoints.push({x:x,y:y});secondlinePoints.push({x:x,y:y2});}}if(firstlinePoints.length>1&&secondlinePoints.length>1){this.DrawBand(firstlinePoints,secondlinePoints);}}};this.ClipTop=function(aryFrist){var isHScreen=this.ChartFrame.IsHScreen;this.Canvas.beginPath();for(var i=0;i<aryFrist.length;++i){if(i==0)this.Canvas.moveTo(aryFrist[i].x,aryFrist[i].y);else this.Canvas.lineTo(aryFrist[i].x,aryFrist[i].y);}var ptStart=aryFrist[0];var ptEnd=aryFrist[aryFrist.length-1];if(isHScreen){var xLeft=this.ChartBorder.GetRightEx();this.Canvas.lineTo(xLeft,ptEnd.y);this.Canvas.lineTo(xLeft,ptStart.y);}else{var yTop=this.ChartBorder.GetTopEx();this.Canvas.lineTo(ptEnd.x,yTop);this.Canvas.lineTo(ptStart.x,yTop);}this.Canvas.closePath();this.Canvas.clip();};this.ClipBottom=function(aryFrist){var isHScreen=this.ChartFrame.IsHScreen;this.Canvas.beginPath();for(var i=0;i<aryFrist.length;++i){if(i==0)this.Canvas.moveTo(aryFrist[i].x,aryFrist[i].y);else this.Canvas.lineTo(aryFrist[i].x,aryFrist[i].y);}var ptStart=aryFrist[0];var ptEnd=aryFrist[aryFrist.length-1];if(isHScreen){var xLeft=this.ChartBorder.GetLeftEx();this.Canvas.lineTo(xLeft,ptEnd.y);this.Canvas.lineTo(xLeft,ptStart.y);}else{var yBottom=this.ChartBorder.GetBottomEx();this.Canvas.lineTo(ptEnd.x,yBottom);this.Canvas.lineTo(ptStart.x,yBottom);}this.Canvas.closePath();//this.Canvas.fillStyle = "rgb(255,0,0)";
+this.newMethod();delete this.newMethod;this.IsDrawFirst=true;this.ClassName="ChartBand";this.FirstColor=g_JSChartResource.Index.LineColor[0];this.SecondColor=g_JSChartResource.Index.LineColor[1];this.Draw=function(){if(this.ChartFrame.IsMinSize)return;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}var isMinute=this.IsMinuteFrame();var isHScreen=this.ChartFrame.IsHScreen;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var x=0;var y=0;var y2=0;var firstlinePoints=[];var secondlinePoints=[];for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){firstlinePoints=[];secondlinePoints=[];for(;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];if(value==null||value.Value==null||value.Value2==null)break;if(isMinute){x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;x=left+(right-left)/2;}y=this.ChartFrame.GetYFromData(value.Value);y2=this.ChartFrame.GetYFromData(value.Value2);if(isHScreen){firstlinePoints.push({x:y,y:x});secondlinePoints.push({x:y2,y:x});}else{firstlinePoints.push({x:x,y:y});secondlinePoints.push({x:x,y:y2});}}if(firstlinePoints.length>1&&secondlinePoints.length>1){this.DrawBand(firstlinePoints,secondlinePoints);}}};this.ClipTop=function(aryFrist){var isHScreen=this.ChartFrame.IsHScreen;this.Canvas.beginPath();for(var i=0;i<aryFrist.length;++i){if(i==0)this.Canvas.moveTo(aryFrist[i].x,aryFrist[i].y);else this.Canvas.lineTo(aryFrist[i].x,aryFrist[i].y);}var ptStart=aryFrist[0];var ptEnd=aryFrist[aryFrist.length-1];if(isHScreen){var xLeft=this.ChartBorder.GetRightEx();this.Canvas.lineTo(xLeft,ptEnd.y);this.Canvas.lineTo(xLeft,ptStart.y);}else{var yTop=this.ChartBorder.GetTopEx();this.Canvas.lineTo(ptEnd.x,yTop);this.Canvas.lineTo(ptStart.x,yTop);}this.Canvas.closePath();this.Canvas.clip();};this.ClipBottom=function(aryFrist){var isHScreen=this.ChartFrame.IsHScreen;this.Canvas.beginPath();for(var i=0;i<aryFrist.length;++i){if(i==0)this.Canvas.moveTo(aryFrist[i].x,aryFrist[i].y);else this.Canvas.lineTo(aryFrist[i].x,aryFrist[i].y);}var ptStart=aryFrist[0];var ptEnd=aryFrist[aryFrist.length-1];if(isHScreen){var xLeft=this.ChartBorder.GetLeftEx();this.Canvas.lineTo(xLeft,ptEnd.y);this.Canvas.lineTo(xLeft,ptStart.y);}else{var yBottom=this.ChartBorder.GetBottomEx();this.Canvas.lineTo(ptEnd.x,yBottom);this.Canvas.lineTo(ptStart.x,yBottom);}this.Canvas.closePath();//this.Canvas.fillStyle = "rgb(255,0,0)";
 //this.Canvas.fill();
 this.Canvas.clip();};this.DrawArea=function(aryFrist,arySecond,clrArea){this.Canvas.beginPath();for(var i=0;i<aryFrist.length;++i){if(i==0)this.Canvas.moveTo(aryFrist[i].x,aryFrist[i].y);else this.Canvas.lineTo(aryFrist[i].x,aryFrist[i].y);}for(var i=arySecond.length-1;i>=0;--i){this.Canvas.lineTo(arySecond[i].x,arySecond[i].y);}this.Canvas.closePath();this.Canvas.fillStyle=clrArea;this.Canvas.fill();};this.DrawBand=function(aryFrist,arySecond){if(this.FirstColor){this.Canvas.save();this.ClipTop(aryFrist);this.DrawArea(aryFrist,arySecond,this.FirstColor);this.Canvas.restore();}if(this.SecondColor){this.Canvas.save();this.ClipBottom(aryFrist);this.DrawArea(aryFrist,arySecond,this.SecondColor);this.Canvas.restore();}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;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||value.Value==null||value.Value2==null)continue;var maxData=value.Value>value.Value2?value.Value:value.Value2;var minData=value.Value<value.Value2?value.Value:value.Value2;if(range.Max==null)range.Max=maxData;else if(range.Max<maxData)range.Max=maxData;if(range.Min==null)range.Min=minData;else if(range.Min>minData)range.Min=minData;}return range;};}// 线段围成的面积图 支持横屏
 function ChartLineArea(){this.newMethod=IChartPainting;//派生
@@ -6850,8 +6850,8 @@ preItem=item;}else{if(preItem){if(preItem.Direction==1){//if (preItem.High<kItem
 //  this.ChartPaint[0] K线画法 这个不要修改
 //
 //
-function KLineChartContainer(uielement,OffscreenElement){var _self=this;this.newMethod=JSChartContainer;//派生
-this.newMethod(uielement,OffscreenElement);delete this.newMethod;this.ClassName='KLineChartContainer';this.WindowIndex=new Array();this.ColorIndex;//五彩K线
+function KLineChartContainer(uielement,OffscreenElement,cacheElement){var _self=this;this.newMethod=JSChartContainer;//派生
+this.newMethod(uielement,OffscreenElement,cacheElement);delete this.newMethod;this.ClassName='KLineChartContainer';this.WindowIndex=new Array();this.ColorIndex;//五彩K线
 this.TradeIndex;//交易指标/专家系统
 this.Symbol;this.Name;this.Period=0;//周期 0=日线 1=周线 2=月线 3=年线 4=1分钟 5=5分钟 6=15分钟 7=30分钟 8=60分钟 9=季线 10=分笔线 11=120分钟 12=240分钟
 this.IsApiPeriod=false;//使用API计算周期
@@ -13028,7 +13028,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.12821";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.12828";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.12822",
+  "version": "1.1.12829",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -3607,7 +3607,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DocOnMouseMove=function(e)
     {
         //加载数据中,禁用鼠标事件
-        if (this.ChartSplashPaint && this.IsEnableSplash == true) return;
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
         
         var drag=this.MouseDrag;
         if (!drag) return;
@@ -3835,7 +3835,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     }
                     else if (!bUpDownY)
                     {
-                        if (this.DragDownloadData) this.DragDownloadData();
+                        if (this.DragDownloadData) 
+                        {
+                            this.DragDownloadData();
+                            if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
+                        }
                     }
                 }
                 //this.UIElement.style.cursor=cursorStatus;
@@ -29362,10 +29366,22 @@ function ChartPartLine()
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
-        var chartright=this.ChartBorder.GetRight();
-        if (bHScreen) chartright=this.ChartBorder.GetBottom();
+        if (bHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var chartright=border.BottomEx;
+            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 chartright=border.RightEx;
+        }
+
         var xPointCount=this.ChartFrame.XPointCount;
-        
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         var bFirstPoint=true;
@@ -29373,7 +29389,7 @@ function ChartPartLine()
         var lastColor;
         var lastPoint={X:null,Y:null};
         var isPerNull=false;
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var item=this.Data.Data[i];
             if (item==null || item.Value==null) 
@@ -29384,9 +29400,20 @@ function ChartPartLine()
                 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;
+            }
+
             var value=item.Value;
             var color=item.RGB;
-            var x=this.ChartFrame.GetXFromIndex(j);
             var y=this.ChartFrame.GetYFromData(value);
 
             if (x>chartright) break;
@@ -33777,6 +33804,7 @@ function ChartBand()
             return;
         }
 
+        var isMinute=this.IsMinuteFrame();
         var isHScreen=this.ChartFrame.IsHScreen;
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -33795,7 +33823,18 @@ function ChartBand()
             {
                 var value=this.Data.Data[i];
                 if (value==null || value.Value==null || value.Value2 == null) break;
-                x=this.ChartFrame.GetXFromIndex(j);
+
+                if (isMinute)
+                {
+                    x=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    var left=xOffset;
+                    var right=xOffset+dataWidth;
+                    x=left+(right-left)/2;
+                }
+
                 y=this.ChartFrame.GetYFromData(value.Value);
                 y2 = this.ChartFrame.GetYFromData(value.Value2);
 
@@ -65518,11 +65557,11 @@ function LineBreakCalcuate()
 //  this.ChartPaint[0] K线画法 这个不要修改
 //
 //
-function KLineChartContainer(uielement,OffscreenElement)
+function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 {
     var _self =this;
     this.newMethod=JSChartContainer;   //派生
-    this.newMethod(uielement,OffscreenElement);
+    this.newMethod(uielement,OffscreenElement,cacheElement);
     delete this.newMethod;
 
     this.ClassName='KLineChartContainer';

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

@@ -7774,7 +7774,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DocOnMouseMove=function(e)
     {
         //加载数据中,禁用鼠标事件
-        if (this.ChartSplashPaint && this.IsEnableSplash == true) return;
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
         
         var drag=this.MouseDrag;
         if (!drag) return;
@@ -8002,7 +8002,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     }
                     else if (!bUpDownY)
                     {
-                        if (this.DragDownloadData) this.DragDownloadData();
+                        if (this.DragDownloadData) 
+                        {
+                            this.DragDownloadData();
+                            if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
+                        }
                     }
                 }
                 //this.UIElement.style.cursor=cursorStatus;
@@ -33529,10 +33533,22 @@ function ChartPartLine()
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
-        var chartright=this.ChartBorder.GetRight();
-        if (bHScreen) chartright=this.ChartBorder.GetBottom();
+        if (bHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var chartright=border.BottomEx;
+            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 chartright=border.RightEx;
+        }
+
         var xPointCount=this.ChartFrame.XPointCount;
-        
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         var bFirstPoint=true;
@@ -33540,7 +33556,7 @@ function ChartPartLine()
         var lastColor;
         var lastPoint={X:null,Y:null};
         var isPerNull=false;
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var item=this.Data.Data[i];
             if (item==null || item.Value==null) 
@@ -33551,9 +33567,20 @@ function ChartPartLine()
                 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;
+            }
+
             var value=item.Value;
             var color=item.RGB;
-            var x=this.ChartFrame.GetXFromIndex(j);
             var y=this.ChartFrame.GetYFromData(value);
 
             if (x>chartright) break;
@@ -37944,6 +37971,7 @@ function ChartBand()
             return;
         }
 
+        var isMinute=this.IsMinuteFrame();
         var isHScreen=this.ChartFrame.IsHScreen;
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -37962,7 +37990,18 @@ function ChartBand()
             {
                 var value=this.Data.Data[i];
                 if (value==null || value.Value==null || value.Value2 == null) break;
-                x=this.ChartFrame.GetXFromIndex(j);
+
+                if (isMinute)
+                {
+                    x=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    var left=xOffset;
+                    var right=xOffset+dataWidth;
+                    x=left+(right-left)/2;
+                }
+
                 y=this.ChartFrame.GetYFromData(value.Value);
                 y2 = this.ChartFrame.GetYFromData(value.Value2);
 
@@ -69685,11 +69724,11 @@ function LineBreakCalcuate()
 //  this.ChartPaint[0] K线画法 这个不要修改
 //
 //
-function KLineChartContainer(uielement,OffscreenElement)
+function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 {
     var _self =this;
     this.newMethod=JSChartContainer;   //派生
-    this.newMethod(uielement,OffscreenElement);
+    this.newMethod(uielement,OffscreenElement,cacheElement);
     delete this.newMethod;
 
     this.ClassName='KLineChartContainer';
@@ -131754,7 +131793,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12821";
+var HQCHART_VERSION="1.1.12828";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -7818,7 +7818,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DocOnMouseMove=function(e)
     {
         //加载数据中,禁用鼠标事件
-        if (this.ChartSplashPaint && this.IsEnableSplash == true) return;
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
         
         var drag=this.MouseDrag;
         if (!drag) return;
@@ -8046,7 +8046,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     }
                     else if (!bUpDownY)
                     {
-                        if (this.DragDownloadData) this.DragDownloadData();
+                        if (this.DragDownloadData) 
+                        {
+                            this.DragDownloadData();
+                            if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
+                        }
                     }
                 }
                 //this.UIElement.style.cursor=cursorStatus;
@@ -33573,10 +33577,22 @@ function ChartPartLine()
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
-        var chartright=this.ChartBorder.GetRight();
-        if (bHScreen) chartright=this.ChartBorder.GetBottom();
+        if (bHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var chartright=border.BottomEx;
+            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 chartright=border.RightEx;
+        }
+
         var xPointCount=this.ChartFrame.XPointCount;
-        
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         var bFirstPoint=true;
@@ -33584,7 +33600,7 @@ function ChartPartLine()
         var lastColor;
         var lastPoint={X:null,Y:null};
         var isPerNull=false;
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var item=this.Data.Data[i];
             if (item==null || item.Value==null) 
@@ -33595,9 +33611,20 @@ function ChartPartLine()
                 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;
+            }
+
             var value=item.Value;
             var color=item.RGB;
-            var x=this.ChartFrame.GetXFromIndex(j);
             var y=this.ChartFrame.GetYFromData(value);
 
             if (x>chartright) break;
@@ -37988,6 +38015,7 @@ function ChartBand()
             return;
         }
 
+        var isMinute=this.IsMinuteFrame();
         var isHScreen=this.ChartFrame.IsHScreen;
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -38006,7 +38034,18 @@ function ChartBand()
             {
                 var value=this.Data.Data[i];
                 if (value==null || value.Value==null || value.Value2 == null) break;
-                x=this.ChartFrame.GetXFromIndex(j);
+
+                if (isMinute)
+                {
+                    x=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    var left=xOffset;
+                    var right=xOffset+dataWidth;
+                    x=left+(right-left)/2;
+                }
+
                 y=this.ChartFrame.GetYFromData(value.Value);
                 y2 = this.ChartFrame.GetYFromData(value.Value2);
 
@@ -69729,11 +69768,11 @@ function LineBreakCalcuate()
 //  this.ChartPaint[0] K线画法 这个不要修改
 //
 //
-function KLineChartContainer(uielement,OffscreenElement)
+function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 {
     var _self =this;
     this.newMethod=JSChartContainer;   //派生
-    this.newMethod(uielement,OffscreenElement);
+    this.newMethod(uielement,OffscreenElement,cacheElement);
     delete this.newMethod;
 
     this.ClassName='KLineChartContainer';
@@ -131912,7 +131951,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12821";
+var HQCHART_VERSION="1.1.12828";
 
 function PrintHQChartVersion()
 {