hqchart 1.1.11273 → 1.1.11276
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/umychart.vue.js
CHANGED
|
@@ -1545,7 +1545,8 @@ ON_CLICK_REPORT_FIXEDROW:59,//点击报价列表点击固定行
|
|
|
1545
1545
|
ON_RCLICK_REPORT_FIXEDROW:60,//点击报价列表右键点击固定行
|
|
1546
1546
|
ON_KEYDOWN_SELECT_RECT_FIRST:61,//区间选择第1个位置事件
|
|
1547
1547
|
ON_CLICK_FRAME_TOOLBAR:62,//指标标题工具栏
|
|
1548
|
-
ON_REPORT_DRAG_ROW:63
|
|
1548
|
+
ON_REPORT_DRAG_ROW:63,//自选股行拖拽
|
|
1549
|
+
ON_MOUSE_MOVE:64//鼠标移动
|
|
1549
1550
|
};var JSCHART_OPERATOR_ID={OP_SCROLL_LEFT:1,//往左移动
|
|
1550
1551
|
OP_SCROLL_RIGHT:2,//往右移动
|
|
1551
1552
|
OP_ZOOM_OUT:3,//缩小
|
|
@@ -1645,8 +1646,7 @@ this.MoveOnChartDrawPicture=null;if(this.ChartSplashPaint&&this.ChartSplashPaint
|
|
|
1645
1646
|
}
|
|
1646
1647
|
*///保存最后一次鼠标移动信息
|
|
1647
1648
|
var MoveStatus={X:x,Y:y,IsInClient:this.IsMouseOnClient(x,y)};this.LastMouseStatus.OnMouseMove=MoveStatus;this.LastMouseStatus.MoveOnPoint={X:x,Y:y};//鼠标移动的位置
|
|
1648
|
-
|
|
1649
|
-
this.MoveOnPoint={X:x,Y:y};this.OnMouseMove(x,y,e);this.LastMouseStatus.MoveOnPoint=null;};this.IsMouseOnClient=function(x,y){var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);return isInClient;};this.UIOnContextMenu=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;if(typeof this.OnRightMenu=='function')this.OnRightMenu(x,y,e);//右键菜单事件
|
|
1649
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);var titleChart=this.TitlePaint[0];if(event&&titleChart)titleChart.OnMouseMoveEvent=event;this.MoveOnPoint={X:x,Y:y};this.OnMouseMove(x,y,e);this.LastMouseStatus.MoveOnPoint=null;if(titleChart)titleChart.OnMouseMoveEvent=null;};this.IsMouseOnClient=function(x,y){var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);return isInClient;};this.UIOnContextMenu=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;if(typeof this.OnRightMenu=='function')this.OnRightMenu(x,y,e);//右键菜单事件
|
|
1650
1650
|
return false;};this.UIOnDblClick=function(e){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;this.OnDoubleClick(x,y,e);};//是否在拖拽Y轴上
|
|
1651
1651
|
this.TryYDrag=function(x,y){if(!this.EnableYDrag)return null;if(!this.EnableYDrag.Left&&!this.EnableYDrag.Right)return null;if(!this.Frame||!this.Frame.PtInFrameY)return null;var dragY=this.Frame.PtInFrameY(x,y);if(!dragY||dragY.Index<0||dragY.IsOverlay==true)return null;if(dragY.Left&&this.EnableYDrag.Left&&this.Frame.IsEnableDragY(dragY.Index)){return dragY;}if(dragY.Right&&this.EnableYDrag.Right&&this.Frame.IsEnableDragY(dragY.Index)){return dragY;}return null;};//是否可以上下拖拽
|
|
1652
1652
|
this.TryUpDownDrag=function(x,y){var windowIndex=this.Frame.PtInFrame(x,y);if(windowIndex<0)return null;var item=this.Frame.SubFrame[windowIndex];if(!item||!item.Frame)return null;var frame=item.Frame;if(!frame.YSplitOperator||!frame.YSplitOperator.FixedYMaxMin)return null;return{Index:windowIndex,X:x,Y:y};};this.TryRectSelectDrag=function(x,y){var paint=this.GetRectSelectPaint();if(!paint)return null;if(paint.GetPointCount()<=0)return null;var item=paint.PtInPaint(x,y);return{Item:item,X:x,Y:y};};this.TryClickCrossCursor=function(x,y,e){if(!this.ChartCorssCursor)return;var button=this.ChartCorssCursor.PtInButton(x,y);if(!button)return false;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_RIGHT);if(event&&event.Callback){var sendData={Button:button,e:e};event.Callback(event,sendData,this);}return true;};this.UIOnMouseDown=function(e){var _this4=this;this.MoveOnChartDrawPicture=null;if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;this.ClickDownPoint={X:e.clientX,Y:e.clientY};this.IsOnTouch=true;this.BorderDrag=null;this.YDrag=null;this.UpDownDrag=null;this.RectSelectDrag=null;this.IndexChartDrag=null;var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var button=this.Frame.PtInButtons(x,y);if(button&&this.ClickFrameButton){this.ClickFrameButton(button,e);return;}else{button=this.PtInExtendChartButtons(x,y);if(button&&this.ClickExtendChartButton){this.ClickExtendChartButton(button,e);return;}}if(this.TryClickCrossCursor(x,y,e)){return;}if(this.TryClickLock){//JSConsole.Chart.Log('[uielement.onmousedown] left, top ',e.clientX, e.clientY, this.getBoundingClientRect().left,this.getBoundingClientRect().top);
|
|
@@ -4222,7 +4222,7 @@ this.OverlayChartPaint;//叠加画法
|
|
|
4222
4222
|
this.IsShowName=true;//是否显示股票名称
|
|
4223
4223
|
this.IsShowSettingInfo=true;//是否显示设置信息(周期 复权)
|
|
4224
4224
|
this.IsShowDateTime=true;//是否显示日期
|
|
4225
|
-
this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.OnDrawEvent;this.ReloadResource=function(){this.Font=g_JSChartResource.TitleFont;this.TitleColor=g_JSChartResource.DefaultTextColor;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchagneColor=g_JSChartResource.UnchagneTextColor;this.VolColor=g_JSChartResource.Title.VolColor;this.AmountColor=g_JSChartResource.Title.AmountColor;this.DateTimeColor=g_JSChartResource.Title.DateTimeColor;this.NameColor=g_JSChartResource.Title.NameColor;this.SettingColor=g_JSChartResource.Title.SettingColor;this.TurnoverRateColor=g_JSChartResource.Title.TurnoverRateColor;//换手率
|
|
4225
|
+
this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.OnDrawEvent;this.OnMouseMoveEvent;this.ReloadResource=function(){this.Font=g_JSChartResource.TitleFont;this.TitleColor=g_JSChartResource.DefaultTextColor;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchagneColor=g_JSChartResource.UnchagneTextColor;this.VolColor=g_JSChartResource.Title.VolColor;this.AmountColor=g_JSChartResource.Title.AmountColor;this.DateTimeColor=g_JSChartResource.Title.DateTimeColor;this.NameColor=g_JSChartResource.Title.NameColor;this.SettingColor=g_JSChartResource.Title.SettingColor;this.TurnoverRateColor=g_JSChartResource.Title.TurnoverRateColor;//换手率
|
|
4226
4226
|
this.PositionColor=g_JSChartResource.Title.PositionColor;//持仓
|
|
4227
4227
|
};this.GetCurrentKLineData=function()//获取当天鼠标位置所在的K线数据
|
|
4228
4228
|
{if(this.CursorIndex==null||!this.Data)return null;if(this.Data.length<=0)return null;var index=this.CursorIndex;index=parseInt(index.toFixed(0));var dataIndex=this.Data.DataOffset+index;if(dataIndex>=this.Data.Data.length)dataIndex=this.Data.Data.length-1;if(dataIndex<0)return null;var item=this.Data.Data[dataIndex];return item;};this.DrawItem=function(item){var isHScreen=this.Frame.IsHScreen===true;var left=this.Frame.ChartBorder.GetLeft();var bottom=this.Frame.ChartBorder.GetTop()-this.Frame.ChartBorder.Top/2;var right=this.Frame.ChartBorder.GetRight();var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
|
|
@@ -4233,8 +4233,8 @@ var text=g_JSChartLocalization.GetText('KTitle-Vol',this.LanguageID)+IFrameSplit
|
|
|
4233
4233
|
{var value=item.Vol/item.FlowCapital*100;//成交量/流通A股*100
|
|
4234
4234
|
var text=g_JSChartLocalization.GetText('KTitle-Exchange',this.LanguageID)+IFrameSplitOperator.FormatValueString(value,2,this.LanguageID)+'%';if(!this.DrawText(text,this.TurnoverRateColor,position))return;}if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)&&IFrameSplitOperator.IsNumber(item.Position))//持仓量
|
|
4235
4235
|
{var text=g_JSChartLocalization.GetText('KTitle-Position',this.LanguageID)+item.Position;if(!this.DrawText(text,this.PositionColor,position))return;}//叠加股票的名字
|
|
4236
|
-
for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;var name=item.Title;var clrText=item.Color;var text='['+name+']';if(!this.DrawText(text,clrText,position))return;}};this.Draw=function(){if(!this.IsShow)return;if(this.CursorIndex==null||!this.Data||this.Data.length<=0){this.OnDrawEventCallback(null);return;}this.Canvas.font=this.Font;this.SpaceWidth=this.Canvas.measureText('0').width;var index=this.CursorIndex;index=parseInt(index.toFixed(0));var dataIndex=this.Data.DataOffset+index;if(dataIndex>=this.Data.Data.length)dataIndex=this.Data.Data.length-1;if(dataIndex<0){this.OnDrawEventCallback(null);return;}var item=this.Data.Data[dataIndex];this.OnDrawEventCallback(item);this.Canvas.save();this.DrawItem(item);this.Canvas.restore();};this.OnDrawEventCallback=function(drawData){
|
|
4237
|
-
if(IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)){data.OverlayStock=[];for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;data.OverlayStock.push({Symbol:item.Symbol,Name:item.Title});}}this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.DrawText=function(title,color,position){if(!title)return true;var isHScreen=this.Frame.IsHScreen===true;var right=this.Frame.ChartBorder.GetRight();if(isHScreen)right=this.Frame.ChartBorder.GetHeight();this.Canvas.fillStyle=color;var textWidth=this.Canvas.measureText(title).width;if(position.Left+textWidth>right)return false;if(this.IsShow)this.Canvas.fillText(title,position.Left,position.Bottom,textWidth);position.Left+=textWidth+this.SpaceWidth;return true;};}function DynamicMinuteTitlePainting(){this.newMethod=DynamicKLineTitlePainting;//派生
|
|
4236
|
+
for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;var name=item.Title;var clrText=item.Color;var text='['+name+']';if(!this.DrawText(text,clrText,position))return;}};this.Draw=function(){if(!this.IsShow)return;if(this.CursorIndex==null||!this.Data||this.Data.length<=0){this.OnDrawEventCallback(null);return;}this.Canvas.font=this.Font;this.SpaceWidth=this.Canvas.measureText('0').width;var index=this.CursorIndex;index=parseInt(index.toFixed(0));var dataIndex=this.Data.DataOffset+index;if(dataIndex>=this.Data.Data.length)dataIndex=this.Data.Data.length-1;if(dataIndex<0){this.OnDrawEventCallback(null);return;}var item=this.Data.Data[dataIndex];this.OnDrawEventCallback(item);this.Canvas.save();this.DrawItem(item);this.Canvas.restore();};this.OnDrawEventCallback=function(drawData){var bDrawEvent=this.OnDrawEvent&&this.OnDrawEvent.Callback;var bMouseMoveEvent=this.OnMouseMoveEvent&&this.OnMouseMoveEvent.Callback;if(!bDrawEvent&&!bMouseMoveEvent)return;var data={Draw:drawData,Name:this.ClassName};if(this.Data&&this.Data.Data){var index=Math.abs(this.CursorIndex);index=parseInt(index.toFixed(0));var dataIndex=this.Data.DataOffset+index;var dataCount=this.Data.Data.length;data.DataIndex=dataIndex;data.DataCount=dataCount;}//叠加股票
|
|
4237
|
+
if(IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)){data.OverlayStock=[];for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;data.OverlayStock.push({Symbol:item.Symbol,Name:item.Title});}}if(bDrawEvent)this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);if(bMouseMoveEvent)this.OnMouseMoveEvent.Callback(this.OnMouseMoveEvent,data,this);};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.DrawText=function(title,color,position){if(!title)return true;var isHScreen=this.Frame.IsHScreen===true;var right=this.Frame.ChartBorder.GetRight();if(isHScreen)right=this.Frame.ChartBorder.GetHeight();this.Canvas.fillStyle=color;var textWidth=this.Canvas.measureText(title).width;if(position.Left+textWidth>right)return false;if(this.IsShow)this.Canvas.fillText(title,position.Left,position.Bottom,textWidth);position.Left+=textWidth+this.SpaceWidth;return true;};}function DynamicMinuteTitlePainting(){this.newMethod=DynamicKLineTitlePainting;//派生
|
|
4238
4238
|
this.newMethod();delete this.newMethod;this.ClassName='DynamicMinuteTitlePainting';this.SpaceWidth=1*GetDevicePixelRatio();this.YClose;this.IsShowDate=false;//标题是否显示日期
|
|
4239
4239
|
this.IsShowTime=true;//标题是否显示时间
|
|
4240
4240
|
this.IsShowName=true;//标题是否显示股票名字
|
|
@@ -4263,8 +4263,8 @@ var xText=border.ChartWidth;var yText=border.Top;this.Canvas.translate(xText,yTe
|
|
|
4263
4263
|
if(bDraw&&item&&IFrameSplitOperator.IsNumber(item.Price)){var color=this.GetColor(item.Price,this.YClose);var filedName='MTitle-AC-Price';if(this.BeforeOpenData&&this.BeforeOpenData.Ver==1.0)filedName="MTitle-Close";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);if(!this.DrawText(text,color,position))return;}//竞价涨幅
|
|
4264
4264
|
if(bDraw&&item&&IFrameSplitOperator.IsPlusNumber(this.YClose)&&IFrameSplitOperator.IsNumber(item.Price)){var value=(item.Price-this.YClose)/this.YClose*100;var color=this.GetColor(value,0);var filedName='MTitle-AC-Increase';if(this.BeforeOpenData&&this.BeforeOpenData.Ver==1.0)filedName="MTitle-Increase";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+value.toFixed(2)+"%";if(!this.DrawText(text,color,position))return;}if(dataVersion==3.0){if(bDraw&&item&&IFrameSplitOperator.IsNumber(item.AvPrice)){var color=this.GetColor(item.Price,this.YClose);var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);if(!this.DrawText(text,color,position))return;}}//匹配量
|
|
4265
4265
|
if(bDraw&&IFrameSplitOperator.IsNumber(item.Vol[0])){var filedName='MTitle-AC-Vol';if(this.BeforeOpenData&&this.BeforeOpenData.Ver==1.0)filedName="MTitle-Vol";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[0],2);if(!this.DrawText(text,this.VolColor,position))return;}//未匹配量
|
|
4266
|
-
if(bDraw&&IFrameSplitOperator.IsNumber(item.Vol[1])){var text=g_JSChartLocalization.GetText('MTitle-AC-NotMatchVol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[1],2);if(!this.DrawText(text,this.VolColor,position))return;}this.OnDrawCallAuctionEventCallback(callbackData);};this.OnDrawCallAuctionEventCallback=function(drawData){if(
|
|
4267
|
-
|
|
4266
|
+
if(bDraw&&IFrameSplitOperator.IsNumber(item.Vol[1])){var text=g_JSChartLocalization.GetText('MTitle-AC-NotMatchVol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[1],2);if(!this.DrawText(text,this.VolColor,position))return;}this.OnDrawCallAuctionEventCallback(callbackData);};this.OnDrawCallAuctionEventCallback=function(drawData){if(this.OnDrawEvent&&this.OnDrawEvent.Callback){var data={Draw:drawData,Name:this.ClassName};this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);}if(this.OnMouseMoveEvent&&this.OnMouseMoveEvent.Callback){var data={Draw:drawData,Name:this.ClassName};this.OnMouseMoveEvent.Callback(this.OnDrawEvent,data,this);}};this.Draw=function(){this.LastShowData=null;if(!this.IsShow){//隐藏标题 并且没有回调事件
|
|
4267
|
+
var bEvent=this.OnDrawEvent&&this.OnDrawEvent.Callback||this.OnMouseMoveEvent&&this.OnMouseMoveEvent.Callback;if(!bEvent)return;}if(this.PointInfo&&(this.PointInfo.ClientPos==2||this.PointInfo.ClientPos==3||this.PointInfo.ClientPos>=200&&this.PointInfo.ClientPos<=299||this.PointInfo.ClientPos>=300&&this.PointInfo.ClientPos<=399)){//集合竞价区域
|
|
4268
4268
|
this.Canvas.save();this.DrawCallAuction();this.Canvas.restore();return;}if(this.CursorIndex==null||!this.Data||!this.Data.Data||this.Data.Data.length<=0){this.OnDrawEventCallback(null);if(this.IsAlwaysShowLastData){this.Canvas.save();this.DrawLastDataItem();this.Canvas.restore();}return;}this.Canvas.font=this.Font;this.SpaceWidth=this.Canvas.measureText('0').width;var isShowLastData=false;if(this.DrawStatus&&this.DrawStatus.IsTitleShowLatestData){var status=this.DrawStatus;if(!IFrameSplitOperator.IsNumber(status.FrameID)||status.FrameID<0)isShowLastData=true;else if(status.CorssCursorTouchEnd&&status.IsOnTouch==false)isShowLastData=true;}var isLastOne=false;if(isShowLastData){var item=null;var lastItem=this.GetLatestKLineData(false);if(lastItem&&lastItem.Type==0)item=lastItem.Data;isLastOne=true;}else{//var index=Math.abs(this.CursorIndex-0.5);
|
|
4269
4269
|
var index=this.CursorIndex;index=parseInt(index.toFixed(0));var dataIndex=index+this.Data.DataOffset;if(dataIndex>=this.Data.Data.length)dataIndex=this.Data.Data.length-1;var item=this.Data.Data[dataIndex];if(dataIndex==this.Data.Data.length-1)isLastOne=true;}this.LastShowData=item;this.Canvas.save();this.OnDrawEventCallback(item);if(this.IsAlwaysShowLastData){this.DrawLastDataItem();}else{this.DrawItem(item,isLastOne);}this.Canvas.restore();};this.DrawCallAuctionItem=function(callAuctionItem,isLastOne){if(!callAuctionItem)return;var item=callAuctionItem.Data;var dataVersion=callAuctionItem.Ver;var isHScreen=this.Frame.IsHScreen===true;var border=this.Frame.GetBorder();var left=border.Left;var bottom=border.Top-this.Frame.ChartBorder.Top/2;var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
|
|
4270
4270
|
var bDraw=true;if(isHScreen){var left=2;var bottom=this.Frame.ChartBorder.Right/2;//上下居中显示
|
package/package.json
CHANGED
|
@@ -6214,6 +6214,8 @@ var JSCHART_EVENT_ID=
|
|
|
6214
6214
|
ON_CLICK_FRAME_TOOLBAR:62, //指标标题工具栏
|
|
6215
6215
|
|
|
6216
6216
|
ON_REPORT_DRAG_ROW:63, //自选股行拖拽
|
|
6217
|
+
|
|
6218
|
+
ON_MOUSE_MOVE:64 //鼠标移动
|
|
6217
6219
|
}
|
|
6218
6220
|
|
|
6219
6221
|
var JSCHART_OPERATOR_ID=
|
|
@@ -6559,11 +6561,17 @@ function JSChartContainer(uielement, OffscreenElement)
|
|
|
6559
6561
|
var MoveStatus={ X:x, Y:y, IsInClient: this.IsMouseOnClient(x,y) };
|
|
6560
6562
|
this.LastMouseStatus.OnMouseMove=MoveStatus;
|
|
6561
6563
|
this.LastMouseStatus.MoveOnPoint={X:x, Y:y}; //鼠标移动的位置
|
|
6562
|
-
//JSConsole.Chart.Log("[JSChartContainer::UIOnMouseMove] MoveStatus", MoveStatus);
|
|
6563
6564
|
|
|
6565
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);
|
|
6566
|
+
var titleChart=this.TitlePaint[0];
|
|
6567
|
+
if (event && titleChart) titleChart.OnMouseMoveEvent=event;
|
|
6568
|
+
|
|
6564
6569
|
this.MoveOnPoint={X:x, Y:y};
|
|
6565
6570
|
this.OnMouseMove(x,y,e);
|
|
6571
|
+
|
|
6566
6572
|
this.LastMouseStatus.MoveOnPoint=null;
|
|
6573
|
+
if (titleChart) titleChart.OnMouseMoveEvent=null;
|
|
6574
|
+
|
|
6567
6575
|
}
|
|
6568
6576
|
|
|
6569
6577
|
this.IsMouseOnClient=function(x,y)
|
|
@@ -42810,6 +42818,7 @@ function DynamicKLineTitlePainting()
|
|
|
42810
42818
|
this.IsShowDateTime=true; //是否显示日期
|
|
42811
42819
|
this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
|
|
42812
42820
|
this.OnDrawEvent;
|
|
42821
|
+
this.OnMouseMoveEvent;
|
|
42813
42822
|
|
|
42814
42823
|
this.ReloadResource=function()
|
|
42815
42824
|
{
|
|
@@ -43038,7 +43047,10 @@ function DynamicKLineTitlePainting()
|
|
|
43038
43047
|
|
|
43039
43048
|
this.OnDrawEventCallback=function(drawData)
|
|
43040
43049
|
{
|
|
43041
|
-
|
|
43050
|
+
var bDrawEvent=(this.OnDrawEvent && this.OnDrawEvent.Callback);
|
|
43051
|
+
var bMouseMoveEvent= (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback);
|
|
43052
|
+
if (!bDrawEvent && !bMouseMoveEvent) return;
|
|
43053
|
+
|
|
43042
43054
|
var data={ Draw: drawData, Name:this.ClassName};
|
|
43043
43055
|
if (this.Data && this.Data.Data)
|
|
43044
43056
|
{
|
|
@@ -43064,8 +43076,11 @@ function DynamicKLineTitlePainting()
|
|
|
43064
43076
|
}
|
|
43065
43077
|
}
|
|
43066
43078
|
|
|
43079
|
+
if (bDrawEvent)
|
|
43080
|
+
this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);
|
|
43067
43081
|
|
|
43068
|
-
|
|
43082
|
+
if (bMouseMoveEvent)
|
|
43083
|
+
this.OnMouseMoveEvent.Callback(this.OnMouseMoveEvent,data,this);
|
|
43069
43084
|
}
|
|
43070
43085
|
|
|
43071
43086
|
this.GetColor=function(price,yclse)
|
|
@@ -43531,9 +43546,17 @@ function DynamicMinuteTitlePainting()
|
|
|
43531
43546
|
|
|
43532
43547
|
this.OnDrawCallAuctionEventCallback=function(drawData)
|
|
43533
43548
|
{
|
|
43534
|
-
if (
|
|
43535
|
-
|
|
43536
|
-
|
|
43549
|
+
if (this.OnDrawEvent && this.OnDrawEvent.Callback)
|
|
43550
|
+
{
|
|
43551
|
+
var data={ Draw: drawData, Name:this.ClassName };
|
|
43552
|
+
this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);
|
|
43553
|
+
}
|
|
43554
|
+
|
|
43555
|
+
if (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback)
|
|
43556
|
+
{
|
|
43557
|
+
var data={ Draw: drawData, Name:this.ClassName };
|
|
43558
|
+
this.OnMouseMoveEvent.Callback(this.OnDrawEvent,data,this);
|
|
43559
|
+
}
|
|
43537
43560
|
}
|
|
43538
43561
|
|
|
43539
43562
|
this.Draw=function()
|
|
@@ -43542,7 +43565,8 @@ function DynamicMinuteTitlePainting()
|
|
|
43542
43565
|
|
|
43543
43566
|
if (!this.IsShow)
|
|
43544
43567
|
{ //隐藏标题 并且没有回调事件
|
|
43545
|
-
|
|
43568
|
+
var bEvent=(this.OnDrawEvent && this.OnDrawEvent.Callback) || (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback);
|
|
43569
|
+
if (!bEvent) return;
|
|
43546
43570
|
}
|
|
43547
43571
|
|
|
43548
43572
|
if (this.PointInfo &&
|
|
@@ -6258,6 +6258,8 @@ var JSCHART_EVENT_ID=
|
|
|
6258
6258
|
ON_CLICK_FRAME_TOOLBAR:62, //指标标题工具栏
|
|
6259
6259
|
|
|
6260
6260
|
ON_REPORT_DRAG_ROW:63, //自选股行拖拽
|
|
6261
|
+
|
|
6262
|
+
ON_MOUSE_MOVE:64 //鼠标移动
|
|
6261
6263
|
}
|
|
6262
6264
|
|
|
6263
6265
|
var JSCHART_OPERATOR_ID=
|
|
@@ -6603,11 +6605,17 @@ function JSChartContainer(uielement, OffscreenElement)
|
|
|
6603
6605
|
var MoveStatus={ X:x, Y:y, IsInClient: this.IsMouseOnClient(x,y) };
|
|
6604
6606
|
this.LastMouseStatus.OnMouseMove=MoveStatus;
|
|
6605
6607
|
this.LastMouseStatus.MoveOnPoint={X:x, Y:y}; //鼠标移动的位置
|
|
6606
|
-
//JSConsole.Chart.Log("[JSChartContainer::UIOnMouseMove] MoveStatus", MoveStatus);
|
|
6607
6608
|
|
|
6609
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);
|
|
6610
|
+
var titleChart=this.TitlePaint[0];
|
|
6611
|
+
if (event && titleChart) titleChart.OnMouseMoveEvent=event;
|
|
6612
|
+
|
|
6608
6613
|
this.MoveOnPoint={X:x, Y:y};
|
|
6609
6614
|
this.OnMouseMove(x,y,e);
|
|
6615
|
+
|
|
6610
6616
|
this.LastMouseStatus.MoveOnPoint=null;
|
|
6617
|
+
if (titleChart) titleChart.OnMouseMoveEvent=null;
|
|
6618
|
+
|
|
6611
6619
|
}
|
|
6612
6620
|
|
|
6613
6621
|
this.IsMouseOnClient=function(x,y)
|
|
@@ -42854,6 +42862,7 @@ function DynamicKLineTitlePainting()
|
|
|
42854
42862
|
this.IsShowDateTime=true; //是否显示日期
|
|
42855
42863
|
this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
|
|
42856
42864
|
this.OnDrawEvent;
|
|
42865
|
+
this.OnMouseMoveEvent;
|
|
42857
42866
|
|
|
42858
42867
|
this.ReloadResource=function()
|
|
42859
42868
|
{
|
|
@@ -43082,7 +43091,10 @@ function DynamicKLineTitlePainting()
|
|
|
43082
43091
|
|
|
43083
43092
|
this.OnDrawEventCallback=function(drawData)
|
|
43084
43093
|
{
|
|
43085
|
-
|
|
43094
|
+
var bDrawEvent=(this.OnDrawEvent && this.OnDrawEvent.Callback);
|
|
43095
|
+
var bMouseMoveEvent= (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback);
|
|
43096
|
+
if (!bDrawEvent && !bMouseMoveEvent) return;
|
|
43097
|
+
|
|
43086
43098
|
var data={ Draw: drawData, Name:this.ClassName};
|
|
43087
43099
|
if (this.Data && this.Data.Data)
|
|
43088
43100
|
{
|
|
@@ -43108,8 +43120,11 @@ function DynamicKLineTitlePainting()
|
|
|
43108
43120
|
}
|
|
43109
43121
|
}
|
|
43110
43122
|
|
|
43123
|
+
if (bDrawEvent)
|
|
43124
|
+
this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);
|
|
43111
43125
|
|
|
43112
|
-
|
|
43126
|
+
if (bMouseMoveEvent)
|
|
43127
|
+
this.OnMouseMoveEvent.Callback(this.OnMouseMoveEvent,data,this);
|
|
43113
43128
|
}
|
|
43114
43129
|
|
|
43115
43130
|
this.GetColor=function(price,yclse)
|
|
@@ -43575,9 +43590,17 @@ function DynamicMinuteTitlePainting()
|
|
|
43575
43590
|
|
|
43576
43591
|
this.OnDrawCallAuctionEventCallback=function(drawData)
|
|
43577
43592
|
{
|
|
43578
|
-
if (
|
|
43579
|
-
|
|
43580
|
-
|
|
43593
|
+
if (this.OnDrawEvent && this.OnDrawEvent.Callback)
|
|
43594
|
+
{
|
|
43595
|
+
var data={ Draw: drawData, Name:this.ClassName };
|
|
43596
|
+
this.OnDrawEvent.Callback(this.OnDrawEvent,data,this);
|
|
43597
|
+
}
|
|
43598
|
+
|
|
43599
|
+
if (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback)
|
|
43600
|
+
{
|
|
43601
|
+
var data={ Draw: drawData, Name:this.ClassName };
|
|
43602
|
+
this.OnMouseMoveEvent.Callback(this.OnDrawEvent,data,this);
|
|
43603
|
+
}
|
|
43581
43604
|
}
|
|
43582
43605
|
|
|
43583
43606
|
this.Draw=function()
|
|
@@ -43586,7 +43609,8 @@ function DynamicMinuteTitlePainting()
|
|
|
43586
43609
|
|
|
43587
43610
|
if (!this.IsShow)
|
|
43588
43611
|
{ //隐藏标题 并且没有回调事件
|
|
43589
|
-
|
|
43612
|
+
var bEvent=(this.OnDrawEvent && this.OnDrawEvent.Callback) || (this.OnMouseMoveEvent && this.OnMouseMoveEvent.Callback);
|
|
43613
|
+
if (!bEvent) return;
|
|
43590
43614
|
}
|
|
43591
43615
|
|
|
43592
43616
|
if (this.PointInfo &&
|