hqchart 1.1.14742 → 1.1.14750

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.
@@ -10344,7 +10344,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
10344
10344
 
10345
10345
  var bDrawDialogTooltip=false;
10346
10346
  var ptPosition=null; //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
10347
- var corssCursorPos=this.GetCorssCursorPosition()
10347
+ var corssCursorPos=this.GetCorssCursorPosition();
10348
10348
  if (corssCursorPos.LastPoint.X!=null || corssCursorPos.LastPoint.Y!=null)
10349
10349
  {
10350
10350
  if (this.ChartCorssCursor)
@@ -10798,6 +10798,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
10798
10798
  this.DrawDynamicInfo=function(option)
10799
10799
  {
10800
10800
  this.LastMouseStatus.MouseOnToolbar=null; //鼠标在工具栏按钮上
10801
+ if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
10801
10802
 
10802
10803
  var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_BEFORE_DRAW_DYNAMIC_INFO);
10803
10804
  if (event && event.Callback)
@@ -17092,7 +17093,7 @@ function AverageWidthFrame()
17092
17093
  }
17093
17094
  else
17094
17095
  {
17095
- var right=border.Right-3;
17096
+ var right=border.RightEx-3;
17096
17097
  var left=border.Left;
17097
17098
  var yButton=border.Top+this.ChartBorder.TitleHeight/2;
17098
17099
 
@@ -64654,6 +64655,7 @@ function DynamicChartTitlePainting()
64654
64655
  this.IsShowIndexTitle=true; //是否显示指标标题信息
64655
64656
  this.IsShowNameArrow=false;
64656
64657
  this.NameArrowConfig=CloneData(g_JSChartResource.IndexTitle.NameArrow);
64658
+ this.CustomLocation; //自定义位置 { IsShow:, Top:, TitleHeight: }
64657
64659
 
64658
64660
  this.TradeIndex; //专家系统名字{Name:'名字', Param:'参数'}
64659
64661
  this.IsShowTradeIndexTitle=true;
@@ -65343,7 +65345,16 @@ function DynamicChartTitlePainting()
65343
65345
  if (this.Frame.IsShowIndexTitle==false) return;
65344
65346
  if (g_JSChartResource.IsDOMFrameTitle===true) return;
65345
65347
  if (!this.Data) return;
65346
- if (this.Frame.ChartBorder.TitleHeight<5) return;
65348
+ if (this.CustomLocation)
65349
+ {
65350
+ if (!this.CustomLocation.IsShow) return;
65351
+ if (!IFrameSplitOperator.IsNumber(this.CustomLocation.Top) || !IFrameSplitOperator.IsNumber(this.CustomLocation.TitleHeight)) return;
65352
+ }
65353
+ else
65354
+ {
65355
+ if (this.Frame.ChartBorder.TitleHeight<5) return;
65356
+ }
65357
+
65347
65358
  if (this.CursorIndex==null && !(this.GlobalOption && this.GlobalOption.IsDisplayLatest)) return;
65348
65359
 
65349
65360
  if (this.Frame.IsHScreen===true)
@@ -65365,6 +65376,11 @@ function DynamicChartTitlePainting()
65365
65376
 
65366
65377
  var left=this.Frame.ChartBorder.GetLeft()+this.MerginLeft;
65367
65378
  var bottom=this.Frame.ChartBorder.GetTop()+this.Frame.ChartBorder.TitleHeight/2; //上下居中显示
65379
+ if (this.CustomLocation) //自定义标题位置
65380
+ {
65381
+ bottom=this.Frame.ChartBorder.GetTop()+this.CustomLocation.Top+this.CustomLocation.TitleHeight/2;
65382
+ }
65383
+
65368
65384
  var right=this.Frame.ChartBorder.GetRight();
65369
65385
 
65370
65386
  var toolbarInfo={ Width:0, YCenter:bottom };
@@ -134560,6 +134576,33 @@ JSDealChartContainer.JsonDataToDealData=function(data)
134560
134576
  if (item[5]) dealItem.StrTime=item[5];
134561
134577
  if (item[6]) dealItem.ID=item[6];
134562
134578
 
134579
+ if (item[11]) dealItem.Symbol=item[11]; //股票代码
134580
+ if (item[12]) dealItem.Name=item[12]; //股票名称
134581
+
134582
+ //10个数值型 101-199
134583
+ if (IFrameSplitOperator.IsNumber(item[101])) dealItem.ReserveNumber1=item[101];
134584
+ if (IFrameSplitOperator.IsNumber(item[102])) dealItem.ReserveNumber2=item[102];
134585
+ if (IFrameSplitOperator.IsNumber(item[103])) dealItem.ReserveNumber3=item[103];
134586
+ if (IFrameSplitOperator.IsNumber(item[104])) dealItem.ReserveNumber4=item[104];
134587
+ if (IFrameSplitOperator.IsNumber(item[105])) dealItem.ReserveNumber5=item[105];
134588
+ if (IFrameSplitOperator.IsNumber(item[106])) dealItem.ReserveNumber6=item[106];
134589
+ if (IFrameSplitOperator.IsNumber(item[107])) dealItem.ReserveNumber7=item[107];
134590
+ if (IFrameSplitOperator.IsNumber(item[108])) dealItem.ReserveNumber8=item[108];
134591
+ if (IFrameSplitOperator.IsNumber(item[109])) dealItem.ReserveNumber9=item[109];
134592
+ if (IFrameSplitOperator.IsNumber(item[110])) dealItem.ReserveNumber10=item[110];
134593
+
134594
+ //10个字符型 201-299
134595
+ if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) dealItem.ReserveString1=item[201];
134596
+ if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) dealItem.ReserveString2=item[202];
134597
+ if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) dealItem.ReserveString3=item[203];
134598
+ if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) dealItem.ReserveString4=item[204];
134599
+ if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) dealItem.ReserveString5=item[205];
134600
+ if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) dealItem.ReserveString6=item[206];
134601
+ if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) dealItem.ReserveString7=item[207];
134602
+ if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) dealItem.ReserveString8=item[208];
134603
+ if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) dealItem.ReserveString9=item[209];
134604
+ if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) dealItem.ReserveString10=item[210];
134605
+
134563
134606
  result.push(dealItem);
134564
134607
  }
134565
134608
 
@@ -134659,9 +134702,66 @@ var DEAL_COLUMN_ID=
134659
134702
  INDEX_ID:7, //序号 从1开始
134660
134703
  MULTI_BAR_ID:8, //多颜色柱子
134661
134704
  CENTER_BAR_ID:9, //中心柱子
134662
- CUSTOM_TEXT_ID:10 //自定义文本
134705
+ CUSTOM_TEXT_ID:10, //自定义文本
134706
+
134707
+ SYMBOL_ID:11, //股票代码
134708
+ NAME_ID:12, //股票名称
134709
+
134710
+
134711
+ //预留数值类型 10个
134712
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
134713
+ RESERVE_NUMBER2_ID:202,
134714
+ RESERVE_NUMBER3_ID:203,
134715
+ RESERVE_NUMBER4_ID:204,
134716
+ RESERVE_NUMBER5_ID:205,
134717
+ RESERVE_NUMBER6_ID:206,
134718
+ RESERVE_NUMBER7_ID:207,
134719
+ RESERVE_NUMBER8_ID:208,
134720
+ RESERVE_NUMBER9_ID:209,
134721
+ RESERVE_NUMBER10_ID:210,
134722
+
134723
+ //预留字符串类型 10个 301-399
134724
+ RESERVE_STRING1_ID:301, //ReserveString1:
134725
+ RESERVE_STRING2_ID:302,
134726
+ RESERVE_STRING3_ID:303,
134727
+ RESERVE_STRING4_ID:304,
134728
+ RESERVE_STRING5_ID:305,
134729
+ RESERVE_STRING6_ID:306,
134730
+ RESERVE_STRING7_ID:307,
134731
+ RESERVE_STRING8_ID:308,
134732
+ RESERVE_STRING9_ID:309,
134733
+ RESERVE_STRING10_ID:310,
134663
134734
  }
134664
134735
 
134736
+ var MAP_DEAL_COLUMN_FIELD=new Map(
134737
+ [
134738
+ [DEAL_COLUMN_ID.SYMBOL_ID, "Symbol"],
134739
+ [DEAL_COLUMN_ID.NAME_ID, "Name"],
134740
+ [DEAL_COLUMN_ID.PRICE_ID, "Price"],
134741
+
134742
+ [DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
134743
+ [DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
134744
+ [DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
134745
+ [DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],
134746
+ [DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],
134747
+ [DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],
134748
+ [DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],
134749
+ [DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
134750
+ [DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
134751
+ [DEAL_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
134752
+
134753
+ [DEAL_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
134754
+ [DEAL_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
134755
+ [DEAL_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],
134756
+ [DEAL_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],
134757
+ [DEAL_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],
134758
+ [DEAL_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],
134759
+ [DEAL_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],
134760
+ [DEAL_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
134761
+ [DEAL_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
134762
+ [DEAL_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
134763
+ ]);
134764
+
134665
134765
  function ChartDealList()
134666
134766
  {
134667
134767
  this.Canvas; //画布
@@ -134687,7 +134787,7 @@ function ChartDealList()
134687
134787
  //涨跌颜色
134688
134788
  this.UpColor=g_JSChartResource.DealList.UpTextColor;
134689
134789
  this.DownColor=g_JSChartResource.DealList.DownTextColor;
134690
- this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor;
134790
+ this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor;
134691
134791
 
134692
134792
  this.BorderColor=g_JSChartResource.DealList.BorderColor; //边框线
134693
134793
 
@@ -134738,7 +134838,7 @@ function ChartDealList()
134738
134838
  {
134739
134839
  this.UpColor=g_JSChartResource.DealList.UpTextColor;
134740
134840
  this.DownColor=g_JSChartResource.DealList.DownTextColor;
134741
- this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor;
134841
+ this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor;
134742
134842
 
134743
134843
  this.BorderColor=g_JSChartResource.DealList.BorderColor; //边框线
134744
134844
 
@@ -134797,6 +134897,11 @@ function ChartDealList()
134797
134897
  {
134798
134898
  if (IFrameSplitOperator.IsString(item.Foramt)) colItem.Foramt=item.Foramt; //设置时间格式
134799
134899
  }
134900
+ else if (this.IsReserveNumber(item.Type))
134901
+ {
134902
+ if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
134903
+ if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
134904
+ }
134800
134905
 
134801
134906
  this.Column.push(colItem);
134802
134907
  }
@@ -134818,6 +134923,31 @@ function ChartDealList()
134818
134923
  { Type:DEAL_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
134819
134924
  { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
134820
134925
  { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
134926
+
134927
+ { Type:DEAL_COLUMN_ID.NAME_ID, Title:"股票名称", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎*" },
134928
+
134929
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134930
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134931
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134932
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER4_ID, Title:"数值4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134933
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER5_ID, Title:"数值5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134934
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER6_ID, Title:"数值6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134935
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER7_ID, Title:"数值7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134936
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134937
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134938
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134939
+
134940
+
134941
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134942
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134943
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING3_ID, Title:"文字3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134944
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING4_ID, Title:"文字4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134945
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING5_ID, Title:"文字5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134946
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING6_ID, Title:"文字6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134947
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING7_ID, Title:"文字7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134948
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134949
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134950
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134821
134951
 
134822
134952
  ];
134823
134953
 
@@ -135039,6 +135169,19 @@ function ChartDealList()
135039
135169
 
135040
135170
  if (i==this.Column.length-1) itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;
135041
135171
 
135172
+ var drawInfo=
135173
+ {
135174
+ Text:null, TextColor:item.TextColor , TextAlign:item.TextAlign, Tooltip:null,
135175
+ Index:dataIndex, ColumnIndex:i
135176
+ };
135177
+
135178
+ var rtItem={ Left:left, Top:top, Width:itemWidth, Height:this.RowHeight };
135179
+ rtItem.Right=rtItem.Left+rtItem.Width;
135180
+ rtItem.Bottom=rtItem.Top+rtItem.Height;
135181
+ drawInfo.Rect=rtItem;
135182
+
135183
+ var bDrawV2=false;
135184
+
135042
135185
  if (item.Type==DEAL_COLUMN_ID.TIME_ID)
135043
135186
  {
135044
135187
  text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);
@@ -135051,7 +135194,7 @@ function ChartDealList()
135051
135194
  {
135052
135195
  if (data.Price>this.YClose) textColor=this.UpColor;
135053
135196
  else if (data.Price<this.YClose) textColor=this.DownColor;
135054
- else textColor=this.UnchagneColor;
135197
+ else textColor=this.UnchangeColor;
135055
135198
 
135056
135199
  text=data.Price.toFixed(this.Decimal);
135057
135200
  }
@@ -135086,7 +135229,7 @@ function ChartDealList()
135086
135229
 
135087
135230
  if (value>0) textColor=this.UpColor;
135088
135231
  else if (value<0) textColor=this.DownColor;
135089
- else textColor=this.UnchagneColor;
135232
+ else textColor=this.UnchangeColor;
135090
135233
  }
135091
135234
  }
135092
135235
  else if (item.Type==DEAL_COLUMN_ID.INDEX_ID)
@@ -135114,13 +135257,110 @@ function ChartDealList()
135114
135257
  if (out.TextAlign) textAlign=out.TextAlign;
135115
135258
  }
135116
135259
  }
135117
-
135118
- this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
135260
+ else if (this.IsReserveString(item.Type))
135261
+ {
135262
+ this.FormatReserveString(item, data, drawInfo);
135263
+ bDrawV2=true;
135264
+ }
135265
+ else if (this.IsReserveNumber(item.Type))
135266
+ {
135267
+ this.FormatReserveNumber(item, data, drawInfo);
135268
+ bDrawV2=true;
135269
+ }
135270
+
135271
+
135272
+ if (bDrawV2)
135273
+ {
135274
+ this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
135275
+ }
135276
+ else
135277
+ {
135278
+ this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
135279
+ }
135280
+
135119
135281
 
135120
135282
  left+=item.Width;
135121
135283
  }
135122
135284
  }
135123
135285
 
135286
+ this.FormatReserveNumber=function(column, data, drawInfo)
135287
+ {
135288
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
135289
+
135290
+ var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
135291
+ if (!data || !fieldName) return;
135292
+
135293
+ var value=data[fieldName];
135294
+ if (!IFrameSplitOperator.IsNumber(value)) return;
135295
+
135296
+ if (IFrameSplitOperator.IsNumber(column.ColorType))
135297
+ {
135298
+ if (column.ColorType==1)
135299
+ {
135300
+ drawInfo.TextColor=this.GetUpDownColor(value,0);
135301
+ }
135302
+ else if (column.ColorType==2)
135303
+ {
135304
+ drawInfo.TextColor=this.GetUpDownColorV2(value,0);
135305
+ }
135306
+ }
135307
+
135308
+ var text=value.toFixed(column.FloatPrecision);
135309
+ if (column.Format && IFrameSplitOperator.IsNumber(column.Format.Type))
135310
+ {
135311
+ var format=column.Format;
135312
+ switch(format.Type)
135313
+ {
135314
+ case 1: //原始数据
135315
+ text=value.toFixed(column.FloatPrecision);
135316
+ break;
135317
+ case 2: //千分位分割
135318
+ text=IFrameSplitOperator.FormatValueThousandsString(value, column.FloatPrecision);
135319
+ break;
135320
+ case 3:
135321
+ var exfloatPrecision=1;
135322
+ if (IFrameSplitOperator.IsNumber(format.ExFloatPrecision)) exfloatPrecision=format.ExFloatPrecision;
135323
+ text=IFrameSplitOperator.FormatValueStringV2(value, column.FloatPrecision,exfloatPrecision);
135324
+ break;
135325
+ }
135326
+ }
135327
+
135328
+ drawInfo.Text=text;
135329
+ }
135330
+
135331
+ this.FormatReserveString=function(column, data, drawInfo)
135332
+ {
135333
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
135334
+
135335
+ var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
135336
+ if (!data || !fieldName) return;
135337
+
135338
+ var item=data[fieldName];
135339
+ if (IFrameSplitOperator.IsObject(item))
135340
+ {
135341
+ if (item.Text) drawInfo.Text=item.Text;
135342
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
135343
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
135344
+ }
135345
+ else if (IFrameSplitOperator.IsString(item))
135346
+ {
135347
+ drawInfo.Text=item;
135348
+ }
135349
+ }
135350
+
135351
+ this.GetUpDownColor=function(price, price2)
135352
+ {
135353
+ if (price>price2) return this.UpColor;
135354
+ else if (price<price2) return this.DownColor;
135355
+ else return this.UnchangeColor;
135356
+ }
135357
+
135358
+ this.GetUpDownColorV2=function(price, price2)
135359
+ {
135360
+ if (price>=price2) return this.UpColor;
135361
+ else return this.DownColor;
135362
+ }
135363
+
135124
135364
  this.DrawSelectedRow=function(data, index, rtRow)
135125
135365
  {
135126
135366
  if (!this.SelectedData) return;
@@ -135332,6 +135572,30 @@ function ChartDealList()
135332
135572
  event.Callback(event,data,this);
135333
135573
  }
135334
135574
  }
135575
+
135576
+ this.IsReserveString=function(value)
135577
+ {
135578
+ var ARARY_TYPE=
135579
+ [
135580
+ DEAL_COLUMN_ID.RESERVE_STRING1_ID,DEAL_COLUMN_ID.RESERVE_STRING2_ID,DEAL_COLUMN_ID.RESERVE_STRING3_ID,DEAL_COLUMN_ID.RESERVE_STRING4_ID,
135581
+ DEAL_COLUMN_ID.RESERVE_STRING5_ID,DEAL_COLUMN_ID.RESERVE_STRING6_ID,DEAL_COLUMN_ID.RESERVE_STRING7_ID,DEAL_COLUMN_ID.RESERVE_STRING8_ID,
135582
+ DEAL_COLUMN_ID.RESERVE_STRING9_ID,DEAL_COLUMN_ID.RESERVE_STRING10_ID
135583
+ ];
135584
+
135585
+ return ARARY_TYPE.includes(value);
135586
+ }
135587
+
135588
+ this.IsReserveNumber=function(value)
135589
+ {
135590
+ var ARARY_TYPE=
135591
+ [
135592
+ DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,
135593
+ DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,
135594
+ DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,DEAL_COLUMN_ID.RESERVE_NUMBER10_ID
135595
+ ];
135596
+
135597
+ return ARARY_TYPE.includes(value);
135598
+ }
135335
135599
  }
135336
135600
  /*
135337
135601
  Copyright (c) 2018 jones
@@ -148383,7 +148647,7 @@ function ScrollBarBGChart()
148383
148647
 
148384
148648
 
148385
148649
 
148386
- var HQCHART_VERSION="1.1.14741";
148650
+ var HQCHART_VERSION="1.1.14749";
148387
148651
 
148388
148652
  function PrintHQChartVersion()
148389
148653
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14741";
8
+ var HQCHART_VERSION="1.1.14749";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {