hqchart 1.1.13100 → 1.1.13107

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.
@@ -4398,6 +4398,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
4398
4398
  drag.LastMove.Y=touches[0].clientY;
4399
4399
 
4400
4400
  this.MouseDrag=drag;
4401
+ var drawPictureActive=this.GetActiveDrawPicture(); //上一次选中的
4402
+ var selectedChart={ Chart:this.SelectedChart.Selected.Chart, Identify:this.SelectedChart.Selected.Identify }; //上一次选中的图形
4401
4403
  this.PhoneTouchInfo={ Start:{X:touches[0].clientX, Y:touches[0].clientY }, End:{ X:touches[0].clientX, Y:touches[0].clientY } };
4402
4404
  if (this.SelectChartDrawPicture) this.SelectChartDrawPicture.IsSelected=false;
4403
4405
  this.SelectChartDrawPicture=null;
@@ -4411,7 +4413,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
4411
4413
  {
4412
4414
  this.SetChartDrawPictureFirstPoint(drag.Click.X,drag.Click.Y,true);
4413
4415
  //只有1个点 直接完成
4414
- if (this.FinishChartDrawPicturePoint()) this.DrawDynamicInfo({Corss:false, Tooltip:false});
4416
+ if (this.FinishChartDrawPicturePoint())
4417
+ {
4418
+ if (drawPicture.IsDrawMain) this.Draw();
4419
+ else this.DrawDynamicInfo( {Corss:false, Tooltip:false} );
4420
+ }
4415
4421
  }
4416
4422
 
4417
4423
  if (e.cancelable) e.preventDefault();
@@ -4437,6 +4443,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
4437
4443
  event.Callback(event,sendData,this);
4438
4444
  }
4439
4445
 
4446
+ var drawType=0;
4447
+ if (drawPictrueData.ChartDrawPicture.IsDrawMain) drawType=1;
4448
+ else if (drawPictureActive.Select.Guid && drawPictureActive.Select.Chart && drawPictureActive.Select.Chart.IsDrawMain) drawType=1;
4449
+
4450
+ if (drawType==1) this.Draw();
4451
+
4440
4452
  if (e.cancelable) e.preventDefault();
4441
4453
  return;
4442
4454
  }
@@ -4493,6 +4505,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
4493
4505
  }
4494
4506
 
4495
4507
  this.TouchEvent({ EventID:JSCHART_EVENT_ID.ON_PHONE_TOUCH, FunctionName:"OnTouchStart"}, e);
4508
+
4509
+ var drawType=0;
4510
+ if (drawPictureActive.Select.Guid!=null)
4511
+ {
4512
+ if (drawPictureActive.Select.Guid && drawPictureActive.Select.Chart) drawType=1;
4513
+ }
4514
+
4515
+ if (drawType==1) this.Draw();
4496
4516
  }
4497
4517
  else if (this.IsPhonePinching(e))
4498
4518
  {
@@ -51336,6 +51356,7 @@ function DynamicChartTitlePainting()
51336
51356
  this.BGBorderColor=g_JSChartResource.IndexTitleBorderColor;
51337
51357
  this.BGBorderMoveOnColor=g_JSChartResource.IndexTitleBorderMoveOnColor;
51338
51358
  this.BorderRoundRadius=2; //圆角矩形角度
51359
+ this.NameButtonStyle=g_JSChartResource.IndexTitleBorderStyle,
51339
51360
 
51340
51361
  this.OnDrawEvent;
51341
51362
  this.ParamSpace=2; //参数显示的间距
@@ -52631,7 +52652,6 @@ function DynamicChartTitlePainting()
52631
52652
  var roundRadius=this.BorderRoundRadius*pixelRatio;
52632
52653
  var bgWidth=textWidth+4*pixelRatio+roundRadius*2;
52633
52654
 
52634
-
52635
52655
  rtButton.Top=rtButton.YCenter-bgHeight/2-1,
52636
52656
  rtButton.Width=bgWidth;
52637
52657
  rtButton.Height=bgHeight;
@@ -52649,19 +52669,33 @@ function DynamicChartTitlePainting()
52649
52669
  }
52650
52670
  }
52651
52671
 
52652
- this.Canvas.beginPath();
52653
- this.Canvas.roundRect( ToFixedPoint(rtButton.Left), ToFixedPoint(rtButton.Top), ToFixedRect(rtButton.Width), ToFixedRect(rtButton.Height), [roundRadius]);
52654
- this.Canvas.closePath();
52672
+ if (this.NameButtonStyle==1)
52673
+ {
52674
+ this.Canvas.beginPath();
52675
+ this.Canvas.roundRect(ToFixedPoint(rtButton.Left), ToFixedPoint(rtButton.Top), ToFixedRect(rtButton.Width), ToFixedRect(rtButton.Height), [roundRadius]);
52676
+ this.Canvas.closePath();
52655
52677
 
52656
- this.Canvas.fillStyle=this.BGColor;
52657
- this.Canvas.fill();
52678
+ this.Canvas.fillStyle=this.BGColor;
52679
+ this.Canvas.fill();
52658
52680
 
52659
- if (borderColor)
52681
+ if (borderColor)
52682
+ {
52683
+ this.Canvas.strokeStyle=borderColor;
52684
+ this.Canvas.stroke();
52685
+ }
52686
+ }
52687
+ else
52660
52688
  {
52661
- this.Canvas.strokeStyle=borderColor;
52662
- this.Canvas.stroke();
52689
+ this.Canvas.fillStyle=this.BGColor;
52690
+ this.Canvas.fillRect(rtButton.Left, rtButton.Top, rtButton.Width, rtButton.Height);
52691
+
52692
+ if (borderColor)
52693
+ {
52694
+ this.Canvas.strokeStyle=borderColor;
52695
+ this.Canvas.strokeRect(ToFixedPoint(rtButton.Left), ToFixedPoint(rtButton.Top), ToFixedRect(rtButton.Width), ToFixedRect(rtButton.Height), [roundRadius]);
52696
+ }
52663
52697
  }
52664
-
52698
+
52665
52699
  this.Canvas.fillStyle=this.TitleColor;
52666
52700
  this.Canvas.fillText(title,rtButton.Left+roundRadius+2*pixelRatio,rtButton.YCenter,textWidth);
52667
52701
  }
@@ -54983,6 +55017,15 @@ function ChartDrawHLine()
54983
55017
 
54984
55018
  this.AryButton=[];
54985
55019
  this.ExtendData; //扩展数据
55020
+ this.ShowPriceTextConfig=
55021
+ {
55022
+ IsShow:[false, false, true], //[0]=left内 [1]=right内 [2]=right外
55023
+ Font:
55024
+ [
55025
+ `${12*GetDevicePixelRatio()}px 微软雅黑`,
55026
+ `${12*GetDevicePixelRatio()}px 微软雅黑`,
55027
+ ],
55028
+ };
54986
55029
 
54987
55030
  //内部变量
54988
55031
  this.ColseButtonSize=0;
@@ -55014,6 +55057,15 @@ function ChartDrawHLine()
55014
55057
  if (item.SettingIcon) this.Button.SettingIcon=CloneData(item.SettingIcon);
55015
55058
  }
55016
55059
  if (option.ExtendData) this.ExtendData=option.ExtendData;
55060
+
55061
+ if (IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText))
55062
+ {
55063
+ for(var i=0;i<option.IsShowPriceText.length && i<3;++i)
55064
+ {
55065
+ var value=option.IsShowPriceText[i]
55066
+ if (IFrameSplitOperator.IsBool(value)) this.ShowPriceTextConfig.IsShow[i]=value;
55067
+ }
55068
+ }
55017
55069
  }
55018
55070
  }
55019
55071
 
@@ -55102,6 +55154,7 @@ function ChartDrawHLine()
55102
55154
  this.Canvas.stroke();
55103
55155
  this.RestoreLineWidth();
55104
55156
 
55157
+ //画水平线段
55105
55158
  var line={Start:new Point(), End:new Point()};
55106
55159
  if (isHScreen)
55107
55160
  {
@@ -55119,6 +55172,18 @@ function ChartDrawHLine()
55119
55172
  }
55120
55173
  this.LinePoint.push(line);
55121
55174
 
55175
+ var yValue=this.Frame.GetYData(drawPoint[0].Y);
55176
+ var strPrice=yValue.toFixed(this.Precision);
55177
+ if (this.ShowPriceTextConfig.IsShow[0])
55178
+ {
55179
+ this.DrawPriceText(strPrice, line.Start, line.End, 0);
55180
+ }
55181
+
55182
+ if (this.ShowPriceTextConfig.IsShow[1])
55183
+ {
55184
+ this.DrawPriceText(strPrice, line.Start, line.End, 1);
55185
+ }
55186
+
55122
55187
  var labInfo;
55123
55188
  if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
55124
55189
 
@@ -55133,14 +55198,17 @@ function ChartDrawHLine()
55133
55198
 
55134
55199
  this.Canvas.restore();
55135
55200
 
55136
- var rtDraw={ };
55137
55201
 
55138
- //显示价格
55139
- this.CalculateButtonSize();
55140
- this.DrawValueText(drawPoint[0].Y, rtDraw, labInfo);
55141
- if (labInfo)
55142
- this.DrawRightLab(labInfo, rtDraw);
55202
+ //外部右侧显示价格
55203
+ if (this.ShowPriceTextConfig.IsShow[2])
55204
+ {
55205
+ var rtDraw={ };
55206
+ this.CalculateButtonSize();
55207
+ this.DrawValueText(drawPoint[0].Y, rtDraw, labInfo);
55208
+ if (labInfo) this.DrawRightLab(labInfo, rtDraw);
55209
+ }
55143
55210
 
55211
+
55144
55212
  //鼠标是否在按钮上
55145
55213
  if (moveonPoint && mouseStatus)
55146
55214
  {
@@ -55320,6 +55388,39 @@ function ChartDrawHLine()
55320
55388
  this.DrawButton(rtBG.Top, rtBG.Right, lineHeight, rtDraw);
55321
55389
  }
55322
55390
 
55391
+ this.DrawPriceText=function(text, ptStart, ptEnd, position)
55392
+ {
55393
+ if (position!=1 && position!=0) return;
55394
+
55395
+ var font=this.ShowPriceTextConfig.Font[position];
55396
+ this.Canvas.fillStyle=this.LineColor;
55397
+ this.Canvas.font=font;
55398
+ var textWidth=this.Canvas.measureText(text).width;
55399
+ var lineHeight=this.GetFontHeight();
55400
+
55401
+ var rtBG=null;
55402
+ if (position==1)
55403
+ {
55404
+ var rtBG={ Left:ptStart.X, Top:ptStart.Y-lineHeight/2, Width:textWidth+4, Height:lineHeight };
55405
+ rtBG.Right=rtBG.Left+rtBG.Width;
55406
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
55407
+ }
55408
+ else if (position==0)
55409
+ {
55410
+ var rtBG={ Right:ptEnd.X, Top:ptEnd.Y-lineHeight/2, Width:textWidth+4, Height:lineHeight };
55411
+ rtBG.Left=rtBG.Right-rtBG.Width;
55412
+ rtBG.Bottom=rtBG.Top+rtBG.Height;
55413
+ }
55414
+
55415
+ this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));
55416
+
55417
+ this.Canvas.fillStyle=this.ValueTextColor
55418
+ this.Canvas.textAlign="left";
55419
+ this.Canvas.textBaseline="middle";
55420
+ this.Canvas.fillText(text,rtBG.Left+2,ptStart.Y);
55421
+
55422
+ }
55423
+
55323
55424
  this.CalculateButtonSize=function()
55324
55425
  {
55325
55426
  var pixelRatio=GetDevicePixelRatio();
@@ -55373,7 +55474,7 @@ function ChartDrawHLine()
55373
55474
 
55374
55475
  left+=1;
55375
55476
  var pixelRatio=GetDevicePixelRatio();
55376
- if (this.Button.SettingIcon)
55477
+ if (this.Button.SettingIcon && this.Button.SettingIcon.Text)
55377
55478
  {
55378
55479
  var rtButton={Left:left, Top:drawTop, Width:this.SettingButtonSize, Height:drawHeight };
55379
55480
  rtButton.Right=rtButton.Left+rtButton.Width;
@@ -55406,7 +55507,7 @@ function ChartDrawHLine()
55406
55507
  left=rtButton.Right+this.ButtonSpace;
55407
55508
  }
55408
55509
 
55409
- if (this.Button.CloseIcon)
55510
+ if (this.Button.CloseIcon && this.Button.CloseIcon.Text)
55410
55511
  {
55411
55512
  var rtButton={Left:left, Top:drawTop, Width:this.ColseButtonSize, Height:drawHeight };
55412
55513
  rtButton.Right=rtButton.Left+rtButton.Width;
@@ -63010,7 +63111,8 @@ function JSChartResource()
63010
63111
  this.TitleFont=13*GetDevicePixelRatio() +'px 微软雅黑'; //指标显示,tooltip显示字体
63011
63112
  this.IndexTitleBGColor='rgb(250,250,250)'; //指标名字背景色
63012
63113
  this.IndexTitleBorderColor='rgb(180,180,180)'; //指标名字边框颜色
63013
- this.IndexTitleBorderMoveOnColor='rgb(0,0,0)'; //指标名字边框颜色(鼠标在上面)
63114
+ this.IndexTitleBorderMoveOnColor='rgb(0,0,0)'; //指标名字边框颜色(鼠标在上面)
63115
+ this.IndexTitleBorderStyle=1, //0=直角边框 1=圆角边框
63014
63116
  this.IndexTitleColor="rgb(43,54,69)"; //指标名字颜色
63015
63117
  this.IndexTitleSelectedColor="rgb(65,105,225)";
63016
63118
  this.OverlayIndexTitleBGColor='rgba(255,255,255,0.7)';
@@ -63984,6 +64086,16 @@ function JSChartResource()
63984
64086
 
63985
64087
  MoveRowColor:'rgb(240,128,128)',
63986
64088
  SrcRowColor:'rgb(180,240,240)',
64089
+ },
64090
+
64091
+ VScrollbar:
64092
+ {
64093
+ ScrollBarHeight:60,
64094
+ ButtonColor:"rgba(252,252,252,0.8)",
64095
+ BarColor:"rgba(168,168,168,0.9)",
64096
+ BorderColor:'rgba(180,180,180,0.9)',
64097
+ BGColor:"rgba(234,239,248,0.9)",
64098
+ BarWidth:{ Size:12 }
63987
64099
  }
63988
64100
  },
63989
64101
 
@@ -64174,6 +64286,7 @@ function JSChartResource()
64174
64286
  if (style.IndexTitleBGColor) this.IndexTitleBGColor=style.IndexTitleBGColor;
64175
64287
  if (style.IndexTitleBorderColor) this.IndexTitleBorderColor=style.IndexTitleBorderColor;
64176
64288
  if (style.IndexTitleBorderMoveOnColor) this.IndexTitleBorderMoveOnColor=style.IndexTitleBorderMoveOnColor;
64289
+ if (IFrameSplitOperator.IsNumber(style.IndexTitleBorderStyle)) this.IndexTitleBorderStyle=style.IndexTitleBorderStyle;
64177
64290
  if (style.IndexTitleColor) this.IndexTitleColor=style.IndexTitleColor;
64178
64291
  if (style.IndexTitleSelectedColor) this.IndexTitleSelectedColor=style.IndexTitleSelectedColor;
64179
64292
  if (style.OverlayIndexTitleBGColor) this.OverlayIndexTitleBGColor=style.OverlayIndexTitleBGColor;
@@ -64621,205 +64734,8 @@ function JSChartResource()
64621
64734
  }
64622
64735
  }
64623
64736
 
64624
- if (style.Report)
64625
- {
64626
- var item=style.Report;
64627
- if (item.BorderColor) this.Report.BorderColor=item.BorderColor;
64628
- if (item.UpTextColor) this.Report.UpTextColor=item.UpTextColor;
64629
- if (item.DownTextColor) this.Report.DownTextColor=item.DownTextColor;
64630
- if (item.UnchagneTextColor) this.Report.UnchagneTextColor=item.UnchagneTextColor;
64631
- if (item.BorderColor) this.Report.SelectedColor=item.SelectedColor;
64632
-
64633
-
64634
- if (item.CloseLine)
64635
- {
64636
- var closeLine=item.CloseLine;
64637
- if (closeLine.CloseColor) this.Report.CloseLine.CloseColor=closeLine.CloseColor;
64638
- if (closeLine.YCloseColor) this.Report.CloseLine.YCloseColor=closeLine.YCloseColor;
64639
- if (closeLine.AreaColor) this.Report.CloseLine.AreaColor=closeLine.AreaColor;
64640
- }
64641
-
64642
- if (item.KLine)
64643
- {
64644
- var kline=item.KLine;
64645
- if (kline.UpColor) this.Report.KLine.UpColor=kline.UpColor;
64646
- if (kline.DownColor) this.Report.KLine.DownColor=kline.DownColor;
64647
- if (kline.UnchagneColor) this.Report.KLine.UnchagneColor=kline.UnchagneColor;
64648
-
64649
- if (IFrameSplitOperator.IsNumber(kline.DataWidth)) this.Report.KLine.DataWidth=kline.DataWidth;
64650
- if (IFrameSplitOperator.IsNumber(kline.DistanceWidth)) this.Report.KLine.DistanceWidth=kline.DistanceWidth;
64651
- }
64652
-
64653
- if (item.Header)
64654
- {
64655
- var header=item.Header;
64656
- if (header.Color) this.Report.Header.Color=header.Color;
64657
- if (header.SortColor) this.Report.Header.SortColor=header.SortColor;
64658
- if (header.Mergin)
64659
- {
64660
- var mergin=header.Mergin;
64661
- if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Header.Mergin.Left=mergin.Left;
64662
- if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Header.Mergin.Left=mergin.Right;
64663
- if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Header.Mergin.Top=mergin.Top;
64664
- if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Header.Mergin.Bottom=mergin.Bottom;
64665
- }
64666
- if (header.Font)
64667
- {
64668
- var font=header.Font;
64669
- if (font.Name) this.Report.Header.Font.Name=font.Name;
64670
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Header.Font.Size=font.Size;
64671
- }
64672
- }
64673
-
64674
- if (item.Item)
64675
- {
64676
- var row=item.Item;
64677
- if (row.Mergin)
64678
- {
64679
- var mergin=row.Mergin;
64680
- if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Item.Mergin.Left=mergin.Left;
64681
- if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Item.Mergin.Right=mergin.Right;
64682
- if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Item.Mergin.Top=mergin.Top;
64683
- if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Item.Mergin.Bottom=mergin.Bottom;
64684
- }
64685
-
64686
- if (row.Font)
64687
- {
64688
- var font=row.Font;
64689
- if (font.Name) this.Report.Item.Font.Name=font.Name;
64690
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.Font.Size=font.Size;
64691
- }
64692
-
64693
- if (row.BarMergin)
64694
- {
64695
- var mergin=row.BarMergin;
64696
- if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Item.BarMergin.Left=mergin.Left;
64697
- if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Item.BarMergin.Top=mergin.Top;
64698
- if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Item.BarMergin.Right=mergin.Right;
64699
- if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Item.BarMergin.Bottom=mergin.Bottom;
64700
- }
64701
-
64702
- if (row.NameFont)
64703
- {
64704
- var font=row.NameFont;
64705
- if (font.Name) this.Report.Item.NameFont.Name=font.Name;
64706
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.NameFont.Size=font.Size;
64707
- }
64708
-
64709
- if (row.SymbolFont)
64710
- {
64711
- var font=row.SymbolFont;
64712
- if (font.Name) this.Report.Item.SymbolFont.Name=font.Name;
64713
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.SymbolFont.Size=font.Size;
64714
- }
64715
- }
64716
-
64717
- if (item.FixedItem)
64718
- {
64719
- var row=item.FixedItem;
64720
- if (row.Font)
64721
- {
64722
- var font=row.Font;
64723
- if (font.Name) this.Report.FixedItem.Font.Name=font.Name;
64724
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.FixedItem.Font.Size=font.Size;
64725
- }
64726
- }
64727
-
64728
- if (item.LimitBorder)
64729
- {
64730
- var limit=item.LimitBorder;
64731
- if (limit.Color) this.Report.LimitBorder.Color=limit.Color;
64732
- if (limit.Mergin)
64733
- {
64734
- var mergin=limit.Mergin;
64735
- if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.LimitBorder.Mergin.Left=mergin.Left;
64736
- if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.LimitBorder.Mergin.Top=mergin.Top;
64737
- if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.LimitBorder.Mergin.Right=mergin.Right;
64738
- if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.LimitBorder.Mergin.Bottom=mergin.Bottom;
64739
- }
64740
- }
64741
-
64742
- if (item.LimitColor)
64743
- {
64744
- var limit=item.LimitColor;
64745
- if (limit.UpColor) this.Report.LimitColor.UpColor=limit.UpColor;
64746
- if (limit.DownColor) this.Report.LimitColor.DownColor=limit.DownColor;
64747
- if (limit.TextColor) this.Report.LimitColor.UpColor=limit.TextColor;
64748
- }
64749
-
64750
- if (item.FieldColor)
64751
- {
64752
- var filed=item.FieldColor;
64753
- if (filed.Name) this.Report.FieldColor.Name=filed.Name;
64754
- if (filed.Symbol) this.Report.FieldColor.Symbol=filed.Symbol;
64755
- if (filed.Vol) this.Report.FieldColor.Vol=filed.Vol;
64756
- if (filed.Amount) this.Report.FieldColor.Amount=filed.Amount;
64757
- if (filed.Index) this.Report.FieldColor.Index=filed.Index;
64758
- if (filed.BarTitle) this.Report.FieldColor.BarTitle=filed.BarTitle;
64759
- if (filed.Text) this.Report.FieldColor.Text=filed.Text;
64760
-
64761
- if (IFrameSplitOperator.IsNonEmptyArray(filed.Bar))
64762
- {
64763
- for(var i=0;i<filed.Bar.length;++i)
64764
- this.Report.FieldColor.Bar[i]=filed.Bar[i];
64765
- }
64766
- }
64767
-
64768
- if (item.Tab)
64769
- {
64770
- var tab=item.Tab;
64771
- if (tab.Font)
64772
- {
64773
- var font=tab.Font;
64774
- if (font.Name) this.Report.Tab.Font.Name=font.Name;
64775
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Tab.Font.Size=font.Size;
64776
- }
64777
-
64778
- if (IFrameSplitOperator.IsNumber(tab.ScrollBarWidth)) this.Report.Tab.ScrollBarWidth=tab.ScrollBarWidth;
64779
- if (tab.ButtonColor) this.Report.Tab.ButtonColor=tab.ButtonColor;
64780
- if (tab.BarColor) this.Report.Tab.BarColor=tab.BarColor;
64781
- if (tab.BorderColor) this.Report.Tab.BorderColor=tab.BorderColor;
64782
-
64783
- if (tab.TabTitleColor) this.Report.Tab.TabTitleColor=tab.TabTitleColor;
64784
- if (tab.TabSelectedTitleColor) this.Report.Tab.TabSelectedTitleColor=tab.TabSelectedTitleColor;
64785
- if (tab.TabSelectedBGColor) this.Report.Tab.TabSelectedBGColor=tab.TabSelectedBGColor;
64786
- if (tab.TabMoveOnTitleColor) this.Report.Tab.TabMoveOnTitleColor=tab.TabMoveOnTitleColor;
64787
- if (tab.TabBGColor) this.Report.Tab.TabBGColor=tab.TabBGColor;
64788
- }
64789
-
64790
- if (item.PageInfo)
64791
- {
64792
- var pageinfo=item.PageInfo;
64793
- if (pageinfo.Font)
64794
- {
64795
- var font=pageinfo.Font;
64796
- if (font.Name) this.Report.PageInfo.Font.Name=font.Name;
64797
- if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.PageInfo.Font.Size=font.Size;
64798
- }
64799
-
64800
- if (pageinfo.TextColor) this.Report.PageInfo.TextColor=pageinfo.TextColor;
64801
- if (pageinfo.BGColor) this.Report.PageInfo.BGColor=pageinfo.BGColor;
64802
-
64803
- if (pageinfo.Mergin)
64804
- {
64805
- var mergin=pageinfo.Mergin;
64806
- if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.PageInfo.Mergin.Left=mergin.Left;
64807
- if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.PageInfo.Mergin.Top=mergin.Top;
64808
- if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.PageInfo.Mergin.Right=mergin.Right;
64809
- if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.PageInfo.Mergin.Bottom=mergin.Bottom;
64810
- }
64811
- }
64812
-
64813
- if (item.DragRow)
64814
- {
64815
- var dragRow=item.DragRow;
64816
- if (dragRow.Color) this.Report.DragRow.Color=dragRow.Color;
64817
- if (dragRow.TextColor) this.Report.DragRow.TextColor=dragRow.TextColor;
64818
- if (dragRow.MoveRowColor) this.Report.DragRow.MoveRowColor=dragRow.MoveRowColor;
64819
- if (dragRow.SrcRowColor) this.Report.DragRow.SrcRowColor=dragRow.SrcRowColor;
64820
- }
64821
- }
64822
-
64737
+ if (style.Report) this.SetReportStyle(style.Report);
64738
+
64823
64739
  if (style.TReport) this.SetTReportStyle(style.TReport);
64824
64740
 
64825
64741
  if (style.SelectedChart)
@@ -64922,6 +64838,218 @@ function JSChartResource()
64922
64838
  }
64923
64839
  }
64924
64840
 
64841
+ this.SetReportStyle=function(style)
64842
+ {
64843
+ var item=style;
64844
+ var dest=this.Report;
64845
+
64846
+ if (item.BorderColor) this.Report.BorderColor=item.BorderColor;
64847
+ if (item.UpTextColor) this.Report.UpTextColor=item.UpTextColor;
64848
+ if (item.DownTextColor) this.Report.DownTextColor=item.DownTextColor;
64849
+ if (item.UnchagneTextColor) this.Report.UnchagneTextColor=item.UnchagneTextColor;
64850
+ if (item.BorderColor) this.Report.SelectedColor=item.SelectedColor;
64851
+
64852
+
64853
+ if (item.CloseLine)
64854
+ {
64855
+ var closeLine=item.CloseLine;
64856
+ if (closeLine.CloseColor) this.Report.CloseLine.CloseColor=closeLine.CloseColor;
64857
+ if (closeLine.YCloseColor) this.Report.CloseLine.YCloseColor=closeLine.YCloseColor;
64858
+ if (closeLine.AreaColor) this.Report.CloseLine.AreaColor=closeLine.AreaColor;
64859
+ }
64860
+
64861
+ if (item.KLine)
64862
+ {
64863
+ var kline=item.KLine;
64864
+ if (kline.UpColor) this.Report.KLine.UpColor=kline.UpColor;
64865
+ if (kline.DownColor) this.Report.KLine.DownColor=kline.DownColor;
64866
+ if (kline.UnchagneColor) this.Report.KLine.UnchagneColor=kline.UnchagneColor;
64867
+
64868
+ if (IFrameSplitOperator.IsNumber(kline.DataWidth)) this.Report.KLine.DataWidth=kline.DataWidth;
64869
+ if (IFrameSplitOperator.IsNumber(kline.DistanceWidth)) this.Report.KLine.DistanceWidth=kline.DistanceWidth;
64870
+ }
64871
+
64872
+ if (item.Header)
64873
+ {
64874
+ var header=item.Header;
64875
+ if (header.Color) this.Report.Header.Color=header.Color;
64876
+ if (header.SortColor) this.Report.Header.SortColor=header.SortColor;
64877
+ if (header.Mergin)
64878
+ {
64879
+ var mergin=header.Mergin;
64880
+ if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Header.Mergin.Left=mergin.Left;
64881
+ if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Header.Mergin.Left=mergin.Right;
64882
+ if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Header.Mergin.Top=mergin.Top;
64883
+ if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Header.Mergin.Bottom=mergin.Bottom;
64884
+ }
64885
+ if (header.Font)
64886
+ {
64887
+ var font=header.Font;
64888
+ if (font.Name) this.Report.Header.Font.Name=font.Name;
64889
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Header.Font.Size=font.Size;
64890
+ }
64891
+ }
64892
+
64893
+ if (item.Item)
64894
+ {
64895
+ var row=item.Item;
64896
+ if (row.Mergin)
64897
+ {
64898
+ var mergin=row.Mergin;
64899
+ if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Item.Mergin.Left=mergin.Left;
64900
+ if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Item.Mergin.Right=mergin.Right;
64901
+ if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Item.Mergin.Top=mergin.Top;
64902
+ if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Item.Mergin.Bottom=mergin.Bottom;
64903
+ }
64904
+
64905
+ if (row.Font)
64906
+ {
64907
+ var font=row.Font;
64908
+ if (font.Name) this.Report.Item.Font.Name=font.Name;
64909
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.Font.Size=font.Size;
64910
+ }
64911
+
64912
+ if (row.BarMergin)
64913
+ {
64914
+ var mergin=row.BarMergin;
64915
+ if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.Item.BarMergin.Left=mergin.Left;
64916
+ if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.Item.BarMergin.Top=mergin.Top;
64917
+ if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.Item.BarMergin.Right=mergin.Right;
64918
+ if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.Item.BarMergin.Bottom=mergin.Bottom;
64919
+ }
64920
+
64921
+ if (row.NameFont)
64922
+ {
64923
+ var font=row.NameFont;
64924
+ if (font.Name) this.Report.Item.NameFont.Name=font.Name;
64925
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.NameFont.Size=font.Size;
64926
+ }
64927
+
64928
+ if (row.SymbolFont)
64929
+ {
64930
+ var font=row.SymbolFont;
64931
+ if (font.Name) this.Report.Item.SymbolFont.Name=font.Name;
64932
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Item.SymbolFont.Size=font.Size;
64933
+ }
64934
+ }
64935
+
64936
+ if (item.FixedItem)
64937
+ {
64938
+ var row=item.FixedItem;
64939
+ if (row.Font)
64940
+ {
64941
+ var font=row.Font;
64942
+ if (font.Name) this.Report.FixedItem.Font.Name=font.Name;
64943
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.FixedItem.Font.Size=font.Size;
64944
+ }
64945
+ }
64946
+
64947
+ if (item.LimitBorder)
64948
+ {
64949
+ var limit=item.LimitBorder;
64950
+ if (limit.Color) this.Report.LimitBorder.Color=limit.Color;
64951
+ if (limit.Mergin)
64952
+ {
64953
+ var mergin=limit.Mergin;
64954
+ if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.LimitBorder.Mergin.Left=mergin.Left;
64955
+ if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.LimitBorder.Mergin.Top=mergin.Top;
64956
+ if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.LimitBorder.Mergin.Right=mergin.Right;
64957
+ if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.LimitBorder.Mergin.Bottom=mergin.Bottom;
64958
+ }
64959
+ }
64960
+
64961
+ if (item.LimitColor)
64962
+ {
64963
+ var limit=item.LimitColor;
64964
+ if (limit.UpColor) this.Report.LimitColor.UpColor=limit.UpColor;
64965
+ if (limit.DownColor) this.Report.LimitColor.DownColor=limit.DownColor;
64966
+ if (limit.TextColor) this.Report.LimitColor.UpColor=limit.TextColor;
64967
+ }
64968
+
64969
+ if (item.FieldColor)
64970
+ {
64971
+ var filed=item.FieldColor;
64972
+ if (filed.Name) this.Report.FieldColor.Name=filed.Name;
64973
+ if (filed.Symbol) this.Report.FieldColor.Symbol=filed.Symbol;
64974
+ if (filed.Vol) this.Report.FieldColor.Vol=filed.Vol;
64975
+ if (filed.Amount) this.Report.FieldColor.Amount=filed.Amount;
64976
+ if (filed.Index) this.Report.FieldColor.Index=filed.Index;
64977
+ if (filed.BarTitle) this.Report.FieldColor.BarTitle=filed.BarTitle;
64978
+ if (filed.Text) this.Report.FieldColor.Text=filed.Text;
64979
+
64980
+ if (IFrameSplitOperator.IsNonEmptyArray(filed.Bar))
64981
+ {
64982
+ for(var i=0;i<filed.Bar.length;++i)
64983
+ this.Report.FieldColor.Bar[i]=filed.Bar[i];
64984
+ }
64985
+ }
64986
+
64987
+ if (item.Tab)
64988
+ {
64989
+ var tab=item.Tab;
64990
+ if (tab.Font)
64991
+ {
64992
+ var font=tab.Font;
64993
+ if (font.Name) this.Report.Tab.Font.Name=font.Name;
64994
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.Tab.Font.Size=font.Size;
64995
+ }
64996
+
64997
+ if (IFrameSplitOperator.IsNumber(tab.ScrollBarWidth)) this.Report.Tab.ScrollBarWidth=tab.ScrollBarWidth;
64998
+ if (tab.ButtonColor) this.Report.Tab.ButtonColor=tab.ButtonColor;
64999
+ if (tab.BarColor) this.Report.Tab.BarColor=tab.BarColor;
65000
+ if (tab.BorderColor) this.Report.Tab.BorderColor=tab.BorderColor;
65001
+
65002
+ if (tab.TabTitleColor) this.Report.Tab.TabTitleColor=tab.TabTitleColor;
65003
+ if (tab.TabSelectedTitleColor) this.Report.Tab.TabSelectedTitleColor=tab.TabSelectedTitleColor;
65004
+ if (tab.TabSelectedBGColor) this.Report.Tab.TabSelectedBGColor=tab.TabSelectedBGColor;
65005
+ if (tab.TabMoveOnTitleColor) this.Report.Tab.TabMoveOnTitleColor=tab.TabMoveOnTitleColor;
65006
+ if (tab.TabBGColor) this.Report.Tab.TabBGColor=tab.TabBGColor;
65007
+ }
65008
+
65009
+ if (item.PageInfo)
65010
+ {
65011
+ var pageinfo=item.PageInfo;
65012
+ if (pageinfo.Font)
65013
+ {
65014
+ var font=pageinfo.Font;
65015
+ if (font.Name) this.Report.PageInfo.Font.Name=font.Name;
65016
+ if (IFrameSplitOperator.IsNumber(font.Size)) this.Report.PageInfo.Font.Size=font.Size;
65017
+ }
65018
+
65019
+ if (pageinfo.TextColor) this.Report.PageInfo.TextColor=pageinfo.TextColor;
65020
+ if (pageinfo.BGColor) this.Report.PageInfo.BGColor=pageinfo.BGColor;
65021
+
65022
+ if (pageinfo.Mergin)
65023
+ {
65024
+ var mergin=pageinfo.Mergin;
65025
+ if (IFrameSplitOperator.IsNumber(mergin.Left)) this.Report.PageInfo.Mergin.Left=mergin.Left;
65026
+ if (IFrameSplitOperator.IsNumber(mergin.Top)) this.Report.PageInfo.Mergin.Top=mergin.Top;
65027
+ if (IFrameSplitOperator.IsNumber(mergin.Right)) this.Report.PageInfo.Mergin.Right=mergin.Right;
65028
+ if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.Report.PageInfo.Mergin.Bottom=mergin.Bottom;
65029
+ }
65030
+ }
65031
+
65032
+ if (item.DragRow)
65033
+ {
65034
+ var dragRow=item.DragRow;
65035
+ if (dragRow.Color) this.Report.DragRow.Color=dragRow.Color;
65036
+ if (dragRow.TextColor) this.Report.DragRow.TextColor=dragRow.TextColor;
65037
+ if (dragRow.MoveRowColor) this.Report.DragRow.MoveRowColor=dragRow.MoveRowColor;
65038
+ if (dragRow.SrcRowColor) this.Report.DragRow.SrcRowColor=dragRow.SrcRowColor;
65039
+ }
65040
+
65041
+ if (item.VScrollbar)
65042
+ {
65043
+ var subItem=item.VScrollbar;
65044
+ if (IFrameSplitOperator.IsNumber(subItem.ScrollBarHeight)) dest.VScrollbar.ScrollBarHeight=subItem.ScrollBarHeight;
65045
+ if (subItem.ButtonColor) dest.VScrollbar.ButtonColor=subItem.ButtonColor;
65046
+ if (subItem.BarColor) dest.VScrollbar.BarColor=subItem.BarColor;
65047
+ if (subItem.BorderColor) dest.VScrollbar.BorderColor=subItem.BorderColor;
65048
+ if (subItem.BGColor) dest.VScrollbar.BGColor=subItem.BGColor;
65049
+ }
65050
+
65051
+ }
65052
+
64925
65053
  this.SetTReportStyle=function(style)
64926
65054
  {
64927
65055
  var item=style;