hqchart 1.1.13698 → 1.1.13705
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.NetworkFilterTest.vue.js +1 -1
- package/lib/umychart.vue.js +8 -4
- package/package.json +1 -1
- package/src/jscommon/umychart.NetworkFilterTest.js +3 -3
- package/src/jscommon/umychart.js +25 -1
- package/src/jscommon/umychart.testdata/60000.sh.day.kline.js +3 -3
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +26 -2
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +3 -3
- package/src/jscommon/umychart.vue/umychart.vue.js +26 -2
package/lib/umychart.vue.js
CHANGED
|
@@ -1177,7 +1177,7 @@ option.CorssCursor={};option.CorssCursor.TitleHeight=chart.ChartCorssCursor.Text
|
|
|
1177
1177
|
}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;//显示右边刻度
|
|
1178
1178
|
}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;//反转坐标
|
|
1179
1179
|
if(IFrameSplitOperator.IsNumber(item.PercentageTextFormat))subFrame.YSplitOperator.PercentageTextFormat=item.PercentageTextFormat;//百分比坐标格式
|
|
1180
|
-
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(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;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;}//叠加股票
|
|
1180
|
+
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;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;}//叠加股票
|
|
1181
1181
|
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);}}//创建子窗口的指标
|
|
1182
1182
|
var scriptData=new JSIndexScript();if(option.ColorIndex)//五彩K线
|
|
1183
1183
|
{var item=option.ColorIndex;var indexInfo=scriptData.Get(item.Index);if(indexInfo){indexInfo.ID=item.Index;chart.ColorIndex=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
|
|
@@ -3334,6 +3334,7 @@ this.ShowRange={};//K线显示范围 { Start:, End:, DataCount:, ShowCount: }
|
|
|
3334
3334
|
this.CustomKLine;//自定义K线, key=date*1000000+time, key={ Color:, DrawType: }
|
|
3335
3335
|
this.DrawKRange={Start:null,End:null};//当前屏K线的索引{ Start: , End:}
|
|
3336
3336
|
this.IsThinAKBar=true;//美国线 柱子是否是线段 (false=柱子)
|
|
3337
|
+
this.OneLimitBarType=0;//一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
3337
3338
|
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,//未用
|
|
3338
3339
|
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//虚线柱子
|
|
3339
3340
|
};this.VirtualBarConfig={Color:g_JSChartResource.VirtualKLine.Color,LineDash:g_JSChartResource.VirtualKLine.LineDash};//DrawType==14 自定义图形
|
|
@@ -3410,9 +3411,12 @@ else this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),ToFixedRect(yClose-y)
|
|
|
3410
3411
|
}else{if(isEmptyBar)//空心柱
|
|
3411
3412
|
{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)//下影线
|
|
3412
3413
|
{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)//平线
|
|
3413
|
-
{if(
|
|
3414
|
+
{if(this.OneLimitBarType===1&&this.IsOneLimitBar(data))//一字板
|
|
3415
|
+
{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)//上影线
|
|
3414
3416
|
{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)//下影线
|
|
3415
|
-
{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();}}
|
|
3417
|
+
{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();}};//是否是一字板
|
|
3418
|
+
this.IsOneLimitBar=function(kItem){if(kItem.Open==kItem.Close&&kItem.High==kItem.Low&&kItem.Open==kItem.High)return true;return false;};//一字板颜色 和昨收比较
|
|
3419
|
+
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;};this.DrawKBar_Custom=function(data,dataWidth,barColor,drawType,option,x,y,left,right,yLow,yHigh,yOpen,yClose,border,isHScreen){if(option.BGColor)//画背景色
|
|
3416
3420
|
{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)//上影线
|
|
3417
3421
|
{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
|
|
3418
3422
|
}else{if(drawType==3)//空心柱
|
|
@@ -13734,7 +13738,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13734
13738
|
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);};}/********************************************************************************
|
|
13735
13739
|
* 版本信息输出
|
|
13736
13740
|
*
|
|
13737
|
-
*/var HQCHART_VERSION="1.1.
|
|
13741
|
+
*/var HQCHART_VERSION="1.1.13704";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();//把给外界调用的方法暴露出来
|
|
13738
13742
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13739
13743
|
// BaseIndex:BaseIndex,
|
|
13740
13744
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -43229,10 +43229,10 @@ var KLINE_CAPITAL_DATA={
|
|
|
43229
43229
|
[
|
|
43230
43230
|
20230821,
|
|
43231
43231
|
7.07,
|
|
43232
|
-
7.06,
|
|
43233
43232
|
7.11,
|
|
43234
|
-
|
|
43235
|
-
|
|
43233
|
+
7.11,
|
|
43234
|
+
7.11,
|
|
43235
|
+
7.11,
|
|
43236
43236
|
42517681,
|
|
43237
43237
|
298419531
|
|
43238
43238
|
],
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -571,6 +571,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
571
571
|
if (option.KLine.ShowKLine == false) klineChart.IsShow = false;
|
|
572
572
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
573
573
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
574
|
+
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
574
575
|
if (item.PriceGap)
|
|
575
576
|
{
|
|
576
577
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -23922,7 +23923,8 @@ function ChartKLine()
|
|
|
23922
23923
|
this.CustomKLine; //自定义K线, key=date*1000000+time, key={ Color:, DrawType: }
|
|
23923
23924
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
23924
23925
|
|
|
23925
|
-
this.IsThinAKBar=true;
|
|
23926
|
+
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
23927
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
23926
23928
|
|
|
23927
23929
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
23928
23930
|
this.HighLowTextConfig=
|
|
@@ -25020,6 +25022,11 @@ function ChartKLine()
|
|
|
25020
25022
|
|
|
25021
25023
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
25022
25024
|
{
|
|
25025
|
+
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
25026
|
+
{
|
|
25027
|
+
unchagneColor=this.GetOneLimitBarColor(data);
|
|
25028
|
+
}
|
|
25029
|
+
|
|
25023
25030
|
if (dataWidth>=4)
|
|
25024
25031
|
{
|
|
25025
25032
|
if ((dataWidth%2)!=0) dataWidth-=1;
|
|
@@ -25107,6 +25114,23 @@ function ChartKLine()
|
|
|
25107
25114
|
}
|
|
25108
25115
|
}
|
|
25109
25116
|
|
|
25117
|
+
//是否是一字板
|
|
25118
|
+
this.IsOneLimitBar=function(kItem)
|
|
25119
|
+
{
|
|
25120
|
+
if (kItem.Open==kItem.Close && kItem.High==kItem.Low && kItem.Open==kItem.High) return true;
|
|
25121
|
+
return false;
|
|
25122
|
+
}
|
|
25123
|
+
|
|
25124
|
+
//一字板颜色 和昨收比较
|
|
25125
|
+
this.GetOneLimitBarColor=function(kItem)
|
|
25126
|
+
{
|
|
25127
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
25128
|
+
|
|
25129
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
25130
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
25131
|
+
else return this.UnchagneColor;
|
|
25132
|
+
}
|
|
25133
|
+
|
|
25110
25134
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
25111
25135
|
{
|
|
25112
25136
|
if (option.BGColor) //画背景色
|
|
@@ -29943,10 +29943,10 @@ var KLINE_DAY_DATA={
|
|
|
29943
29943
|
[
|
|
29944
29944
|
20230821,
|
|
29945
29945
|
7.07,
|
|
29946
|
-
7.06,
|
|
29947
29946
|
7.11,
|
|
29948
|
-
|
|
29949
|
-
|
|
29947
|
+
7.11,
|
|
29948
|
+
7.11,
|
|
29949
|
+
7.11,
|
|
29950
29950
|
42517681,
|
|
29951
29951
|
298419531
|
|
29952
29952
|
],
|
|
@@ -4496,6 +4496,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4496
4496
|
if (option.KLine.ShowKLine == false) klineChart.IsShow = false;
|
|
4497
4497
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
4498
4498
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4499
|
+
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4499
4500
|
if (item.PriceGap)
|
|
4500
4501
|
{
|
|
4501
4502
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -27847,7 +27848,8 @@ function ChartKLine()
|
|
|
27847
27848
|
this.CustomKLine; //自定义K线, key=date*1000000+time, key={ Color:, DrawType: }
|
|
27848
27849
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
27849
27850
|
|
|
27850
|
-
this.IsThinAKBar=true;
|
|
27851
|
+
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
27852
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
27851
27853
|
|
|
27852
27854
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
27853
27855
|
this.HighLowTextConfig=
|
|
@@ -28945,6 +28947,11 @@ function ChartKLine()
|
|
|
28945
28947
|
|
|
28946
28948
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
28947
28949
|
{
|
|
28950
|
+
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
28951
|
+
{
|
|
28952
|
+
unchagneColor=this.GetOneLimitBarColor(data);
|
|
28953
|
+
}
|
|
28954
|
+
|
|
28948
28955
|
if (dataWidth>=4)
|
|
28949
28956
|
{
|
|
28950
28957
|
if ((dataWidth%2)!=0) dataWidth-=1;
|
|
@@ -29032,6 +29039,23 @@ function ChartKLine()
|
|
|
29032
29039
|
}
|
|
29033
29040
|
}
|
|
29034
29041
|
|
|
29042
|
+
//是否是一字板
|
|
29043
|
+
this.IsOneLimitBar=function(kItem)
|
|
29044
|
+
{
|
|
29045
|
+
if (kItem.Open==kItem.Close && kItem.High==kItem.Low && kItem.Open==kItem.High) return true;
|
|
29046
|
+
return false;
|
|
29047
|
+
}
|
|
29048
|
+
|
|
29049
|
+
//一字板颜色 和昨收比较
|
|
29050
|
+
this.GetOneLimitBarColor=function(kItem)
|
|
29051
|
+
{
|
|
29052
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
29053
|
+
|
|
29054
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
29055
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
29056
|
+
else return this.UnchagneColor;
|
|
29057
|
+
}
|
|
29058
|
+
|
|
29035
29059
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
29036
29060
|
{
|
|
29037
29061
|
if (option.BGColor) //画背景色
|
|
@@ -137751,7 +137775,7 @@ function ScrollBarBGChart()
|
|
|
137751
137775
|
|
|
137752
137776
|
|
|
137753
137777
|
|
|
137754
|
-
var HQCHART_VERSION="1.1.
|
|
137778
|
+
var HQCHART_VERSION="1.1.13704";
|
|
137755
137779
|
|
|
137756
137780
|
function PrintHQChartVersion()
|
|
137757
137781
|
{
|
|
@@ -43229,10 +43229,10 @@ var KLINE_CAPITAL_DATA={
|
|
|
43229
43229
|
[
|
|
43230
43230
|
20230821,
|
|
43231
43231
|
7.07,
|
|
43232
|
-
7.06,
|
|
43233
43232
|
7.11,
|
|
43234
|
-
|
|
43235
|
-
|
|
43233
|
+
7.11,
|
|
43234
|
+
7.11,
|
|
43235
|
+
7.11,
|
|
43236
43236
|
42517681,
|
|
43237
43237
|
298419531
|
|
43238
43238
|
],
|
|
@@ -4540,6 +4540,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4540
4540
|
if (option.KLine.ShowKLine == false) klineChart.IsShow = false;
|
|
4541
4541
|
if (option.KLine.InfoPosition>0) klineChart.InfoPosition=option.KLine.InfoPosition;
|
|
4542
4542
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4543
|
+
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4543
4544
|
if (item.PriceGap)
|
|
4544
4545
|
{
|
|
4545
4546
|
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
@@ -27891,7 +27892,8 @@ function ChartKLine()
|
|
|
27891
27892
|
this.CustomKLine; //自定义K线, key=date*1000000+time, key={ Color:, DrawType: }
|
|
27892
27893
|
this.DrawKRange={ Start:null, End:null }; //当前屏K线的索引{ Start: , End:}
|
|
27893
27894
|
|
|
27894
|
-
this.IsThinAKBar=true;
|
|
27895
|
+
this.IsThinAKBar=true; //美国线 柱子是否是线段 (false=柱子)
|
|
27896
|
+
this.OneLimitBarType=0; //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
|
|
27895
27897
|
|
|
27896
27898
|
this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
|
|
27897
27899
|
this.HighLowTextConfig=
|
|
@@ -28989,6 +28991,11 @@ function ChartKLine()
|
|
|
28989
28991
|
|
|
28990
28992
|
this.DrawKBar_Unchagne=function(data, dataWidth, unchagneColor, drawType, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen) //平线
|
|
28991
28993
|
{
|
|
28994
|
+
if (this.OneLimitBarType===1&& this.IsOneLimitBar(data)) //一字板
|
|
28995
|
+
{
|
|
28996
|
+
unchagneColor=this.GetOneLimitBarColor(data);
|
|
28997
|
+
}
|
|
28998
|
+
|
|
28992
28999
|
if (dataWidth>=4)
|
|
28993
29000
|
{
|
|
28994
29001
|
if ((dataWidth%2)!=0) dataWidth-=1;
|
|
@@ -29076,6 +29083,23 @@ function ChartKLine()
|
|
|
29076
29083
|
}
|
|
29077
29084
|
}
|
|
29078
29085
|
|
|
29086
|
+
//是否是一字板
|
|
29087
|
+
this.IsOneLimitBar=function(kItem)
|
|
29088
|
+
{
|
|
29089
|
+
if (kItem.Open==kItem.Close && kItem.High==kItem.Low && kItem.Open==kItem.High) return true;
|
|
29090
|
+
return false;
|
|
29091
|
+
}
|
|
29092
|
+
|
|
29093
|
+
//一字板颜色 和昨收比较
|
|
29094
|
+
this.GetOneLimitBarColor=function(kItem)
|
|
29095
|
+
{
|
|
29096
|
+
if (!kItem || !IFrameSplitOperator.IsNumber(kItem.YClose)) return this.UnchagneColor;
|
|
29097
|
+
|
|
29098
|
+
if (kItem.Close>kItem.YClose) return this.UpColor;
|
|
29099
|
+
else if (kItem.Close<kItem.YClose) return this.DownColor;
|
|
29100
|
+
else return this.UnchagneColor;
|
|
29101
|
+
}
|
|
29102
|
+
|
|
29079
29103
|
this.DrawKBar_Custom=function(data, dataWidth, barColor, drawType, option, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen)
|
|
29080
29104
|
{
|
|
29081
29105
|
if (option.BGColor) //画背景色
|
|
@@ -142267,7 +142291,7 @@ function HQChartScriptWorker()
|
|
|
142267
142291
|
|
|
142268
142292
|
|
|
142269
142293
|
|
|
142270
|
-
var HQCHART_VERSION="1.1.
|
|
142294
|
+
var HQCHART_VERSION="1.1.13704";
|
|
142271
142295
|
|
|
142272
142296
|
function PrintHQChartVersion()
|
|
142273
142297
|
{
|