hqchart 1.1.15076 → 1.1.15080
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 +6 -4
- package/package.json +1 -1
- package/src/jscommon/umychart.complier.js +1 -1
- package/src/jscommon/umychart.js +4 -2
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +6 -4
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +6 -4
package/lib/umychart.vue.js
CHANGED
|
@@ -2594,6 +2594,7 @@ this.SetLock=function(lockData){if(!lockData)//空数据不上锁
|
|
|
2594
2594
|
{this.IsLocked=false;return;}this.IsLocked=true;if(!this.LockPaint)this.LockPaint=g_ChartPaintFactory.Create("ChartLock");//new ChartLock(); //创建锁
|
|
2595
2595
|
if(lockData.Callback)this.LockPaint.Callback=lockData.Callback;//回调
|
|
2596
2596
|
if(lockData.IndexName)this.LockPaint.IndexName=lockData.IndexName;//指标名字
|
|
2597
|
+
if(lockData.IndexID)this.LockPaint.IndexID=lockData.IndexID;//指标ID
|
|
2597
2598
|
if(lockData.ID)this.LockPaint.LockID=lockData.ID;//锁ID
|
|
2598
2599
|
if(lockData.BG)this.LockPaint.BGColor=lockData.BG;//背景色
|
|
2599
2600
|
if(lockData.Text)this.LockPaint.Title=lockData.Text;if(lockData.TextColor)this.LockPaint.TextColor=lockData.TextColor;if(lockData.Font)this.LockPaint.Font=lockData.Font;if(lockData.Count)this.LockPaint.LockCount=lockData.Count;if(lockData.MinWidth>0)this.LockPaint.MinWidth=lockData.MinWidth;};this.GetLockRect=function(){if(!this.IsLocked)return null;if(!this.LockPaint)return null;return this.LockPaint.LockRect;};this.ReloadResource=function(resource){if(!resource){this.PenBorder=g_JSChartResource.FrameBorderPen;//边框颜色
|
|
@@ -4864,13 +4865,14 @@ this.BGColor=g_JSChartResource.IndexLock.BGColor;this.TextColor=g_JSChartResourc
|
|
|
4864
4865
|
this.LockID;//锁ID
|
|
4865
4866
|
this.Callback;//回调
|
|
4866
4867
|
this.IndexName;//指标名字
|
|
4868
|
+
this.IndexID;//指标ID
|
|
4867
4869
|
this.MinWidth=null;//最小宽度
|
|
4868
4870
|
this.Draw=function(isDraw){this.LockRect=null;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw(isDraw);return;}var xOffset=this.ChartBorder.GetRight();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetLeft())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();var lHeight=this.ChartBorder.GetBottom()-this.ChartBorder.GetTop();var lWidth=this.ChartBorder.GetRight()-lLeft;if(this.MinWidth>10&&lWidth<this.MinWidth){lWidth=this.MinWidth;lLeft=this.ChartBorder.GetRight()-lWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();}if(isDraw){var rtBG={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Height:lHeight};rtBG.Right=rtBG.Width+rtBG.Left;rtBG.Bottom=rtBG.Height+rtBG.Top;//上下渐变
|
|
4869
4871
|
var bgColor=this.SetFillStyle(this.BGColor,rtBG.Left,rtBG.Top,rtBG.Left,rtBG.Bottom);this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);var xCenter=rtBG.Left+rtBG.Width/2;var yCenter=rtBG.Top+lHeight/2;this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,xCenter,yCenter);}this.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};//保存上锁区域
|
|
4870
4872
|
};this.HScreenDraw=function(isDraw){var xOffset=this.ChartBorder.GetBottom();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetBottom();var xPointCount=this.ChartFrame.XPointCount;//求最后1个数据的位置
|
|
4871
4873
|
for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetTop())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetTop())lLeft=this.ChartBorder.GetTop();var lHeight=this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();var lWidth=this.ChartBorder.GetBottom()-lLeft;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(this.ChartBorder.GetLeft(),lLeft,lHeight,lWidth);var xCenter=this.ChartBorder.GetLeft()+lHeight/2;var yCenter=lLeft+lWidth/2;this.Canvas.save();this.Canvas.translate(xCenter,yCenter);this.Canvas.rotate(90*Math.PI/180);this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,0,0);this.Canvas.restore();this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth};//保存上锁区域
|
|
4872
4874
|
};//x,y是否在上锁区域
|
|
4873
|
-
this.GetTooltipData=function(x,y,tooltip){if(this.LockRect==null)return false;this.Canvas.beginPath();this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);if(this.Canvas.isPointInPath(x,y)){tooltip.Data={ID:this.LockID,Callback:this.Callback,IndexName:this.IndexName};tooltip.ChartPaint=this;return true;}return false;};}//买卖盘
|
|
4875
|
+
this.GetTooltipData=function(x,y,tooltip){if(this.LockRect==null)return false;this.Canvas.beginPath();this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);if(this.Canvas.isPointInPath(x,y)){tooltip.Data={ID:this.LockID,Callback:this.Callback,IndexName:this.IndexName,IndexID:this.IndexID};tooltip.ChartPaint=this;return true;}return false;};}//买卖盘
|
|
4874
4876
|
function ChartBuySell(){this.newMethod=ChartSingleText;//派生
|
|
4875
4877
|
this.newMethod();delete this.newMethod;this.ClassName="ChartBuySell";this.TextFont=g_JSChartResource.KLineTrain.Font;//"bold 14px arial"; //买卖信息字体
|
|
4876
4878
|
this.LastDataIcon=g_JSChartResource.KLineTrain.LastDataIcon;//{Color:'rgb(0,0,205)',Text:'↓'};
|
|
@@ -6263,7 +6265,7 @@ var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);//国内期货, 纽约
|
|
|
6263
6265
|
var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);var item=data.Data;var isLastOne=data.IsLastOne;var aryText=[];//{Color:, Text: }
|
|
6264
6266
|
if(this.IsShowName)aryText.push({Text:this.Name,Color:this.NameColor});if(this.IsShowDate||this.IsShowTime){var bShowUpdateTime=false;//是否显示了更新时间
|
|
6265
6267
|
if(isLastOne&&this.ShowLastDataFormat==1){if(this.Data&&this.Data.UpdateTime&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date)&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time)){var text=IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time,"HH:MM:SS");aryText.push({Text:text,Color:this.DateTimeColor});bShowUpdateTime=true;}}if(!bShowUpdateTime){if(this.TimeFormat)//指定时间格式
|
|
6266
|
-
{var strDate=null,strTime=null,text=null;if(this.IsShowDate)strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD"
|
|
6268
|
+
{var strDate=null,strTime=null,text=null;if(this.IsShowDate)strDate=IFrameSplitOperator.FormatDateString(item.Date,"YYYY-MM-DD");if(this.IsShowTime)strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);if(strDate&&strTime)text=strDate+' '+strTime;else if(strDate)text=strDate;else if(strTime)text=strTime;if(text)aryText.push({Text:text,Color:this.DateTimeColor});}else{var text=IFrameSplitOperator.FormatDateTimeString(item.DateTime,this.IsShowDate,this.IsShowTime);aryText.push({Text:text,Color:this.DateTimeColor});}}}var close=item.Close;var increase=item.Increase;var vol=item.Vol;var amount=item.Amount;var yClose=item.YClose;if(!IFrameSplitOperator.IsNumber(yClose))yClose=this.YClose;if(isFutures&&IFrameSplitOperator.IsNumber(item.YClearing))yClose=item.YClearing;//期货使用昨结算
|
|
6267
6269
|
if(IFrameSplitOperator.IsNumber(close)){var color=this.GetColor(close,yClose);var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(increase)){var color=this.GetColor(increase,0);var text=g_JSChartLocalization.GetText('MTitle-Increase',this.LanguageID)+increase.toFixed(2)+'%';aryText.push({Text:text,Color:color});}var isShowAvPrice=true;var upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsET(upperSymbol)&&!MARKET_SUFFIX_NAME.IsETShowAvPrice(upperSymbol))isShowAvPrice=false;else if(MARKET_SUFFIX_NAME.IsShowAvPrice&&!MARKET_SUFFIX_NAME.IsShowAvPrice(upperSymbol))isShowAvPrice=false;if(IFrameSplitOperator.IsNumber(item.AvPrice)&&isShowAvPrice&&this.IsShowAveragePrice){var color=this.GetColor(item.AvPrice,yClose);var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(vol)){var text=g_JSChartLocalization.GetText('MTitle-Vol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(vol/unit,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(IFrameSplitOperator.IsNumber(amount)){var text=g_JSChartLocalization.GetText('MTitle-Amount',this.LanguageID)+IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);aryText.push({Text:text,Color:this.AmountColor});}if(IFrameSplitOperator.IsNumber(item.Position)){var text=g_JSChartLocalization.GetText('MTitle-Position',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Position,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(isLastOne&&this.ShowLastDataFormat==0)//显示数据最后的更新时间
|
|
6268
6270
|
{if(this.Data&&this.Data.UpdateTime&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date)&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time)){var text=g_JSChartLocalization.GetText('MTitle-UpdateTime',this.LanguageID)+IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time,"HH:MM:SS");aryText.push({Text:text,Color:this.DateTimeColor});}}//叠加股票的名字
|
|
6269
6271
|
if(IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)){for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;var clrText=item.Color;var text='['+item.Title+']';aryText.push({Text:text,Color:clrText});}}return{AryText:aryText};};this.DrawItem=function(item,isLastOne)//isLastOne 是否是最后一个数据
|
|
@@ -12491,7 +12493,7 @@ this.ShowConditionError=function(param,msg){var hqChart=param.HQChart;var window
|
|
|
12491
12493
|
hqChart.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
12492
12494
|
hqChart.Draw();};this.RecvResultData=function(outVar,param){var hqChart=param.HQChart;var windowIndex=param.WindowIndex;var hisData=param.HistoryData;param.Self.OutVar=outVar;param.Self.BindData(hqChart,windowIndex,hisData);if(param.Self.IsLocked==false)//不上锁
|
|
12493
12495
|
{param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(null);}else//上锁
|
|
12494
|
-
{var lockData={IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,ID:param.Self.LockID,BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor,Font:param.Self.LockFont,Count:param.Self.LockCount,MinWidth:param.Self.LockMinWidth};param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);}param.HQChart.UpdataDataoffset();//更新数据偏移
|
|
12496
|
+
{var lockData={IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,IndexID:param.Self.ID,ID:param.Self.LockID,BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor,Font:param.Self.LockFont,Count:param.Self.LockCount,MinWidth:param.Self.LockMinWidth};param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);}param.HQChart.UpdataDataoffset();//更新数据偏移
|
|
12495
12497
|
param.HQChart.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
12496
12498
|
if(param.Self.IsSync===false)//异步需要马上刷新，同步主图数据更新的时候会刷新的
|
|
12497
12499
|
param.HQChart.Draw();if(hqChart.GetIndexEvent){var event=hqChart.GetIndexEvent();//指标计算完成回调
|
|
@@ -15338,7 +15340,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15338
15340
|
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);};}/********************************************************************************
|
|
15339
15341
|
* 版本信息输出
|
|
15340
15342
|
*
|
|
15341
|
-
*/var HQCHART_VERSION="1.1.
|
|
15343
|
+
*/var HQCHART_VERSION="1.1.15079";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();//把给外界调用的方法暴露出来
|
|
15342
15344
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15343
15345
|
// BaseIndex:BaseIndex,
|
|
15344
15346
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -20679,7 +20679,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
20679
20679
|
}
|
|
20680
20680
|
else //上锁
|
|
20681
20681
|
{
|
|
20682
|
-
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name
|
|
20682
|
+
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,IndexID:param.Self.ID, ID:param.Self.LockID,
|
|
20683
20683
|
BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor, Font:param.Self.LockFont, Count:param.Self.LockCount, MinWidth:param.Self.LockMinWidth };
|
|
20684
20684
|
param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);
|
|
20685
20685
|
}
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -13448,6 +13448,7 @@ function IChartFramePainting()
|
|
|
13448
13448
|
|
|
13449
13449
|
if (lockData.Callback) this.LockPaint.Callback=lockData.Callback; //回调
|
|
13450
13450
|
if (lockData.IndexName) this.LockPaint.IndexName=lockData.IndexName; //指标名字
|
|
13451
|
+
if (lockData.IndexID) this.LockPaint.IndexID=lockData.IndexID; //指标ID
|
|
13451
13452
|
if (lockData.ID) this.LockPaint.LockID=lockData.ID; //锁ID
|
|
13452
13453
|
if (lockData.BG) this.LockPaint.BGColor=lockData.BG; //背景色
|
|
13453
13454
|
if (lockData.Text) this.LockPaint.Title= lockData.Text;
|
|
@@ -47718,6 +47719,7 @@ function ChartLock()
|
|
|
47718
47719
|
this.LockID; //锁ID
|
|
47719
47720
|
this.Callback; //回调
|
|
47720
47721
|
this.IndexName; //指标名字
|
|
47722
|
+
this.IndexID; //指标ID
|
|
47721
47723
|
this.MinWidth=null; //最小宽度
|
|
47722
47724
|
|
|
47723
47725
|
this.Draw=function(isDraw)
|
|
@@ -47856,7 +47858,7 @@ function ChartLock()
|
|
|
47856
47858
|
this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);
|
|
47857
47859
|
if (this.Canvas.isPointInPath(x,y))
|
|
47858
47860
|
{
|
|
47859
|
-
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName };
|
|
47861
|
+
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
|
|
47860
47862
|
tooltip.ChartPaint=this;
|
|
47861
47863
|
return true;
|
|
47862
47864
|
}
|
|
@@ -61759,7 +61761,7 @@ function DynamicMinuteTitlePainting()
|
|
|
61759
61761
|
if (this.TimeFormat) //指定时间格式
|
|
61760
61762
|
{
|
|
61761
61763
|
var strDate=null, strTime=null, text=null;
|
|
61762
|
-
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD"
|
|
61764
|
+
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString(item.Date, "YYYY-MM-DD");
|
|
61763
61765
|
if (this.IsShowTime) strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);
|
|
61764
61766
|
if (strDate && strTime) text=`${strDate} ${strTime}`;
|
|
61765
61767
|
else if (strDate) text=strDate;
|
|
@@ -17544,6 +17544,7 @@ function IChartFramePainting()
|
|
|
17544
17544
|
|
|
17545
17545
|
if (lockData.Callback) this.LockPaint.Callback=lockData.Callback; //回调
|
|
17546
17546
|
if (lockData.IndexName) this.LockPaint.IndexName=lockData.IndexName; //指标名字
|
|
17547
|
+
if (lockData.IndexID) this.LockPaint.IndexID=lockData.IndexID; //指标ID
|
|
17547
17548
|
if (lockData.ID) this.LockPaint.LockID=lockData.ID; //锁ID
|
|
17548
17549
|
if (lockData.BG) this.LockPaint.BGColor=lockData.BG; //背景色
|
|
17549
17550
|
if (lockData.Text) this.LockPaint.Title= lockData.Text;
|
|
@@ -51814,6 +51815,7 @@ function ChartLock()
|
|
|
51814
51815
|
this.LockID; //锁ID
|
|
51815
51816
|
this.Callback; //回调
|
|
51816
51817
|
this.IndexName; //指标名字
|
|
51818
|
+
this.IndexID; //指标ID
|
|
51817
51819
|
this.MinWidth=null; //最小宽度
|
|
51818
51820
|
|
|
51819
51821
|
this.Draw=function(isDraw)
|
|
@@ -51952,7 +51954,7 @@ function ChartLock()
|
|
|
51952
51954
|
this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);
|
|
51953
51955
|
if (this.Canvas.isPointInPath(x,y))
|
|
51954
51956
|
{
|
|
51955
|
-
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName };
|
|
51957
|
+
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
|
|
51956
51958
|
tooltip.ChartPaint=this;
|
|
51957
51959
|
return true;
|
|
51958
51960
|
}
|
|
@@ -65855,7 +65857,7 @@ function DynamicMinuteTitlePainting()
|
|
|
65855
65857
|
if (this.TimeFormat) //指定时间格式
|
|
65856
65858
|
{
|
|
65857
65859
|
var strDate=null, strTime=null, text=null;
|
|
65858
|
-
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD"
|
|
65860
|
+
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString(item.Date, "YYYY-MM-DD");
|
|
65859
65861
|
if (this.IsShowTime) strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);
|
|
65860
65862
|
if (strDate && strTime) text=`${strDate} ${strTime}`;
|
|
65861
65863
|
else if (strDate) text=strDate;
|
|
@@ -130426,7 +130428,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
130426
130428
|
}
|
|
130427
130429
|
else //上锁
|
|
130428
130430
|
{
|
|
130429
|
-
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name
|
|
130431
|
+
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,IndexID:param.Self.ID, ID:param.Self.LockID,
|
|
130430
130432
|
BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor, Font:param.Self.LockFont, Count:param.Self.LockCount, MinWidth:param.Self.LockMinWidth };
|
|
130431
130433
|
param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);
|
|
130432
130434
|
}
|
|
@@ -153708,7 +153710,7 @@ function ScrollBarBGChart()
|
|
|
153708
153710
|
|
|
153709
153711
|
|
|
153710
153712
|
|
|
153711
|
-
var HQCHART_VERSION="1.1.
|
|
153713
|
+
var HQCHART_VERSION="1.1.15079";
|
|
153712
153714
|
|
|
153713
153715
|
function PrintHQChartVersion()
|
|
153714
153716
|
{
|
|
@@ -17588,6 +17588,7 @@ function IChartFramePainting()
|
|
|
17588
17588
|
|
|
17589
17589
|
if (lockData.Callback) this.LockPaint.Callback=lockData.Callback; //回调
|
|
17590
17590
|
if (lockData.IndexName) this.LockPaint.IndexName=lockData.IndexName; //指标名字
|
|
17591
|
+
if (lockData.IndexID) this.LockPaint.IndexID=lockData.IndexID; //指标ID
|
|
17591
17592
|
if (lockData.ID) this.LockPaint.LockID=lockData.ID; //锁ID
|
|
17592
17593
|
if (lockData.BG) this.LockPaint.BGColor=lockData.BG; //背景色
|
|
17593
17594
|
if (lockData.Text) this.LockPaint.Title= lockData.Text;
|
|
@@ -51858,6 +51859,7 @@ function ChartLock()
|
|
|
51858
51859
|
this.LockID; //锁ID
|
|
51859
51860
|
this.Callback; //回调
|
|
51860
51861
|
this.IndexName; //指标名字
|
|
51862
|
+
this.IndexID; //指标ID
|
|
51861
51863
|
this.MinWidth=null; //最小宽度
|
|
51862
51864
|
|
|
51863
51865
|
this.Draw=function(isDraw)
|
|
@@ -51996,7 +51998,7 @@ function ChartLock()
|
|
|
51996
51998
|
this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);
|
|
51997
51999
|
if (this.Canvas.isPointInPath(x,y))
|
|
51998
52000
|
{
|
|
51999
|
-
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName };
|
|
52001
|
+
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
|
|
52000
52002
|
tooltip.ChartPaint=this;
|
|
52001
52003
|
return true;
|
|
52002
52004
|
}
|
|
@@ -65899,7 +65901,7 @@ function DynamicMinuteTitlePainting()
|
|
|
65899
65901
|
if (this.TimeFormat) //指定时间格式
|
|
65900
65902
|
{
|
|
65901
65903
|
var strDate=null, strTime=null, text=null;
|
|
65902
|
-
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD"
|
|
65904
|
+
if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString(item.Date, "YYYY-MM-DD");
|
|
65903
65905
|
if (this.IsShowTime) strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);
|
|
65904
65906
|
if (strDate && strTime) text=`${strDate} ${strTime}`;
|
|
65905
65907
|
else if (strDate) text=strDate;
|
|
@@ -130470,7 +130472,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
130470
130472
|
}
|
|
130471
130473
|
else //上锁
|
|
130472
130474
|
{
|
|
130473
|
-
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name
|
|
130475
|
+
let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,IndexID:param.Self.ID, ID:param.Self.LockID,
|
|
130474
130476
|
BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor, Font:param.Self.LockFont, Count:param.Self.LockCount, MinWidth:param.Self.LockMinWidth };
|
|
130475
130477
|
param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);
|
|
130476
130478
|
}
|
|
@@ -165588,7 +165590,7 @@ function HQChartScriptWorker()
|
|
|
165588
165590
|
|
|
165589
165591
|
|
|
165590
165592
|
|
|
165591
|
-
var HQCHART_VERSION="1.1.
|
|
165593
|
+
var HQCHART_VERSION="1.1.15079";
|
|
165592
165594
|
|
|
165593
165595
|
function PrintHQChartVersion()
|
|
165594
165596
|
{
|