hqchart 1.1.13269 → 1.1.13276

package/lib/umychart.NetworkFilterTest.vue.js

@@ -12,8 +12,12 @@ HQData.RequestFlowCapitalData(data,callback);break;case'KLineChartContainer::Req
 HQData.RequestHistoryMinuteData(data,callback);break;case'KLineChartContainer::RequestMinuteRealtimeData'://分钟增量数据更新
 HQData.RequestMinuteRealtimeData(data,callback);break;case"JSSymbolData::GetVariantData"://额外的变量数据
 HQData.RequestIndexVariantData(data,callback);break;case"JSSymbolData::GetOtherSymbolData":HQData.RequestOtherSymbolData(data,callback);break;case"AnnouncementInfo::RequestData":HQData.AnnouncementInfo_RequestData(data,callback);break;case"JSSymbolData::GetLatestData":HQData.RequestLatestData(data,callback);break;case"PforecastInfo::RequestData":HQData.PforecastInfo_RequestData(data,callback);break;case"InvestorInfo::RequestData":HQData.InvestorInfo_RequestData(data,callback);break;case"ResearchInfo::RequestData":break;case"BlockTrading::RequestData":HQData.BlockTrading_RequestData(data,callback);break;case"TradeDetail::RequestData":HQData.TradeDetail_RequestData(data,callback);break;}};HQData.RequestMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];//请求的股票代码
-var dayCount=data.Request.Data.daycount;console.log("[HQData::RequestMinuteData] Symbol="+symbol);var hqchartData=MINUTE_1DAY_DATA;hqchartData.stock[0].symbol=symbol;hqchartData.stock[0].name=symbol;callback(hqchartData);};HQData.RequestMinuteDaysData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
-var dayCount=data.Request.Data.daycount;console.log("[HQData::RequestMinuteDaysData] Symbol="+symbol);var hqchartData=MINUTE_5DAY_DATA;hqchartData.symbol=symbol;hqchartData.name=symbol;callback(hqchartData);};HQData.RequestHistoryData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
+var callcation=data.Request.Data.callcation;//集合竞价
+console.log("[HQData::RequestMinuteData] Symbol="+symbol);var srcStock=MINUTE_1DAY_DATA.stock[0];var stockItem={date:srcStock.date,minute:srcStock.minute,yclose:srcStock.yclose,symbol:srcStock.symbol,name:srcStock.name};if(callcation.Before){var before=[//[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+[915,srcStock.yclose,0,0],[916,srcStock.yclose+0.01,0,0],[917,srcStock.yclose+0.03,0,0],[918,srcStock.yclose+0.02,0,0],[919,srcStock.yclose+0.02,0,0],[920,srcStock.yclose+0.01,0,0],[921,srcStock.yclose,0,0],[922,srcStock.yclose-0.02,0,0],[923,srcStock.yclose-0.03,0,0],[924,srcStock.yclose,0,0],[925,srcStock.yclose,0,0]];var beforeinfo={totalcount:11,ver:1.0};stockItem.before=before;stockItem.beforeinfo=beforeinfo;}var hqchartData={code:0,stock:[stockItem]};callback(hqchartData);};HQData.RequestMinuteDaysData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
+var dayCount=data.Request.Data.daycount;var callcation=data.Request.Data.callcation;//集合竞价
+console.log("[HQData::RequestMinuteDaysData] Symbol="+symbol);var hqchartData={code:0,data:[]};hqchartData.symbol=MINUTE_5DAY_DATA.symbol;hqchartData.name=MINUTE_5DAY_DATA.symbol;for(var i=0;i<dayCount&&i<MINUTE_5DAY_DATA.data.length;++i){var item=MINUTE_5DAY_DATA.data[i];var dayItem={minute:item.minute,yclose:item.yclose,date:item.date};if(callcation.Before){var before=[//[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+[915,item.yclose,0,0],[916,item.yclose+0.01,0,0],[917,item.yclose+0.03,0,0],[918,item.yclose+0.02,0,0],[919,item.yclose+0.02,0,0],[920,item.yclose+0.01,0,0],[921,item.yclose,0,0],[922,item.yclose-0.02,0,0],[923,item.yclose-0.03,0,0],[924,item.yclose,0,0],[925,item.yclose,0,0]];var beforeinfo={totalcount:11,ver:1.0};dayItem.before=before;dayItem.beforeinfo=beforeinfo;}hqchartData.data.push(dayItem);}callback(hqchartData);};HQData.RequestHistoryData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
 console.log("[HQData::RequestMinuteDaysData] Symbol="+symbol);var hqchartData=KLINE_DAY_DATA;hqchartData.symbol=symbol;hqchartData.name=symbol;callback(hqchartData);};HQData.RequestFlowCapitalData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
 console.log("[HQData::RequestFlowCapitalData] Symbol="+symbol);var hqchartData=KLINE_CAPITAL_DATA;callback(hqchartData);};HQData.RequestRealtimeData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];//请求的股票代码
 console.log("[HQData::RequestRealtimeData] Symbol="+symbol);var hqchartData=KLINE_1DAY_DATA;hqchartData.stock[0].name=symbol;hqchartData.stock[0].symbol=symbol;callback(hqchartData);};HQData.RequestHistoryMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码

package/lib/umychart.vue.js

@@ -2000,7 +2000,8 @@ this.Draw();break;case JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID:if(!IFrameSpl
 this.OnClickRightMenu=function(data){JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);if(!data||!data.Data)return;var cmdID=data.Data.ID;//命令ID
 var aryArgs=data.Data.Args;//参数
 var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);//回调通知外部
-if(event&&event.Callback){var data={PreventDefault:false,CommandID:cmdID,Args:aryArgs,SrcData:data};event.Callback(event,data,this);if(data.PreventDefault)return;}this.ExecuteMenuCommand(cmdID,aryArgs);};this.PopupRightMenuV2=function(data,e){var _this15=this;if(!this.JSPopMenu)return;var x=data.X,y=data.Y;var frameID=data.FrameID;var menuData={Menu:this.GetRightMenuData(frameID),Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID};menuData.ClickCallback=function(data){_this15.OnClickRightMenu(data);};var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);if(event&&event.Callback){var sendData={MenuData:menuData,FrameID:frameID};event.Callback(event,sendData,this);}this.PopupMenuByRClick(menuData,x,y);};}function GetDevicePixelRatio(){if(typeof window=='undefined')return 1;return window.devicePixelRatio||1;}function GetFontHeight(context,font,word){if(!context)return null;if(font)context.font=font;var text='擎';if(IFrameSplitOperator.IsString(word))text=word;var fontInfo=context.measureText(text);var textHeight=fontInfo.fontBoundingBoxAscent+fontInfo.fontBoundingBoxDescent;if(!IFrameSplitOperator.IsNumber(textHeight))textHeight=fontInfo.width+2*GetDevicePixelRatio();return textHeight;}function IsPhoneWeb(){var userAgentInfo=navigator.userAgent;var Agents=new Array("Android","iPhone","SymbianOS","Windows Phone","iPad","iPod");for(var v=0;v<Agents.length;v++){if(userAgentInfo.indexOf(Agents[v])>0)return true;}return false;}function OnKeyDown(e)//键盘事件
+if(event&&event.Callback){var data={PreventDefault:false,CommandID:cmdID,Args:aryArgs,SrcData:data};event.Callback(event,data,this);if(data.PreventDefault)return;}this.ExecuteMenuCommand(cmdID,aryArgs);};this.PopupRightMenuV2=function(data,e){var _this15=this;if(!this.JSPopMenu)return;var x=data.X,y=data.Y;var frameID=data.FrameID;var menuData={Menu:this.GetRightMenuData(frameID),Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID};menuData.ClickCallback=function(data){_this15.OnClickRightMenu(data);};var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);if(event&&event.Callback){var sendData={MenuData:menuData,FrameID:frameID};event.Callback(event,sendData,this);}this.PopupMenuByRClick(menuData,x,y);};//指标窗口扩展图形
+this.CreateChartPaintExtend=function(chart,windowIndex){if(windowIndex<0)return false;var subFrame=this.Frame.SubFrame[windowIndex];if(!subFrame||!subFrame.Frame)return false;var frame=subFrame.Frame;chart.Canvas=this.Canvas;chart.ChartBorder=frame.ChartBorder;chart.ChartFrame=frame;this.ChartPaintEx.push(chart);return true;};}function GetDevicePixelRatio(){if(typeof window=='undefined')return 1;return window.devicePixelRatio||1;}function GetFontHeight(context,font,word){if(!context)return null;if(font)context.font=font;var text='擎';if(IFrameSplitOperator.IsString(word))text=word;var fontInfo=context.measureText(text);var textHeight=fontInfo.fontBoundingBoxAscent+fontInfo.fontBoundingBoxDescent;if(!IFrameSplitOperator.IsNumber(textHeight))textHeight=fontInfo.width+2*GetDevicePixelRatio();return textHeight;}function IsPhoneWeb(){var userAgentInfo=navigator.userAgent;var Agents=new Array("Android","iPhone","SymbianOS","Windows Phone","iPad","iPod");for(var v=0;v<Agents.length;v++){if(userAgentInfo.indexOf(Agents[v])>0)return true;}return false;}function OnKeyDown(e)//键盘事件
 {if(this.JSChartContainer&&this.JSChartContainer.OnKeyDown)this.JSChartContainer.OnKeyDown(e);}function OnWheel(e)//上下滚动事件
 {if(this.JSChartContainer&&this.JSChartContainer.OnWheel)this.JSChartContainer.OnWheel(e);}function ToFixed(number,precision){var b=1;if(isNaN(number))return number;if(number<0)b=-1;var multiplier=Math.pow(10,precision);var value=Math.round(Math.abs(number)*multiplier)/multiplier*b;if(/^(\d+(?:\.\d+)?)(e)([\-]?\d+)$/.test(value))var s=value.toFixed2(precision);else var s=value.toString();var rs=s.indexOf('.');if(rs<0&&precision>0){rs=s.length;s+='.';}while(s.length<=rs+precision){s+='0';}return s;}Number.prototype.toFixed2=Number.prototype.toFixed;//备份下老的
 Number.prototype.toFixed=function(precision){return ToFixed(this,precision);};function Guid(){function S4(){return((1+Math.random())*0x10000|0).toString(16).substring(1);}return"guid"+(S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());}function GetScrollPosition(){var scrollPos={};var scrollTop=0;var scrollLeft=0;if(document.documentElement&&(document.documentElement.scrollTop||document.documentElement.scrollLeft)){scrollTop=document.documentElement.scrollTop;scrollLeft=document.documentElement.scrollLeft;}else if(document.body){scrollTop=document.body.scrollTop;scrollLeft=document.body.scrollLeft;}scrollPos.Top=scrollTop;scrollPos.Left=scrollLeft;return scrollPos;}//修正线段有毛刺
@@ -7760,10 +7761,10 @@ this.DayData;//多日分钟数据
 this.LimitPrice;//涨停价格 { Max:null, Min:null };  
 this.IsShowBeforeData=false;//是否显示盘前集合竞价数据 (当日)
 this.BeforeOpenData=null;//盘前集合竞价数据
-this.IsBeforeData=false;//是否支持显示盘前集合竞价数据
+this.IsBeforeData=false;//是否支持显示盘前集合竞价数据(当日)
 this.IsShowAfterData=false;//收盘集合竞价
 this.AfterCloseData=null;//收盘集合竞价数据
-this.IsAfterData=false;//是否支持显示收盘集合竞价数据
+this.IsAfterData=false;//是否支持显示收盘集合竞价数据(当日)
 this.ShareAfterVol=0;//1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
 this.ExtendWidth={Left:120,Right:120};//单日分时图 左右扩展图形宽度
 this.IsShowLead=true;//指数是否显示领先指标
@@ -7771,7 +7772,7 @@ this.IsShowMultiDayBeforeData=false;//多日分时图 是否显示盘前集合
 this.MultiDayBeforeOpenData=null;//多日分时图 盘前集合竞价数据 
 this.IsShowMultiDayAfterData=false;//多日分时图 是否显示收盘集合竞价
 this.MultiDayAfterCloseData=null;//多日分时图 收盘集合竞价数据
-this.MultiDayExtendWidth={Left:20,Right:20};//多日分时图 左右扩展图形宽度
+this.MultiDayExtendWidth={Left:40,Right:20};//多日分时图 左右扩展图形宽度
 this.ChartDrawStorage=new ChartDrawStorage();this.ChartDrawStorageCache=null;//首次需要创建的画图工具数据
 this.MinuteApiUrl=g_JSChartResource.Domain+"/API/Stock";this.HistoryMinuteApiUrl=g_JSChartResource.Domain+'/API/StockMinuteData';//历史分钟数据
 this.ColorLineData;//主图价格线颜色自定义配置
@@ -7976,8 +7977,9 @@ this.UpdateFrameMaxMin();this.Draw();};this.ShowBeforeData=function(isShow,optio
 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.RequestData();};this.RequestData=function(){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 obj={Name:'MinuteChartContainer::RequestHistoryMinuteData',//类名::函数
-Explain:'多日分时数据',Request:{Url:self.HistoryMinuteApiUrl,Data:{daycount:self.DayCount,symbol:self.Symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvHistoryMinuteData(data);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
+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 obj={Name:'MinuteChartContainer::RequestHistoryMinuteData',//类名::函数
+Explain:'多日分时数据',Request:{Url:self.HistoryMinuteApiUrl,Data:{daycount:self.DayCount,symbol:self.Symbol,callcation:callCation},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvHistoryMinuteData(data);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
 }JSNetwork.HttpRequest({url:self.HistoryMinuteApiUrl,data:{"symbol":self.Symbol,"daycount":self.DayCount},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvHistoryMinuteData(data);}});};this.RecvHistoryMinuteData=function(data){if(this.EnableVerifyRecvData&&data.symbol!=this.Symbol){JSConsole.Chart.Warn('[MinuteChartContainer::RecvHistoryMinuteData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.symbol+']');return;}this.DayData=MinuteChartContainer.JsonDataToMinuteDataArray(data);this.ColorLineData=MinuteChartContainer.JsonDataToHistoryMinuteLineColorData(data);this.MultiDayBeforeOpenData=MinuteChartContainer.JosnDataToBeforeOpenDataArray(data);this.MultiDayAfterCloseData=MinuteChartContainer.JosnDataToAfterCloseDataArray(data);var updateTime=MinuteChartContainer.JsonDataToHistoryMinuteLastUpdateTime(data);this.DataStatus.MultiDay=true;this.CaclutateCallCationYRange();this.Symbol=data.symbol;this.Name=data.name;this.SetCallCationDataBorder({Left:false,Right:false,MultiDay:{Left:this.IsShowMultiDayBeforeData,Right:this.IsShowMultiDayAfterData}});this.CaclutateLimitPrice(this.DayData[0].YClose,data.data[0].limitprice);//计算涨停价格
 this.UpdateHistoryMinuteUI(updateTime);this.RecvMinuteDataEvent({FunctionName:"RecvHistoryMinuteData"});this.RequestOverlayHistoryMinuteData();this.BindAllOverlayIndexData(this.SourceData);this.AutoUpdateEvent(true,"MinuteChartContainer::RequestHistoryMinuteData");this.AutoUpdate();};this.CaclutateCallCationYRange=function(){//多日集合竞价Y轴统一成交量
 var afterRange=null,beforeRange=null;if(IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){var range={Max:null,Min:null};for(var i=0;i<this.MultiDayAfterCloseData.length;++i){var item=this.MultiDayAfterCloseData[i];if(range.Max==null)range.Max=item.VolMax;else if(range.Max<item.VolMax)range.Max=item.VolMax;if(range.Min==null)range.Min=item.VolMin;else if(range.Min>item.VolMin)range.Min=item.VolMin;}afterRange=range;}if(IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData)){var range={Max:null,Min:null};for(var i=0;i<this.MultiDayBeforeOpenData.length;++i){var item=this.MultiDayBeforeOpenData[i];if(range.Max==null)range.Max=item.VolMax;else if(range.Max<item.VolMax)range.Max=item.VolMax;if(range.Min==null)range.Min=item.VolMin;else if(range.Min>item.VolMin)range.Min=item.VolMin;}beforeRange=range;}if(this.ShareAfterVol==2)// 公用坐标
@@ -7999,7 +8001,8 @@ if(stock&&IFrameSplitOperator.IsNumber(stock.yclose))item.YClose=stock.yclose;if
 this.UpdateLatestMinuteDataV2=function(minuteData){if(this.DayCount>1){if(!this.DayData)return;var findItem=null;for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];if(item.Date===date){findItem=item;break;}}if(!findItem)return;var findIndex=-1;var firstItem=minuteData.Data[0];for(var i=0;i<findItem.Data.length;++i){var item=findItem.Data[i];if(item.Date==firstItem.Date&&item.Time==firstItem.Time){findIndex=i;break;}}if(findIndex<0)findIndex=findItem.Data.length;for(var i=0,j=findIndex;i<minuteData.Data.length;++i,++j){var item=minuteData.Data[i];findItem.Data[j]=item;}}else{if(!this.SourceData)return;var findIndex=-1;var firstItem=minuteData.Data[0];for(var i=0;i<this.SourceData.Data.length;++i){var item=this.SourceData.Data[i];if(item.Date==firstItem.Date&&item.Time==firstItem.Time){findIndex=i;break;}}if(findIndex<0)findIndex=this.SourceData.Data.length;for(var i=0,j=findIndex;i<minuteData.Data.length;++i,++j){var item=minuteData.Data[i];this.SourceData.Data[j]=item;}}};//请求分钟数据
 this.RequestMinuteData=function(){var self=this;var fields=["name","symbol","yclose","open","price","high","low","vol","amount","date","time","minute","minutecount"];var upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)){//期货的需要加上结算价
 fields.push("clearing");fields.push("yclearing");}//  盘前数据(A股)
-this.IsBeforeData=false;if(this.IsShowBeforeData&&this.DayCount===1&&MARKET_SUFFIX_NAME.IsSHSZStockA(self.Symbol)){this.IsBeforeData=true;fields.push('before');}this.IsAfterData=false;if(this.IsShowAfterData&&this.DayCount===1&&MARKET_SUFFIX_NAME.IsSHSZStockA(self.Symbol)){this.IsAfterData=true;}if(this.NetworkFilter){var dateRange=null;if(this.DayCount>1){if(IFrameSplitOperator.IsNonEmptyArray(this.DayData)){var dayData=this.DayData[0];dateRange=dayData.GetDateRange();}}else{if(this.SourceData)dateRange=this.SourceData.GetDateRange();}var callCation={Before:this.IsShowBeforeData&&this.DayCount===1,After:this.IsShowAfterData&&this.DayCount===1//集合竞价
+this.IsBeforeData=false;if(this.IsShowBeforeData&&this.DayCount===1&&MARKET_SUFFIX_NAME.IsSHSZStockA(self.Symbol)){this.IsBeforeData=true;fields.push('before');}this.IsAfterData=false;if(this.IsShowAfterData&&this.DayCount===1&&MARKET_SUFFIX_NAME.IsSHSZStockA(self.Symbol)){this.IsAfterData=true;}if(this.NetworkFilter){var dateRange=null;if(this.DayCount>1){if(IFrameSplitOperator.IsNonEmptyArray(this.DayData)){var dayData=this.DayData[0];dateRange=dayData.GetDateRange();}}else{if(this.SourceData)dateRange=this.SourceData.GetDateRange();}var callCation={Before:this.IsShowBeforeData,After:this.IsShowAfterData//集合竞价
+};if(this.DayCount>1)callCation={Before:this.IsShowMultiDayBeforeData,After:this.IsShowMultiDayAfterData//多日集合竞价
 };var obj={Name:'MinuteChartContainer::RequestMinuteData',//类名::函数名
 Explain:'最新分时数据',Request:{Url:self.MinuteApiUrl,Data:{field:fields,symbol:[self.Symbol],callcation:callCation},Type:'POST'},Self:this,PreventDefault:false};if(dateRange)obj.DateRange=dateRange;//本地数据日期范围
 this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteData(data);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
@@ -13208,7 +13211,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.13268";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.13275";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.13269",
+  "version": "1.1.13276",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -48757,13 +48757,38 @@ HQData.NetworkFilter=function(data, callback)
 HQData.RequestMinuteData=function(data, callback)
 {
     data.PreventDefault=true;
-    var symbol=data.Request.Data.symbol[0]; //请求的股票代码
-    var dayCount=data.Request.Data.daycount;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_1DAY_DATA;
-    hqchartData.stock[0].symbol=symbol;
-    hqchartData.stock[0].name=symbol;
+    var srcStock=MINUTE_1DAY_DATA.stock[0];
+    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+    if (callcation.Before)
+    {
+        var before=
+        [
+            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+            [915, srcStock.yclose,0,0],
+            [916, srcStock.yclose+0.01,0,0],
+            [917, srcStock.yclose+0.03,0,0],
+            [918, srcStock.yclose+0.02,0,0],
+            [919, srcStock.yclose+0.02,0,0],
+            [920, srcStock.yclose+0.01,0,0],
+            [921, srcStock.yclose,0,0],
+            [922, srcStock.yclose-0.02,0,0],
+            [923, srcStock.yclose-0.03,0,0],
+            [924, srcStock.yclose,0,0],
+            [925, srcStock.yclose,0,0],
+        ];
+
+        var beforeinfo={ totalcount:11, ver:1.0 };
+
+        stockItem.before=before;
+        stockItem.beforeinfo=beforeinfo;
+    }
+
+    var hqchartData={code:0, stock:[stockItem] };
+   
 
     callback(hqchartData);
 }
@@ -48773,12 +48798,44 @@ HQData.RequestMinuteDaysData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol; //请求的股票代码
     var dayCount=data.Request.Data.daycount;
+    var callcation=data.Request.Data.callcation;        //集合竞价
   
     console.log(`[HQData::RequestMinuteDaysData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_5DAY_DATA;
-    hqchartData.symbol=symbol;
-    hqchartData.name=symbol;
+    var hqchartData={code:0, data:[] };
+    hqchartData.symbol=MINUTE_5DAY_DATA.symbol;
+    hqchartData.name=MINUTE_5DAY_DATA.symbol;
+
+    for(var i=0;i<dayCount && i<MINUTE_5DAY_DATA.data.length;++i)
+    {
+        var item=MINUTE_5DAY_DATA.data[i];
+        var dayItem={minute:item.minute, yclose:item.yclose, date:item.date };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, item.yclose,0,0],
+                [916, item.yclose+0.01,0,0],
+                [917, item.yclose+0.03,0,0],
+                [918, item.yclose+0.02,0,0],
+                [919, item.yclose+0.02,0,0],
+                [920, item.yclose+0.01,0,0],
+                [921, item.yclose,0,0],
+                [922, item.yclose-0.02,0,0],
+                [923, item.yclose-0.03,0,0],
+                [924, item.yclose,0,0],
+                [925, item.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            dayItem.before=before;
+            dayItem.beforeinfo=beforeinfo;
+        }
+
+        hqchartData.data.push(dayItem);
+    }
    
     callback(hqchartData);
 }

package/src/jscommon/umychart.js

@@ -9472,6 +9472,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.PopupMenuByRClick(menuData, x, y);
     }
+
+    //指标窗口扩展图形
+    this.CreateChartPaintExtend=function(chart, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -75056,12 +75073,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.IsShowBeforeData=false;              //是否显示盘前集合竞价数据 (当日)
     this.BeforeOpenData=null;                 //盘前集合竞价数据
-    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据
+    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据(当日)
 
     this.IsShowAfterData=false;               //收盘集合竞价
     this.AfterCloseData=null;                 //收盘集合竞价数据
-    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据
-    this.ShareAfterVol=0;              //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
+    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据(当日)
+    this.ShareAfterVol=0;                     //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
     this.ExtendWidth={ Left: 120, Right:120 } ;      //单日分时图 左右扩展图形宽度
     
     this.IsShowLead=true;                     //指数是否显示领先指标
@@ -75071,7 +75088,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.IsShowMultiDayAfterData=false;             //多日分时图 是否显示收盘集合竞价
     this.MultiDayAfterCloseData=null;                //多日分时图 收盘集合竞价数据
 
-    this.MultiDayExtendWidth={ Left:20, Right:20 };   //多日分时图 左右扩展图形宽度
+    this.MultiDayExtendWidth={ Left:40, Right:20 };   //多日分时图 左右扩展图形宽度
 
     this.ChartDrawStorage=new ChartDrawStorage();
     this.ChartDrawStorageCache=null;         //首次需要创建的画图工具数据
@@ -78058,11 +78075,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.NetworkFilter)
         {
+            var callCation=
+            { 
+                Before:this.IsShowMultiDayBeforeData , 
+                After:this.IsShowMultiDayAfterData
+            }   //集合竞价
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -78442,11 +78465,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     dateRange=this.SourceData.GetDateRange();
             }
 
-            var callCation=
-            { 
-                Before:(this.IsShowBeforeData && this.DayCount===1), 
-                After:(this.IsShowAfterData && this.DayCount===1)
-            }   //集合竞价
+            var callCation={ Before:this.IsShowBeforeData, After:this.IsShowAfterData }   //集合竞价
+            if (this.DayCount>1) callCation={ Before:this.IsShowMultiDayBeforeData, After:this.IsShowMultiDayAfterData }   //多日集合竞价
+           
             var obj=
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名

package/src/jscommon/umychart.testdata.js

@@ -82,13 +82,38 @@ HQData.NetworkFilter=function(data, callback)
 HQData.RequestMinuteData=function(data, callback)
 {
     data.PreventDefault=true;
-    var symbol=data.Request.Data.symbol[0]; //请求的股票代码
-    var dayCount=data.Request.Data.daycount;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_1DAY_DATA;
-    hqchartData.stock[0].symbol=symbol;
-    hqchartData.stock[0].name=symbol;
+    var srcStock=MINUTE_1DAY_DATA.stock[0];
+    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+    if (callcation.Before)
+    {
+        var before=
+        [
+            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+            [915, srcStock.yclose,0,0],
+            [916, srcStock.yclose+0.01,0,0],
+            [917, srcStock.yclose+0.03,0,0],
+            [918, srcStock.yclose+0.02,0,0],
+            [919, srcStock.yclose+0.02,0,0],
+            [920, srcStock.yclose+0.01,0,0],
+            [921, srcStock.yclose,0,0],
+            [922, srcStock.yclose-0.02,0,0],
+            [923, srcStock.yclose-0.03,0,0],
+            [924, srcStock.yclose,0,0],
+            [925, srcStock.yclose,0,0],
+        ];
+
+        var beforeinfo={ totalcount:11, ver:1.0 };
+
+        stockItem.before=before;
+        stockItem.beforeinfo=beforeinfo;
+    }
+
+    var hqchartData={code:0, stock:[stockItem] };
+   
 
     callback(hqchartData);
 }
@@ -98,12 +123,44 @@ HQData.RequestMinuteDaysData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol; //请求的股票代码
     var dayCount=data.Request.Data.daycount;
+    var callcation=data.Request.Data.callcation;        //集合竞价
   
     console.log(`[HQData::RequestMinuteDaysData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_5DAY_DATA;
-    hqchartData.symbol=symbol;
-    hqchartData.name=symbol;
+    var hqchartData={code:0, data:[] };
+    hqchartData.symbol=MINUTE_5DAY_DATA.symbol;
+    hqchartData.name=MINUTE_5DAY_DATA.symbol;
+
+    for(var i=0;i<dayCount && i<MINUTE_5DAY_DATA.data.length;++i)
+    {
+        var item=MINUTE_5DAY_DATA.data[i];
+        var dayItem={minute:item.minute, yclose:item.yclose, date:item.date };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, item.yclose,0,0],
+                [916, item.yclose+0.01,0,0],
+                [917, item.yclose+0.03,0,0],
+                [918, item.yclose+0.02,0,0],
+                [919, item.yclose+0.02,0,0],
+                [920, item.yclose+0.01,0,0],
+                [921, item.yclose,0,0],
+                [922, item.yclose-0.02,0,0],
+                [923, item.yclose-0.03,0,0],
+                [924, item.yclose,0,0],
+                [925, item.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            dayItem.before=before;
+            dayItem.beforeinfo=beforeinfo;
+        }
+
+        hqchartData.data.push(dayItem);
+    }
    
     callback(hqchartData);
 }

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

@@ -13364,6 +13364,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.PopupMenuByRClick(menuData, x, y);
     }
+
+    //指标窗口扩展图形
+    this.CreateChartPaintExtend=function(chart, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -78948,12 +78965,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.IsShowBeforeData=false;              //是否显示盘前集合竞价数据 (当日)
     this.BeforeOpenData=null;                 //盘前集合竞价数据
-    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据
+    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据(当日)
 
     this.IsShowAfterData=false;               //收盘集合竞价
     this.AfterCloseData=null;                 //收盘集合竞价数据
-    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据
-    this.ShareAfterVol=0;              //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
+    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据(当日)
+    this.ShareAfterVol=0;                     //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
     this.ExtendWidth={ Left: 120, Right:120 } ;      //单日分时图 左右扩展图形宽度
     
     this.IsShowLead=true;                     //指数是否显示领先指标
@@ -78963,7 +78980,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.IsShowMultiDayAfterData=false;             //多日分时图 是否显示收盘集合竞价
     this.MultiDayAfterCloseData=null;                //多日分时图 收盘集合竞价数据
 
-    this.MultiDayExtendWidth={ Left:20, Right:20 };   //多日分时图 左右扩展图形宽度
+    this.MultiDayExtendWidth={ Left:40, Right:20 };   //多日分时图 左右扩展图形宽度
 
     this.ChartDrawStorage=new ChartDrawStorage();
     this.ChartDrawStorageCache=null;         //首次需要创建的画图工具数据
@@ -81950,11 +81967,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.NetworkFilter)
         {
+            var callCation=
+            { 
+                Before:this.IsShowMultiDayBeforeData , 
+                After:this.IsShowMultiDayAfterData
+            }   //集合竞价
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -82334,11 +82357,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     dateRange=this.SourceData.GetDateRange();
             }
 
-            var callCation=
-            { 
-                Before:(this.IsShowBeforeData && this.DayCount===1), 
-                After:(this.IsShowAfterData && this.DayCount===1)
-            }   //集合竞价
+            var callCation={ Before:this.IsShowBeforeData, After:this.IsShowAfterData }   //集合竞价
+            if (this.DayCount>1) callCation={ Before:this.IsShowMultiDayBeforeData, After:this.IsShowMultiDayAfterData }   //多日集合竞价
+           
             var obj=
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
@@ -132137,7 +132158,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13268";
+var HQCHART_VERSION="1.1.13275";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -48757,13 +48757,38 @@ HQData.NetworkFilter=function(data, callback)
 HQData.RequestMinuteData=function(data, callback)
 {
     data.PreventDefault=true;
-    var symbol=data.Request.Data.symbol[0]; //请求的股票代码
-    var dayCount=data.Request.Data.daycount;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_1DAY_DATA;
-    hqchartData.stock[0].symbol=symbol;
-    hqchartData.stock[0].name=symbol;
+    var srcStock=MINUTE_1DAY_DATA.stock[0];
+    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+    if (callcation.Before)
+    {
+        var before=
+        [
+            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+            [915, srcStock.yclose,0,0],
+            [916, srcStock.yclose+0.01,0,0],
+            [917, srcStock.yclose+0.03,0,0],
+            [918, srcStock.yclose+0.02,0,0],
+            [919, srcStock.yclose+0.02,0,0],
+            [920, srcStock.yclose+0.01,0,0],
+            [921, srcStock.yclose,0,0],
+            [922, srcStock.yclose-0.02,0,0],
+            [923, srcStock.yclose-0.03,0,0],
+            [924, srcStock.yclose,0,0],
+            [925, srcStock.yclose,0,0],
+        ];
+
+        var beforeinfo={ totalcount:11, ver:1.0 };
+
+        stockItem.before=before;
+        stockItem.beforeinfo=beforeinfo;
+    }
+
+    var hqchartData={code:0, stock:[stockItem] };
+   
 
     callback(hqchartData);
 }
@@ -48773,12 +48798,44 @@ HQData.RequestMinuteDaysData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol; //请求的股票代码
     var dayCount=data.Request.Data.daycount;
+    var callcation=data.Request.Data.callcation;        //集合竞价
   
     console.log(`[HQData::RequestMinuteDaysData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_5DAY_DATA;
-    hqchartData.symbol=symbol;
-    hqchartData.name=symbol;
+    var hqchartData={code:0, data:[] };
+    hqchartData.symbol=MINUTE_5DAY_DATA.symbol;
+    hqchartData.name=MINUTE_5DAY_DATA.symbol;
+
+    for(var i=0;i<dayCount && i<MINUTE_5DAY_DATA.data.length;++i)
+    {
+        var item=MINUTE_5DAY_DATA.data[i];
+        var dayItem={minute:item.minute, yclose:item.yclose, date:item.date };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, item.yclose,0,0],
+                [916, item.yclose+0.01,0,0],
+                [917, item.yclose+0.03,0,0],
+                [918, item.yclose+0.02,0,0],
+                [919, item.yclose+0.02,0,0],
+                [920, item.yclose+0.01,0,0],
+                [921, item.yclose,0,0],
+                [922, item.yclose-0.02,0,0],
+                [923, item.yclose-0.03,0,0],
+                [924, item.yclose,0,0],
+                [925, item.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            dayItem.before=before;
+            dayItem.beforeinfo=beforeinfo;
+        }
+
+        hqchartData.data.push(dayItem);
+    }
    
     callback(hqchartData);
 }

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

@@ -13408,6 +13408,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.PopupMenuByRClick(menuData, x, y);
     }
+
+    //指标窗口扩展图形
+    this.CreateChartPaintExtend=function(chart, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -78992,12 +79009,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.IsShowBeforeData=false;              //是否显示盘前集合竞价数据 (当日)
     this.BeforeOpenData=null;                 //盘前集合竞价数据
-    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据
+    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据(当日)
 
     this.IsShowAfterData=false;               //收盘集合竞价
     this.AfterCloseData=null;                 //收盘集合竞价数据
-    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据
-    this.ShareAfterVol=0;              //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
+    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据(当日)
+    this.ShareAfterVol=0;                     //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
     this.ExtendWidth={ Left: 120, Right:120 } ;      //单日分时图 左右扩展图形宽度
     
     this.IsShowLead=true;                     //指数是否显示领先指标
@@ -79007,7 +79024,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.IsShowMultiDayAfterData=false;             //多日分时图 是否显示收盘集合竞价
     this.MultiDayAfterCloseData=null;                //多日分时图 收盘集合竞价数据
 
-    this.MultiDayExtendWidth={ Left:20, Right:20 };   //多日分时图 左右扩展图形宽度
+    this.MultiDayExtendWidth={ Left:40, Right:20 };   //多日分时图 左右扩展图形宽度
 
     this.ChartDrawStorage=new ChartDrawStorage();
     this.ChartDrawStorageCache=null;         //首次需要创建的画图工具数据
@@ -81994,11 +82011,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.NetworkFilter)
         {
+            var callCation=
+            { 
+                Before:this.IsShowMultiDayBeforeData , 
+                After:this.IsShowMultiDayAfterData
+            }   //集合竞价
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -82378,11 +82401,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     dateRange=this.SourceData.GetDateRange();
             }
 
-            var callCation=
-            { 
-                Before:(this.IsShowBeforeData && this.DayCount===1), 
-                After:(this.IsShowAfterData && this.DayCount===1)
-            }   //集合竞价
+            var callCation={ Before:this.IsShowBeforeData, After:this.IsShowAfterData }   //集合竞价
+            if (this.DayCount>1) callCation={ Before:this.IsShowMultiDayBeforeData, After:this.IsShowMultiDayAfterData }   //多日集合竞价
+           
             var obj=
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
@@ -135567,7 +135588,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13268";
+var HQCHART_VERSION="1.1.13275";
 
 function PrintHQChartVersion()
 {