hqchart 1.1.14450 → 1.1.14455

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14450",
3
+ "version": "1.1.14455",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
@@ -491,6 +491,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
491
491
  if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
492
492
  if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
493
493
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
494
+
495
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
494
496
 
495
497
  }
496
498
 
@@ -984,6 +986,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
984
986
  if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
985
987
  if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
986
988
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
989
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
987
990
  }
988
991
 
989
992
  if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -2875,6 +2878,7 @@ var JSCHART_MENU_ID=
2875
2878
  CMD_CORSS_ON_CLOSE_LINE_ID:49, //十字光标在价格线上(分时图)
2876
2879
  CMD_CORSS_ON_VAILD_TIME_ID:50, //超出当前时间的,X轴调整到当前最后的时间(分时图)
2877
2880
  CMD_CORSS_ON_KLINE_ID:51, //十字光标只能画在K线上
2881
+ CMD_CORSS_POINT_ID:52, //十字光标圆点
2878
2882
 
2879
2883
 
2880
2884
 
@@ -10277,6 +10281,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
10277
10281
  this.ChartCorssCursor.IsShowClose=srcParam;
10278
10282
  }
10279
10283
  break;
10284
+ case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
10285
+ if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
10286
+ break;
10280
10287
  }
10281
10288
  }
10282
10289
 
@@ -53485,6 +53492,13 @@ function ChartCorssCursor()
53485
53492
  this.IsFixXLastTime=false; //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
53486
53493
  this.IsDrawXRangeBG=false; //是否绘制十字光标背景
53487
53494
 
53495
+ this.CorssPointConfig=
53496
+ {
53497
+ Enable:false,
53498
+ Center:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center),
53499
+ Border:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border)
53500
+ }
53501
+
53488
53502
  this.EnableNewIndex=false; //分时图是否使用最新的索引结构 (由外部chart容器传入)
53489
53503
  this.CorssCursorIndex; //分时图新版本的索引结构 (由外部chart容器传入)
53490
53504
 
@@ -53533,6 +53547,10 @@ function ChartCorssCursor()
53533
53547
  this.BorderColor=g_JSChartResource.CorssCursorBorderColor; //边框颜色
53534
53548
  this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
53535
53549
  this.LineDash=g_JSChartResource.CorssCursorLineDash.slice(); //虚线
53550
+
53551
+
53552
+ this.CorssPointConfig.Center=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center);
53553
+ this.CorssPointConfig.Border=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border);
53536
53554
  }
53537
53555
 
53538
53556
  this.GetCloseYPoint=function(index)
@@ -53857,7 +53875,10 @@ function ChartCorssCursor()
53857
53875
 
53858
53876
  this.Canvas.stroke();
53859
53877
  this.Canvas.restore();
53860
-
53878
+
53879
+ this.Canvas.save();
53880
+ this.DrawCorssPoint(x,y);
53881
+ this.Canvas.restore();
53861
53882
  }
53862
53883
 
53863
53884
  var xValue=this.Frame.GetXData(x);
@@ -54460,6 +54481,10 @@ function ChartCorssCursor()
54460
54481
 
54461
54482
  this.Canvas.stroke();
54462
54483
  this.Canvas.restore();
54484
+
54485
+ this.Canvas.save();
54486
+ this.DrawCorssPoint(x,y);
54487
+ this.Canvas.restore();
54463
54488
  }
54464
54489
 
54465
54490
  var xValue=this.Frame.GetXData(y);
@@ -54719,6 +54744,30 @@ function ChartCorssCursor()
54719
54744
  }
54720
54745
  }
54721
54746
 
54747
+
54748
+ this.DrawCorssPoint=function(x,y)
54749
+ {
54750
+ var config=this.CorssPointConfig;
54751
+ if (!config.Enable) return;
54752
+
54753
+ this.Canvas.beginPath();
54754
+ this.Canvas.arc(x,y,config.Center.Radius,0,360,false);
54755
+ this.Canvas.closePath();
54756
+
54757
+ if (config.Center && config.Center.Color)
54758
+ {
54759
+ this.Canvas.fillStyle=config.Center.Color;
54760
+ this.Canvas.fill();
54761
+ }
54762
+
54763
+ if (config.Border && config.Border.Color)
54764
+ {
54765
+ this.Canvas.strokeStyle=config.Border.Color;
54766
+ if (IFrameSplitOperator.IsNumber(config.Border.Width)) this.Canvas.lineWidth=config.Border.Width;
54767
+ this.Canvas.stroke();
54768
+ }
54769
+ }
54770
+
54722
54771
  }
54723
54772
 
54724
54773
 
@@ -71462,7 +71511,9 @@ function JSChartResource()
71462
71511
  RightMargin: { Left:2, Right:2, Top:5, Bottom:3 },
71463
71512
 
71464
71513
  BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
71465
- LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } }
71514
+ LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
71515
+
71516
+ CorssPoint:{ Center:{ Radius:5*GetDevicePixelRatio(), Color:"rgb(50,171,205)"}, Border:{ Color:'rgb(255,255,255)', Width:1*GetDevicePixelRatio() } }
71466
71517
  };
71467
71518
 
71468
71519
  this.LockBGColor = "rgb(220, 220, 220)"; //指标锁区域颜色
@@ -72901,6 +72952,26 @@ function JSChartResource()
72901
72952
  if (item.PenColor) this.CorssCursor.RightButton.PenColor=item.PenColor;
72902
72953
  if (item.Icon) this.CorssCursor.RightButton.Icon=item.Icon;
72903
72954
  }
72955
+
72956
+ if (style.CorssCursor && style.CorssCursor.CorssPoint)
72957
+ {
72958
+ var item=style.CorssCursor.CorssPoint;
72959
+ if (item.Center)
72960
+ {
72961
+ var subItem=item.Center;
72962
+ var subDest=this.CorssCursor.CorssPoint.Center;
72963
+ if (IFrameSplitOperator.IsNumber(subItem.Radius)) subDest.Radius=subItem.Radius;
72964
+ if (subItem.Color) subDest.Color=subItem.Color;
72965
+ }
72966
+
72967
+ if (item.Border)
72968
+ {
72969
+ var subItem=item.Border;
72970
+ var subDest=this.CorssCursor.CorssPoint.Border;
72971
+ if (IFrameSplitOperator.IsNumber(subItem.Width)) subDest.Width=subItem.Width;
72972
+ if (subItem.Color) subDest.Color=subItem.Color;
72973
+ }
72974
+ }
72904
72975
 
72905
72976
  if (style.KLine) this.KLine = style.KLine;
72906
72977
  if (style.VirtualKLine)
@@ -80921,11 +80992,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
80921
80992
  var bShowCorss=false; //十字光标十字线
80922
80993
  var bCorssDrawKLine=false;
80923
80994
  var bCorssDrawVaildTime=false;
80995
+ var bCorssDrawPoint=false;
80924
80996
  if (this.ChartCorssCursor)
80925
80997
  {
80926
80998
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
80927
80999
  bCorssDrawKLine=this.ChartCorssCursor.IsOnlyDrawKLine && this.ChartCorssCursor.IsShowClose;
80928
81000
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
81001
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
80929
81002
  }
80930
81003
 
80931
81004
  var bPopMinuteChart=false;
@@ -81102,6 +81175,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
81102
81175
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
81103
81176
  { Name:"显示在K线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_KLINE_ID, Args:[!bCorssDrawKLine]}, Checked:bCorssDrawKLine },
81104
81177
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
81178
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
81105
81179
  ]
81106
81180
  },
81107
81181
  {
@@ -85081,11 +85155,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
85081
85155
  var bShowCorss=false; //十字光标十字线
85082
85156
  var bCorssDrawCloseLine=false; //十字光标只能画在走势图价格线上
85083
85157
  var bCorssDrawVaildTime=false;
85158
+ var bCorssDrawPoint=false;
85084
85159
  if (this.ChartCorssCursor)
85085
85160
  {
85086
85161
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
85087
85162
  bCorssDrawCloseLine=this.ChartCorssCursor.IsOnlyDrawMinute;
85088
85163
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
85164
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
85089
85165
  }
85090
85166
 
85091
85167
 
@@ -85170,6 +85246,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
85170
85246
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
85171
85247
  { Name:"画在价格线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_CLOSE_LINE_ID, Args:[!bCorssDrawCloseLine]}, Checked:bCorssDrawCloseLine },
85172
85248
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
85249
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
85173
85250
  ]
85174
85251
  },
85175
85252
 
@@ -188,7 +188,9 @@ function GetBlackStyle()
188
188
  BGColor:'rgb(43,54,69)',
189
189
  PenColor:'rgb(255,255,255)',
190
190
  Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
191
- }
191
+ },
192
+
193
+ CorssPoint:{ Center:{ Color:"rgb(50,171,205)" }, Border:{ Color:'rgba(0,0,0,0.8)', Width:1*GetDevicePixelRatio() } }
192
194
  },
193
195
 
194
196
  //订单流配置
@@ -4416,6 +4416,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4416
4416
  if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
4417
4417
  if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
4418
4418
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
4419
+
4420
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
4419
4421
 
4420
4422
  }
4421
4423
 
@@ -4909,6 +4911,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4909
4911
  if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
4910
4912
  if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
4911
4913
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
4914
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
4912
4915
  }
4913
4916
 
4914
4917
  if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -6800,6 +6803,7 @@ var JSCHART_MENU_ID=
6800
6803
  CMD_CORSS_ON_CLOSE_LINE_ID:49, //十字光标在价格线上(分时图)
6801
6804
  CMD_CORSS_ON_VAILD_TIME_ID:50, //超出当前时间的,X轴调整到当前最后的时间(分时图)
6802
6805
  CMD_CORSS_ON_KLINE_ID:51, //十字光标只能画在K线上
6806
+ CMD_CORSS_POINT_ID:52, //十字光标圆点
6803
6807
 
6804
6808
 
6805
6809
 
@@ -14202,6 +14206,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
14202
14206
  this.ChartCorssCursor.IsShowClose=srcParam;
14203
14207
  }
14204
14208
  break;
14209
+ case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
14210
+ if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
14211
+ break;
14205
14212
  }
14206
14213
  }
14207
14214
 
@@ -57410,6 +57417,13 @@ function ChartCorssCursor()
57410
57417
  this.IsFixXLastTime=false; //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
57411
57418
  this.IsDrawXRangeBG=false; //是否绘制十字光标背景
57412
57419
 
57420
+ this.CorssPointConfig=
57421
+ {
57422
+ Enable:false,
57423
+ Center:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center),
57424
+ Border:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border)
57425
+ }
57426
+
57413
57427
  this.EnableNewIndex=false; //分时图是否使用最新的索引结构 (由外部chart容器传入)
57414
57428
  this.CorssCursorIndex; //分时图新版本的索引结构 (由外部chart容器传入)
57415
57429
 
@@ -57458,6 +57472,10 @@ function ChartCorssCursor()
57458
57472
  this.BorderColor=g_JSChartResource.CorssCursorBorderColor; //边框颜色
57459
57473
  this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
57460
57474
  this.LineDash=g_JSChartResource.CorssCursorLineDash.slice(); //虚线
57475
+
57476
+
57477
+ this.CorssPointConfig.Center=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center);
57478
+ this.CorssPointConfig.Border=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border);
57461
57479
  }
57462
57480
 
57463
57481
  this.GetCloseYPoint=function(index)
@@ -57782,7 +57800,10 @@ function ChartCorssCursor()
57782
57800
 
57783
57801
  this.Canvas.stroke();
57784
57802
  this.Canvas.restore();
57785
-
57803
+
57804
+ this.Canvas.save();
57805
+ this.DrawCorssPoint(x,y);
57806
+ this.Canvas.restore();
57786
57807
  }
57787
57808
 
57788
57809
  var xValue=this.Frame.GetXData(x);
@@ -58385,6 +58406,10 @@ function ChartCorssCursor()
58385
58406
 
58386
58407
  this.Canvas.stroke();
58387
58408
  this.Canvas.restore();
58409
+
58410
+ this.Canvas.save();
58411
+ this.DrawCorssPoint(x,y);
58412
+ this.Canvas.restore();
58388
58413
  }
58389
58414
 
58390
58415
  var xValue=this.Frame.GetXData(y);
@@ -58644,6 +58669,30 @@ function ChartCorssCursor()
58644
58669
  }
58645
58670
  }
58646
58671
 
58672
+
58673
+ this.DrawCorssPoint=function(x,y)
58674
+ {
58675
+ var config=this.CorssPointConfig;
58676
+ if (!config.Enable) return;
58677
+
58678
+ this.Canvas.beginPath();
58679
+ this.Canvas.arc(x,y,config.Center.Radius,0,360,false);
58680
+ this.Canvas.closePath();
58681
+
58682
+ if (config.Center && config.Center.Color)
58683
+ {
58684
+ this.Canvas.fillStyle=config.Center.Color;
58685
+ this.Canvas.fill();
58686
+ }
58687
+
58688
+ if (config.Border && config.Border.Color)
58689
+ {
58690
+ this.Canvas.strokeStyle=config.Border.Color;
58691
+ if (IFrameSplitOperator.IsNumber(config.Border.Width)) this.Canvas.lineWidth=config.Border.Width;
58692
+ this.Canvas.stroke();
58693
+ }
58694
+ }
58695
+
58647
58696
  }
58648
58697
 
58649
58698
 
@@ -75387,7 +75436,9 @@ function JSChartResource()
75387
75436
  RightMargin: { Left:2, Right:2, Top:5, Bottom:3 },
75388
75437
 
75389
75438
  BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
75390
- LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } }
75439
+ LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
75440
+
75441
+ CorssPoint:{ Center:{ Radius:5*GetDevicePixelRatio(), Color:"rgb(50,171,205)"}, Border:{ Color:'rgb(255,255,255)', Width:1*GetDevicePixelRatio() } }
75391
75442
  };
75392
75443
 
75393
75444
  this.LockBGColor = "rgb(220, 220, 220)"; //指标锁区域颜色
@@ -76826,6 +76877,26 @@ function JSChartResource()
76826
76877
  if (item.PenColor) this.CorssCursor.RightButton.PenColor=item.PenColor;
76827
76878
  if (item.Icon) this.CorssCursor.RightButton.Icon=item.Icon;
76828
76879
  }
76880
+
76881
+ if (style.CorssCursor && style.CorssCursor.CorssPoint)
76882
+ {
76883
+ var item=style.CorssCursor.CorssPoint;
76884
+ if (item.Center)
76885
+ {
76886
+ var subItem=item.Center;
76887
+ var subDest=this.CorssCursor.CorssPoint.Center;
76888
+ if (IFrameSplitOperator.IsNumber(subItem.Radius)) subDest.Radius=subItem.Radius;
76889
+ if (subItem.Color) subDest.Color=subItem.Color;
76890
+ }
76891
+
76892
+ if (item.Border)
76893
+ {
76894
+ var subItem=item.Border;
76895
+ var subDest=this.CorssCursor.CorssPoint.Border;
76896
+ if (IFrameSplitOperator.IsNumber(subItem.Width)) subDest.Width=subItem.Width;
76897
+ if (subItem.Color) subDest.Color=subItem.Color;
76898
+ }
76899
+ }
76829
76900
 
76830
76901
  if (style.KLine) this.KLine = style.KLine;
76831
76902
  if (style.VirtualKLine)
@@ -84846,11 +84917,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
84846
84917
  var bShowCorss=false; //十字光标十字线
84847
84918
  var bCorssDrawKLine=false;
84848
84919
  var bCorssDrawVaildTime=false;
84920
+ var bCorssDrawPoint=false;
84849
84921
  if (this.ChartCorssCursor)
84850
84922
  {
84851
84923
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
84852
84924
  bCorssDrawKLine=this.ChartCorssCursor.IsOnlyDrawKLine && this.ChartCorssCursor.IsShowClose;
84853
84925
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
84926
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
84854
84927
  }
84855
84928
 
84856
84929
  var bPopMinuteChart=false;
@@ -85027,6 +85100,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
85027
85100
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
85028
85101
  { Name:"显示在K线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_KLINE_ID, Args:[!bCorssDrawKLine]}, Checked:bCorssDrawKLine },
85029
85102
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
85103
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
85030
85104
  ]
85031
85105
  },
85032
85106
  {
@@ -89006,11 +89080,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89006
89080
  var bShowCorss=false; //十字光标十字线
89007
89081
  var bCorssDrawCloseLine=false; //十字光标只能画在走势图价格线上
89008
89082
  var bCorssDrawVaildTime=false;
89083
+ var bCorssDrawPoint=false;
89009
89084
  if (this.ChartCorssCursor)
89010
89085
  {
89011
89086
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
89012
89087
  bCorssDrawCloseLine=this.ChartCorssCursor.IsOnlyDrawMinute;
89013
89088
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
89089
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
89014
89090
  }
89015
89091
 
89016
89092
 
@@ -89095,6 +89171,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89095
89171
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
89096
89172
  { Name:"画在价格线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_CLOSE_LINE_ID, Args:[!bCorssDrawCloseLine]}, Checked:bCorssDrawCloseLine },
89097
89173
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
89174
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
89098
89175
  ]
89099
89176
  },
89100
89177
 
@@ -128531,7 +128608,9 @@ function GetBlackStyle()
128531
128608
  BGColor:'rgb(43,54,69)',
128532
128609
  PenColor:'rgb(255,255,255)',
128533
128610
  Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
128534
- }
128611
+ },
128612
+
128613
+ CorssPoint:{ Center:{ Color:"rgb(50,171,205)" }, Border:{ Color:'rgba(0,0,0,0.8)', Width:1*GetDevicePixelRatio() } }
128535
128614
  },
128536
128615
 
128537
128616
  //订单流配置
@@ -143494,7 +143573,7 @@ function ScrollBarBGChart()
143494
143573
 
143495
143574
 
143496
143575
 
143497
- var HQCHART_VERSION="1.1.14449";
143576
+ var HQCHART_VERSION="1.1.14454";
143498
143577
 
143499
143578
  function PrintHQChartVersion()
143500
143579
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14449";
8
+ var HQCHART_VERSION="1.1.14454";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -4460,6 +4460,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4460
4460
  if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
4461
4461
  if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
4462
4462
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
4463
+
4464
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
4463
4465
 
4464
4466
  }
4465
4467
 
@@ -4953,6 +4955,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4953
4955
  if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
4954
4956
  if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
4955
4957
  if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
4958
+ if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
4956
4959
  }
4957
4960
 
4958
4961
  if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -6844,6 +6847,7 @@ var JSCHART_MENU_ID=
6844
6847
  CMD_CORSS_ON_CLOSE_LINE_ID:49, //十字光标在价格线上(分时图)
6845
6848
  CMD_CORSS_ON_VAILD_TIME_ID:50, //超出当前时间的,X轴调整到当前最后的时间(分时图)
6846
6849
  CMD_CORSS_ON_KLINE_ID:51, //十字光标只能画在K线上
6850
+ CMD_CORSS_POINT_ID:52, //十字光标圆点
6847
6851
 
6848
6852
 
6849
6853
 
@@ -14246,6 +14250,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
14246
14250
  this.ChartCorssCursor.IsShowClose=srcParam;
14247
14251
  }
14248
14252
  break;
14253
+ case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
14254
+ if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
14255
+ break;
14249
14256
  }
14250
14257
  }
14251
14258
 
@@ -57454,6 +57461,13 @@ function ChartCorssCursor()
57454
57461
  this.IsFixXLastTime=false; //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
57455
57462
  this.IsDrawXRangeBG=false; //是否绘制十字光标背景
57456
57463
 
57464
+ this.CorssPointConfig=
57465
+ {
57466
+ Enable:false,
57467
+ Center:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center),
57468
+ Border:CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border)
57469
+ }
57470
+
57457
57471
  this.EnableNewIndex=false; //分时图是否使用最新的索引结构 (由外部chart容器传入)
57458
57472
  this.CorssCursorIndex; //分时图新版本的索引结构 (由外部chart容器传入)
57459
57473
 
@@ -57502,6 +57516,10 @@ function ChartCorssCursor()
57502
57516
  this.BorderColor=g_JSChartResource.CorssCursorBorderColor; //边框颜色
57503
57517
  this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
57504
57518
  this.LineDash=g_JSChartResource.CorssCursorLineDash.slice(); //虚线
57519
+
57520
+
57521
+ this.CorssPointConfig.Center=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center);
57522
+ this.CorssPointConfig.Border=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border);
57505
57523
  }
57506
57524
 
57507
57525
  this.GetCloseYPoint=function(index)
@@ -57826,7 +57844,10 @@ function ChartCorssCursor()
57826
57844
 
57827
57845
  this.Canvas.stroke();
57828
57846
  this.Canvas.restore();
57829
-
57847
+
57848
+ this.Canvas.save();
57849
+ this.DrawCorssPoint(x,y);
57850
+ this.Canvas.restore();
57830
57851
  }
57831
57852
 
57832
57853
  var xValue=this.Frame.GetXData(x);
@@ -58429,6 +58450,10 @@ function ChartCorssCursor()
58429
58450
 
58430
58451
  this.Canvas.stroke();
58431
58452
  this.Canvas.restore();
58453
+
58454
+ this.Canvas.save();
58455
+ this.DrawCorssPoint(x,y);
58456
+ this.Canvas.restore();
58432
58457
  }
58433
58458
 
58434
58459
  var xValue=this.Frame.GetXData(y);
@@ -58688,6 +58713,30 @@ function ChartCorssCursor()
58688
58713
  }
58689
58714
  }
58690
58715
 
58716
+
58717
+ this.DrawCorssPoint=function(x,y)
58718
+ {
58719
+ var config=this.CorssPointConfig;
58720
+ if (!config.Enable) return;
58721
+
58722
+ this.Canvas.beginPath();
58723
+ this.Canvas.arc(x,y,config.Center.Radius,0,360,false);
58724
+ this.Canvas.closePath();
58725
+
58726
+ if (config.Center && config.Center.Color)
58727
+ {
58728
+ this.Canvas.fillStyle=config.Center.Color;
58729
+ this.Canvas.fill();
58730
+ }
58731
+
58732
+ if (config.Border && config.Border.Color)
58733
+ {
58734
+ this.Canvas.strokeStyle=config.Border.Color;
58735
+ if (IFrameSplitOperator.IsNumber(config.Border.Width)) this.Canvas.lineWidth=config.Border.Width;
58736
+ this.Canvas.stroke();
58737
+ }
58738
+ }
58739
+
58691
58740
  }
58692
58741
 
58693
58742
 
@@ -75431,7 +75480,9 @@ function JSChartResource()
75431
75480
  RightMargin: { Left:2, Right:2, Top:5, Bottom:3 },
75432
75481
 
75433
75482
  BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
75434
- LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } }
75483
+ LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
75484
+
75485
+ CorssPoint:{ Center:{ Radius:5*GetDevicePixelRatio(), Color:"rgb(50,171,205)"}, Border:{ Color:'rgb(255,255,255)', Width:1*GetDevicePixelRatio() } }
75435
75486
  };
75436
75487
 
75437
75488
  this.LockBGColor = "rgb(220, 220, 220)"; //指标锁区域颜色
@@ -76870,6 +76921,26 @@ function JSChartResource()
76870
76921
  if (item.PenColor) this.CorssCursor.RightButton.PenColor=item.PenColor;
76871
76922
  if (item.Icon) this.CorssCursor.RightButton.Icon=item.Icon;
76872
76923
  }
76924
+
76925
+ if (style.CorssCursor && style.CorssCursor.CorssPoint)
76926
+ {
76927
+ var item=style.CorssCursor.CorssPoint;
76928
+ if (item.Center)
76929
+ {
76930
+ var subItem=item.Center;
76931
+ var subDest=this.CorssCursor.CorssPoint.Center;
76932
+ if (IFrameSplitOperator.IsNumber(subItem.Radius)) subDest.Radius=subItem.Radius;
76933
+ if (subItem.Color) subDest.Color=subItem.Color;
76934
+ }
76935
+
76936
+ if (item.Border)
76937
+ {
76938
+ var subItem=item.Border;
76939
+ var subDest=this.CorssCursor.CorssPoint.Border;
76940
+ if (IFrameSplitOperator.IsNumber(subItem.Width)) subDest.Width=subItem.Width;
76941
+ if (subItem.Color) subDest.Color=subItem.Color;
76942
+ }
76943
+ }
76873
76944
 
76874
76945
  if (style.KLine) this.KLine = style.KLine;
76875
76946
  if (style.VirtualKLine)
@@ -84890,11 +84961,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
84890
84961
  var bShowCorss=false; //十字光标十字线
84891
84962
  var bCorssDrawKLine=false;
84892
84963
  var bCorssDrawVaildTime=false;
84964
+ var bCorssDrawPoint=false;
84893
84965
  if (this.ChartCorssCursor)
84894
84966
  {
84895
84967
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
84896
84968
  bCorssDrawKLine=this.ChartCorssCursor.IsOnlyDrawKLine && this.ChartCorssCursor.IsShowClose;
84897
84969
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
84970
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
84898
84971
  }
84899
84972
 
84900
84973
  var bPopMinuteChart=false;
@@ -85071,6 +85144,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
85071
85144
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
85072
85145
  { Name:"显示在K线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_KLINE_ID, Args:[!bCorssDrawKLine]}, Checked:bCorssDrawKLine },
85073
85146
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
85147
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
85074
85148
  ]
85075
85149
  },
85076
85150
  {
@@ -89050,11 +89124,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89050
89124
  var bShowCorss=false; //十字光标十字线
89051
89125
  var bCorssDrawCloseLine=false; //十字光标只能画在走势图价格线上
89052
89126
  var bCorssDrawVaildTime=false;
89127
+ var bCorssDrawPoint=false;
89053
89128
  if (this.ChartCorssCursor)
89054
89129
  {
89055
89130
  bShowCorss=this.ChartCorssCursor.IsShowCorss;
89056
89131
  bCorssDrawCloseLine=this.ChartCorssCursor.IsOnlyDrawMinute;
89057
89132
  bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
89133
+ bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
89058
89134
  }
89059
89135
 
89060
89136
 
@@ -89139,6 +89215,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89139
89215
  { Name:"显示", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
89140
89216
  { Name:"画在价格线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_CLOSE_LINE_ID, Args:[!bCorssDrawCloseLine]}, Checked:bCorssDrawCloseLine },
89141
89217
  { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
89218
+ { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
89142
89219
  ]
89143
89220
  },
89144
89221
 
@@ -128575,7 +128652,9 @@ function GetBlackStyle()
128575
128652
  BGColor:'rgb(43,54,69)',
128576
128653
  PenColor:'rgb(255,255,255)',
128577
128654
  Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
128578
- }
128655
+ },
128656
+
128657
+ CorssPoint:{ Center:{ Color:"rgb(50,171,205)" }, Border:{ Color:'rgba(0,0,0,0.8)', Width:1*GetDevicePixelRatio() } }
128579
128658
  },
128580
128659
 
128581
128660
  //订单流配置
@@ -153306,7 +153385,7 @@ function HQChartScriptWorker()
153306
153385
 
153307
153386
 
153308
153387
 
153309
- var HQCHART_VERSION="1.1.14449";
153388
+ var HQCHART_VERSION="1.1.14454";
153310
153389
 
153311
153390
  function PrintHQChartVersion()
153312
153391
  {