hqchart 1.1.15091 → 1.1.15104
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.
|
@@ -6992,6 +6992,8 @@ var JSCHART_EVENT_ID=
|
|
|
6992
6992
|
ON_FORMAT_TVLONGPOSITION_LABEL:176,
|
|
6993
6993
|
|
|
6994
6994
|
ON_FORMAT_COUNTDOWN_TEXT:177, //倒计时
|
|
6995
|
+
ON_CLICK_INDEX_LOCK:178, //点击指标锁
|
|
6996
|
+
ON_CORSSCURSOR_STATUS_CHANGE:179, //十字光标状态改变
|
|
6995
6997
|
}
|
|
6996
6998
|
|
|
6997
6999
|
var JSCHART_OPERATOR_ID=
|
|
@@ -7229,6 +7231,18 @@ var JSCHART_TRADE_STATUS_ID=
|
|
|
7229
7231
|
SUSP_ID:1, //停牌
|
|
7230
7232
|
}
|
|
7231
7233
|
|
|
7234
|
+
//十字光标状态
|
|
7235
|
+
var JSCHART_CORSSCURSOR_STATUS_ID=
|
|
7236
|
+
{
|
|
7237
|
+
NONE_ID:0,
|
|
7238
|
+
LINE_ID:1,
|
|
7239
|
+
LEFT_TEXT_ID:2,
|
|
7240
|
+
LEFT_INTER_TEXT_ID:4,
|
|
7241
|
+
RIGHT_TEXT_ID:8,
|
|
7242
|
+
RIGHT_INTER_TEXT_ID:16,
|
|
7243
|
+
BOTTOM_TEXT_ID:32,
|
|
7244
|
+
}
|
|
7245
|
+
|
|
7232
7246
|
|
|
7233
7247
|
function PhoneDBClick()
|
|
7234
7248
|
{
|
|
@@ -7445,6 +7459,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7445
7459
|
//锁十字光标
|
|
7446
7460
|
LockCorssCursor:{ X:{ Enable:false } },
|
|
7447
7461
|
|
|
7462
|
+
CorssCursorStatus:{ Value:null }, //十字光标状态 只读
|
|
7463
|
+
|
|
7448
7464
|
//图形中的单元选中状态
|
|
7449
7465
|
MapIndexChartCache:new Map(), //key 指标GUID
|
|
7450
7466
|
|
|
@@ -7611,6 +7627,29 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7611
7627
|
this.BuySellData.ArySell=null;
|
|
7612
7628
|
}
|
|
7613
7629
|
|
|
7630
|
+
this.UpdateCorssCursorStatus=function()
|
|
7631
|
+
{
|
|
7632
|
+
if (!this.ChartCorssCursor) return false;
|
|
7633
|
+
if (!this.GlobalOption || !this.GlobalOption.CorssCursorStatus) return false;
|
|
7634
|
+
|
|
7635
|
+
var status=this.ChartCorssCursor.Status;
|
|
7636
|
+
|
|
7637
|
+
//状态改变了
|
|
7638
|
+
if (this.GlobalOption.CorssCursorStatus.Value!=status)
|
|
7639
|
+
{
|
|
7640
|
+
this.GlobalOption.CorssCursorStatus.Value=status;
|
|
7641
|
+
|
|
7642
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CORSSCURSOR_STATUS_CHANGE);
|
|
7643
|
+
if (event && event.Callback)
|
|
7644
|
+
{
|
|
7645
|
+
var sendData={ Status:status, IsShowLine:(status&JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID)>0 };
|
|
7646
|
+
event.Callback(event, sendData, this);
|
|
7647
|
+
}
|
|
7648
|
+
}
|
|
7649
|
+
|
|
7650
|
+
return true;
|
|
7651
|
+
}
|
|
7652
|
+
|
|
7614
7653
|
this.InitalPopMenu=function() //初始化弹出窗口
|
|
7615
7654
|
{
|
|
7616
7655
|
if (this.JSPopMenu) return;
|
|
@@ -10578,6 +10617,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
10578
10617
|
this.Frame.ClearCoordinateText();
|
|
10579
10618
|
this.Frame.Draw( { IsEnableSplash:this.ChartSplashPaint.IsEnableSplash} );
|
|
10580
10619
|
this.ChartSplashPaint.Draw();
|
|
10620
|
+
this.UpdateCorssCursorStatus();
|
|
10581
10621
|
return;
|
|
10582
10622
|
}
|
|
10583
10623
|
|
|
@@ -10870,6 +10910,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
10870
10910
|
}
|
|
10871
10911
|
|
|
10872
10912
|
++this.TouchDrawCount;
|
|
10913
|
+
|
|
10914
|
+
this.UpdateCorssCursorStatus();
|
|
10873
10915
|
}
|
|
10874
10916
|
|
|
10875
10917
|
this.DrawExtendChartPaint=function(level, option)
|
|
@@ -11349,39 +11391,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11349
11391
|
exChartOption.Tooltip=option.Tooltip;
|
|
11350
11392
|
exChartOption.Point=option.Point;
|
|
11351
11393
|
}
|
|
11352
|
-
this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25,exChartOption);
|
|
11353
|
-
/*
|
|
11354
|
-
for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形 在动态标题以后画
|
|
11355
|
-
{
|
|
11356
|
-
var item=this.ExtendChartPaint[i];
|
|
11357
|
-
if (item.IsCallbackDraw) continue;
|
|
11358
|
-
if (item.DrawAfterPicture) continue;
|
|
11359
|
-
if (item.ClassName=='KLineTooltipPaint' && option)
|
|
11360
|
-
{
|
|
11361
|
-
if (option.Tooltip==false) continue;
|
|
11362
|
-
if (option.Point) item.LatestPoint=option.Point;
|
|
11363
|
-
}
|
|
11364
|
-
else if (item.ClassName=="MinuteTooltipPaint" && option)
|
|
11365
|
-
{
|
|
11366
|
-
if (option.Point) item.LatestPoint=option.Point;
|
|
11367
|
-
}
|
|
11368
|
-
|
|
11369
|
-
if (item.IsDynamic && item.DrawAfterTitle===true) item.Draw(moveonPoint, this.LastMouseStatus);
|
|
11370
|
-
}
|
|
11371
|
-
*/
|
|
11372
11394
|
|
|
11395
|
+
this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25,exChartOption);
|
|
11396
|
+
|
|
11373
11397
|
if (this.EnableAnimation) this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_30);
|
|
11374
|
-
|
|
11375
|
-
if (this.EnableAnimation)
|
|
11376
|
-
{
|
|
11377
|
-
for(var i=0;i<this.ExtendChartPaint.length;++i) //动画
|
|
11378
|
-
{
|
|
11379
|
-
var item=this.ExtendChartPaint[i];
|
|
11380
|
-
if (item.IsAnimation===true) item.Draw();
|
|
11381
|
-
}
|
|
11382
|
-
}
|
|
11383
|
-
*/
|
|
11384
|
-
|
|
11398
|
+
|
|
11385
11399
|
for(var i=0;i<this.ChartDrawPicture.length;++i)
|
|
11386
11400
|
{
|
|
11387
11401
|
var item=this.ChartDrawPicture[i];
|
|
@@ -11407,15 +11421,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11407
11421
|
}
|
|
11408
11422
|
|
|
11409
11423
|
this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50);
|
|
11410
|
-
|
|
11411
|
-
for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
|
|
11412
|
-
{
|
|
11413
|
-
var item=this.ExtendChartPaint[i];
|
|
11414
|
-
if (item.DrawAfterPicture)
|
|
11415
|
-
item.Draw();
|
|
11416
|
-
}
|
|
11417
|
-
*/
|
|
11418
|
-
|
|
11424
|
+
|
|
11419
11425
|
if (this.LastMouseStatus.MouseOnToolbar) //工具栏按钮提示信息
|
|
11420
11426
|
{
|
|
11421
11427
|
var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
|
|
@@ -11427,6 +11433,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11427
11433
|
if (bDrawDialogTooltip) this.DrawTooltipDialog();
|
|
11428
11434
|
|
|
11429
11435
|
++this.TouchDrawCount;
|
|
11436
|
+
|
|
11437
|
+
this.UpdateCorssCursorStatus();
|
|
11430
11438
|
}
|
|
11431
11439
|
|
|
11432
11440
|
this.DrawAnimation=function() //绘制动画 如弹幕
|
|
@@ -51882,7 +51890,6 @@ function ChartLock()
|
|
|
51882
51890
|
delete this.newMethod;
|
|
51883
51891
|
|
|
51884
51892
|
this.ClassName="ChartLock";
|
|
51885
|
-
this.WidthDiv = 0.2; // 框子宽度占比
|
|
51886
51893
|
this.LockCount = 20; // 锁最新的几个数据
|
|
51887
51894
|
this.BGColor = g_JSChartResource.IndexLock.BGColor;
|
|
51888
51895
|
this.TextColor = g_JSChartResource.IndexLock.TextColor;
|
|
@@ -51893,7 +51900,6 @@ function ChartLock()
|
|
|
51893
51900
|
this.Callback; //回调
|
|
51894
51901
|
this.IndexName; //指标名字
|
|
51895
51902
|
this.IndexID; //指标ID
|
|
51896
|
-
this.MinWidth=null; //最小宽度
|
|
51897
51903
|
|
|
51898
51904
|
|
|
51899
51905
|
this.CalculateTextSize=function(aryText, defaultFont, out)
|
|
@@ -51936,70 +51942,78 @@ function ChartLock()
|
|
|
51936
51942
|
return true;
|
|
51937
51943
|
}
|
|
51938
51944
|
|
|
51939
|
-
this.Draw=function(
|
|
51945
|
+
this.Draw=function(bDraw)
|
|
51940
51946
|
{
|
|
51941
51947
|
this.LockRect=null;
|
|
51948
|
+
if (!bDraw) return;
|
|
51942
51949
|
if (this.NotSupportMessage)
|
|
51943
51950
|
{
|
|
51944
51951
|
this.DrawNotSupportmessage();
|
|
51945
51952
|
return;
|
|
51946
51953
|
}
|
|
51947
51954
|
|
|
51948
|
-
|
|
51955
|
+
var bHScreen=this.ChartFrame.IsHScreen;
|
|
51956
|
+
var bMinute=this.IsMinuteFrame();
|
|
51957
|
+
var dataWidth=this.ChartFrame.DataWidth;
|
|
51958
|
+
var distanceWidth=this.ChartFrame.DistanceWidth;
|
|
51959
|
+
var xPointCount=this.ChartFrame.XPointCount;
|
|
51960
|
+
var border=this.ChartFrame.GetBorder();
|
|
51961
|
+
if (bHScreen)
|
|
51949
51962
|
{
|
|
51950
|
-
|
|
51951
|
-
|
|
51963
|
+
var chartright=border.BottomEx;
|
|
51964
|
+
var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
|
|
51965
|
+
}
|
|
51966
|
+
else
|
|
51967
|
+
{
|
|
51968
|
+
var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
|
|
51969
|
+
var chartright=border.RightEx;
|
|
51952
51970
|
}
|
|
51953
51971
|
|
|
51954
|
-
var
|
|
51955
|
-
var
|
|
51956
|
-
|
|
51957
|
-
if (this.ChartFrame.Data != null)
|
|
51972
|
+
var kData=this.ChartFrame.Data;
|
|
51973
|
+
var left=xOffset;
|
|
51974
|
+
if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
|
|
51958
51975
|
{
|
|
51959
|
-
var
|
|
51960
|
-
var distanceWidth=this.ChartFrame.DistanceWidth;
|
|
51961
|
-
xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
|
|
51962
|
-
var chartright=this.ChartBorder.GetRight();
|
|
51963
|
-
var xPointCount=this.ChartFrame.XPointCount;
|
|
51964
|
-
for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
|
|
51976
|
+
for(var i=kData.DataOffset,j=0;i<kData.Data.length-this.LockCount && j<xPointCount-this.LockCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
|
|
51965
51977
|
{
|
|
51966
|
-
var
|
|
51967
|
-
if (
|
|
51978
|
+
var kItem=kData.Data[i];
|
|
51979
|
+
if (kItem.Open==null || kItem.High==null || kItem.Low==null || kItem.Close==null) continue;
|
|
51968
51980
|
|
|
51969
|
-
|
|
51970
|
-
|
|
51971
|
-
|
|
51981
|
+
if (bMinute)
|
|
51982
|
+
{
|
|
51983
|
+
left=this.ChartFrame.GetXFromIndex(j);
|
|
51984
|
+
}
|
|
51985
|
+
else
|
|
51986
|
+
{
|
|
51987
|
+
left=xOffset;
|
|
51988
|
+
var right=xOffset+dataWidth;
|
|
51989
|
+
if (right>chartright) break;
|
|
51990
|
+
}
|
|
51972
51991
|
}
|
|
51973
|
-
lOffsetWidth = (dataWidth + distanceWidth) * this.LockCount;
|
|
51974
51992
|
}
|
|
51975
|
-
|
|
51993
|
+
|
|
51994
|
+
if (bHScreen)
|
|
51976
51995
|
{
|
|
51977
|
-
|
|
51978
|
-
|
|
51979
|
-
|
|
51980
|
-
if (lLeft < this.ChartBorder.GetLeft())
|
|
51981
|
-
lLeft = this.ChartBorder.GetLeft();
|
|
51982
|
-
var lWidth = this.ChartBorder.GetRight() - lLeft;
|
|
51996
|
+
var rtBG={ Left:border.Left, Right:border.RightEx, Top:left, Bottom:border.Bottom };
|
|
51997
|
+
rtBG.Width=rtBG.Right-rtBG.Left;
|
|
51998
|
+
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
51983
51999
|
|
|
51984
|
-
|
|
52000
|
+
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Right, rtBG.Top);
|
|
52001
|
+
this.Canvas.fillStyle =bgColor;
|
|
52002
|
+
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
52003
|
+
this.LockRect=rtBG; //保存上锁区域
|
|
52004
|
+
}
|
|
52005
|
+
else
|
|
51985
52006
|
{
|
|
51986
|
-
|
|
51987
|
-
|
|
51988
|
-
|
|
52007
|
+
var rtBG={ Left:left, Right:border.RightEx, Top:border.TopTitle, Bottom:border.Bottom };
|
|
52008
|
+
rtBG.Width=rtBG.Right-rtBG.Left;
|
|
52009
|
+
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
52010
|
+
//上下渐变
|
|
52011
|
+
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
|
|
52012
|
+
this.Canvas.fillStyle =bgColor;
|
|
52013
|
+
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
52014
|
+
this.LockRect=rtBG; //保存上锁区域
|
|
51989
52015
|
}
|
|
51990
52016
|
|
|
51991
|
-
var rtBG={ Left:lLeft, Top:border.TopTitle, Bottom:border.Bottom, Width:lWidth };
|
|
51992
|
-
rtBG.Right=rtBG.Width+rtBG.Left;
|
|
51993
|
-
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
51994
|
-
this.LockRect=rtBG; //保存上锁区域
|
|
51995
|
-
|
|
51996
|
-
if (!isDraw) return;
|
|
51997
|
-
|
|
51998
|
-
//上下渐变
|
|
51999
|
-
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
|
|
52000
|
-
this.Canvas.fillStyle =bgColor;
|
|
52001
|
-
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
52002
|
-
|
|
52003
52017
|
var aryText=null;
|
|
52004
52018
|
if (Array.isArray(this.Title)) aryText=this.Title;
|
|
52005
52019
|
else aryText=[{Text:this.Title}];
|
|
@@ -52007,85 +52021,57 @@ function ChartLock()
|
|
|
52007
52021
|
var outSize={ };
|
|
52008
52022
|
if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
|
|
52009
52023
|
|
|
52010
|
-
var left=rtBG.Left+(rtBG.Width-outSize.Width)/2;
|
|
52011
|
-
if (outSize.Width>rtBG.Width) left=rtBG.Right-outSize.Width;
|
|
52012
|
-
var top=rtBG.Top+(rtBG.Height-outSize.Height)/2;
|
|
52013
|
-
|
|
52014
52024
|
this.Canvas.textAlign='left';
|
|
52015
52025
|
this.Canvas.textBaseline='bottom';
|
|
52016
52026
|
this.Canvas.font = this.Font;
|
|
52017
|
-
|
|
52018
|
-
|
|
52027
|
+
|
|
52028
|
+
if (bHScreen)
|
|
52019
52029
|
{
|
|
52020
|
-
var
|
|
52021
|
-
if (
|
|
52022
|
-
|
|
52030
|
+
var top=rtBG.Top+(rtBG.Height-outSize.Width)/2;
|
|
52031
|
+
if (outSize.Width>rtBG.Height) top=rtBG.Bottom-outSize.Width;
|
|
52032
|
+
var left=rtBG.Left+(rtBG.Width-outSize.Height)/2;
|
|
52023
52033
|
|
|
52024
|
-
|
|
52025
|
-
this.Canvas.
|
|
52026
|
-
|
|
52027
|
-
|
|
52034
|
+
this.Canvas.save();
|
|
52035
|
+
this.Canvas.translate(left, top);
|
|
52036
|
+
this.Canvas.rotate(90 * Math.PI / 180);
|
|
52037
|
+
var yText=0,xText=0;
|
|
52038
|
+
for(var i=0;i<outSize.AryText.length;++i)
|
|
52039
|
+
{
|
|
52040
|
+
var item=outSize.AryText[i];
|
|
52041
|
+
if (item.Color) this.Canvas.fillStyle=item.Color;
|
|
52042
|
+
else this.Canvas.fillStyle=this.TextColor;
|
|
52028
52043
|
|
|
52029
|
-
|
|
52030
|
-
|
|
52031
|
-
|
|
52044
|
+
yText+=item.Height;
|
|
52045
|
+
this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
|
|
52046
|
+
}
|
|
52032
52047
|
|
|
52033
|
-
|
|
52034
|
-
|
|
52048
|
+
this.Canvas.restore();
|
|
52049
|
+
}
|
|
52050
|
+
else
|
|
52035
52051
|
{
|
|
52036
|
-
var
|
|
52037
|
-
|
|
52038
|
-
|
|
52039
|
-
|
|
52040
|
-
var
|
|
52041
|
-
|
|
52042
|
-
for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
|
|
52052
|
+
var left=rtBG.Left+(rtBG.Width-outSize.Width)/2;
|
|
52053
|
+
if (outSize.Width>rtBG.Width) left=rtBG.Right-outSize.Width;
|
|
52054
|
+
var top=rtBG.Top+(rtBG.Height-outSize.Height)/2;
|
|
52055
|
+
|
|
52056
|
+
var yText=top, xText=left;
|
|
52057
|
+
for(var i=0;i<outSize.AryText.length;++i)
|
|
52043
52058
|
{
|
|
52044
|
-
var
|
|
52045
|
-
if (
|
|
52059
|
+
var item=outSize.AryText[i];
|
|
52060
|
+
if (item.Color) this.Canvas.fillStyle=item.Color;
|
|
52061
|
+
else this.Canvas.fillStyle=this.TextColor;
|
|
52046
52062
|
|
|
52047
|
-
|
|
52048
|
-
|
|
52049
|
-
|
|
52050
|
-
}
|
|
52051
|
-
lOffsetWidth = (dataWidth + distanceWidth) * this.LockCount;
|
|
52052
|
-
}
|
|
52053
|
-
if (lOffsetWidth == 0)
|
|
52054
|
-
{
|
|
52055
|
-
lOffsetWidth = (xOffset - this.ChartBorder.GetTop()) * this.WidthDiv;
|
|
52063
|
+
yText+=item.Height;
|
|
52064
|
+
this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
|
|
52065
|
+
}
|
|
52056
52066
|
}
|
|
52057
|
-
|
|
52058
|
-
var lLeft = xOffset - lOffsetWidth;
|
|
52059
|
-
if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
|
|
52060
|
-
var lHeight = this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
|
|
52061
|
-
var lWidth = this.ChartBorder.GetBottom() - lLeft;
|
|
52062
|
-
|
|
52063
|
-
this.Canvas.fillStyle = this.BGColor;
|
|
52064
|
-
this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
|
|
52065
|
-
|
|
52066
|
-
var xCenter = this.ChartBorder.GetLeft() + lHeight / 2;
|
|
52067
|
-
var yCenter = lLeft + lWidth / 2;
|
|
52068
|
-
this.Canvas.save();
|
|
52069
|
-
this.Canvas.translate(xCenter, yCenter);
|
|
52070
|
-
this.Canvas.rotate(90 * Math.PI / 180);
|
|
52071
|
-
this.Canvas.textAlign = 'center';
|
|
52072
|
-
this.Canvas.textBaseline = 'middle';
|
|
52073
|
-
this.Canvas.fillStyle = this.TextColor;
|
|
52074
|
-
this.Canvas.font = this.Font;
|
|
52075
|
-
this.Canvas.fillText(this.Title, 0, 0);
|
|
52076
|
-
this.Canvas.restore();
|
|
52077
|
-
|
|
52078
|
-
this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth}; //保存上锁区域
|
|
52079
52067
|
}
|
|
52080
52068
|
|
|
52081
52069
|
//x,y是否在上锁区域
|
|
52082
52070
|
this.GetTooltipData=function(x,y,tooltip)
|
|
52083
52071
|
{
|
|
52084
|
-
if (this.LockRect
|
|
52072
|
+
if (!this.LockRect) return false;
|
|
52085
52073
|
|
|
52086
|
-
this.
|
|
52087
|
-
this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Height);
|
|
52088
|
-
if (this.Canvas.isPointInPath(x,y))
|
|
52074
|
+
if (Path2DHelper.PtInRect(x,y,this.LockRect))
|
|
52089
52075
|
{
|
|
52090
52076
|
tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
|
|
52091
52077
|
tooltip.ChartPaint=this;
|
|
@@ -62340,7 +62326,7 @@ function ChartCorssCursor()
|
|
|
62340
62326
|
|
|
62341
62327
|
this.Draw=function()
|
|
62342
62328
|
{
|
|
62343
|
-
this.Status=
|
|
62329
|
+
this.Status=JSCHART_CORSSCURSOR_STATUS_ID.NONE_ID;
|
|
62344
62330
|
this.RightButton.Rect=null;
|
|
62345
62331
|
this.BottomButton.Rect=null;
|
|
62346
62332
|
this.LastValue=null;
|
|
@@ -62487,6 +62473,7 @@ function ChartCorssCursor()
|
|
|
62487
62473
|
}
|
|
62488
62474
|
}
|
|
62489
62475
|
|
|
62476
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
|
|
62490
62477
|
this.Canvas.stroke();
|
|
62491
62478
|
this.Canvas.restore();
|
|
62492
62479
|
|
|
@@ -62543,6 +62530,7 @@ function ChartCorssCursor()
|
|
|
62543
62530
|
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
62544
62531
|
}
|
|
62545
62532
|
|
|
62533
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
|
|
62546
62534
|
}
|
|
62547
62535
|
else if (this.ShowTextMode.Left==2) //在框架内显示
|
|
62548
62536
|
{
|
|
@@ -62550,6 +62538,8 @@ function ChartCorssCursor()
|
|
|
62550
62538
|
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
62551
62539
|
rtBG.Top=rtBG.YCenter-rtBG.Height/2;
|
|
62552
62540
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
62541
|
+
|
|
62542
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_INTER_TEXT_ID;
|
|
62553
62543
|
}
|
|
62554
62544
|
|
|
62555
62545
|
if (rtBG)
|
|
@@ -62559,6 +62549,7 @@ function ChartCorssCursor()
|
|
|
62559
62549
|
this.Canvas.textBaseline="bottom";
|
|
62560
62550
|
this.Canvas.fillStyle=this.TextColor;
|
|
62561
62551
|
this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
|
|
62552
|
+
|
|
62562
62553
|
}
|
|
62563
62554
|
|
|
62564
62555
|
var complexText=
|
|
@@ -62680,6 +62671,8 @@ function ChartCorssCursor()
|
|
|
62680
62671
|
this.DrawComplexRightText(rtBG,complexText,textSize);
|
|
62681
62672
|
|
|
62682
62673
|
if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
|
|
62674
|
+
|
|
62675
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_TEXT_ID;
|
|
62683
62676
|
}
|
|
62684
62677
|
}
|
|
62685
62678
|
else if (this.ShowTextMode.Right==2) //框架内侧显示
|
|
@@ -62693,6 +62686,8 @@ function ChartCorssCursor()
|
|
|
62693
62686
|
this.DrawComplexRightText(rtBG,complexText,textSize);
|
|
62694
62687
|
|
|
62695
62688
|
if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
|
|
62689
|
+
|
|
62690
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_INTER_TEXT_ID;
|
|
62696
62691
|
}
|
|
62697
62692
|
}
|
|
62698
62693
|
|
|
@@ -62758,6 +62753,8 @@ function ChartCorssCursor()
|
|
|
62758
62753
|
if (this.StringFormatX.KItem) buttonData.KItem=this.StringFormatX.KItem;
|
|
62759
62754
|
this.BottomButton.Rect=rtBG;
|
|
62760
62755
|
this.BottomButton.Data=buttonData;
|
|
62756
|
+
|
|
62757
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.BOTTOM_TEXT_ID;
|
|
62761
62758
|
}
|
|
62762
62759
|
}
|
|
62763
62760
|
|
|
@@ -62806,8 +62803,6 @@ function ChartCorssCursor()
|
|
|
62806
62803
|
this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
|
|
62807
62804
|
}
|
|
62808
62805
|
}
|
|
62809
|
-
|
|
62810
|
-
this.Status=1;
|
|
62811
62806
|
}
|
|
62812
62807
|
|
|
62813
62808
|
this.DrawComplexRightText=function(rtBG, complexText, size)
|
|
@@ -63095,6 +63090,7 @@ function ChartCorssCursor()
|
|
|
63095
63090
|
|
|
63096
63091
|
this.HScreenDraw=function()
|
|
63097
63092
|
{
|
|
63093
|
+
this.Status=JSCHART_CORSSCURSOR_STATUS_ID.NONE_ID;
|
|
63098
63094
|
var x=this.LastPoint.X;
|
|
63099
63095
|
var y=this.LastPoint.Y;
|
|
63100
63096
|
|
|
@@ -63188,6 +63184,8 @@ function ChartCorssCursor()
|
|
|
63188
63184
|
}
|
|
63189
63185
|
}
|
|
63190
63186
|
|
|
63187
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID;
|
|
63188
|
+
|
|
63191
63189
|
this.Canvas.stroke();
|
|
63192
63190
|
this.Canvas.restore();
|
|
63193
63191
|
|
|
@@ -63248,6 +63246,8 @@ function ChartCorssCursor()
|
|
|
63248
63246
|
}
|
|
63249
63247
|
|
|
63250
63248
|
this.Canvas.restore();
|
|
63249
|
+
|
|
63250
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_TEXT_ID;
|
|
63251
63251
|
}
|
|
63252
63252
|
else if (this.ShowTextMode.Left==2)
|
|
63253
63253
|
{
|
|
@@ -63265,6 +63265,8 @@ function ChartCorssCursor()
|
|
|
63265
63265
|
this.Canvas.fillText(text,2,0,textWidth);
|
|
63266
63266
|
|
|
63267
63267
|
this.Canvas.restore();
|
|
63268
|
+
|
|
63269
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.LEFT_INTER_TEXT_ID;
|
|
63268
63270
|
}
|
|
63269
63271
|
|
|
63270
63272
|
if (this.StringFormatY.RText)
|
|
@@ -63335,6 +63337,8 @@ function ChartCorssCursor()
|
|
|
63335
63337
|
}
|
|
63336
63338
|
|
|
63337
63339
|
this.Canvas.restore();
|
|
63340
|
+
|
|
63341
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_TEXT_ID;
|
|
63338
63342
|
}
|
|
63339
63343
|
else if (this.ShowTextMode.Right==2)
|
|
63340
63344
|
{
|
|
@@ -63352,6 +63356,8 @@ function ChartCorssCursor()
|
|
|
63352
63356
|
this.Canvas.fillText(text,-2,0,textWidth);
|
|
63353
63357
|
|
|
63354
63358
|
this.Canvas.restore();
|
|
63359
|
+
|
|
63360
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.RIGHT_INTER_TEXT_ID;
|
|
63355
63361
|
}
|
|
63356
63362
|
}
|
|
63357
63363
|
|
|
@@ -63425,10 +63431,10 @@ function ChartCorssCursor()
|
|
|
63425
63431
|
|
|
63426
63432
|
this.Canvas.restore();
|
|
63427
63433
|
}
|
|
63434
|
+
|
|
63435
|
+
this.Status|=JSCHART_CORSSCURSOR_STATUS_ID.BOTTOM_TEXT_ID;
|
|
63428
63436
|
}
|
|
63429
63437
|
}
|
|
63430
|
-
|
|
63431
|
-
this.Status=1;
|
|
63432
63438
|
}
|
|
63433
63439
|
|
|
63434
63440
|
//data={ e:e, PreventDefault:false, KeyID, Draw:是否需要重绘 }
|
|
@@ -63500,6 +63506,7 @@ function ChartCorssCursor()
|
|
|
63500
63506
|
}
|
|
63501
63507
|
|
|
63502
63508
|
|
|
63509
|
+
|
|
63503
63510
|
////////////////////////////////////////////////////////////////////////////////
|
|
63504
63511
|
//深度图十字光标
|
|
63505
63512
|
function DepthChartCorssCursor()
|
|
@@ -90685,6 +90692,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
90685
90692
|
if (!item.Frame.LockPaint.GetTooltipData(x,y,tooltip)) continue;
|
|
90686
90693
|
|
|
90687
90694
|
tooltip.HQChart=this;
|
|
90695
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
|
|
90696
|
+
if (event && event.Callback)
|
|
90697
|
+
{
|
|
90698
|
+
var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
|
|
90699
|
+
event.Callback(event,sendData,this);
|
|
90700
|
+
}
|
|
90701
|
+
|
|
90688
90702
|
if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
|
|
90689
90703
|
return true;
|
|
90690
90704
|
}
|
|
@@ -153888,7 +153902,7 @@ function ScrollBarBGChart()
|
|
|
153888
153902
|
|
|
153889
153903
|
|
|
153890
153904
|
|
|
153891
|
-
var HQCHART_VERSION="1.1.
|
|
153905
|
+
var HQCHART_VERSION="1.1.15103";
|
|
153892
153906
|
|
|
153893
153907
|
function PrintHQChartVersion()
|
|
153894
153908
|
{
|
|
@@ -154042,7 +154056,8 @@ export default {
|
|
|
154042
154056
|
JSCHART_DATA_FIELD_ID:JSCHART_DATA_FIELD_ID,
|
|
154043
154057
|
JSCHART_WORKER_MESSAGE_ID:JSCHART_WORKER_MESSAGE_ID,
|
|
154044
154058
|
JSCHART_MENU_ID:JSCHART_MENU_ID,
|
|
154045
|
-
JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,
|
|
154059
|
+
JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID, //交易状态
|
|
154060
|
+
JSCHART_CORSSCURSOR_STATUS_ID:JSCHART_CORSSCURSOR_STATUS_ID, //十字光标状态
|
|
154046
154061
|
},
|
|
154047
154062
|
}
|
|
154048
154063
|
|