hqchart 1.1.14956 → 1.1.14962

package/lib/umychart.vue.js

@@ -9050,7 +9050,7 @@ this.ClearOverlaySymbol=function(){for(var i in this.OverlayChartPaint){var item
 this.UpdateFrameMaxMin();this.Draw();};this.ShowBeforeData=function(isShow,option){this.ShowCallAuctionData({Left:isShow},option);};//集合竞价设置 obj={ Left:, Right: }
 this.ShowCallAuctionData=function(obj,option){if(!obj)return;var optionChanged=false;//配置修改
 if(IFrameSplitOperator.IsBool(obj.Left)&&this.IsShowBeforeData!=obj.Left){this.IsShowBeforeData=obj.Left;optionChanged=true;}if(IFrameSplitOperator.IsBool(obj.Right)&&this.IsShowAfterData!=obj.Right){this.IsShowAfterData=obj.Right;optionChanged=true;}if(obj.MultiDay){var item=obj.MultiDay;if(IFrameSplitOperator.IsBool(item.Left)&&this.IsShowMultiDayBeforeData!=item.Left){this.IsShowMultiDayBeforeData=item.Left;optionChanged=true;}if(IFrameSplitOperator.IsBool(item.Right)&&this.IsShowMultiDayAfterData!=item.Right){this.IsShowMultiDayAfterData=item.Right;optionChanged=true;}}if(option){if(option.BeforeOpen){var item=option.BeforeOpen;if(IFrameSplitOperator.IsNumber(item.Left)&&this.ExtendWidth.Left!=item.Left){this.ExtendWidth.Left=item.Left;optionChanged=true;}}if(option.AfterClose){var item=option.AfterClose;if(IFrameSplitOperator.IsNumber(item.Right)&&this.ExtendWidth.Right!=item.Right){this.ExtendWidth.Right=item.Right;optionChanged=true;}}if(option.MultiDay){var item=option.MultiDay;if(IFrameSplitOperator.IsNumber(item.Left)&&this.MultiDayExtendWidth.Left!=item.Left){this.MultiDayExtendWidth.Left=item.Left;optionChanged=true;}if(IFrameSplitOperator.IsNumber(item.Right)&&this.MultiDayExtendWidth.Right!=item.Right){this.MultiDayExtendWidth.Right=item.Right;optionChanged=true;}}}if(optionChanged){this.Frame.ClearYCoordinateMaxMin();this.RequestData();}};//option={ ClearYCoordinateMaxMin:true }
-this.RequestData=function(option){if(option){if(option.ClearYCoordinateMaxMin===true)this.Frame.ClearYCoordinateMaxMin();}if(this.DayCount<=1)this.RequestMinuteData();else this.RequestHistoryMinuteData();};this.ChangeDrawType=function(type){if(this.ChartPaint.length<=0)return;if(type==0)this.ChartPaint[0].IsDrawArea=true;else if(type==1)this.ChartPaint[0].IsDrawArea=false;else return;this.Draw();};this.UpdateDataOffset=function(){this.SourceData.DataOffset=this.DayOffset.DataOffset;for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;if(item.ClassName=="ChartMinuteVolumBar"||item.ClassName=="ChartMinutePriceLine")item.DayOffset=this.DayOffset;}for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}//叠加指标当前显示的数据偏移
+this.RequestData=function(option){if(option){if(option.ClearYCoordinateMaxMin===true)this.Frame.ClearYCoordinateMaxMin();}this.ResetDataStatus();this.ClearIndexPaint();this.ClearIndexRunCount();this.ClearStockCache();if(this.DayCount<=1)this.RequestMinuteData();else this.RequestHistoryMinuteData();};this.ChangeDrawType=function(type){if(this.ChartPaint.length<=0)return;if(type==0)this.ChartPaint[0].IsDrawArea=true;else if(type==1)this.ChartPaint[0].IsDrawArea=false;else return;this.Draw();};this.UpdateDataOffset=function(){this.SourceData.DataOffset=this.DayOffset.DataOffset;for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;if(item.ClassName=="ChartMinuteVolumBar"||item.ClassName=="ChartMinutePriceLine")item.DayOffset=this.DayOffset;}for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}//叠加指标当前显示的数据偏移
 for(var i=0;i<this.Frame.SubFrame.length;++i){var subFrame=this.Frame.SubFrame[i];for(var j=0;j<subFrame.OverlayIndex.length;++j){var overlayItem=subFrame.OverlayIndex[j];for(var k=0;k<overlayItem.ChartPaint.length;++k){var item=overlayItem.ChartPaint[k];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}}}};//请求历史分钟数据
 this.RequestHistoryMinuteData=function(){var self=this;this.IsBeforeData=false;this.IsAfterData=false;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.Draw();if(this.NetworkFilter){var callCation={Before:this.IsShowMultiDayBeforeData,After:this.IsShowMultiDayAfterData//集合竞价
 };var bBuySellBar=this.IsShowMinuteBuySellBar();var obj={Name:'MinuteChartContainer::RequestHistoryMinuteData',//类名::函数
@@ -9094,7 +9094,8 @@ this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1]=beforeOpenData
 this.MultiDayBeforeOpenData.push(beforeOpenData);}if(afterCloseData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){var lastItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(lastItem.Date==afterCloseData.Date)this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1]=afterCloseData;else if(lastItem.Date<afterCloseData.Date)this.MultiDayAfterCloseData.push(afterCloseData);}}this.CaclutateCallCationYRange();};//增量更新
 this.RecvUpdateMinuteData=function(data){var minuteData=MinuteChartContainer.JsonDataToUpdateMinuteData(data);var aryColorData=MinuteChartContainer.JsonDataToMinuteLineColorData(data);var beforeOpenData=MinuteChartContainer.JsonDataToBeforeOpenData(data);var afterCloseData=MinuteChartContainer.JsonDataToAfterCloseData(data);var updateTime=MinuteChartContainer.JsonDataToMinuteLastUpdateTime(data);//数据最后的更新时间
 if(data.LatestPointFlash)//最新数据闪烁
-{var item=data.LatestPointFlash;if(IFrameSplitOperator.IsNumber(item.FlashCount))this.SetLatestPointFlash(item.FlashCount);}if(this.DayCount>1)//多日走势图
+{var item=data.LatestPointFlash;if(IFrameSplitOperator.IsNumber(item.FlashCount))this.SetLatestPointFlash(item.FlashCount);}if(IFrameSplitOperator.IsNonEmptyArray(data.stock)&&data.stock[0]){this.DataStatus.LatestDate=data.stock[0].date;//保存下最后一天的日期
+this.RecvBuySellData(data.stock[0].BuySellData);}if(this.DayCount>1)//多日走势图
 {this.UpdateCallCationData(beforeOpenData,afterCloseData,{DataType:1});this.UpdateLineColorData(aryColorData,minuteData.date);this.UpdateLatestMinuteDataV2(minuteData);this.UpdateHistoryMinuteUI(updateTime);this.RecvMinuteDataEvent({FunctionName:"RecvUpdateMinuteData"});this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
 this.BindAllOverlayIndexData(this.SourceData,{SyncExecute:false});this.AutoUpdateEvent(true,"MinuteChartContainer::RecvUpdateMinuteData");this.AutoUpdate();return;}//if (this.IsBeforeData && beforeOpenData) this.BeforeOpenData=beforeOpenData;
 //if (this.IsAfterData && afterCloseData) this.AfterCloseData=afterCloseData;
@@ -9319,7 +9320,7 @@ IsShowCorss:this.ChartCorssCursor.IsShowCorss,//是否显示十字线
 MinItem:minuteItem,Symbol:this.Symbol,Name:this.Name,LastValue:this.ChartCorssCursor.LastValue};this.DialogTooltip.Update(sendData);return true;};this.DrawSelectRectDialog=function(e){if(!this.DialogSelectRect)return;this.UpdateSelectRectDialog(e);};this.UpdateSelectRectDialog=function(e){if(!this.DialogSelectRect)return false;var data=e.data;//区间统计数据
 var x,y;if(data&&IFrameSplitOperator.IsNumber(data.X)&&IFrameSplitOperator.IsNumber(data.Y)){var pixelRatio=GetDevicePixelRatio();var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x=data.X;y=data.Y;x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;}var sendData={Symbol:this.Symbol,Name:this.Name,SelectData:data.SelectData,X:x,Y:y,e:e};this.DialogSelectRect.Update(sendData);};this.GetKData=function(){if(!this.SourceData)return null;var data=this.SourceData;if(!data)return null;return data;};//获取最新的一条盘前数据
 this.GetLatestBeforeOpenItem=function(){var lastItem=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData))return null;var dayItem=this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.BeforeOpenData||!IFrameSplitOperator.IsNonEmptyArray(this.BeforeOpenData.Data))return null;var finder=this.BeforeOpenData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};//获取最新的一条盘后数据
-this.GetLatestAfterCloseItem=function(){if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return null;var dayItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.AfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.AfterCloseData.Data))return null;var finder=this.AfterCloseData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};this.IsCallAuctionFrame=function(frameID){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(frameID<0||frameID>=this.Frame.SubFrame.length)return false;var subItem=this.Frame.SubFrame[frameID];if(!subItem||!subItem.Frame)return false;var subFrame=subItem.Frame;for(var i=0;i<this.ChartPaintEx.length;++i){var item=this.ChartPaintEx[i];if(item.ChartFrame&&item.ChartFrame.Guid==subFrame.Guid)return true;}return false;};}//盘前数据
+this.GetLatestAfterCloseItem=function(){var lastItem=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return null;var dayItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.AfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.AfterCloseData.Data))return null;var finder=this.AfterCloseData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};this.IsCallAuctionFrame=function(frameID){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(frameID<0||frameID>=this.Frame.SubFrame.length)return false;var subItem=this.Frame.SubFrame[frameID];if(!subItem||!subItem.Frame)return false;var subFrame=subItem.Frame;for(var i=0;i<this.ChartPaintEx.length;++i){var item=this.ChartPaintEx[i];if(item.ChartFrame&&item.ChartFrame.Guid==subFrame.Guid)return true;}return false;};}//盘前数据
 MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);var yClose=data.stock[0].yclose;var preClose=data.stock[0].yclose;//前一个数据价格
 var stockData=data.stock[0];var date=stockData.date;//日期
 var beforeOpenData={Data:[],TotalCount:15,Ver:1.0,Date:date,YClose:stockData.yclose,YClearing:stockData.yclearing};var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA;//扩展数据序号
@@ -13272,7 +13273,7 @@ var _iteratorNormalCompletion23=true;var _didIteratorError23=false;var _iterator
 if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}if(option.EnableResize==true)this.CreateResizeListener();if(option.EnablePopMenuV2===true)chart.InitalPopMenu();if(option.FloatTooltip&&option.FloatTooltip.Enable)chart.InitalFloatTooltip(option.FloatTooltip);//提示信息
 if(option.MinuteChartTooltip&&option.MinuteChartTooltip.Enable)chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);if(option.KLineChartTooltip&&option.KLineChartTooltip.Enable)chart.InitalKLineChartTooltip(option.KLineChartTooltip);if(option.Symbol)chart.Symbol=option.Symbol;if(option.Name)chart.Name=option.Name;var requestOption={Callback:null};if(chart.Symbol)requestOption.Callback=function(){chart.RequestMemberListData();};if(option.LoadStockList===false){chart.ChartSplashPaint.IsEnableSplash=false;chart.Draw();}else{chart.RequestStockListData(requestOption);//下载码表     
 }};this.CreateJSReportChartContainer=function(option){var _this56=this;var chart=new JSReportChartContainer(this.CanvasElement);chart.GetExtraCanvas=function(name){return _this56.GetExtraCanvas(name);};chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(IFrameSplitOperator.IsNumber(option.WheelPageType))chart.WheelPageType=option.WheelPageType;if(IFrameSplitOperator.IsBool(option.PageUpDownCycle))chart.PageUpDownCycle=option.PageUpDownCycle;//数据下载提示信息
-if(IFrameSplitOperator.IsObject(option.SplashTitle)){var item=option.SplashTitle;if(item)chart.SplashTitle.StockList=item.StockList;if(item)chart.SplashTitle.MemberList=item.MemberList;}if(option.VScrollbar)chart.SetVScrollbar(option.VScrollbar);if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}if(option.VirtualTable){var item=option.VirtualTable;if(IFrameSplitOperator.IsBool(item.Enable))chart.Data.Virtual.Enable=item.Enable;}var reportChart=chart.GetReportChart();if(reportChart){if(IFrameSplitOperator.IsNumber(option.TextOverflowStyle))reportChart.TextOverflowStyle=option.TextOverflowStyle;if(IFrameSplitOperator.IsNumber(option.MultiSelectModel))reportChart.MultiSelectModel=option.MultiSelectModel;if(IFrameSplitOperator.IsNumber(option.SelectedStyle))reportChart.SelectedStyle=option.SelectedStyle;}this.SetChartBorder(chart,option);//是否自动更新
+if(IFrameSplitOperator.IsObject(option.SplashTitle)){var item=option.SplashTitle;if(item)chart.SplashTitle.StockList=item.StockList;if(item)chart.SplashTitle.MemberList=item.MemberList;}if(option.VScrollbar)chart.SetVScrollbar(option.VScrollbar);if(option.SortInfo){var item=option.SortInfo;if(item.Search)chart.SortInfo.Field=chart.FindFiledIndex(item.Search);if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}if(option.VirtualTable){var item=option.VirtualTable;if(IFrameSplitOperator.IsBool(item.Enable))chart.Data.Virtual.Enable=item.Enable;}var reportChart=chart.GetReportChart();if(reportChart){if(IFrameSplitOperator.IsNumber(option.TextOverflowStyle))reportChart.TextOverflowStyle=option.TextOverflowStyle;if(IFrameSplitOperator.IsNumber(option.MultiSelectModel))reportChart.MultiSelectModel=option.MultiSelectModel;if(IFrameSplitOperator.IsNumber(option.SelectedStyle))reportChart.SelectedStyle=option.SelectedStyle;}this.SetChartBorder(chart,option);//是否自动更新
 if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;//数据筛选
 if(option.DataFilter){var item=option.DataFilter;if(IFrameSplitOperator.IsBool(item.Enable))chart.DataFilterConfig.Enable=item.Enable;}//注册事件
 if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}return chart;};this.SetChartBorder=function(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
@@ -13369,7 +13370,7 @@ this.UIElement.ontouchstart=function(e){_this59.OnTouchStart(e);};this.UIElement
 this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段宽度
 this.LastMouseStatus.MouseOnStatus=null;if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash){this.Frame.Draw({IsEnableSplash:this.ChartSplashPaint.IsEnableSplash});this.ChartSplashPaint.Draw();return;}this.Frame.Draw();this.Frame.DrawLogo();//框架内图形
 for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw(this.LastMouseStatus);}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw(this.LastMouseStatus);}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this60=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this60.Draw();},frequency);};this.ResetReportStatus=function(){this.Data.XOffset=0;this.Data.YOffset=0;};this.ResetReportSelectStatus=function(){var chart=this.GetReportChart();if(chart){chart.SelectedRow=-1;chart.SelectedFixedRow=-1;chart.MultiSelectedRow=[];}};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Virtual.Count=0;this.BlockData=new _map2.default();};this.ClearMapStockData=function(){this.MapStockData=new _map2.default();};this.ResetSortStatus=function(){this.SortInfo.Field=-1;this.SortInfo.Sort=0;};this.SetSelectedRow=function(option){var reportChart=this.GetReportChart();if(!reportChart)return false;if(!reportChart.SetSelectedRow(option))return false;this.Draw();};//设置股票列表
-this.SetSymbolList=function(arySymbol,option){this.ClearData();this.ResetReportStatus();this.ResetSortStatus();if(IFrameSplitOperator.IsNonEmptyArray(arySymbol)){for(var i=0;i<arySymbol.length;++i){this.Data.Data.push(arySymbol[i]);}}var chart=this.ChartPaint[0];if(chart)chart.Data=this.Data;this.Draw();};this.ChangeSymbol=function(symbol,option){var _this61=this;this.Symbol=symbol;this.ClearData();this.ResetReportStatus();this.ResetSortStatus();this.ResetReportSelectStatus();if(option){if(IFrameSplitOperator.IsNumber(option.TabSelected)){var chartTab=this.GetTabChart();if(chartTab)chartTab.SelectedTabIndex=option.TabSelected;}if(Array.isArray(option.FixedSymbol)){var chart=this.GetReportChart();if(chart){chart.FixedRowCount=0;this.FixedRowData.Type=1;this.FixedRowData.Symbol=[];var aryData=option.FixedSymbol;for(var i=0;i<aryData.length;++i){var item=aryData[i];this.FixedRowData.Symbol.push(item.Symbol);++chart.FixedRowCount;}this.SetSizeChange(true);}}if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))this.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))this.SortInfo.Sort=item.Sort;}if(IFrameSplitOperator.IsNonEmptyArray(option.Column))//字段重新设置
+this.SetSymbolList=function(arySymbol,option){this.ClearData();this.ResetReportStatus();this.ResetSortStatus();if(IFrameSplitOperator.IsNonEmptyArray(arySymbol)){for(var i=0;i<arySymbol.length;++i){this.Data.Data.push(arySymbol[i]);}}var chart=this.ChartPaint[0];if(chart)chart.Data=this.Data;this.Draw();};this.ChangeSymbol=function(symbol,option){var _this61=this;this.Symbol=symbol;this.ClearData();this.ResetReportStatus();this.ResetSortStatus();this.ResetReportSelectStatus();if(option){if(IFrameSplitOperator.IsNumber(option.TabSelected)){var chartTab=this.GetTabChart();if(chartTab)chartTab.SelectedTabIndex=option.TabSelected;}if(Array.isArray(option.FixedSymbol)){var chart=this.GetReportChart();if(chart){chart.FixedRowCount=0;this.FixedRowData.Type=1;this.FixedRowData.Symbol=[];var aryData=option.FixedSymbol;for(var i=0;i<aryData.length;++i){var item=aryData[i];this.FixedRowData.Symbol.push(item.Symbol);++chart.FixedRowCount;}this.SetSizeChange(true);}}if(option.SortInfo){var item=option.SortInfo;if(item.Search)this.SortInfo.Field=this.FindFiledIndex(item.Search);if(IFrameSplitOperator.IsNumber(item.Field))this.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))this.SortInfo.Sort=item.Sort;}if(IFrameSplitOperator.IsNonEmptyArray(option.Column))//字段重新设置
 {this.SetColumn(option.Column,{Draw:false});}if(IFrameSplitOperator.IsBool(option.IsReloadStockList)&&option.IsReloadStockList){var requestOption={Callback:null};if(this.Symbol)requestOption.Callback=function(){_this61.RequestMemberListData();};this.MapStockData=new _map2.default();this.RequestStatus.IsFinishStockList=false;this.RequestStatus.IsFinishMemberList=false;this.RequestStockListData(requestOption);return;}}this.RequestMemberListData();};//更新数据
 this.UpdateFullData=function(data){var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){//0=证券代码 1=股票名称
 for(var i=0;i<data.data.length;++i){var item=data.data[i];var symbol=item[0];var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;this.MapStockData.set(symbol,stock);}stock.Symbol=this.GetSymbolNoSuffix(symbol);stock.Name=item[1];this.ReadStockJsonData(stock,item);arySymbol.push(symbol);}}//设置显示数据
@@ -13581,7 +13582,8 @@ var oneStep=this.YStepPixel;if(oneStep<=0)oneStep=5;var step=parseInt(moveUpDown
 var oneStep=this.XStepPixel;if(oneStep<=0)oneStep=5;var step=parseInt(moveLeftRight/oneStep);//除以4个像素
 if(step<=0)return false;if(!isLeft)step*=-1;if(this.MoveXOffset(step)){drag.IsXMove=true;this.Draw();}return true;};this.OnTouchMove=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var touches=this.GetTouchData(e);if(this.IsPhoneDragging(e)){var drag=this.TouchDrag;this.TouchInfo.Move={X:touches[0].clientX,Y:touches[0].clientY};if(drag){this.PreventTouchEvent(e);var moveAngle=this.GetMoveAngle(drag.LastMove,{X:touches[0].clientX,Y:touches[0].clientY});var moveLeftRight=Math.abs(drag.LastMove.X-touches[0].clientX);var moveUpDown=Math.abs(drag.LastMove.Y-touches[0].clientY);if(drag.IsYMove==true){this.ShowPageInfo(true);if(!this.OnDragYOffset(drag,touches,moveUpDown,e))return;}else if(drag.IsXMove==true){if(!this.OnDragXOffset(drag,touches,moveLeftRight,e))return;}else if(moveUpDown>0&&moveAngle<this.TouchMoveMinAngle){this.ShowPageInfo(true);if(!this.OnDragYOffset(drag,touches,moveUpDown,e))return;}else if(moveLeftRight>0&&moveAngle>=this.TouchMoveMinAngle){if(!this.OnDragXOffset(drag,touches,moveLeftRight,e))return;}else{return;}drag.LastMove.X=touches[0].clientX;drag.LastMove.Y=touches[0].clientY;}}};this.OnTouchEnd=function(e){JSConsole.Chart.Log('[JSReportChartContainer:OnTouchEnd]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;this.ShowPageInfo(false);this.OnTouchClick(this.TouchInfo,e);this.IsOnTouch=false;this.TouchDrag=null;this.TouchInfo=null;};this.OnTouchClick=function(touchInfo,e){if(!touchInfo||!touchInfo.Click)return false;if(touchInfo.Move)return false;var clickPoint=touchInfo.InsideClick;var reportChart=this.GetReportChart();if(!reportChart)return false;var clickData=reportChart.OnMouseDown(clickPoint.X,clickPoint.Y,e);if(!clickData)return false;if(clickData.Type==2||clickData.Type==4)//点击行
 {if(clickData.Redraw==true)this.Draw();}else if(clickData.Type==3)//表头
-{this.OnClickHeader(clickData,e);}JSConsole.Chart.Log('[JSReportChartContainer:OnTouchClick] clickData',clickData);};this.GetTabChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.Tab;};this.GetVScrollbarChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.VScrollbar;};this.GetReportChart=function(){var chart=this.ChartPaint[0];return chart;};this.GotoNextItem=function(step){if(step==0)return false;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();if(pageSize>this.Data.Data.length)return false;var moveCount=0;if(step>0){for(var i=0;i<step;++i){if(this.Data.YOffset+pageSize>=this.Data.Data.length)break;++this.Data.YOffset;++moveCount;}}else if(step<0){step=Math.abs(step);for(var i=0;i<step;++i){if(this.Data.YOffset<=0)break;--this.Data.YOffset;++moveCount;}}return moveCount>0;};this.GotoNextPage=function(bCycle)//bCycle 是否循环
+{this.OnClickHeader(clickData,e);}JSConsole.Chart.Log('[JSReportChartContainer:OnTouchClick] clickData',clickData);};this.GetTabChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.Tab;};this.GetVScrollbarChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.VScrollbar;};this.GetReportChart=function(){var chart=this.ChartPaint[0];return chart;};//获取列索引
+this.FindFiledIndex=function(search){if(!search)return-1;var chart=this.GetReportChart();if(!chart)return-1;if(!IFrameSplitOperator.IsNonEmptyArray(chart.Column))return-1;if(search.ID){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.ID==search.ID)return i;}return-1;}if(search.Title){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.Title==search.Title)return i;}return-1;}if(search.Type){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.Type==search.Type)return i;}return-1;}return-1;};this.GotoNextItem=function(step){if(step==0)return false;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();if(pageSize>this.Data.Data.length)return false;var moveCount=0;if(step>0){for(var i=0;i<step;++i){if(this.Data.YOffset+pageSize>=this.Data.Data.length)break;++this.Data.YOffset;++moveCount;}}else if(step<0){step=Math.abs(step);for(var i=0;i<step;++i){if(this.Data.YOffset<=0)break;--this.Data.YOffset;++moveCount;}}return moveCount>0;};this.GotoNextPage=function(bCycle)//bCycle 是否循环
 {if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();var dataCount=chart.GetAllRowCount();if(pageSize>dataCount)return false;if(this.Data.YOffset+pageSize>=dataCount){if(bCycle===true){this.Data.YOffset=0;//循环到第1页
 return true;}else{return false;}}this.Data.YOffset+=pageSize;var showDataCount=dataCount-this.Data.YOffset;if(chart.SelectedModel==0){if(chart.SelectedRow>showDataCount-1)chart.SelectedRow=showDataCount-1;}return true;};this.GotoPreviousPage=function(bCycle)//bCycle 是否循环
 {if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();var dataCount=chart.GetAllRowCount();if(pageSize>dataCount)return false;if(this.Data.YOffset<=0){if(bCycle===true){this.Data.YOffset=dataCount-pageSize;//循环到最后一页
@@ -14420,8 +14422,8 @@ case TREPORT_COLUMN_ID.BUY_VOL_ID://买量
 case TREPORT_COLUMN_ID.POSITION_ID://持仓量
 case TREPORT_COLUMN_ID.VOL_ID://成交量
 case TREPORT_COLUMN_ID.AMOUNT_ID://成交金额
-var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:this.FormatReserveString(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.Type,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);if(column.EnableChartTooltip){var tooltipData={Rect:rtItem,Data:data,Index:index,Column:column,CellType:cellType,Type:20};this.TooltipRect.push(tooltipData);}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_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);}}//TODO: 不同类型的 格式化输出 
-drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_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;}};this.GetFlashBGData=function(drawInfo,exePriceData,columnType,cellType){if(!exePriceData.TData)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(columnType)){var item=data.Data.get(columnType);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
+var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:this.FormatReserveString(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.ID,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);if(column.EnableChartTooltip){var tooltipData={Rect:rtItem,Data:data,Index:index,Column:column,CellType:cellType,Type:20};this.TooltipRect.push(tooltipData);}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_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);}}//TODO: 不同类型的 格式化输出 
+drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_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;}};this.GetFlashBGData=function(drawInfo,exePriceData,id,cellType){if(!exePriceData.TData)return;if(!id)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(id)){var item=data.Data.get(id);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
 this.FormatVolString=function(value,languageID){if(!IFrameSplitOperator.IsNumber(value))return null;return IFrameSplitOperator.FormatVolString(value,languageID);};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.DrawCell=function(drawInfo){var rtText=drawInfo.RectText;var yCenter=rtText.Top+rtText.Height/2;var fontBackup=null;//字体备份
 if(drawInfo.BGColor)//背景
 {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.FlashBGColor)//闪动背景
@@ -15237,7 +15239,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.14955";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.14961";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.14956",
+  "version": "1.1.14962",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55964,6 +55964,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         var srcStock=fullData[0];
         var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
 
+        var lastItem=null;
         for(var i=0;i<srcStock.minute.length;++i)
         {
             var item=srcStock.minute[i];
@@ -55972,6 +55973,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
                 //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
                 var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
                 stockItem.minute.push(minItem);
+                lastItem=minItem;
                 if (stockItem.minute.length>3) break;
             }
         }
@@ -55997,28 +55999,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         if (callcation.After)
         {
             var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} };  //9:15-9:25 集合竞价15分钟 1s一个数据 
+            var afterData=[];
 
-            var afterData=
-            [
-                [145708,price+0.01, 400, 300, 1, 800],
-                [145718,price+0.02, 550, 600, 0, 1500],
-                [145738,price+0.02, 150, 800, 0, 1500],
-                [145748,price+0.02, 150, 800, 0, 1500],
-                [145803,price+0.03, 300, 600, 1, 3600],
-                [145815,price+0.03, 350, 210, 2, 1600],
-                [145826,price+0.02, 1210, 350, 2, 2700],
-                [145833,price+0.01, 260, 550, 2, 1000],
-                [145845,price+0.02, 160, 750, 2, 1000],
-                [145858,price-0.01, 460, 650, 2, 1500],
-                [145905,price-0.02, 160, 450, 1, 1500],
-                [145928,price-0.02, 260, 250, 1, 1500],
-                [145948,price-0.02, 860, 150, 1, 1500],
-            ];
+            if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
+            {
+                var price=lastItem[5];
+                afterData=
+                [
+                    [145708,price+0.01, 400, 300, 1, 800],
+                    [145718,price+0.02, 550, 600, 0, 1500],
+                    [145738,price+0.02, 150, 800, 0, 1500],
+                    [145748,price+0.02, 150, 800, 0, 1500],
+                    [145803,price+0.03, 300, 600, 1, 3600],
+                    [145815,price+0.03, 350, 210, 2, 1600],
+                    [145826,price+0.02, 1210, 350, 2, 2700],
+                    [145833,price+0.01, 260, 550, 2, 1000],
+                    [145845,price+0.02, 160, 750, 2, 1000],
+                    [145858,price-0.01, 460, 650, 2, 1500],
+                    [145905,price-0.02, 160, 450, 1, 1500],
+                    [145928,price-0.02, 260, 250, 1, 1500],
+                    [145948,price-0.02, 860, 150, 1, 1500],
+                ];
+            }
 
             stockItem.after=afterData;
             stockItem.afterinfo=afterInfo;
         }
 
+        if (bBuySellBar && lastItem)    //盘口分析
+        {
+            var lastPrice=lastItem[4];
+            var aryBuy=[];
+            var value=lastPrice+0.01;
+            for(var i=0;i<10;++i)
+            {
+                aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+    
+            var arySell=[];
+            for(var i=0;i<10;++i)
+            {
+                arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+
+            stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+        }
+
         var hqchartData={code:0, stock:[stockItem], dataType:1 };
         hqchartData.LatestPointFlash={ FlashCount:2 };
 

package/src/jscommon/umychart.TReport.js

@@ -2716,7 +2716,7 @@ function ChartTReport()
             }
 
             this.GetMarkBorderData(drawInfo, exePriceData.ExePrice, column.Type, cellType);
-            this.GetFlashBGData(drawInfo, exePriceData, column.Type, cellType);
+            this.GetFlashBGData(drawInfo, exePriceData, column.ID, cellType);
         }
 
         this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
@@ -2774,9 +2774,10 @@ function ChartTReport()
         }
     }
 
-    this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
+    this.GetFlashBGData=function(drawInfo, exePriceData, id, cellType)
     {
         if (!exePriceData.TData) return;
+        if (!id) return;
 
         var data=null;
         if (cellType==1) data=exePriceData.TData.LeftFlashBG;
@@ -2784,9 +2785,9 @@ function ChartTReport()
 
         if (!data || !data.Data) return;
 
-        if (data.Data.has(columnType))
+        if (data.Data.has(id))
         {
-            var item=data.Data.get(columnType);
+            var item=data.Data.get(id);
             drawInfo.FlashBGColor=item.Color;
             --item.Count;
 

package/src/jscommon/umychart.js

@@ -92227,6 +92227,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
         }
 
+        this.ResetDataStatus();
+        this.ClearIndexPaint(); 
+        this.ClearIndexRunCount();
+        this.ClearStockCache();    
+
         if (this.DayCount<=1) this.RequestMinuteData();               
         else this.RequestHistoryMinuteData();
     }
@@ -92842,6 +92847,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.SetLatestPointFlash(item.FlashCount)
         }
 
+        if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
+        {
+            this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
+            this.RecvBuySellData(data.stock[0].BuySellData);
+        }
+
         if (this.DayCount>1)    //多日走势图
         {
             this.UpdateCallCationData(beforeOpenData,afterCloseData,  { DataType:1});
@@ -94795,6 +94806,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //获取最新的一条盘后数据
     this.GetLatestAfterCloseItem=function()
     {
+        var lastItem=null;
         if (this.DayCount>1)
         {
             if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;

package/src/jscommon/umychart.report.js

@@ -206,6 +206,7 @@ function JSReportChart(divElement)
         if (option.SortInfo)
         {
             var item=option.SortInfo;
+            if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
             if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
             if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
         }
@@ -1027,6 +1028,7 @@ function JSReportChartContainer(uielement)
             if (option.SortInfo)
             {
                 var item=option.SortInfo;
+                if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
                 if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
                 if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
             }
@@ -3041,6 +3043,53 @@ function JSReportChartContainer(uielement)
         return chart;
     }
 
+    //获取列索引
+    this.FindFiledIndex=function(search)
+    {
+        if (!search) return -1;
+        var chart=this.GetReportChart();
+        if (!chart) return -1;
+        if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
+
+        if (search.ID)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.ID==search.ID) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Title)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Title==search.Title) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Type)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Type==search.Type) return i;
+            }
+
+            return -1;
+        }
+
+        return -1;
+    }
+
     this.GotoNextItem=function(step)
     {
         if (step==0) return false;

package/src/jscommon/umychart.testdata.js

@@ -450,6 +450,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         var srcStock=fullData[0];
         var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
 
+        var lastItem=null;
         for(var i=0;i<srcStock.minute.length;++i)
         {
             var item=srcStock.minute[i];
@@ -458,6 +459,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
                 //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
                 var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
                 stockItem.minute.push(minItem);
+                lastItem=minItem;
                 if (stockItem.minute.length>3) break;
             }
         }
@@ -483,28 +485,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         if (callcation.After)
         {
             var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} };  //9:15-9:25 集合竞价15分钟 1s一个数据 
+            var afterData=[];
 
-            var afterData=
-            [
-                [145708,price+0.01, 400, 300, 1, 800],
-                [145718,price+0.02, 550, 600, 0, 1500],
-                [145738,price+0.02, 150, 800, 0, 1500],
-                [145748,price+0.02, 150, 800, 0, 1500],
-                [145803,price+0.03, 300, 600, 1, 3600],
-                [145815,price+0.03, 350, 210, 2, 1600],
-                [145826,price+0.02, 1210, 350, 2, 2700],
-                [145833,price+0.01, 260, 550, 2, 1000],
-                [145845,price+0.02, 160, 750, 2, 1000],
-                [145858,price-0.01, 460, 650, 2, 1500],
-                [145905,price-0.02, 160, 450, 1, 1500],
-                [145928,price-0.02, 260, 250, 1, 1500],
-                [145948,price-0.02, 860, 150, 1, 1500],
-            ];
+            if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
+            {
+                var price=lastItem[5];
+                afterData=
+                [
+                    [145708,price+0.01, 400, 300, 1, 800],
+                    [145718,price+0.02, 550, 600, 0, 1500],
+                    [145738,price+0.02, 150, 800, 0, 1500],
+                    [145748,price+0.02, 150, 800, 0, 1500],
+                    [145803,price+0.03, 300, 600, 1, 3600],
+                    [145815,price+0.03, 350, 210, 2, 1600],
+                    [145826,price+0.02, 1210, 350, 2, 2700],
+                    [145833,price+0.01, 260, 550, 2, 1000],
+                    [145845,price+0.02, 160, 750, 2, 1000],
+                    [145858,price-0.01, 460, 650, 2, 1500],
+                    [145905,price-0.02, 160, 450, 1, 1500],
+                    [145928,price-0.02, 260, 250, 1, 1500],
+                    [145948,price-0.02, 860, 150, 1, 1500],
+                ];
+            }
 
             stockItem.after=afterData;
             stockItem.afterinfo=afterInfo;
         }
 
+        if (bBuySellBar && lastItem)    //盘口分析
+        {
+            var lastPrice=lastItem[4];
+            var aryBuy=[];
+            var value=lastPrice+0.01;
+            for(var i=0;i<10;++i)
+            {
+                aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+    
+            var arySell=[];
+            for(var i=0;i<10;++i)
+            {
+                arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+
+            stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+        }
+
         var hqchartData={code:0, stock:[stockItem], dataType:1 };
         hqchartData.LatestPointFlash={ FlashCount:2 };
 

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

@@ -96323,6 +96323,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
         }
 
+        this.ResetDataStatus();
+        this.ClearIndexPaint(); 
+        this.ClearIndexRunCount();
+        this.ClearStockCache();    
+
         if (this.DayCount<=1) this.RequestMinuteData();               
         else this.RequestHistoryMinuteData();
     }
@@ -96938,6 +96943,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.SetLatestPointFlash(item.FlashCount)
         }
 
+        if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
+        {
+            this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
+            this.RecvBuySellData(data.stock[0].BuySellData);
+        }
+
         if (this.DayCount>1)    //多日走势图
         {
             this.UpdateCallCationData(beforeOpenData,afterCloseData,  { DataType:1});
@@ -98891,6 +98902,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //获取最新的一条盘后数据
     this.GetLatestAfterCloseItem=function()
     {
+        var lastItem=null;
         if (this.DayCount>1)
         {
             if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;
@@ -138209,6 +138221,7 @@ function JSReportChart(divElement)
         if (option.SortInfo)
         {
             var item=option.SortInfo;
+            if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
             if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
             if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
         }
@@ -139030,6 +139043,7 @@ function JSReportChartContainer(uielement)
             if (option.SortInfo)
             {
                 var item=option.SortInfo;
+                if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
                 if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
                 if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
             }
@@ -141044,6 +141058,53 @@ function JSReportChartContainer(uielement)
         return chart;
     }
 
+    //获取列索引
+    this.FindFiledIndex=function(search)
+    {
+        if (!search) return -1;
+        var chart=this.GetReportChart();
+        if (!chart) return -1;
+        if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
+
+        if (search.ID)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.ID==search.ID) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Title)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Title==search.Title) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Type)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Type==search.Type) return i;
+            }
+
+            return -1;
+        }
+
+        return -1;
+    }
+
     this.GotoNextItem=function(step)
     {
         if (step==0) return false;
@@ -151464,7 +151525,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14955";
+var HQCHART_VERSION="1.1.14961";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -55982,6 +55982,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         var srcStock=fullData[0];
         var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
 
+        var lastItem=null;
         for(var i=0;i<srcStock.minute.length;++i)
         {
             var item=srcStock.minute[i];
@@ -55990,6 +55991,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
                 //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
                 var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
                 stockItem.minute.push(minItem);
+                lastItem=minItem;
                 if (stockItem.minute.length>3) break;
             }
         }
@@ -56015,28 +56017,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
         if (callcation.After)
         {
             var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} };  //9:15-9:25 集合竞价15分钟 1s一个数据 
+            var afterData=[];
 
-            var afterData=
-            [
-                [145708,price+0.01, 400, 300, 1, 800],
-                [145718,price+0.02, 550, 600, 0, 1500],
-                [145738,price+0.02, 150, 800, 0, 1500],
-                [145748,price+0.02, 150, 800, 0, 1500],
-                [145803,price+0.03, 300, 600, 1, 3600],
-                [145815,price+0.03, 350, 210, 2, 1600],
-                [145826,price+0.02, 1210, 350, 2, 2700],
-                [145833,price+0.01, 260, 550, 2, 1000],
-                [145845,price+0.02, 160, 750, 2, 1000],
-                [145858,price-0.01, 460, 650, 2, 1500],
-                [145905,price-0.02, 160, 450, 1, 1500],
-                [145928,price-0.02, 260, 250, 1, 1500],
-                [145948,price-0.02, 860, 150, 1, 1500],
-            ];
+            if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
+            {
+                var price=lastItem[5];
+                afterData=
+                [
+                    [145708,price+0.01, 400, 300, 1, 800],
+                    [145718,price+0.02, 550, 600, 0, 1500],
+                    [145738,price+0.02, 150, 800, 0, 1500],
+                    [145748,price+0.02, 150, 800, 0, 1500],
+                    [145803,price+0.03, 300, 600, 1, 3600],
+                    [145815,price+0.03, 350, 210, 2, 1600],
+                    [145826,price+0.02, 1210, 350, 2, 2700],
+                    [145833,price+0.01, 260, 550, 2, 1000],
+                    [145845,price+0.02, 160, 750, 2, 1000],
+                    [145858,price-0.01, 460, 650, 2, 1500],
+                    [145905,price-0.02, 160, 450, 1, 1500],
+                    [145928,price-0.02, 260, 250, 1, 1500],
+                    [145948,price-0.02, 860, 150, 1, 1500],
+                ];
+            }
 
             stockItem.after=afterData;
             stockItem.afterinfo=afterInfo;
         }
 
+        if (bBuySellBar && lastItem)    //盘口分析
+        {
+            var lastPrice=lastItem[4];
+            var aryBuy=[];
+            var value=lastPrice+0.01;
+            for(var i=0;i<10;++i)
+            {
+                aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+    
+            var arySell=[];
+            for(var i=0;i<10;++i)
+            {
+                arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+
+            stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+        }
+
         var hqchartData={code:0, stock:[stockItem], dataType:1 };
         hqchartData.LatestPointFlash={ FlashCount:2 };
 

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

@@ -96367,6 +96367,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
         }
 
+        this.ResetDataStatus();
+        this.ClearIndexPaint(); 
+        this.ClearIndexRunCount();
+        this.ClearStockCache();    
+
         if (this.DayCount<=1) this.RequestMinuteData();               
         else this.RequestHistoryMinuteData();
     }
@@ -96982,6 +96987,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.SetLatestPointFlash(item.FlashCount)
         }
 
+        if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
+        {
+            this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
+            this.RecvBuySellData(data.stock[0].BuySellData);
+        }
+
         if (this.DayCount>1)    //多日走势图
         {
             this.UpdateCallCationData(beforeOpenData,afterCloseData,  { DataType:1});
@@ -98935,6 +98946,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //获取最新的一条盘后数据
     this.GetLatestAfterCloseItem=function()
     {
+        var lastItem=null;
         if (this.DayCount>1)
         {
             if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;
@@ -138253,6 +138265,7 @@ function JSReportChart(divElement)
         if (option.SortInfo)
         {
             var item=option.SortInfo;
+            if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
             if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
             if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
         }
@@ -139074,6 +139087,7 @@ function JSReportChartContainer(uielement)
             if (option.SortInfo)
             {
                 var item=option.SortInfo;
+                if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
                 if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
                 if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
             }
@@ -141088,6 +141102,53 @@ function JSReportChartContainer(uielement)
         return chart;
     }
 
+    //获取列索引
+    this.FindFiledIndex=function(search)
+    {
+        if (!search) return -1;
+        var chart=this.GetReportChart();
+        if (!chart) return -1;
+        if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
+
+        if (search.ID)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.ID==search.ID) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Title)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Title==search.Title) return i;
+            }
+
+            return -1;
+        }
+
+        if (search.Type)
+        {
+            for(var i=0;i<chart.Column.length;++i)
+            {
+                var item=chart.Column[i];
+                if (!item) continue;
+                if (item.Type==search.Type) return i;
+            }
+
+            return -1;
+        }
+
+        return -1;
+    }
+
     this.GotoNextItem=function(step)
     {
         if (step==0) return false;
@@ -150885,7 +150946,7 @@ function ChartTReport()
             }
 
             this.GetMarkBorderData(drawInfo, exePriceData.ExePrice, column.Type, cellType);
-            this.GetFlashBGData(drawInfo, exePriceData, column.Type, cellType);
+            this.GetFlashBGData(drawInfo, exePriceData, column.ID, cellType);
         }
 
         this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
@@ -150943,9 +151004,10 @@ function ChartTReport()
         }
     }
 
-    this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
+    this.GetFlashBGData=function(drawInfo, exePriceData, id, cellType)
     {
         if (!exePriceData.TData) return;
+        if (!id) return;
 
         var data=null;
         if (cellType==1) data=exePriceData.TData.LeftFlashBG;
@@ -150953,9 +151015,9 @@ function ChartTReport()
 
         if (!data || !data.Data) return;
 
-        if (data.Data.has(columnType))
+        if (data.Data.has(id))
         {
-            var item=data.Data.get(columnType);
+            var item=data.Data.get(id);
             drawInfo.FlashBGColor=item.Color;
             --item.Count;
 
@@ -162839,7 +162901,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14955";
+var HQCHART_VERSION="1.1.14961";
 
 function PrintHQChartVersion()
 {