hqchart 1.1.13732 → 1.1.13734
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
|
@@ -1502,7 +1502,8 @@ ON_CREATE_RIGHT_MENU:152,//创建右键菜单
|
|
|
1502
1502
|
ON_FORMAT_CALL_AUCTION_INDEX_TITLE:153,//集合竞价指标窗口标题内容
|
|
1503
1503
|
ON_FORMAT_KLINE_HIGH_LOW_TITLE:154,//K线最高最低价格式化内容
|
|
1504
1504
|
ON_CUSTOM_CORSSCURSOR_POSITION:155,//自定义十字光标X轴的输出的位置
|
|
1505
|
-
ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156
|
|
1505
|
+
ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156,//日盘夜盘的分界线
|
|
1506
|
+
ON_CUSTOM_MINUTE_BG:157//自定义分时图背景颜色
|
|
1506
1507
|
};var JSCHART_OPERATOR_ID={OP_SCROLL_LEFT:1,//往左移动
|
|
1507
1508
|
OP_SCROLL_RIGHT:2,//往右移动
|
|
1508
1509
|
OP_ZOOM_OUT:3,//缩小
|
|
@@ -2390,6 +2391,7 @@ this.BeforeCloseIcon=CloneData(g_JSChartResource.Minute.Before.CloseIcon);this.I
|
|
|
2390
2391
|
this.BeforeOpenVerticalInfo=[];//盘前集合竞价X轴
|
|
2391
2392
|
this.AfterCloseVerticalInfo=[];//收盘集合竞价X轴
|
|
2392
2393
|
this.NightDayConfig=CloneData(g_JSChartResource.Minute.NightDay);this.DrawFrame=function(){if(!this.IsMinSize){this.SplitXYCoordinate();this.DrawBeforeDataBG();this.YInsideOffset=0;if(this.BeforeDrawXYCallback)this.BeforeDrawXYCallback(this);this.DrawNightDayBG();//绘制夜盘 日盘背景
|
|
2394
|
+
this.DrawCustomBG();//绘制自定义背景色
|
|
2393
2395
|
this.DrawTitleBG();this.DrawHorizontal();this.DrawVertical();}if(this.SizeChange==true||this.ReDrawToolbar==true){this.DrawToolbar();//大小变动才画工具条
|
|
2394
2396
|
this.ReDrawToolbar=false;}};//画边框
|
|
2395
2397
|
this.SuperDrawBorder=this.DrawBorder;this.DrawBorder=function(){if(!this.IsShowBorder)return;if(this.IsMinSize)return;this.SuperDrawBorder();if(this.Identify==1)//走势图和成交量中间用粗线分割开
|
|
@@ -2422,7 +2424,7 @@ this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed
|
|
|
2422
2424
|
this.DrawBeforeDataBG=function(){var border=this.ChartBorder.GetBorder();if(border.DayBorder){this.DrawMultiDayBeforeDataBG(border);return;}if(this.ChartBorder.LeftExtendWidth<10&&this.ChartBorder.RightExtendWidth<10)return;//if (this.Identify>=2) return;
|
|
2423
2425
|
var top=ToFixedPoint(border.Top);var bottom=ToFixedPoint(border.Bottom);this.Canvas.fillStyle=this.BeforeBGColor;if(this.ChartBorder.LeftExtendWidth>10)//盘前
|
|
2424
2426
|
{var left=ToFixedPoint(border.Left);var right=ToFixedPoint(this.ChartBorder.GetLeft());var width=right-left;var height=bottom-top;this.Canvas.fillRect(left,top,width,height);this.DrawCallAuctionVertical(this.BeforeOpenVerticalInfo,this.YSplitOperator.BeforeOpenData,border,true);}if(this.ChartBorder.RightExtendWidth>10)//盘后
|
|
2425
|
-
{this.Canvas.fillStyle=this.AfterBGColor;var left=ToFixedPoint(this.ChartBorder.GetRight());var right=ToFixedPoint(border.Right);var width=right-left;var height=bottom-top;this.Canvas.fillRect(left,top,width,height);}};this.DrawNightDayBG=function(){if(this.DayCount!=1)return;if(!this.HQChart)return;if(!this.HQChart.EnableNightDayBG)return;var symbol=this.HQChart.Symbol;if(!symbol)return;var xIndex=-1;//获取夜盘和日期的分界线X索引位置
|
|
2427
|
+
{this.Canvas.fillStyle=this.AfterBGColor;var left=ToFixedPoint(this.ChartBorder.GetRight());var right=ToFixedPoint(border.Right);var width=right-left;var height=bottom-top;this.Canvas.fillRect(left,top,width,height);}};this.DrawCustomBG=function(){if(!this.HQChart)return;if(this.IsHScreen)return;var symbol=this.HQChart.Symbol;if(!symbol)return;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_BG);if(!event||!event.Callback)return;var aryDay=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.DayData))return;aryDay=[];for(var i=this.HQChart.DayData.length-1;i>=0;--i){aryDay.push({Date:this.HQChart.DayData[i].Date,BGColor:null});}}else if(this.DayCount==1){if(!IFrameSplitOperator.IsPlusNumber(this.HQChart.DataStatus.LatestDate))return;aryDay=[{Date:this.HQChart.DataStatus.LatestDate,BGColor:null}];}if(!IFrameSplitOperator.IsNonEmptyArray(aryDay))return;var sendData={XPointCount:this.XPointCount,DayCount:this.DayCount,MinuteCount:this.MinuteCount,AryDay:aryDay,PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;var border=this.ChartBorder.GetBorder();for(var i=0;i<aryDay.length;++i){var item=aryDay[i];if(!item.BGColor)continue;var start=i*this.MinuteCount;var end=start+this.MinuteCount-1;var xStart=this.GetXFromIndex(start);var xEnd=this.GetXFromIndex(end);var rtDay={Left:xStart,Top:border.Top,Right:xEnd,Bottom:border.Bottom};rtDay.Width=rtDay.Right-rtDay.Left;rtDay.Height=rtDay.Bottom-rtDay.Top;this.Canvas.fillStyle=item.BGColor;this.Canvas.fillRect(rtDay.Left,rtDay.Top,rtDay.Width,rtDay.Height);}};this.DrawNightDayBG=function(){if(this.DayCount!=1)return;if(!this.HQChart)return;if(!this.HQChart.EnableNightDayBG)return;var symbol=this.HQChart.Symbol;if(!symbol)return;var xIndex=-1;//获取夜盘和日期的分界线X索引位置
|
|
2426
2428
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX);if(!event||!event.Callback)return;var sendData={Symbol:symbol,XIndex:xIndex,MinuteTimeStringData:g_MinuteTimeStringData};event.Callback(event,sendData,this);xIndex=sendData.XIndex;if(xIndex<0)return;var border=this.ChartBorder.GetBorder();var x=this.GetXFromIndex(xIndex);var rtNight={Left:border.Left,Top:border.TopEx,Right:x,Bottom:border.Bottom};rtNight.Width=rtNight.Right-rtNight.Left;rtNight.Height=rtNight.Bottom-rtNight.Top;this.Canvas.fillStyle=this.NightDayConfig.NightBGColor;this.Canvas.fillRect(rtNight.Left,rtNight.Top,rtNight.Width,rtNight.Height);if(this.Identify!=0)return;//显示 日盘夜盘文字
|
|
2427
2429
|
this.Canvas.font=this.NightDayConfig.Font;this.Canvas.textBaseline="bottom";this.Canvas.textAlign='left';var aryTitle=[{Title:"夜盘",Position:1,Config:this.NightDayConfig.Night},{Title:"日盘",Position:0,Config:this.NightDayConfig.Day}];var textHeight=this.Canvas.measureText("擎").width;for(var i=0;i<aryTitle.length;++i){var item=aryTitle[i];var text=g_JSChartLocalization.GetText(item.Title,this.HQChart.LanguageID);var testWidth=this.Canvas.measureText(text).width;var rtItem={Width:testWidth+item.Config.Margin.Left+item.Config.Margin.Right,Height:textHeight+item.Config.Margin.Top+item.Config.Margin.Bottom,Bottom:border.Bottom};rtItem.Top=rtItem.Bottom-rtItem.Height;if(item.Position===1){rtItem.Right=x-1;rtItem.Left=rtItem.Right-rtItem.Width;}else{rtItem.Left=x+1;rtItem.Right=rtItem.Left+rtItem.Width;}if(item.Config.BGColor){this.Canvas.fillStyle=item.Config.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(item.Config.BorderColor){this.Canvas.strokeStyle=item.Config.BorderColor;this.Canvas.strokeRect(ToFixedPoint(rtItem.Left),ToFixedPoint(rtItem.Top),ToFixedRect(rtItem.Width),ToFixedRect(rtItem.Height));}this.Canvas.fillStyle=item.Config.Color;this.Canvas.fillText(text,rtItem.Left+item.Config.Margin.Left,rtItem.Bottom-item.Config.Margin.Bottom);}};//选中的画图工具X轴坐标信息
|
|
2428
2430
|
this.DrawPictureXCoordinate=function(drawPicture,range,option){if(this.IsHScreen)return;if(!range)return;if(!IFrameSplitOperator.IsNonEmptyArray(range.Points))return;var border=this.GetBorder();var left=border.Left;var right=border.Right;this.Canvas.font=this.DrawPicture.Font;var fontHeight=this.GetFontHeight();if(range.X){var xRange=range.X;var xLeft=xRange.Min.X;var xRight=xRange.Max.X;if(xLeft<left)xLeft=left;if(xRight>right)xRight=right;this.Canvas.fillStyle=this.DrawPicture.BGColor;this.Canvas.fillRect(xLeft,border.Bottom,xRight-xLeft,fontHeight);}for(var i=0;i<range.Points.length;++i){var item=range.Points[i];if(item.X<left||item.X>right)continue;var index=parseInt(this.GetXData(item.X));var kItem=this.GetKItem(index,option);if(kItem){//var text=IFrameSplitOperator.FormatDateString(kItem.Date,null);
|
|
@@ -13778,7 +13780,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13778
13780
|
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);};}/********************************************************************************
|
|
13779
13781
|
* 版本信息输出
|
|
13780
13782
|
*
|
|
13781
|
-
*/var HQCHART_VERSION="1.1.
|
|
13783
|
+
*/var HQCHART_VERSION="1.1.13733";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();//把给外界调用的方法暴露出来
|
|
13782
13784
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13783
13785
|
// BaseIndex:BaseIndex,
|
|
13784
13786
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -2613,6 +2613,7 @@ var JSCHART_EVENT_ID=
|
|
|
2613
2613
|
ON_CUSTOM_CORSSCURSOR_POSITION:155, //自定义十字光标X轴的输出的位置
|
|
2614
2614
|
|
|
2615
2615
|
ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156, //日盘夜盘的分界线
|
|
2616
|
+
ON_CUSTOM_MINUTE_BG:157, //自定义分时图背景颜色
|
|
2616
2617
|
}
|
|
2617
2618
|
|
|
2618
2619
|
var JSCHART_OPERATOR_ID=
|
|
@@ -13021,6 +13022,7 @@ function MinuteFrame()
|
|
|
13021
13022
|
if (this.BeforeDrawXYCallback) this.BeforeDrawXYCallback(this);
|
|
13022
13023
|
|
|
13023
13024
|
this.DrawNightDayBG(); //绘制夜盘 日盘背景
|
|
13025
|
+
this.DrawCustomBG(); //绘制自定义背景色
|
|
13024
13026
|
|
|
13025
13027
|
this.DrawTitleBG();
|
|
13026
13028
|
this.DrawHorizontal();
|
|
@@ -13465,6 +13467,60 @@ function MinuteFrame()
|
|
|
13465
13467
|
}
|
|
13466
13468
|
}
|
|
13467
13469
|
|
|
13470
|
+
this.DrawCustomBG=function()
|
|
13471
|
+
{
|
|
13472
|
+
if (!this.HQChart) return;
|
|
13473
|
+
if (this.IsHScreen) return;
|
|
13474
|
+
|
|
13475
|
+
var symbol=this.HQChart.Symbol;
|
|
13476
|
+
if (!symbol) return;
|
|
13477
|
+
|
|
13478
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_BG)
|
|
13479
|
+
if (!event || !event.Callback) return;
|
|
13480
|
+
|
|
13481
|
+
var aryDay=null;
|
|
13482
|
+
if (this.DayCount>1)
|
|
13483
|
+
{
|
|
13484
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.DayData)) return;
|
|
13485
|
+
aryDay=[];
|
|
13486
|
+
for(var i=this.HQChart.DayData.length-1;i>=0;--i)
|
|
13487
|
+
{
|
|
13488
|
+
aryDay.push({ Date:this.HQChart.DayData[i].Date, BGColor:null } );
|
|
13489
|
+
}
|
|
13490
|
+
}
|
|
13491
|
+
else if (this.DayCount==1)
|
|
13492
|
+
{
|
|
13493
|
+
if (!IFrameSplitOperator.IsPlusNumber(this.HQChart.DataStatus.LatestDate)) return;
|
|
13494
|
+
aryDay=[{ Date:this.HQChart.DataStatus.LatestDate, BGColor:null }];
|
|
13495
|
+
}
|
|
13496
|
+
|
|
13497
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(aryDay)) return;
|
|
13498
|
+
|
|
13499
|
+
var sendData={ XPointCount:this.XPointCount, DayCount:this.DayCount, MinuteCount:this.MinuteCount , AryDay:aryDay, PreventDefault:false };
|
|
13500
|
+
event.Callback(event, sendData, this);
|
|
13501
|
+
if (sendData.PreventDefault) return;
|
|
13502
|
+
|
|
13503
|
+
var border=this.ChartBorder.GetBorder();
|
|
13504
|
+
for(var i=0;i<aryDay.length;++i)
|
|
13505
|
+
{
|
|
13506
|
+
var item=aryDay[i];
|
|
13507
|
+
if (!item.BGColor) continue;
|
|
13508
|
+
|
|
13509
|
+
var start=i*this.MinuteCount;
|
|
13510
|
+
var end=start+this.MinuteCount-1;
|
|
13511
|
+
|
|
13512
|
+
var xStart=this.GetXFromIndex(start);
|
|
13513
|
+
var xEnd=this.GetXFromIndex(end);
|
|
13514
|
+
|
|
13515
|
+
var rtDay={Left:xStart, Top:border.Top, Right:xEnd, Bottom:border.Bottom };
|
|
13516
|
+
rtDay.Width=rtDay.Right-rtDay.Left;
|
|
13517
|
+
rtDay.Height=rtDay.Bottom-rtDay.Top;
|
|
13518
|
+
|
|
13519
|
+
this.Canvas.fillStyle =item.BGColor;
|
|
13520
|
+
this.Canvas.fillRect(rtDay.Left, rtDay.Top, rtDay.Width, rtDay.Height);
|
|
13521
|
+
}
|
|
13522
|
+
}
|
|
13523
|
+
|
|
13468
13524
|
this.DrawNightDayBG=function()
|
|
13469
13525
|
{
|
|
13470
13526
|
if (this.DayCount!=1) return;
|
|
@@ -6538,6 +6538,7 @@ var JSCHART_EVENT_ID=
|
|
|
6538
6538
|
ON_CUSTOM_CORSSCURSOR_POSITION:155, //自定义十字光标X轴的输出的位置
|
|
6539
6539
|
|
|
6540
6540
|
ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156, //日盘夜盘的分界线
|
|
6541
|
+
ON_CUSTOM_MINUTE_BG:157, //自定义分时图背景颜色
|
|
6541
6542
|
}
|
|
6542
6543
|
|
|
6543
6544
|
var JSCHART_OPERATOR_ID=
|
|
@@ -16946,6 +16947,7 @@ function MinuteFrame()
|
|
|
16946
16947
|
if (this.BeforeDrawXYCallback) this.BeforeDrawXYCallback(this);
|
|
16947
16948
|
|
|
16948
16949
|
this.DrawNightDayBG(); //绘制夜盘 日盘背景
|
|
16950
|
+
this.DrawCustomBG(); //绘制自定义背景色
|
|
16949
16951
|
|
|
16950
16952
|
this.DrawTitleBG();
|
|
16951
16953
|
this.DrawHorizontal();
|
|
@@ -17390,6 +17392,60 @@ function MinuteFrame()
|
|
|
17390
17392
|
}
|
|
17391
17393
|
}
|
|
17392
17394
|
|
|
17395
|
+
this.DrawCustomBG=function()
|
|
17396
|
+
{
|
|
17397
|
+
if (!this.HQChart) return;
|
|
17398
|
+
if (this.IsHScreen) return;
|
|
17399
|
+
|
|
17400
|
+
var symbol=this.HQChart.Symbol;
|
|
17401
|
+
if (!symbol) return;
|
|
17402
|
+
|
|
17403
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_BG)
|
|
17404
|
+
if (!event || !event.Callback) return;
|
|
17405
|
+
|
|
17406
|
+
var aryDay=null;
|
|
17407
|
+
if (this.DayCount>1)
|
|
17408
|
+
{
|
|
17409
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.DayData)) return;
|
|
17410
|
+
aryDay=[];
|
|
17411
|
+
for(var i=this.HQChart.DayData.length-1;i>=0;--i)
|
|
17412
|
+
{
|
|
17413
|
+
aryDay.push({ Date:this.HQChart.DayData[i].Date, BGColor:null } );
|
|
17414
|
+
}
|
|
17415
|
+
}
|
|
17416
|
+
else if (this.DayCount==1)
|
|
17417
|
+
{
|
|
17418
|
+
if (!IFrameSplitOperator.IsPlusNumber(this.HQChart.DataStatus.LatestDate)) return;
|
|
17419
|
+
aryDay=[{ Date:this.HQChart.DataStatus.LatestDate, BGColor:null }];
|
|
17420
|
+
}
|
|
17421
|
+
|
|
17422
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(aryDay)) return;
|
|
17423
|
+
|
|
17424
|
+
var sendData={ XPointCount:this.XPointCount, DayCount:this.DayCount, MinuteCount:this.MinuteCount , AryDay:aryDay, PreventDefault:false };
|
|
17425
|
+
event.Callback(event, sendData, this);
|
|
17426
|
+
if (sendData.PreventDefault) return;
|
|
17427
|
+
|
|
17428
|
+
var border=this.ChartBorder.GetBorder();
|
|
17429
|
+
for(var i=0;i<aryDay.length;++i)
|
|
17430
|
+
{
|
|
17431
|
+
var item=aryDay[i];
|
|
17432
|
+
if (!item.BGColor) continue;
|
|
17433
|
+
|
|
17434
|
+
var start=i*this.MinuteCount;
|
|
17435
|
+
var end=start+this.MinuteCount-1;
|
|
17436
|
+
|
|
17437
|
+
var xStart=this.GetXFromIndex(start);
|
|
17438
|
+
var xEnd=this.GetXFromIndex(end);
|
|
17439
|
+
|
|
17440
|
+
var rtDay={Left:xStart, Top:border.Top, Right:xEnd, Bottom:border.Bottom };
|
|
17441
|
+
rtDay.Width=rtDay.Right-rtDay.Left;
|
|
17442
|
+
rtDay.Height=rtDay.Bottom-rtDay.Top;
|
|
17443
|
+
|
|
17444
|
+
this.Canvas.fillStyle =item.BGColor;
|
|
17445
|
+
this.Canvas.fillRect(rtDay.Left, rtDay.Top, rtDay.Width, rtDay.Height);
|
|
17446
|
+
}
|
|
17447
|
+
}
|
|
17448
|
+
|
|
17393
17449
|
this.DrawNightDayBG=function()
|
|
17394
17450
|
{
|
|
17395
17451
|
if (this.DayCount!=1) return;
|
|
@@ -138357,7 +138413,7 @@ function ScrollBarBGChart()
|
|
|
138357
138413
|
|
|
138358
138414
|
|
|
138359
138415
|
|
|
138360
|
-
var HQCHART_VERSION="1.1.
|
|
138416
|
+
var HQCHART_VERSION="1.1.13733";
|
|
138361
138417
|
|
|
138362
138418
|
function PrintHQChartVersion()
|
|
138363
138419
|
{
|
|
@@ -6582,6 +6582,7 @@ var JSCHART_EVENT_ID=
|
|
|
6582
6582
|
ON_CUSTOM_CORSSCURSOR_POSITION:155, //自定义十字光标X轴的输出的位置
|
|
6583
6583
|
|
|
6584
6584
|
ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156, //日盘夜盘的分界线
|
|
6585
|
+
ON_CUSTOM_MINUTE_BG:157, //自定义分时图背景颜色
|
|
6585
6586
|
}
|
|
6586
6587
|
|
|
6587
6588
|
var JSCHART_OPERATOR_ID=
|
|
@@ -16990,6 +16991,7 @@ function MinuteFrame()
|
|
|
16990
16991
|
if (this.BeforeDrawXYCallback) this.BeforeDrawXYCallback(this);
|
|
16991
16992
|
|
|
16992
16993
|
this.DrawNightDayBG(); //绘制夜盘 日盘背景
|
|
16994
|
+
this.DrawCustomBG(); //绘制自定义背景色
|
|
16993
16995
|
|
|
16994
16996
|
this.DrawTitleBG();
|
|
16995
16997
|
this.DrawHorizontal();
|
|
@@ -17434,6 +17436,60 @@ function MinuteFrame()
|
|
|
17434
17436
|
}
|
|
17435
17437
|
}
|
|
17436
17438
|
|
|
17439
|
+
this.DrawCustomBG=function()
|
|
17440
|
+
{
|
|
17441
|
+
if (!this.HQChart) return;
|
|
17442
|
+
if (this.IsHScreen) return;
|
|
17443
|
+
|
|
17444
|
+
var symbol=this.HQChart.Symbol;
|
|
17445
|
+
if (!symbol) return;
|
|
17446
|
+
|
|
17447
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_BG)
|
|
17448
|
+
if (!event || !event.Callback) return;
|
|
17449
|
+
|
|
17450
|
+
var aryDay=null;
|
|
17451
|
+
if (this.DayCount>1)
|
|
17452
|
+
{
|
|
17453
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.DayData)) return;
|
|
17454
|
+
aryDay=[];
|
|
17455
|
+
for(var i=this.HQChart.DayData.length-1;i>=0;--i)
|
|
17456
|
+
{
|
|
17457
|
+
aryDay.push({ Date:this.HQChart.DayData[i].Date, BGColor:null } );
|
|
17458
|
+
}
|
|
17459
|
+
}
|
|
17460
|
+
else if (this.DayCount==1)
|
|
17461
|
+
{
|
|
17462
|
+
if (!IFrameSplitOperator.IsPlusNumber(this.HQChart.DataStatus.LatestDate)) return;
|
|
17463
|
+
aryDay=[{ Date:this.HQChart.DataStatus.LatestDate, BGColor:null }];
|
|
17464
|
+
}
|
|
17465
|
+
|
|
17466
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(aryDay)) return;
|
|
17467
|
+
|
|
17468
|
+
var sendData={ XPointCount:this.XPointCount, DayCount:this.DayCount, MinuteCount:this.MinuteCount , AryDay:aryDay, PreventDefault:false };
|
|
17469
|
+
event.Callback(event, sendData, this);
|
|
17470
|
+
if (sendData.PreventDefault) return;
|
|
17471
|
+
|
|
17472
|
+
var border=this.ChartBorder.GetBorder();
|
|
17473
|
+
for(var i=0;i<aryDay.length;++i)
|
|
17474
|
+
{
|
|
17475
|
+
var item=aryDay[i];
|
|
17476
|
+
if (!item.BGColor) continue;
|
|
17477
|
+
|
|
17478
|
+
var start=i*this.MinuteCount;
|
|
17479
|
+
var end=start+this.MinuteCount-1;
|
|
17480
|
+
|
|
17481
|
+
var xStart=this.GetXFromIndex(start);
|
|
17482
|
+
var xEnd=this.GetXFromIndex(end);
|
|
17483
|
+
|
|
17484
|
+
var rtDay={Left:xStart, Top:border.Top, Right:xEnd, Bottom:border.Bottom };
|
|
17485
|
+
rtDay.Width=rtDay.Right-rtDay.Left;
|
|
17486
|
+
rtDay.Height=rtDay.Bottom-rtDay.Top;
|
|
17487
|
+
|
|
17488
|
+
this.Canvas.fillStyle =item.BGColor;
|
|
17489
|
+
this.Canvas.fillRect(rtDay.Left, rtDay.Top, rtDay.Width, rtDay.Height);
|
|
17490
|
+
}
|
|
17491
|
+
}
|
|
17492
|
+
|
|
17437
17493
|
this.DrawNightDayBG=function()
|
|
17438
17494
|
{
|
|
17439
17495
|
if (this.DayCount!=1) return;
|
|
@@ -142888,7 +142944,7 @@ function HQChartScriptWorker()
|
|
|
142888
142944
|
|
|
142889
142945
|
|
|
142890
142946
|
|
|
142891
|
-
var HQCHART_VERSION="1.1.
|
|
142947
|
+
var HQCHART_VERSION="1.1.13733";
|
|
142892
142948
|
|
|
142893
142949
|
function PrintHQChartVersion()
|
|
142894
142950
|
{
|