hqchart 1.1.15220 → 1.1.15225
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
|
@@ -2685,6 +2685,8 @@ this.AreaData;//区域: { Start:, End:, BGColor:, Position:[0=左, 1=右] }
|
|
|
2685
2685
|
//this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
|
|
2686
2686
|
//Y轴文字偏移
|
|
2687
2687
|
//this.YOffset=[{ Offset:5}, { Offset:10} ] //目前只对框子外的刻度文字生效 0=外左 1=外右 2=内左 3=内右
|
|
2688
|
+
//X轴文字
|
|
2689
|
+
//this.XOffset=[{ Position:1} ] //Position:1=线段移动到左侧K线间距 2=线段移动到K线右侧间距
|
|
2688
2690
|
}//边框信息
|
|
2689
2691
|
function ChartBorder(){this.UIElement;//四周间距
|
|
2690
2692
|
this.Left=50;this.Right=80;this.Top=50;this.Bottom=50;this.TitleHeight=24;//标题高度
|
|
@@ -2891,7 +2893,7 @@ this.DrawVertical=function(){var border=this.GetBorder();var top=border.TopTitle
|
|
|
2891
2893
|
//if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return; //高度不够 不显示
|
|
2892
2894
|
var mapX=null;if(this.GetVerticalXCache)mapX=this.GetVerticalXCache();var bottomTextExtend=null;if(this.XTextExtend){bottomTextExtend=this.XTextExtend[0];}var bottomLineExtend=null;if(this.XLineExtend){bottomLineExtend=this.XLineExtend[0];}var xPrev=null;//上一个坐标x的值
|
|
2893
2895
|
var textRightPrev=null;//上一次刻度输出右边x坐标
|
|
2894
|
-
for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];var x=null;if(mapX&&mapX.has(item.Value))x=mapX.get(item.Value);else x=this.GetXFromIndex(item.Value);if(x>right)break;if(xPrev!=null&&Math.abs(x-xPrev)<this.MinXDistance)continue;var item=this.VerticalInfo[i];var xFixed=ToFixedPoint(x);if(this.IsShowXLine){if(item.LineType==2)//虚线
|
|
2896
|
+
for(var i=0;i<this.VerticalInfo.length;++i){var item=this.VerticalInfo[i];var x=null;if(mapX&&mapX.has(item.Value))x=mapX.get(item.Value);else x=this.GetXFromIndex(item.Value);if(item.XOffset&&item.XOffset[0]){var subItem=item.XOffset[0];if(subItem.Position===1){x-=this.DataWidth/2;x-=this.DistanceWidth/2;}else if(subItem.Position===2){x+=this.DataWidth/2;x+=this.DistanceWidth/2;}}if(x>right)break;if(xPrev!=null&&Math.abs(x-xPrev)<this.MinXDistance)continue;var item=this.VerticalInfo[i];var xFixed=ToFixedPoint(x);if(this.IsShowXLine){if(item.LineType==2)//虚线
|
|
2895
2897
|
{this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;if(item.LineDash)this.Canvas.setLineDash(item.LineDash);else this.Canvas.setLineDash([5*pixelRatio,5*pixelRatio]);this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();this.Canvas.setLineDash([]);}else if(item.LineType==3){}else if(item.LineType>0)//实线
|
|
2896
2898
|
{if(g_JSChartResource.FrameXLineDash){this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.setLineDash(g_JSChartResource.FrameXLineDash);//虚线
|
|
2897
2899
|
this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();this.Canvas.setLineDash([]);}else{this.Canvas.strokeStyle=this.VerticalInfo[i].LineColor;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,top);this.Canvas.lineTo(xFixed,bottom);this.Canvas.stroke();}}}if(item.BG&&this.DrawDayVertical){this.DrawDayVertical(item,x,border);}if(item.Message[0]!=null&&this.ChartBorder.Bottom>5*pixelRatio){if(IFrameSplitOperator.IsObject(item.Message[0])){var textObj=item.Message[0];if(!textObj.Font)textObj.Font=item.Font;if(!textObj.TextColor)textObj.TextColor=item.TextColor;var drawInfo=this.GetMultiLineVTextSize(textObj);if(drawInfo){drawInfo.XCenter=x;var rtBottom={Left:0,Right:right,Top:bottom+2*pixelRatio,Bottom:border.Height};rtBottom.Width=rtBottom.Right-rtBottom.Left;rtBottom.Height=rtBottom.Bottom-rtBottom.Top;drawInfo.RectBottom=rtBottom;drawInfo.TextRightPrev=textRightPrev;this.DrawMultiLineVText(drawInfo);if(drawInfo.TextRight)textRightPrev=drawInfo.TextRight;}}else{if(item.Font)this.Canvas.font=item.Font;var textLeft=0;this.Canvas.strokeStyle=item.TextColor;var testWidth=this.Canvas.measureText(item.Message[0]).width;var textHeight=this.Canvas.measureText("擎").width;if(bottomTextExtend&&bottomTextExtend.Align==1){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";textLeft=x;}else{if(x<testWidth/2){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";textLeft=x;}else if(x+testWidth/2>=this.ChartBorder.GetChartWidth()){this.Canvas.textAlign="right";this.Canvas.textBaseline="top";textLeft=x-testWidth;}else{this.Canvas.textAlign="center";this.Canvas.textBaseline="top";textLeft=x-testWidth/2;}}if(textRightPrev==null||textLeft>textRightPrev){var yText=bottom;if(item.LineType==3){var lineLength=this.ShortXLineLength*pixelRatio;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,yText);this.Canvas.lineTo(xFixed,yText+lineLength);this.Canvas.stroke();yText+=lineLength+2*pixelRatio;}if(bottomLineExtend){if(bottomLineExtend.Mode===1){if(item.Value>1){if(bottomLineExtend.Color)this.Canvas.strokeStyle=bottomLineExtend.Color;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,bottom);this.Canvas.lineTo(xFixed,border.ChartHeight);this.Canvas.stroke();x+=1;}}else if(bottomLineExtend.Mode===2){if(bottomLineExtend.Width>=1){var lineLength=bottomLineExtend.Width;if(bottomLineExtend.Color)this.Canvas.strokeStyle=bottomLineExtend.Color;this.Canvas.beginPath();this.Canvas.moveTo(xFixed,yText);this.Canvas.lineTo(xFixed,yText+lineLength);this.Canvas.stroke();yText+=lineLength+2;}}}//item.TextBGColor="rgb(0,255,0)";
|
|
@@ -9256,7 +9258,7 @@ if(this.Frame&&this.Frame.SubFrame){for(var i=0;i<this.Frame.SubFrame.length;++i
|
|
|
9256
9258
|
for(var i=1;i<this.TitlePaint.length;++i){var item=this.TitlePaint[i];item.OverlayIndex=new _map2.default();}};this.ResetDayOffset=function(){if(this.PageInfo.Enable){this.DayOffset.Offset=this.PageInfo.Offset;this.DayOffset.ShowDayCount=this.PageInfo.ShowDayCount;}else{this.DayOffset.Offset=0;this.DayOffset.ShowDayCount=-1;}this.DayOffset.PageInfo=null;};this.ResetDataStatus=function(){this.DataStatus.MultiDay=false;this.DataStatus.LatestDay=false;this.DataStatus.LatestDate=null;};this.ClearOverlaySymbolData=function(){for(var i=0;i<this.OverlayChartPaint.length;++i){var chart=this.OverlayChartPaint[i];chart.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;//重置状态
|
|
9257
9259
|
chart.Data.Data=[];//清空数据
|
|
9258
9260
|
}};//切换股票代码
|
|
9259
|
-
this.ChangeSymbol=function(symbol,option){this.StopDisplayLatest();this.ClearGlobalOption();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeSymbol");this.Symbol=symbol;this.ResetDayOffset();this.ResetDataStatus();this.ClearIndexPaint();//清空指标
|
|
9261
|
+
this.ChangeSymbol=function(symbol,option){this.StopDisplayLatest();this.ClearGlobalOption();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeSymbol");this.Symbol=symbol;this.ResetDayOffset();this.ResetDataStatus();this.ClearMinuteData();this.ClearIndexPaint();//清空指标
|
|
9260
9262
|
this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRunCount();this.ClearStockCache();this.UnlockCorssCursor();this.Frame.ClearYCoordinateMaxMin();if(option){if(IFrameSplitOperator.IsNumber(option.DayCount))this.DayCount=option.DayCount;if(IFrameSplitOperator.IsNonEmptyArray(option.Windows))//切换指标
|
|
9261
9263
|
{for(var i=0;i<option.Windows.length;++i){var index=2+i;if(index>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
|
|
9262
9264
|
var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
|
|
@@ -9268,7 +9270,10 @@ if(option.Overlay&&IFrameSplitOperator.IsNonEmptyArray(option.Overlay)){var setS
|
|
|
9268
9270
|
{var item=this.OverlayChartPaint[i];setSymbol.add(item.Symbol);}for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];if(setSymbol.has(item.Symbol))continue;var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=item.Symbol;paint.Identify='Overlay-Minute-'+item.Symbol;if(item.Color)paint.Color=item.Color;//外部设置颜色
|
|
9269
9271
|
else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
|
|
9270
9272
|
if(paint.SetOption)paint.SetOption(item);this.OverlayChartPaint.push(paint);}}if(IFrameSplitOperator.IsNonEmptyArray(option.AryDate)){this.AryDate=option.AryDate.slice();}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
|
|
9271
|
-
this.Draw();this.RequestData();}};this.SetPageInfo=function(pageInfo){if(!pageInfo)return;if(IFrameSplitOperator.IsBool(pageInfo.Enable))this.PageInfo.Enable=pageInfo.Enable;if(IFrameSplitOperator.IsNumber(pageInfo.Offset))this.PageInfo.Offset=pageInfo.Offset;if(IFrameSplitOperator.IsNumber(pageInfo.ShowDayCount))this.PageInfo.ShowDayCount=pageInfo.ShowDayCount;};this.ClearMinuteData=function(){this.SourceData=null;this.DayData=null;this.BeforeOpenData=null;this.AfterCloseData=null;this.MultiDayBeforeOpenData=null;this.MultiDayAfterCloseData=null;
|
|
9273
|
+
this.Draw();this.RequestData();}};this.SetPageInfo=function(pageInfo){if(!pageInfo)return;if(IFrameSplitOperator.IsBool(pageInfo.Enable))this.PageInfo.Enable=pageInfo.Enable;if(IFrameSplitOperator.IsNumber(pageInfo.Offset))this.PageInfo.Offset=pageInfo.Offset;if(IFrameSplitOperator.IsNumber(pageInfo.ShowDayCount))this.PageInfo.ShowDayCount=pageInfo.ShowDayCount;};this.ClearMinuteData=function(){this.SourceData=null;this.DayData=null;this.BeforeOpenData=null;this.AfterCloseData=null;this.MultiDayBeforeOpenData=null;this.MultiDayAfterCloseData=null;this.ClearMainChartData();};this.ClearMainChartData=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaint))return;var chart=this.ChartPaint[0];//价格线
|
|
9274
|
+
if(chart){chart.Data=null;chart.BeforeOpenData=null;chart.AfterCloseData=null;chart.MultiDayBeforeOpenData=null;chart.MultiDayAfterCloseData=null;}var chart=this.ChartPaint[1];//均线
|
|
9275
|
+
if(chart){chart.Data=null;}var chart=this.ChartPaint[2];//成交量
|
|
9276
|
+
if(chart){chart.Data=null;}};this.ChangeDayCount=function(count,option){if(count<0)return;this.StopDisplayLatest();this.ClearGlobalOption();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeDayCount");this.DayCount=count;this.ClearMinuteData();this.ClearStockCache();this.UnlockCorssCursor();this.Frame.ClearYCoordinateMaxMin();if(option&&option.PageInfo){this.SetPageInfo(option.PageInfo);this.ResetDayOffset();}if(option){if(IFrameSplitOperator.IsNonEmptyArray(option.AryDate)){this.AryDate=option.AryDate.slice();}}this.ReloadChartDrawPicture();this.ResetDataStatus();this.ClearIndexPaint();//清空指标
|
|
9272
9277
|
this.Frame.ClearYCoordinateMaxMin();this.ResetOverlaySymbolStatus();this.RequestData();};this.ChangeBaselineType=function(type){if(this.BaselineType==type)return;this.BaselineType=type;if(this.DayCount>1)this.RequestData();};//[{ Symbol: , Color, Option: }]
|
|
9273
9278
|
this.OverlaySymbols=function(aryData,option){if(option&&option.ClearAll===true)//全部清空
|
|
9274
9279
|
{for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];item.IsDelete=true;}this.OverlayChartPaint=[];}var aryNewOverlay=[];for(var i=0,j=0;i<aryData.length;++i)//去重，已经叠加过的不用在叠加
|
|
@@ -15639,7 +15644,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15639
15644
|
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);};}/********************************************************************************
|
|
15640
15645
|
* 版本信息输出
|
|
15641
15646
|
*
|
|
15642
|
-
*/var HQCHART_VERSION="1.1.
|
|
15647
|
+
*/var HQCHART_VERSION="1.1.15224";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();//把给外界调用的方法暴露出来
|
|
15643
15648
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15644
15649
|
// BaseIndex:BaseIndex,
|
|
15645
15650
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -12991,6 +12991,8 @@ function CoordinateInfo()
|
|
|
12991
12991
|
//this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
|
|
12992
12992
|
//Y轴文字偏移
|
|
12993
12993
|
//this.YOffset=[{ Offset:5}, { Offset:10} ] //目前只对框子外的刻度文字生效 0=外左 1=外右 2=内左 3=内右
|
|
12994
|
+
//X轴文字
|
|
12995
|
+
//this.XOffset=[{ Position:1} ] //Position:1=线段移动到左侧K线间距 2=线段移动到K线右侧间距
|
|
12994
12996
|
}
|
|
12995
12997
|
|
|
12996
12998
|
|
|
@@ -14970,6 +14972,22 @@ function AverageWidthFrame()
|
|
|
14970
14972
|
var x=null;
|
|
14971
14973
|
if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
|
|
14972
14974
|
else x=this.GetXFromIndex(item.Value);
|
|
14975
|
+
|
|
14976
|
+
if (item.XOffset && item.XOffset[0])
|
|
14977
|
+
{
|
|
14978
|
+
var subItem=item.XOffset[0];
|
|
14979
|
+
if (subItem.Position===1)
|
|
14980
|
+
{
|
|
14981
|
+
x-=this.DataWidth/2;
|
|
14982
|
+
x-=this.DistanceWidth/2;
|
|
14983
|
+
}
|
|
14984
|
+
else if (subItem.Position===2)
|
|
14985
|
+
{
|
|
14986
|
+
x+=this.DataWidth/2;
|
|
14987
|
+
x+=this.DistanceWidth/2;
|
|
14988
|
+
}
|
|
14989
|
+
}
|
|
14990
|
+
|
|
14973
14991
|
if (x>right) break;
|
|
14974
14992
|
if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
|
|
14975
14993
|
|
|
@@ -93576,6 +93594,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
93576
93594
|
this.Symbol=symbol;
|
|
93577
93595
|
this.ResetDayOffset();
|
|
93578
93596
|
this.ResetDataStatus();
|
|
93597
|
+
this.ClearMinuteData();
|
|
93579
93598
|
this.ClearIndexPaint(); //清空指标
|
|
93580
93599
|
this.ResetOverlaySymbolStatus();
|
|
93581
93600
|
this.ReloadChartDrawPicture();
|
|
@@ -93583,6 +93602,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
93583
93602
|
this.ClearStockCache();
|
|
93584
93603
|
this.UnlockCorssCursor();
|
|
93585
93604
|
this.Frame.ClearYCoordinateMaxMin();
|
|
93605
|
+
|
|
93586
93606
|
|
|
93587
93607
|
if (option)
|
|
93588
93608
|
{
|
|
@@ -93706,6 +93726,35 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
93706
93726
|
this.AfterCloseData=null;
|
|
93707
93727
|
this.MultiDayBeforeOpenData=null;
|
|
93708
93728
|
this.MultiDayAfterCloseData=null;
|
|
93729
|
+
|
|
93730
|
+
this.ClearMainChartData();
|
|
93731
|
+
}
|
|
93732
|
+
|
|
93733
|
+
this.ClearMainChartData=function()
|
|
93734
|
+
{
|
|
93735
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaint)) return;
|
|
93736
|
+
|
|
93737
|
+
var chart=this.ChartPaint[0]; //价格线
|
|
93738
|
+
if (chart)
|
|
93739
|
+
{
|
|
93740
|
+
chart.Data=null;
|
|
93741
|
+
chart.BeforeOpenData=null;
|
|
93742
|
+
chart.AfterCloseData=null;
|
|
93743
|
+
chart.MultiDayBeforeOpenData=null;
|
|
93744
|
+
chart.MultiDayAfterCloseData=null;
|
|
93745
|
+
}
|
|
93746
|
+
|
|
93747
|
+
var chart=this.ChartPaint[1]; //均线
|
|
93748
|
+
if (chart)
|
|
93749
|
+
{
|
|
93750
|
+
chart.Data=null;
|
|
93751
|
+
}
|
|
93752
|
+
|
|
93753
|
+
var chart=this.ChartPaint[2]; //成交量
|
|
93754
|
+
if (chart)
|
|
93755
|
+
{
|
|
93756
|
+
chart.Data=null;
|
|
93757
|
+
}
|
|
93709
93758
|
}
|
|
93710
93759
|
|
|
93711
93760
|
this.ChangeDayCount=function(count, option)
|
|
@@ -17087,6 +17087,8 @@ function CoordinateInfo()
|
|
|
17087
17087
|
//this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
|
|
17088
17088
|
//Y轴文字偏移
|
|
17089
17089
|
//this.YOffset=[{ Offset:5}, { Offset:10} ] //目前只对框子外的刻度文字生效 0=外左 1=外右 2=内左 3=内右
|
|
17090
|
+
//X轴文字
|
|
17091
|
+
//this.XOffset=[{ Position:1} ] //Position:1=线段移动到左侧K线间距 2=线段移动到K线右侧间距
|
|
17090
17092
|
}
|
|
17091
17093
|
|
|
17092
17094
|
|
|
@@ -19066,6 +19068,22 @@ function AverageWidthFrame()
|
|
|
19066
19068
|
var x=null;
|
|
19067
19069
|
if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
|
|
19068
19070
|
else x=this.GetXFromIndex(item.Value);
|
|
19071
|
+
|
|
19072
|
+
if (item.XOffset && item.XOffset[0])
|
|
19073
|
+
{
|
|
19074
|
+
var subItem=item.XOffset[0];
|
|
19075
|
+
if (subItem.Position===1)
|
|
19076
|
+
{
|
|
19077
|
+
x-=this.DataWidth/2;
|
|
19078
|
+
x-=this.DistanceWidth/2;
|
|
19079
|
+
}
|
|
19080
|
+
else if (subItem.Position===2)
|
|
19081
|
+
{
|
|
19082
|
+
x+=this.DataWidth/2;
|
|
19083
|
+
x+=this.DistanceWidth/2;
|
|
19084
|
+
}
|
|
19085
|
+
}
|
|
19086
|
+
|
|
19069
19087
|
if (x>right) break;
|
|
19070
19088
|
if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
|
|
19071
19089
|
|
|
@@ -97672,6 +97690,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97672
97690
|
this.Symbol=symbol;
|
|
97673
97691
|
this.ResetDayOffset();
|
|
97674
97692
|
this.ResetDataStatus();
|
|
97693
|
+
this.ClearMinuteData();
|
|
97675
97694
|
this.ClearIndexPaint(); //清空指标
|
|
97676
97695
|
this.ResetOverlaySymbolStatus();
|
|
97677
97696
|
this.ReloadChartDrawPicture();
|
|
@@ -97679,6 +97698,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97679
97698
|
this.ClearStockCache();
|
|
97680
97699
|
this.UnlockCorssCursor();
|
|
97681
97700
|
this.Frame.ClearYCoordinateMaxMin();
|
|
97701
|
+
|
|
97682
97702
|
|
|
97683
97703
|
if (option)
|
|
97684
97704
|
{
|
|
@@ -97802,6 +97822,35 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97802
97822
|
this.AfterCloseData=null;
|
|
97803
97823
|
this.MultiDayBeforeOpenData=null;
|
|
97804
97824
|
this.MultiDayAfterCloseData=null;
|
|
97825
|
+
|
|
97826
|
+
this.ClearMainChartData();
|
|
97827
|
+
}
|
|
97828
|
+
|
|
97829
|
+
this.ClearMainChartData=function()
|
|
97830
|
+
{
|
|
97831
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaint)) return;
|
|
97832
|
+
|
|
97833
|
+
var chart=this.ChartPaint[0]; //价格线
|
|
97834
|
+
if (chart)
|
|
97835
|
+
{
|
|
97836
|
+
chart.Data=null;
|
|
97837
|
+
chart.BeforeOpenData=null;
|
|
97838
|
+
chart.AfterCloseData=null;
|
|
97839
|
+
chart.MultiDayBeforeOpenData=null;
|
|
97840
|
+
chart.MultiDayAfterCloseData=null;
|
|
97841
|
+
}
|
|
97842
|
+
|
|
97843
|
+
var chart=this.ChartPaint[1]; //均线
|
|
97844
|
+
if (chart)
|
|
97845
|
+
{
|
|
97846
|
+
chart.Data=null;
|
|
97847
|
+
}
|
|
97848
|
+
|
|
97849
|
+
var chart=this.ChartPaint[2]; //成交量
|
|
97850
|
+
if (chart)
|
|
97851
|
+
{
|
|
97852
|
+
chart.Data=null;
|
|
97853
|
+
}
|
|
97805
97854
|
}
|
|
97806
97855
|
|
|
97807
97856
|
this.ChangeDayCount=function(count, option)
|
|
@@ -154160,7 +154209,7 @@ function ScrollBarBGChart()
|
|
|
154160
154209
|
|
|
154161
154210
|
|
|
154162
154211
|
|
|
154163
|
-
var HQCHART_VERSION="1.1.
|
|
154212
|
+
var HQCHART_VERSION="1.1.15224";
|
|
154164
154213
|
|
|
154165
154214
|
function PrintHQChartVersion()
|
|
154166
154215
|
{
|
|
@@ -17131,6 +17131,8 @@ function CoordinateInfo()
|
|
|
17131
17131
|
//this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
|
|
17132
17132
|
//Y轴文字偏移
|
|
17133
17133
|
//this.YOffset=[{ Offset:5}, { Offset:10} ] //目前只对框子外的刻度文字生效 0=外左 1=外右 2=内左 3=内右
|
|
17134
|
+
//X轴文字
|
|
17135
|
+
//this.XOffset=[{ Position:1} ] //Position:1=线段移动到左侧K线间距 2=线段移动到K线右侧间距
|
|
17134
17136
|
}
|
|
17135
17137
|
|
|
17136
17138
|
|
|
@@ -19110,6 +19112,22 @@ function AverageWidthFrame()
|
|
|
19110
19112
|
var x=null;
|
|
19111
19113
|
if (mapX && mapX.has(item.Value)) x=mapX.get(item.Value);
|
|
19112
19114
|
else x=this.GetXFromIndex(item.Value);
|
|
19115
|
+
|
|
19116
|
+
if (item.XOffset && item.XOffset[0])
|
|
19117
|
+
{
|
|
19118
|
+
var subItem=item.XOffset[0];
|
|
19119
|
+
if (subItem.Position===1)
|
|
19120
|
+
{
|
|
19121
|
+
x-=this.DataWidth/2;
|
|
19122
|
+
x-=this.DistanceWidth/2;
|
|
19123
|
+
}
|
|
19124
|
+
else if (subItem.Position===2)
|
|
19125
|
+
{
|
|
19126
|
+
x+=this.DataWidth/2;
|
|
19127
|
+
x+=this.DistanceWidth/2;
|
|
19128
|
+
}
|
|
19129
|
+
}
|
|
19130
|
+
|
|
19113
19131
|
if (x>right) break;
|
|
19114
19132
|
if (xPrev!=null && Math.abs(x-xPrev)<this.MinXDistance) continue;
|
|
19115
19133
|
|
|
@@ -97716,6 +97734,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97716
97734
|
this.Symbol=symbol;
|
|
97717
97735
|
this.ResetDayOffset();
|
|
97718
97736
|
this.ResetDataStatus();
|
|
97737
|
+
this.ClearMinuteData();
|
|
97719
97738
|
this.ClearIndexPaint(); //清空指标
|
|
97720
97739
|
this.ResetOverlaySymbolStatus();
|
|
97721
97740
|
this.ReloadChartDrawPicture();
|
|
@@ -97723,6 +97742,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97723
97742
|
this.ClearStockCache();
|
|
97724
97743
|
this.UnlockCorssCursor();
|
|
97725
97744
|
this.Frame.ClearYCoordinateMaxMin();
|
|
97745
|
+
|
|
97726
97746
|
|
|
97727
97747
|
if (option)
|
|
97728
97748
|
{
|
|
@@ -97846,6 +97866,35 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
97846
97866
|
this.AfterCloseData=null;
|
|
97847
97867
|
this.MultiDayBeforeOpenData=null;
|
|
97848
97868
|
this.MultiDayAfterCloseData=null;
|
|
97869
|
+
|
|
97870
|
+
this.ClearMainChartData();
|
|
97871
|
+
}
|
|
97872
|
+
|
|
97873
|
+
this.ClearMainChartData=function()
|
|
97874
|
+
{
|
|
97875
|
+
if (!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaint)) return;
|
|
97876
|
+
|
|
97877
|
+
var chart=this.ChartPaint[0]; //价格线
|
|
97878
|
+
if (chart)
|
|
97879
|
+
{
|
|
97880
|
+
chart.Data=null;
|
|
97881
|
+
chart.BeforeOpenData=null;
|
|
97882
|
+
chart.AfterCloseData=null;
|
|
97883
|
+
chart.MultiDayBeforeOpenData=null;
|
|
97884
|
+
chart.MultiDayAfterCloseData=null;
|
|
97885
|
+
}
|
|
97886
|
+
|
|
97887
|
+
var chart=this.ChartPaint[1]; //均线
|
|
97888
|
+
if (chart)
|
|
97889
|
+
{
|
|
97890
|
+
chart.Data=null;
|
|
97891
|
+
}
|
|
97892
|
+
|
|
97893
|
+
var chart=this.ChartPaint[2]; //成交量
|
|
97894
|
+
if (chart)
|
|
97895
|
+
{
|
|
97896
|
+
chart.Data=null;
|
|
97897
|
+
}
|
|
97849
97898
|
}
|
|
97850
97899
|
|
|
97851
97900
|
this.ChangeDayCount=function(count, option)
|
|
@@ -166217,7 +166266,7 @@ function HQChartScriptWorker()
|
|
|
166217
166266
|
|
|
166218
166267
|
|
|
166219
166268
|
|
|
166220
|
-
var HQCHART_VERSION="1.1.
|
|
166269
|
+
var HQCHART_VERSION="1.1.15224";
|
|
166221
166270
|
|
|
166222
166271
|
function PrintHQChartVersion()
|
|
166223
166272
|
{
|