hqchart 1.1.12786 → 1.1.12790

package/lib/umychart.vue.js

@@ -8028,11 +8028,11 @@ this.Frame.SetSizeChage(true);this.Draw();this.BindAllOverlayIndexData(this.Sour
 if(limitData&&limitData.max>0&&limitData.min>0)//API里带涨停价格 直接使用
 {this.LimitPrice={Max:limitData.max,Min:limitData.min};return;}var range=MARKET_SUFFIX_NAME.GetLimitPriceRange(this.Symbol,this.Name);//通过规则获取涨停价格
 if(!range){JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' no limit price.');return;}//var yClose=data.stock[0].yclose;
-if(yClose<=0)return;this.LimitPrice={Max:yClose*(1+range.Max),Min:yClose*(1+range.Min)};JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' yClose:'+yClose+' max:'+this.LimitPrice.Max+' min:'+this.LimitPrice.Min);this.LimitPrice.Max=parseFloat(this.LimitPrice.Max.toFixed(2));this.LimitPrice.Min=parseFloat(this.LimitPrice.Min.toFixed(2));JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' tofixed(2) max:'+this.LimitPrice.Max+' min:'+this.LimitPrice.Min);};this.RequestSingleOverlayMinuteData=function(symbol,date,item){item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayMinuteData',//类名::函数名
-Explain:'叠加股票最新分时数据',Request:{Url:this.HistoryMinuteApiUrl,Data:{days:[date],symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;this.RecvOverlayMinuteData(data,item);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
+if(yClose<=0)return;this.LimitPrice={Max:yClose*(1+range.Max),Min:yClose*(1+range.Min)};JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' yClose:'+yClose+' max:'+this.LimitPrice.Max+' min:'+this.LimitPrice.Min);this.LimitPrice.Max=parseFloat(this.LimitPrice.Max.toFixed(2));this.LimitPrice.Min=parseFloat(this.LimitPrice.Min.toFixed(2));JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' tofixed(2) max:'+this.LimitPrice.Max+' min:'+this.LimitPrice.Min);};this.RequestSingleOverlayMinuteData=function(symbol,date,item){var self=this;item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayMinuteData',//类名::函数名
+Explain:'叠加股票最新分时数据',Request:{Url:this.HistoryMinuteApiUrl,Data:{days:[date],symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;self.RecvOverlayMinuteData(data,item);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
 }//请求数据
 JSNetwork.HttpRequest({url:this.HistoryMinuteApiUrl,data:{"symbol":symbol,"days":[date]},type:"post",dataType:"json",async:true,success:function success(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;//self.RecvMultiOverlayMinuteData([data]);
-this.RecvOverlayMinuteData(data,item);}});};//请求叠加数据 (主数据下载完再下载))
+self.RecvOverlayMinuteData(data,item);}});};//请求叠加数据 (主数据下载完再下载))
 this.RequestOverlayMinuteData=function(){var self=this;var date=this.TradeDate;//最后一个交易日期
 for(var i=0;i<this.OverlayChartPaint.length;++i){var _item10=this.OverlayChartPaint[i];if(!_item10.MainData)continue;if(_item10.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID)continue;var symbol=_item10.Symbol;if(!symbol)continue;this.RequestSingleOverlayMinuteData(symbol,date,_item10);/*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
@@ -8078,9 +8078,9 @@ for(var i=0;i<this.OverlayChartPaint.length;++i){var _item10=this.OverlayChartPa
 this.RecvMultiOverlayMinuteData=function(aryData){if(!IFrameSplitOperator.IsNonEmptyArray(aryData))return;var bUpdate=false;for(var i=0;i<aryData.length;++i){var overlayData=aryData[i];if(!overlayData.symbol)continue;for(var j=0;j<this.OverlayChartPaint.length;++j){var item=this.OverlayChartPaint[j];if(!item.MainData)continue;if(overlayData.symbol==item.Symbol){this.RecvOverlayMinuteData(overlayData,item,{Redraw:false});bUpdate=true;break;}}}if(bUpdate){this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.Draw();}};this.RecvOverlayMinuteData=function(data,paint,option){if(paint.IsDelete)return;if(this.EnableVerifyRecvData&&data.symbol!=paint.Symbol){JSConsole.Chart.Warn('[MinuteChartContainer::RecvOverlayMinuteData] recv data symbol not match. paint['+paint.Symbol+'] , Recv['+data.symbol+']');return;}var aryMinuteData=MinuteChartContainer.JsonDataToMinuteDataArray(data);var sourceData=null;var yClose;if(this.DayCount>1)//多日数据
 {if(aryMinuteData.length<=0)return;var minuteData=aryMinuteData[0];for(var i in paint.SourceData){var item=paint.SourceData[i];if(item.Date==minuteData.Date){paint.SourceData[i]=minuteData;var allMinuteData=this.HistoryMinuteDataToArray(paint.SourceData);var sourceData=new ChartData();sourceData.Data=allMinuteData;yClose=minuteData.YClose;break;}}if(sourceData==null)return;}else{if(aryMinuteData.length>0)sourceData=aryMinuteData[0];else sourceData=new ChartData();yClose=sourceData.YClose;}paint.Data=sourceData;paint.Title=data.name;paint.Symbol=data.symbol;paint.YClose=yClose;paint.Status=OVERLAY_STATUS_ID.STATUS_FINISHED_ID;var bRedraw=true;if(option&&option.Redraw==false)bRedraw=false;if(bRedraw){this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.Frame.SetSizeChage(true);this.Draw();}};this.RequestSingleOverlayHistoryMinuteData=function(symbol,days,item){item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData',//类名::函数名
-Explain:'叠加股票多日分时数据',Request:{Url:this.HistoryMinuteApiUrl,Data:{days:days,symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;this.RecvOverlayHistoryMinuteData(data,item);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
-}JSNetwork.HttpRequest({url:this.HistoryMinuteApiUrl,data:{"symbol":symbol,"days":days},type:"post",dataType:"json",async:true,success:function success(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;this.RecvOverlayHistoryMinuteData(data,item);}});};this.RequestOverlayHistoryMinuteData=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var self=this;var days=[];for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];days.push(item.Date);}if(days.length<=0)return;for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];var symbol=item.Symbol;if(!symbol)continue;if(item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID)continue;this.RequestSingleOverlayHistoryMinuteData(symbol,days,item);/*
+this.Frame.SetSizeChage(true);this.Draw();}};this.RequestSingleOverlayHistoryMinuteData=function(symbol,days,item){var self=this;item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData',//类名::函数名
+Explain:'叠加股票多日分时数据',Request:{Url:self.HistoryMinuteApiUrl,Data:{days:days,symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;self.RecvOverlayHistoryMinuteData(data,item);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
+}JSNetwork.HttpRequest({url:self.HistoryMinuteApiUrl,data:{"symbol":symbol,"days":days},type:"post",dataType:"json",async:true,success:function success(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;self.RecvOverlayHistoryMinuteData(data,item);}});};this.RequestOverlayHistoryMinuteData=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var self=this;var days=[];for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];days.push(item.Date);}if(days.length<=0)return;for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];var symbol=item.Symbol;if(!symbol)continue;if(item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID)continue;this.RequestSingleOverlayHistoryMinuteData(symbol,days,item);/*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -12974,7 +12974,8 @@ this.ClassName='SliderChart';//类名
 this.OffsetData;this.Color=g_JSChartResource.ScrollBar.Slider.BarAreaColor;this.BarColor=g_JSChartResource.ScrollBar.Slider.BarColor;this.BarWidth=10;this.BarPadding=10;//上下留白
 this.DateFont=g_JSChartResource.ScrollBar.Slider.DateFont;this.DateColor=g_JSChartResource.ScrollBar.Slider.DateColor;this.AryRect=[];//[{ Rect:{Left, Top, Right:, Bottom:, Width, Height:}, Type:0中间 1=左 2=右 }]
 this.XStart;this.XEnd;this.SizeChange=true;this.DragMode=false;this.ReloadResource=function(resource){this.Color=g_JSChartResource.ScrollBar.Slider.BarAreaColor;this.BarColor=g_JSChartResource.ScrollBar.Slider.BarColor;this.DateFont=g_JSChartResource.ScrollBar.Slider.DateFont;this.DateColor=g_JSChartResource.ScrollBar.Slider.DateColor;};this.Draw=function(){this.AryRect=[];if(!this.OffsetData||!IFrameSplitOperator.IsPlusNumber(this.OffsetData.Count))return;if(!IFrameSplitOperator.IsNumber(this.OffsetData.Start)||!IFrameSplitOperator.IsNumber(this.OffsetData.End))return;var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();var startData,endData;if(this.DragMode){var xStart=this.XStart;var xEnd=this.XEnd;var startIndex=this.ChartFrame.GetXData(xStart);var endIndx=this.ChartFrame.GetXData(xEnd);startIndex=parseInt(startIndex);endIndx=parseInt(endIndx);startData={Data:this.Data.Data[this.OffsetData.Start],X:xStart,Type:startIndex<endIndx?0:1};endData={Data:this.Data.Data[this.OffsetData.End],X:xEnd,Type:endIndx>startIndex?1:0};}else{var start=this.OffsetData.Start,end=this.OffsetData.End;var xStart=this.ChartFrame.GetXFromIndex(start);var xEnd=this.ChartFrame.GetXFromIndex(end);this.XStart=xStart;this.XEnd=xEnd;startData={Data:this.Data.Data[this.OffsetData.Start],X:xStart,Type:xStart<xEnd?0:1};endData={Data:this.Data.Data[this.OffsetData.End],X:xEnd,Type:xEnd>xStart?1:0};}this.Canvas.fillStyle=this.Color;var rtBar={Left:Math.min(xStart,xEnd),Top:top,Width:Math.abs(xEnd-xStart),Height:bottom-top};rtBar.Right=rtBar.Left+rtBar.Width;rtBar.Bottom=rtBar.Top+rtBar.Height;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.AryRect.push({Rect:rtBar,Type:0});//左右拖拽块
-var pixelRatio=GetDevicePixelRatio();var barWidth=this.BarWidth*pixelRatio;var barHeight=bottom-top-this.BarPadding*2*pixelRatio;var xBar=xStart-this.BarWidth/2;var yBar=top+this.BarPadding*pixelRatio;this.Canvas.fillStyle=this.BarColor;var rtBar={Left:xBar,Top:yBar,Width:barWidth,Height:barHeight};rtBar.Right=rtBar.Left+rtBar.Width;rtBar.Bottom=rtBar.Top+rtBar.Height;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.AryRect.push({Rect:rtBar,Type:1});var xBar=xEnd-this.BarWidth/2;var rtBar={Left:xBar,Top:yBar,Width:barWidth,Height:barHeight};rtBar.Right=rtBar.Left+rtBar.Width;rtBar.Bottom=rtBar.Top+rtBar.Height;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.AryRect.push({Rect:rtBar,Type:2});this.DrawDateTime(startData);this.DrawDateTime(endData);};this.DrawDateTime=function(data){if(!data||!data.Data)return;var text=IFrameSplitOperator.FormatDateString(data.Data.Date);var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();var timeText=null;if(ChartData.IsMilliSecondPeriod(this.Data.Period)){var time=parseInt(data.Data.Time/1000);text=IFrameSplitOperator.FormatTimeString(time,"HH:MM:SS");}else if(ChartData.IsMinutePeriod(this.Data.Period,true)){timeText=IFrameSplitOperator.FormatTimeString(data.Data.Time,"HH:MM");}if(data.Type==0){this.Canvas.textAlign="right";var x=data.X-this.BarWidth/2;}else if(data.Type==1){this.Canvas.textAlign="left";var x=data.X+this.BarWidth/2;}this.Canvas.font=this.DateFont;var fontHeight=this.Canvas.measureText("擎").width;this.Canvas.textBaseline="middle";this.Canvas.fillStyle=this.DateColor;var yText=top+(bottom-top)/2;this.Canvas.fillText(text,x,yText);if(timeText){yText+=fontHeight;this.Canvas.fillText(timeText,x,yText);}};this.PtInChart=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryRect))return null;for(var i=this.AryRect.length-1;i>=0;--i){var item=this.AryRect[i];var rt=item.Rect;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Data:item};}}return null;};}///////////////////////////////////////////////////////////////////////////////////////////////
+var pixelRatio=GetDevicePixelRatio();var barWidth=this.BarWidth*pixelRatio;var barHeight=bottom-top-this.BarPadding*2*pixelRatio;var xBar=xStart-this.BarWidth/2;var yBar=top+this.BarPadding*pixelRatio;this.Canvas.fillStyle=this.BarColor;var rtBar={Left:xBar,Top:yBar,Width:barWidth,Height:barHeight};rtBar.Right=rtBar.Left+rtBar.Width;rtBar.Bottom=rtBar.Top+rtBar.Height;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.AryRect.push({Rect:rtBar,Type:1});var xBar=xEnd-this.BarWidth/2;var rtBar={Left:xBar,Top:yBar,Width:barWidth,Height:barHeight};rtBar.Right=rtBar.Left+rtBar.Width;rtBar.Bottom=rtBar.Top+rtBar.Height;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.AryRect.push({Rect:rtBar,Type:2});//最右边可能是空白区 要处理下
+if(endData.Type==1){var dataIndex=this.OffsetData.End;if(dataIndex>=this.Data.Data.length)endData.Data=this.Data.Data[this.Data.Data.length-1];}this.DrawDateTime(startData);this.DrawDateTime(endData);};this.DrawDateTime=function(data){if(!data||!data.Data)return;var text=IFrameSplitOperator.FormatDateString(data.Data.Date);var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();var timeText=null;if(ChartData.IsMilliSecondPeriod(this.Data.Period)){var time=parseInt(data.Data.Time/1000);text=IFrameSplitOperator.FormatTimeString(time,"HH:MM:SS");}else if(ChartData.IsMinutePeriod(this.Data.Period,true)){timeText=IFrameSplitOperator.FormatTimeString(data.Data.Time,"HH:MM");}if(data.Type==0){this.Canvas.textAlign="right";var x=data.X-this.BarWidth/2;}else if(data.Type==1){this.Canvas.textAlign="left";var x=data.X+this.BarWidth/2;}this.Canvas.font=this.DateFont;var fontHeight=this.Canvas.measureText("擎").width;this.Canvas.textBaseline="middle";this.Canvas.fillStyle=this.DateColor;var yText=top+(bottom-top)/2;this.Canvas.fillText(text,x,yText);if(timeText){yText+=fontHeight;this.Canvas.fillText(timeText,x,yText);}};this.PtInChart=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryRect))return null;for(var i=this.AryRect.length-1;i>=0;--i){var item=this.AryRect[i];var rt=item.Rect;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Data:item};}}return null;};}///////////////////////////////////////////////////////////////////////////////////////////////
 // 滚动条K线背景色
 //
 //
@@ -13002,7 +13003,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.12785";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12789";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.12786",
+  "version": "1.1.12790",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -76293,6 +76293,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayMinuteData=function(symbol, date, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -76308,7 +76309,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
@@ -76329,7 +76330,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
                 //self.RecvMultiOverlayMinuteData([data]);
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             }
         });
     }
@@ -76485,6 +76486,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -76493,21 +76495,21 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
                 Explain:'叠加股票多日分时数据',
-                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
         JSNetwork.HttpRequest({
-            url: this.HistoryMinuteApiUrl,
+            url: self.HistoryMinuteApiUrl,
             data:{ "symbol": symbol, "days": days },
             type:"post",
             dataType: "json",
@@ -76515,7 +76517,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             success: function (data)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             }
         });
     }

package/src/jscommon/umychart.scrollbar.js

@@ -1175,6 +1175,13 @@ function SliderChart()
         this.Canvas.fillRect(rtBar.Left, rtBar.Top, rtBar.Width, rtBar.Height);
         this.AryRect.push({ Rect:rtBar, Type:2});
 
+        //最右边可能是空白区 要处理下
+        if (endData.Type==1)
+        {
+            var dataIndex=this.OffsetData.End;
+            if (dataIndex>=this.Data.Data.length) endData.Data=this.Data.Data[this.Data.Data.length-1];
+        }
+
         this.DrawDateTime(startData);
         this.DrawDateTime(endData);
     }

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

@@ -80437,6 +80437,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayMinuteData=function(symbol, date, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -80452,7 +80453,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
@@ -80473,7 +80474,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
                 //self.RecvMultiOverlayMinuteData([data]);
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             }
         });
     }
@@ -80629,6 +80630,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -80637,21 +80639,21 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
                 Explain:'叠加股票多日分时数据',
-                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
         JSNetwork.HttpRequest({
-            url: this.HistoryMinuteApiUrl,
+            url: self.HistoryMinuteApiUrl,
             data:{ "symbol": symbol, "days": days },
             type:"post",
             dataType: "json",
@@ -80659,7 +80661,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             success: function (data)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             }
         });
     }
@@ -131312,6 +131314,13 @@ function SliderChart()
         this.Canvas.fillRect(rtBar.Left, rtBar.Top, rtBar.Width, rtBar.Height);
         this.AryRect.push({ Rect:rtBar, Type:2});
 
+        //最右边可能是空白区 要处理下
+        if (endData.Type==1)
+        {
+            var dataIndex=this.OffsetData.End;
+            if (dataIndex>=this.Data.Data.length) endData.Data=this.Data.Data[this.Data.Data.length-1];
+        }
+
         this.DrawDateTime(startData);
         this.DrawDateTime(endData);
     }
@@ -131487,7 +131496,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12785";
+var HQCHART_VERSION="1.1.12789";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -80481,6 +80481,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayMinuteData=function(symbol, date, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -80496,7 +80497,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
@@ -80517,7 +80518,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
                 //self.RecvMultiOverlayMinuteData([data]);
-                this.RecvOverlayMinuteData(data,item);
+                self.RecvOverlayMinuteData(data,item);
             }
         });
     }
@@ -80673,6 +80674,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
     {
+        var self = this;
         item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
         if (this.NetworkFilter)
@@ -80681,21 +80683,21 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
                 Explain:'叠加股票多日分时数据',
-                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
             this.NetworkFilter(obj, function(data) 
             { 
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             });
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
         JSNetwork.HttpRequest({
-            url: this.HistoryMinuteApiUrl,
+            url: self.HistoryMinuteApiUrl,
             data:{ "symbol": symbol, "days": days },
             type:"post",
             dataType: "json",
@@ -80703,7 +80705,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             success: function (data)
             {
                 item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                this.RecvOverlayHistoryMinuteData(data,item);
+                self.RecvOverlayHistoryMinuteData(data,item);
             }
         });
     }
@@ -131356,6 +131358,13 @@ function SliderChart()
         this.Canvas.fillRect(rtBar.Left, rtBar.Top, rtBar.Width, rtBar.Height);
         this.AryRect.push({ Rect:rtBar, Type:2});
 
+        //最右边可能是空白区 要处理下
+        if (endData.Type==1)
+        {
+            var dataIndex=this.OffsetData.End;
+            if (dataIndex>=this.Data.Data.length) endData.Data=this.Data.Data[this.Data.Data.length-1];
+        }
+
         this.DrawDateTime(startData);
         this.DrawDateTime(endData);
     }
@@ -131645,7 +131654,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12785";
+var HQCHART_VERSION="1.1.12789";
 
 function PrintHQChartVersion()
 {