hqchart 1.1.14978 → 1.1.14986

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.
@@ -11461,6 +11461,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
11461
11461
  var mouseStatus=null; //鼠标状态
11462
11462
  var button=null; //当前鼠标所在按钮
11463
11463
  var frameID=this.Frame.PtInFrame(x,y);
11464
+ this.LastPoint.FrameID=frameID;
11464
11465
  if (IFrameSplitOperator.IsNumber(frameID) && frameID>=0) //在K线内部移动,调整K线索引
11465
11466
  this.CursorIndex=this.Frame.GetXData(x);
11466
11467
 
@@ -12356,40 +12357,45 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
12356
12357
 
12357
12358
  this.UpdatePointByCursorIndex=function(type) //type 1=根据十字光标更新 2=强制取消十字光标
12358
12359
  {
12359
- var pt={X:null, Y:null};
12360
- pt.X=this.Frame.GetXFromIndex(this.CursorIndex);
12361
- var index=Math.abs(this.CursorIndex-0.5);
12362
- if (this.IsKLineContainer()) index=this.CursorIndex;
12360
+ if (type==1) //根据十字光标更新
12361
+ {
12362
+ if (this.LastPoint.FrameID<0) return;
12363
12363
 
12364
- var data=this.Frame.Data;
12365
- if (data.DataOffset+index<data.Data.length)
12366
- {
12367
- var close=data.Data[data.DataOffset+index].Close;
12368
- pt.Y=this.Frame.GetYFromData(close);
12369
- }
12370
-
12371
- if (type==1 && this.ChartCorssCursor)
12372
- {
12373
- if (this.ChartCorssCursor.Status==1) //十字光标显示中, 不调整位置
12364
+ var pt={ X:null, Y:this.LastPoint.Y };
12365
+ pt.X=this.Frame.GetXFromIndex(this.CursorIndex); //X轴动态变的
12366
+ if (this.ChartCorssCursor)
12374
12367
  {
12368
+ if (this.ChartCorssCursor.Status==1)
12369
+ {
12375
12370
 
12371
+ }
12372
+ else
12373
+ {
12374
+ pt.Y=null;
12375
+ pt.X=null;
12376
+ }
12376
12377
  }
12377
- else
12378
- {
12379
- this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
12380
- var index=Math.abs(this.CursorIndex-0.5);
12381
- index=parseInt(index.toFixed(0));
12382
- if (this.IsKLineContainer()) index=this.CursorIndex;
12383
- this.LastPoint.Y=null;
12384
- }
12378
+ this.LastPoint.X=pt.X;
12379
+ this.LastPoint.Y=pt.Y;
12385
12380
  }
12386
- else if (type==2 && this.ChartCorssCursor) //取消鼠标位置,十字光标就不显示了
12381
+ else if (type==2)
12387
12382
  {
12388
12383
  this.LastPoint.Y=null;
12389
12384
  this.LastPoint.X=null;
12385
+ this.LastPoint.FrameID=-1;
12390
12386
  }
12391
12387
  else
12392
12388
  {
12389
+ var pt={ X:null, Y:null };
12390
+ pt.X=this.Frame.GetXFromIndex(this.CursorIndex);
12391
+ var index=this.CursorIndex;
12392
+ var data=this.GetKData();
12393
+ if (IFrameSplitOperator.IsGTEZero(index) && data.DataOffset+index<data.Data.length)
12394
+ {
12395
+ var close=data.Data[data.DataOffset+index].Close;
12396
+ pt.Y=this.Frame.GetYFromData(close);
12397
+ this.LastPoint.FrameID=0;
12398
+ }
12393
12399
  this.LastPoint.X=pt.X;
12394
12400
  this.LastPoint.Y=pt.Y;
12395
12401
  }
@@ -58385,6 +58391,12 @@ IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID
58385
58391
  return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
58386
58392
  case "HH:MM:SS.fff":
58387
58393
  return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}.${IFrameSplitOperator.MillisecondToString(datetime.getMilliseconds())}`;
58394
+
58395
+ case "YYYY-MM-DD HH:MM":
58396
+ return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())} ${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
58397
+ case "MM-DD HH:MM":
58398
+ return `${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())} ${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
58399
+
58388
58400
  default:
58389
58401
  return null;
58390
58402
  }
@@ -58440,6 +58452,15 @@ IFrameSplitOperator.IsPlusNumber=function(value)
58440
58452
  return value>0;
58441
58453
  }
58442
58454
 
58455
+ //>=0
58456
+ IFrameSplitOperator.IsGTEZero=function(value)
58457
+ {
58458
+ if (value==null) return false;
58459
+ if (isNaN(value)) return false;
58460
+
58461
+ return value>=0;
58462
+ }
58463
+
58443
58464
  //是否是整形
58444
58465
  IFrameSplitOperator.IsInteger=function(x)
58445
58466
  {
@@ -95624,7 +95645,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
95624
95645
 
95625
95646
  var index=this.CursorIndex;
95626
95647
  index=parseInt(index.toFixed(0));
95627
- var data=this.Frame.SourceData;
95648
+ var data=this.GetKData();
95628
95649
  if (data.DataOffset+index>=data.Data.length)
95629
95650
  {
95630
95651
  return;
@@ -95635,6 +95656,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
95635
95656
  else close=item.Close
95636
95657
 
95637
95658
  this.LastPoint.Y=this.Frame.GetYFromData(close);
95659
+ this.LastPoint.FrameID=0;
95638
95660
  }
95639
95661
 
95640
95662
 
@@ -140453,6 +140475,16 @@ function JSReportChartContainer(uielement)
140453
140475
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
140454
140476
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
140455
140477
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
140478
+ if (IFrameSplitOperator.IsNumber(item[111])) stock.ReserveNumber11=item[111];
140479
+ if (IFrameSplitOperator.IsNumber(item[112])) stock.ReserveNumber12=item[112];
140480
+ if (IFrameSplitOperator.IsNumber(item[113])) stock.ReserveNumber13=item[113];
140481
+ if (IFrameSplitOperator.IsNumber(item[114])) stock.ReserveNumber14=item[114];
140482
+ if (IFrameSplitOperator.IsNumber(item[115])) stock.ReserveNumber15=item[115];
140483
+ if (IFrameSplitOperator.IsNumber(item[116])) stock.ReserveNumber16=item[116];
140484
+ if (IFrameSplitOperator.IsNumber(item[117])) stock.ReserveNumber17=item[117];
140485
+ if (IFrameSplitOperator.IsNumber(item[118])) stock.ReserveNumber18=item[118];
140486
+ if (IFrameSplitOperator.IsNumber(item[119])) stock.ReserveNumber19=item[119];
140487
+ if (IFrameSplitOperator.IsNumber(item[120])) stock.ReserveNumber20=item[120];
140456
140488
 
140457
140489
  //10个字符型 201-299
140458
140490
  if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
@@ -142847,6 +142879,16 @@ function JSReportChartContainer(uielement)
142847
142879
  case REPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
142848
142880
  case REPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
142849
142881
  case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
142882
+ case REPORT_COLUMN_ID.RESERVE_NUMBER11_ID:
142883
+ case REPORT_COLUMN_ID.RESERVE_NUMBER12_ID:
142884
+ case REPORT_COLUMN_ID.RESERVE_NUMBER13_ID:
142885
+ case REPORT_COLUMN_ID.RESERVE_NUMBER14_ID:
142886
+ case REPORT_COLUMN_ID.RESERVE_NUMBER15_ID:
142887
+ case REPORT_COLUMN_ID.RESERVE_NUMBER16_ID:
142888
+ case REPORT_COLUMN_ID.RESERVE_NUMBER17_ID:
142889
+ case REPORT_COLUMN_ID.RESERVE_NUMBER18_ID:
142890
+ case REPORT_COLUMN_ID.RESERVE_NUMBER19_ID:
142891
+ case REPORT_COLUMN_ID.RESERVE_NUMBER20_ID:
142850
142892
 
142851
142893
  return this.LocalNumberSort(left, right, column, sortType);
142852
142894
 
@@ -143509,7 +143551,7 @@ var REPORT_COLUMN_ID=
143509
143551
  MULTI_LINE_CONTAINER:108, //多行组合输出
143510
143552
 
143511
143553
 
143512
- //预留数值类型 10
143554
+ //预留数值类型 20
143513
143555
  RESERVE_NUMBER1_ID:201, //ReserveNumber1:
143514
143556
  RESERVE_NUMBER2_ID:202,
143515
143557
  RESERVE_NUMBER3_ID:203,
@@ -143520,6 +143562,16 @@ var REPORT_COLUMN_ID=
143520
143562
  RESERVE_NUMBER8_ID:208,
143521
143563
  RESERVE_NUMBER9_ID:209,
143522
143564
  RESERVE_NUMBER10_ID:210,
143565
+ RESERVE_NUMBER11_ID:211,
143566
+ RESERVE_NUMBER12_ID:212,
143567
+ RESERVE_NUMBER13_ID:213,
143568
+ RESERVE_NUMBER14_ID:214,
143569
+ RESERVE_NUMBER15_ID:215,
143570
+ RESERVE_NUMBER16_ID:216,
143571
+ RESERVE_NUMBER17_ID:217,
143572
+ RESERVE_NUMBER18_ID:218,
143573
+ RESERVE_NUMBER19_ID:219,
143574
+ RESERVE_NUMBER20_ID:220,
143523
143575
 
143524
143576
 
143525
143577
  //预留字符串类型 10个 301-399
@@ -143632,6 +143684,16 @@ var MAP_COLUMN_FIELD=new Map([
143632
143684
  [REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
143633
143685
  [REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
143634
143686
  [REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
143687
+ [REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,"ReserveNumber11"],
143688
+ [REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,"ReserveNumber12"],
143689
+ [REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,"ReserveNumber13"],
143690
+ [REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,"ReserveNumber14"],
143691
+ [REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,"ReserveNumber15"],
143692
+ [REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,"ReserveNumber16"],
143693
+ [REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,"ReserveNumber17"],
143694
+ [REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,"ReserveNumber18"],
143695
+ [REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,"ReserveNumber19"],
143696
+ [REPORT_COLUMN_ID.RESERVE_NUMBER20_ID,"ReserveNumber20"],
143635
143697
 
143636
143698
  [REPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
143637
143699
  [REPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
@@ -143876,6 +143938,9 @@ function ChartReport()
143876
143938
 
143877
143939
  this.LastMouseStatus;
143878
143940
 
143941
+ //绘图过程中的缓存数据 绘制完清空的
143942
+ this.TempCache=null; //
143943
+
143879
143944
  this.ReloadResource=function(resource)
143880
143945
  {
143881
143946
  this.DevicePixelRatio=GetDevicePixelRatio()
@@ -144077,6 +144142,7 @@ function ChartReport()
144077
144142
  else if (this.IsReserveDateTime(item.Type))
144078
144143
  {
144079
144144
  if (item.DateTimeFormat) colItem.DateTimeFormat=item.DateTimeFormat; //日期格式化
144145
+ if (item.SubDateTimeFormat) colItem.SubDateTimeFormat=item.SubDateTimeFormat;
144080
144146
  }
144081
144147
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
144082
144148
  {
@@ -144287,6 +144353,16 @@ function ChartReport()
144287
144353
  { Type:REPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144288
144354
  { Type:REPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144289
144355
  { Type:REPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144356
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER11_ID, Title:"数值11", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144357
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER12_ID, Title:"数值12", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144358
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER13_ID, Title:"数值13", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144359
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER14_ID, Title:"数值14", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144360
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER15_ID, Title:"数值15", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144361
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER16_ID, Title:"数值16", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144362
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER17_ID, Title:"数值17", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144363
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER18_ID, Title:"数值18", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144364
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER19_ID, Title:"数值19", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144365
+ { Type:REPORT_COLUMN_ID.RESERVE_NUMBER20_ID, Title:"数值20", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
144290
144366
 
144291
144367
  { Type:REPORT_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
144292
144368
  { Type:REPORT_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
@@ -144354,6 +144430,11 @@ function ChartReport()
144354
144430
  this.Canvas.clip();
144355
144431
  }
144356
144432
 
144433
+ this.CreateTempCache=function()
144434
+ {
144435
+ this.TempCache={ MapReserveDateTime:new Map() }; //MapReserveDateTime:key=colindex, Value:{ PreDate }
144436
+ }
144437
+
144357
144438
  this.Draw=function(lastMouseStatus)
144358
144439
  {
144359
144440
  this.ShowSymbol=[];
@@ -144362,6 +144443,7 @@ function ChartReport()
144362
144443
  this.AryFullSelectedRow=[];
144363
144444
  this.DevicePixelRatio=GetDevicePixelRatio()
144364
144445
  this.LastMouseStatus=lastMouseStatus;
144446
+ this.CreateTempCache();
144365
144447
 
144366
144448
  if (this.GlobalOption) this.GlobalOption.FlashBGCount=0;
144367
144449
 
@@ -144400,6 +144482,7 @@ function ChartReport()
144400
144482
  this.LastMouseStatus=null;
144401
144483
  this.SizeChange=false;
144402
144484
  this.AryFullSelectedRow=[];
144485
+ this.TempCache=null;
144403
144486
  }
144404
144487
 
144405
144488
  this.DrawDragHeaderBG=function()
@@ -145814,7 +145897,11 @@ function ChartReport()
145814
145897
  [
145815
145898
  REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,
145816
145899
  REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,
145817
- REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID
145900
+ REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,
145901
+
145902
+ REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,
145903
+ REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,
145904
+ REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,REPORT_COLUMN_ID.RESERVE_NUMBER20_ID
145818
145905
  ];
145819
145906
 
145820
145907
  return ARARY_TYPE.includes(value);
@@ -146288,6 +146375,36 @@ function ChartReport()
146288
146375
  }
146289
146376
  }
146290
146377
 
146378
+ this.GetReserveDateTimePreItem=function(colIndex)
146379
+ {
146380
+ if (!this.CreateTempCache) return null;
146381
+ if (!this.TempCache.MapReserveDateTime) return null;
146382
+
146383
+ var mapData=this.TempCache.MapReserveDateTime;
146384
+ if (!mapData.has(colIndex)) return null;
146385
+
146386
+ return mapData.get(colIndex);
146387
+ }
146388
+
146389
+ this.SetReserveDateTimePreItem=function(colIndex,data)
146390
+ {
146391
+ if (!this.CreateTempCache) return false;
146392
+ if (!this.TempCache.MapReserveDateTime) return false;
146393
+
146394
+ var mapData=this.TempCache.MapReserveDateTime;
146395
+ if (mapData.has(colIndex))
146396
+ {
146397
+ var item=mapData.get(colIndex);
146398
+ item.PreItem.Date=data.Date;
146399
+ }
146400
+ else
146401
+ {
146402
+ mapData.set(colIndex, { PreItem:{ Date:data.Date } })
146403
+ }
146404
+
146405
+ return true;
146406
+ }
146407
+
146291
146408
  this.FormatReserveDateTime=function(column, data, drawInfo)
146292
146409
  {
146293
146410
  if (column.DefaultText) drawInfo.Text=column.DefaultText;
@@ -146298,7 +146415,24 @@ function ChartReport()
146298
146415
  var item=data[fieldName];
146299
146416
  if (!IFrameSplitOperator.IsObject(item)) return;
146300
146417
 
146301
- if (item.DateTime) drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,column.DateTimeFormat);
146418
+ var cacheItem=this.GetReserveDateTimePreItem(drawInfo.ColumnIndex);
146419
+ if (item.DateTime)
146420
+ {
146421
+ var date=item.DateTime.getFullYear()*10000+(item.DateTime.getMonth()+1)*100+item.DateTime.getDate();
146422
+ var format=column.DateTimeFormat;
146423
+ if (cacheItem && cacheItem.PreItem && date==cacheItem.PreItem.Date)
146424
+ {
146425
+ if (column.SubDateTimeFormat) format=column.SubDateTimeFormat
146426
+ }
146427
+ else
146428
+ {
146429
+
146430
+ this.SetReserveDateTimePreItem(drawInfo.ColumnIndex, {Date:date});
146431
+ }
146432
+
146433
+ drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime, format);
146434
+ }
146435
+
146302
146436
  if (item.TextColor) drawInfo.TextColor=item.TextColor;
146303
146437
  if (item.BGColor) drawInfo.BGColor=item.BGColor;
146304
146438
  }
@@ -152166,7 +152300,7 @@ function ScrollBarBGChart()
152166
152300
 
152167
152301
 
152168
152302
 
152169
- var HQCHART_VERSION="1.1.14977";
152303
+ var HQCHART_VERSION="1.1.14985";
152170
152304
 
152171
152305
  function PrintHQChartVersion()
152172
152306
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14977";
8
+ var HQCHART_VERSION="1.1.14985";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -57376,6 +57376,10 @@ HQData.Report_RequestStockData=function(data, callback)
57376
57376
 
57377
57377
  newItem[301]=HQData.GetRandomTestData(0,100)/100;
57378
57378
  newItem[302]=HQData.GetRandomTestData(0,100)/100;
57379
+
57380
+ var testDate=new Date();
57381
+ testDate.setHours(testDate.getHours() + i*2)
57382
+ newItem[401]={ DateTime:testDate } ;
57379
57383
 
57380
57384
 
57381
57385
  item.Data=newItem;
@@ -57531,6 +57535,9 @@ HQData.Report_RequestStockSortData=function(data, callback)
57531
57535
  extendData[7]=(Math.round(Math.random()*60))/100;
57532
57536
  extendData[8]=(Math.round(Math.random()*60))/100;
57533
57537
 
57538
+ var testDate=new Date();
57539
+ testDate.setHours(testDate.getHours() + i*2)
57540
+ newItem[401]={ DateTime:testDate } ;
57534
57541
 
57535
57542
  item.Data=newItem;
57536
57543
  }
@@ -58103,6 +58110,8 @@ HQData.Report_APIIndex=function(data, callback)
58103
58110
  HQData.APIIndex_MARK_AREA_V2(data, callback);
58104
58111
  else if (request.Data.indexname=="API_CHANNELV2")
58105
58112
  HQData.APIIndex_CHANNEL_V2(data, callback);
58113
+ else if (request.Data.indexname=="API_CHART_AREA_TEXT")
58114
+ HQData.API_CHART_AREA_TEXT(data, callback);
58106
58115
  }
58107
58116
 
58108
58117
 
@@ -59597,6 +59606,87 @@ HQData.APIIndex_MARK_AREA_V2=function(data, callback)
59597
59606
  }
59598
59607
 
59599
59608
 
59609
+ HQData.API_CHART_AREA_TEXT=function(data, callback)
59610
+ {
59611
+ data.PreventDefault=true;
59612
+ var hqchart=data.HQChart;
59613
+ var kData=hqchart.GetKData();
59614
+
59615
+ var markData=
59616
+ {
59617
+ name:'区域文字', type:1,
59618
+ Draw:
59619
+ {
59620
+ DrawType:'JS_CHART_AREA_TEXT',
59621
+ DrawData:
59622
+ {
59623
+ AryData:[], //[ { Start:{ }, End:{ }, AreaColor:, Text:"", BarColor:, TextColor:, ID: }]
59624
+ },
59625
+
59626
+ Config:{ },
59627
+ }
59628
+ };
59629
+
59630
+ var markItem=null;
59631
+ for(var i=0;i<kData.Data.length;++i)
59632
+ {
59633
+ var kItem=kData.Data[i];
59634
+ if (!markItem)
59635
+ {
59636
+ markItem=
59637
+ {
59638
+ Start:{ Date:kItem.Date, Time:kItem.Time },
59639
+ End:{ Date:kItem.Date, Time:kItem.Time },
59640
+ BGColor:"rgba(186,85,211,0.5)",
59641
+ TextColor:"rgb(255,215,0)",
59642
+ ID:i,
59643
+ Count:1,
59644
+ AryText:
59645
+ [
59646
+ {
59647
+ AryText:
59648
+ [
59649
+ { Text:`日期: ${kItem.Date} `, Color:"rgb(220,220,220)"},
59650
+ { Text:`ID: ${i} `, Color:"rgb(255,165,0)" }
59651
+ ],
59652
+ },
59653
+ {
59654
+ AryText:
59655
+ [
59656
+ { Text:`数据1: -- `, Color:"rgb(30,144,255)"},
59657
+ { Text:`数据2: -- `, Color:"rgb(255,0,255)" }
59658
+ ],
59659
+ }
59660
+ ]
59661
+ }
59662
+ }
59663
+ else
59664
+ {
59665
+ markItem.End.Date=kItem.Date;
59666
+ markItem.End.Time=kItem.Time;
59667
+ markItem.Count++;
59668
+
59669
+ if (markItem.Count>150)
59670
+ {
59671
+ markData.Draw.DrawData.AryData.push(markItem);
59672
+ markItem=null;
59673
+ }
59674
+ }
59675
+
59676
+ }
59677
+
59678
+ var apiData=
59679
+ {
59680
+ code:0,
59681
+ stock:{ name:hqchart.Name, symbol:hqchart.Symbol },
59682
+ outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[markData] }
59683
+ };
59684
+
59685
+ console.log('[HQData.API_CHART_AREA_TEXT] apiData ', apiData);
59686
+ callback(apiData);
59687
+ }
59688
+
59689
+
59600
59690
 
59601
59691
 
59602
59692
  /*暴露外部用的方法*/