hqchart 1.1.13478 → 1.1.13487

package/lib/umychart.NetworkFilterTest.vue.js

@@ -21,8 +21,11 @@ console.log("[HQData::RequestMinuteDaysData] Symbol="+symbol);var hqchartData={c
 [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;//请求的股票代码
+if(data.Request.Data.symbol.length>1)//叠加股票
+{var hqchartData={stock:[],code:0};var arySymbol=data.Request.Data.symbol;for(var i=0;i<arySymbol.length;++i){var symbol=arySymbol[i];if(i==0){var stock=KLINE_1DAY_DATA.stock[0];stock.name=symbol;stock.symbol=symbol;hqchartData.stock.push(stock);}else{if(symbol=="399001.sz"){var stock=KLINE_1DAY_OVERLAY_DATA2.stock[0];stock.name=symbol;stock.symbol=symbol;hqchartData.stock.push(stock);}else{var stock=KLINE_1DAY_OVERLAY_DATA.stock[0];stock.name=symbol;stock.symbol=symbol;hqchartData.stock.push(stock);}}}callback(hqchartData);}else{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;//请求的股票代码
 console.log("[HQData::RequestHistoryMinuteData] Symbol="+symbol);var hqchartData=KLINE_MINUTE_DATA;hqchartData.name=symbol;hqchartData.symbol=symbol;callback(hqchartData);};HQData.RequestMinuteRealtimeData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];//请求的股票代码
-console.log("[HQData::RequestMinuteRealtimeData] Symbol="+symbol);var hqchartData=JSON.parse((0,_stringify2.default)(KLINE_1MINUTE_DATA));var kItem=hqchartData.data[0];var price=kItem[5];var value=Math.ceil(Math.random()*10)/1000*price;var bUp=Math.ceil(Math.random()*10)>=5;if(bUp)price+=value;else price-=value;kItem[5]=price;kItem[3]=Math.max(price,kItem[3]);kItem[4]=Math.min(price,kItem[4]);hqchartData.name=symbol;hqchartData.symbol=symbol;callback(hqchartData);};HQData.RequestIndexVariantData=function(data,callback){var varName=data.Request.Data.VariantName;//变量名称
+if(data.Request.Data.symbol.length>1)//叠加股票
+{var hqchartData=JSON.parse((0,_stringify2.default)(KLINE_1MINUTE_DATA));hqchartData.overlay=[];//叠加数据
+var arySymbol=data.Request.Data.symbol;for(var i=0;i<arySymbol.length;++i){var symbol=arySymbol[i];if(i==0){var kItem=hqchartData.data[0];var price=kItem[5];var value=Math.ceil(Math.random()*10)/1000*price;var bUp=Math.ceil(Math.random()*10)>=5;if(bUp)price+=value;else price-=value;kItem[5]=price;kItem[3]=Math.max(price,kItem[3]);kItem[4]=Math.min(price,kItem[4]);hqchartData.name=symbol;hqchartData.symbol=symbol;}else{var testData=JSON.parse((0,_stringify2.default)(KLINE_1MINUTE_DATA2));var kItem=testData.data[0];var price=kItem[5];var value=Math.ceil(Math.random()*10)/1000*price;var bUp=Math.ceil(Math.random()*10)>=5;if(bUp)price+=value;else price-=value;kItem[5]=price;kItem[3]=Math.max(price,kItem[3]);kItem[4]=Math.min(price,kItem[4]);var stock={data:testData.data,symbol:symbol,name:symbol};hqchartData.overlay.push(stock);}}callback(hqchartData);}else{console.log("[HQData::RequestMinuteRealtimeData] Symbol="+symbol);var hqchartData=JSON.parse((0,_stringify2.default)(KLINE_1MINUTE_DATA));var kItem=hqchartData.data[0];var price=kItem[5];var value=Math.ceil(Math.random()*10)/1000*price;var bUp=Math.ceil(Math.random()*10)>=5;if(bUp)price+=value;else price-=value;kItem[5]=price;kItem[3]=Math.max(price,kItem[3]);kItem[4]=Math.min(price,kItem[4]);hqchartData.name=symbol;hqchartData.symbol=symbol;callback(hqchartData);}};HQData.RequestIndexVariantData=function(data,callback){var varName=data.Request.Data.VariantName;//变量名称
 if(varName=="FROMOPEN"){var hqchartData={};//单数据
 hqchartData.Data={Date:20230707,Value:240};hqchartData.DataType=1;callback(hqchartData);}};HQData.RequestOtherSymbolData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;var period=data.Request.Data.period;var right=data.Request.Data.right;var hqchartData=null;if(ChartData.IsDayPeriod(period,true))hqchartData=KLINE_DAY_DATA2;else if(ChartData.IsMinutePeriod(period,true))hqchartData=KLINE_MINUTE_DATA2;hqchartData.name=symbol;hqchartData.symbol=symbol;callback(hqchartData);};HQData.AnnouncementInfo_RequestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Symbol;var hqchartData={symbol:symbol,report:[]};var kData=data.HQChart.ChartPaint[0].Data;for(var i=0,j=1;i<kData.Data.length;++i){var kItem=kData.Data[i];if(i%10!=4)continue;var itemReport={releasedate:kItem.Date,time:kItem.Time,title:"\u516C\u544A("+j+") xxxx"};hqchartData.report.push(itemReport);++j;}callback(hqchartData);};HQData.PforecastInfo_RequestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Symbol;var hqchartData={symbol:symbol,report:[]};var kData=data.HQChart.ChartPaint[0].Data;for(var i=0,j=1;i<kData.Data.length;++i){var kItem=kData.Data[i];if(i%10!=4)continue;var itemReport={date:kItem.Date,time:kItem.Time,title:"\u516C\u544A("+j+") xxxx"};hqchartData.report.push(itemReport);++j;}callback(hqchartData);};HQData.InvestorInfo_RequestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Symbol;callback(TEST_NEWSINTERACT_DATA);};HQData.BlockTrading_RequestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Symbol;callback(TEST_BLOCK_TRADING_DATA);};HQData.TradeDetail_RequestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Symbol;callback(TEST_TRADE_DETAL_DATA);};HQData.RequestLatestData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];var id=data.Args[0];var value=1;switch(id){case 3:value=KLINE_1DAY_DATA.stock[0].yclose;break;case 4:value=KLINE_1DAY_DATA.stock[0].open;break;case 5:value=KLINE_1DAY_DATA.stock[0].high;break;case 6:value=KLINE_1DAY_DATA.stock[0].low;break;case 7:value=KLINE_1DAY_DATA.stock[0].price;break;case 8:value=KLINE_1DAY_DATA.stock[0].vol;break;}var hqchartData={symbol:symbol,ver:2.0,data:[{id:id,value:value}]};callback(hqchartData);};HQData.RequestOverlayHistoryData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;var hqchartData={symbol:symbol,name:symbol};if(symbol=="399001.sz")hqchartData.data=KLINE_DAY_OVERLAY_DATA2.data;else hqchartData.data=KLINE_DAY_OVERLAY_DATA.data;callback(hqchartData);};HQData.RequestOverlayHistoryMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;var hqchartData={symbol:symbol,name:symbol};hqchartData.data=KLINE_MINUTE_DATA2.data;callback(hqchartData);};/*暴露外部用的方法*/exports.default={HQData:HQData};

package/lib/umychart.vue.js

@@ -2249,7 +2249,7 @@ if(this.IsMinSize)return;if(this.ChartBorder.IsShowTitleOnly)return;if(this.IsSh
 var yInsideText=null;for(var i=this.HorizontalInfo.length-1;i>=0;--i)//从上往下画分割线
 {var item=this.HorizontalInfo[i];var y=this.GetYFromData(item.Value);if(y!=null&&yPrev!=null&&Math.abs(y-yPrev)<this.MinYDistance)continue;//两个坐标在近了 就不画了
 //坐标信息 左边 间距小于10 画在内部
-if(item.Message[0]!=null&&isDrawLeft){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="left";var yText=y;if(y>=bottom-2){this.Canvas.textBaseline='bottom';}else if(y<=top+2){this.Canvas.textBaseline='top';yText+=this.YTextTopOffset;}else{if(this.YTextBaseline==1)this.Canvas.textBaseline="bottom";else this.Canvas.textBaseline="middle";}var textObj={X:left,Y:yText,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:item.Message[0]}};if(!this.IsOverlayMaxMin||!this.IsOverlayMaxMin(textObj)){this.Canvas.fillText(item.Message[0],left+1*pixelTatio,yText);if(yInsideText==null||yInsideText>yText){this.YInsideOffset=this.Canvas.measureText(item.Message[0]).width+4*GetDevicePixelRatio();yInsideText=yText;}}}if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="right";var yText=y;if(y>=bottom-2){this.Canvas.textBaseline='bottom';}else if(y<=top+2){this.Canvas.textBaseline='top';yText+=this.YTextTopOffset;}else{if(this.YTextBaseline==1)this.Canvas.textBaseline="bottom";else this.Canvas.textBaseline="middle";}if(Array.isArray(item.Message[1]))var text=item.Message[1][0];else var text=item.Message[1];var textWidth=this.Canvas.measureText(text).width;var textObj={X:right-textWidth,Y:yText,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:item.Message[1]}};if(!this.IsOverlayMaxMin||!this.IsOverlayMaxMin(textObj))this.Canvas.fillText(text,right-1*pixelTatio,yText);}yPrev=y;}}};this.GetXFromIndex=function(index){var count=this.XPointCount;if(count==1){if(index==0)return this.ChartBorder.GetLeft();else return this.ChartBorder.GetRight();}else if(count<=0){return this.ChartBorder.GetLeft();}else if(index>=count){return this.ChartBorder.GetRight();}else{var offset=this.ChartBorder.GetLeft()+this.ChartBorder.GetWidth()*index/count;return offset;}};//画X轴
+if(item.Message[0]!=null&&isDrawLeft){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="left";var textHeight=this.Canvas.measureText("擎").width;var yText=y;if(y>=bottom-2){this.Canvas.textBaseline='bottom';}else if(y-textHeight/2<=top){this.Canvas.textBaseline='top';yText+=this.YTextTopOffset;}else{if(this.YTextBaseline==1)this.Canvas.textBaseline="bottom";else this.Canvas.textBaseline="middle";}var textObj={X:left,Y:yText,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:item.Message[0]}};if(!this.IsOverlayMaxMin||!this.IsOverlayMaxMin(textObj)){this.Canvas.fillText(item.Message[0],left+1*pixelTatio,yText);if(yInsideText==null||yInsideText>yText){this.YInsideOffset=this.Canvas.measureText(item.Message[0]).width+4*GetDevicePixelRatio();yInsideText=yText;}}}if(item.Message[1]!=null&&isDrawRight){if(item.Font!=null)this.Canvas.font=item.Font;this.Canvas.fillStyle=item.TextColor;this.Canvas.textAlign="right";var textHeight=this.Canvas.measureText("擎").width;var yText=y;if(y>=bottom-2){this.Canvas.textBaseline='bottom';}else if(y-textHeight/2<=top){this.Canvas.textBaseline='top';yText+=this.YTextTopOffset;}else{if(this.YTextBaseline==1)this.Canvas.textBaseline="bottom";else this.Canvas.textBaseline="middle";}if(Array.isArray(item.Message[1]))var text=item.Message[1][0];else var text=item.Message[1];var textWidth=this.Canvas.measureText(text).width;var textObj={X:right-textWidth,Y:yText,Text:{BaseLine:this.Canvas.textBaseline,TextAlign:this.Canvas.textAlign,Font:this.Canvas.font,Value:item.Message[1]}};if(!this.IsOverlayMaxMin||!this.IsOverlayMaxMin(textObj))this.Canvas.fillText(text,right-1*pixelTatio,yText);}yPrev=y;}}};this.GetXFromIndex=function(index){var count=this.XPointCount;if(count==1){if(index==0)return this.ChartBorder.GetLeft();else return this.ChartBorder.GetRight();}else if(count<=0){return this.ChartBorder.GetLeft();}else if(index>=count){return this.ChartBorder.GetRight();}else{var offset=this.ChartBorder.GetLeft()+this.ChartBorder.GetWidth()*index/count;return offset;}};//画X轴
 this.DrawVertical=function(){var border=this.GetBorder();var top=border.TopTitle;var bottom=border.Bottom;var right=border.RightEx;var pixelRatio=GetDevicePixelRatio();//获取设备的分辨率
 //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
 //if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return;   //高度不够 不显示
@@ -7108,7 +7108,8 @@ var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=
 {var rightData=bindData.GetRightData(bindData.Right,{AlgorithmType:this.RightFormula});bindData.Data=rightData;}if((ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))&&!this.IsApiPeriod)//周期数据 (0= 日线,4=1分钟线 不需要处理)
 {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
 {var newBindData=kLineCalculate.RecvHistoryData(bindData,{Symbol:this.Symbol,Function:"RecvMinuteRealtimeDataV2"});bindData=newBindData;this.FlowCapitalReady=true;}//绑定数据
-this.UpdateMainData(bindData,lastDataCount);this.BindInstructionIndexData(bindData);//执行指示脚本
+this.UpdateMainData(bindData,lastDataCount);this.UpdateOverlayMinuteRealtimeData(data);//更新叠加股票数据
+this.BindInstructionIndexData(bindData);//执行指示脚本
 for(var i=0;i<this.Frame.SubFrame.length;++i){this.BindIndexData(i,bindData);}this.BindAllOverlayIndexData(bindData,{CheckRunCount:true,SyncExecute:true});//同步模式叠加指标
 //刷新画图
 this.UpdataDataoffset();//更新数据偏移
@@ -7638,7 +7639,7 @@ if(!IFrameSplitOperator.IsNumber(item.Open))item.Open=null;if(!IFrameSplitOperat
 if(IFrameSplitOperator.IsNumber(jsData.price))preClose=jsData.price;aryMinuteData[i]=item;}return aryMinuteData;};//分钟K线叠加数据增量更新v2版本
 KLineChartContainer.JsonDataToMinuteRealtimeDataV2=function(data,symbol){if(!data||!data.overlay||!symbol)return null;var overlayData=null;for(var i=0;i<data.overlay.length;++i)//overlay={ symbol:, name:, data:[] }
 {var item=data.overlay[i];if(item.symbol==symbol){overlayData=item;break;}}if(!overlayData)return null;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);//是否是期货
-var date=0,yclose=1,open=2,high=3,low=4,close=5,vol=6,amount=7,time=8,position=9;var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;var yClose=null;for(var i=0;i<overlayData.data.length;++i){var item=new HistoryData();var jsData=overlayData.data[i];item.Date=jsData[date];item.Open=jsData[open];item.YClose=jsData[yclose];item.Close=jsData[close];item.High=jsData[high];item.Low=jsData[low];item.Vol=jsData[vol];//股
+var date=0,yclose=1,open=2,high=3,low=4,close=5,vol=6,amount=7,time=8,position=9;var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;var yClose=null;var aryMinuteData=[];for(var i=0;i<overlayData.data.length;++i){var item=new HistoryData();var jsData=overlayData.data[i];item.Date=jsData[date];item.Open=jsData[open];item.YClose=jsData[yclose];item.Close=jsData[close];item.High=jsData[high];item.Low=jsData[low];item.Vol=jsData[vol];//股
 item.Amount=jsData[amount];item.Time=jsData[time];if(IFrameSplitOperator.IsNumber(jsData[position]))item.Position=jsData[position];//期货持仓
 if(!IFrameSplitOperator.IsNumber(item.YClose)){if(IFrameSplitOperator.IsNumber(yClose))item.YClose=yClose;}if(IFrameSplitOperator.IsNumber(item.Close))yClose=item.Close;if(jsData[orderFlow])item.OrderFlow=jsData[orderFlow];aryMinuteData.push(item);}return aryMinuteData;};//API 返回数据 转化为array[]
 KLineChartContainer.JsonDataToMinuteHistoryData=function(data){var upperSymbol=null;if(data.symbol)upperSymbol=data.symbol.toUpperCase();var isSHSZ=false;if(upperSymbol)isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var isFutures=false;//是否是期货
@@ -8859,6 +8860,7 @@ FHK:'.FHK',//港股期货
 SHFE:'.SHF',//上期所 (Shanghai Futures Exchange) | 上期所-能源
 SHFE2:'.SHFE',//上期所 (Shanghai Futures Exchange) | 上期所-能源
 CFFEX:'.CFE',//中期所 (China Financial Futures Exchange)
+CFFEX2:'.CFFEX',//中期所 (China Financial Futures Exchange)
 DCE:'.DCE',//大连商品交易所(Dalian Commodity Exchange)
 CZCE:'.CZC',//郑州期货交易所
 GZFE:".GZFE",//广州期货交易所
@@ -8885,7 +8887,7 @@ IsET:function IsET(upperSymbol){if(!upperSymbol)return false;return upperSymbol.
 {return false;},IsHSX:function IsHSX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.HSX)>0;},IsHNX:function IsHNX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.HNX)>0;},IsUPCOM:function IsUPCOM(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.UPCOM)>0;},IsNYMEX:function IsNYMEX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.NYMEX)>0;},IsCOMEX:function IsCOMEX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.COMEX)>0;},IsNYBOT:function IsNYBOT(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.NYBOT)>0;},IsCBOT:function IsCBOT(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CBOT)>0;},IsLME:function IsLME(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.LME)>0;},IsTOCOM:function IsTOCOM(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.TOCOM)>0;},IsIPE:function IsIPE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.IPE)>0;},IsForeignExchange:function IsForeignExchange(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FOREX)>0;},IsFTSE:function IsFTSE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FTSE)>0;},IsFHK:function IsFHK(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FHK)>0;},IsBIT:function IsBIT(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.BIT)>0)return true;if(upperSymbol.indexOf(this.BIZ)>0)return true;return false;},IsUSA:function IsUSA(upperSymbol)//是否是美股
 {if(!upperSymbol)return false;return upperSymbol.indexOf(this.USA)>0;},IsSH:function IsSH(upperSymbol){//需要精确匹配最后3位
 var pos=upperSymbol.length-this.SH.length;var find=upperSymbol.indexOf(this.SH);return find==pos;},IsSZ:function IsSZ(upperSymbol){var pos=upperSymbol.length-this.SZ.length;var find=upperSymbol.indexOf(this.SZ);return find==pos;},IsBJ:function IsBJ(upperSymbol){var pos=upperSymbol.length-this.BJ.length;var find=upperSymbol.indexOf(this.BJ);return find==pos;},//自定义指数
-IsSHSZCustomIndex:function IsSHSZCustomIndex(upperSymbol){var pos=upperSymbol.length-this.SHSZ_C_Index.length;var find=upperSymbol.indexOf(this.SHSZ_C_Index);return find==pos;},IsSHO:function IsSHO(upperSymbol){var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;return false;},IsDCE:function IsDCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.DCE)>0;},IsCZCE:function IsCZCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CZCE)>0;},IsGZFE:function IsGZFE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.GZFE)>0;},IsChinaFutures:function IsChinaFutures(upperSymbol)//是否是国内期货 /期权
+IsSHSZCustomIndex:function IsSHSZCustomIndex(upperSymbol){var pos=upperSymbol.length-this.SHSZ_C_Index.length;var find=upperSymbol.indexOf(this.SHSZ_C_Index);return find==pos;},IsSHO:function IsSHO(upperSymbol){var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;if(upperSymbol.indexOf(this.CFFEX2)>0)return true;return false;},IsDCE:function IsDCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.DCE)>0;},IsCZCE:function IsCZCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CZCE)>0;},IsGZFE:function IsGZFE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.GZFE)>0;},IsChinaFutures:function IsChinaFutures(upperSymbol)//是否是国内期货 /期权
 {return this.IsSHO(upperSymbol)||this.IsSZO(upperSymbol)||this.IsGZFE(upperSymbol)||this.IsCFFEX(upperSymbol)||this.IsCZCE(upperSymbol)||this.IsDCE(upperSymbol)||this.IsSHFE(upperSymbol);},IsFutures:function IsFutures(upperSymbol)//是否是期货 包含国外的
 {if(!upperSymbol)return false;return this.IsChinaFutures(upperSymbol)||this.IsNYMEX(upperSymbol)||this.IsCOMEX(upperSymbol)||this.IsNYBOT(upperSymbol)||this.IsCBOT(upperSymbol)||this.IsLME(upperSymbol)||this.IsTOCOM(upperSymbol);},IsSHSZ:function IsSHSZ(upperSymbol)//是否是沪深的股票
 {return this.IsSZ(upperSymbol)||this.IsSH(upperSymbol)||this.IsSHSZCustomIndex(upperSymbol);},IsSHSZFund:function IsSHSZFund(upperSymbol)//是否是交易所基金
@@ -12236,8 +12238,12 @@ this.UIElement.ondblclick=function(e){_this51.UIOnDblClick(e);};this.UIElement.o
 this.UIElement.ontouchstart=function(e){_this51.OnTouchStart(e);};this.UIElement.ontouchmove=function(e){_this51.OnTouchMove(e);};this.UIElement.ontouchend=function(e){_this51.OnTouchEnd(e);};};this.Draw=function(){if(this.UIElement.width<=0||this.UIElement.height<=0)return;this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段宽度
 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();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this52=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this52.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;}};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.BlockData=new _map2.default();};this.ResetSortStatus=function(){this.SortInfo.Field=-1;this.SortInfo.Sort=0;};//设置股票列表
-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 _this53=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.IsBool(option.IsReloadStockList)){var requestOption={Callback:null};if(this.Symbol)requestOption.Callback=function(){_this53.RequestMemberListData();};this.MapStockData=new _map2.default();this.RequestStockListData(requestOption);return;}}this.RequestMemberListData();};this.RequestMemberListData=function(){//this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
+for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this52=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this52.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;}};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];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.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 _this53=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.IsBool(option.IsReloadStockList)){var requestOption={Callback:null};if(this.Symbol)requestOption.Callback=function(){_this53.RequestMemberListData();};this.MapStockData=new _map2.default();this.RequestStockListData(requestOption);return;}}this.RequestMemberListData();};//设置全部的数据
+this.SetFullData=function(data){this.ClearMapStockData();this.ClearData();this.ResetReportStatus();this.ResetSortStatus();this.ResetReportSelectStatus();//缓存所有数据
+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);}}//设置显示数据
+if(IFrameSplitOperator.IsNonEmptyArray(arySymbol)){for(var i=0;i<arySymbol.length;++i){this.Data.Data.push(arySymbol[i]);this.SourceData.Data.push(arySymbol[i]);}}this.Draw();};this.RequestMemberListData=function(){//this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
 //this.ChartSplashPaint.EnableSplash(true);
 //this.Draw();
 var self=this;if(this.NetworkFilter){var obj={Name:'JSReportChartContainer::RequestMemberListData',//类名::
@@ -13207,7 +13213,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.13477";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.13486";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.13478",
+  "version": "1.1.13487",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -48874,17 +48874,55 @@ HQData.RequestFlowCapitalData=function(data,callback)
     callback(hqchartData);
 }
 
-HQData.RequestRealtimeData=function(data,callback)
+HQData.RequestRealtimeData=function(data, callback)
 {
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData={ stock:[], code:0 };
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var stock=KLINE_1DAY_DATA.stock[0];
+                stock.name=symbol;
+                stock.symbol=symbol;
+                hqchartData.stock.push(stock);
+            }
+            else
+            {
+                if (symbol=="399001.sz") 
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA2.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                else
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                    
+            } 
+        }
 
-    var hqchartData=KLINE_1DAY_DATA;
-    hqchartData.stock[0].name=symbol;
-    hqchartData.stock[0].symbol=symbol;
-    callback(hqchartData);
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+        var hqchartData=KLINE_1DAY_DATA;
+        hqchartData.stock[0].name=symbol;
+        hqchartData.stock[0].symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 
@@ -48908,24 +48946,71 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+        hqchartData.overlay=[]; //叠加数据
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var kItem=hqchartData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
 
-    var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+                hqchartData.name=symbol;
+                hqchartData.symbol=symbol;
+            }
+            else
+            {
+                var testData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA2));
+                var kItem=testData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
+                var stock={ data:testData.data, symbol:symbol, name:symbol };
+                hqchartData.overlay.push(stock);
+            }
+        }
 
-    var kItem=hqchartData.data[0];
-    var price=kItem[5];
-    var value=Math.ceil(Math.random()*10)/1000*price;
-    var bUp=Math.ceil(Math.random()*10)>=5;
-    
-    if (bUp) price+=value;
-    else price-=value;
-    kItem[5]=price;
-    kItem[3]=Math.max(price, kItem[3]);
-    kItem[4]=Math.min(price, kItem[4]);
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
+
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
     
-    hqchartData.name=symbol;
-    hqchartData.symbol=symbol;
-    callback(hqchartData);
+        var kItem=hqchartData.data[0];
+        var price=kItem[5];
+        var value=Math.ceil(Math.random()*10)/1000*price;
+        var bUp=Math.ceil(Math.random()*10)>=5;
+        
+        if (bUp) price+=value;
+        else price-=value;
+        kItem[5]=price;
+        kItem[3]=Math.max(price, kItem[3]);
+        kItem[4]=Math.min(price, kItem[4]);
+        
+        hqchartData.name=symbol;
+        hqchartData.symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 

package/src/jscommon/umychart.js

@@ -11572,12 +11572,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "left";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if ((y-textHeight/2)<=top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -11606,12 +11607,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "right";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if (y-textHeight/2 <= top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -71934,7 +71936,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        this.BindInstructionIndexData(bindData);    //执行指示脚本
+        this.UpdateOverlayMinuteRealtimeData(data);     //更新叠加股票数据
+        this.BindInstructionIndexData(bindData);        //执行指示脚本
 
         for(var i=0; i<this.Frame.SubFrame.length; ++i)
         {
@@ -76705,7 +76708,7 @@ KLineChartContainer.JsonDataToMinuteRealtimeDataV2=function(data,symbol)
     var date = 0, yclose = 1, open = 2, high = 3, low = 4, close = 5, vol = 6, amount = 7, time = 8, position=9;
     var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
     var yClose=null; 
-    
+    var aryMinuteData=[];
     for (var i = 0; i < overlayData.data.length; ++i)
     {
         var item = new HistoryData();
@@ -88953,6 +88956,7 @@ var MARKET_SUFFIX_NAME=
     SHFE: '.SHF',        //上期所 (Shanghai Futures Exchange) | 上期所-能源
     SHFE2:'.SHFE',       //上期所 (Shanghai Futures Exchange) | 上期所-能源
     CFFEX: '.CFE',       //中期所 (China Financial Futures Exchange)
+    CFFEX2:'.CFFEX',     //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
@@ -89164,6 +89168,7 @@ var MARKET_SUFFIX_NAME=
     {
         if (!upperSymbol) return false;
         if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
+        if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
         
         return false;
     },

package/src/jscommon/umychart.report.js

@@ -618,6 +618,11 @@ function JSReportChartContainer(uielement)
         this.BlockData=new Map(); 
     }
 
+    this.ClearMapStockData=function()
+    {
+        this.MapStockData=new Map();
+    }
+
     this.ResetSortStatus=function()
     {
         this.SortInfo.Field=-1;
@@ -702,6 +707,57 @@ function JSReportChartContainer(uielement)
         this.RequestMemberListData();
     }
 
+    //设置全部的数据
+    this.SetFullData=function(data)
+    {
+        this.ClearMapStockData();
+        this.ClearData();
+        this.ResetReportStatus();
+        this.ResetSortStatus();
+        this.ResetReportSelectStatus();
+
+        //缓存所有数据
+        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);
+            }
+        }
+
+        //设置显示数据
+        if (IFrameSplitOperator.IsNonEmptyArray(arySymbol))
+        {
+            for(var i=0;i<arySymbol.length;++i)
+            {
+                this.Data.Data.push(arySymbol[i]);
+                this.SourceData.Data.push(arySymbol[i]);
+            }
+        }
+
+        this.Draw();
+    }
+
     this.RequestMemberListData=function()
     {
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);

package/src/jscommon/umychart.testdata/000001.sh.day.kline.js

@@ -79863,4 +79863,25 @@ var KLINE_DAY_OVERLAY_DATA={
             317757173399.7
         ]
     ]
+}
+
+
+var KLINE_1DAY_OVERLAY_DATA=
+{
+    "stock": 
+    [
+        {
+            "time": 150002,
+            "date": 20230825,
+            "price": 3074.0747,
+            "open": 3068.615,
+            "yclose": 3082.2439,
+            "high": 3095.047,
+            "low": 3053.0373,
+            "vol": 293357686,
+            "amount": 317757373399.7,
+            "symbol": "000001.sh",
+            "name": "000001.sh"
+        }
+    ],
 }

package/src/jscommon/umychart.testdata/000001.sz.minute.kline.js

@@ -2678,4 +2678,26 @@ var KLINE_MINUTE_DATA2 = {
     "name": "平安银行",
     "count": 7646,
     "code": 0
-  }
+  }
+
+
+var KLINE_1MINUTE_DATA2=
+{
+    code:0,
+    data:
+    [
+      [
+        20230829,
+        12.65,
+        12.65,
+        12.65,
+        12.65,
+        12.65,
+        1246339,
+        15766208,
+        1500
+      ]
+    ],
+    symbol:"xxx",
+    name:"xxxx",
+}

package/src/jscommon/umychart.testdata/399001.sz.day.kline.js

@@ -78512,4 +78512,25 @@ var KLINE_DAY_OVERLAY_DATA2 =
             171136489266.51
         ]
     ]
+}
+
+
+var KLINE_1DAY_OVERLAY_DATA2=
+{
+    "stock": 
+    [
+        {
+            "time": 150002,
+            "date": 20230825,
+            "price": 10180.4711,
+            "open": 10197.9573,
+            "yclose": 10256.1896,
+            "high": 10212.6467,
+            "low": 10091.8625,
+            "vol": 10428916190,
+            "amount": 171138489266.7,
+            "symbol": "",
+            "name": ""
+        }
+    ],
 }

package/src/jscommon/umychart.testdata.js

@@ -199,17 +199,55 @@ HQData.RequestFlowCapitalData=function(data,callback)
     callback(hqchartData);
 }
 
-HQData.RequestRealtimeData=function(data,callback)
+HQData.RequestRealtimeData=function(data, callback)
 {
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData={ stock:[], code:0 };
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var stock=KLINE_1DAY_DATA.stock[0];
+                stock.name=symbol;
+                stock.symbol=symbol;
+                hqchartData.stock.push(stock);
+            }
+            else
+            {
+                if (symbol=="399001.sz") 
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA2.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                else
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                    
+            } 
+        }
 
-    var hqchartData=KLINE_1DAY_DATA;
-    hqchartData.stock[0].name=symbol;
-    hqchartData.stock[0].symbol=symbol;
-    callback(hqchartData);
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+        var hqchartData=KLINE_1DAY_DATA;
+        hqchartData.stock[0].name=symbol;
+        hqchartData.stock[0].symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 
@@ -233,24 +271,71 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+        hqchartData.overlay=[]; //叠加数据
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var kItem=hqchartData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
+
+                hqchartData.name=symbol;
+                hqchartData.symbol=symbol;
+            }
+            else
+            {
+                var testData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA2));
+                var kItem=testData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
+                var stock={ data:testData.data, symbol:symbol, name:symbol };
+                hqchartData.overlay.push(stock);
+            }
+        }
 
-    var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
 
-    var kItem=hqchartData.data[0];
-    var price=kItem[5];
-    var value=Math.ceil(Math.random()*10)/1000*price;
-    var bUp=Math.ceil(Math.random()*10)>=5;
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
     
-    if (bUp) price+=value;
-    else price-=value;
-    kItem[5]=price;
-    kItem[3]=Math.max(price, kItem[3]);
-    kItem[4]=Math.min(price, kItem[4]);
-    
-    hqchartData.name=symbol;
-    hqchartData.symbol=symbol;
-    callback(hqchartData);
+        var kItem=hqchartData.data[0];
+        var price=kItem[5];
+        var value=Math.ceil(Math.random()*10)/1000*price;
+        var bUp=Math.ceil(Math.random()*10)>=5;
+        
+        if (bUp) price+=value;
+        else price-=value;
+        kItem[5]=price;
+        kItem[3]=Math.max(price, kItem[3]);
+        kItem[4]=Math.min(price, kItem[4]);
+        
+        hqchartData.name=symbol;
+        hqchartData.symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 

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

@@ -15497,12 +15497,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "left";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if ((y-textHeight/2)<=top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -15531,12 +15532,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "right";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if (y-textHeight/2 <= top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -75859,7 +75861,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        this.BindInstructionIndexData(bindData);    //执行指示脚本
+        this.UpdateOverlayMinuteRealtimeData(data);     //更新叠加股票数据
+        this.BindInstructionIndexData(bindData);        //执行指示脚本
 
         for(var i=0; i<this.Frame.SubFrame.length; ++i)
         {
@@ -80630,7 +80633,7 @@ KLineChartContainer.JsonDataToMinuteRealtimeDataV2=function(data,symbol)
     var date = 0, yclose = 1, open = 2, high = 3, low = 4, close = 5, vol = 6, amount = 7, time = 8, position=9;
     var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
     var yClose=null; 
-    
+    var aryMinuteData=[];
     for (var i = 0; i < overlayData.data.length; ++i)
     {
         var item = new HistoryData();
@@ -92878,6 +92881,7 @@ var MARKET_SUFFIX_NAME=
     SHFE: '.SHF',        //上期所 (Shanghai Futures Exchange) | 上期所-能源
     SHFE2:'.SHFE',       //上期所 (Shanghai Futures Exchange) | 上期所-能源
     CFFEX: '.CFE',       //中期所 (China Financial Futures Exchange)
+    CFFEX2:'.CFFEX',     //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
@@ -93089,6 +93093,7 @@ var MARKET_SUFFIX_NAME=
     {
         if (!upperSymbol) return false;
         if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
+        if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
         
         return false;
     },
@@ -125639,6 +125644,11 @@ function JSReportChartContainer(uielement)
         this.BlockData=new Map(); 
     }
 
+    this.ClearMapStockData=function()
+    {
+        this.MapStockData=new Map();
+    }
+
     this.ResetSortStatus=function()
     {
         this.SortInfo.Field=-1;
@@ -125723,6 +125733,57 @@ function JSReportChartContainer(uielement)
         this.RequestMemberListData();
     }
 
+    //设置全部的数据
+    this.SetFullData=function(data)
+    {
+        this.ClearMapStockData();
+        this.ClearData();
+        this.ResetReportStatus();
+        this.ResetSortStatus();
+        this.ResetReportSelectStatus();
+
+        //缓存所有数据
+        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);
+            }
+        }
+
+        //设置显示数据
+        if (IFrameSplitOperator.IsNonEmptyArray(arySymbol))
+        {
+            for(var i=0;i<arySymbol.length;++i)
+            {
+                this.Data.Data.push(arySymbol[i]);
+                this.SourceData.Data.push(arySymbol[i]);
+            }
+        }
+
+        this.Draw();
+    }
+
     this.RequestMemberListData=function()
     {
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
@@ -134347,7 +134408,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13477";
+var HQCHART_VERSION="1.1.13486";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -48874,17 +48874,55 @@ HQData.RequestFlowCapitalData=function(data,callback)
     callback(hqchartData);
 }
 
-HQData.RequestRealtimeData=function(data,callback)
+HQData.RequestRealtimeData=function(data, callback)
 {
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData={ stock:[], code:0 };
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var stock=KLINE_1DAY_DATA.stock[0];
+                stock.name=symbol;
+                stock.symbol=symbol;
+                hqchartData.stock.push(stock);
+            }
+            else
+            {
+                if (symbol=="399001.sz") 
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA2.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                else
+                {
+                    var stock=KLINE_1DAY_OVERLAY_DATA.stock[0];
+                    stock.name=symbol;
+                    stock.symbol=symbol;
+                    hqchartData.stock.push(stock);
+                }
+                    
+            } 
+        }
 
-    var hqchartData=KLINE_1DAY_DATA;
-    hqchartData.stock[0].name=symbol;
-    hqchartData.stock[0].symbol=symbol;
-    callback(hqchartData);
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestRealtimeData] Symbol=${symbol}`);
+        var hqchartData=KLINE_1DAY_DATA;
+        hqchartData.stock[0].name=symbol;
+        hqchartData.stock[0].symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 
@@ -48908,24 +48946,71 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0]; //请求的股票代码
 
-    console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
+    if (data.Request.Data.symbol.length>1)  //叠加股票
+    {
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+        hqchartData.overlay=[]; //叠加数据
+        var arySymbol=data.Request.Data.symbol;
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var symbol=arySymbol[i];
+            if (i==0)
+            {
+                var kItem=hqchartData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
 
-    var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
+                hqchartData.name=symbol;
+                hqchartData.symbol=symbol;
+            }
+            else
+            {
+                var testData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA2));
+                var kItem=testData.data[0];
+                var price=kItem[5];
+                var value=Math.ceil(Math.random()*10)/1000*price;
+                var bUp=Math.ceil(Math.random()*10)>=5;
+                
+                if (bUp) price+=value;
+                else price-=value;
+                kItem[5]=price;
+                kItem[3]=Math.max(price, kItem[3]);
+                kItem[4]=Math.min(price, kItem[4]);
+                var stock={ data:testData.data, symbol:symbol, name:symbol };
+                hqchartData.overlay.push(stock);
+            }
+        }
 
-    var kItem=hqchartData.data[0];
-    var price=kItem[5];
-    var value=Math.ceil(Math.random()*10)/1000*price;
-    var bUp=Math.ceil(Math.random()*10)>=5;
-    
-    if (bUp) price+=value;
-    else price-=value;
-    kItem[5]=price;
-    kItem[3]=Math.max(price, kItem[3]);
-    kItem[4]=Math.min(price, kItem[4]);
+        callback(hqchartData);
+    }
+    else
+    {
+        console.log(`[HQData::RequestMinuteRealtimeData] Symbol=${symbol}`);
+
+        var hqchartData=JSON.parse(JSON.stringify(KLINE_1MINUTE_DATA));
     
-    hqchartData.name=symbol;
-    hqchartData.symbol=symbol;
-    callback(hqchartData);
+        var kItem=hqchartData.data[0];
+        var price=kItem[5];
+        var value=Math.ceil(Math.random()*10)/1000*price;
+        var bUp=Math.ceil(Math.random()*10)>=5;
+        
+        if (bUp) price+=value;
+        else price-=value;
+        kItem[5]=price;
+        kItem[3]=Math.max(price, kItem[3]);
+        kItem[4]=Math.min(price, kItem[4]);
+        
+        hqchartData.name=symbol;
+        hqchartData.symbol=symbol;
+        callback(hqchartData);
+    }
 }
 
 

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

@@ -15541,12 +15541,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "left";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if ((y-textHeight/2)<=top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -15575,12 +15576,13 @@ function AverageWidthFrame()
                     if (item.Font != null) this.Canvas.font = item.Font;
                     this.Canvas.fillStyle = item.TextColor;
                     this.Canvas.textAlign = "right";
+                    var textHeight=this.Canvas.measureText("擎").width;
                     var yText=y;
                     if (y >= bottom - 2) 
                     {
                         this.Canvas.textBaseline = 'bottom';
                     }
-                    else if (y <= top + 2) 
+                    else if (y-textHeight/2 <= top) 
                     {
                         this.Canvas.textBaseline = 'top';
                         yText+=this.YTextTopOffset;
@@ -75903,7 +75905,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        this.BindInstructionIndexData(bindData);    //执行指示脚本
+        this.UpdateOverlayMinuteRealtimeData(data);     //更新叠加股票数据
+        this.BindInstructionIndexData(bindData);        //执行指示脚本
 
         for(var i=0; i<this.Frame.SubFrame.length; ++i)
         {
@@ -80674,7 +80677,7 @@ KLineChartContainer.JsonDataToMinuteRealtimeDataV2=function(data,symbol)
     var date = 0, yclose = 1, open = 2, high = 3, low = 4, close = 5, vol = 6, amount = 7, time = 8, position=9;
     var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
     var yClose=null; 
-    
+    var aryMinuteData=[];
     for (var i = 0; i < overlayData.data.length; ++i)
     {
         var item = new HistoryData();
@@ -92922,6 +92925,7 @@ var MARKET_SUFFIX_NAME=
     SHFE: '.SHF',        //上期所 (Shanghai Futures Exchange) | 上期所-能源
     SHFE2:'.SHFE',       //上期所 (Shanghai Futures Exchange) | 上期所-能源
     CFFEX: '.CFE',       //中期所 (China Financial Futures Exchange)
+    CFFEX2:'.CFFEX',     //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
@@ -93133,6 +93137,7 @@ var MARKET_SUFFIX_NAME=
     {
         if (!upperSymbol) return false;
         if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
+        if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
         
         return false;
     },
@@ -125683,6 +125688,11 @@ function JSReportChartContainer(uielement)
         this.BlockData=new Map(); 
     }
 
+    this.ClearMapStockData=function()
+    {
+        this.MapStockData=new Map();
+    }
+
     this.ResetSortStatus=function()
     {
         this.SortInfo.Field=-1;
@@ -125767,6 +125777,57 @@ function JSReportChartContainer(uielement)
         this.RequestMemberListData();
     }
 
+    //设置全部的数据
+    this.SetFullData=function(data)
+    {
+        this.ClearMapStockData();
+        this.ClearData();
+        this.ResetReportStatus();
+        this.ResetSortStatus();
+        this.ResetReportSelectStatus();
+
+        //缓存所有数据
+        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);
+            }
+        }
+
+        //设置显示数据
+        if (IFrameSplitOperator.IsNonEmptyArray(arySymbol))
+        {
+            for(var i=0;i<arySymbol.length;++i)
+            {
+                this.Data.Data.push(arySymbol[i]);
+                this.SourceData.Data.push(arySymbol[i]);
+            }
+        }
+
+        this.Draw();
+    }
+
     this.RequestMemberListData=function()
     {
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
@@ -138288,7 +138349,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13477";
+var HQCHART_VERSION="1.1.13486";
 
 function PrintHQChartVersion()
 {