hqchart 1.1.12754 → 1.1.12767

package/lib/umychart.vue.js

@@ -2886,7 +2886,8 @@ if(x>=left&&x<=right&&y>bottom&&y<chartHeight)return-3;return-1;};this.PtInChart
 {for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];var left=item.Frame.ChartBorder.GetLeft();var top=item.Frame.ChartBorder.GetTopEx();var width=item.Frame.ChartBorder.GetWidth();var height=item.Frame.ChartBorder.GetHeightEx();item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(left,top,width,height);if(item.Frame.Canvas.isPointInPath(x,y)){return i;//转成整形
 }}return-1;};this.PtInButtons=function(x,y){for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(item.Height<=0)continue;var button=item.Frame.PtInButtons(x,y);if(button){button.Frame=item.Frame;button.FrameID=i;return button;}for(var j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];var overlayFrame=overlayItem.Frame;if(!overlayFrame||!overlayFrame.PtInButtons)continue;var button=overlayFrame.PtInButtons(x,y);if(button){button.IndexID=overlayItem.Identify;button.FrameID=i;button.OverlayFrame=overlayFrame;button.Frame=item.Frame;return button;}}}return null;};//是否在X轴坐标上
 this.PtInFrameBottom=function(x,y){var left=this.ChartBorder.GetLeft();var top=this.ChartBorder.GetBottom();var width=this.ChartBorder.GetWidth();var height=this.ChartBorder.Bottom;this.Canvas.beginPath();this.Canvas.rect(left,top,width,height);if(this.Canvas.isPointInPath(x,y))return true;return false;};this.PtInFrameVertical=function(x,y){for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(item.Height<=0)continue;if(!item.Frame.PtInVertical)continue;if(item.Frame.PtInVertical(x,y)){return{Frame:item.Frame};}}return null;};this.GetXFromIndex=function(index){return this.SubFrame[0].Frame.GetXFromIndex(index);};this.GetYFromData=function(value){return this.SubFrame[0].Frame.GetYFromData(value);};this.ZoomUp=function(cursorIndex){var result=this.SubFrame[0].Frame.ZoomUp(cursorIndex);this.UpdateAllFrame();return result;};this.ZoomDown=function(cursorIndex,option){var result=this.SubFrame[0].Frame.ZoomDown(cursorIndex,option);this.UpdateAllFrame();return result;};this.SetXShowCount=function(showCount){var result=this.SubFrame[0].Frame.SetXShowCount(showCount);this.UpdateAllFrame();return result;};this.XCoordinateZoom=function(step,isMoveLeft){var result=this.SubFrame[0].Frame.XCoordinateZoom(step,isMoveLeft);this.UpdateAllFrame();return result;};//设置重新计算刻度坐标
-this.ResetXYSplit=function(){for(var _i in this.SubFrame){this.SubFrame[_i].Frame.XYSplit=true;}};this.ResetXSplit=function(){for(var _i2 in this.SubFrame){this.SubFrame[_i2].Frame.XSplit=true;}};this.SetLanguage=function(languageID){for(var _i3 in this.SubFrame){var item=this.SubFrame[_i3];if(item&&item.Frame){if(item.Frame.YSplitOperator)item.Frame.YSplitOperator.LanguageID=languageID;if(item.Frame.XSplitOperator)item.Frame.XSplitOperator.LanguageID=languageID;}}};this.GetCurrentPageSize=function()//获取当前页显示的数据个数
+this.ResetXYSplit=function(){for(var _i in this.SubFrame){this.SubFrame[_i].Frame.XYSplit=true;}};this.ResetXSplit=function(){for(var _i2 in this.SubFrame){this.SubFrame[_i2].Frame.XSplit=true;}};//清空Y轴坐标的最大最小值
+this.ClearYCoordinateMaxMin=function(){for(var i=0;i<this.SubFrame.length;++i){var subItem=this.SubFrame[i];var frame=subItem.Frame;if(frame.YMaxMin){frame.YMaxMin.Max=null;frame.YMaxMin.Min=null;}}};this.SetLanguage=function(languageID){for(var _i3 in this.SubFrame){var item=this.SubFrame[_i3];if(item&&item.Frame){if(item.Frame.YSplitOperator)item.Frame.YSplitOperator.LanguageID=languageID;if(item.Frame.XSplitOperator)item.Frame.XSplitOperator.LanguageID=languageID;}}};this.GetCurrentPageSize=function()//获取当前页显示的数据个数
 {if(this.SubFrame.length<=0)return null;var item=this.SubFrame[0];if(!item||!item.Frame)return null;return item.Frame.XPointCount;};this.OnSize=function(){var obj={};this.SubFrame[0].Frame.OnSize(obj);this.UpdateAllFrame();return obj;};this.SetDataWidth=function(dataWidth){var obj=this.SubFrame[0].Frame.SetDataWidth(dataWidth);this.UpdateAllFrame();return obj;};this.UpdateAllFrame=function(){var mainFrame=this.SubFrame[0].Frame;for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(i>0)//第1个窗口主坐标已经算好了
 {item.Frame.XPointCount=mainFrame.XPointCount;item.Frame.ZoomIndex=mainFrame.ZoomIndex;item.Frame.DataWidth=mainFrame.DataWidth;item.Frame.DistanceWidth=mainFrame.DistanceWidth;item.Frame.LastCalculateStatus.Width=mainFrame.LastCalculateStatus.Width;item.Frame.LastCalculateStatus.XPointCount=mainFrame.LastCalculateStatus.XPointCount;}for(var j in item.OverlayIndex){var overlayItem=this.SubFrame[i].OverlayIndex[j];overlayItem.Frame.XPointCount=mainFrame.XPointCount;overlayItem.Frame.ZoomIndex=mainFrame.ZoomIndex;overlayItem.Frame.DataWidth=mainFrame.DataWidth;overlayItem.Frame.DistanceWidth=mainFrame.DistanceWidth;overlayItem.Frame.LastCalculateStatus.Width=mainFrame.LastCalculateStatus.Width;overlayItem.Frame.LastCalculateStatus.XPointCount=mainFrame.LastCalculateStatus.XPointCount;}}};//鼠标是否在边框上
 this.PtInFrameBorder=function(x,y){var height=this.DragBorderHeight;for(var i=0;i<this.SubFrame.length-1;++i){var item=this.SubFrame[i];if(item.Frame.Heigh<=0)continue;var bottom=item.Frame.ChartBorder.GetBottom();var left=item.Frame.ChartBorder.GetLeft();var right=item.Frame.ChartBorder.GetRight();item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(left,bottom-height/2,right-left,height);if(item.Frame.Canvas.isPointInPath(x,y)){return{Index:i,Bottom:true};}}return null;};this.IsEnableDragY=function(index){if(!this.SubFrame)return false;var item=this.SubFrame[index];if(!item||!item.Frame||!item.Frame.YSplitOperator)return false;var split=item.Frame.YSplitOperator;if(typeof split.IsEnableDragY!='function')return false;return split.IsEnableDragY();};this.PtInFrameY=function(x,y){var rightExtendWith=0;if(this.GetExtendChartByClassName){var finder=this.GetExtendChartByClassName("StockChip");if(finder&&finder.Chart)rightExtendWith=finder.Chart.Width;}for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];if(item.Frame.Heigh<=0)continue;var rightWidth=item.Frame.ChartBorder.Right;rightWidth-=rightExtendWith;var border=item.Frame.ChartBorder.GetBorder();var bottom=border.Bottom;var top=border.TopTitle;var left=border.Left;var right=border.Right;var maxTopHegith=30;var barHegith=bottom-top;if(barHegith/3>maxTopHegith){var barTop=top+maxTopHegith;var barBottom=bottom-maxTopHegith;}else{var internal=barHegith/3;var barTop=top+internal;var barBottom=bottom-internal;}var position=0;if(y<barTop)position=1;else if(y>barBottom)position=2;if(rightWidth>=10){if(IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex)){var overlayItem=item.OverlayIndex[0];var rightOffset=overlayItem.Frame.RightOffset;item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(right,top,rightOffset,bottom-top);if(item.Frame.Canvas.isPointInPath(x,y)){return{Index:i,Right:true,Left:false,Position:position,IsOverlay:false};//Position 1=上面 2 下面 0=中间(TODO)
@@ -7076,10 +7077,11 @@ this.CreateChartDrawPictureByStorage();//创建画图工具
 this.UpdataDataoffset();//更新数据偏移
 this.UpdatePointByCursorIndex();//更新十字光标位子
 this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.Frame.SetSizeChage(true);this.Draw();};this.ReqeustHistoryMinuteData=function(){var self=this;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.FlowCapitalReady=false;this.ResetPage();//重置分页
+this.Frame.SetSizeChage(true);this.Draw();};this.RequestHistoryMinuteData=function(){var self=this;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.FlowCapitalReady=false;this.ResetPage();//重置分页
 this.ResetDragDownload();this.ResetZoomDownload();this.Draw();if(this.NetworkFilter){var kLineDrawType=this.GetKLineDrawType();var obj={Name:'KLineChartContainer::ReqeustHistoryMinuteData',//类名::
 Explain:'1分钟K线数据',Request:{Url:self.MinuteKLineApiUrl,Type:'POST',Data:{symbol:self.Symbol,count:self.MaxRequestMinuteDayCount,field:["name","symbol","yclose","open","price","high","low","vol"],period:this.Period,right:this.Right,klineDrawType:kLineDrawType}},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
-}JSNetwork.HttpRequest({url:this.MinuteKLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}}});};this.RecvMinuteHistoryData=function(data){if(this.EnableVerifyRecvData&&data.symbol!=this.Symbol){JSConsole.Chart.Warn('[KLineChartContainer::RecvMinuteHistoryData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.symbol+']');return;}var aryDayData=KLineChartContainer.JsonDataToMinuteHistoryData(data);//原始数据
+}JSNetwork.HttpRequest({url:this.MinuteKLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}}});};//支持老版本
+this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;this.RecvMinuteHistoryData=function(data){if(this.EnableVerifyRecvData&&data.symbol!=this.Symbol){JSConsole.Chart.Warn('[KLineChartContainer::RecvMinuteHistoryData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.symbol+']');return;}var aryDayData=KLineChartContainer.JsonDataToMinuteHistoryData(data);//原始数据
 var sourceData=new ChartData();sourceData.Data=aryDayData;sourceData.DataType=1;//0=日线数据 1=分钟数据
 sourceData.Symbol=data.symbol;this.SourceData=sourceData;if(this.BeforeBindMainData)this.BeforeBindMainData("RecvMinuteHistoryData");//显示的数据
 var bindData=new ChartData();bindData.Data=aryDayData;bindData.Right=this.Right;bindData.Period=this.Period;bindData.DataType=1;bindData.Symbol=data.symbol;if(bindData.Right>0&&!this.IsApiPeriod&&this.RightFormula>=1)//复权
@@ -7257,13 +7259,13 @@ this.ClearRectSelect(true);this.Frame.ClearUpDonwFrameYData();this.ClearCustomKL
 };event.Callback(event,sendData,this);isDataTypeChange=sendData.IsDataTypeChange;}if(isDataTypeChange==false&&!this.IsApiPeriod){this.ClearIndexRunCount();this.Update({UpdateCursorIndexType:2});//更新的时候 取消显示十字光标
 return;}this.ClearIndexPaint();if(ChartData.IsDayPeriod(this.Period,true)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');//切换周期先停止更新
-this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.RequestHistoryData();//请求日线数据
+this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.RequestHistoryData();//请求日线数据
 //this.ReqeustKLineInfoData();
 }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');//切换周期先停止更新
-this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.ReqeustHistoryMinuteData();//请求分钟数据
+this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.RequestHistoryMinuteData();//请求分钟数据
 }else if(ChartData.IsTickPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
-this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');this.ResetScrollBar();this.ClearIndexRunCount();this.RequestTickData();//请求分笔数据
+this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');this.ResetScrollBar();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.RequestTickData();//请求分笔数据
 }};//复权切换
 this.ChangeRight=function(right){if(!MARKET_SUFFIX_NAME.IsEnableRight(this.Period,this.Symbol,this.RightFormula))return;var upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsBIT(upperSymbol))return;if(right<0||right>2)return;if(this.Right==right)return;this.Right=right;if(!this.IsApiPeriod){this.Update();return;}else//API周期数据 重新请求数据
 {if(ChartData.IsDayPeriod(this.Period,true)){this.CancelAutoUpdate();//先停止定时器
@@ -7271,7 +7273,7 @@ this.AutoUpdateEvent(false,'KLineChartContainer::ChangeRight');//切换复权先
 this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.RequestHistoryData();//请求日线数据
 }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangeRight');//切换复权先停止更新
-this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.ReqeustHistoryMinuteData();//请求分钟数据
+this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.RequestHistoryMinuteData();//请求分钟数据
 }}};//设置第1屏的起始日期
 this.SetFirstShowDate=function(obj){if(!obj||!obj.Date)return;var option={ID:JSCHART_OPERATOR_ID.OP_GOTO,Date:obj.Date};if(IFrameSplitOperator.IsNumber(obj.Time))option.Time=obj.Time;if(IFrameSplitOperator.IsNumber(obj.PageSize))option.PageSize=obj.PageSize;this.ChartOperator(option);};//删除某一个窗口的指标, bCallDestory=是否调用图形销毁函数
 this.DeleteIndexPaint=function(windowIndex,bCallDestroy){var paint=new Array();//踢出当前窗口的指标画法
@@ -7351,7 +7353,7 @@ scriptIndex.Create(this,windowIndex);overlayFrame.Script=scriptIndex;}var event=
 {if(!this.DeleteOverlayIndex(identify,null))return;this.UpdateFrameMaxMin();//重新计算坐标范围
 this.Frame.ResetXYSplit(true);this.Draw();};this.ChangeKLineDrawType=function(drawType,isDraw,option){if(this.KLineDrawType==drawType&&!option)return;var oldKLineType=this.KLineDrawType;this.KLineDrawType=drawType;var setKLineType=new _set2.default([5,7,8,10,11,12,17]);if(setKLineType.has(oldKLineType)||setKLineType.has(drawType)){var chart=this.ChartPaint[0];if(chart)chart.DrawType=this.KLineDrawType;this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangeKLineDrawType');if(ChartData.IsDayPeriod(this.Period,true)){this.ResetOverlaySymbolStatus();this.RequestHistoryData();//请求日线数据
-}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ResetOverlaySymbolStatus();this.ReqeustHistoryMinuteData();//请求分钟数据
+}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ResetOverlaySymbolStatus();this.RequestHistoryMinuteData();//请求分钟数据
 }return;}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(i==0){item.DrawType=this.KLineDrawType;if(option){if(IFrameSplitOperator.IsBool(option.IsThinAKBar))item.IsThinAKBar=option.IsThinAKBar;}}else if(item.ClassName=='ChartVolStick'){item.KLineDrawType=this.KLineDrawType;}}for(var i in this.OverlayChartPaint)//叠加K线样式修改
 {var item=this.OverlayChartPaint[i];item.DrawType=this.KLineDrawType;}if(isDraw==false)return;this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.Draw();};//修改坐标类型 
@@ -7425,14 +7427,14 @@ this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.Draw();//叠加指标
 for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];for(var j in item.OverlayIndex){var overlayItem=item.OverlayIndex[j];this.BindOverlayIndexData(overlayItem,i,bindData);}}};//切换股票代码
 this.ChangeSymbol=function(symbol,option){this.CancelAutoUpdate();//先停止定时器
-this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');this.ClearRectSelect(true);this.ClearCustomKLine();this.ClearKLineCaluate();this.HideTooltip();this.ResetScrollBar();this.ClearIndexRunCount();this.Symbol=symbol;if(!symbol){this.DrawEmpty();return;}if(option){if(option.KLine){var item=option.KLine;if(IFrameSplitOperator.IsNumber(item.Right))this.Right=item.Right;if(IFrameSplitOperator.IsNumber(item.Period))this.Period=item.Period;}}if(MARKET_SUFFIX_NAME.IsSHSZIndex(symbol))this.Right=0;//指数没有复权
+this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');this.ClearRectSelect(true);this.ClearCustomKLine();this.ClearKLineCaluate();this.HideTooltip();this.ResetScrollBar();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.Symbol=symbol;if(!symbol){this.DrawEmpty();return;}if(option){if(option.KLine){var item=option.KLine;if(IFrameSplitOperator.IsNumber(item.Right))this.Right=item.Right;if(IFrameSplitOperator.IsNumber(item.Period))this.Period=item.Period;}}if(MARKET_SUFFIX_NAME.IsSHSZIndex(symbol))this.Right=0;//指数没有复权
 this.ClearIndexPaint();//清空指标
 if(option){if(option.Windows&&Array.isArray(option.Windows)&&option.Windows.length>0){var windows=option.Windows;var systemScript=new JSIndexScript();for(var i in windows){if(i>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=windows[i];if(!item)continue;if(item.Script){this.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[i]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
 }}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
 //this.ReqeustKLineInfoData();
-}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.ReqeustHistoryMinuteData();//请求分钟数据
+}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.RequestHistoryMinuteData();//请求分钟数据
 }else if(ChartData.IsTickPeriod(this.Period)){this.ClearStockCache();this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
 {obj.Update=true;}else{if(this.ChartPaint.length>0){var klinePaint=this.ChartPaint[0];klinePaint.InfoData=new _map2.default();}obj.Update=false;}//信息地雷信息
 if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return;for(var i=0;i<this.ChartInfo.length;++i){this.ChartInfo[i].RequestData(this,obj);}};//设置K线信息地雷
@@ -7925,7 +7927,7 @@ if(this.Frame&&this.Frame.SubFrame){for(var i=0;i<this.Frame.SubFrame.length;++i
 {var overlayItem=item.OverlayIndex[j];for(var k=0;k<overlayItem.ChartPaint.length;++k){var overlayChart=overlayItem.ChartPaint[k];if(overlayChart&&overlayChart.OnDestroy)overlayChart.OnDestroy();}overlayItem.ChartPaint=[];}}}}//清空叠加标题
 for(var i=1;i<this.TitlePaint.length;++i){var item=this.TitlePaint[i];item.OverlayIndex=new _map2.default();}};this.ResetDayOffset=function(){if(this.PageInfo.Enable){this.DayOffset.Offset=this.PageInfo.Offset;this.DayOffset.ShowDayCount=this.PageInfo.ShowDayCount;}else{this.DayOffset.Offset=0;this.DayOffset.ShowDayCount=-1;}this.DayOffset.PageInfo=null;};this.ResetDataStatus=function(){this.DataStatus.MultiDay=false;this.DataStatus.LatestDay=false;};//切换股票代码
 this.ChangeSymbol=function(symbol,option){this.StopDisplayLatest();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeSymbol");this.Symbol=symbol;this.ResetDayOffset();this.ResetDataStatus();this.ClearIndexPaint();//清空指标
-this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRunCount();this.ClearStockCache();if(option){if(IFrameSplitOperator.IsNumber(option.DayCount))this.DayCount=option.DayCount;if(IFrameSplitOperator.IsNonEmptyArray(option.Windows))//切换指标
+this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRunCount();this.ClearStockCache();this.Frame.ClearYCoordinateMaxMin();if(option){if(IFrameSplitOperator.IsNumber(option.DayCount))this.DayCount=option.DayCount;if(IFrameSplitOperator.IsNonEmptyArray(option.Windows))//切换指标
 {var systemScript=new JSIndexScript();for(var i=0;i<option.Windows.length;++i){var index=2+i;if(index>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[index]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
@@ -7937,7 +7939,7 @@ if(option.Overlay&&IFrameSplitOperator.IsNonEmptyArray(option.Overlay)){var setS
 else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
 if(paint.SetOption)paint.SetOption(item);this.OverlayChartPaint.push(paint);}}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
 this.Draw();this.RequestData();}};this.SetPageInfo=function(pageInfo){if(!pageInfo)return;if(IFrameSplitOperator.IsBool(pageInfo.Enable))this.PageInfo.Enable=pageInfo.Enable;if(IFrameSplitOperator.IsNumber(pageInfo.Offset))this.PageInfo.Offset=pageInfo.Offset;if(IFrameSplitOperator.IsNumber(pageInfo.ShowDayCount))this.PageInfo.ShowDayCount=pageInfo.ShowDayCount;};this.ClearMinuteData=function(){this.SourceData=null;this.DayData=null;this.BeforeOpenData=null;this.AfterCloseData=null;this.MultiDayBeforeOpenData=null;this.MultiDayAfterCloseData=null;};this.ChangeDayCount=function(count,option){if(count<0)return;this.StopDisplayLatest();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeDayCount");this.DayCount=count;this.ClearMinuteData();if(option&&option.PageInfo){this.SetPageInfo(option.PageInfo);this.ResetDayOffset();}if(this.DayCount>1){this.ChartDrawPicture=[];}else{this.ReloadChartDrawPicture();}this.ResetDataStatus();this.ClearIndexPaint();//清空指标
-this.ResetOverlaySymbolStatus();this.RequestData();};//叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
+this.Frame.ClearYCoordinateMaxMin();this.ResetOverlaySymbolStatus();this.RequestData();};//叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
 this.OverlaySymbol=function(symbol,option){var arySymbol=null;if(IFrameSplitOperator.IsString(symbol))arySymbol=[symbol];else if(Array.isArray(symbol))arySymbol=symbol;if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return false;var aryNewSymbol=[];for(var i=0,j=0;i<arySymbol.length;++i){var strSymbol=arySymbol[i];var bFind=false;for(j=0;j<this.OverlayChartPaint.length;++j){var item=this.OverlayChartPaint[j];if(item.Symbol==strSymbol){bFind=true;console.warn('[MinuteChartContainer::OverlaySymbol] overlay symbol='+strSymbol+' exist.');break;}}if(!bFind)aryNewSymbol.push(strSymbol);}if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return true;for(var i=0;i<aryNewSymbol.length;++i){var strSymbol=aryNewSymbol[i];var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=strSymbol;paint.Identify='Overlay-Minute-'+strSymbol;if(option&&option.Color)paint.Color=option.Color;//外部设置颜色
 else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
 if(paint.SetOption)paint.SetOption(option);this.OverlayChartPaint.push(paint);}if(this.DayCount<=1)this.RequestOverlayMinuteData();//请求数据
@@ -12911,7 +12913,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.12747";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.12765";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.12754",
+  "version": "1.1.12767",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -17680,6 +17680,21 @@ function HQTradeFrame()
         }
     }
 
+    //清空Y轴坐标的最大最小值
+    this.ClearYCoordinateMaxMin=function()
+    {
+        for(var i=0;i<this.SubFrame.length;++i)
+        {
+            var subItem=this.SubFrame[i];
+            var frame=subItem.Frame;
+            if (frame.YMaxMin)
+            {
+                frame.YMaxMin.Max=null;
+                frame.YMaxMin.Min=null;
+            }
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -67250,7 +67265,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -67328,6 +67343,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -68488,6 +68505,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -68498,7 +68516,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.Frame.ClearYCoordinateMaxMin();
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -68506,6 +68525,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');
             this.ResetScrollBar();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -68547,7 +68567,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -69038,7 +69058,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -69816,6 +69836,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.HideTooltip();
         this.ResetScrollBar();
         this.ClearIndexRunCount();
+        this.Frame.ClearYCoordinateMaxMin();
         
         
         this.Symbol=symbol;
@@ -69887,7 +69908,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -74931,6 +74952,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
         this.ClearStockCache();
+        this.Frame.ClearYCoordinateMaxMin();
 
         if (option)
         {
@@ -75078,6 +75100,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.ResetDataStatus();
         this.ClearIndexPaint();             //清空指标
+        this.Frame.ClearYCoordinateMaxMin();
         this.ResetOverlaySymbolStatus();
         this.RequestData();
     }

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

@@ -21824,6 +21824,21 @@ function HQTradeFrame()
         }
     }
 
+    //清空Y轴坐标的最大最小值
+    this.ClearYCoordinateMaxMin=function()
+    {
+        for(var i=0;i<this.SubFrame.length;++i)
+        {
+            var subItem=this.SubFrame[i];
+            var frame=subItem.Frame;
+            if (frame.YMaxMin)
+            {
+                frame.YMaxMin.Max=null;
+                frame.YMaxMin.Min=null;
+            }
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -71394,7 +71409,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -71472,6 +71487,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -72632,6 +72649,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -72642,7 +72660,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.Frame.ClearYCoordinateMaxMin();
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -72650,6 +72669,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');
             this.ResetScrollBar();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -72691,7 +72711,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -73182,7 +73202,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -73960,6 +73980,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.HideTooltip();
         this.ResetScrollBar();
         this.ClearIndexRunCount();
+        this.Frame.ClearYCoordinateMaxMin();
         
         
         this.Symbol=symbol;
@@ -74031,7 +74052,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -79075,6 +79096,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
         this.ClearStockCache();
+        this.Frame.ClearYCoordinateMaxMin();
 
         if (option)
         {
@@ -79222,6 +79244,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.ResetDataStatus();
         this.ClearIndexPaint();             //清空指标
+        this.Frame.ClearYCoordinateMaxMin();
         this.ResetOverlaySymbolStatus();
         this.RequestData();
     }
@@ -131205,7 +131228,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12747";
+var HQCHART_VERSION="1.1.12765";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -21868,6 +21868,21 @@ function HQTradeFrame()
         }
     }
 
+    //清空Y轴坐标的最大最小值
+    this.ClearYCoordinateMaxMin=function()
+    {
+        for(var i=0;i<this.SubFrame.length;++i)
+        {
+            var subItem=this.SubFrame[i];
+            var frame=subItem.Frame;
+            if (frame.YMaxMin)
+            {
+                frame.YMaxMin.Max=null;
+                frame.YMaxMin.Min=null;
+            }
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -71438,7 +71453,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -71516,6 +71531,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -72676,6 +72693,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -72686,7 +72704,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.Frame.ClearYCoordinateMaxMin();
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -72694,6 +72713,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');
             this.ResetScrollBar();
             this.ClearIndexRunCount();
+            this.Frame.ClearYCoordinateMaxMin();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -72735,7 +72755,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -73226,7 +73246,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -74004,6 +74024,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.HideTooltip();
         this.ResetScrollBar();
         this.ClearIndexRunCount();
+        this.Frame.ClearYCoordinateMaxMin();
         
         
         this.Symbol=symbol;
@@ -74075,7 +74096,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -79119,6 +79140,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
         this.ClearStockCache();
+        this.Frame.ClearYCoordinateMaxMin();
 
         if (option)
         {
@@ -79266,6 +79288,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.ResetDataStatus();
         this.ClearIndexPaint();             //清空指标
+        this.Frame.ClearYCoordinateMaxMin();
         this.ResetOverlaySymbolStatus();
         this.RequestData();
     }
@@ -131363,7 +131386,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12747";
+var HQCHART_VERSION="1.1.12765";
 
 function PrintHQChartVersion()
 {