hqchart 1.1.14154 → 1.1.14161
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 +15 -14
- package/package.json +1 -1
- package/src/jscommon/umychart.TReport.js +7 -9
- package/src/jscommon/umychart.js +1 -0
- package/src/jscommon/umychart.report.js +5 -0
- package/src/jscommon/umychart.style.js +1 -1
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +8 -2
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +15 -11
package/lib/umychart.vue.js
CHANGED
|
@@ -8334,7 +8334,8 @@ this.TitlePaint[0].Symbol=this.Symbol;this.TitlePaint[0].Name=this.Name;this.Tit
|
|
|
8334
8334
|
this.ChartCorssCursor.StringFormatX.BeforeOpenData=this.BeforeOpenData;this.ChartCorssCursor.StringFormatX.AfterCloseData=this.AfterCloseData;this.ChartCorssCursor.StringFormatX.MultiDayBeforeOpenData=multiBeforeOpenData;this.ChartCorssCursor.StringFormatX.MultiDayAfterCloseData=multiAfterCloseData;this.ChartCorssCursor.StringFormatX.DayOffset=this.DayOffset;;if(this.ChartCorssCursor.CallAcutionXOperator){this.ChartCorssCursor.CallAcutionXOperator.BeforeOpenData=this.BeforeOpenData;this.ChartCorssCursor.CallAcutionXOperator.AfterCloseData=this.AfterCloseData;this.ChartCorssCursor.CallAcutionXOperator.MultiDayBeforeOpenData=multiBeforeOpenData;this.ChartCorssCursor.CallAcutionXOperator.MultiDayAfterCloseData=multiAfterCloseData;this.ChartCorssCursor.CallAcutionXOperator.DayOffset=this.DayOffset;}}if(this.ExtendChartPaint[0]){this.ExtendChartPaint[0].Symbol=this.Symbol;this.ExtendChartPaint[0].Name=this.Name;}for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];item.MainData=minuteData;//绑定主图数据
|
|
8335
8335
|
}};//绑定分钟叠加指标数据(持仓量)
|
|
8336
8336
|
this.BindOverlayPositionData=function(minuteData,yClose){var _this33=this;if(this.Frame.SubFrame.length<2)return;var chart=null;var frame=null;var subFrame=this.Frame.SubFrame[1];//第2个窗口
|
|
8337
|
-
var overlayFrame=null;for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];if(item.Identify=='Position_Line_Frame'){overlayFrame=item;break;}}if(!overlayFrame){overlayFrame=new OverlayIndexItem();overlayFrame.Identify='Position_Line_Frame';if(this.ClassName=="MinuteChartContainer")frame=new OverlayMinuteFrame();else frame=new OverlayMinuteHScreenFrame();frame.Canvas=this.Canvas;frame.MainFrame=subFrame.Frame;frame.ChartBorder=subFrame.Frame.ChartBorder;frame.GlobalOption=this.GlobalOption;overlayFrame.Frame=frame;frame.YSplitOperator=new FrameSplitY();frame.YSplitOperator.LanguageID=this.LanguageID;frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');frame.YSplitOperator.Frame=frame;frame.YSplitOperator.ChartBorder=frame.ChartBorder;frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;frame.YSplitOperator.GetEventCallback=function(id){return _this33.GetEventCallback(id);};frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
|
|
8337
|
+
var overlayFrame=null;for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];if(item.Identify=='Position_Line_Frame'){overlayFrame=item;break;}}if(!overlayFrame){overlayFrame=new OverlayIndexItem();overlayFrame.Identify='Position_Line_Frame';if(this.ClassName=="MinuteChartContainer")frame=new OverlayMinuteFrame();else frame=new OverlayMinuteHScreenFrame();frame.Canvas=this.Canvas;frame.MainFrame=subFrame.Frame;frame.ChartBorder=subFrame.Frame.ChartBorder;frame.GlobalOption=this.GlobalOption;overlayFrame.Frame=frame;frame.YSplitOperator=new FrameSplitY();frame.YSplitOperator.LanguageID=this.LanguageID;frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');frame.YSplitOperator.Frame=frame;frame.YSplitOperator.ChartBorder=frame.ChartBorder;frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;frame.YSplitOperator.GetEventCallback=function(id){return _this33.GetEventCallback(id);};frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;frame.YSplitOperator.FloatPrecision=0;//持仓量 整数
|
|
8338
|
+
var chart=new ChartMinutePositionLine();chart.Canvas=this.Canvas;chart.Name='Position-Line';chart.ChartBorder=frame.ChartBorder;chart.ChartFrame=frame;chart.Identify=overlayFrame.Identify;chart.Color=g_JSChartResource.Minute.PositionColor;overlayFrame.ChartPaint.push(chart);subFrame.OverlayIndex.push(overlayFrame);subFrame.Frame.RightFrame=frame;//右边坐标绑定到主坐标上
|
|
8338
8339
|
}else{frame=overlayFrame.Frame;for(var i=0;i<overlayFrame.ChartPaint.length;++i){var item=overlayFrame.ChartPaint[i];if(item.Name=='Position-Line'){chart=item;break;}}if(!chart)//图形不存在就创建一个
|
|
8339
8340
|
{chart=new ChartMinutePositionLine();chart.Canvas=this.Canvas;chart.Name='Position-Line';chart.ChartBorder=frame.ChartBorder;chart.ChartFrame=frame;chart.Identify=overlayFrame.Identify;chart.Color=g_JSChartResource.Minute.PositionColor;overlayFrame.ChartPaint.push(chart);}}var xPointCouont=this.Frame.SubFrame[0].Frame.XPointCount;frame.XPointCount=xPointCouont;subFrame.Frame.IsShowPositionTitle=true;var bindData=new ChartData();bindData.Data=minuteData.GetPosition();chart.Data=bindData;};this.ClearBindOverlayPositionData=function(){if(this.Frame.SubFrame.length<2)return;var subFrame=this.Frame.SubFrame[1];//第2个窗口
|
|
8340
8341
|
subFrame.Frame.RightFrame=null;subFrame.Frame.IsShowPositionTitle=false;for(var i in subFrame.OverlayIndex){var item=subFrame.OverlayIndex[i];if(item.Identify=='Position_Line_Frame'){subFrame.OverlayIndex.splice(i,1);break;}}};this.GetOverlayIndexByIdentify=function(identify){for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];if(!IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex))continue;for(var j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];if(overlayItem.Identify===identify)return{OverlayItem:overlayItem,WindowIndex:i};}}return null;};this.RecvOverlayIndex=function(identify,data){var overlayIndex=this.GetOverlayIndexByIdentify(identify);if(overlayIndex==null){console.warn('[MinuteChartContainer::RecvOverlayIndex] can\'t find overlay index. [identify='+identify+']');return;}if(!overlayIndex.Script)return;if(typeof overlayIndex.RecvSubscribeData!="function")return;var bindData=this.SourceData;if(!bindData)return;overlayIndex.Script.RecvSubscribeData(data,this,overlayIndex.WindowIndex,bindData);};//更新叠加指标
|
|
@@ -11877,7 +11878,7 @@ UpBarColor:"rgb(238,21,21)",//上涨
|
|
|
11877
11878
|
DownBarColor:"rgb(25,158,0)",//下跌
|
|
11878
11879
|
UnchagneBarColor:"rgb(228,228,228)",//平盘
|
|
11879
11880
|
EmptyBarBGColor:'rgb(0,0,0)',//空心柱子背景色
|
|
11880
|
-
SplashScreen:{BGColor:"rgba(112,128,144,0.5)",TextColor:"rgb(230,230,230)"},HLCArea:{HighLineColor:'rgb(238,21,21)',LowLineColor:"rgb(25,158,0)",CloseLineColor:"rgb(156,156,156)",LineWidth:2*GetDevicePixelRatio(),UpAreaColor:"rgba(238,21,21, 0.3)",DownAreaColor:"rgba(25,158,0, 0.3)"},Minute:{VolBarColor:null,PriceColor:"rgb(25,180,231)",AreaPriceColor:"rgba(63,158,255,.3)",AvPriceColor:"rgb(255,236,0)",PositionColor:'rgb(
|
|
11881
|
+
SplashScreen:{BGColor:"rgba(112,128,144,0.5)",TextColor:"rgb(230,230,230)"},HLCArea:{HighLineColor:'rgb(238,21,21)',LowLineColor:"rgb(25,158,0)",CloseLineColor:"rgb(156,156,156)",LineWidth:2*GetDevicePixelRatio(),UpAreaColor:"rgba(238,21,21, 0.3)",DownAreaColor:"rgba(25,158,0, 0.3)"},Minute:{VolBarColor:null,PriceColor:"rgb(25,180,231)",AreaPriceColor:"rgba(63,158,255,.3)",AvPriceColor:"rgb(255,236,0)",PositionColor:'rgb(201, 9, 224)',VolTitleColor:"rgb(190,190,190)",Before:{BGColor:"rgba(105,105,105,0.5)",AvPriceColor:'rgb(248,248,255)',//均线
|
|
11881
11882
|
CloseIcon:{MoveOnColor:"rgb(255,255,255)",Color:"rgb(156,156,156)"}},After:{BGColor:"rgba(105,105,105,0.5)",AvPriceColor:'rgb(248,248,255)'//均线
|
|
11882
11883
|
},NightDay:{NightBGColor:"rgb(22,22,22)",Font:12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',Day:{Color:"rgb(153,153,153)",BGColor:"rgb(51,51,51)",BorderColor:"rgb(51,51,51)",Margin:{Left:5,Top:2,Bottom:2,Right:5}},Night:{Color:"rgb(153,153,153)",BGColor:"rgb(51,51,51)",BorderColor:"rgb(51,51,51)",Margin:{Left:5,Top:2,Bottom:2,Right:5}}}},PopMinuteChart:{BGColor:"rgba(0,0,0,0.85)",BorderColor:"rgb(230,230,230)"},DefaultTextColor:"rgb(101,104,112)",DefaultTextFont:14*GetDevicePixelRatio()+'px 微软雅黑',TitleFont:13*GetDevicePixelRatio()+'px 微软雅黑',//标题字体(动态标题 K线及指标的动态信息字体)
|
|
11883
11884
|
IndexTitleColor:"rgb(190, 190 ,190)",//指标名字颜色
|
|
@@ -12445,11 +12446,11 @@ var frequency=this.AutoUpdateFrequency;if(marketStatus==1)//盘前
|
|
|
12445
12446
|
this.AddEventCallback=function(object){if(!object||!object.event||!object.callback)return;var data={Callback:object.callback,Source:object};this.mapEvent.set(object.event,data);};this.RemoveEventCallback=function(eventid){if(!this.mapEvent.has(eventid))return;this.mapEvent.delete(eventid);};this.GetEventCallback=function(id)//获取事件回调
|
|
12446
12447
|
{if(!this.mapEvent.has(id))return null;var item=this.mapEvent.get(id);return item;};this.OnSize=function(){if(!this.Frame)return;this.SetSizeChange(true);this.Draw();this.DelayUpdateStockData();};this.SetSizeChange=function(bChanged){for(var i=0;i<this.ChartPaint.length;++i){var chart=this.ChartPaint[i];if(chart)chart.SizeChange=bChanged;}};this.OnWheel=function(e)//滚轴
|
|
12447
12448
|
{JSConsole.Chart.Log('[JSReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;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);if(!isInClient)return;var chart=this.ChartPaint[0];if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;if(this.WheelPageType==1){console.log('[OnWheel] wheelValue='+wheelValue);if(wheelValue<0)//下
|
|
12448
|
-
{this.LastMouseStatus.TooltipStatus=null;if(this.GotoNextItem(1)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
12449
|
-
{this.LastMouseStatus.TooltipStatus=null;if(this.GotoNextItem(-1)){this.Draw();this.DelayUpdateStockData();}}}else{if(wheelValue<0)//下一页
|
|
12450
|
-
{this.LastMouseStatus.TooltipStatus=null;if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上一页
|
|
12451
|
-
{this.LastMouseStatus.TooltipStatus=null;if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
|
|
12452
|
-
switch(keyID){case 33://page up
|
|
12449
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();if(this.GotoNextItem(1)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
12450
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();if(this.GotoNextItem(-1)){this.Draw();this.DelayUpdateStockData();}}}else{if(wheelValue<0)//下一页
|
|
12451
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上一页
|
|
12452
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
|
|
12453
|
+
this.HideMinuteChartTooltip();switch(keyID){case 33://page up
|
|
12453
12454
|
if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}break;case 34://page down
|
|
12454
12455
|
if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}break;case 38://up
|
|
12455
12456
|
var result=this.MoveSelectedRow(-1);if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}break;case 40://down
|
|
@@ -12990,8 +12991,8 @@ this.DelayUpdateStockData=function(){var _this66=this;if(this.DelayUpdateTimer!=
|
|
|
12990
12991
|
{if(clickData.Redraw==true)this.Draw();}else if(clickData.Type==3&&e.button==0)//表头
|
|
12991
12992
|
{this.OnClickHeader(clickData,e);}//document.onmousemove=(e)=>{ this.DocOnMouseMove(e); }
|
|
12992
12993
|
//document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
|
|
12993
|
-
};this.
|
|
12994
|
-
var report=this.
|
|
12994
|
+
};this.GetTReportChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart;};this.UIOnMouseMove=function(e){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var oldMouseOnStatus=this.LastMouseStatus.MouseOnStatus;this.LastMouseStatus.OnMouseMove=null;var bDrawTooltip=false;if(this.LastMouseStatus.TooltipStatus)bDrawTooltip=true;this.LastMouseStatus.TooltipStatus=null;var bShowChartTooltip=false;var chartTooltipData=null;this.LastMouseStatus.OnMouseMove={X:x,Y:y};var mouseStatus={Cursor:"default",Name:"Default"};;//鼠标状态
|
|
12995
|
+
var report=this.GetTReportChart();var bDraw=false;if(report){var tooltipData=report.GetTooltipData(x,y);//单元格提示信息
|
|
12995
12996
|
if(tooltipData){if(tooltipData.Type==20){if(tooltipData.Data&&tooltipData.Data.Symbol){bShowChartTooltip=true;chartTooltipData={Symbol:tooltipData.Data.Symbol,Rect:tooltipData.Rect};}}else{this.LastMouseStatus.TooltipStatus={X:x,Y:y,Data:tooltipData,ClientX:e.clientX,ClientY:e.clientY};bDrawTooltip=true;}}}/* 目前没有用到
|
|
12996
12997
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_MOUSE_MOVE);
|
|
12997
12998
|
if (event)
|
|
@@ -13007,11 +13008,11 @@ this.SortHeader=function(column,sortData){var _this67=this;var sortInfo={Field:t
|
|
|
13007
13008
|
this.LocalSort=function(left,right,column,sortType,cellType){switch(column.Type){case TREPORT_COLUMN_ID.SYMBOL_ID:case TREPORT_COLUMN_ID.NAME_ID:return this.LocalStringSort(left,right,column,sortType,cellType);case TREPORT_COLUMN_ID.PRICE_ID:case TREPORT_COLUMN_ID.VOL_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.BUY_PRICE_ID:case TREPORT_COLUMN_ID.SELL_PRICE_ID:case TREPORT_COLUMN_ID.AMOUNT_ID:case TREPORT_COLUMN_ID.BUY_VOL_ID:case TREPORT_COLUMN_ID.SELL_VOL_ID:case TREPORT_COLUMN_ID.YCLOSE_ID:case TREPORT_COLUMN_ID.OPEN_ID:case TREPORT_COLUMN_ID.HIGH_ID:case TREPORT_COLUMN_ID.LOW_ID:case TREPORT_COLUMN_ID.AVERAGE_PRICE_ID:case TREPORT_COLUMN_ID.EXE_PRICE_ID://行权价格
|
|
13008
13009
|
case TREPORT_COLUMN_ID.POSITION_ID://持仓量
|
|
13009
13010
|
case TREPORT_COLUMN_ID.AMPLITUDE_ID:case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:return this.LocalNumberSort(left,right,column,sortType,cellType);default:return 0;}};this.LocalNumberSort=function(left,right,column,sortType,cellType){var leftStock=this.GetExePriceData(left);var rightStock=this.GetExePriceData(right);var leftValue=-99999999999999,rightValue=-99999999999999;if(sortType==2)leftValue=rightValue=99999999999999;var filedName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(cellType==0)//行权价格
|
|
13010
|
-
{if(leftStock&&IFrameSplitOperator.IsNumber(leftStock.ExePrice))leftValue=leftStock.ExePrice;if(rightStock&&IFrameSplitOperator.IsNumber(rightStock.ExePrice))rightValue=rightStock.ExePrice;}else if(cellType==1){if(leftStock&&leftStock.LeftData){var value=leftStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.LeftData){var value=rightStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}else if(cellType==2){if(leftStock&&leftStock.RightData){var value=leftStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.RightData){var value=rightStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.
|
|
13011
|
+
{if(leftStock&&IFrameSplitOperator.IsNumber(leftStock.ExePrice))leftValue=leftStock.ExePrice;if(rightStock&&IFrameSplitOperator.IsNumber(rightStock.ExePrice))rightValue=rightStock.ExePrice;}else if(cellType==1){if(leftStock&&leftStock.LeftData){var value=leftStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.LeftData){var value=rightStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}else if(cellType==2){if(leftStock&&leftStock.RightData){var value=leftStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.RightData){var value=rightStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.OnWheel=function(e)//滚轴
|
|
13011
13012
|
{JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;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);if(!isInClient)return;var chart=this.GetTReportChart();if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;if(wheelValue<0)//下
|
|
13012
|
-
{this.LastMouseStatus.TooltipStatus=null;var result=this.MoveSelectedRow(1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
13013
|
-
{this.LastMouseStatus.TooltipStatus=null;var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
|
|
13014
|
-
switch(keyID){/*
|
|
13013
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();var result=this.MoveSelectedRow(1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
13014
|
+
{this.LastMouseStatus.TooltipStatus=null;this.HideMinuteChartTooltip();var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;if(keyID==116)return;//F15刷新不处理
|
|
13015
|
+
this.HideMinuteChartTooltip();switch(keyID){/*
|
|
13015
13016
|
case 33: //page up
|
|
13016
13017
|
if (this.GotoPreviousPage(this.PageUpDownCycle))
|
|
13017
13018
|
{
|
|
@@ -13868,7 +13869,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13868
13869
|
this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
|
|
13869
13870
|
* 版本信息输出
|
|
13870
13871
|
*
|
|
13871
|
-
*/var HQCHART_VERSION="1.1.
|
|
13872
|
+
*/var HQCHART_VERSION="1.1.14160";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13872
13873
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13873
13874
|
// BaseIndex:BaseIndex,
|
|
13874
13875
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -1041,10 +1041,10 @@ function JSTReportChartContainer(uielement)
|
|
|
1041
1041
|
//document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
|
|
1042
1042
|
}
|
|
1043
1043
|
|
|
1044
|
-
this.
|
|
1044
|
+
this.GetTReportChart=function()
|
|
1045
1045
|
{
|
|
1046
1046
|
var chart=this.ChartPaint[0];
|
|
1047
|
-
if (!chart) return;
|
|
1047
|
+
if (!chart) return null;
|
|
1048
1048
|
|
|
1049
1049
|
return chart;
|
|
1050
1050
|
}
|
|
@@ -1067,7 +1067,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1067
1067
|
|
|
1068
1068
|
this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
|
|
1069
1069
|
var mouseStatus={ Cursor:"default", Name:"Default"};; //鼠标状态
|
|
1070
|
-
var report=this.
|
|
1070
|
+
var report=this.GetTReportChart();
|
|
1071
1071
|
var bDraw=false;
|
|
1072
1072
|
|
|
1073
1073
|
if (report)
|
|
@@ -1300,12 +1300,6 @@ function JSTReportChartContainer(uielement)
|
|
|
1300
1300
|
}
|
|
1301
1301
|
}
|
|
1302
1302
|
|
|
1303
|
-
this.GetTReportChart=function()
|
|
1304
|
-
{
|
|
1305
|
-
var chart=this.ChartPaint[0];
|
|
1306
|
-
return chart;
|
|
1307
|
-
}
|
|
1308
|
-
|
|
1309
1303
|
this.OnWheel=function(e) //滚轴
|
|
1310
1304
|
{
|
|
1311
1305
|
JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);
|
|
@@ -1331,6 +1325,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1331
1325
|
if (wheelValue<0) //下
|
|
1332
1326
|
{
|
|
1333
1327
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1328
|
+
this.HideMinuteChartTooltip();
|
|
1334
1329
|
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
|
|
1335
1330
|
if (result)
|
|
1336
1331
|
{
|
|
@@ -1341,6 +1336,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1341
1336
|
else if (wheelValue>0) //上
|
|
1342
1337
|
{
|
|
1343
1338
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1339
|
+
this.HideMinuteChartTooltip();
|
|
1344
1340
|
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
|
|
1345
1341
|
if (result)
|
|
1346
1342
|
{
|
|
@@ -1362,6 +1358,8 @@ function JSTReportChartContainer(uielement)
|
|
|
1362
1358
|
var keyID = e.keyCode ? e.keyCode :e.which;
|
|
1363
1359
|
if (keyID==116) return; //F15刷新不处理
|
|
1364
1360
|
|
|
1361
|
+
this.HideMinuteChartTooltip();
|
|
1362
|
+
|
|
1365
1363
|
switch(keyID)
|
|
1366
1364
|
{
|
|
1367
1365
|
/*
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -85047,6 +85047,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
85047
85047
|
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
|
|
85048
85048
|
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
|
|
85049
85049
|
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
|
|
85050
|
+
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数
|
|
85050
85051
|
|
|
85051
85052
|
var chart=new ChartMinutePositionLine();
|
|
85052
85053
|
chart.Canvas=this.Canvas
|
|
@@ -1737,6 +1737,7 @@ function JSReportChartContainer(uielement)
|
|
|
1737
1737
|
if (wheelValue<0) //下
|
|
1738
1738
|
{
|
|
1739
1739
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1740
|
+
this.HideMinuteChartTooltip();
|
|
1740
1741
|
if (this.GotoNextItem(1))
|
|
1741
1742
|
{
|
|
1742
1743
|
this.Draw();
|
|
@@ -1746,6 +1747,7 @@ function JSReportChartContainer(uielement)
|
|
|
1746
1747
|
else if (wheelValue>0) //上
|
|
1747
1748
|
{
|
|
1748
1749
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1750
|
+
this.HideMinuteChartTooltip();
|
|
1749
1751
|
if (this.GotoNextItem(-1))
|
|
1750
1752
|
{
|
|
1751
1753
|
this.Draw();
|
|
@@ -1758,6 +1760,7 @@ function JSReportChartContainer(uielement)
|
|
|
1758
1760
|
if (wheelValue<0) //下一页
|
|
1759
1761
|
{
|
|
1760
1762
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1763
|
+
this.HideMinuteChartTooltip();
|
|
1761
1764
|
if (this.GotoNextPage(this.PageUpDownCycle))
|
|
1762
1765
|
{
|
|
1763
1766
|
this.Draw();
|
|
@@ -1767,6 +1770,7 @@ function JSReportChartContainer(uielement)
|
|
|
1767
1770
|
else if (wheelValue>0) //上一页
|
|
1768
1771
|
{
|
|
1769
1772
|
this.LastMouseStatus.TooltipStatus=null;
|
|
1773
|
+
this.HideMinuteChartTooltip();
|
|
1770
1774
|
if (this.GotoPreviousPage(this.PageUpDownCycle))
|
|
1771
1775
|
{
|
|
1772
1776
|
this.Draw();
|
|
@@ -1788,6 +1792,7 @@ function JSReportChartContainer(uielement)
|
|
|
1788
1792
|
var keyID = e.keyCode ? e.keyCode :e.which;
|
|
1789
1793
|
if (keyID==116) return; //F15刷新不处理
|
|
1790
1794
|
|
|
1795
|
+
this.HideMinuteChartTooltip();
|
|
1791
1796
|
switch(keyID)
|
|
1792
1797
|
{
|
|
1793
1798
|
case 33: //page up
|
|
@@ -64,7 +64,7 @@ function GetBlackStyle()
|
|
|
64
64
|
PriceColor: "rgb(25,180,231)",
|
|
65
65
|
AreaPriceColor:"rgba(63,158,255,.3)",
|
|
66
66
|
AvPriceColor: "rgb(255,236,0)",
|
|
67
|
-
PositionColor:'rgb(
|
|
67
|
+
PositionColor:'rgb(201, 9, 224)',
|
|
68
68
|
VolTitleColor:"rgb(190,190,190)",
|
|
69
69
|
Before:
|
|
70
70
|
{
|
|
@@ -88972,6 +88972,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
88972
88972
|
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
|
|
88973
88973
|
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
|
|
88974
88974
|
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
|
|
88975
|
+
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数
|
|
88975
88976
|
|
|
88976
88977
|
var chart=new ChartMinutePositionLine();
|
|
88977
88978
|
chart.Canvas=this.Canvas
|
|
@@ -124822,7 +124823,7 @@ function GetBlackStyle()
|
|
|
124822
124823
|
PriceColor: "rgb(25,180,231)",
|
|
124823
124824
|
AreaPriceColor:"rgba(63,158,255,.3)",
|
|
124824
124825
|
AvPriceColor: "rgb(255,236,0)",
|
|
124825
|
-
PositionColor:'rgb(
|
|
124826
|
+
PositionColor:'rgb(201, 9, 224)',
|
|
124826
124827
|
VolTitleColor:"rgb(190,190,190)",
|
|
124827
124828
|
Before:
|
|
124828
124829
|
{
|
|
@@ -128843,6 +128844,7 @@ function JSReportChartContainer(uielement)
|
|
|
128843
128844
|
if (wheelValue<0) //下
|
|
128844
128845
|
{
|
|
128845
128846
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128847
|
+
this.HideMinuteChartTooltip();
|
|
128846
128848
|
if (this.GotoNextItem(1))
|
|
128847
128849
|
{
|
|
128848
128850
|
this.Draw();
|
|
@@ -128852,6 +128854,7 @@ function JSReportChartContainer(uielement)
|
|
|
128852
128854
|
else if (wheelValue>0) //上
|
|
128853
128855
|
{
|
|
128854
128856
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128857
|
+
this.HideMinuteChartTooltip();
|
|
128855
128858
|
if (this.GotoNextItem(-1))
|
|
128856
128859
|
{
|
|
128857
128860
|
this.Draw();
|
|
@@ -128864,6 +128867,7 @@ function JSReportChartContainer(uielement)
|
|
|
128864
128867
|
if (wheelValue<0) //下一页
|
|
128865
128868
|
{
|
|
128866
128869
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128870
|
+
this.HideMinuteChartTooltip();
|
|
128867
128871
|
if (this.GotoNextPage(this.PageUpDownCycle))
|
|
128868
128872
|
{
|
|
128869
128873
|
this.Draw();
|
|
@@ -128873,6 +128877,7 @@ function JSReportChartContainer(uielement)
|
|
|
128873
128877
|
else if (wheelValue>0) //上一页
|
|
128874
128878
|
{
|
|
128875
128879
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128880
|
+
this.HideMinuteChartTooltip();
|
|
128876
128881
|
if (this.GotoPreviousPage(this.PageUpDownCycle))
|
|
128877
128882
|
{
|
|
128878
128883
|
this.Draw();
|
|
@@ -128894,6 +128899,7 @@ function JSReportChartContainer(uielement)
|
|
|
128894
128899
|
var keyID = e.keyCode ? e.keyCode :e.which;
|
|
128895
128900
|
if (keyID==116) return; //F15刷新不处理
|
|
128896
128901
|
|
|
128902
|
+
this.HideMinuteChartTooltip();
|
|
128897
128903
|
switch(keyID)
|
|
128898
128904
|
{
|
|
128899
128905
|
case 33: //page up
|
|
@@ -139523,7 +139529,7 @@ function ScrollBarBGChart()
|
|
|
139523
139529
|
|
|
139524
139530
|
|
|
139525
139531
|
|
|
139526
|
-
var HQCHART_VERSION="1.1.
|
|
139532
|
+
var HQCHART_VERSION="1.1.14160";
|
|
139527
139533
|
|
|
139528
139534
|
function PrintHQChartVersion()
|
|
139529
139535
|
{
|
|
@@ -89016,6 +89016,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
89016
89016
|
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
|
|
89017
89017
|
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
|
|
89018
89018
|
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
|
|
89019
|
+
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数
|
|
89019
89020
|
|
|
89020
89021
|
var chart=new ChartMinutePositionLine();
|
|
89021
89022
|
chart.Canvas=this.Canvas
|
|
@@ -124866,7 +124867,7 @@ function GetBlackStyle()
|
|
|
124866
124867
|
PriceColor: "rgb(25,180,231)",
|
|
124867
124868
|
AreaPriceColor:"rgba(63,158,255,.3)",
|
|
124868
124869
|
AvPriceColor: "rgb(255,236,0)",
|
|
124869
|
-
PositionColor:'rgb(
|
|
124870
|
+
PositionColor:'rgb(201, 9, 224)',
|
|
124870
124871
|
VolTitleColor:"rgb(190,190,190)",
|
|
124871
124872
|
Before:
|
|
124872
124873
|
{
|
|
@@ -128887,6 +128888,7 @@ function JSReportChartContainer(uielement)
|
|
|
128887
128888
|
if (wheelValue<0) //下
|
|
128888
128889
|
{
|
|
128889
128890
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128891
|
+
this.HideMinuteChartTooltip();
|
|
128890
128892
|
if (this.GotoNextItem(1))
|
|
128891
128893
|
{
|
|
128892
128894
|
this.Draw();
|
|
@@ -128896,6 +128898,7 @@ function JSReportChartContainer(uielement)
|
|
|
128896
128898
|
else if (wheelValue>0) //上
|
|
128897
128899
|
{
|
|
128898
128900
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128901
|
+
this.HideMinuteChartTooltip();
|
|
128899
128902
|
if (this.GotoNextItem(-1))
|
|
128900
128903
|
{
|
|
128901
128904
|
this.Draw();
|
|
@@ -128908,6 +128911,7 @@ function JSReportChartContainer(uielement)
|
|
|
128908
128911
|
if (wheelValue<0) //下一页
|
|
128909
128912
|
{
|
|
128910
128913
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128914
|
+
this.HideMinuteChartTooltip();
|
|
128911
128915
|
if (this.GotoNextPage(this.PageUpDownCycle))
|
|
128912
128916
|
{
|
|
128913
128917
|
this.Draw();
|
|
@@ -128917,6 +128921,7 @@ function JSReportChartContainer(uielement)
|
|
|
128917
128921
|
else if (wheelValue>0) //上一页
|
|
128918
128922
|
{
|
|
128919
128923
|
this.LastMouseStatus.TooltipStatus=null;
|
|
128924
|
+
this.HideMinuteChartTooltip();
|
|
128920
128925
|
if (this.GotoPreviousPage(this.PageUpDownCycle))
|
|
128921
128926
|
{
|
|
128922
128927
|
this.Draw();
|
|
@@ -128938,6 +128943,7 @@ function JSReportChartContainer(uielement)
|
|
|
128938
128943
|
var keyID = e.keyCode ? e.keyCode :e.which;
|
|
128939
128944
|
if (keyID==116) return; //F15刷新不处理
|
|
128940
128945
|
|
|
128946
|
+
this.HideMinuteChartTooltip();
|
|
128941
128947
|
switch(keyID)
|
|
128942
128948
|
{
|
|
128943
128949
|
case 33: //page up
|
|
@@ -137269,10 +137275,10 @@ function JSTReportChartContainer(uielement)
|
|
|
137269
137275
|
//document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
|
|
137270
137276
|
}
|
|
137271
137277
|
|
|
137272
|
-
this.
|
|
137278
|
+
this.GetTReportChart=function()
|
|
137273
137279
|
{
|
|
137274
137280
|
var chart=this.ChartPaint[0];
|
|
137275
|
-
if (!chart) return;
|
|
137281
|
+
if (!chart) return null;
|
|
137276
137282
|
|
|
137277
137283
|
return chart;
|
|
137278
137284
|
}
|
|
@@ -137295,7 +137301,7 @@ function JSTReportChartContainer(uielement)
|
|
|
137295
137301
|
|
|
137296
137302
|
this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
|
|
137297
137303
|
var mouseStatus={ Cursor:"default", Name:"Default"};; //鼠标状态
|
|
137298
|
-
var report=this.
|
|
137304
|
+
var report=this.GetTReportChart();
|
|
137299
137305
|
var bDraw=false;
|
|
137300
137306
|
|
|
137301
137307
|
if (report)
|
|
@@ -137528,12 +137534,6 @@ function JSTReportChartContainer(uielement)
|
|
|
137528
137534
|
}
|
|
137529
137535
|
}
|
|
137530
137536
|
|
|
137531
|
-
this.GetTReportChart=function()
|
|
137532
|
-
{
|
|
137533
|
-
var chart=this.ChartPaint[0];
|
|
137534
|
-
return chart;
|
|
137535
|
-
}
|
|
137536
|
-
|
|
137537
137537
|
this.OnWheel=function(e) //滚轴
|
|
137538
137538
|
{
|
|
137539
137539
|
JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);
|
|
@@ -137559,6 +137559,7 @@ function JSTReportChartContainer(uielement)
|
|
|
137559
137559
|
if (wheelValue<0) //下
|
|
137560
137560
|
{
|
|
137561
137561
|
this.LastMouseStatus.TooltipStatus=null;
|
|
137562
|
+
this.HideMinuteChartTooltip();
|
|
137562
137563
|
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
|
|
137563
137564
|
if (result)
|
|
137564
137565
|
{
|
|
@@ -137569,6 +137570,7 @@ function JSTReportChartContainer(uielement)
|
|
|
137569
137570
|
else if (wheelValue>0) //上
|
|
137570
137571
|
{
|
|
137571
137572
|
this.LastMouseStatus.TooltipStatus=null;
|
|
137573
|
+
this.HideMinuteChartTooltip();
|
|
137572
137574
|
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
|
|
137573
137575
|
if (result)
|
|
137574
137576
|
{
|
|
@@ -137590,6 +137592,8 @@ function JSTReportChartContainer(uielement)
|
|
|
137590
137592
|
var keyID = e.keyCode ? e.keyCode :e.which;
|
|
137591
137593
|
if (keyID==116) return; //F15刷新不处理
|
|
137592
137594
|
|
|
137595
|
+
this.HideMinuteChartTooltip();
|
|
137596
|
+
|
|
137593
137597
|
switch(keyID)
|
|
137594
137598
|
{
|
|
137595
137599
|
/*
|
|
@@ -149019,7 +149023,7 @@ function HQChartScriptWorker()
|
|
|
149019
149023
|
|
|
149020
149024
|
|
|
149021
149025
|
|
|
149022
|
-
var HQCHART_VERSION="1.1.
|
|
149026
|
+
var HQCHART_VERSION="1.1.14160";
|
|
149023
149027
|
|
|
149024
149028
|
function PrintHQChartVersion()
|
|
149025
149029
|
{
|