hqchart 1.1.12493 → 1.1.12499

package/lib/umychart.vue.js

@@ -2148,7 +2148,7 @@ this.IsDrawTitleBottomLine=false;this.BorderLine=null;//1=上 2=下 4=左 8=右
 this.Buttons=[];//按钮事件 
 this.LeftButtonWidth=0;//左侧按钮的宽度
 this.IsMinSize=false;//窗口是否最小化
-this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;this.LogoTextFont=g_JSChartResource.FrameLogo.Font;this.GlobalOption;this.PtInButtons=function(x,y)//坐标是否在按钮上
+this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;this.LogoTextFont=g_JSChartResource.FrameLogo.Font;this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;this.GlobalOption;this.PtInButtons=function(x,y)//坐标是否在按钮上
 {for(var i=0;i<this.Buttons.length;++i){var item=this.Buttons[i];if(!item.Rect)continue;var rect=item.Rect;this.Canvas.beginPath();this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);if(this.Canvas.isPointInPath(x,y)){return{ID:item.ID,Rect:rect};}}return null;};this.GetBorder=function(){if(this.IsHScreen)return this.ChartBorder.GetHScreenBorder();else return this.ChartBorder.GetBorder();};this.Draw=function(){this.Buttons=[];this.DrawFrame();this.DrawBorder();this.SizeChange=false;this.XYSplit=false;};this.DrawFrame=function(){};this.ClearCoordinateText=function(option){if(IFrameSplitOperator.IsNonEmptyArray(this.HorizontalInfo)){for(var i=0;i<this.HorizontalInfo.length;++i){var item=this.HorizontalInfo[i];if(item&&item.Message&&Array.isArray(item.Message))item.Message[0]=item.Message[1]=null;}}if(IFrameSplitOperator.IsNonEmptyArray(this.VerticalInfo)){for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];if(item&&item.Message&&Array.isArray(item.Message))item.Message[0]=item.Message[1]=null;}}};//画边框
 this.DrawBorder=function(){if(!this.IsShowBorder)return;if(this.IsMinSize)return;var border=this.IsHScreen==true?this.ChartBorder.GetHScreenBorder():this.ChartBorder.GetBorder();var left=ToFixedPoint(border.Left);var top=ToFixedPoint(border.Top);//var top=ToFixedPoint(border.TopEx);
 var right=ToFixedPoint(border.Right);var bottom=ToFixedPoint(border.Bottom);var width=right-left;var height=bottom-top;//JSConsole.Chart.Log(`[IChartFramePainting.DrawBorder] left=${left} `);
@@ -2158,7 +2158,7 @@ if(this.BorderLine==null){this.Canvas.strokeStyle=this.PenBorder;this.Canvas.str
 {this.Canvas.moveTo(left,bottom);this.Canvas.lineTo(right,bottom);}if((this.BorderLine&4)>0)//左
 {this.Canvas.moveTo(left,top);this.Canvas.lineTo(left,bottom);}if((this.BorderLine&8)>0)//右
 {this.Canvas.moveTo(right,top);this.Canvas.lineTo(right,bottom);}this.Canvas.stroke();}};//画标题背景色
-this.DrawTitleBG=function(){if(this.ChartBorder.TitleHeight<=0)return;var border=this.GetBorder();var left=ToFixedPoint(border.Left);var top=ToFixedPoint(border.Top);var right=ToFixedPoint(border.Right);var bottom=ToFixedPoint(this.ChartBorder.GetTopTitle());var width=right-left;var height=bottom-top;this.Canvas.fillStyle=this.TitleBGColor;this.Canvas.fillRect(left,top,width,height);if(this.IsDrawTitleBottomLine){this.Canvas.strokeStyle=this.PenBorder;this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(border.TopTitle));this.Canvas.lineTo(right,ToFixedPoint(border.TopTitle));this.Canvas.stroke();}};this.DrawLock=function(){if(this.IsLocked){if(this.LockPaint==null)this.LockPaint=new ChartLock();this.LockPaint.Canvas=this.Canvas;this.LockPaint.ChartBorder=this.ChartBorder;this.LockPaint.ChartFrame=this;this.LockPaint.Draw(true);}};this.DrawLogo=function(){var border=this.GetBorder();var text=g_JSChartResource.FrameLogo.Text;if(!IFrameSplitOperator.IsString(text))return;this.Canvas.fillStyle=this.LogoTextColor;this.Canvas.font=this.LogoTextFont;this.Canvas.textAlign='left';this.Canvas.textBaseline='bottom';if(this.IsHScreen){var x=border.Left+5;var y=border.Top+5;this.Canvas.save();this.Canvas.translate(x,y);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(text,0,0);this.Canvas.restore();}else{var x=border.Left+5;var y=border.Bottom-5;this.Canvas.fillText(text,x,y);}};this.CalculateLock=function(){if(this.IsLocked){if(this.LockPaint==null)this.LockPaint=new ChartLock();this.LockPaint.Canvas=this.Canvas;this.LockPaint.ChartBorder=this.ChartBorder;this.LockPaint.ChartFrame=this;this.LockPaint.Draw(false);}};//设施上锁
+this.DrawTitleBG=function(){if(this.ChartBorder.TitleHeight<=0)return;var border=this.GetBorder();var left=ToFixedPoint(border.Left);var top=ToFixedPoint(border.Top);var right=ToFixedPoint(border.Right);var bottom=ToFixedPoint(this.ChartBorder.GetTopTitle());var width=right-left;var height=bottom-top;this.Canvas.fillStyle=this.TitleBGColor;this.Canvas.fillRect(left,top,width,height);if(this.IsDrawTitleBottomLine){this.Canvas.strokeStyle=this.PenBorder;this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(border.TopTitle));this.Canvas.lineTo(right,ToFixedPoint(border.TopTitle));this.Canvas.stroke();}};this.DrawLock=function(){if(this.IsLocked){if(this.LockPaint==null)this.LockPaint=new ChartLock();this.LockPaint.Canvas=this.Canvas;this.LockPaint.ChartBorder=this.ChartBorder;this.LockPaint.ChartFrame=this;this.LockPaint.Draw(true);}};this.DrawLogo=function(){var border=this.GetBorder();var text=g_JSChartResource.FrameLogo.Text;if(!IFrameSplitOperator.IsString(text))return;this.Canvas.font=this.LogoTextFont;this.Canvas.textAlign='left';this.Canvas.textBaseline='bottom';var height=this.Canvas.measureText("擎").width;var width=this.Canvas.measureText(text).width;if(this.IsHScreen){var x=border.Left+5;var y=border.Top+5;this.Canvas.save();this.Canvas.translate(x,y);this.Canvas.rotate(90*Math.PI/180);var rtBG={Left:0,Bottom:0,Width:width+4,Height:height+4};rtBG.Top=rtBG.Bottom-rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;if(this.LogoBGColor){this.Canvas.fillStyle=this.LogoBGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}this.Canvas.fillStyle=this.LogoTextColor;this.Canvas.fillText(text,1,0);this.Canvas.restore();}else{var rtBG={Left:border.Left+5,Bottom:border.Bottom-5,Width:width+4,Height:height+4};rtBG.Top=rtBG.Bottom-rtBG.Height;rtBG.Right=rtBG.Left+rtBG.Width;if(this.LogoBGColor){this.Canvas.fillStyle=this.LogoBGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}var x=rtBG.Left+1;var y=rtBG.Bottom-1;this.Canvas.fillStyle=this.LogoTextColor;this.Canvas.fillText(text,x,y);}};this.CalculateLock=function(){if(this.IsLocked){if(this.LockPaint==null)this.LockPaint=new ChartLock();this.LockPaint.Canvas=this.Canvas;this.LockPaint.ChartBorder=this.ChartBorder;this.LockPaint.ChartFrame=this;this.LockPaint.Draw(false);}};//设施上锁
 this.SetLock=function(lockData){if(!lockData)//空数据不上锁
 {this.IsLocked=false;return;}this.IsLocked=true;if(!this.LockPaint)this.LockPaint=new ChartLock();//创建锁
 if(lockData.Callback)this.LockPaint.Callback=lockData.Callback;//回调
@@ -6178,8 +6178,8 @@ this.FrameSplitTextFont=14*GetDevicePixelRatio()+"px 微软雅黑";//坐标刻
 this.FrameTitleBGColor="rgb(246,251,253)";//标题栏背景色
 this.Frame={XBottomOffset:1*GetDevicePixelRatio(),//X轴文字向下偏移
 YTopOffset:2*GetDevicePixelRatio(),//Y轴顶部文字向下偏移
-YTextPadding:[2,2]};this.ToolbarButtonStyle=0;this.FrameLogo={TextColor:'rgb(178,34,34)',Font:"bold "+16*GetDevicePixelRatio()+"px 微软雅黑",Text:"*仅学习使用*"//不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
-};//百分比坐标文字颜色
+YTextPadding:[2,2]};this.ToolbarButtonStyle=0;this.FrameLogo={TextColor:'rgb(178,34,34)',Font:"bold "+16*GetDevicePixelRatio()+"px 微软雅黑",Text:"*仅学习使用*",//不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+BGColor:"rgba(230,230,230, 0.5)"};//百分比坐标文字颜色
 this.Frame.PercentageText={PriceColor:'rgb(117,125,129)',PercentageColor:"rgb(117,125,129)",SplitColor:"rgb(117,125,129)",Font:14*GetDevicePixelRatio()+"px 微软雅黑"};//对数坐标
 this.FrameLogarithmic={OpenPriceFont:"bold "+14*GetDevicePixelRatio()+"px 微软雅黑",//开盘价刻度文字字体
 MinInterval:45*GetDevicePixelRatio()//刻度最小间距
@@ -8286,14 +8286,17 @@ this.UpdateData=function(aryData){if(!aryData||aryData.length<=0)return;var setK
 for(var i in this.Data){var item=this.Data[i];var strKey=item.Date+'-'+item.Time+'-'+item.InfoType+'-'+item.Title;setKeys.add(strKey);}var count=0;for(var i in aryData){var item=aryData[i];var strKey=item.Date+'-'+item.Time+'-'+item.InfoType+'-'+item.Title;if(setKeys.has(strKey))continue;this.Data.push(item);++count;}JSConsole.Chart.Log('[AnnouncementInfo::UpdateData] add new count='+count);};this.RecvError=function(http,e,param){console.warn("[AnnouncementInfo::RecvError] error, http ",e,http);//if (param.HQChart.ScriptErrorCallback) param.HQChart.ScriptErrorCallback(e);
 };}//业绩预告
 function PforecastInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='PforecastInfo';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;//请求数据
+this.newMethod();delete this.newMethod;this.ClassName='PforecastInfo';this.Explain='业绩预告';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
+//请求数据
 JSNetwork.HttpRequest({url:url,data:{"field":["pforecast.type","pforecast.reportdate","fweek"],"condition":[{"item":["pforecast.reportdate","int32","gte",this.StartDate]}],"symbol":[param.HQChart.Symbol],"start":0,"end":this.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvData(recvData,param);}});return true;};this.RecvData=function(recvData,param){if(recvData.stock.length!=1)return;if(recvData.stock[0].stockday.length<=0)return;for(var i in recvData.stock[0].stockday){var item=recvData.stock[0].stockday[i];if(item.pforecast.length>0){var dataItem=item.pforecast[0];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.Title=dataItem.type;infoData.InfoType=KLINE_INFO_TYPE.PFORECAST;infoData.ExtendData={Type:dataItem.type,ReportDate:dataItem.reportdate};if(item.fweek)//未来周涨幅
 {infoData.ExtendData.FWeek={};if(item.fweek.week1!=null)infoData.ExtendData.FWeek.Week1=item.fweek.week1;if(item.fweek.week4!=null)infoData.ExtendData.FWeek.Week4=item.fweek.week4;}this.Data.push(infoData);}}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//投资者关系 (调研)
 function ResearchInfo(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='ResearchInfo';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;//请求数据
+this.newMethod();delete this.newMethod;this.ClassName='ResearchInfo';this.Explain='调研';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
+//请求数据
 JSNetwork.HttpRequest({url:url,data:{"filed":["releasedate","researchdate","level","symbol","id",'type'],"querydate":{"StartDate":this.StartDate,"EndDate":this.GetToday()},"symbol":[param.HQChart.Symbol],"start":0,"end":this.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvData(recvData,param);}});return true;};this.RecvData=function(recvData,param){if(recvData.list.length<=0)return;for(var i in recvData.list){var item=recvData.list[i];var infoData=new KLineInfoData();infoData.ID=item.id;infoData.Date=item.researchdate;infoData.InfoType=KLINE_INFO_TYPE.RESEARCH;infoData.ExtendData={Level:item.level,Type:item.type};this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//大宗交易
 function BlockTrading(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='BlockTrading';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;//请求数据
+this.newMethod();delete this.newMethod;this.ClassName='BlockTrading';this.Explain='大宗交易';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
+//请求数据
 JSNetwork.HttpRequest({url:url,data:{"field":["blocktrading.price","blocktrading.vol","blocktrading.premium","fweek","price"],"condition":[{"item":["date","int32","gte",this.StartDate]},{"item":["blocktrading.vol","int32","gte","0"]}],"symbol":[param.HQChart.Symbol],"start":0,"end":this.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvData(recvData,param);}});return true;};this.RecvData=function(recvData,param){if(recvData.stock.length!=1)return;if(recvData.stock[0].stockday.length<=0)return;for(var i in recvData.stock[0].stockday){var item=recvData.stock[0].stockday[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.BLOCKTRADING;infoData.ExtendData={Price:item.blocktrading.price,//交易价格
 Premium:item.blocktrading.premium,//溢价 （百分比%)
 Vol:item.blocktrading.vol,//交易金额单位（万元)
@@ -8301,7 +8304,8 @@ ClosePrice:item.price//收盘价
 };if(item.fweek)//未来周涨幅
 {infoData.ExtendData.FWeek={};if(item.fweek.week1!=null)infoData.ExtendData.FWeek.Week1=item.fweek.week1;if(item.fweek.week4!=null)infoData.ExtendData.FWeek.Week4=item.fweek.week4;}this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}//龙虎榜
 function TradeDetail(){this.newMethod=IKLineInfo;//派生
-this.newMethod();delete this.newMethod;this.ClassName='TradeDetail';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;//请求数据
+this.newMethod();delete this.newMethod;this.ClassName='TradeDetail';this.Explain='大宗交易';this.RequestData=function(hqChart,obj){var self=this;var param={HQChart:hqChart};this.Data=[];var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;if(this.NetworkFilter(hqChart,obj))return;//已被上层替换,不调用默认的网络请求
+//请求数据
 JSNetwork.HttpRequest({url:url,data:{"field":["tradedetail.typeexplain","tradedetail.type","fweek"],"condition":[{"item":["date","int32","gte",this.StartDate]},{"item":["tradedetail.type","int32","gte","0"]}],"symbol":[param.HQChart.Symbol],"start":0,"end":this.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvData(recvData,param);}});return true;};this.RecvData=function(recvData,param){if(recvData.stock.length!=1)return;if(recvData.stock[0].stockday.length<=0)return;for(var i in recvData.stock[0].stockday){var item=recvData.stock[0].stockday[i];var infoData=new KLineInfoData();infoData.Date=item.date;infoData.InfoType=KLINE_INFO_TYPE.TRADEDETAIL;infoData.ExtendData={Detail:new Array()};for(var j in item.tradedetail){var tradeItem=item.tradedetail[j];infoData.ExtendData.Detail.push({"Type":tradeItem.type,"TypeExplain":tradeItem.typeexplain});}if(item.fweek)//未来周涨幅
 {infoData.ExtendData.FWeek={};if(item.fweek.week1!=null)infoData.ExtendData.FWeek.Week1=item.fweek.week1;if(item.fweek.week4!=null)infoData.ExtendData.FWeek.Week4=item.fweek.week4;}this.Data.push(infoData);}param.HQChart.UpdataChartInfo();param.HQChart.Draw();};}function JSMinuteInfoMap(){}JSMinuteInfoMap.InfoMap=new _map2.default([["大盘异动",{Create:function Create(){return new MarketEventInfo();}}]]);JSMinuteInfoMap.Get=function(id){return JSMinuteInfoMap.InfoMap.get(id);};function IMinuteInfo(){this.Data;this.ClassName='IMinuteInfo';}//////////////////////////////////////////////////////////////////////
 //  大盘异动
@@ -12491,7 +12495,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
 hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12492";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.12498";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

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12493",
+  "version": "1.1.12499",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -9010,6 +9010,7 @@ function IChartFramePainting()
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
+    this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;
     this.GlobalOption;
 
     this.PtInButtons=function(x,y) //坐标是否在按钮上
@@ -9174,10 +9175,12 @@ function IChartFramePainting()
         var text=g_JSChartResource.FrameLogo.Text;
         if (!IFrameSplitOperator.IsString(text)) return;
 
-        this.Canvas.fillStyle=this.LogoTextColor;
+        
         this.Canvas.font=this.LogoTextFont;
         this.Canvas.textAlign = 'left';
         this.Canvas.textBaseline = 'bottom';
+        var height=this.Canvas.measureText("擎").width;
+        var width=this.Canvas.measureText(text).width;
         if (this.IsHScreen)
         {
             var x=border.Left+5;
@@ -9185,13 +9188,36 @@ function IChartFramePainting()
             this.Canvas.save();
             this.Canvas.translate(x,y);
             this.Canvas.rotate(90 * Math.PI / 180);
-            this.Canvas.fillText(text,0,0);
+
+            var rtBG={ Left:0, Bottom:0, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            this.Canvas.fillStyle=this.LogoTextColor;
+            this.Canvas.fillText(text,1,0);
             this.Canvas.restore();
         }
         else
         {
-            var x=border.Left+5;
-            var y=border.Bottom-5;
+            var rtBG={ Left:border.Left+5, Bottom:border.Bottom-5, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            var x=rtBG.Left+1;
+            var y=rtBG.Bottom-1;
+            this.Canvas.fillStyle=this.LogoTextColor;
             this.Canvas.fillText(text,x,y);
         }   
     }
@@ -59622,7 +59648,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -80514,6 +80541,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80526,6 +80554,9 @@ function PforecastInfo()
         this.Data=[];
 
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80592,6 +80623,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80603,6 +80635,9 @@ function ResearchInfo()
 
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80656,6 +80691,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80668,6 +80704,8 @@ function BlockTrading()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80739,7 +80777,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -80751,6 +80790,8 @@ function TradeDetail()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,

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

@@ -13090,6 +13090,7 @@ function IChartFramePainting()
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
+    this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;
     this.GlobalOption;
 
     this.PtInButtons=function(x,y) //坐标是否在按钮上
@@ -13254,10 +13255,12 @@ function IChartFramePainting()
         var text=g_JSChartResource.FrameLogo.Text;
         if (!IFrameSplitOperator.IsString(text)) return;
 
-        this.Canvas.fillStyle=this.LogoTextColor;
+        
         this.Canvas.font=this.LogoTextFont;
         this.Canvas.textAlign = 'left';
         this.Canvas.textBaseline = 'bottom';
+        var height=this.Canvas.measureText("擎").width;
+        var width=this.Canvas.measureText(text).width;
         if (this.IsHScreen)
         {
             var x=border.Left+5;
@@ -13265,13 +13268,36 @@ function IChartFramePainting()
             this.Canvas.save();
             this.Canvas.translate(x,y);
             this.Canvas.rotate(90 * Math.PI / 180);
-            this.Canvas.fillText(text,0,0);
+
+            var rtBG={ Left:0, Bottom:0, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            this.Canvas.fillStyle=this.LogoTextColor;
+            this.Canvas.fillText(text,1,0);
             this.Canvas.restore();
         }
         else
         {
-            var x=border.Left+5;
-            var y=border.Bottom-5;
+            var rtBG={ Left:border.Left+5, Bottom:border.Bottom-5, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            var x=rtBG.Left+1;
+            var y=rtBG.Bottom-1;
+            this.Canvas.fillStyle=this.LogoTextColor;
             this.Canvas.fillText(text,x,y);
         }   
     }
@@ -63702,7 +63728,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -84594,6 +84621,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84606,6 +84634,9 @@ function PforecastInfo()
         this.Data=[];
 
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84672,6 +84703,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84683,6 +84715,9 @@ function ResearchInfo()
 
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84736,6 +84771,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84748,6 +84784,8 @@ function BlockTrading()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84819,7 +84857,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84831,6 +84870,8 @@ function TradeDetail()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -128062,7 +128103,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12492";
+var HQCHART_VERSION="1.1.12498";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -13134,6 +13134,7 @@ function IChartFramePainting()
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
+    this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;
     this.GlobalOption;
 
     this.PtInButtons=function(x,y) //坐标是否在按钮上
@@ -13298,10 +13299,12 @@ function IChartFramePainting()
         var text=g_JSChartResource.FrameLogo.Text;
         if (!IFrameSplitOperator.IsString(text)) return;
 
-        this.Canvas.fillStyle=this.LogoTextColor;
+        
         this.Canvas.font=this.LogoTextFont;
         this.Canvas.textAlign = 'left';
         this.Canvas.textBaseline = 'bottom';
+        var height=this.Canvas.measureText("擎").width;
+        var width=this.Canvas.measureText(text).width;
         if (this.IsHScreen)
         {
             var x=border.Left+5;
@@ -13309,13 +13312,36 @@ function IChartFramePainting()
             this.Canvas.save();
             this.Canvas.translate(x,y);
             this.Canvas.rotate(90 * Math.PI / 180);
-            this.Canvas.fillText(text,0,0);
+
+            var rtBG={ Left:0, Bottom:0, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            this.Canvas.fillStyle=this.LogoTextColor;
+            this.Canvas.fillText(text,1,0);
             this.Canvas.restore();
         }
         else
         {
-            var x=border.Left+5;
-            var y=border.Bottom-5;
+            var rtBG={ Left:border.Left+5, Bottom:border.Bottom-5, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            var x=rtBG.Left+1;
+            var y=rtBG.Bottom-1;
+            this.Canvas.fillStyle=this.LogoTextColor;
             this.Canvas.fillText(text,x,y);
         }   
     }
@@ -63746,7 +63772,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -84638,6 +84665,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84650,6 +84678,9 @@ function PforecastInfo()
         this.Data=[];
 
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84716,6 +84747,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84727,6 +84759,9 @@ function ResearchInfo()
 
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84780,6 +84815,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84792,6 +84828,8 @@ function BlockTrading()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84863,7 +84901,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84875,6 +84914,8 @@ function TradeDetail()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -128215,7 +128256,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12492";
+var HQCHART_VERSION="1.1.12498";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.chartpaint.wechat.js

@@ -7068,6 +7068,7 @@ function ChartVolStick()
         else    //太细了直接话线
         {
             var preKItem=null;
+            var barColor=null;
             for (var i = this.Data.DataOffset, j = 0; i < this.Data.Data.length && j < xPointCount; ++i, ++j, xOffset += (dataWidth + distanceWidth)) 
             {
                 var value = this.Data.Data[i];
@@ -7089,14 +7090,8 @@ function ChartVolStick()
 
                 if (x > chartright) break;
 
-                if (isMinute)
-                {
-                    var barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                }
-                else
-                {
-                    var barColor=this.GetBarColor(kItem);
-                }
+                if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
+                else barColor=this.GetBarColor(kItem);
                 
                 this.Canvas.strokeStyle=barColor.Color;
 
@@ -7133,7 +7128,7 @@ function ChartVolStick()
         var xOffset = this.ChartBorder.GetTop() + distanceWidth / 2.0 + 2.0;
         var chartBottom = this.ChartBorder.GetBottom();
         var xPointCount = this.ChartFrame.XPointCount;
-
+        var isMinute=this.IsMinuteFrame();
         var yBottom = this.ChartFrame.GetYFromData(0);
 
         if (dataWidth >= this.MinBarWidth) 
@@ -7171,6 +7166,8 @@ function ChartVolStick()
         }
         else    //太细了直接话线
         {
+            var preKItem=null;
+            var barColor=null;
             for (var i = this.Data.DataOffset, j = 0; i < this.Data.Data.length && j < xPointCount; ++i, ++j, xOffset += (dataWidth + distanceWidth)) 
             {
                 var value = this.Data.Data[i];
@@ -7178,10 +7175,22 @@ function ChartVolStick()
                 if (value == null || kItem == null) continue;
 
                 var y = this.ChartFrame.GetYFromData(value);
-                var x = this.ChartFrame.GetXFromIndex(j);
+
+                if (isMinute)
+                {
+                    var x=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    var left=xOffset;
+                    var right=xOffset+dataWidth;
+                    var x=left+(right-left)/2;
+                }
                 if (x > chartBottom) break;
 
-                var barColor=this.GetBarColor(kItem);
+                if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
+                else barColor=this.GetBarColor(kItem);
+                
                 this.Canvas.strokeStyle=barColor.Color;
 
                 //var x = this.ChartFrame.GetXFromIndex(j);
@@ -7189,6 +7198,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(y, ToFixedPoint(x));
                 this.Canvas.lineTo(yBottom, ToFixedPoint(x));
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

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