hqchart 1.1.14713 → 1.1.14722

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.
@@ -6869,6 +6869,8 @@ var JSCHART_EVENT_ID=
6869
6869
  ON_TOUCH_FAST_SLIDE:169, //快速滑动
6870
6870
 
6871
6871
  ON_CLICK_CROSSCURSOR_BOTTOM:170, //十字光标底部文字点击
6872
+
6873
+ ON_CLICK_CHART_CELL:171, //点击图形单元
6872
6874
  }
6873
6875
 
6874
6876
  var JSCHART_OPERATOR_ID=
@@ -7300,7 +7302,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7300
7302
  this.EnableVerticalDrag=false;
7301
7303
 
7302
7304
  //十字光标长留(手势才有)
7303
- this.ClickModel={ IsShowCorssCursor:false, PreventHide:false }; //PreventHide 阻止隐藏十字光标
7305
+ this.ClickModel={ IsShowCorssCursor:false, PreventHide:false, IsClickButton:false }; //PreventHide 阻止隐藏十字光标
7304
7306
  this.EnableClickModel=false;
7305
7307
 
7306
7308
  //标题栏显示最新数据
@@ -7782,6 +7784,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7782
7784
  if (this.IndexChartDrag) return;
7783
7785
  if (this.CustomChartDrag) return;
7784
7786
  //if (this.RectSelectDrag) return;
7787
+ if (this.EnableClickModel && this.ClickModel.IsClickButton) return;
7785
7788
 
7786
7789
  /*
7787
7790
  if (this.CurrentChartDrawPicture)
@@ -7998,7 +8001,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7998
8001
  if (item.IsHideScriptIndex()) continue;
7999
8002
 
8000
8003
  result=item.ClickCell(x,y,e);
8001
- if (result) return result;
8004
+ if (result)
8005
+ {
8006
+ result.Chart=item;
8007
+ return result;
8008
+ }
8002
8009
  }
8003
8010
 
8004
8011
  for(var i=0;i<this.OverlayChartPaint.length;++i)
@@ -8007,7 +8014,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
8007
8014
  if (!item.ClickCell) continue;
8008
8015
 
8009
8016
  result=item.ClickCell(x,y,e);
8010
- if (result) return result;
8017
+ if (result)
8018
+ {
8019
+ result.Chart=item;
8020
+ result.IsOverlayChart=true;
8021
+ return result;
8022
+ }
8011
8023
  }
8012
8024
 
8013
8025
  for(var i=0,j=0,k=0;i<this.Frame.SubFrame.length;++i)
@@ -8028,7 +8040,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
8028
8040
  if (chart.ClickCell)
8029
8041
  {
8030
8042
  result=chart.ClickCell(x,y,e);
8031
- if (result) return result;
8043
+ if (result)
8044
+ {
8045
+ result.Chart=chart;
8046
+ result.IsOverlayIndex=true;
8047
+ return result;
8048
+ }
8032
8049
  }
8033
8050
  }
8034
8051
  }
@@ -8352,6 +8369,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
8352
8369
 
8353
8370
  if (clickCellData)
8354
8371
  {
8372
+ var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CHART_CELL); //点击图形单个元素
8373
+ if (event && event.Callback)
8374
+ {
8375
+ var data={ Event:e, CellData:clickCellData };
8376
+ event.Callback(event,data,this);
8377
+ }
8378
+
8355
8379
  if (clickCellData.Redraw===true) bRedraw=true;
8356
8380
  }
8357
8381
  else
@@ -9049,6 +9073,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
9049
9073
  this.UIOnMounseOut=function(e)
9050
9074
  {
9051
9075
  JSConsole.Chart.Log('[KLineChartContainer::UIOnMounseOut]',e);
9076
+ if (this.EnableClickModel && this.ClickModel.IsShowCorssCursor==true) return; //点击模式 十字光标显示下 不需要处理
9077
+
9052
9078
  if (!this.IsLockCorssCursor()) this.UIOnMouseMove(e); //锁十字光标时, 始终显示十字光标
9053
9079
  }
9054
9080
 
@@ -9468,7 +9494,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
9468
9494
  this.TouchDrawCount=0;
9469
9495
  this.PhonePinch=null;
9470
9496
  this.TouchDrag=null;
9471
- if (this.ClickModel) this.ClickModel.PreventHide=false;
9497
+ this.ClickModel.IsClickButton=false;
9498
+ this.ClickModel.PreventHide=false;
9499
+
9500
+
9472
9501
  this.StopDragTimer();
9473
9502
 
9474
9503
  var isSingleTouch=this.IsSingleTouch(e);
@@ -9484,8 +9513,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
9484
9513
  var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
9485
9514
 
9486
9515
  if (this.TryPhoneClickButton(pt.X, pt.Y, e))
9516
+ {
9517
+ this.ClickModel.IsClickButton=true;
9487
9518
  return;
9488
-
9519
+ }
9520
+
9489
9521
  if (this.EnableVerticalDrag )
9490
9522
  {
9491
9523
  this.VerticalDrag={ IsDrag:false };
@@ -9670,6 +9702,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
9670
9702
  if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
9671
9703
 
9672
9704
  var touches=this.GetToucheData(e,this.IsForceLandscape);
9705
+ this.ClickModel.IsClickButton=false;
9673
9706
 
9674
9707
  if (this.IsPhoneDragging(e))
9675
9708
  {
@@ -59962,7 +59995,7 @@ function ChartCorssCursor()
59962
59995
  Enable:false, Rect:null,
59963
59996
  BGColor:g_JSChartResource.CorssCursor.RightButton.BGColor ,
59964
59997
  PenColor:g_JSChartResource.CorssCursor.RightButton.PenColor,
59965
- Icon:g_JSChartResource.CorssCursor.RightButton.Icon
59998
+ Icon:CloneData(g_JSChartResource.CorssCursor.RightButton.Icon)
59966
59999
  };
59967
60000
 
59968
60001
  //底部按钮
@@ -59971,9 +60004,11 @@ function ChartCorssCursor()
59971
60004
  Enable:false, Rect:null,
59972
60005
  }
59973
60006
 
59974
- this.RightMargin=CloneData(g_JSChartResource.CorssCursor.RightMargin);
59975
- this.BottomConfig=CloneData(g_JSChartResource.CorssCursor.BottomText); //底部输出配置
59976
- this.LeftConfig=CloneData(g_JSChartResource.CorssCursor.LeftText);
60007
+ this.BottomConfig=CloneData(g_JSChartResource.CorssCursor.BottomText); //底部输出配置
60008
+ this.LeftConfig=CloneData(g_JSChartResource.CorssCursor.LeftText); //左侧输出配置
60009
+ this.RightConfig=CloneData(g_JSChartResource.CorssCursor.RightText); //右侧输出配置
60010
+ this.RightOverlayConfig=CloneData(g_JSChartResource.CorssCursor.RightOverlayText); //右侧叠加指标输出配置
60011
+
59977
60012
 
59978
60013
  //内部使用
59979
60014
  this.Close=null; //收盘价格
@@ -59991,6 +60026,10 @@ function ChartCorssCursor()
59991
60026
  this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
59992
60027
  this.LineDash=g_JSChartResource.CorssCursorLineDash.slice(); //虚线
59993
60028
 
60029
+ this.RightButton.BGColor=g_JSChartResource.CorssCursor.RightButton.BGColor;
60030
+ this.RightButton.PenColor=g_JSChartResource.CorssCursor.RightButton.PenColor;
60031
+ this.RightButton.Icon=CloneData(g_JSChartResource.CorssCursor.RightButton.Icon);
60032
+ this.RightOverlayConfig=CloneData(g_JSChartResource.CorssCursor.RightOverlayText);
59994
60033
 
59995
60034
  this.CorssPointConfig.Center=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Center);
59996
60035
  this.CorssPointConfig.Border=CloneData(g_JSChartResource.CorssCursor.CorssPoint.Border);
@@ -60396,7 +60435,7 @@ function ChartCorssCursor()
60396
60435
  {
60397
60436
  ShowType:0, //0=单行(默认) 1=多行
60398
60437
  Font:this.Font, Color:this.TextColor,
60399
- Text:[ { Text:text, Margin:this.RightMargin } ],
60438
+ Text:[ { Text:text, Margin:this.RightConfig.Margin, TextOffset:this.RightConfig.TextOffset } ],
60400
60439
  };
60401
60440
 
60402
60441
  var yTop=y-this.TextHeight/2;
@@ -60455,74 +60494,73 @@ function ChartCorssCursor()
60455
60494
  //叠加坐标
60456
60495
  if (isOverlayIndex && textSize.Width>overlayIndexInterval && overlayIndexInterval>0) //大于子坐标宽度
60457
60496
  {
60497
+ var rtBG={ Right:right+overlayIndexInterval, Width:textSize.Width, YCenter:y, Height:textSize.Height };
60498
+ rtBG.Left=rtBG.Right-rtBG.Width;
60499
+ if (complexText.ShowType==1)
60500
+ {
60501
+ rtBG.Top=rtBG.YCenter-this.TextHeight/2;
60502
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60503
+ }
60504
+ else
60505
+ {
60506
+ rtBG.Top=rtBG.YCenter-rtBG.Height/2;
60507
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60508
+ }
60509
+
60510
+ if (rtBG.Right>chartRight)
60511
+ {
60512
+ rtBG.Right=chartRight;
60513
+ rtBG.Left=rtBG.Right-rtBG.Width;
60514
+ }
60515
+
60458
60516
  var drawRight=right+overlayIndexInterval;
60459
60517
  if (drawRight>chartRight) drawRight=chartRight;
60460
60518
 
60461
- var itemLeft=drawRight-2-textSize.Width;
60462
- this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
60463
- this.DrawComplexTextV2(itemLeft, yTop, complexText, textSize);
60519
+ this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
60520
+ this.DrawComplexRightText(rtBG,complexText,textSize);
60464
60521
 
60465
- if (this.RightButton.Enable) this.DrawRightButton(yTop, itemLeft,this.TextHeight,this.TextHeight,buttonData);
60466
- }
60467
- else if (rightWidth<textSize.Width) //右边空白显示不下,
60468
- {
60469
- var itemLeft=chartRight-2-textSize.Width;
60470
- this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
60471
- this.DrawComplexTextV2(itemLeft, yTop ,complexText, textSize);
60472
-
60473
- if (this.RightButton.Enable) this.DrawRightButton(yTop, chartRight-2-textSize.Width,this.TextHeight,this.TextHeight,buttonData);
60522
+ if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
60474
60523
  }
60475
60524
  else
60476
60525
  {
60477
- var itemLeft=right+2;
60478
- this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
60479
- this.DrawComplexTextV2(itemLeft,yTop,complexText,textSize);
60480
-
60481
- if (this.RightButton.Enable) this.DrawRightButton(yTop, right+2,this.TextHeight,this.TextHeight,buttonData);
60482
- }
60483
-
60484
- /*
60485
- if (this.StringFormatY.RExtendText && this.StringFormatY.RExtendText.length>0)
60486
- {
60487
- var yOffset=0;
60488
- for(var i in this.StringFormatY.RExtendText)
60526
+ var rtBG={ Left:right+1, Width:textSize.Width, YCenter:y, Height:textSize.Height };
60527
+ rtBG.Right=rtBG.Left+rtBG.Width;
60528
+ if (complexText.ShowType==1)
60489
60529
  {
60490
- var item=this.StringFormatY.RExtendText[i];
60491
- var rText='--.--'
60492
- if (item.YText) rText=item.YText;
60493
- else if (IFrameSplitOperator.IsNumber(item.Y)) rText=item.Y.toFixed(0);
60494
- var rTextWidth=this.Canvas.measureText(rText).width+4; //前后各空2个像素
60495
-
60496
- if (rightWidth<rTextWidth)
60497
- {
60498
- this.DrawTextBGRect(chartRight-2-rTextWidth,y+yOffset+this.TextHeight/2,rTextWidth,this.TextHeight);
60499
- this.Canvas.textAlign="right";
60500
- this.Canvas.textBaseline="middle";
60501
- this.Canvas.fillStyle=item.TextColor;
60502
- this.Canvas.fillText(rText,chartRight-4,y+yOffset+this.TextHeight,rTextWidth);
60503
- }
60504
- else
60505
- {
60506
- this.DrawTextBGRect(right+2,y+yOffset+this.TextHeight/2,rTextWidth,this.TextHeight);
60507
- this.Canvas.textAlign="left";
60508
- this.Canvas.textBaseline="middle";
60509
- this.Canvas.fillStyle=item.TextColor;
60510
- this.Canvas.fillText(rText,right+4,y+yOffset+this.TextHeight,rTextWidth);
60511
- }
60512
-
60513
- yOffset+=this.TextHeight;
60530
+ rtBG.Top=rtBG.YCenter-this.TextHeight/2;
60531
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60514
60532
  }
60533
+ else
60534
+ {
60535
+ rtBG.Top=rtBG.YCenter-rtBG.Height/2;
60536
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60537
+ }
60538
+
60539
+ if (rtBG.Right>chartRight)
60540
+ {
60541
+ rtBG.Right=chartRight;
60542
+ rtBG.Left=rtBG.Right-rtBG.Width;
60543
+ }
60544
+
60545
+ this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
60546
+ this.DrawComplexRightText(rtBG,complexText,textSize);
60547
+
60548
+ if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
60515
60549
  }
60516
- */
60517
60550
  }
60518
- else if (this.ShowTextMode.Right==2)
60551
+ else if (this.ShowTextMode.Right==2) //框架内侧显示
60519
60552
  {
60553
+ var rtBG={ Right:right, Width:textSize.Width, YCenter:y, Height:textSize.Height };
60554
+ rtBG.Left=rtBG.Right-rtBG.Width;
60555
+ rtBG.Top=rtBG.YCenter-rtBG.Height/2;
60556
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60557
+
60520
60558
  this.Canvas.fillStyle=this.TextBGColor;
60521
60559
  var showLeft=right-textSize.Width;
60522
- this.DrawTextBGRect(showLeft,yTop,textSize.Width,textSize.Height);
60523
- this.DrawComplexTextV2(showLeft,yTop,complexText,textSize);
60560
+ this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
60561
+ this.DrawComplexRightText(rtBG,complexText,textSize);
60524
60562
 
60525
- if (this.RightButton.Enable) this.DrawRightButton(yTop, showLeft,this.TextHeight,this.TextHeight,buttonData);
60563
+ if (this.RightButton.Enable) this.DrawRightButtonV2(rtBG, complexText, textSize, buttonData);
60526
60564
  }
60527
60565
  }
60528
60566
 
@@ -60605,8 +60643,19 @@ function ChartCorssCursor()
60605
60643
  //if (overlayLeft+30>chartRight) break;
60606
60644
  var yValue=item.Frame.GetYData(y);
60607
60645
  var text=IFrameSplitOperator.FormatValueString(yValue,2);
60608
- var textWidth=this.Canvas.measureText(text).width+4; //前后各空2个像素
60646
+ var textWidth=this.Canvas.measureText(text).width; //前后各空2个像素
60647
+
60648
+
60649
+ var margin=this.RightOverlayConfig.Margin;
60650
+ var textOffset=this.RightOverlayConfig.TextOffset;
60651
+
60652
+ var rtBG={ Left:overlayLeft+1, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
60653
+ rtBG.Right=rtBG.Left-rtBG.Width;
60654
+ rtBG.Top=rtBG.YCenter-rtBG.Height/2;
60655
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
60609
60656
 
60657
+ this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
60658
+
60610
60659
  /*
60611
60660
  for(var j=2;j>=0;--j)
60612
60661
  {
@@ -60616,19 +60665,17 @@ function ChartCorssCursor()
60616
60665
  }
60617
60666
  */
60618
60667
 
60619
- this.Canvas.fillStyle=this.TextBGColor;
60620
- this.Canvas.fillRect(overlayLeft+1,y-this.TextHeight/2,textWidth,this.TextHeight);
60621
60668
  this.Canvas.textAlign="left";
60622
- this.Canvas.textBaseline="middle";
60669
+ this.Canvas.textBaseline="bottom";
60623
60670
  this.Canvas.fillStyle=this.TextColor;
60624
- this.Canvas.fillText(text,overlayLeft+4,y,textWidth);
60671
+ this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
60625
60672
  }
60626
60673
  }
60627
60674
 
60628
60675
  this.Status=1;
60629
60676
  }
60630
60677
 
60631
- this.DrawComplexTextV2=function(left, yTop, complexText, size)
60678
+ this.DrawComplexRightText=function(rtBG, complexText, size)
60632
60679
  {
60633
60680
  this.Canvas.textAlign="left";
60634
60681
  this.Canvas.textBaseline="bottom";
@@ -60636,8 +60683,8 @@ function ChartCorssCursor()
60636
60683
  if (complexText.ShowType==1) showType=complexText.ShowType;
60637
60684
  if (showType==1) //多行
60638
60685
  {
60639
- var xLeft=left;
60640
- var yText=yTop; //顶
60686
+ var xLeft=rtBG.Left;
60687
+ var yTop=rtBG.Top; //顶
60641
60688
  for(var i=0; i<complexText.Text.length; ++i)
60642
60689
  {
60643
60690
  var item=complexText.Text[i];
@@ -60649,24 +60696,25 @@ function ChartCorssCursor()
60649
60696
  if (item.Color) this.Canvas.fillStyle=item.Color;
60650
60697
  else this.Canvas.fillStyle=complexText.Color;
60651
60698
 
60652
- var y=yText+itemSize.Height;
60699
+ var y=yTop+itemSize.Height;
60653
60700
  var x=xLeft;
60654
- if (item.Margin)
60701
+
60702
+ if (item.TextOffset)
60655
60703
  {
60656
- var margin=item.Margin;
60657
- if (IFrameSplitOperator.IsNumber(margin.Bottom)) y-=margin.Bottom;
60658
- if (IFrameSplitOperator.IsNumber(margin.Left)) x+=margin.Left;
60704
+ var textOffset=item.TextOffset;
60705
+ if (IFrameSplitOperator.IsNumber(textOffset.X)) x+=textOffset.X;
60706
+ if (IFrameSplitOperator.IsNumber(textOffset.Y)) y+=textOffset.Y;
60659
60707
  }
60660
60708
 
60661
60709
  this.Canvas.fillText(item.Text,x,y,itemSize.Width);
60662
60710
 
60663
- yText+=itemSize.Height;
60711
+ yTop+=itemSize.Height;
60664
60712
  }
60665
60713
  }
60666
60714
  else //水平 单行
60667
60715
  {
60668
- var xText=left;
60669
- var yBottom=yTop+size.Height;
60716
+ var xText=rtBG.Left;
60717
+ var yBottom=rtBG.Bottom;
60670
60718
  for(var i=0; i<complexText.Text.length; ++i)
60671
60719
  {
60672
60720
  var item=complexText.Text[i];
@@ -60678,15 +60726,16 @@ function ChartCorssCursor()
60678
60726
  if (item.Color) this.Canvas.fillStyle=item.Color;
60679
60727
  else this.Canvas.fillStyle=complexText.Color;
60680
60728
 
60681
- var y=yBottom;
60682
60729
  var x=xText;
60683
- if (item.Margin)
60730
+ var y=yBottom;
60731
+
60732
+ if (item.TextOffset)
60684
60733
  {
60685
- var margin=item.Margin;
60686
- if (IFrameSplitOperator.IsNumber(margin.Bottom)) y-=margin.Bottom;
60687
- if (IFrameSplitOperator.IsNumber(margin.Left)) x+=margin.Left;
60734
+ var textOffset=item.TextOffset;
60735
+ if (IFrameSplitOperator.IsNumber(textOffset.X)) x+=textOffset.X;
60736
+ if (IFrameSplitOperator.IsNumber(textOffset.Y)) y+=textOffset.Y;
60688
60737
  }
60689
-
60738
+
60690
60739
  this.Canvas.fillText(item.Text,x,y,itemSize.Width);
60691
60740
 
60692
60741
  xText+=itemSize.Width;
@@ -60709,7 +60758,7 @@ function ChartCorssCursor()
60709
60758
  if (item.Font) this.Canvas.font=item.Font;
60710
60759
  else this.Canvas.font=complexText.Font;
60711
60760
  var itemWidth=this.Canvas.measureText(item.Text).width; //前后各空2个像素
60712
- var itemHeight=this.Canvas.measureText("擎").width;
60761
+ var itemHeight=this.GetFontHeight();
60713
60762
  if (item.Margin)
60714
60763
  {
60715
60764
  var margin=item.Margin;
@@ -60730,7 +60779,7 @@ function ChartCorssCursor()
60730
60779
  }
60731
60780
  else //水平 单行
60732
60781
  {
60733
- var textWidth=0, textHeight=0;
60782
+ var textWidth=0, textHeight=this.GetFontHeight();
60734
60783
  for(var i=0; i<complexText.Text.length; ++i)
60735
60784
  {
60736
60785
  var item=complexText.Text[i];
@@ -60759,6 +60808,61 @@ function ChartCorssCursor()
60759
60808
  }
60760
60809
  }
60761
60810
 
60811
+
60812
+ this.DrawRightButtonV2=function(rtTextBG, complexText, textSize, data)
60813
+ {
60814
+ this.Canvas.fillStyle=this.RightButton.BGColor;
60815
+ var drawHeight=rtTextBG.Height;
60816
+ var drawWidth=rtTextBG.Height;
60817
+
60818
+ if (complexText.ShowType==1) //多行 取第1行高度
60819
+ {
60820
+ var itemSize=textSize.Text[0];
60821
+ drawHeight=itemSize.Height;
60822
+ drawWidth=itemSize.Height;
60823
+ }
60824
+
60825
+ var rtButton={Left:rtTextBG.Left-drawHeight, Top:rtTextBG.Top, Width:drawWidth, Height:drawHeight };
60826
+ rtButton.Right=rtButton.Left+rtButton.Width;
60827
+ rtButton.Bottom=rtButton.Top+rtButton.Height;
60828
+ this.RightButton.Rect=rtButton;
60829
+ this.RightButton.Data=data;
60830
+ this.Canvas.fillRect(ToFixedPoint(rtButton.Left+1),ToFixedPoint(rtButton.Top),ToFixedRect(rtButton.Width),ToFixedRect(rtButton.Height));
60831
+
60832
+ var pixelRatio=GetDevicePixelRatio();
60833
+ var spaceWidth=3;
60834
+ var yCenter=(rtButton.Top+spaceWidth)+(rtButton.Height-spaceWidth*2)/2;
60835
+ var xCenter=(rtButton.Left+spaceWidth)+(rtButton.Width-spaceWidth*2)/2;
60836
+
60837
+ if (this.RightButton.Icon)
60838
+ {
60839
+ var icon=this.RightButton.Icon;
60840
+ this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
60841
+ this.Canvas.textAlign="center";
60842
+ this.Canvas.textBaseline="middle";
60843
+ this.Canvas.fillStyle=icon.Color;
60844
+ this.Canvas.fillText("\ue6a3",xCenter,yCenter);
60845
+ }
60846
+ else
60847
+ {
60848
+ //画加号
60849
+ this.Canvas.strokeStyle=this.RightButton.PenColor;
60850
+ var x=rtButtom.Left+spaceWidth;
60851
+ var y=rtButtom.Top+spaceWidth;
60852
+ this.Canvas.save();
60853
+ this.Canvas.linewidth=1*pixelRatio;
60854
+ this.Canvas.beginPath();
60855
+ this.Canvas.moveTo(ToFixedPoint(x), ToFixedPoint(yCenter));
60856
+ this.Canvas.lineTo(ToFixedPoint(x+rtButton.Width-spaceWidth*2), ToFixedPoint(yCenter));
60857
+
60858
+ this.Canvas.moveTo(ToFixedPoint(xCenter),ToFixedPoint(y));
60859
+ this.Canvas.lineTo(ToFixedPoint(xCenter), ToFixedPoint(y+rtButton.Height-spaceWidth*2));
60860
+
60861
+ this.Canvas.stroke();
60862
+ this.Canvas.restore();
60863
+ }
60864
+ }
60865
+
60762
60866
  this.DrawRightButton=function(drawTop, drawRight, drawWidth, drawHeight, data)
60763
60867
  {
60764
60868
  this.Canvas.fillStyle=this.RightButton.BGColor;
@@ -78247,13 +78351,13 @@ function JSChartResource()
78247
78351
  {
78248
78352
  BGColor:'rgb(43,54,69)',
78249
78353
  PenColor:'rgb(255,255,255)',
78250
- Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
78354
+ Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:14 }
78251
78355
  },
78252
78356
 
78253
- RightMargin: { Left:2, Right:2, Top:5, Bottom:3 },
78254
-
78255
78357
  BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
78256
78358
  LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
78359
+ RightText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
78360
+ RightOverlayText:{ Margin: { Left:2, Right:2, Top:0, Bottom:0 }, TextOffset:{X:2, Y:-1 } }, //右侧叠加坐标
78257
78361
 
78258
78362
  CorssPoint:{ Center:{ Radius:5*GetDevicePixelRatio(), Color:"rgb(50,171,205)"}, Border:{ Color:'rgb(255,255,255)', Width:1*GetDevicePixelRatio() } }
78259
78363
  };
@@ -132431,7 +132535,7 @@ function GetBlackStyle()
132431
132535
  {
132432
132536
  BGColor:'rgb(43,54,69)',
132433
132537
  PenColor:'rgb(255,255,255)',
132434
- Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
132538
+ Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:12 }
132435
132539
  },
132436
132540
 
132437
132541
  CorssPoint:{ Center:{ Color:"rgb(50,171,205)" }, Border:{ Color:'rgba(0,0,0,0.8)', Width:1*GetDevicePixelRatio() } }
@@ -147890,7 +147994,7 @@ function ScrollBarBGChart()
147890
147994
 
147891
147995
 
147892
147996
 
147893
- var HQCHART_VERSION="1.1.14712";
147997
+ var HQCHART_VERSION="1.1.14721";
147894
147998
 
147895
147999
  function PrintHQChartVersion()
147896
148000
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14712";
8
+ var HQCHART_VERSION="1.1.14721";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {