hqchart 1.1.12490 → 1.1.12499

package/lib/umychart.vue.js

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _promise=require('babel-runtime/core-js/promise');var _promise2=_interopRequireDefault(_promise);var _log=require('babel-runtime/core-js/math/log10');var _log2=_interopRequireDefault(_log);var _defineProperties=require('babel-runtime/core-js/object/define-properties');var _defineProperties2=_interopRequireDefault(_defineProperties);var _create=require('babel-runtime/core-js/object/create');var _create2=_interopRequireDefault(_create);var _from=require('babel-runtime/core-js/array/from');var _from2=_interopRequireDefault(_from);var _typeof2=require('babel-runtime/helpers/typeof');var _typeof3=_interopRequireDefault(_typeof2);var _defineProperty2=require('babel-runtime/helpers/defineProperty');var _defineProperty3=_interopRequireDefault(_defineProperty2);var _set=require('babel-runtime/core-js/set');var _set2=_interopRequireDefault(_set);var _stringify=require('babel-runtime/core-js/json/stringify');var _stringify2=_interopRequireDefault(_stringify);var _getIterator2=require('babel-runtime/core-js/get-iterator');var _getIterator3=_interopRequireDefault(_getIterator2);var _map=require('babel-runtime/core-js/map');var _map2=_interopRequireDefault(_map);var _jsChartInit$jsChartS;var _jquery=require('jquery');var _jquery2=_interopRequireDefault(_jquery);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}//日志输出类
+'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _promise=require('babel-runtime/core-js/promise');var _promise2=_interopRequireDefault(_promise);var _log=require('babel-runtime/core-js/math/log10');var _log2=_interopRequireDefault(_log);var _defineProperties=require('babel-runtime/core-js/object/define-properties');var _defineProperties2=_interopRequireDefault(_defineProperties);var _create=require('babel-runtime/core-js/object/create');var _create2=_interopRequireDefault(_create);var _from=require('babel-runtime/core-js/array/from');var _from2=_interopRequireDefault(_from);var _typeof2=require('babel-runtime/helpers/typeof');var _typeof3=_interopRequireDefault(_typeof2);var _set=require('babel-runtime/core-js/set');var _set2=_interopRequireDefault(_set);var _defineProperty2=require('babel-runtime/helpers/defineProperty');var _defineProperty3=_interopRequireDefault(_defineProperty2);var _stringify=require('babel-runtime/core-js/json/stringify');var _stringify2=_interopRequireDefault(_stringify);var _getIterator2=require('babel-runtime/core-js/get-iterator');var _getIterator3=_interopRequireDefault(_getIterator2);var _map=require('babel-runtime/core-js/map');var _map2=_interopRequireDefault(_map);var _jsChartInit$jsChartS;var _jquery=require('jquery');var _jquery2=_interopRequireDefault(_jquery);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}//日志输出类
 var JSConsole={Chart:{Log:console.log,Warn:console.warn},//图形日志
 Complier:{Log:console.log,Warn:console.warn},//编译器日志
 JSTable:{Log:console.log,Warn:console.warn//表格日志
@@ -1760,9 +1760,9 @@ return true;};this.DocOnMouseUp=function(e){//清空事件
 document.onmousemove=null;document.onmouseup=null;var IsMinuteChart=this.ClassName=="MinuteChartContainer"||this.ClassName=="MinuteChartHScreenContainer"?true:false;var isDragSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Index>=0;var isDragSubSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Type==4;var bClearDrawPicture=true;if(this.CurrentChartDrawPicture){var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==2||drawPicture.Status==1||drawPicture.Status==3){drawPicture.PointStatus=drawPicture.Status;if(this.FinishChartDrawPicturePoint())this.DrawDynamicInfo();else bClearDrawPicture=false;}else if(drawPicture.Status==20){if(this.FinishMoveChartDrawPicture())this.DrawDynamicInfo();}}else if(this.IndexChartDrag&&this.IndexChartDrag.SelectedChart){var chartMove=this.GetExtendChartByClassName("DragMovePaint");if(chartMove&&chartMove.Chart)chartMove.Chart.Clear();if(!this.OnDragChart(this.IndexChartDrag))this.DrawDynamicInfo();this.UIElement.style.cursor="default";}else if(this.CustomChartDrag){var sendData={e:e,ChartDrag:this.CustomChartDrag,Drag:this.MouseDrag};this.TryMouseUp_CustomChartDrag(sendData);}else if(isDragSelectRect)//区间选择拖动范围
 {if(this.OnDragSelectRectMouseUp)this.OnDragSelectRectMouseUp(e);}else if(isDragSubSelectRect){if(this.OnDragSubSelectRectMouseUp)this.OnDragSubSelectRectMouseUp(e);}else if(IsMinuteChart){if(this.OnMinuteSelectRectMouseUp)this.OnMinuteSelectRectMouseUp(e);}else if(this.DragMode==2)//区间选择
 {var drag=this.MouseDrag;drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;var selectData=new SelectRectData();var pixelTatio=GetDevicePixelRatio();//区间起始位置 结束位子
-selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowMenu=true;if(event&&event.Callback){var data={X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
+selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowMenu=true;if(event&&event.Callback){var data=(0,_defineProperty3.default)({X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint,//区间选择背景
-IsShowMenu:true};event.Callback(event,data,this);isShowMenu=data.IsShowMenu;}if(IsMinuteChart)//分时图直接显示显示区间选择
+IsShowMenu:true,e:e},'e',e);event.Callback(event,data,this);isShowMenu=data.IsShowMenu;}if(IsMinuteChart)//分时图直接显示显示区间选择
 {this.HideSelectRect();this.UpdateSelectRect(selectData.Start,selectData.End);}else{if(isShowMenu&&this.SelectRectRightMenu){e.data={Chart:this,X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint//区间选择背景
 };this.SelectRectRightMenu.DoModal(e);}}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);this.ClickEvent(e);}//清空数据
@@ -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;//回调
@@ -3841,14 +3841,15 @@ this.KLineDrawType=0;this.ClassName='ChartVolStick';this.PtInChart=this.PtInBar;
 y=yBottom-height;if(this.KLineDrawType==6)//完全空心柱
 {this.Canvas.strokeStyle=barColor.Color;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(y),ToFixedRect(dataWidth),height);this.Canvas.stroke();}else if(bUp&&(this.KLineDrawType==1||this.KLineDrawType==2||this.KLineDrawType==3))//空心柱子
 {this.Canvas.strokeStyle=this.UpColor;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(y),ToFixedRect(dataWidth),height);this.Canvas.stroke();}else{this.Canvas.fillRect(ToFixedRect(left),y,ToFixedRect(dataWidth),height);}}}else//太细了直接话线
-{var preKItem=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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;}if(x>chartright)break;if(isMinute){var barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
-}else{var barColor=this.GetBarColor(kItem);}this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
+{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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;}if(x>chartright)break;if(isMinute)barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
+else barColor=this.GetBarColor(kItem);this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
 this.Canvas.beginPath();this.Canvas.moveTo(ToFixedPoint(x),y);this.Canvas.lineTo(ToFixedPoint(x),yBottom);this.Canvas.stroke();preKItem=kItem;}}};this.HScreenDraw=function()//横屏画法
-{var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartBottom=border.BottomEx;var xPointCount=this.ChartFrame.XPointCount;var lockRect=this.GetLockRect();if(lockRect)chartBottom=lockRect.Top;var yBottom=this.ChartFrame.GetYFromData(0);if(dataWidth>=4){yBottom=ToFixedRect(yBottom);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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartBottom)break;var y=this.ChartFrame.GetYFromData(value);var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.fillStyle=barColor.Color;var height=ToFixedRect(y-yBottom);//高度调整为整数
+{var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartBottom=border.BottomEx;var xPointCount=this.ChartFrame.XPointCount;var lockRect=this.GetLockRect();if(lockRect)chartBottom=lockRect.Top;var isMinute=this.IsMinuteFrame();var yBottom=this.ChartFrame.GetYFromData(0);if(dataWidth>=4){yBottom=ToFixedRect(yBottom);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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartBottom)break;var y=this.ChartFrame.GetYFromData(value);var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.fillStyle=barColor.Color;var height=ToFixedRect(y-yBottom);//高度调整为整数
 if(bUp&&(this.KLineDrawType==1||this.KLineDrawType==2||this.KLineDrawType==3))//空心柱子
 {this.Canvas.strokeStyle=this.UpColor;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(yBottom),ToFixedPoint(left),height,ToFixedRect(dataWidth));this.Canvas.stroke();}else{this.Canvas.fillRect(yBottom,ToFixedRect(left),height,ToFixedRect(dataWidth));}}}else//太细了直接话线
-{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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);var x=this.ChartFrame.GetXFromIndex(j);if(x>chartBottom)break;var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
-this.Canvas.beginPath();this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yBottom,ToFixedPoint(x));this.Canvas.stroke();}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(!IFrameSplitOperator.IsNumber(range.Max)||range.Max<value)range.Max=value;if(!IFrameSplitOperator.IsNumber(range.Min)||range.Min>value)range.Min=value;}if(range.Max>0&&range.Min>0)range.Min=0;else if(range.Max<0&&range.Min<0)range.Max=0;return range;};this.GetBarColor=function(kItem){if(kItem.Close>=kItem.Open)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
+{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];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);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;if(isMinute)barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
+else barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
+this.Canvas.beginPath();this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yBottom,ToFixedPoint(x));this.Canvas.stroke();preKItem=kItem;}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(!IFrameSplitOperator.IsNumber(range.Max)||range.Max<value)range.Max=value;if(!IFrameSplitOperator.IsNumber(range.Min)||range.Min>value)range.Min=value;}if(range.Max>0&&range.Min>0)range.Min=0;else if(range.Max<0&&range.Min<0)range.Max=0;return range;};this.GetBarColor=function(kItem){if(kItem.Close>=kItem.Open)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
 else return{Color:this.DownColor,IsUp:false};};this.GetMinuteBarColor=function(kItem,preItem){var prePrice=kItem.YClose;if(preItem)prePrice=preItem.Close;if(kItem.Close>=prePrice)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
 else return{Color:this.DownColor,IsUp:false};};this.GetItemData=function(indexData){if(!indexData)return null;if(!IFrameSplitOperator.IsNumber(indexData.Index))return null;if(!this.HistoryData||!IFrameSplitOperator.IsNonEmptyArray(this.HistoryData.Data))return null;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=indexData.Index;if(index<0||index>=this.Data.Data.length||index>=this.HistoryData.Data.length)return null;var item=this.Data.Data[index];var kItem=this.HistoryData.Data[index];return[{Value:item,Color:this.GetBarColor(kItem).Color,Name:this.Name}];};}// VERTLINE(HIGH>=HHV(HIGH,20),1)表示在创20天新高画垂直虚线。
 // 支持横屏
@@ -6177,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()//刻度最小间距
@@ -7419,8 +7420,8 @@ this.OnDragMode_One=function(moveData,e){var drag=this.MouseDrag;var moveSetp=mo
 {if(moveSetp<5)return;var obj={X:e.clientX,Y:e.clientY,PointIndex:this.RectSelectDrag.Index,Name:"MoveRectSelectLine"};if(this.MoveRectSelectPoint(obj)){drag.LastMove.X=e.clientX;this.Draw();}}else{if(moveSetp<5&&yMoveSetp<5)return;if(!this.EnableSelectRect)return;this.UIElement.style.cursor="default";var x=drag.Click.X-uielement.getBoundingClientRect().left;var y=drag.Click.Y-uielement.getBoundingClientRect().top;var x2=e.clientX-uielement.getBoundingClientRect().left;var y2=e.clientY-uielement.getBoundingClientRect().top;this.ShowSelectRect(x,y,x2,y2);drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;}};this.OnMinuteSelectRectMouseUp=function(e){var drag=this.MouseDrag;drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;var selectData=new SelectRectData();var pixelTatio=GetDevicePixelRatio();//区间起始位置 结束位子
 selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(this.EnableSelectRect&&!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowDialog=true;//是否显示内置区间选择框
 if(event&&event.Callback){var data={X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
-RectSelectPaint:paint//区间选择背景
-};event.Callback(event,data,this);isShowDialog=false;//外部调用了区间选择事件，不弹框
+RectSelectPaint:paint,//区间选择背景
+e:e};event.Callback(event,data,this);isShowDialog=false;//外部调用了区间选择事件，不弹框
 }if(isShowDialog&&this.SelectRectDialog){e.data={Chart:this,X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
 RectSelectPaint:paint//区间选择背景
 };this.SelectRectDialog.DoModal(e);}else{this.HideSelectRect();this.UpdateSelectRect(selectData.Start,selectData.End);}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);this.ClickEvent(e);}};this.OnDragSelectRectMouseUp=function(e){var paint=this.GetRectSelectPaint();if(!paint)return;var selectData=paint.GetSelectRectData();if(!selectData)return;var pixelTatio=GetDevicePixelRatio();var corssCursor=this.ChartCorssCursor;//十字光标
@@ -8285,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,//交易金额单位（万元)
@@ -8300,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';}//////////////////////////////////////////////////////////////////////
 //  大盘异动
@@ -10562,7 +10567,7 @@ case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY://卖出信息-偿还量
 case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET://卖出信息-融券净卖出
 var sellData=marginData.sell;if(!sellData)continue;if(!this.IsNumber(sellData.balance)||!this.IsNumber(sellData.volume)||!this.IsNumber(sellData.repay)||!this.IsNumber(sellData.net))continue;indexData.Value=buyData.balance;var indexData2=new SingleData();indexData2.Date=item.date;indexData2.Value=buyData.volume;var indexData3=new SingleData();indexData3.Date=item.date;indexData3.Value=buyData.repay;var indexData4=new SingleData();indexData4.Date=item.date;indexData4.Value=buyData.net;aryData.push(indexData);aryData2.push(indexData2);aryData3.push(indexData3);aryData4.push(indexData4);break;default:continue;}}var allData=[];if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_RATE){allData.push({JobID:jobID,Data:aryData});}else if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_AMOUNT||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_REPAY||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_NET){allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_BALANCE,Data:aryData});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_AMOUNT,Data:aryData2});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_REPAY,Data:aryData3});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_NET,Data:aryData4});}else if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_VOLUME||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET){allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_BALANCE,Data:aryData});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_VOLUME,Data:aryData2});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY,Data:aryData3});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET,Data:aryData4});}for(var _i126 in allData){var aryFixedData=this.SourceData.GetFittingData(allData[_i126].Data);var bindData=new ChartData();bindData.Data=aryFixedData;bindData.Period=this.Period;//周期
 if(bindData.Period>0)//周期数据
-{var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data=bindData.GetValue();this.MarginData.set(allData[_i126].JobID,_data);}};this.GetNewsAnalysisCacheData=function(id,node){var jobID=JS_EXECUTE_JOB_ID.GetNewsAnalysisID(id);if(!jobID)this.Execute.ThrowUnexpectedNode(node,'不支持NEWS('+id+')');if(this.NewsAnalysisData.has(jobID))return this.NewsAnalysisData.get(jobID);return[];};this.GetHKToSHSZData=function(job){var args=job.Args;var code=this.Symbol;if(args.length>0){var item=args[0];if(item.Type==Syntax.Literal){code=item.Value;}else if(item.Type==Syntax.Identifier)//变量 !!只支持默认的变量值
+{var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data2=bindData.GetValue();this.MarginData.set(allData[_i126].JobID,_data2);}};this.GetNewsAnalysisCacheData=function(id,node){var jobID=JS_EXECUTE_JOB_ID.GetNewsAnalysisID(id);if(!jobID)this.Execute.ThrowUnexpectedNode(node,'不支持NEWS('+id+')');if(this.NewsAnalysisData.has(jobID))return this.NewsAnalysisData.get(jobID);return[];};this.GetHKToSHSZData=function(job){var args=job.Args;var code=this.Symbol;if(args.length>0){var item=args[0];if(item.Type==Syntax.Literal){code=item.Value;}else if(item.Type==Syntax.Identifier)//变量 !!只支持默认的变量值
 {var isFind=false;for(var j in this.Arguments){var argItem=this.Arguments[j];if(argItem.Name==item.Name){code=argItem.Value;isFind=true;break;}}if(!isFind){var token=job.Token;this.Execute.ErrorHandler.ThrowError(token.Index,token.Line,0,'HK2SHSZ() Error: can\'t read '+item.Name);}}}job.Symbol=code;if(code==1||code==2||code==3)//下载全市场数据
 this.GetHKToSHSZMarketData(code,job);else this.GetHKToSHSZStockData(code,job);//下载个股数据
 };this.GetHKToSHSZStockData=function(symbol,job){if(this.HKToSHSZData.has(symbol))return this.Execute.RunNextJob();var upperSymbol=symbol.toLowerCase();//代码小写
@@ -10577,7 +10582,7 @@ JSNetwork.HttpRequest({url:url,type:"get",dataType:"json",async:true,success:fun
 var SZValue=data.hk2sz[i]*1000000;//单位是百万
 var total=SHValue+SZValue;var itemSHSZData=new SingleData();itemSHSZData.Date=date;itemSHSZData.Value=total;var itemSHData=new SingleData();itemSHData.Date=date;itemSHData.Value=SHValue;var itemSZData=new SingleData();itemSZData.Date=date;itemSZData.Value=SZValue;arySHSZData.push(itemSHSZData);arySHData.push(itemSHData);arySZData.push(itemSZData);}var allData=[{Data:arySHSZData,ID:1},{Data:arySHData,ID:2},{Data:arySZData,ID:3}];for(var _i127 in allData){var aryFixedData=this.Data.GetFittingData(allData[_i127].Data);var bindData=new ChartData();bindData.Data=aryFixedData;bindData.Period=this.Period;//周期
 if(bindData.Period>0)//周期数据
-{var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data2=bindData.GetValue();this.HKToSHSZData.set(allData[_i127].ID,_data2);}};this.RecvMulitMinuteHKToSHSZData=function(data,job)//多日分时图北上资金
+{var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data3=bindData.GetValue();this.HKToSHSZData.set(allData[_i127].ID,_data3);}};this.RecvMulitMinuteHKToSHSZData=function(data,job)//多日分时图北上资金
 {if(!data.data||data.data.length<=0)return;var arySHSZData=[],arySHData=[],arySZData=[];for(var i=0,j=0;i<this.Data.Data.length&&j<data.data.length;){arySHSZData[i]=null;arySHData[i]=null;arySZData[i]=null;var item=this.Data.Data[i];var dateTime=item.DateTime;//日期加时间
 if(!dateTime){++i;continue;}var aryValue=dateTime.split(' ');if(aryValue.length!=2){++i;continue;}var date=parseInt(aryValue[0]);var day=data.data[j];if(!day.minute||day.minute.length<=0){++j;continue;}if(day.date>date){++i;continue;}else if(day.date<date){++j;continue;}for(var k in day.minute){var timeItem=day.minute[k];var SHValue=timeItem[1];var SZValue=timeItem[2];var total=SHValue+SZValue;arySHSZData[i]=total;arySHData[i]=SHValue;arySZData[i]=SZValue;++i;}++j;}var allData=[{Data:arySHSZData,ID:1},{Data:arySHData,ID:2},{Data:arySZData,ID:3}];for(var i in allData){var item=allData[i];this.HKToSHSZData.set(item.ID,item.Data);}};//北上资金函数
 this.GetHKToSHSZCacheData=function(code,node){//if (!this.HKToSHSZData.has(code)) this.Execute.ThrowUnexpectedNode(node,`不支持HK2SHSZ(${code})`);
@@ -12490,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.12489";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.12490",
+  "version": "1.1.12499",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -3842,7 +3842,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                         SelectData:selectData,   //区间选择的数据
                         RectSelectPaint:paint,    //区间选择背景
-                        IsShowMenu:true
+                        IsShowMenu:true,
+                        e,e
                     };
                     event.Callback(event,data,this);
                     isShowMenu=data.IsShowMenu;
@@ -9009,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) //坐标是否在按钮上
@@ -9173,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;
@@ -9184,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);
         }   
     }
@@ -29064,6 +29091,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];
@@ -29084,14 +29112,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;
                 
@@ -29117,6 +29139,7 @@ function ChartVolStick()
         var lockRect=this.GetLockRect();
         if (lockRect) chartBottom=lockRect.Top;
 
+        var isMinute=this.IsMinuteFrame();
         var yBottom=this.ChartFrame.GetYFromData(0);
 
         if (dataWidth>=4)
@@ -29153,6 +29176,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];
@@ -29160,10 +29185,23 @@ 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);
+
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
 
@@ -29172,6 +29210,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(y,ToFixedPoint(x));
                 this.Canvas.lineTo(yBottom,ToFixedPoint(x));
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }
@@ -59608,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)",
     };
 
     //百分比坐标文字颜色
@@ -70566,7 +70607,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:drag.LastMove.X-uielement.getBoundingClientRect().left,
                     Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e
                 };
                 event.Callback(event,data,this);
                 isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -80499,6 +80541,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80511,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,
@@ -80577,6 +80623,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80588,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,
@@ -80641,6 +80691,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80653,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,
@@ -80724,7 +80777,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -80736,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

@@ -7922,7 +7922,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                         SelectData:selectData,   //区间选择的数据
                         RectSelectPaint:paint,    //区间选择背景
-                        IsShowMenu:true
+                        IsShowMenu:true,
+                        e,e
                     };
                     event.Callback(event,data,this);
                     isShowMenu=data.IsShowMenu;
@@ -13089,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) //坐标是否在按钮上
@@ -13253,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;
@@ -13264,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);
         }   
     }
@@ -33144,6 +33171,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];
@@ -33164,14 +33192,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;
                 
@@ -33197,6 +33219,7 @@ function ChartVolStick()
         var lockRect=this.GetLockRect();
         if (lockRect) chartBottom=lockRect.Top;
 
+        var isMinute=this.IsMinuteFrame();
         var yBottom=this.ChartFrame.GetYFromData(0);
 
         if (dataWidth>=4)
@@ -33233,6 +33256,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];
@@ -33240,10 +33265,23 @@ 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);
+
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
 
@@ -33252,6 +33290,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(y,ToFixedPoint(x));
                 this.Canvas.lineTo(yBottom,ToFixedPoint(x));
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }
@@ -63688,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)",
     };
 
     //百分比坐标文字颜色
@@ -74646,7 +74687,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:drag.LastMove.X-uielement.getBoundingClientRect().left,
                     Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e
                 };
                 event.Callback(event,data,this);
                 isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -84579,6 +84621,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84591,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,
@@ -84657,6 +84703,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84668,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,
@@ -84721,6 +84771,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84733,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,
@@ -84804,7 +84857,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84816,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,
@@ -128047,7 +128103,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12489";
+var HQCHART_VERSION="1.1.12498";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -7966,7 +7966,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                         SelectData:selectData,   //区间选择的数据
                         RectSelectPaint:paint,    //区间选择背景
-                        IsShowMenu:true
+                        IsShowMenu:true,
+                        e,e
                     };
                     event.Callback(event,data,this);
                     isShowMenu=data.IsShowMenu;
@@ -13133,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) //坐标是否在按钮上
@@ -13297,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;
@@ -13308,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);
         }   
     }
@@ -33188,6 +33215,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];
@@ -33208,14 +33236,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;
                 
@@ -33241,6 +33263,7 @@ function ChartVolStick()
         var lockRect=this.GetLockRect();
         if (lockRect) chartBottom=lockRect.Top;
 
+        var isMinute=this.IsMinuteFrame();
         var yBottom=this.ChartFrame.GetYFromData(0);
 
         if (dataWidth>=4)
@@ -33277,6 +33300,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];
@@ -33284,10 +33309,23 @@ 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);
+
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
 
@@ -33296,6 +33334,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(y,ToFixedPoint(x));
                 this.Canvas.lineTo(yBottom,ToFixedPoint(x));
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }
@@ -63732,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)",
     };
 
     //百分比坐标文字颜色
@@ -74690,7 +74731,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:drag.LastMove.X-uielement.getBoundingClientRect().left,
                     Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e
                 };
                 event.Callback(event,data,this);
                 isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -84623,6 +84665,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84635,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,
@@ -84701,6 +84747,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84712,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,
@@ -84765,6 +84815,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84777,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,
@@ -84848,7 +84901,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84860,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,
@@ -128200,7 +128256,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12489";
+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()
 {