hqchart 1.1.13140 → 1.1.13144
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
|
@@ -2706,7 +2706,9 @@ if(this.ChartBorder.UIElement){this.Position={X:this.ChartBorder.UIElement.offse
|
|
|
2706
2706
|
this.Snapshot=function(){this.ScreenImageData=this.Canvas.getImageData(0,0,this.ChartBorder.GetChartWidth(),this.ChartBorder.GetChartHeight());};this.GetXData=function(x){return this.SubFrame[0].Frame.GetXData(x);};this.GetYData=function(y,outObject)//outObject 可以保存返回的额外数据
|
|
2707
2707
|
{var frame;for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];var left=item.Frame.ChartBorder.GetLeft();var top=item.Frame.ChartBorder.GetTopEx();var width=item.Frame.ChartBorder.GetWidth();var height=item.Frame.ChartBorder.GetHeightEx();item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(left,top,width,height);if(item.Frame.Canvas.isPointInPath(left,y)){frame=item.Frame;if(outObject)outObject.FrameID=i;break;}}if(frame!=null){if(frame.RightFrame)outObject.RightYValue=frame.RightFrame.GetYData(y);//右侧子坐标
|
|
2708
2708
|
var yValue=frame.GetYData(y);if(frame.YSplitOperator.CoordinateType==1)//百分比坐标 右边显示百分比信息
|
|
2709
|
-
{var firstOpenPrice=frame.YSplitOperator.GetFirstOpenPrice();outObject.RightYValue=((yValue-firstOpenPrice)/firstOpenPrice*100).toFixed(2)+'%';}
|
|
2709
|
+
{var firstOpenPrice=frame.YSplitOperator.GetFirstOpenPrice();outObject.RightYValue=((yValue-firstOpenPrice)/firstOpenPrice*100).toFixed(2)+'%';}if(frame.GetMainOverlayFrame){var aryOverlayFrame=frame.GetMainOverlayFrame();if(aryOverlayFrame){if(aryOverlayFrame[0])//左侧
|
|
2710
|
+
{var leftFrame=aryOverlayFrame[0];var value=leftFrame.GetYData(y);outObject.RightYValue=yValue;yValue=value;}if(aryOverlayFrame[1])//右侧
|
|
2711
|
+
{var rightFrame=aryOverlayFrame[1];var value=rightFrame.GetYData(y);outObject.RightYValue=value;}}}return yValue;}};this.PtInFrame=function(x,y)//鼠标哪个指标窗口
|
|
2710
2712
|
{for(var i=0;i<this.SubFrame.length;++i){var item=this.SubFrame[i];var left=item.Frame.ChartBorder.GetLeft();var top=item.Frame.ChartBorder.GetTop();var width=item.Frame.ChartBorder.GetWidth();var height=item.Frame.ChartBorder.GetHeight();item.Frame.Canvas.beginPath();item.Frame.Canvas.rect(left,top,width,height);if(item.Frame.Canvas.isPointInPath(x,y)){return i;//转成整形
|
|
2711
2713
|
}}var bottom=this.ChartBorder.GetBottom();var chartHeight=this.ChartBorder.GetChartHeight();var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();//底部
|
|
2712
2714
|
if(x>=left&&x<=right&&y>bottom&&y<chartHeight)return-3;return-1;};this.PtInChartFrame=function(x,y)//鼠标在图形区域, 取出上下空白
|
|
@@ -5044,7 +5046,7 @@ this.CallAcutionSplitY(this.SplitCount,splitData);if(this.EnableRemoveZero)this.
|
|
|
5044
5046
|
{text=''+value.toFixed(this.FloatPrecision);}else{var absValue=Math.abs(value);if(absValue<0.0000000001){text=0;}else if(absValue<this.FLOATPRECISION_RANGE[this.FLOATPRECISION_RANGE.length-1]){text=value.toExponential(2).toString();}else{var floatPrecision=this.GetFloatPrecision(absValue,this.FloatPrecision);//数据比小数位数还小, 调整小数位数
|
|
5045
5047
|
text=IFrameSplitOperator.FormatValueString(value,floatPrecision,this.LanguageID);}}return text;};this.FilterIgnoreYValue=function(){if(!this.IgnoreYValue||this.IgnoreYValue.length<=0)return;var setValue=new _set2.default(this.IgnoreYValue);this.Frame.HorizontalInfo=this.Frame.HorizontalInfo.filter(function(item){return!setValue.has(item.Value);});};this.DynamicMessageText=function(){if(this.SplitType==2){for(var i=0;i<this.Frame.HorizontalInfo.length;++i){var item=this.Frame.HorizontalInfo[i];if(item.Message[0])item.Message[0]+='%';if(item.Message[1])item.Message[1]+='%';}}};this.CallAcutionSplitY=function(count,splitData){if(this.Frame.Identify!=1)return null;var aryCallAcution=this.GetCallAcutionSplitY(count,splitData);if(!aryCallAcution)return;for(var i=0;i<this.Frame.HorizontalInfo.length;++i)//把显示的数据迁移到 Message[2] Message[3]
|
|
5046
5048
|
{var item=this.Frame.HorizontalInfo[i];if(aryCallAcution.IsBeforeData){item.Message[2]=item.Message[0];item.Message[0]=null;}if(aryCallAcution.IsAfterData&&(this.ShareAfterVol==0||this.ShareAfterVol==2)){item.Message[3]=item.Message[1];item.Message[1]=null;}}//集合竞价的坐标插入最后
|
|
5047
|
-
for(var i=0;i<aryCallAcution.HorizontalInfo.length;++i){var item=aryCallAcution.HorizontalInfo[i];this.Frame.HorizontalInfo.push(item);}};this.GetCallAcutionSplitY=function(count,splitData){if(this.Frame.Identify!=1)return null;var isBeforeData=this.IsBeforeData==true&&this.BeforeOpenData&&(this.BeforeOpenData.Ver==2.0||this.BeforeOpenData.Ver==3.0);var isAfterData=this.IsAfterData==true&&this.AfterCloseData&&(this.AfterCloseData.Ver==2.0||this.AfterCloseData.Ver==3.0);if(isBeforeData||isAfterData){var intervalY=(splitData.Max-splitData.Min)/(count-1);if(isBeforeData)var intervalLeft=(this.BeforeOpenData.VolMax-this.BeforeOpenData.VolMin)/(count-1);if(isAfterData)var intervalRight=(this.AfterCloseData.VolMax-this.AfterCloseData.VolMin)/(count-1);var aryHorizontalInfo=[];for(var i=0;i<count;++i){var item=new CoordinateInfo();var yValue=intervalY*i;item.Value=yValue;item.LineType=8;if(isBeforeData){var leftValue=intervalLeft*i;item.Message[0]=this.FormatValueString(leftValue);}if(isAfterData&&(this.ShareAfterVol==0||this.ShareAfterVol==2)){var rightValue=intervalRight*i;item.Message[1]=this.FormatValueString(rightValue);}aryHorizontalInfo.push(item);}return{HorizontalInfo:aryHorizontalInfo,IsBeforeData:isBeforeData,IsAfterData:isAfterData};}var isMultiDayBeforeData=false;var intervalLeft=null;if(this.MultiDayBeforeOpenData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData)){isMultiDayBeforeData=true;var firstDayData=this.MultiDayBeforeOpenData[0];if(firstDayData.Ver==2.0||firstDayData.Ver==3.0){var intervalLeft=(firstDayData.VolMax-firstDayData.VolMin)/(count-1);}}var isMultiDayAfterData=false;var intervalRight=null;if(this.MultiDayAfterCloseData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){isMultiDayAfterData=true;var firstDayData=this.MultiDayAfterCloseData[0];if(firstDayData.Ver==2.0||firstDayData.Ver==3.0){var intervalRight=(firstDayData.VolMax-firstDayData.VolMin)/(count-1);}}if(isMultiDayBeforeData||isMultiDayAfterData){var intervalY=(splitData.Max-splitData.Min)/(count-1);var aryHorizontalInfo=[];for(var i=0;i<count;++i){var item=new CoordinateInfo();var yValue=intervalY*i;item.Value=yValue;item.LineType=9;var isVaild=false;if(intervalLeft!=null){var leftValue=intervalLeft*i;item.Message[0]=this.FormatValueString(leftValue);isVaild=true;}if(intervalRight!=null&&(this.ShareAfterVol==0||this.ShareAfterVol==2)){var rightValue=intervalRight*i;item.Message[1]=this.FormatValueString(rightValue);isVaild=true;}if(isVaild)aryHorizontalInfo.push(item);}if(IFrameSplitOperator.IsNonEmptyArray(aryHorizontalInfo))return{HorizontalInfo:aryHorizontalInfo,IsBeforeData:isMultiDayBeforeData,IsAfterData:isMultiDayAfterData};}return null;};this.RightFrameSplitY=function(){if(!this.Frame.RightFrame)return;var rightFrame=this.Frame.RightFrame;if(rightFrame.YSplitOperator)rightFrame.YSplitOperator.Operator();for(var i=0;i<this.Frame.HorizontalInfo.length;++i){var item=this.Frame.HorizontalInfo[i];var y=this.Frame.GetYFromData(item.Value);var yValue=rightFrame.GetYData(y);item.Message[1]=IFrameSplitOperator.FormatValueString(yValue,this.FloatPrecision,this.LanguageID);}};this.MainOverlayFrameSplitY=function(){if(!this.Frame.GetMainOverlayFrame)return;var aryOverlayFrame=this.Frame.GetMainOverlayFrame();if(!aryOverlayFrame)return;if(aryOverlayFrame[1]){var rightFrame=aryOverlayFrame[1];
|
|
5049
|
+
for(var i=0;i<aryCallAcution.HorizontalInfo.length;++i){var item=aryCallAcution.HorizontalInfo[i];this.Frame.HorizontalInfo.push(item);}};this.GetCallAcutionSplitY=function(count,splitData){if(this.Frame.Identify!=1)return null;var isBeforeData=this.IsBeforeData==true&&this.BeforeOpenData&&(this.BeforeOpenData.Ver==2.0||this.BeforeOpenData.Ver==3.0);var isAfterData=this.IsAfterData==true&&this.AfterCloseData&&(this.AfterCloseData.Ver==2.0||this.AfterCloseData.Ver==3.0);if(isBeforeData||isAfterData){var intervalY=(splitData.Max-splitData.Min)/(count-1);if(isBeforeData)var intervalLeft=(this.BeforeOpenData.VolMax-this.BeforeOpenData.VolMin)/(count-1);if(isAfterData)var intervalRight=(this.AfterCloseData.VolMax-this.AfterCloseData.VolMin)/(count-1);var aryHorizontalInfo=[];for(var i=0;i<count;++i){var item=new CoordinateInfo();var yValue=intervalY*i;item.Value=yValue;item.LineType=8;if(isBeforeData){var leftValue=intervalLeft*i;item.Message[0]=this.FormatValueString(leftValue);}if(isAfterData&&(this.ShareAfterVol==0||this.ShareAfterVol==2)){var rightValue=intervalRight*i;item.Message[1]=this.FormatValueString(rightValue);}aryHorizontalInfo.push(item);}return{HorizontalInfo:aryHorizontalInfo,IsBeforeData:isBeforeData,IsAfterData:isAfterData};}var isMultiDayBeforeData=false;var intervalLeft=null;if(this.MultiDayBeforeOpenData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData)){isMultiDayBeforeData=true;var firstDayData=this.MultiDayBeforeOpenData[0];if(firstDayData.Ver==2.0||firstDayData.Ver==3.0){var intervalLeft=(firstDayData.VolMax-firstDayData.VolMin)/(count-1);}}var isMultiDayAfterData=false;var intervalRight=null;if(this.MultiDayAfterCloseData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){isMultiDayAfterData=true;var firstDayData=this.MultiDayAfterCloseData[0];if(firstDayData.Ver==2.0||firstDayData.Ver==3.0){var intervalRight=(firstDayData.VolMax-firstDayData.VolMin)/(count-1);}}if(isMultiDayBeforeData||isMultiDayAfterData){var intervalY=(splitData.Max-splitData.Min)/(count-1);var aryHorizontalInfo=[];for(var i=0;i<count;++i){var item=new CoordinateInfo();var yValue=intervalY*i;item.Value=yValue;item.LineType=9;var isVaild=false;if(intervalLeft!=null){var leftValue=intervalLeft*i;item.Message[0]=this.FormatValueString(leftValue);isVaild=true;}if(intervalRight!=null&&(this.ShareAfterVol==0||this.ShareAfterVol==2)){var rightValue=intervalRight*i;item.Message[1]=this.FormatValueString(rightValue);isVaild=true;}if(isVaild)aryHorizontalInfo.push(item);}if(IFrameSplitOperator.IsNonEmptyArray(aryHorizontalInfo))return{HorizontalInfo:aryHorizontalInfo,IsBeforeData:isMultiDayBeforeData,IsAfterData:isMultiDayAfterData};}return null;};this.RightFrameSplitY=function(){if(!this.Frame.RightFrame)return;var rightFrame=this.Frame.RightFrame;if(rightFrame.YSplitOperator)rightFrame.YSplitOperator.Operator();for(var i=0;i<this.Frame.HorizontalInfo.length;++i){var item=this.Frame.HorizontalInfo[i];var y=this.Frame.GetYFromData(item.Value);var yValue=rightFrame.GetYData(y);item.Message[1]=IFrameSplitOperator.FormatValueString(yValue,this.FloatPrecision,this.LanguageID);}};this.MainOverlayFrameSplitY=function(){if(!this.Frame.GetMainOverlayFrame)return;var aryOverlayFrame=this.Frame.GetMainOverlayFrame();if(!aryOverlayFrame)return;if(aryOverlayFrame[1]){var rightFrame=aryOverlayFrame[1];var ySplitOper=rightFrame.YSplitOperator;if(ySplitOper)ySplitOper.Operator();for(var i=0;i<this.Frame.HorizontalInfo.length;++i){var item=this.Frame.HorizontalInfo[i];var y=this.Frame.GetYFromData(item.Value);var yValue=rightFrame.GetYData(y);if(ySplitOper&&ySplitOper.FormatValueString)item.Message[1]=ySplitOper.FormatValueString(yValue);else item.Message[1]=this.FormatValueString(yValue);}}if(aryOverlayFrame[0]){var leftFrame=aryOverlayFrame[0];var ySplitOper=leftFrame.YSplitOperator;if(ySplitOper)ySplitOper.Operator();for(var i=0;i<this.Frame.HorizontalInfo.length;++i){var item=this.Frame.HorizontalInfo[i];var y=this.Frame.GetYFromData(item.Value);var yValue=leftFrame.GetYData(y);if(ySplitOper&&ySplitOper.FormatValueString)item.Message[0]=ySplitOper.FormatValueString(yValue);else item.Message[0]=this.FormatValueString(yValue);}}};this.CustomCoordinate=function(){this.Frame.CustomHorizontalInfo=[];var data=this.InvokeCustomYCoordinateCallback();if(data&&data.PreventDefault==true)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.Custom))return;for(var i=0;i<this.Custom.length;++i){var item=this.Custom[i];if(item.Type==JSCHART_CUSTOM_YCOORDINATE_ID.PAGE_LAST_INDEX_VALUE_ID)//当前屏最后一个数据
|
|
5048
5050
|
{this.CustomLatestIndexDataCoordinate(item);}else if(item.Type==JSCHART_CUSTOM_YCOORDINATE_ID.FIXED_VALUE_ID)//自定义刻度
|
|
5049
5051
|
{this.CustomFixedCoordinate(item);}else if(item.Type==JSCHART_CUSTOM_YCOORDINATE_ID.PAGE_LAST_OVERLAY_INDEX_VALUE_ID)//叠加指标当前屏最后一个数据
|
|
5050
5052
|
{this.CustomLatestOverlayIndexDataCoordinate(item);}}};this.CustomFixedCoordinate=function(option)//固定坐标刻度
|
|
@@ -13053,7 +13055,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13053
13055
|
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);};}/********************************************************************************
|
|
13054
13056
|
* 版本信息输出
|
|
13055
13057
|
*
|
|
13056
|
-
*/var HQCHART_VERSION="1.1.
|
|
13058
|
+
*/var HQCHART_VERSION="1.1.13143";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n* HQChart Ver: '+HQCHART_VERSION+' \n* \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13057
13059
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13058
13060
|
// BaseIndex:BaseIndex,
|
|
13059
13061
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -18041,6 +18041,29 @@ function HQTradeFrame()
|
|
|
18041
18041
|
var firstOpenPrice=frame.YSplitOperator.GetFirstOpenPrice();
|
|
18042
18042
|
outObject.RightYValue=((yValue-firstOpenPrice)/firstOpenPrice*100).toFixed(2)+'%';
|
|
18043
18043
|
}
|
|
18044
|
+
|
|
18045
|
+
if (frame.GetMainOverlayFrame)
|
|
18046
|
+
{
|
|
18047
|
+
var aryOverlayFrame=frame.GetMainOverlayFrame();
|
|
18048
|
+
if (aryOverlayFrame)
|
|
18049
|
+
{
|
|
18050
|
+
if (aryOverlayFrame[0]) //左侧
|
|
18051
|
+
{
|
|
18052
|
+
var leftFrame=aryOverlayFrame[0];
|
|
18053
|
+
var value=leftFrame.GetYData(y);
|
|
18054
|
+
outObject.RightYValue=yValue;
|
|
18055
|
+
yValue=value;
|
|
18056
|
+
}
|
|
18057
|
+
|
|
18058
|
+
if (aryOverlayFrame[1]) //右侧
|
|
18059
|
+
{
|
|
18060
|
+
var rightFrame=aryOverlayFrame[1];
|
|
18061
|
+
var value=rightFrame.GetYData(y);
|
|
18062
|
+
outObject.RightYValue=value;
|
|
18063
|
+
}
|
|
18064
|
+
}
|
|
18065
|
+
}
|
|
18066
|
+
|
|
18044
18067
|
return yValue;
|
|
18045
18068
|
}
|
|
18046
18069
|
}
|
|
@@ -46014,28 +46037,32 @@ function FrameSplitY()
|
|
|
46014
46037
|
if (aryOverlayFrame[1])
|
|
46015
46038
|
{
|
|
46016
46039
|
var rightFrame=aryOverlayFrame[1];
|
|
46017
|
-
|
|
46040
|
+
var ySplitOper=rightFrame.YSplitOperator;
|
|
46041
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
46018
46042
|
|
|
46019
46043
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
46020
46044
|
{
|
|
46021
46045
|
var item=this.Frame.HorizontalInfo[i];
|
|
46022
46046
|
var y=this.Frame.GetYFromData(item.Value);
|
|
46023
46047
|
var yValue=rightFrame.GetYData(y);
|
|
46024
|
-
item.Message[1] =
|
|
46048
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[1] = ySplitOper.FormatValueString(yValue);
|
|
46049
|
+
else item.Message[1] = this.FormatValueString(yValue);
|
|
46025
46050
|
}
|
|
46026
46051
|
}
|
|
46027
46052
|
|
|
46028
46053
|
if (aryOverlayFrame[0])
|
|
46029
46054
|
{
|
|
46030
46055
|
var leftFrame=aryOverlayFrame[0];
|
|
46031
|
-
|
|
46056
|
+
var ySplitOper=leftFrame.YSplitOperator
|
|
46057
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
46032
46058
|
|
|
46033
46059
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
46034
46060
|
{
|
|
46035
46061
|
var item=this.Frame.HorizontalInfo[i];
|
|
46036
46062
|
var y=this.Frame.GetYFromData(item.Value);
|
|
46037
46063
|
var yValue=leftFrame.GetYData(y);
|
|
46038
|
-
item.Message[0] =
|
|
46064
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[0] = ySplitOper.FormatValueString(yValue);
|
|
46065
|
+
else item.Message[0] = this.FormatValueString(yValue);
|
|
46039
46066
|
}
|
|
46040
46067
|
}
|
|
46041
46068
|
}
|
|
@@ -21933,6 +21933,29 @@ function HQTradeFrame()
|
|
|
21933
21933
|
var firstOpenPrice=frame.YSplitOperator.GetFirstOpenPrice();
|
|
21934
21934
|
outObject.RightYValue=((yValue-firstOpenPrice)/firstOpenPrice*100).toFixed(2)+'%';
|
|
21935
21935
|
}
|
|
21936
|
+
|
|
21937
|
+
if (frame.GetMainOverlayFrame)
|
|
21938
|
+
{
|
|
21939
|
+
var aryOverlayFrame=frame.GetMainOverlayFrame();
|
|
21940
|
+
if (aryOverlayFrame)
|
|
21941
|
+
{
|
|
21942
|
+
if (aryOverlayFrame[0]) //左侧
|
|
21943
|
+
{
|
|
21944
|
+
var leftFrame=aryOverlayFrame[0];
|
|
21945
|
+
var value=leftFrame.GetYData(y);
|
|
21946
|
+
outObject.RightYValue=yValue;
|
|
21947
|
+
yValue=value;
|
|
21948
|
+
}
|
|
21949
|
+
|
|
21950
|
+
if (aryOverlayFrame[1]) //右侧
|
|
21951
|
+
{
|
|
21952
|
+
var rightFrame=aryOverlayFrame[1];
|
|
21953
|
+
var value=rightFrame.GetYData(y);
|
|
21954
|
+
outObject.RightYValue=value;
|
|
21955
|
+
}
|
|
21956
|
+
}
|
|
21957
|
+
}
|
|
21958
|
+
|
|
21936
21959
|
return yValue;
|
|
21937
21960
|
}
|
|
21938
21961
|
}
|
|
@@ -49906,28 +49929,32 @@ function FrameSplitY()
|
|
|
49906
49929
|
if (aryOverlayFrame[1])
|
|
49907
49930
|
{
|
|
49908
49931
|
var rightFrame=aryOverlayFrame[1];
|
|
49909
|
-
|
|
49932
|
+
var ySplitOper=rightFrame.YSplitOperator;
|
|
49933
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
49910
49934
|
|
|
49911
49935
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
49912
49936
|
{
|
|
49913
49937
|
var item=this.Frame.HorizontalInfo[i];
|
|
49914
49938
|
var y=this.Frame.GetYFromData(item.Value);
|
|
49915
49939
|
var yValue=rightFrame.GetYData(y);
|
|
49916
|
-
item.Message[1] =
|
|
49940
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[1] = ySplitOper.FormatValueString(yValue);
|
|
49941
|
+
else item.Message[1] = this.FormatValueString(yValue);
|
|
49917
49942
|
}
|
|
49918
49943
|
}
|
|
49919
49944
|
|
|
49920
49945
|
if (aryOverlayFrame[0])
|
|
49921
49946
|
{
|
|
49922
49947
|
var leftFrame=aryOverlayFrame[0];
|
|
49923
|
-
|
|
49948
|
+
var ySplitOper=leftFrame.YSplitOperator
|
|
49949
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
49924
49950
|
|
|
49925
49951
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
49926
49952
|
{
|
|
49927
49953
|
var item=this.Frame.HorizontalInfo[i];
|
|
49928
49954
|
var y=this.Frame.GetYFromData(item.Value);
|
|
49929
49955
|
var yValue=leftFrame.GetYData(y);
|
|
49930
|
-
item.Message[0] =
|
|
49956
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[0] = ySplitOper.FormatValueString(yValue);
|
|
49957
|
+
else item.Message[0] = this.FormatValueString(yValue);
|
|
49931
49958
|
}
|
|
49932
49959
|
}
|
|
49933
49960
|
}
|
|
@@ -131756,7 +131783,7 @@ function ScrollBarBGChart()
|
|
|
131756
131783
|
|
|
131757
131784
|
|
|
131758
131785
|
|
|
131759
|
-
var HQCHART_VERSION="1.1.
|
|
131786
|
+
var HQCHART_VERSION="1.1.13143";
|
|
131760
131787
|
|
|
131761
131788
|
function PrintHQChartVersion()
|
|
131762
131789
|
{
|
|
@@ -21977,6 +21977,29 @@ function HQTradeFrame()
|
|
|
21977
21977
|
var firstOpenPrice=frame.YSplitOperator.GetFirstOpenPrice();
|
|
21978
21978
|
outObject.RightYValue=((yValue-firstOpenPrice)/firstOpenPrice*100).toFixed(2)+'%';
|
|
21979
21979
|
}
|
|
21980
|
+
|
|
21981
|
+
if (frame.GetMainOverlayFrame)
|
|
21982
|
+
{
|
|
21983
|
+
var aryOverlayFrame=frame.GetMainOverlayFrame();
|
|
21984
|
+
if (aryOverlayFrame)
|
|
21985
|
+
{
|
|
21986
|
+
if (aryOverlayFrame[0]) //左侧
|
|
21987
|
+
{
|
|
21988
|
+
var leftFrame=aryOverlayFrame[0];
|
|
21989
|
+
var value=leftFrame.GetYData(y);
|
|
21990
|
+
outObject.RightYValue=yValue;
|
|
21991
|
+
yValue=value;
|
|
21992
|
+
}
|
|
21993
|
+
|
|
21994
|
+
if (aryOverlayFrame[1]) //右侧
|
|
21995
|
+
{
|
|
21996
|
+
var rightFrame=aryOverlayFrame[1];
|
|
21997
|
+
var value=rightFrame.GetYData(y);
|
|
21998
|
+
outObject.RightYValue=value;
|
|
21999
|
+
}
|
|
22000
|
+
}
|
|
22001
|
+
}
|
|
22002
|
+
|
|
21980
22003
|
return yValue;
|
|
21981
22004
|
}
|
|
21982
22005
|
}
|
|
@@ -49950,28 +49973,32 @@ function FrameSplitY()
|
|
|
49950
49973
|
if (aryOverlayFrame[1])
|
|
49951
49974
|
{
|
|
49952
49975
|
var rightFrame=aryOverlayFrame[1];
|
|
49953
|
-
|
|
49976
|
+
var ySplitOper=rightFrame.YSplitOperator;
|
|
49977
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
49954
49978
|
|
|
49955
49979
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
49956
49980
|
{
|
|
49957
49981
|
var item=this.Frame.HorizontalInfo[i];
|
|
49958
49982
|
var y=this.Frame.GetYFromData(item.Value);
|
|
49959
49983
|
var yValue=rightFrame.GetYData(y);
|
|
49960
|
-
item.Message[1] =
|
|
49984
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[1] = ySplitOper.FormatValueString(yValue);
|
|
49985
|
+
else item.Message[1] = this.FormatValueString(yValue);
|
|
49961
49986
|
}
|
|
49962
49987
|
}
|
|
49963
49988
|
|
|
49964
49989
|
if (aryOverlayFrame[0])
|
|
49965
49990
|
{
|
|
49966
49991
|
var leftFrame=aryOverlayFrame[0];
|
|
49967
|
-
|
|
49992
|
+
var ySplitOper=leftFrame.YSplitOperator
|
|
49993
|
+
if (ySplitOper) ySplitOper.Operator();
|
|
49968
49994
|
|
|
49969
49995
|
for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
|
|
49970
49996
|
{
|
|
49971
49997
|
var item=this.Frame.HorizontalInfo[i];
|
|
49972
49998
|
var y=this.Frame.GetYFromData(item.Value);
|
|
49973
49999
|
var yValue=leftFrame.GetYData(y);
|
|
49974
|
-
item.Message[0] =
|
|
50000
|
+
if (ySplitOper && ySplitOper.FormatValueString) item.Message[0] = ySplitOper.FormatValueString(yValue);
|
|
50001
|
+
else item.Message[0] = this.FormatValueString(yValue);
|
|
49975
50002
|
}
|
|
49976
50003
|
}
|
|
49977
50004
|
}
|
|
@@ -134320,7 +134347,7 @@ function HQChartScriptWorker()
|
|
|
134320
134347
|
|
|
134321
134348
|
|
|
134322
134349
|
|
|
134323
|
-
var HQCHART_VERSION="1.1.
|
|
134350
|
+
var HQCHART_VERSION="1.1.13143";
|
|
134324
134351
|
|
|
134325
134352
|
function PrintHQChartVersion()
|
|
134326
134353
|
{
|