hqchart 1.1.14468 → 1.1.14471
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
|
@@ -1173,7 +1173,7 @@ option.CorssCursor={};option.CorssCursor.TitleHeight=chart.ChartCorssCursor.Text
|
|
|
1173
1173
|
}if(item.IsShowRightText===false||item.IsShowRightText===true){chart.Frame.SubFrame[i].Frame.IsShowYText[1]=item.IsShowRightText;chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowRightText=item.IsShowRightText;//显示右边刻度
|
|
1174
1174
|
}if(item.TopSpace>=0)chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace*pixelRatio;if(item.BottomSpace>=0)chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace*pixelRatio;if(item.RightTextPosition>0)chart.Frame.SubFrame[i].Frame.YTextPosition[1]=item.RightTextPosition;if(item.LeftTextPosition>0)chart.Frame.SubFrame[i].Frame.YTextPosition[0]=item.LeftTextPosition;if(item.IsShowXLine==false)chart.Frame.SubFrame[i].Frame.IsShowXLine=item.IsShowXLine;if(item.IsShowYLine==false)chart.Frame.SubFrame[i].Frame.IsShowYLine=item.IsShowYLine;if(IFrameSplitOperator.IsNumber(item.YTextBaseline))chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;if(item.YCoordinateType>0)chart.Frame.SubFrame[0].Frame.YSplitOperator.CoordinateType=item.YCoordinateType;if(item.IsYReverse==true)chart.Frame.SubFrame[0].Frame.CoordinateType=1;//反转坐标
|
|
1175
1175
|
if(IFrameSplitOperator.IsNumber(item.PercentageTextFormat))subFrame.YSplitOperator.PercentageTextFormat=item.PercentageTextFormat;//百分比坐标格式
|
|
1176
|
-
if(item.DefaultYMaxMin)chart.Frame.SubFrame[i].Frame.YSplitOperator.DefaultYMaxMin=item.DefaultYMaxMin;if(IFrameSplitOperator.IsBool(item.EnableRemoveZero))chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;if(IFrameSplitOperator.IsPlusNumber(item.MinYDistance))chart.Frame.SubFrame[i].Frame.MinYDistance=item.MinYDistance;if(IFrameSplitOperator.IsNumber(item.BorderLine))chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;if(IFrameSplitOperator.IsBool(item.IsShowIndexTitle))chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine))subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;if(item.ClientBGColor)subFrame.ClientBGColor=item.ClientBGColor;}}if(option.KLine){var item=option.KLine;var klineChart=chart.ChartPaint[0];if(option.KLine.ShowKLine==false)klineChart.IsShow=false;if(option.KLine.InfoPosition>0)klineChart.InfoPosition=option.KLine.InfoPosition;if(IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice))klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;if(IFrameSplitOperator.IsNumber(item.OneLimitBarType))klineChart.OneLimitBarType=item.OneLimitBarType;if(item.PriceGap){if(IFrameSplitOperator.IsBool(item.PriceGap.Enable))klineChart.PriceGap.Enable=item.PriceGap.Enable;if(IFrameSplitOperator.IsNumber(item.PriceGap.Count))klineChart.PriceGap.Count=item.PriceGap.Count;}}if(option.KLineTitle){var item=option.KLineTitle;var chartTitle=chart.TitlePaint[0];if(option.KLineTitle.IsShowName==false)chart.TitlePaint[0].IsShowName=false;if(option.KLineTitle.IsShowSettingInfo==false)chart.TitlePaint[0].IsShowSettingInfo=false;if(option.KLineTitle.IsShow==false)chart.TitlePaint[0].IsShow=false;if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData))chart.IsTitleShowLatestData=item.IsTitleShowLatestData;if(item.ShowPosition||item.ShowPostion)//显示位置高级配置
|
|
1176
|
+
if(item.DefaultYMaxMin)chart.Frame.SubFrame[i].Frame.YSplitOperator.DefaultYMaxMin=item.DefaultYMaxMin;if(IFrameSplitOperator.IsBool(item.EnableRemoveZero))chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;if(IFrameSplitOperator.IsPlusNumber(item.MinYDistance))chart.Frame.SubFrame[i].Frame.MinYDistance=item.MinYDistance;if(IFrameSplitOperator.IsNumber(item.BorderLine))chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;if(IFrameSplitOperator.IsBool(item.IsShowIndexTitle))chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine))subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;if(item.ClientBGColor)subFrame.ClientBGColor=item.ClientBGColor;}}if(option.KLine){var item=option.KLine;var klineChart=chart.ChartPaint[0];if(option.KLine.ShowKLine==false)klineChart.IsShow=false;if(option.KLine.InfoPosition>0)klineChart.InfoPosition=option.KLine.InfoPosition;if(IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice))klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;if(IFrameSplitOperator.IsNumber(item.OneLimitBarType))klineChart.OneLimitBarType=item.OneLimitBarType;if(IFrameSplitOperator.IsNumber(item.UnchangeBarType))klineChart.UnchangeBarType=item.UnchangeBarType;if(item.PriceGap){if(IFrameSplitOperator.IsBool(item.PriceGap.Enable))klineChart.PriceGap.Enable=item.PriceGap.Enable;if(IFrameSplitOperator.IsNumber(item.PriceGap.Count))klineChart.PriceGap.Count=item.PriceGap.Count;}}if(option.KLineTitle){var item=option.KLineTitle;var chartTitle=chart.TitlePaint[0];if(option.KLineTitle.IsShowName==false)chart.TitlePaint[0].IsShowName=false;if(option.KLineTitle.IsShowSettingInfo==false)chart.TitlePaint[0].IsShowSettingInfo=false;if(option.KLineTitle.IsShow==false)chart.TitlePaint[0].IsShow=false;if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData))chart.IsTitleShowLatestData=item.IsTitleShowLatestData;if(item.ShowPosition||item.ShowPostion)//显示位置高级配置
|
|
1177
1177
|
{var subItem=item.ShowPostion;if(item.ShowPosition)subItem=item.ShowPosition;if(!chartTitle.ShowPositionConfig)chartTitle.ShowPositionConfig={Margin:{}};if(IFrameSplitOperator.IsNumber(subItem.Type))chartTitle.ShowPositionConfig.Type=subItem.Type;if(subItem.Margin){if(IFrameSplitOperator.IsNumber(subItem.Margin.Left))chartTitle.ShowPositionConfig.Margin.Left=subItem.Margin.Left;if(IFrameSplitOperator.IsNumber(subItem.Margin.Right))chartTitle.ShowPositionConfig.Margin.Right=subItem.Margin.Right;if(IFrameSplitOperator.IsNumber(subItem.Margin.Bottom))chartTitle.ShowPositionConfig.Margin.Bottom=subItem.Margin.Bottom;}}}//叠加股票
|
|
1178
1178
|
if(option.Overlay){for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];chart.OverlaySymbol(item.Symbol,item);}}if(option.ExtendChart){for(var i=0;i<option.ExtendChart.length;++i){var item=option.ExtendChart[i];chart.CreateExtendChart(item.Name,item);}}//创建子窗口的指标
|
|
1179
1179
|
var scriptData=new JSIndexScript();if(option.ColorIndex)//五彩K线
|
|
@@ -3466,6 +3466,7 @@ this.CustomKLine;//自定义K线, key=date*1000000+time, key={ Color:, DrawType
|
|
|
3466
3466
|
this.DrawKRange={Start:null,End:null};//当前屏K线的索引{ Start: , End:}
|
|
3467
3467
|
this.IsThinAKBar=true;//美国线 柱子是否是线段 (false=柱子)
|
|
3468
3468
|
this.OneLimitBarType=0;//一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
3469
|
+
this.UnchangeBarType=0;//0=使用unchange color 1=和昨收比较
|
|
3469
3470
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;this.HighLowTextConfig={FontName:g_JSChartResource.HighLowText.FontName,MaxSize:g_JSChartResource.HighLowText.MaxSize,MinSize:g_JSChartResource.HighLowText.MinSize,Color:g_JSChartResource.HighLowText.Color,//未用
|
|
3470
3471
|
MaxText:g_JSChartResource.HighLowText.MaxText};this.HLCAreaConfig={HighLineColor:g_JSChartResource.HLCArea.HighLineColor,LowLineColor:g_JSChartResource.HLCArea.LowLineColor,CloseLineColor:g_JSChartResource.HLCArea.CloseLineColor,LineWidth:g_JSChartResource.HLCArea.LineWidth,UpAreaColor:g_JSChartResource.HLCArea.UpAreaColor,DownAreaColor:g_JSChartResource.HLCArea.DownAreaColor//虚线柱子
|
|
3471
3472
|
};this.VirtualBarConfig={Color:g_JSChartResource.VirtualKLine.Color,LineDash:g_JSChartResource.VirtualKLine.LineDash};//DrawType==14 自定义图形
|
|
@@ -3545,12 +3546,14 @@ else this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),ToFixedRect(yClose-y)
|
|
|
3545
3546
|
}else{if(isEmptyBar)//空心柱
|
|
3546
3547
|
{this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(Math.min(y,yClose)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(yClose-y)));this.Canvas.stroke();}else{this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,yClose)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(yClose-y)));}}}if(data.Open>data.Low)//下影线
|
|
3547
3548
|
{this.Canvas.beginPath();if(isHScreen){this.Canvas.moveTo(ToFixedPoint(y),ToFixedPoint(x));this.Canvas.lineTo(ToFixedPoint(yLow),ToFixedPoint(x));}else{if(isEmptyBar){var xFixed=left+dataWidth/2;this.Canvas.moveTo(ToFixedPoint(xFixed),ToFixedPoint(Math.max(yClose,yOpen)));this.Canvas.lineTo(ToFixedPoint(xFixed),ToFixedPoint(yLow));}else{this.Canvas.moveTo(ToFixedPoint(x),ToFixedPoint(y));this.Canvas.lineTo(ToFixedPoint(x),ToFixedPoint(yLow));}}this.Canvas.stroke();}}else{this.Canvas.beginPath();if(isHScreen){this.Canvas.moveTo(yHigh,ToFixedPoint(x));this.Canvas.lineTo(yLow,ToFixedPoint(x));}else{this.Canvas.moveTo(ToFixedPoint(x),yHigh);this.Canvas.lineTo(ToFixedPoint(x),yLow);}this.Canvas.strokeStyle=downColor;this.Canvas.stroke();}};this.DrawKBar_Unchagne=function(data,dataWidth,unchagneColor,drawType,x,y,left,right,yLow,yHigh,yOpen,yClose,isHScreen)//平线
|
|
3548
|
-
{if(this.
|
|
3549
|
+
{if(this.UnchangeBarType==1)//十字星颜色
|
|
3550
|
+
{unchagneColor=this.GetUnchangeBarColor(data);}if(this.OneLimitBarType===1&&this.IsOneLimitBar(data))//一字板
|
|
3549
3551
|
{unchagneColor=this.GetOneLimitBarColor(data);}if(dataWidth>=4){if(dataWidth%2!=0)dataWidth-=1;this.Canvas.strokeStyle=unchagneColor;this.Canvas.beginPath();if(data.High>data.Close)//上影线
|
|
3550
3552
|
{if(isHScreen){this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yOpen,ToFixedPoint(x));}else{var xFixed=ToFixedPoint(left+dataWidth/2);this.Canvas.moveTo(xFixed,y);this.Canvas.lineTo(xFixed,yOpen);}y=yOpen;}else{y=yOpen;}if(isHScreen){this.Canvas.moveTo(ToFixedPoint(y),ToFixedPoint(left));this.Canvas.lineTo(ToFixedPoint(y),ToFixedPoint(right));}else{this.Canvas.moveTo(ToFixedPoint(left),ToFixedPoint(y));this.Canvas.lineTo(ToFixedPoint(left+dataWidth),ToFixedPoint(y));}if(data.Open>data.Low)//下影线
|
|
3551
3553
|
{if(isHScreen){this.Canvas.moveTo(ToFixedPoint(y),ToFixedPoint(x));this.Canvas.lineTo(ToFixedPoint(yLow),ToFixedPoint(x));}else{var xFixed=ToFixedPoint(left+dataWidth/2);this.Canvas.moveTo(xFixed,ToFixedPoint(y));this.Canvas.lineTo(xFixed,ToFixedPoint(yLow));}}this.Canvas.stroke();}else{this.Canvas.beginPath();if(isHScreen){if(data.High==data.Low){this.Canvas.moveTo(yHigh,ToFixedPoint(x));this.Canvas.lineTo(yLow-1,ToFixedPoint(x));}else{this.Canvas.moveTo(yHigh,ToFixedPoint(x));this.Canvas.lineTo(yLow,ToFixedPoint(x));}}else{if(data.High==data.Low){this.Canvas.moveTo(ToFixedPoint(x),yHigh);this.Canvas.lineTo(ToFixedPoint(x),yLow+1);}else{this.Canvas.moveTo(ToFixedPoint(x),yHigh);this.Canvas.lineTo(ToFixedPoint(x),yLow);}}this.Canvas.strokeStyle=unchagneColor;this.Canvas.stroke();}};//是否是一字板
|
|
3552
3554
|
this.IsOneLimitBar=function(kItem){if(kItem.Open==kItem.Close&&kItem.High==kItem.Low&&kItem.Open==kItem.High)return true;return false;};//一字板颜色 和昨收比较
|
|
3553
|
-
this.GetOneLimitBarColor=function(kItem){if(!kItem||!IFrameSplitOperator.IsNumber(kItem.YClose))return this.UnchagneColor;if(kItem.Close>kItem.YClose)return this.UpColor;else if(kItem.Close<kItem.YClose)return this.DownColor;else return this.UnchagneColor;}
|
|
3555
|
+
this.GetOneLimitBarColor=function(kItem){if(!kItem||!IFrameSplitOperator.IsNumber(kItem.YClose))return this.UnchagneColor;if(kItem.Close>kItem.YClose)return this.UpColor;else if(kItem.Close<kItem.YClose)return this.DownColor;else return this.UnchagneColor;};//十字星颜色
|
|
3556
|
+
this.GetUnchangeBarColor=function(kItem){if(!kItem||!IFrameSplitOperator.IsNumber(kItem.YClose))return this.UnchagneColor;if(kItem.Close>kItem.YClose)return this.UpColor;else if(kItem.Close<kItem.YClose)return this.DownColor;else return this.UnchagneColor;};this.DrawKBar_Custom=function(data,dataWidth,barColor,drawType,option,x,y,left,right,yLow,yHigh,yOpen,yClose,border,isHScreen){if(option.BGColor)//画背景色
|
|
3554
3557
|
{this.Canvas.fillStyle=option.BGColor;var distanceWidth=this.ChartFrame.DistanceWidth;if(isHScreen){var yLeft=left-distanceWidth/2;var yRight=right+distanceWidth/2;var xTop=border.RightEx;var xBottom=border.LeftEx;this.Canvas.fillRect(ToFixedRect(xBottom),ToFixedRect(yLeft),ToFixedRect(xTop-xBottom),ToFixedRect(yRight-yLeft));}else{var xLeft=left-distanceWidth/2;var xRight=right+distanceWidth/2;var yTop=border.TopEx;var yBottom=border.BottomEx;this.Canvas.fillRect(ToFixedRect(xLeft),ToFixedRect(yTop),ToFixedRect(xRight-xLeft),ToFixedRect(yBottom-yTop));}}if(dataWidth>=4){this.Canvas.strokeStyle=barColor;if(data.High>data.Close)//上影线
|
|
3555
3558
|
{this.Canvas.beginPath();if(isHScreen){this.Canvas.moveTo(ToFixedPoint(y),ToFixedPoint(x));this.Canvas.lineTo(ToFixedPoint(drawType==3?Math.max(yClose,yOpen):yClose),ToFixedPoint(x));}else{this.Canvas.moveTo(ToFixedPoint(x),ToFixedPoint(y));this.Canvas.lineTo(ToFixedPoint(x),ToFixedPoint(drawType==3?Math.min(yClose,yOpen):yClose));}this.Canvas.stroke();y=yClose;}else{y=yClose;}this.Canvas.fillStyle=barColor;if(isHScreen){if(Math.abs(yOpen-y)<1){this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),1,ToFixedRect(dataWidth));//高度小于1,统一使用高度1
|
|
3556
3559
|
}else{if(drawType==3)//空心柱
|
|
@@ -4074,7 +4077,9 @@ if(bSolidBar){this.Canvas.fillStyle=barColor.Color;this.Canvas.fillRect(yBottom,
|
|
|
4074
4077
|
else barColor=this.GetBarColor(kItem,value);var bUp=barColor.IsUp;this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
|
|
4075
4078
|
this.Canvas.beginPath();this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yBottom,ToFixedPoint(x));this.Canvas.stroke();preKItem=kItem;}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var start=this.Data.DataOffset;if(this.ChartFrame.GlobalOption&&this.ChartFrame.GlobalOption.IsValueFullRange){start=0;xPointCount=this.Data.Data.length;}var range={Min:null,Max:null};for(var i=start,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(!IFrameSplitOperator.IsNumber(range.Max)||range.Max<value)range.Max=value;if(!IFrameSplitOperator.IsNumber(range.Min)||range.Min>value)range.Min=value;}if(range.Max>0&&range.Min>0)range.Min=0;else if(range.Max<0&&range.Min<0)range.Max=0;return range;};this.GetBarColor=function(kItem,value){if(this.BarColorType===1)//更具正负决定柱子颜色
|
|
4076
4079
|
{if(value>=0)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
|
|
4077
|
-
else return{Color:this.DownColor,IsUp:false};}
|
|
4080
|
+
else return{Color:this.DownColor,IsUp:false};}//平盘K线，使用昨收盘比较
|
|
4081
|
+
if(kItem.Close>kItem.Open)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
|
|
4082
|
+
else if(kItem.Close<kItem.Open)return{Color:this.DownColor,IsUp:false};if(kItem.Close>=kItem.YClose)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
|
|
4078
4083
|
else return{Color:this.DownColor,IsUp:false};};//true=实心 false=空心
|
|
4079
4084
|
this.IsSolidBar=function(bUp){var bSolidBar=true;//实心柱子
|
|
4080
4085
|
if(this.BarType===0||this.BarType===1||this.BarType===2){if(this.BarType===0)//空心
|
|
@@ -14345,7 +14350,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
14345
14350
|
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);};}/********************************************************************************
|
|
14346
14351
|
* 版本信息输出
|
|
14347
14352
|
*
|
|
14348
|
-
*/var HQCHART_VERSION="1.1.
|
|
14353
|
+
*/var HQCHART_VERSION="1.1.14470";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();//把给外界调用的方法暴露出来
|
|
14349
14354
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
14350
14355
|
// BaseIndex:BaseIndex,
|
|
14351
14356
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -570,6 +570,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
570
570
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
571
571
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
572
572
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
573
|
+
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
573
574
|
if (item.PriceGap)
|
|
574
575
|
{
|
|
575
576
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -25437,7 +25438,8 @@ function ChartKLine()
|
|
|
25437
25438
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
25438
25439
|
|
|
25439
25440
|
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
25440
|
-
this.OneLimitBarType=0;
|
|
25441
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
25442
|
+
this.UnchangeBarType=0; //0=使用unchange color 1=和昨收比较
|
|
25441
25443
|
|
|
25442
25444
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
25443
25445
|
this.HighLowTextConfig=
|
|
@@ -26584,6 +26586,11 @@ function ChartKLine()
|
|
|
26584
26586
|
|
|
26585
26587
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
26586
26588
|
{
|
|
26589
|
+
if (this.UnchangeBarType==1) //十字星颜色
|
|
26590
|
+
{
|
|
26591
|
+
unchagneColor=this.GetUnchangeBarColor(data);
|
|
26592
|
+
}
|
|
26593
|
+
|
|
26587
26594
|
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
26588
26595
|
{
|
|
26589
26596
|
unchagneColor=this.GetOneLimitBarColor(data);
|
|
@@ -26693,6 +26700,16 @@ function ChartKLine()
|
|
|
26693
26700
|
else return this.UnchagneColor;
|
|
26694
26701
|
}
|
|
26695
26702
|
|
|
26703
|
+
//十字星颜色
|
|
26704
|
+
this.GetUnchangeBarColor=function(kItem)
|
|
26705
|
+
{
|
|
26706
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
26707
|
+
|
|
26708
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
26709
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
26710
|
+
else return this.UnchagneColor
|
|
26711
|
+
}
|
|
26712
|
+
|
|
26696
26713
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
26697
26714
|
{
|
|
26698
26715
|
if (option.BGColor) //画背景色
|
|
@@ -35066,7 +35083,11 @@ function ChartVolStick()
|
|
|
35066
35083
|
else return { Color:this.DownColor, IsUp:false };
|
|
35067
35084
|
}
|
|
35068
35085
|
|
|
35069
|
-
|
|
35086
|
+
//平盘K线，使用昨收盘比较
|
|
35087
|
+
if (kItem.Close>kItem.Open) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
35088
|
+
else if (kItem.Close<kItem.Open) return { Color:this.DownColor, IsUp:false };
|
|
35089
|
+
|
|
35090
|
+
if (kItem.Close>=kItem.YClose) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
35070
35091
|
else return { Color:this.DownColor, IsUp:false };
|
|
35071
35092
|
}
|
|
35072
35093
|
|
|
@@ -4495,6 +4495,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4495
4495
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
4496
4496
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4497
4497
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4498
|
+
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
4498
4499
|
if (item.PriceGap)
|
|
4499
4500
|
{
|
|
4500
4501
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -29362,7 +29363,8 @@ function ChartKLine()
|
|
|
29362
29363
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
29363
29364
|
|
|
29364
29365
|
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
29365
|
-
this.OneLimitBarType=0;
|
|
29366
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
29367
|
+
this.UnchangeBarType=0; //0=使用unchange color 1=和昨收比较
|
|
29366
29368
|
|
|
29367
29369
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
29368
29370
|
this.HighLowTextConfig=
|
|
@@ -30509,6 +30511,11 @@ function ChartKLine()
|
|
|
30509
30511
|
|
|
30510
30512
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
30511
30513
|
{
|
|
30514
|
+
if (this.UnchangeBarType==1) //十字星颜色
|
|
30515
|
+
{
|
|
30516
|
+
unchagneColor=this.GetUnchangeBarColor(data);
|
|
30517
|
+
}
|
|
30518
|
+
|
|
30512
30519
|
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
30513
30520
|
{
|
|
30514
30521
|
unchagneColor=this.GetOneLimitBarColor(data);
|
|
@@ -30618,6 +30625,16 @@ function ChartKLine()
|
|
|
30618
30625
|
else return this.UnchagneColor;
|
|
30619
30626
|
}
|
|
30620
30627
|
|
|
30628
|
+
//十字星颜色
|
|
30629
|
+
this.GetUnchangeBarColor=function(kItem)
|
|
30630
|
+
{
|
|
30631
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
30632
|
+
|
|
30633
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
30634
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
30635
|
+
else return this.UnchagneColor
|
|
30636
|
+
}
|
|
30637
|
+
|
|
30621
30638
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
30622
30639
|
{
|
|
30623
30640
|
if (option.BGColor) //画背景色
|
|
@@ -38991,7 +39008,11 @@ function ChartVolStick()
|
|
|
38991
39008
|
else return { Color:this.DownColor, IsUp:false };
|
|
38992
39009
|
}
|
|
38993
39010
|
|
|
38994
|
-
|
|
39011
|
+
//平盘K线，使用昨收盘比较
|
|
39012
|
+
if (kItem.Close>kItem.Open) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
39013
|
+
else if (kItem.Close<kItem.Open) return { Color:this.DownColor, IsUp:false };
|
|
39014
|
+
|
|
39015
|
+
if (kItem.Close>=kItem.YClose) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
38995
39016
|
else return { Color:this.DownColor, IsUp:false };
|
|
38996
39017
|
}
|
|
38997
39018
|
|
|
@@ -143684,7 +143705,7 @@ function ScrollBarBGChart()
|
|
|
143684
143705
|
|
|
143685
143706
|
|
|
143686
143707
|
|
|
143687
|
-
var HQCHART_VERSION="1.1.
|
|
143708
|
+
var HQCHART_VERSION="1.1.14470";
|
|
143688
143709
|
|
|
143689
143710
|
function PrintHQChartVersion()
|
|
143690
143711
|
{
|
|
@@ -4539,6 +4539,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4539
4539
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
4540
4540
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4541
4541
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4542
|
+
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
4542
4543
|
if (item.PriceGap)
|
|
4543
4544
|
{
|
|
4544
4545
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -29406,7 +29407,8 @@ function ChartKLine()
|
|
|
29406
29407
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
29407
29408
|
|
|
29408
29409
|
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
29409
|
-
this.OneLimitBarType=0;
|
|
29410
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
29411
|
+
this.UnchangeBarType=0; //0=使用unchange color 1=和昨收比较
|
|
29410
29412
|
|
|
29411
29413
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
29412
29414
|
this.HighLowTextConfig=
|
|
@@ -30553,6 +30555,11 @@ function ChartKLine()
|
|
|
30553
30555
|
|
|
30554
30556
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
30555
30557
|
{
|
|
30558
|
+
if (this.UnchangeBarType==1) //十字星颜色
|
|
30559
|
+
{
|
|
30560
|
+
unchagneColor=this.GetUnchangeBarColor(data);
|
|
30561
|
+
}
|
|
30562
|
+
|
|
30556
30563
|
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
30557
30564
|
{
|
|
30558
30565
|
unchagneColor=this.GetOneLimitBarColor(data);
|
|
@@ -30662,6 +30669,16 @@ function ChartKLine()
|
|
|
30662
30669
|
else return this.UnchagneColor;
|
|
30663
30670
|
}
|
|
30664
30671
|
|
|
30672
|
+
//十字星颜色
|
|
30673
|
+
this.GetUnchangeBarColor=function(kItem)
|
|
30674
|
+
{
|
|
30675
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
30676
|
+
|
|
30677
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
30678
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
30679
|
+
else return this.UnchagneColor
|
|
30680
|
+
}
|
|
30681
|
+
|
|
30665
30682
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
30666
30683
|
{
|
|
30667
30684
|
if (option.BGColor) //画背景色
|
|
@@ -39035,7 +39052,11 @@ function ChartVolStick()
|
|
|
39035
39052
|
else return { Color:this.DownColor, IsUp:false };
|
|
39036
39053
|
}
|
|
39037
39054
|
|
|
39038
|
-
|
|
39055
|
+
//平盘K线，使用昨收盘比较
|
|
39056
|
+
if (kItem.Close>kItem.Open) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
39057
|
+
else if (kItem.Close<kItem.Open) return { Color:this.DownColor, IsUp:false };
|
|
39058
|
+
|
|
39059
|
+
if (kItem.Close>=kItem.YClose) return { Color:this.UpColor, IsUp:true }; //颜色, 是否是上涨
|
|
39039
39060
|
else return { Color:this.DownColor, IsUp:false };
|
|
39040
39061
|
}
|
|
39041
39062
|
|
|
@@ -153496,7 +153517,7 @@ function HQChartScriptWorker()
|
|
|
153496
153517
|
|
|
153497
153518
|
|
|
153498
153519
|
|
|
153499
|
-
var HQCHART_VERSION="1.1.
|
|
153520
|
+
var HQCHART_VERSION="1.1.14470";
|
|
153500
153521
|
|
|
153501
153522
|
function PrintHQChartVersion()
|
|
153502
153523
|
{
|