hqchart 1.1.14851 → 1.1.14855

package/lib/umychart.vue.js

@@ -1214,7 +1214,7 @@ var scriptData=new JSIndexScript();if(option.ColorIndex)//五彩K线
 {var apiItem=item.API;chart.WindowIndex[i]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexItem=JSIndexMap.Get(item.Index);if(indexItem){chart.WindowIndex[i]=indexItem.Create(item.Option);if(chart.WindowIndex[i].SetArgs)chart.WindowIndex[i].SetArgs(item.Args);chart.CreateWindowIndex(i);}else{var scriptData=new JSIndexScript();var _indexInfo2=scriptData.Get(item.Index);if(!_indexInfo2)continue;JSIndexScript.ModifyAttribute(_indexInfo2,item);_indexInfo2.ID=item.Index;chart.WindowIndex[i]=new ScriptIndex(_indexInfo2.Name,_indexInfo2.Script,_indexInfo2.Args,_indexInfo2);//脚本执行
 if(item.StringFormat>0)chart.WindowIndex[i].StringFormat=item.StringFormat;if(item.FloatPrecision>=0)chart.WindowIndex[i].FloatPrecision=item.FloatPrecision;}}var frame=chart.Frame.SubFrame[i].Frame;if(IFrameSplitOperator.IsBool(item.Modify))frame.ModifyIndex=item.Modify;if(IFrameSplitOperator.IsBool(item.Change))frame.ChangeIndex=item.Change;if(IFrameSplitOperator.IsBool(item.Close))frame.CloseIndex=item.Close;if(IFrameSplitOperator.IsBool(item.Overlay))frame.OverlayIndex=item.Overlay;if(IFrameSplitOperator.IsBool(item.Export))frame.ExportData=item.Export;if(IFrameSplitOperator.IsBool(item.MaxMin))chart.Frame.SubFrame[i].Frame.MaxMinWindow=item.MaxMin;if(IFrameSplitOperator.IsBool(item.TitleWindow))chart.Frame.SubFrame[i].Frame.TitleWindow=item.TitleWindow;if(IFrameSplitOperator.IsBool(item.AddIndexWindow))frame.AddIndexWindow=item.AddIndexWindow;if(item.IsDrawTitleBG==true)chart.Frame.SubFrame[i].Frame.IsDrawTitleBG=item.IsDrawTitleBG;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;if(IFrameSplitOperator.IsNumber(item.TitleHeight))chart.Frame.SubFrame[i].Frame.ChartBorder.TitleHeight=item.TitleHeight;else item.TitleHeight=chart.Frame.SubFrame[i].Frame.ChartBorder.TitleHeight;if(IFrameSplitOperator.IsBool(item.IsShowTitleArrow))frame.IsShowTitleArrow=item.IsShowTitleArrow;if(IFrameSplitOperator.IsNumber(item.TitleArrowType))frame.TitleArrowType=item.TitleArrowType;if(item.IsShowIndexName==false)chart.Frame.SubFrame[i].Frame.IsShowIndexName=false;if(item.IsShowOverlayIndexName==false)chart.Frame.SubFrame[i].Frame.IsShowOverlayIndexName=false;if(IFrameSplitOperator.IsNumber(item.IndexParamSpace))chart.Frame.SubFrame[i].Frame.IndexParamSpace=item.IndexParamSpace;if(IFrameSplitOperator.IsNumber(item.IndexTitleSpace))chart.Frame.SubFrame[i].Frame.IndexTitleSpace=item.IndexTitleSpace;if(!IFrameSplitOperator.IsUndefined(item.HorizontalReserved))frame.HorizontalReserved=item.HorizontalReserved;if(item.OverlayIndexType){if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position))chart.Frame.SubFrame[i].Frame.OverlayIndexType.Position=item.OverlayIndexType.Position;if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace))chart.Frame.SubFrame[i].Frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;}}//叠加指标宽度
 if(option.OverlayIndexFrameWidth>40)chart.Frame.FixedRightWidth.Overlay=option.OverlayIndexFrameWidth;//叠加指标
-if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Windows>=chart.Frame.SubFrame.length)continue;var itemString=(0,_stringify2.default)(item);var obj=JSON.parse(itemString);if(item.Index)obj.IndexName=item.Index;if(item.Windows>=0)obj.WindowIndex=item.Windows;chart.CreateOverlayWindowsIndex(obj);}}this.AdjustTitleHeight(chart);return chart;};//自定义指数历史K线图
+if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Windows>=chart.Frame.SubFrame.length)continue;var itemString=(0,_stringify2.default)(item);var obj=JSON.parse(itemString);if(item.Index)obj.IndexName=item.Index;if(item.Windows>=0)obj.WindowIndex=item.Windows;chart.CreateOverlayWindowsIndex(obj);}}this.AdjustTitleHeight(chart);if(option.LatestPointFlash){var item=option.LatestPointFlash;if(item.Enable){this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey,{ZIndex:6});chart.CreateExtendChart("LatestPointFlashPaint",item);chart.StartLatestPointFlash();}}return chart;};//自定义指数历史K线图
 this.CreateCustomKLineChartContainer=function(option){var chart=new CustomKLineChartContainer(this.CanvasElement);//右键菜单
 if(IFrameSplitOperator.IsBool(option.IsShowRightMenu))chart.IsShowRightMenu=option.IsShowRightMenu;if(option.KLine)//k线图的属性设置
 {if(option.KLine.DragMode>=0)chart.DragMode=option.KLine.DragMode;if(option.KLine.Right>=0)chart.Right=option.KLine.Right;if(option.KLine.Period>=0)chart.Period=option.KLine.Period;if(option.KLine.MaxRequestDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;if(option.KLine.Info&&option.KLine.Info.length>0)chart.SetKLineInfo(option.KLine.Info,false);if(option.KLine.PageSize>0)chart.PageSize=option.KLine.PageSize;if(option.KLine.IsShowTooltip==false)chart.IsShowTooltip=false;}if(option.CustomStock)chart.CustomStock=option.CustomStock;if(option.QueryDate)chart.QueryDate=option.QueryDate;if(!option.Windows||option.Windows.length<=0)return null;//创建子窗口
@@ -1564,7 +1564,11 @@ OP_CORSSCURSOR_GOTO:14,//十字光标移动某一个时刻点
 OP_SCROOLBAR_SLIDER_CHANGED:15,//滑块变动
 OP_GOTO:16,//移动到某一个天或某一个分钟
 OP_GOTO_BY_DATAINDEX:17,//的移动到某一个数据起始位置
-OP_MOVE_CORSSCURSOR:18//移动十字光标 { Step, Start:{ Date:, Time: } }
+OP_MOVE_CORSSCURSOR:18,//移动十字光标 { Step, Start:{ Date:, Time: } }
+OP_CORSSCURSOR_PAGE_START:19,//当前屏第1条数据
+OP_CORSSCURSOR_PAGE_END:20,//当前屏最后1条数据
+OP_CORSSCURSOR_DATA_START:21,//所有数据的第1条数据
+OP_CORSSCURSOR_DATA_END:22//所有数据的最后1条数据
 };var JSCHART_DRAG_ID={DISABLE_DRAG_ID:0,CLICK_TOUCH_MODE_ID:3//长按十字光标显示保留/点击十字光标消失 (使用TouchStatus)
 };var JSCHART_BUTTON_ID={CLOSE_BEFOREOPEN_ID:1,//关闭集合竞价
 CLOSE_OVERLAY_INDEX:2,//关闭叠加指标
@@ -2117,6 +2121,8 @@ if(this.SelectChartDrawPicture){var drawPicture=this.SelectChartDrawPicture;JSCo
 this.OnMarkRectSelect(e);break;case 27://ESCAPE  取消画布工具
 if(this.CurrentChartDrawPicture){var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status!=20)//画布移动的时候不能取消
 this.CurrentChartDrawPicture=null;}break;case 13://回车
+case 35://END
+case 36://HOME
 if(this.OnCustomKeyDown)this.OnCustomKeyDown(keyID,e);break;default:return;}if(draw)this.DrawDynamicInfo();if(keyID==37||keyID==39)this.StartKeyboardMoveTimer(e);//不让滚动条滚动
 if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.ClearKeyboardMoveTimer=function(){if(!this.KeyboardMove)return;this.KeyboardMove.Event=null;if(this.KeyboardMove.Timer){clearTimeout(this.KeyboardMove.Timer);this.KeyboardMove.Timer=null;JSConsole.Chart.Log('[JSChartContainer::ClearKeyboardMoveTimer] Stop');}this.KeyboardMove.Enable=false;};this.StartKeyboardMoveTimer=function(e){if(!this.KeyboardMove)return;if(this.KeyboardMove.Enable)return;//已启动
 this.KeyboardMove.Event=e;this.KeyboardMove.Enable=true;JSConsole.Chart.Log('[JSChartContainer::StartKeyboardMoveTimer] Start');this.AutoKeyboardMove();};this.AutoKeyboardMove=function(){var _this15=this;if(!this.KeyboardMove)return false;if(!this.KeyboardMove.Enable)return false;if(!this.KeyboardMove.Event)return false;this.KeyboardMove.Timer=setTimeout(function(){_this15.OnKeyboardMoveTimerProc();},this.KeyboardMove.Delay);};this.OnKeyboardMoveTimerProc=function(){if(!this.KeyboardMove)return false;if(!this.KeyboardMove.Enable)return false;if(!this.KeyboardMove.Event)return false;var e=this.KeyboardMove.Event;var keyID=e.keyCode?e.keyCode:e.which;var bStop=false;switch(keyID){case 37://left
@@ -3742,7 +3748,8 @@ this.ChartHeatMap;//=new ChartHeatMap();
 this.PriceGap={Enable:false,Count:1};this.PriceGapStyple={Line:{Color:g_JSChartResource.PriceGapStyple.Line.Color},Text:{Color:g_JSChartResource.PriceGapStyple.Text.Color,Font:g_JSChartResource.PriceGapStyple.Text.Font}};this.AryPriceGapCache=[];//缺口数据 { }
 //面积图和收盘价线 断开点
 this.AryBreakPoint;//天数统计
-this.DaySummary={MapDate:new _map2.default(),Enable:false};this.DaySummaryConfig={Font:g_JSChartResource.DaySummaryKLine.Font,TextColor:g_JSChartResource.DaySummaryKLine.TextColor,LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin};this.AddToDaySummary=function(kItem){if(!this.DaySummary.Enable)return false;if(!kItem)return false;if(!IFrameSplitOperator.IsPlusNumber(kItem.Date))return false;if(this.DaySummary.MapDate.has(kItem.Date))return false;this.DaySummary.MapDate.set(kItem.Date,{Date:kItem.Date});};this.ClearDaySummary=function(){this.DaySummary.MapDate.clear();};this.BuildDateTimeKey=function(item){if(!item)return null;if(!IFrameSplitOperator.IsNumber(item.Time))return''+item.Date;return item.Date+'-'+item.Time;};this.BuildBreakPoint=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryBreakPoint))return null;var mapBreakPoint=new _map2.default();for(var i=0;i<this.AryBreakPoint.length;++i){var item=this.AryBreakPoint[i];var key=this.BuildDateTimeKey(item);if(key)mapBreakPoint.set(key,item);}return mapBreakPoint;};this.ReloadResource=function(resource){this.TextFont=g_JSChartResource.KLine.MaxMin.Font;this.TextColor=g_JSChartResource.KLine.MaxMin.Color;this.CloseLineColor=g_JSChartResource.CloseLineColor;this.CloseLineAreaColor=g_JSChartResource.CloseLineAreaColor;this.CloseLineWidth=g_JSChartResource.CloseLineWidth;this.UpColor=g_JSChartResource.UpBarColor;this.DownColor=g_JSChartResource.DownBarColor;this.UnchagneColor=g_JSChartResource.UnchagneBarColor;//平盘
+this.DaySummary={MapDate:new _map2.default(),Enable:false};this.DaySummaryConfig={Font:g_JSChartResource.DaySummaryKLine.Font,TextColor:g_JSChartResource.DaySummaryKLine.TextColor,LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin};this.LastPoint={};//最后一个点的信息 {X, Y, KItem:, Date:, Time: }
+this.AddToDaySummary=function(kItem){if(!this.DaySummary.Enable)return false;if(!kItem)return false;if(!IFrameSplitOperator.IsPlusNumber(kItem.Date))return false;if(this.DaySummary.MapDate.has(kItem.Date))return false;this.DaySummary.MapDate.set(kItem.Date,{Date:kItem.Date});};this.ClearDaySummary=function(){this.DaySummary.MapDate.clear();};this.BuildDateTimeKey=function(item){if(!item)return null;if(!IFrameSplitOperator.IsNumber(item.Time))return''+item.Date;return item.Date+'-'+item.Time;};this.BuildBreakPoint=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryBreakPoint))return null;var mapBreakPoint=new _map2.default();for(var i=0;i<this.AryBreakPoint.length;++i){var item=this.AryBreakPoint[i];var key=this.BuildDateTimeKey(item);if(key)mapBreakPoint.set(key,item);}return mapBreakPoint;};this.ReloadResource=function(resource){this.TextFont=g_JSChartResource.KLine.MaxMin.Font;this.TextColor=g_JSChartResource.KLine.MaxMin.Color;this.CloseLineColor=g_JSChartResource.CloseLineColor;this.CloseLineAreaColor=g_JSChartResource.CloseLineAreaColor;this.CloseLineWidth=g_JSChartResource.CloseLineWidth;this.UpColor=g_JSChartResource.UpBarColor;this.DownColor=g_JSChartResource.DownBarColor;this.UnchagneColor=g_JSChartResource.UnchagneBarColor;//平盘
 this.HighLowBarColor=g_JSChartResource.HighLowBarColor;this.OrderFlow.UpColor={BG:g_JSChartResource.OrderFlow.UpColor.BG,Border:g_JSChartResource.OrderFlow.UpColor.Border};this.OrderFlow.DownColor={BG:g_JSChartResource.OrderFlow.DownColor.BG,Border:g_JSChartResource.OrderFlow.DownColor.Border};this.OrderFlow.UnchagneColor={BG:g_JSChartResource.OrderFlow.UnchagneColor.BG,Border:g_JSChartResource.OrderFlow.UnchagneColor.Border};this.OrderFlow.Text={Color:g_JSChartResource.OrderFlow.Text.Color,Family:g_JSChartResource.OrderFlow.Text.Family,FontMaxSize:g_JSChartResource.OrderFlow.Text.FontMaxSize,MaxValue:g_JSChartResource.OrderFlow.Text.MaxValue};this.OrderFlow.Line={UpDownColor:g_JSChartResource.OrderFlow.Line.UpDownColor,MiddleColor:g_JSChartResource.OrderFlow.Line.MiddleColor};this.PredictionConfig.Line={Color:g_JSChartResource.PredictionKLine.Line.Color,LineDash:g_JSChartResource.PredictionKLine.Line.LineDash,LineWidth:g_JSChartResource.PredictionKLine.Line.LineWidth};this.PredictionConfig.Bar={UpColor:g_JSChartResource.PredictionKLine.Bar.UpColor,DownColor:g_JSChartResource.PredictionKLine.Bar.DownColor,UnchangeColor:g_JSChartResource.PredictionKLine.Bar.UnchangeColor,DrawType:g_JSChartResource.PredictionKLine.Bar.DrawType};this.DaySummaryConfig={Font:g_JSChartResource.DaySummaryKLine.Font,TextColor:g_JSChartResource.DaySummaryKLine.TextColor,LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin};};this.ClearCustomKLine=function(){this.CustomKLine=null;};this.ClearBreakPoint=function(){this.AryBreakPoint=null;};this.GetCustomKLine=function(kItem){if(!this.CustomKLine)return null;if(!kItem)return null;var key=kItem.Date*1000000;if(IFrameSplitOperator.IsNumber(kItem.Time))key+=kItem.Time;if(!this.CustomKLine.has(key))return null;var value=this.CustomKLine.get(key);return value;};this.DrawHeatMap=function(){if(!this.ChartHeatMap)return;this.ChartHeatMap.Canvas=this.Canvas;this.ChartHeatMap.ChartBorder=this.ChartBorder;this.ChartHeatMap.ChartFrame=this.ChartFrame;this.ChartHeatMap.Data=this.Data;this.ChartHeatMap.Draw();};this.ClearHeatMap=function(){this.ChartHeatMap=null;};this.CreateHeatMap=function(){this.ChartHeatMap=new ChartHeatMap();};this.DrawAKLine=function()//美国线
 {var isHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;if(isHScreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;}var upColor=this.UpColor;var downColor=this.DownColor;var unchagneColor=this.UnchagneColor;var ptMax={X:null,Y:null,Value:null,Align:'left'};var ptMin={X:null,Y:null,Value:null,Align:'left'};this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;this.DrawKRange.Start=this.Data.DataOffset;var eventUnchangeKLine=null;//定制平盘K线颜色事件
 if(this.GetEventCallback){eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_COLOR);}var preKItemInfo=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth,++this.ShowRange.DataCount){var data=this.Data.Data[i];this.ShowRange.End=i;if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;var yLow=this.GetYFromData(data.Low,false);var yHigh=this.GetYFromData(data.High,false);var yOpen=this.GetYFromData(data.Open,false);var yClose=this.GetYFromData(data.Close,false);this.DrawKRange.End=i;this.AddToDaySummary(data);var kItemInfo={Data:data,Coordinate:{X:x,Low:yLow,High:yHigh,Close:yClose,Open:yOpen,Left:left,Right:right}};if(ptMax.Value==null||ptMax.Value<data.High)//求最大值
@@ -3764,11 +3771,12 @@ var yTop=yClose-barWidth/2;if(isHScreen){this.Canvas.fillRect(yTop,aryX[2],barWi
 {var isHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;if(isHScreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;var borderLeft=border.TopEx;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var borderLeft=border.LeftEx;}var bFirstPoint=true;var firstPoint=null;this.Canvas.beginPath();this.Canvas.strokeStyle=this.CloseLineColor;if(IFrameSplitOperator.IsNumber(this.CloseLineWidth))this.Canvas.lineWidth=this.CloseLineWidth;var ptLast=null;if(this.Data.DataOffset>0)//把最左边的一个点连上
 {var data=this.Data.Data[this.Data.DataOffset-1];if(data&&IFrameSplitOperator.IsNumber(data.Close)){var x=borderLeft;var yClose=this.GetYFromData(data.Close,false);if(isHScreen){this.Canvas.moveTo(yClose,x);firstPoint={X:yClose,Y:x};}else{this.Canvas.moveTo(x,yClose);firstPoint={X:x,Y:yClose};}bFirstPoint=false;}}this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;this.DrawKRange.Start=this.Data.DataOffset;var preKItemInfo=null;var prePoint=null;var xEnd=null;//最后一个点
 for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth,++this.ShowRange.DataCount){var data=this.Data.Data[i];this.ShowRange.End=i;if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;var yClose=this.GetYFromData(data.Close,false);this.DrawKRange.End=i;this.AddToDaySummary(data);if(data.IsVirtual&&this.PredictionConfig.Enable)//预测数据|虚拟数据
-{this.AryPredictionCache.push({PrePoint:prePoint,Point:{X:x,Y:yClose}});prePoint={X:x,Y:yClose};continue;}if(bFirstPoint){if(isHScreen){this.Canvas.moveTo(yClose,x);firstPoint={X:yClose,Y:x};}else{this.Canvas.moveTo(x,yClose);firstPoint={X:x,Y:yClose};}bFirstPoint=false;}else{if(isHScreen)this.Canvas.lineTo(yClose,x);else this.Canvas.lineTo(x,yClose);}xEnd=x;prePoint={X:x,Y:yClose};if(i==this.Data.Data.length-1){ptLast={X:x,Y:yClose,XLeft:left,XRight:right,KItem:data,ChartRight:chartright};}if(this.PriceGap.Enable){var yLow=this.GetYFromData(data.Low,false);var yHigh=this.GetYFromData(data.High,false);var yOpen=this.GetYFromData(data.Open,false);var kItemInfo={Data:data,Coordinate:{X:x,Low:yLow,High:yHigh,Close:yClose,Open:yOpen,Left:left,Right:right}};if(preKItemInfo){this.CheckPriceGap(kItemInfo);var value=this.IsPriceGap(kItemInfo,preKItemInfo);if(value>0)this.AryPriceGapCache.push({Data:[preKItemInfo,kItemInfo],Type:value});}preKItemInfo=kItemInfo;}}this.DrawLastPointEvent(ptLast);//通知外部绘制最后一个点
+{this.AryPredictionCache.push({PrePoint:prePoint,Point:{X:x,Y:yClose}});prePoint={X:x,Y:yClose};continue;}if(bFirstPoint){if(isHScreen){this.Canvas.moveTo(yClose,x);firstPoint={X:yClose,Y:x};}else{this.Canvas.moveTo(x,yClose);firstPoint={X:x,Y:yClose};}bFirstPoint=false;}else{if(isHScreen)this.Canvas.lineTo(yClose,x);else this.Canvas.lineTo(x,yClose);}xEnd=x;prePoint={X:x,Y:yClose};if(i==this.Data.Data.length-1){ptLast={X:x,Y:yClose,XLeft:left,XRight:right,KItem:data,ChartRight:chartright};this.LastPoint={X:x,Y:yClose,KItem:data};}if(this.PriceGap.Enable){var yLow=this.GetYFromData(data.Low,false);var yHigh=this.GetYFromData(data.High,false);var yOpen=this.GetYFromData(data.Open,false);var kItemInfo={Data:data,Coordinate:{X:x,Low:yLow,High:yHigh,Close:yClose,Open:yOpen,Left:left,Right:right}};if(preKItemInfo){this.CheckPriceGap(kItemInfo);var value=this.IsPriceGap(kItemInfo,preKItemInfo);if(value>0)this.AryPriceGapCache.push({Data:[preKItemInfo,kItemInfo],Type:value});}preKItemInfo=kItemInfo;}}this.DrawLastPointEvent(ptLast);//通知外部绘制最后一个点
 if(bFirstPoint)return;this.Canvas.stroke();if(isHScreen){this.Canvas.lineTo(border.Left,xEnd);this.Canvas.lineTo(border.Left,firstPoint.Y);}else{this.Canvas.lineTo(xEnd,border.Bottom);this.Canvas.lineTo(firstPoint.X,border.Bottom);}this.Canvas.closePath();if(Array.isArray(this.CloseLineAreaColor)){if(isHScreen){var gradient=this.Canvas.createLinearGradient(this.ChartBorder.GetRightEx(),this.ChartBorder.GetTop(),this.ChartBorder.GetLeft(),this.ChartBorder.GetTop());gradient.addColorStop(0,this.CloseLineAreaColor[0]);gradient.addColorStop(1,this.CloseLineAreaColor[1]);this.Canvas.fillStyle=gradient;}else{var _gradient=this.Canvas.createLinearGradient(firstPoint.X,this.ChartBorder.GetTopEx(),firstPoint.X,this.ChartBorder.GetBottom());_gradient.addColorStop(0,this.CloseLineAreaColor[0]);_gradient.addColorStop(1,this.CloseLineAreaColor[1]);this.Canvas.fillStyle=_gradient;}}else{this.Canvas.fillStyle=this.CloseLineAreaColor;}this.Canvas.fill();};this.DrawCloseLine=function()//收盘价线
 {var isHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;if(isHScreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;}var bFirstPoint=true;var drawCount=0;this.Canvas.beginPath();this.Canvas.strokeStyle=this.CloseLineColor;if(IFrameSplitOperator.IsNumber(this.CloseLineWidth))this.Canvas.lineWidth=this.CloseLineWidth;this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;this.DrawKRange.Start=this.Data.DataOffset;var mapBreakPoint=this.BuildBreakPoint();//断点
 var preKItemInfo=null;var prePoint=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth,++this.ShowRange.DataCount){var data=this.Data.Data[i];this.ShowRange.End=i;if(!data||data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;var yClose=this.GetYFromData(data.Close,false);this.DrawKRange.End=i;this.AddToDaySummary(data);if(data.IsVirtual&&this.PredictionConfig.Enable)//预测数据|虚拟数据
-{this.AryPredictionCache.push({PrePoint:prePoint,Point:{X:x,Y:yClose}});prePoint={X:x,Y:yClose};continue;}if(bFirstPoint){if(isHScreen)this.Canvas.moveTo(yClose,x);else this.Canvas.moveTo(x,yClose);bFirstPoint=false;}else{if(isHScreen)this.Canvas.lineTo(yClose,x);else this.Canvas.lineTo(x,yClose);}++drawCount;prePoint={X:x,Y:yClose};if(this.PriceGap.Enable){var yLow=this.GetYFromData(data.Low,false);var yHigh=this.GetYFromData(data.High,false);var yOpen=this.GetYFromData(data.Open,false);var kItemInfo={Data:data,Coordinate:{X:x,Low:yLow,High:yHigh,Close:yClose,Open:yOpen,Left:left,Right:right}};if(preKItemInfo){this.CheckPriceGap(kItemInfo);var value=this.IsPriceGap(kItemInfo,preKItemInfo);if(value>0)this.AryPriceGapCache.push({Data:[preKItemInfo,kItemInfo],Type:value});}preKItemInfo=kItemInfo;}//断开点
+{this.AryPredictionCache.push({PrePoint:prePoint,Point:{X:x,Y:yClose}});prePoint={X:x,Y:yClose};continue;}if(bFirstPoint){if(isHScreen)this.Canvas.moveTo(yClose,x);else this.Canvas.moveTo(x,yClose);bFirstPoint=false;}else{if(isHScreen)this.Canvas.lineTo(yClose,x);else this.Canvas.lineTo(x,yClose);}++drawCount;prePoint={X:x,Y:yClose};if(i==this.Data.Data.length-1)//最后一个点
+{this.LastPoint={X:x,Y:yClose,KItem:data};}if(this.PriceGap.Enable){var yLow=this.GetYFromData(data.Low,false);var yHigh=this.GetYFromData(data.High,false);var yOpen=this.GetYFromData(data.Open,false);var kItemInfo={Data:data,Coordinate:{X:x,Low:yLow,High:yHigh,Close:yClose,Open:yOpen,Left:left,Right:right}};if(preKItemInfo){this.CheckPriceGap(kItemInfo);var value=this.IsPriceGap(kItemInfo,preKItemInfo);if(value>0)this.AryPriceGapCache.push({Data:[preKItemInfo,kItemInfo],Type:value});}preKItemInfo=kItemInfo;}//断开点
 if(mapBreakPoint){var kItem=data;var key=this.BuildDateTimeKey(kItem);if(key&&mapBreakPoint.has(key)){if(drawCount>0)this.Canvas.stroke();bFirstPoint=true;drawCount=0;}}}if(drawCount>0)this.Canvas.stroke();};this.DrawKBar=function()//蜡烛头
 {var isHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var xPointCount=this.ChartFrame.XPointCount;if(isHScreen){var border=this.ChartBorder.GetHScreenBorder();xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;chartright=border.BottomEx;}var ptMax={X:null,Y:null,Value:null,Align:'left'};var ptMin={X:null,Y:null,Value:null,Align:'left'};var upColor=this.UpColor;var downColor=this.DownColor;var unchagneColor=this.UnchagneColor;this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;var ptLast=null;this.DrawKRange.Start=this.Data.DataOffset;var eventUnchangeKLine=null;//定制平盘K线颜色事件
 if(this.GetEventCallback){eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_COLOR);}var preKItemInfo=null;var prePoint=null;//上一个点的位置
@@ -3920,11 +3928,11 @@ this.TooltipRect.push([i,rect]);//[0]数据索引 [1]数据区域
 this.Canvas.clip();};this.ClipClient=function(isHScreen)//裁剪客户端
 {if(isHScreen==true){var left=this.ChartBorder.GetLeftEx();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTopEx();var bottom=this.ChartBorder.GetBottomEx();if(this.ChartBorder.BottomSpace>0)bottom+=1;if(this.DrawType==13)//需要显示文字,裁剪要大点
 {top=this.ChartBorder.GetTopTitle();bottom=this.ChartBorder.GetBottom();}}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
-this.Canvas.clip();};this.Draw=function(){if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;this.ClearDaySummary();this.IsShowOrderText=false;this.TooltipRect=[];this.InfoTooltipRect=[];this.TradeIconTooltipRect=[];this.PtMax={X:null,Y:null,Value:null,Align:'left'};//清空最大
+this.Canvas.clip();};this.ClearLastPoint=function(){this.LastPoint={};if(this.ChartFrame.GlobalOption){var item=this.ChartFrame.GlobalOption;item.LatestPoint=null;}};this.UpdateGlobalLatestPoint=function(){if(this.Identify!="Main-KLine")return;if(!this.ChartFrame.GlobalOption)return;var item=this.ChartFrame.GlobalOption;if(IFrameSplitOperator.IsNumber(this.LastPoint.X)&&IFrameSplitOperator.IsNumber(this.LastPoint.Y))item.LatestPoint={X:this.LastPoint.X,Y:this.LastPoint.Y};};this.Draw=function(){this.ClearLastPoint();if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;this.ClearDaySummary();this.IsShowOrderText=false;this.TooltipRect=[];this.InfoTooltipRect=[];this.TradeIconTooltipRect=[];this.PtMax={X:null,Y:null,Value:null,Align:'left'};//清空最大
 this.PtMin={X:null,Y:null,Value:null,Align:'left'};//清空最小
 this.DrawKRange={Start:null,End:null};this.AryPriceGapCache=[];this.AryPredictionCache=[];this.ChartFrame.ChartKLine={Max:null,Min:null};//保存K线上 显示最大最小值坐标
 this.DrawHeatMap();if(!this.IsShow)return;if(this.ChartFrame.IsMinSize&&this.Name=="Self Kline")return;if(ChartData.IsTickPeriod(this.Period))//分笔图
-{this.Canvas.save();if(this.DrawType==1){this.ClipClient(this.ChartFrame.IsHScreen);this.DrawCloseLine();}else if(this.DrawType==4){this.ClipClient(this.ChartFrame.IsHScreen);this.DrawCloseArea();}else{this.ClipTickClient(this.ChartFrame.IsHScreen);this.DrawTick();}this.Canvas.restore();return;}this.Canvas.save();this.ClipClient(this.ChartFrame.IsHScreen);if(this.DrawType==1){this.DrawCloseLine();this.Canvas.restore();this.DrawPredictionLine();if(this.PriceGap.Enable)this.DrawPriceGap();return;}else if(this.DrawType==2){this.DrawAKLine();}else if(this.DrawType==4){this.DrawCloseArea();}else if(this.DrawType==5){this.DrawOrderFlow();}else if(this.DrawType==7){this.DrawOrderFlow_Style2();}else if(this.DrawType==8){this.DrawOrderFlow_Style3();}else if(this.DrawType==9){this.DrawKBar();}else if(this.DrawType==10){this.DrawRenkoCandle();}else if(this.DrawType==12){this.DrawLineBreak();}else if(this.DrawType==13){this.DrawHighLow();}else if(this.DrawType==14){if(this.FFKChart&&this.FFKChart.Draw){this.FFKChart.Draw(this);}}else if(this.DrawType==15){this.DrawHLCArea();}else if(this.DrawType==16){this.DrawKagi();}else if(this.DrawType==17){this.DrawOrderFlow_Style4();}else if(this.DrawType==18){this.DrawOrderFlow_Style5();}else{this.DrawKBar();}if(this.TradeIcon)this.DrawTradeIcon();else this.DrawTrade();this.Canvas.restore();this.DrawPredictionLine();if(this.PriceGap.Enable)this.DrawPriceGap();if(this.IsShowMaxMinPrice)//标注最大值最小值
+{this.Canvas.save();if(this.DrawType==1){this.ClipClient(this.ChartFrame.IsHScreen);this.DrawCloseLine();}else if(this.DrawType==4){this.ClipClient(this.ChartFrame.IsHScreen);this.DrawCloseArea();}else{this.ClipTickClient(this.ChartFrame.IsHScreen);this.DrawTick();}this.Canvas.restore();return;}this.Canvas.save();this.ClipClient(this.ChartFrame.IsHScreen);if(this.DrawType==1){this.DrawCloseLine();this.Canvas.restore();this.DrawPredictionLine();if(this.PriceGap.Enable)this.DrawPriceGap();this.UpdateGlobalLatestPoint();return;}else if(this.DrawType==2){this.DrawAKLine();}else if(this.DrawType==4){this.DrawCloseArea();}else if(this.DrawType==5){this.DrawOrderFlow();}else if(this.DrawType==7){this.DrawOrderFlow_Style2();}else if(this.DrawType==8){this.DrawOrderFlow_Style3();}else if(this.DrawType==9){this.DrawKBar();}else if(this.DrawType==10){this.DrawRenkoCandle();}else if(this.DrawType==12){this.DrawLineBreak();}else if(this.DrawType==13){this.DrawHighLow();}else if(this.DrawType==14){if(this.FFKChart&&this.FFKChart.Draw){this.FFKChart.Draw(this);}}else if(this.DrawType==15){this.DrawHLCArea();}else if(this.DrawType==16){this.DrawKagi();}else if(this.DrawType==17){this.DrawOrderFlow_Style4();}else if(this.DrawType==18){this.DrawOrderFlow_Style5();}else{this.DrawKBar();}if(this.TradeIcon)this.DrawTradeIcon();else this.DrawTrade();this.Canvas.restore();this.UpdateGlobalLatestPoint();this.DrawPredictionLine();if(this.PriceGap.Enable)this.DrawPriceGap();if(this.IsShowMaxMinPrice)//标注最大值最小值
 {if(this.ChartFrame.IsHScreen===true)this.HScreenDrawMaxMinPrice(this.PtMax,this.PtMin);else this.DrawMaxMinPrice(this.PtMax,this.PtMin);}if(this.DrawType==14)//自定义图形 标注最大最小值
 {if(this.FFKChart&&this.FFKChart.DrawMaxMinPrice){this.FFKChart.DrawMaxMinPrice();}}this.DrawDaySummary();};this.OnFormatHighLowTitle=function(ptMax,ptMin){if(!ptMax||!ptMin)return null;if(!IFrameSplitOperator.IsNumber(ptMax.Value)||!IFrameSplitOperator.IsNumber(ptMin.Value))return null;var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//小数位数
 var title={High:ptMax.Value.toFixed(defaultfloatPrecision),Low:ptMin.Value.toFixed(defaultfloatPrecision)};if(!this.GetEventCallback)return title;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_KLINE_HIGH_LOW_TITLE);if(!event||!event.Callback)return title;var data={Max:ptMax,Min:ptMin,Symbol:this.Symbol,Title:{High:title.High,Low:title.Low},Decimal:defaultfloatPrecision,PreventDefault:false};event.Callback(event,data,this);if(data.PreventDefault)return data.Title;//使用外部回调的数值
@@ -5312,8 +5320,9 @@ var yText=subFrame.ChartBorder.GetTopEx()+this.MerginTop;for(var i=0;i<this.Data
 function LatestPointFlashPaint(){this.newMethod=IExtendChartPainting;//派生
 this.newMethod();delete this.newMethod;this.ClassName='LatestPointFlashPaint';this.HQChart;this.Status=0;this.UpdateTime=new Date();this.FlashCount=0;//闪烁次数
 this.Frequency=500;//闪烁频率ms
-this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;this.FlashCanvas;this.SetOption=function(option){if(this.HQChart){var extraElement=this.HQChart.GetExtraCanvas(JSChart.LatestPointFlashKey);if(extraElement&&extraElement.Canvas)this.FlashCanvas=extraElement.Canvas;//绑定独立的画布
-}if(option){if(IFrameSplitOperator.IsNumber(option.Frequency))this.Frequency=option.Frequency;}};this.ReloadResource=function(resource){this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;};this.Draw=function(){if(!this.FlashCanvas)return;if(!this.HQChart)return;this.HQChart.ClearCanvas(this.FlashCanvas);if(this.FlashCount<=0)return;if(this.IsStatusChange()){this.Status=(this.Status+1)%2;--this.FlashCount;}if(this.Status==0)return;if(!this.HQChart.GlobalOption||!this.HQChart.GlobalOption.LatestPoint)return;var point=this.HQChart.GlobalOption.LatestPoint;if(!IFrameSplitOperator.IsNumber(point.X)||!IFrameSplitOperator.IsNumber(point.Y))return;this.FlashCanvas.fillStyle=this.BGColor;this.FlashCanvas.beginPath();this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);this.FlashCanvas.fill();this.FlashCanvas.closePath();//画实心圆
+this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;this.Style=1;//0=默认配置 1=图形保持一致
+this.FlashCanvas;this.SetOption=function(option){if(this.HQChart){var extraElement=this.HQChart.GetExtraCanvas(JSChart.LatestPointFlashKey);if(extraElement&&extraElement.Canvas)this.FlashCanvas=extraElement.Canvas;//绑定独立的画布
+}if(option){if(IFrameSplitOperator.IsNumber(option.Frequency))this.Frequency=option.Frequency;}};this.ReloadResource=function(resource){this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;};this.GetChartColor=function(){var chart=this.HQChart.ChartPaint[0];if(!chart)return;if(chart.ClassName=="ChartKLine"){this.PointColor=chart.CloseLineColor;this.BGColor=IChartDrawPicture.ColorToRGBA(chart.CloseLineColor,0.6);}else if(chart.ClassName=="ChartMinutePriceLine"){this.PointColor=chart.Color;this.BGColor=IChartDrawPicture.ColorToRGBA(chart.Color,0.6);}};this.Draw=function(){if(!this.FlashCanvas)return;if(!this.HQChart)return;this.HQChart.ClearCanvas(this.FlashCanvas);if(this.FlashCount<=0)return;if(this.IsStatusChange()){this.Status=(this.Status+1)%2;--this.FlashCount;}if(this.Status==0)return;if(!this.HQChart.GlobalOption||!this.HQChart.GlobalOption.LatestPoint)return;var point=this.HQChart.GlobalOption.LatestPoint;if(!IFrameSplitOperator.IsNumber(point.X)||!IFrameSplitOperator.IsNumber(point.Y))return;if(this.Style==1)this.GetChartColor();this.FlashCanvas.fillStyle=this.BGColor;this.FlashCanvas.beginPath();this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);this.FlashCanvas.fill();this.FlashCanvas.closePath();//画实心圆
 this.FlashCanvas.fillStyle=this.PointColor;this.FlashCanvas.beginPath();this.FlashCanvas.arc(point.X,point.Y,this.PointRadius,0,360,false);this.FlashCanvas.fill();this.FlashCanvas.closePath();};this.IsStatusChange=function(){if(!this.UpdateTime){this.UpdateTime=new Date();return true;}var now=new Date();var diffValue=now.getTime()-this.UpdateTime.getTime();if(diffValue<=this.Frequency)return false;this.UpdateTime=now;return true;};}//拖拽效果图
 var JSCHART_DRAGCHART_TYPE_ID={MAIN_KLINE:1,OVERLAY_KLINE:2,MAIN_INDEX:3,OVERLAY_INDEX:4,OVERLAY_MINUTE:5,//叠加走势图
 MAIN_MINUTE:6,//走势图
@@ -7588,7 +7597,19 @@ var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.
 var start=kData.DataOffset;var bDayPeriod=ChartData.IsDayPeriod(this.Period,true);var findItem=null,dataIndex=-1;for(var i=0;i<kData.Data.length;++i){var item=kData.Data[i];if(!item)continue;if(bDayPeriod){if(item.Date==obj.Start.Date){findItem=item;dataIndex=i;break;}}else{if(item.Date==obj.Start.Date&&item.Time==obj.Start.Time){findItem=item;dataIndex=i;break;}}}if(!findItem)return false;var index=-1;var dataOffset=kData.DataOffset;if(dataIndex>=start&&dataIndex<=start+(showCount-1)){index=dataIndex-start;}else//需要调整当前屏范围
 {if(step>0){if(dataIndex+showCount>=kData.Data.length){dataOffset=kData.Data.length-showCount;index=dataIndex-dataOffset;}else{index=0;dataOffset=dataIndex;}}else{if(dataIndex-showCount<0){dataOffset=0;index=dataIndex;}else if(dataIndex+showCount>=kData.Data.length){dataOffset=kData.Data.length-showCount;index=dataIndex-dataOffset;}else{index=showCount;dataOffset=dataIndex-showCount;}}}var kItem=findItem;if(step>0){for(var i=dataIndex+1,j=0;i<kData.Data.length&&j<step;++i,++j){++index;dataIndex=i;if(index>=showCount-1){index=showCount-1;dataOffset+=1;}var item=kData.Data[i];if(!item)continue;var kItem=item;}}else if(step<0){for(var i=dataIndex-1,j=0;i>=0&&j<Math.abs(step);--i,++j){--index;dataIndex=i;if(index<=0){index=0;dataOffset-=1;}var item=kData.Data[i];if(!item)continue;var kItem=item;}}if(!kItem)return false;obj.KItem=kItem;if(kData.DataOffset==dataOffset){return this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);}else{kData.DataOffset=dataOffset;this.UpdataDataoffset();//更新数据偏移
 this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.ResetFrameXSplit();this.Frame.SetSizeChage(true);this.Draw();this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);return true;}}};this.ChartOperator_Temp_SetChartCorssCursor=function(index,kItem){if(!this.Frame||!this.Frame.SubFrame[0]||!this.Frame.SubFrame[0].Frame)return false;var frame=this.Frame.SubFrame[0].Frame;var x=frame.GetXFromIndex(index);var y=frame.GetYFromData(kItem.Close);//保存最后一次鼠标移动信息
+this.ResetFrameXSplit();this.Frame.SetSizeChage(true);this.Draw();this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);return true;}}else if(id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START)//当前屏第1条数据
+{var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;//数据还没有到达
+var startIndex=kData.DataOffset;var kItem=kData.Data[startIndex];this.ChartOperator_Temp_SetChartCorssCursor(0,kItem);return true;}else if(id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END)//当前屏最后1条数据
+{var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;//数据还没有到达
+if(!this.Frame||!this.Frame.SubFrame[0]||!this.Frame.SubFrame[0].Frame)return false;var showCount=this.Frame.SubFrame[0].Frame.XPointCount;//一屏显示个数
+var endIndex=kData.DataOffset+showCount-1;if(endIndex>=kData.Data.length)endIndex=kData.Data.length-1;var kItem=kData.Data[endIndex];var index=endIndex-kData.DataOffset;this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);return true;}else if(id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;//数据还没有到达
+var kItem=kData.Data[0];if(kData.DataOffset!=0){kData.DataOffset=0;this.UpdataDataoffset();//更新数据偏移
+this.UpdateFrameMaxMin();//调整坐标最大 最小值
+this.ResetFrameXSplit();this.Frame.SetSizeChage(true);this.Draw();this.ChartOperator_Temp_SetChartCorssCursor(0,kItem);}else{this.ChartOperator_Temp_SetChartCorssCursor(0,kItem);}return true;}else if(id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END){var kData=this.GetKData();if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return false;//数据还没有到达
+var kItem=kData.Data[kData.Data.length-1];if(!this.Frame||!this.Frame.SubFrame[0]||!this.Frame.SubFrame[0].Frame)return false;var showCount=this.Frame.SubFrame[0].Frame.XPointCount;//一屏显示个数
+var dataOffset=kData.Data.length-showCount;if(kData.DataOffset<dataOffset){kData.DataOffset=dataOffset;var index=kData.Data.length-kData.DataOffset-1;this.UpdataDataoffset();//更新数据偏移
+this.UpdateFrameMaxMin();//调整坐标最大 最小值
+this.ResetFrameXSplit();this.Frame.SetSizeChage(true);this.Draw();this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);}else{var index=kData.Data.length-kData.DataOffset-1;this.ChartOperator_Temp_SetChartCorssCursor(index,kItem);}return true;}};this.ChartOperator_Temp_SetChartCorssCursor=function(index,kItem){if(!this.Frame||!this.Frame.SubFrame[0]||!this.Frame.SubFrame[0].Frame)return false;var frame=this.Frame.SubFrame[0].Frame;var x=frame.GetXFromIndex(index);var y=frame.GetYFromData(kItem.Close);//保存最后一次鼠标移动信息
 var MoveStatus={X:x,Y:y,IsInClient:this.IsMouseOnClient(x,y)};this.LastMouseStatus.OnMouseMove=MoveStatus;this.LastMouseStatus.MoveOnPoint={X:x,Y:y};//鼠标移动的位置
 var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);var titleChart=this.TitlePaint[0];if(event&&titleChart)titleChart.OnMouseMoveEvent=event;var pixelTatio=GetDevicePixelRatio();var e={};e.clientX=x/pixelTatio+this.UIElement.getBoundingClientRect().left;e.clientY=y/pixelTatio+this.UIElement.getBoundingClientRect().top;this.MoveOnPoint={X:x,Y:y};this.OnMouseMove(x,y,e);this.LastMouseStatus.MoveOnPoint=null;if(titleChart)titleChart.OnMouseMoveEvent=null;return true;};//内部函数
 this.ChartOperator_Temp_GetHistoryData=function(){var hisData=null;if(!this.Frame.Data)hisData=this.Frame.Data;else hisData=this.Frame.SubFrame[0].Frame.Data;if(!hisData)return null;//数据还没有到达
@@ -7623,6 +7644,8 @@ for(var i in this.Frame.SubFrame){var titlePaint=new DynamicChartTitlePainting()
 if(!data.Tooltip||!data.Chart)return;var pixelRatio=GetDevicePixelRatio();var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;var item=data.Tooltip.Data;var date=item.Date;var symbol=null;if(data.Tooltip.ChartPaint&&data.Tooltip.ChartPaint.Name=="DRAWKLINE"){if(item.Symbol)symbol=item.Symbol;else if(data.Tooltip.Symbol)symbol=data.Tooltip.Symbol;}else{symbol=data.Chart.Symbol;}if(!symbol)return;this.PopMinuteChart.Show({Date:date,Symbol:symbol,Data:data.Tooltip.Data,Chart:data.Tooltip.ChartPaint},x/pixelRatio,y/pixelRatio);};//Alt+W	区间统计
 //Alt+数字	切换多个窗口
 //Ctrl+I
+//HOME / END 当前屏 第1条 最后一条
+//Ctrl+HOME / Ctrl+END 第1条 最后一条
 this.OnCustomKeyDown=function(keyID,e)//自定义键盘事件
 {if(keyID==37&&e.ctrlKey)//Ctrl+Left
 {this.MoveCorssCursorLeft(this.CtrlMoveStep);return true;}else if(keyID==39&&e.ctrlKey)//Ctrl+Right
@@ -7631,7 +7654,11 @@ this.OnCustomKeyDown=function(keyID,e)//自定义键盘事件
 {this.MoveKLineRight(this.ShiftMoveStep);return true;}else if(keyID==38&&e.shiftKey)//shift+up   上移十字光标
 {this.MoveCorssCursorUp(this.ShiftUpDownStepPixel);return true;}else if(keyID==40&&e.shiftKey)//shift+down    下移十字光标
 {this.MoveCorssCursorDown(this.ShiftUpDownStepPixel);return true;}else if(keyID==13)//回车显示分时图
-{this.OnEnterKeyDown();}else{return false;}};this.MoveKLineLeft=function(value){return this.MoveKLine(-value);};this.MoveKLineRight=function(value){return this.MoveKLine(value);};this.MoveKLine=function(step){if(step==0)return;var oneStepWidth=this.GetMoveOneStepWidth();var moveSetp=step*oneStepWidth;var bLeft=true;if(step<0){moveSetp=Math.abs(step)*oneStepWidth;bLeft=false;}if(!this.DataMove(moveSetp,bLeft))return;this.UpdataDataoffset();this.RepairCursorIndex();this.UpdatePointByCursorIndex();//推拽数据的时候不需要把鼠标位置更新到K线上
+{this.OnEnterKeyDown();}else if(keyID==36)//HOME  第1条
+{var option=null;if(e.ctrlKey)option={ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START};//所有数据的第1条数据   
+else option={ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START};if(option)this.ChartOperator(option);}else if(keyID==35)//END   最后一条
+{var option=null;if(e.ctrlKey)option={ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END};//所有数据的最后1条数据
+else option={ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END};if(option)this.ChartOperator(option);}else{return false;}};this.MoveKLineLeft=function(value){return this.MoveKLine(-value);};this.MoveKLineRight=function(value){return this.MoveKLine(value);};this.MoveKLine=function(step){if(step==0)return;var oneStepWidth=this.GetMoveOneStepWidth();var moveSetp=step*oneStepWidth;var bLeft=true;if(step<0){moveSetp=Math.abs(step)*oneStepWidth;bLeft=false;}if(!this.DataMove(moveSetp,bLeft))return;this.UpdataDataoffset();this.RepairCursorIndex();this.UpdatePointByCursorIndex();//推拽数据的时候不需要把鼠标位置更新到K线上
 this.UpdateFrameMaxMin();this.ResetFrameXYSplit();this.Draw();this.ShowTooltipByKeyDown();this.OnKLinePageChange("datamove");};//修复 当前数据索引大于数据个数的请求
 this.RepairCursorIndex=function(){var kData=this.GetKData();if(!kData)return;var xPointcount=0;if(this.Frame.XPointCount)xPointcount=this.Frame.XPointCount;else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;if(!IFrameSplitOperator.IsPlusNumber(xPointcount))return;if(this.CursorIndex<0)this.CursorIndex=0;var index=this.CursorIndex;index=parseInt(index.toFixed(0));if(index+kData.DataOffset>=kData.Data.length){this.CursorIndex=kData.Data.length-1-kData.DataOffset;}};this.MoveCorssCursorLeft=function(step){var data=null;if(this.Frame.Data)data=this.Frame.Data;else data=this.Frame.SubFrame[0].Frame.Data;if(!data)return;if(data.DataOffset<=0&&this.CursorIndex<=0)//数据到头了
 {if(this.DragDownloadData)this.DragDownloadData();return;}if(this.CursorIndex-step<0)//当前屏到头了
@@ -7908,7 +7935,8 @@ var lastDataCount=this.GetHistoryDataCount();//保存下上一次的数据个数
 if(this.SourceData.Data.length==0)//第1条数据
 {var newItem=new HistoryData();HistoryData.CopyTo(newItem,realtimeData);this.SourceData.Data.push(newItem);}else if(item.Date==realtimeData.Date)//实时行情数据更新
 {JSConsole.Chart.Log('[KLineChartContainer::RecvRealtimeData] update kline by realtime data',realtimeData);HistoryData.CopyTo(item,realtimeData);}else if(item.Date<realtimeData.Date)//新增加数据
-{JSConsole.Chart.Log('[KLineChartContainer::RecvRealtimeData] insert kline by realtime data',realtimeData);var newItem=new HistoryData();HistoryData.CopyTo(newItem,realtimeData);if(!IFrameSplitOperator.IsNumber(newItem.YClose)&&this.SourceData.Data.length>0)newItem.YClose=this.SourceData.Data[this.SourceData.Data.length-1].YClose;this.SourceData.Data.push(newItem);}else{var bFind=false;var aryKData=this.SourceData.Data;for(var i=aryKData.length-1;i>=0;--i){var kItem=aryKData[i];if(kItem.Date==realtimeData.Date){HistoryData.CopyTo(kItem,realtimeData);bFind=true;break;}}if(!bFind)return;}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(bindData.Right>0&&ChartData.IsDayPeriod(bindData.Period,true)&&MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol)&&!this.IsApiPeriod)//复权(A股日线数据才复权)
+{JSConsole.Chart.Log('[KLineChartContainer::RecvRealtimeData] insert kline by realtime data',realtimeData);var newItem=new HistoryData();HistoryData.CopyTo(newItem,realtimeData);if(!IFrameSplitOperator.IsNumber(newItem.YClose)&&this.SourceData.Data.length>0)newItem.YClose=this.SourceData.Data[this.SourceData.Data.length-1].YClose;this.SourceData.Data.push(newItem);}else{var bFind=false;var aryKData=this.SourceData.Data;for(var i=aryKData.length-1;i>=0;--i){var kItem=aryKData[i];if(kItem.Date==realtimeData.Date){HistoryData.CopyTo(kItem,realtimeData);bFind=true;break;}}if(!bFind)return;}if(data.LatestPointFlash)//最新数据闪烁
+{var item=data.LatestPointFlash;if(IFrameSplitOperator.IsNumber(item.FlashCount))this.SetLatestPointFlash(item.FlashCount);}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(bindData.Right>0&&ChartData.IsDayPeriod(bindData.Period,true)&&MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol)&&!this.IsApiPeriod)//复权(A股日线数据才复权)
 {var rightData=bindData.GetRightData(bindData.Right,{AlgorithmType:this.RightFormula});bindData.Data=rightData;}if(!this.IsApiPeriod){if(ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))//周期数据 (0= 日线,4=1分钟线 不需要处理)
 {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
 {var newBindData=kLineCalculate.RecvHistoryData(bindData,{Symbol:this.Symbol,Function:"RecvRealtimeData"});bindData=newBindData;this.FlowCapitalReady=true;}this.UpdateMainData(bindData,lastDataCount);//更新主图数据
@@ -13094,7 +13122,7 @@ this.DrawItemTextV2(drawInfo,rtItem);}else{this.DrawItemText(text,textColor,text
 var tooltipData=(0,_defineProperty3.default)({Rect:rtItem,Data:data,Index:dataIndex,Column:item,Type:drawInfo.Tooltip.Type},'Data',drawInfo.Tooltip.Data);this.TooltipRect.push(tooltipData);}else if(item.ChartTooltip&&item.ChartTooltip.Enable&&IFrameSplitOperator.IsNumber(item.ChartTooltip.Type))//Type 20分时图 21K线图
 {var tooltipData={Rect:rtItem,Data:data,Index:dataIndex,Column:item,Type:item.ChartTooltip.Type};this.TooltipRect.push(tooltipData);}left+=item.Width;}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
 text=value.toFixed(column.FloatPrecision);break;case 2://千分位分割
-text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}if(item&&item.Tooltip&&IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText)){drawInfo.Tooltip={Type:2,Data:{AryText:item.Tooltip.AryText}};}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawSelectedRow=function(data,index,rtRow){if(!this.SelectedData)return false;if(!this.SelectedData.Enable)return false;if(!this.SelectedData.Guid||this.SelectedData.Guid!=data.Guid)return false;if(this.SelectedStyle==1){this.Canvas.fillStyle=this.SelectedConfig.BGColor;this.Canvas.fillRect(rtRow.Left,rtRow.Top,rtRow.Width,rtRow.Height);}return true;};this.DrawItemText=function(text,textColor,textAlign,left,top,width){var x=left;if(textAlign=='center'){x=left+width/2;this.Canvas.textAlign="center";}else if(textAlign=='right'){x=left+width;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=textColor;if(text)this.Canvas.fillText(text,x,top+this.RowHeight-2);};this.DrawItemTextV2=function(drawInfo,rtItem){if(drawInfo.BGColor){this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.Text){var text=drawInfo.Text;var x=rtItem.Left;if(drawInfo.TextAlign=='center'){x=rtItem.Left+rtItem.Width/2;this.Canvas.textAlign="center";}else if(drawInfo.TextAlign=='right'){x=rtItem.Left+rtItem.Width-2;this.Canvas.textAlign="right";}else{x+=2;this.Canvas.textAlign="left";}var textWidth=this.Canvas.measureText(text).width+1;this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=drawInfo.TextColor;this.Canvas.fillText(text,x,rtItem.Top+this.RowHeight-2);}};this.DrawMultiBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
+text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}if(item&&item.Tooltip&&IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText)){drawInfo.Tooltip={Type:2,Data:{AryText:item.Tooltip.AryText}};}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawSelectedRow=function(data,index,rtRow){if(!this.SelectedData)return false;if(!this.SelectedData.Enable)return false;if(!this.SelectedData.Guid||this.SelectedData.Guid!=data.Guid)return false;if(this.SelectedStyle==1){this.Canvas.fillStyle=this.SelectedConfig.BGColor;this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1,rtRow.Width-2,rtRow.Height-2);}return true;};this.DrawItemText=function(text,textColor,textAlign,left,top,width){var x=left;if(textAlign=='center'){x=left+width/2;this.Canvas.textAlign="center";}else if(textAlign=='right'){x=left+width;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=textColor;if(text)this.Canvas.fillText(text,x,top+this.RowHeight-2);};this.DrawItemTextV2=function(drawInfo,rtItem){if(drawInfo.BGColor){this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.Text){var text=drawInfo.Text;var x=rtItem.Left;if(drawInfo.TextAlign=='center'){x=rtItem.Left+rtItem.Width/2;this.Canvas.textAlign="center";}else if(drawInfo.TextAlign=='right'){x=rtItem.Left+rtItem.Width-2;this.Canvas.textAlign="right";}else{x+=2;this.Canvas.textAlign="left";}var textWidth=this.Canvas.measureText(text).width+1;this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=drawInfo.TextColor;this.Canvas.fillText(text,x,rtItem.Top+this.RowHeight-2);}};this.DrawMultiBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
 if(!barData)return false;if(!IFrameSplitOperator.IsNonEmptyArray(barData.Value))return false;var width=rtItem.Width-this.BarMergin.Left-this.BarMergin.Right;var left=rtItem.Left+this.BarMergin.Left;var top=rtItem.Top+this.RowMergin.Top+this.BarMergin.Top;var height=rtItem.Height-this.RowMergin.Top-this.RowMergin.Bottom-this.BarMergin.Top-this.BarMergin.Bottom;var right=left+width;for(var i=0;i<barData.Value.length;++i){var value=barData.Value[i];if(value<=0)continue;if(left>=right)break;var barWidth=width*value;if(barWidth<1)barWidth=1;if(left+barWidth>right)barWidth=right-left;var colorIndex=i;if(IFrameSplitOperator.IsNonEmptyArray(barData.Color)&&i<barData.Color.length)colorIndex=barData.Color[i];this.Canvas.fillStyle=g_JSChartResource.DealList.FieldColor.Bar[colorIndex];this.Canvas.fillRect(left,top,barWidth,height);left+=barWidth;}return true;};this.DrawCenterBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
 if(!barData)return false;if(!IFrameSplitOperator.IsNonEmptyArray(barData.Value))return false;var width=(rtItem.Width-this.BarMergin.Left-this.BarMergin.Right)/2;var left=rtItem.Left+this.BarMergin.Left;var center=left+width;var top=rtItem.Top+this.RowMergin.Top+this.BarMergin.Top;var height=rtItem.Height-this.RowMergin.Top-this.RowMergin.Bottom-this.BarMergin.Top-this.BarMergin.Bottom;var right=left+width;for(var i=0;i<barData.Value.length&&i<2;++i){var value=barData.Value[i];if(value<=0)continue;if(value>1)value=1;var barWidth=width*value;if(barWidth<1)barWidth=1;var colorIndex=i;if(IFrameSplitOperator.IsNonEmptyArray(barData.Color)&&i<barData.Color.length)colorIndex=barData.Color[i];this.Canvas.fillStyle=g_JSChartResource.DealList.FieldColor.Bar[colorIndex];if(i==0)//左边
 {this.Canvas.fillRect(center,top,-barWidth,height);}else//右边
@@ -15050,7 +15078,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.14850";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.14854";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.14851",
+  "version": "1.1.14855",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.deal.js

@@ -2020,7 +2020,7 @@ function ChartDealList()
         if ( this.SelectedStyle==1)
         {
             this.Canvas.fillStyle=this.SelectedConfig.BGColor;
-            this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+            this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1, rtRow.Width-2, rtRow.Height-2);
         }
        
         return true;

package/src/jscommon/umychart.js

@@ -787,6 +787,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         
         this.AdjustTitleHeight(chart);
 
+        if (option.LatestPointFlash)
+        {
+            var item=option.LatestPointFlash;
+            if (item.Enable)
+            {
+                this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey, { ZIndex:6 });
+                chart.CreateExtendChart("LatestPointFlashPaint", item);
+                chart.StartLatestPointFlash();
+            }
+        }
+
         return chart;
     }
 
@@ -2834,6 +2845,12 @@ var JSCHART_OPERATOR_ID=
     OP_GOTO_BY_DATAINDEX:17,   //的移动到某一个数据起始位置
 
     OP_MOVE_CORSSCURSOR:18,       //移动十字光标 { Step, Start:{ Date:, Time: } }
+
+    OP_CORSSCURSOR_PAGE_START:19,   //当前屏第1条数据
+    OP_CORSSCURSOR_PAGE_END:20,     //当前屏最后1条数据
+
+    OP_CORSSCURSOR_DATA_START:21,   //所有数据的第1条数据
+    OP_CORSSCURSOR_DATA_END:22,     //所有数据的最后1条数据
 }
 
 var JSCHART_DRAG_ID=
@@ -7783,6 +7800,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 break;
             case 13:    //回车
+            case 35:    //END
+            case 36:    //HOME
                 if (this.OnCustomKeyDown) this.OnCustomKeyDown(keyID, e);
                 break;
             default:
@@ -27235,6 +27254,8 @@ function ChartKLine()
         LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
     }
 
+    this.LastPoint={ };  //最后一个点的信息 {X, Y, KItem:, Date:, Time: }
+
     this.AddToDaySummary=function(kItem)
     {
         if (!this.DaySummary.Enable) return false;
@@ -27738,6 +27759,8 @@ function ChartKLine()
             if (i==this.Data.Data.length-1)
             {
                 ptLast={ X:x, Y:yClose, XLeft:left, XRight:right, KItem:data, ChartRight:chartright };
+
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
             }
 
             if (this.PriceGap.Enable )
@@ -27871,6 +27894,11 @@ function ChartKLine()
 
             prePoint={ X:x, Y:yClose};
 
+            if (i==this.Data.Data.length-1) //最后一个点
+            {
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
+            }
+
             if (this.PriceGap.Enable)
             {
                 var yLow=this.GetYFromData(data.Low, false);
@@ -29834,8 +29862,29 @@ function ChartKLine()
         this.Canvas.clip();
     }
 
+    this.ClearLastPoint=function()
+    {
+        this.LastPoint={ };
+        if (this.ChartFrame.GlobalOption)
+        {
+            var item=this.ChartFrame.GlobalOption;
+            item.LatestPoint=null;
+        }
+    }
+
+    this.UpdateGlobalLatestPoint=function()
+    {
+        if (this.Identify!="Main-KLine") return;
+        if (!this.ChartFrame.GlobalOption) return;
+
+        var item=this.ChartFrame.GlobalOption;
+        if (IFrameSplitOperator.IsNumber(this.LastPoint.X) && IFrameSplitOperator.IsNumber(this.LastPoint.Y))
+            item.LatestPoint={ X:this.LastPoint.X, Y:this.LastPoint.Y };
+    }
+
     this.Draw=function()
     {
+        this.ClearLastPoint();
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -29892,6 +29941,7 @@ function ChartKLine()
             this.Canvas.restore();
             this.DrawPredictionLine();
             if (this.PriceGap.Enable) this.DrawPriceGap();
+            this.UpdateGlobalLatestPoint();
             return;
         }
         else if (this.DrawType==2)
@@ -29963,6 +30013,8 @@ function ChartKLine()
 
         this.Canvas.restore();
 
+        this.UpdateGlobalLatestPoint();
+
         this.DrawPredictionLine();
         if (this.PriceGap.Enable) this.DrawPriceGap();
 
@@ -52066,6 +52118,7 @@ function LatestPointFlashPaint()
     this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
     this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+    this.Style=1;   //0=默认配置 1=图形保持一致
     this.FlashCanvas;
 
     this.SetOption=function(option)
@@ -52090,6 +52143,23 @@ function LatestPointFlashPaint()
         this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     }
 
+    this.GetChartColor=function()
+    {
+        var chart=this.HQChart.ChartPaint[0];
+        if (!chart) return;
+
+        if (chart.ClassName=="ChartKLine")
+        {
+            this.PointColor=chart.CloseLineColor;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.CloseLineColor, 0.6);
+        }
+        else if (chart.ClassName=="ChartMinutePriceLine")
+        {
+            this.PointColor=chart.Color;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.Color, 0.6);
+        }
+    }
+
     this.Draw=function()
     {
         if (!this.FlashCanvas) return;
@@ -52108,6 +52178,8 @@ function LatestPointFlashPaint()
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        if (this.Style==1) this.GetChartColor();
+
         this.FlashCanvas.fillStyle=this.BGColor;
         this.FlashCanvas.beginPath();
         this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);
@@ -80103,6 +80175,80 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 return true;
             }
         }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START)     //当前屏第1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var startIndex=kData.DataOffset;
+            var kItem=kData.Data[startIndex];
+            this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END)   //当前屏最后1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var endIndex=kData.DataOffset+showCount-1;
+            if (endIndex>=kData.Data.length) endIndex=kData.Data.length-1;
+            var kItem=kData.Data[endIndex];
+            var index=endIndex-kData.DataOffset;
+            this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var kItem=kData.Data[0];
+
+            if (kData.DataOffset!=0)
+            {
+                kData.DataOffset=0
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+            else
+            {
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+
+            var kItem=kData.Data[kData.Data.length-1];
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var dataOffset=kData.Data.length-showCount;
+
+            if (kData.DataOffset<dataOffset)
+            {
+                kData.DataOffset=dataOffset;
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+            else
+            {
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+
+            return true;
+        }
     }
 
     
@@ -80463,6 +80609,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     //Alt+W	区间统计
     //Alt+数字	切换多个窗口
     //Ctrl+I
+    //HOME / END 当前屏 第1条 最后一条
+    //Ctrl+HOME / Ctrl+END 第1条 最后一条
     this.OnCustomKeyDown=function(keyID, e) //自定义键盘事件
     {
         if (keyID==37 && e.ctrlKey) //Ctrl+Left
@@ -80499,6 +80647,26 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             this.OnEnterKeyDown();
         }
+        else if (keyID==36) //HOME  第1条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START };    //所有数据的第1条数据   
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START };
+                
+            if (option) this.ChartOperator(option);
+        }
+        else if (keyID==35) //END   最后一条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END };  //所有数据的最后1条数据
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END };
+
+            if (option) this.ChartOperator(option);
+        }
         else
         {
             return false;
@@ -82226,6 +82394,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             if (!bFind) return;
         }
+
+        if (data.LatestPointFlash)  //最新数据闪烁
+        {
+            var item=data.LatestPointFlash;
+            if (IFrameSplitOperator.IsNumber(item.FlashCount))
+                this.SetLatestPointFlash(item.FlashCount)
+        }
         
         var bindData=new ChartData();
         bindData.Data=this.SourceData.Data;

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

@@ -4883,6 +4883,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         
         this.AdjustTitleHeight(chart);
 
+        if (option.LatestPointFlash)
+        {
+            var item=option.LatestPointFlash;
+            if (item.Enable)
+            {
+                this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey, { ZIndex:6 });
+                chart.CreateExtendChart("LatestPointFlashPaint", item);
+                chart.StartLatestPointFlash();
+            }
+        }
+
         return chart;
     }
 
@@ -6930,6 +6941,12 @@ var JSCHART_OPERATOR_ID=
     OP_GOTO_BY_DATAINDEX:17,   //的移动到某一个数据起始位置
 
     OP_MOVE_CORSSCURSOR:18,       //移动十字光标 { Step, Start:{ Date:, Time: } }
+
+    OP_CORSSCURSOR_PAGE_START:19,   //当前屏第1条数据
+    OP_CORSSCURSOR_PAGE_END:20,     //当前屏最后1条数据
+
+    OP_CORSSCURSOR_DATA_START:21,   //所有数据的第1条数据
+    OP_CORSSCURSOR_DATA_END:22,     //所有数据的最后1条数据
 }
 
 var JSCHART_DRAG_ID=
@@ -11879,6 +11896,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 break;
             case 13:    //回车
+            case 35:    //END
+            case 36:    //HOME
                 if (this.OnCustomKeyDown) this.OnCustomKeyDown(keyID, e);
                 break;
             default:
@@ -31331,6 +31350,8 @@ function ChartKLine()
         LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
     }
 
+    this.LastPoint={ };  //最后一个点的信息 {X, Y, KItem:, Date:, Time: }
+
     this.AddToDaySummary=function(kItem)
     {
         if (!this.DaySummary.Enable) return false;
@@ -31834,6 +31855,8 @@ function ChartKLine()
             if (i==this.Data.Data.length-1)
             {
                 ptLast={ X:x, Y:yClose, XLeft:left, XRight:right, KItem:data, ChartRight:chartright };
+
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
             }
 
             if (this.PriceGap.Enable )
@@ -31967,6 +31990,11 @@ function ChartKLine()
 
             prePoint={ X:x, Y:yClose};
 
+            if (i==this.Data.Data.length-1) //最后一个点
+            {
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
+            }
+
             if (this.PriceGap.Enable)
             {
                 var yLow=this.GetYFromData(data.Low, false);
@@ -33930,8 +33958,29 @@ function ChartKLine()
         this.Canvas.clip();
     }
 
+    this.ClearLastPoint=function()
+    {
+        this.LastPoint={ };
+        if (this.ChartFrame.GlobalOption)
+        {
+            var item=this.ChartFrame.GlobalOption;
+            item.LatestPoint=null;
+        }
+    }
+
+    this.UpdateGlobalLatestPoint=function()
+    {
+        if (this.Identify!="Main-KLine") return;
+        if (!this.ChartFrame.GlobalOption) return;
+
+        var item=this.ChartFrame.GlobalOption;
+        if (IFrameSplitOperator.IsNumber(this.LastPoint.X) && IFrameSplitOperator.IsNumber(this.LastPoint.Y))
+            item.LatestPoint={ X:this.LastPoint.X, Y:this.LastPoint.Y };
+    }
+
     this.Draw=function()
     {
+        this.ClearLastPoint();
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -33988,6 +34037,7 @@ function ChartKLine()
             this.Canvas.restore();
             this.DrawPredictionLine();
             if (this.PriceGap.Enable) this.DrawPriceGap();
+            this.UpdateGlobalLatestPoint();
             return;
         }
         else if (this.DrawType==2)
@@ -34059,6 +34109,8 @@ function ChartKLine()
 
         this.Canvas.restore();
 
+        this.UpdateGlobalLatestPoint();
+
         this.DrawPredictionLine();
         if (this.PriceGap.Enable) this.DrawPriceGap();
 
@@ -56162,6 +56214,7 @@ function LatestPointFlashPaint()
     this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
     this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+    this.Style=1;   //0=默认配置 1=图形保持一致
     this.FlashCanvas;
 
     this.SetOption=function(option)
@@ -56186,6 +56239,23 @@ function LatestPointFlashPaint()
         this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     }
 
+    this.GetChartColor=function()
+    {
+        var chart=this.HQChart.ChartPaint[0];
+        if (!chart) return;
+
+        if (chart.ClassName=="ChartKLine")
+        {
+            this.PointColor=chart.CloseLineColor;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.CloseLineColor, 0.6);
+        }
+        else if (chart.ClassName=="ChartMinutePriceLine")
+        {
+            this.PointColor=chart.Color;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.Color, 0.6);
+        }
+    }
+
     this.Draw=function()
     {
         if (!this.FlashCanvas) return;
@@ -56204,6 +56274,8 @@ function LatestPointFlashPaint()
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        if (this.Style==1) this.GetChartColor();
+
         this.FlashCanvas.fillStyle=this.BGColor;
         this.FlashCanvas.beginPath();
         this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);
@@ -84199,6 +84271,80 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 return true;
             }
         }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START)     //当前屏第1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var startIndex=kData.DataOffset;
+            var kItem=kData.Data[startIndex];
+            this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END)   //当前屏最后1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var endIndex=kData.DataOffset+showCount-1;
+            if (endIndex>=kData.Data.length) endIndex=kData.Data.length-1;
+            var kItem=kData.Data[endIndex];
+            var index=endIndex-kData.DataOffset;
+            this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var kItem=kData.Data[0];
+
+            if (kData.DataOffset!=0)
+            {
+                kData.DataOffset=0
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+            else
+            {
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+
+            var kItem=kData.Data[kData.Data.length-1];
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var dataOffset=kData.Data.length-showCount;
+
+            if (kData.DataOffset<dataOffset)
+            {
+                kData.DataOffset=dataOffset;
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+            else
+            {
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+
+            return true;
+        }
     }
 
     
@@ -84559,6 +84705,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     //Alt+W	区间统计
     //Alt+数字	切换多个窗口
     //Ctrl+I
+    //HOME / END 当前屏 第1条 最后一条
+    //Ctrl+HOME / Ctrl+END 第1条 最后一条
     this.OnCustomKeyDown=function(keyID, e) //自定义键盘事件
     {
         if (keyID==37 && e.ctrlKey) //Ctrl+Left
@@ -84595,6 +84743,26 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             this.OnEnterKeyDown();
         }
+        else if (keyID==36) //HOME  第1条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START };    //所有数据的第1条数据   
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START };
+                
+            if (option) this.ChartOperator(option);
+        }
+        else if (keyID==35) //END   最后一条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END };  //所有数据的最后1条数据
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END };
+
+            if (option) this.ChartOperator(option);
+        }
         else
         {
             return false;
@@ -86322,6 +86490,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             if (!bFind) return;
         }
+
+        if (data.LatestPointFlash)  //最新数据闪烁
+        {
+            var item=data.LatestPointFlash;
+            if (IFrameSplitOperator.IsNumber(item.FlashCount))
+                this.SetLatestPointFlash(item.FlashCount)
+        }
         
         var bindData=new ChartData();
         bindData.Data=this.SourceData.Data;
@@ -136583,7 +136758,7 @@ function ChartDealList()
         if ( this.SelectedStyle==1)
         {
             this.Canvas.fillStyle=this.SelectedConfig.BGColor;
-            this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+            this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1, rtRow.Width-2, rtRow.Height-2);
         }
        
         return true;
@@ -150093,7 +150268,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14850";
+var HQCHART_VERSION="1.1.14854";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -4927,6 +4927,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         
         this.AdjustTitleHeight(chart);
 
+        if (option.LatestPointFlash)
+        {
+            var item=option.LatestPointFlash;
+            if (item.Enable)
+            {
+                this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey, { ZIndex:6 });
+                chart.CreateExtendChart("LatestPointFlashPaint", item);
+                chart.StartLatestPointFlash();
+            }
+        }
+
         return chart;
     }
 
@@ -6974,6 +6985,12 @@ var JSCHART_OPERATOR_ID=
     OP_GOTO_BY_DATAINDEX:17,   //的移动到某一个数据起始位置
 
     OP_MOVE_CORSSCURSOR:18,       //移动十字光标 { Step, Start:{ Date:, Time: } }
+
+    OP_CORSSCURSOR_PAGE_START:19,   //当前屏第1条数据
+    OP_CORSSCURSOR_PAGE_END:20,     //当前屏最后1条数据
+
+    OP_CORSSCURSOR_DATA_START:21,   //所有数据的第1条数据
+    OP_CORSSCURSOR_DATA_END:22,     //所有数据的最后1条数据
 }
 
 var JSCHART_DRAG_ID=
@@ -11923,6 +11940,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 break;
             case 13:    //回车
+            case 35:    //END
+            case 36:    //HOME
                 if (this.OnCustomKeyDown) this.OnCustomKeyDown(keyID, e);
                 break;
             default:
@@ -31375,6 +31394,8 @@ function ChartKLine()
         LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
     }
 
+    this.LastPoint={ };  //最后一个点的信息 {X, Y, KItem:, Date:, Time: }
+
     this.AddToDaySummary=function(kItem)
     {
         if (!this.DaySummary.Enable) return false;
@@ -31878,6 +31899,8 @@ function ChartKLine()
             if (i==this.Data.Data.length-1)
             {
                 ptLast={ X:x, Y:yClose, XLeft:left, XRight:right, KItem:data, ChartRight:chartright };
+
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
             }
 
             if (this.PriceGap.Enable )
@@ -32011,6 +32034,11 @@ function ChartKLine()
 
             prePoint={ X:x, Y:yClose};
 
+            if (i==this.Data.Data.length-1) //最后一个点
+            {
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
+            }
+
             if (this.PriceGap.Enable)
             {
                 var yLow=this.GetYFromData(data.Low, false);
@@ -33974,8 +34002,29 @@ function ChartKLine()
         this.Canvas.clip();
     }
 
+    this.ClearLastPoint=function()
+    {
+        this.LastPoint={ };
+        if (this.ChartFrame.GlobalOption)
+        {
+            var item=this.ChartFrame.GlobalOption;
+            item.LatestPoint=null;
+        }
+    }
+
+    this.UpdateGlobalLatestPoint=function()
+    {
+        if (this.Identify!="Main-KLine") return;
+        if (!this.ChartFrame.GlobalOption) return;
+
+        var item=this.ChartFrame.GlobalOption;
+        if (IFrameSplitOperator.IsNumber(this.LastPoint.X) && IFrameSplitOperator.IsNumber(this.LastPoint.Y))
+            item.LatestPoint={ X:this.LastPoint.X, Y:this.LastPoint.Y };
+    }
+
     this.Draw=function()
     {
+        this.ClearLastPoint();
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -34032,6 +34081,7 @@ function ChartKLine()
             this.Canvas.restore();
             this.DrawPredictionLine();
             if (this.PriceGap.Enable) this.DrawPriceGap();
+            this.UpdateGlobalLatestPoint();
             return;
         }
         else if (this.DrawType==2)
@@ -34103,6 +34153,8 @@ function ChartKLine()
 
         this.Canvas.restore();
 
+        this.UpdateGlobalLatestPoint();
+
         this.DrawPredictionLine();
         if (this.PriceGap.Enable) this.DrawPriceGap();
 
@@ -56206,6 +56258,7 @@ function LatestPointFlashPaint()
     this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
     this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+    this.Style=1;   //0=默认配置 1=图形保持一致
     this.FlashCanvas;
 
     this.SetOption=function(option)
@@ -56230,6 +56283,23 @@ function LatestPointFlashPaint()
         this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     }
 
+    this.GetChartColor=function()
+    {
+        var chart=this.HQChart.ChartPaint[0];
+        if (!chart) return;
+
+        if (chart.ClassName=="ChartKLine")
+        {
+            this.PointColor=chart.CloseLineColor;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.CloseLineColor, 0.6);
+        }
+        else if (chart.ClassName=="ChartMinutePriceLine")
+        {
+            this.PointColor=chart.Color;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.Color, 0.6);
+        }
+    }
+
     this.Draw=function()
     {
         if (!this.FlashCanvas) return;
@@ -56248,6 +56318,8 @@ function LatestPointFlashPaint()
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        if (this.Style==1) this.GetChartColor();
+
         this.FlashCanvas.fillStyle=this.BGColor;
         this.FlashCanvas.beginPath();
         this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);
@@ -84243,6 +84315,80 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 return true;
             }
         }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START)     //当前屏第1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var startIndex=kData.DataOffset;
+            var kItem=kData.Data[startIndex];
+            this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END)   //当前屏最后1条数据
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var endIndex=kData.DataOffset+showCount-1;
+            if (endIndex>=kData.Data.length) endIndex=kData.Data.length-1;
+            var kItem=kData.Data[endIndex];
+            var index=endIndex-kData.DataOffset;
+            this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+            var kItem=kData.Data[0];
+
+            if (kData.DataOffset!=0)
+            {
+                kData.DataOffset=0
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+            else
+            {
+                this.ChartOperator_Temp_SetChartCorssCursor(0, kItem);
+            }
+
+            return true;
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END)
+        {
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
+
+            var kItem=kData.Data[kData.Data.length-1];
+            if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
+            var dataOffset=kData.Data.length-showCount;
+
+            if (kData.DataOffset<dataOffset)
+            {
+                kData.DataOffset=dataOffset;
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+            else
+            {
+                var index=kData.Data.length-kData.DataOffset-1;
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+
+            return true;
+        }
     }
 
     
@@ -84603,6 +84749,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     //Alt+W	区间统计
     //Alt+数字	切换多个窗口
     //Ctrl+I
+    //HOME / END 当前屏 第1条 最后一条
+    //Ctrl+HOME / Ctrl+END 第1条 最后一条
     this.OnCustomKeyDown=function(keyID, e) //自定义键盘事件
     {
         if (keyID==37 && e.ctrlKey) //Ctrl+Left
@@ -84639,6 +84787,26 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             this.OnEnterKeyDown();
         }
+        else if (keyID==36) //HOME  第1条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_START };    //所有数据的第1条数据   
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_START };
+                
+            if (option) this.ChartOperator(option);
+        }
+        else if (keyID==35) //END   最后一条
+        {
+            var option=null;
+            if (e.ctrlKey)
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_DATA_END };  //所有数据的最后1条数据
+            else
+                option={ ID:JSCHART_OPERATOR_ID.OP_CORSSCURSOR_PAGE_END };
+
+            if (option) this.ChartOperator(option);
+        }
         else
         {
             return false;
@@ -86366,6 +86534,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             if (!bFind) return;
         }
+
+        if (data.LatestPointFlash)  //最新数据闪烁
+        {
+            var item=data.LatestPointFlash;
+            if (IFrameSplitOperator.IsNumber(item.FlashCount))
+                this.SetLatestPointFlash(item.FlashCount)
+        }
         
         var bindData=new ChartData();
         bindData.Data=this.SourceData.Data;
@@ -136627,7 +136802,7 @@ function ChartDealList()
         if ( this.SelectedStyle==1)
         {
             this.Canvas.fillStyle=this.SelectedConfig.BGColor;
-            this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+            this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1, rtRow.Width-2, rtRow.Height-2);
         }
        
         return true;
@@ -161133,7 +161308,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14850";
+var HQCHART_VERSION="1.1.14854";
 
 function PrintHQChartVersion()
 {