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.
@@ -10388,7 +10388,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
10388
10388
 
10389
10389
  var bDrawDialogTooltip=false;
10390
10390
  var ptPosition=null; //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
10391
- var corssCursorPos=this.GetCorssCursorPosition()
10391
+ var corssCursorPos=this.GetCorssCursorPosition();
10392
10392
  if (corssCursorPos.LastPoint.X!=null || corssCursorPos.LastPoint.Y!=null)
10393
10393
  {
10394
10394
  if (this.ChartCorssCursor)
@@ -10842,6 +10842,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
10842
10842
  this.DrawDynamicInfo=function(option)
10843
10843
  {
10844
10844
  this.LastMouseStatus.MouseOnToolbar=null; //鼠标在工具栏按钮上
10845
+ if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
10845
10846
 
10846
10847
  var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_BEFORE_DRAW_DYNAMIC_INFO);
10847
10848
  if (event && event.Callback)
@@ -17136,7 +17137,7 @@ function AverageWidthFrame()
17136
17137
  }
17137
17138
  else
17138
17139
  {
17139
- var right=border.Right-3;
17140
+ var right=border.RightEx-3;
17140
17141
  var left=border.Left;
17141
17142
  var yButton=border.Top+this.ChartBorder.TitleHeight/2;
17142
17143
 
@@ -64698,6 +64699,7 @@ function DynamicChartTitlePainting()
64698
64699
  this.IsShowIndexTitle=true; //是否显示指标标题信息
64699
64700
  this.IsShowNameArrow=false;
64700
64701
  this.NameArrowConfig=CloneData(g_JSChartResource.IndexTitle.NameArrow);
64702
+ this.CustomLocation; //自定义位置 { IsShow:, Top:, TitleHeight: }
64701
64703
 
64702
64704
  this.TradeIndex; //专家系统名字{Name:'名字', Param:'参数'}
64703
64705
  this.IsShowTradeIndexTitle=true;
@@ -65387,7 +65389,16 @@ function DynamicChartTitlePainting()
65387
65389
  if (this.Frame.IsShowIndexTitle==false) return;
65388
65390
  if (g_JSChartResource.IsDOMFrameTitle===true) return;
65389
65391
  if (!this.Data) return;
65390
- if (this.Frame.ChartBorder.TitleHeight<5) return;
65392
+ if (this.CustomLocation)
65393
+ {
65394
+ if (!this.CustomLocation.IsShow) return;
65395
+ if (!IFrameSplitOperator.IsNumber(this.CustomLocation.Top) || !IFrameSplitOperator.IsNumber(this.CustomLocation.TitleHeight)) return;
65396
+ }
65397
+ else
65398
+ {
65399
+ if (this.Frame.ChartBorder.TitleHeight<5) return;
65400
+ }
65401
+
65391
65402
  if (this.CursorIndex==null && !(this.GlobalOption && this.GlobalOption.IsDisplayLatest)) return;
65392
65403
 
65393
65404
  if (this.Frame.IsHScreen===true)
@@ -65409,6 +65420,11 @@ function DynamicChartTitlePainting()
65409
65420
 
65410
65421
  var left=this.Frame.ChartBorder.GetLeft()+this.MerginLeft;
65411
65422
  var bottom=this.Frame.ChartBorder.GetTop()+this.Frame.ChartBorder.TitleHeight/2; //上下居中显示
65423
+ if (this.CustomLocation) //自定义标题位置
65424
+ {
65425
+ bottom=this.Frame.ChartBorder.GetTop()+this.CustomLocation.Top+this.CustomLocation.TitleHeight/2;
65426
+ }
65427
+
65412
65428
  var right=this.Frame.ChartBorder.GetRight();
65413
65429
 
65414
65430
  var toolbarInfo={ Width:0, YCenter:bottom };
@@ -134604,6 +134620,33 @@ JSDealChartContainer.JsonDataToDealData=function(data)
134604
134620
  if (item[5]) dealItem.StrTime=item[5];
134605
134621
  if (item[6]) dealItem.ID=item[6];
134606
134622
 
134623
+ if (item[11]) dealItem.Symbol=item[11]; //股票代码
134624
+ if (item[12]) dealItem.Name=item[12]; //股票名称
134625
+
134626
+ //10个数值型 101-199
134627
+ if (IFrameSplitOperator.IsNumber(item[101])) dealItem.ReserveNumber1=item[101];
134628
+ if (IFrameSplitOperator.IsNumber(item[102])) dealItem.ReserveNumber2=item[102];
134629
+ if (IFrameSplitOperator.IsNumber(item[103])) dealItem.ReserveNumber3=item[103];
134630
+ if (IFrameSplitOperator.IsNumber(item[104])) dealItem.ReserveNumber4=item[104];
134631
+ if (IFrameSplitOperator.IsNumber(item[105])) dealItem.ReserveNumber5=item[105];
134632
+ if (IFrameSplitOperator.IsNumber(item[106])) dealItem.ReserveNumber6=item[106];
134633
+ if (IFrameSplitOperator.IsNumber(item[107])) dealItem.ReserveNumber7=item[107];
134634
+ if (IFrameSplitOperator.IsNumber(item[108])) dealItem.ReserveNumber8=item[108];
134635
+ if (IFrameSplitOperator.IsNumber(item[109])) dealItem.ReserveNumber9=item[109];
134636
+ if (IFrameSplitOperator.IsNumber(item[110])) dealItem.ReserveNumber10=item[110];
134637
+
134638
+ //10个字符型 201-299
134639
+ if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) dealItem.ReserveString1=item[201];
134640
+ if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) dealItem.ReserveString2=item[202];
134641
+ if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) dealItem.ReserveString3=item[203];
134642
+ if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) dealItem.ReserveString4=item[204];
134643
+ if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) dealItem.ReserveString5=item[205];
134644
+ if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) dealItem.ReserveString6=item[206];
134645
+ if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) dealItem.ReserveString7=item[207];
134646
+ if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) dealItem.ReserveString8=item[208];
134647
+ if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) dealItem.ReserveString9=item[209];
134648
+ if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) dealItem.ReserveString10=item[210];
134649
+
134607
134650
  result.push(dealItem);
134608
134651
  }
134609
134652
 
@@ -134703,9 +134746,66 @@ var DEAL_COLUMN_ID=
134703
134746
  INDEX_ID:7, //序号 从1开始
134704
134747
  MULTI_BAR_ID:8, //多颜色柱子
134705
134748
  CENTER_BAR_ID:9, //中心柱子
134706
- CUSTOM_TEXT_ID:10 //自定义文本
134749
+ CUSTOM_TEXT_ID:10, //自定义文本
134750
+
134751
+ SYMBOL_ID:11, //股票代码
134752
+ NAME_ID:12, //股票名称
134753
+
134754
+
134755
+ //预留数值类型 10个
134756
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
134757
+ RESERVE_NUMBER2_ID:202,
134758
+ RESERVE_NUMBER3_ID:203,
134759
+ RESERVE_NUMBER4_ID:204,
134760
+ RESERVE_NUMBER5_ID:205,
134761
+ RESERVE_NUMBER6_ID:206,
134762
+ RESERVE_NUMBER7_ID:207,
134763
+ RESERVE_NUMBER8_ID:208,
134764
+ RESERVE_NUMBER9_ID:209,
134765
+ RESERVE_NUMBER10_ID:210,
134766
+
134767
+ //预留字符串类型 10个 301-399
134768
+ RESERVE_STRING1_ID:301, //ReserveString1:
134769
+ RESERVE_STRING2_ID:302,
134770
+ RESERVE_STRING3_ID:303,
134771
+ RESERVE_STRING4_ID:304,
134772
+ RESERVE_STRING5_ID:305,
134773
+ RESERVE_STRING6_ID:306,
134774
+ RESERVE_STRING7_ID:307,
134775
+ RESERVE_STRING8_ID:308,
134776
+ RESERVE_STRING9_ID:309,
134777
+ RESERVE_STRING10_ID:310,
134707
134778
  }
134708
134779
 
134780
+ var MAP_DEAL_COLUMN_FIELD=new Map(
134781
+ [
134782
+ [DEAL_COLUMN_ID.SYMBOL_ID, "Symbol"],
134783
+ [DEAL_COLUMN_ID.NAME_ID, "Name"],
134784
+ [DEAL_COLUMN_ID.PRICE_ID, "Price"],
134785
+
134786
+ [DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
134787
+ [DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
134788
+ [DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
134789
+ [DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],
134790
+ [DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],
134791
+ [DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],
134792
+ [DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],
134793
+ [DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
134794
+ [DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
134795
+ [DEAL_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
134796
+
134797
+ [DEAL_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
134798
+ [DEAL_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
134799
+ [DEAL_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],
134800
+ [DEAL_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],
134801
+ [DEAL_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],
134802
+ [DEAL_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],
134803
+ [DEAL_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],
134804
+ [DEAL_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
134805
+ [DEAL_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
134806
+ [DEAL_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
134807
+ ]);
134808
+
134709
134809
  function ChartDealList()
134710
134810
  {
134711
134811
  this.Canvas; //画布
@@ -134731,7 +134831,7 @@ function ChartDealList()
134731
134831
  //涨跌颜色
134732
134832
  this.UpColor=g_JSChartResource.DealList.UpTextColor;
134733
134833
  this.DownColor=g_JSChartResource.DealList.DownTextColor;
134734
- this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor;
134834
+ this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor;
134735
134835
 
134736
134836
  this.BorderColor=g_JSChartResource.DealList.BorderColor; //边框线
134737
134837
 
@@ -134782,7 +134882,7 @@ function ChartDealList()
134782
134882
  {
134783
134883
  this.UpColor=g_JSChartResource.DealList.UpTextColor;
134784
134884
  this.DownColor=g_JSChartResource.DealList.DownTextColor;
134785
- this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor;
134885
+ this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor;
134786
134886
 
134787
134887
  this.BorderColor=g_JSChartResource.DealList.BorderColor; //边框线
134788
134888
 
@@ -134841,6 +134941,11 @@ function ChartDealList()
134841
134941
  {
134842
134942
  if (IFrameSplitOperator.IsString(item.Foramt)) colItem.Foramt=item.Foramt; //设置时间格式
134843
134943
  }
134944
+ else if (this.IsReserveNumber(item.Type))
134945
+ {
134946
+ if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
134947
+ if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
134948
+ }
134844
134949
 
134845
134950
  this.Column.push(colItem);
134846
134951
  }
@@ -134862,6 +134967,31 @@ function ChartDealList()
134862
134967
  { Type:DEAL_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
134863
134968
  { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
134864
134969
  { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
134970
+
134971
+ { Type:DEAL_COLUMN_ID.NAME_ID, Title:"股票名称", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎*" },
134972
+
134973
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134974
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134975
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134976
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER4_ID, Title:"数值4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134977
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER5_ID, Title:"数值5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134978
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER6_ID, Title:"数值6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134979
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER7_ID, Title:"数值7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134980
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134981
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134982
+ { Type:DEAL_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
134983
+
134984
+
134985
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134986
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134987
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING3_ID, Title:"文字3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134988
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING4_ID, Title:"文字4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134989
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING5_ID, Title:"文字5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134990
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING6_ID, Title:"文字6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134991
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING7_ID, Title:"文字7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134992
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134993
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134994
+ { Type:DEAL_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
134865
134995
 
134866
134996
  ];
134867
134997
 
@@ -135083,6 +135213,19 @@ function ChartDealList()
135083
135213
 
135084
135214
  if (i==this.Column.length-1) itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;
135085
135215
 
135216
+ var drawInfo=
135217
+ {
135218
+ Text:null, TextColor:item.TextColor , TextAlign:item.TextAlign, Tooltip:null,
135219
+ Index:dataIndex, ColumnIndex:i
135220
+ };
135221
+
135222
+ var rtItem={ Left:left, Top:top, Width:itemWidth, Height:this.RowHeight };
135223
+ rtItem.Right=rtItem.Left+rtItem.Width;
135224
+ rtItem.Bottom=rtItem.Top+rtItem.Height;
135225
+ drawInfo.Rect=rtItem;
135226
+
135227
+ var bDrawV2=false;
135228
+
135086
135229
  if (item.Type==DEAL_COLUMN_ID.TIME_ID)
135087
135230
  {
135088
135231
  text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);
@@ -135095,7 +135238,7 @@ function ChartDealList()
135095
135238
  {
135096
135239
  if (data.Price>this.YClose) textColor=this.UpColor;
135097
135240
  else if (data.Price<this.YClose) textColor=this.DownColor;
135098
- else textColor=this.UnchagneColor;
135241
+ else textColor=this.UnchangeColor;
135099
135242
 
135100
135243
  text=data.Price.toFixed(this.Decimal);
135101
135244
  }
@@ -135130,7 +135273,7 @@ function ChartDealList()
135130
135273
 
135131
135274
  if (value>0) textColor=this.UpColor;
135132
135275
  else if (value<0) textColor=this.DownColor;
135133
- else textColor=this.UnchagneColor;
135276
+ else textColor=this.UnchangeColor;
135134
135277
  }
135135
135278
  }
135136
135279
  else if (item.Type==DEAL_COLUMN_ID.INDEX_ID)
@@ -135158,13 +135301,110 @@ function ChartDealList()
135158
135301
  if (out.TextAlign) textAlign=out.TextAlign;
135159
135302
  }
135160
135303
  }
135161
-
135162
- this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
135304
+ else if (this.IsReserveString(item.Type))
135305
+ {
135306
+ this.FormatReserveString(item, data, drawInfo);
135307
+ bDrawV2=true;
135308
+ }
135309
+ else if (this.IsReserveNumber(item.Type))
135310
+ {
135311
+ this.FormatReserveNumber(item, data, drawInfo);
135312
+ bDrawV2=true;
135313
+ }
135314
+
135315
+
135316
+ if (bDrawV2)
135317
+ {
135318
+ this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
135319
+ }
135320
+ else
135321
+ {
135322
+ this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
135323
+ }
135324
+
135163
135325
 
135164
135326
  left+=item.Width;
135165
135327
  }
135166
135328
  }
135167
135329
 
135330
+ this.FormatReserveNumber=function(column, data, drawInfo)
135331
+ {
135332
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
135333
+
135334
+ var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
135335
+ if (!data || !fieldName) return;
135336
+
135337
+ var value=data[fieldName];
135338
+ if (!IFrameSplitOperator.IsNumber(value)) return;
135339
+
135340
+ if (IFrameSplitOperator.IsNumber(column.ColorType))
135341
+ {
135342
+ if (column.ColorType==1)
135343
+ {
135344
+ drawInfo.TextColor=this.GetUpDownColor(value,0);
135345
+ }
135346
+ else if (column.ColorType==2)
135347
+ {
135348
+ drawInfo.TextColor=this.GetUpDownColorV2(value,0);
135349
+ }
135350
+ }
135351
+
135352
+ var text=value.toFixed(column.FloatPrecision);
135353
+ if (column.Format && IFrameSplitOperator.IsNumber(column.Format.Type))
135354
+ {
135355
+ var format=column.Format;
135356
+ switch(format.Type)
135357
+ {
135358
+ case 1: //原始数据
135359
+ text=value.toFixed(column.FloatPrecision);
135360
+ break;
135361
+ case 2: //千分位分割
135362
+ text=IFrameSplitOperator.FormatValueThousandsString(value, column.FloatPrecision);
135363
+ break;
135364
+ case 3:
135365
+ var exfloatPrecision=1;
135366
+ if (IFrameSplitOperator.IsNumber(format.ExFloatPrecision)) exfloatPrecision=format.ExFloatPrecision;
135367
+ text=IFrameSplitOperator.FormatValueStringV2(value, column.FloatPrecision,exfloatPrecision);
135368
+ break;
135369
+ }
135370
+ }
135371
+
135372
+ drawInfo.Text=text;
135373
+ }
135374
+
135375
+ this.FormatReserveString=function(column, data, drawInfo)
135376
+ {
135377
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
135378
+
135379
+ var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
135380
+ if (!data || !fieldName) return;
135381
+
135382
+ var item=data[fieldName];
135383
+ if (IFrameSplitOperator.IsObject(item))
135384
+ {
135385
+ if (item.Text) drawInfo.Text=item.Text;
135386
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
135387
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
135388
+ }
135389
+ else if (IFrameSplitOperator.IsString(item))
135390
+ {
135391
+ drawInfo.Text=item;
135392
+ }
135393
+ }
135394
+
135395
+ this.GetUpDownColor=function(price, price2)
135396
+ {
135397
+ if (price>price2) return this.UpColor;
135398
+ else if (price<price2) return this.DownColor;
135399
+ else return this.UnchangeColor;
135400
+ }
135401
+
135402
+ this.GetUpDownColorV2=function(price, price2)
135403
+ {
135404
+ if (price>=price2) return this.UpColor;
135405
+ else return this.DownColor;
135406
+ }
135407
+
135168
135408
  this.DrawSelectedRow=function(data, index, rtRow)
135169
135409
  {
135170
135410
  if (!this.SelectedData) return;
@@ -135376,6 +135616,30 @@ function ChartDealList()
135376
135616
  event.Callback(event,data,this);
135377
135617
  }
135378
135618
  }
135619
+
135620
+ this.IsReserveString=function(value)
135621
+ {
135622
+ var ARARY_TYPE=
135623
+ [
135624
+ DEAL_COLUMN_ID.RESERVE_STRING1_ID,DEAL_COLUMN_ID.RESERVE_STRING2_ID,DEAL_COLUMN_ID.RESERVE_STRING3_ID,DEAL_COLUMN_ID.RESERVE_STRING4_ID,
135625
+ DEAL_COLUMN_ID.RESERVE_STRING5_ID,DEAL_COLUMN_ID.RESERVE_STRING6_ID,DEAL_COLUMN_ID.RESERVE_STRING7_ID,DEAL_COLUMN_ID.RESERVE_STRING8_ID,
135626
+ DEAL_COLUMN_ID.RESERVE_STRING9_ID,DEAL_COLUMN_ID.RESERVE_STRING10_ID
135627
+ ];
135628
+
135629
+ return ARARY_TYPE.includes(value);
135630
+ }
135631
+
135632
+ this.IsReserveNumber=function(value)
135633
+ {
135634
+ var ARARY_TYPE=
135635
+ [
135636
+ DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,
135637
+ DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,
135638
+ DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,DEAL_COLUMN_ID.RESERVE_NUMBER10_ID
135639
+ ];
135640
+
135641
+ return ARARY_TYPE.includes(value);
135642
+ }
135379
135643
  }
135380
135644
  /*
135381
135645
  Copyright (c) 2018 jones
@@ -159198,7 +159462,7 @@ function HQChartScriptWorker()
159198
159462
 
159199
159463
 
159200
159464
 
159201
- var HQCHART_VERSION="1.1.14741";
159465
+ var HQCHART_VERSION="1.1.14749";
159202
159466
 
159203
159467
  function PrintHQChartVersion()
159204
159468
  {