hqchart 1.1.13644 → 1.1.13654

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.
@@ -3981,7 +3981,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
3981
3981
  //改参数div
3982
3982
  this.ModifyIndexDialog=new ModifyIndexDialog(divElement);
3983
3983
  this.ChangeIndexDialog=new ChangeIndexDialog(divElement);
3984
- this.MinuteDialog=new MinuteDialog(divElement);
3985
3984
 
3986
3985
  //额外的画布
3987
3986
  this.MapExtraCanvasElement=new Map(); //key=画布名字, value={ Element:, Canvas:}
@@ -4218,7 +4217,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4218
4217
  //创建改参数div
4219
4218
  chart.ModifyIndexDialog=this.ModifyIndexDialog;
4220
4219
  chart.ChangeIndexDialog=this.ChangeIndexDialog;
4221
- chart.MinuteDialog=this.MinuteDialog;
4222
4220
 
4223
4221
  var pixelRatio=GetDevicePixelRatio();
4224
4222
 
@@ -4265,7 +4263,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4265
4263
  if (option.KLine.MaxReqeustDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxReqeustDataCount; //兼容老版本
4266
4264
  if (option.KLine.MaxRequestDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;
4267
4265
  if (option.KLine.Info && option.KLine.Info.length>0) chart.SetKLineInfo(option.KLine.Info,false);
4268
- if (option.KLine.KLineDoubleClick==false) chart.MinuteDialog=this.MinuteDialog=null;
4269
4266
  if (IFrameSplitOperator.IsBool(item.IsShowTooltip)) chart.IsShowTooltip=item.IsShowTooltip;
4270
4267
  if (IFrameSplitOperator.IsBool(item.IsShowKLineDivTooltip)) chart.IsShowKLineDivTooltip=item.IsShowKLineDivTooltip;
4271
4268
  if (option.KLine.MaxRequestMinuteDayCount>0) chart.MaxRequestMinuteDayCount=option.KLine.MaxRequestMinuteDayCount;
@@ -4665,7 +4662,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4665
4662
  //创建改参数div
4666
4663
  chart.ModifyIndexDialog=this.ModifyIndexDialog;
4667
4664
  chart.ChangeIndexDialog=this.ChangeIndexDialog;
4668
- chart.MinuteDialog=this.MinuteDialog;
4669
4665
 
4670
4666
  //右键菜单
4671
4667
  if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
@@ -4677,7 +4673,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
4677
4673
  if (option.KLine.Period>=0) chart.Period=option.KLine.Period;
4678
4674
  if (option.KLine.MaxRequestDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;
4679
4675
  if (option.KLine.Info && option.KLine.Info.length>0) chart.SetKLineInfo(option.KLine.Info,false);
4680
- if (option.KLine.KLineDoubleClick==false) chart.MinuteDialog=this.MinuteDialog=null;
4681
4676
  if (option.KLine.PageSize>0) chart.PageSize=option.KLine.PageSize;
4682
4677
  if (option.KLine.IsShowTooltip==false) chart.IsShowTooltip=false;
4683
4678
  }
@@ -5273,6 +5268,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5273
5268
 
5274
5269
  }
5275
5270
 
5271
+ /*废弃
5272
+ //统一全部使用 MinuteChartContainer
5276
5273
  //历史分钟走势图
5277
5274
  this.CreateHistoryMinuteChartContainer=function(option)
5278
5275
  {
@@ -5334,6 +5331,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5334
5331
 
5335
5332
  return chart;
5336
5333
  }
5334
+ */
5337
5335
 
5338
5336
  this.CreateKLineTrainChartContainer=function(option)
5339
5337
  {
@@ -5610,9 +5608,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5610
5608
  case "迷你分钟走势图":
5611
5609
  chart=this.CreateMinMinuteChartContainer(option);
5612
5610
  break;
5613
- case "历史分钟走势图":
5614
- chart=this.CreateHistoryMinuteChartContainer(option);
5615
- break;
5616
5611
  case 'K线训练':
5617
5612
  case 'K线训练横屏':
5618
5613
  case "简单K线训练":
@@ -6706,6 +6701,7 @@ var JSCHART_MENU_ID=
6706
6701
  CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID:38,
6707
6702
 
6708
6703
  CMD_SHOW_CORSS_LINE_ID:39, //显示十字光标线
6704
+ CMD_ENABLE_POP_MINUTE_CHART_ID:40, //双击弹分时图
6709
6705
 
6710
6706
 
6711
6707
  CMD_REPORT_CHANGE_BLOCK_ID:60, //报价列表 切换板块ID
@@ -11838,6 +11834,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
11838
11834
 
11839
11835
  if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} ); //是否立即更新并重绘
11840
11836
  else if (option.Draw==true) this.Draw(); //是否立即重绘
11837
+
11838
+ if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
11841
11839
  }
11842
11840
 
11843
11841
  this.ReloadBorder=function(option) //根据页面缩放调整对应边框的尺长
@@ -13516,6 +13514,21 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
13516
13514
  if (this.ChartCorssCursor) this.ChartCorssCursor.IsShowCorss=srcParam;
13517
13515
  }
13518
13516
  break;
13517
+
13518
+ case JSCHART_MENU_ID.CMD_ENABLE_POP_MINUTE_CHART_ID://双击弹分时图
13519
+ if (IFrameSplitOperator.IsBool(srcParam))
13520
+ {
13521
+ if (srcParam)
13522
+ {
13523
+ this.DestroyPopMinuteChart();
13524
+ this.InitalPopMinuteChart( {KLine:{KLineDoubleClick:true}} );
13525
+ }
13526
+ else
13527
+ {
13528
+ this.DestroyPopMinuteChart();
13529
+ }
13530
+ }
13531
+ break;
13519
13532
  }
13520
13533
  }
13521
13534
 
@@ -70919,6 +70932,12 @@ function JSChartResource()
70919
70932
  this.TooltipBGColor="rgb(255, 255, 255)"; //背景色
70920
70933
  this.TooltipAlpha=0.92; //透明度
70921
70934
 
70935
+ this.PopMinuteChart=
70936
+ {
70937
+ BGColor:"rgba(250,250,250,0.95)",
70938
+ BorderColor:"rgb(0,0,0)",
70939
+ }
70940
+
70922
70941
  this.SelectRectBGColor="rgba(1,130,212,0.06)"; //背景色
70923
70942
  // this.SelectRectAlpha=0.06; //透明度
70924
70943
 
@@ -72302,6 +72321,13 @@ function JSChartResource()
72302
72321
  }
72303
72322
  }
72304
72323
 
72324
+ if (style.PopMinuteChart)
72325
+ {
72326
+ var item=style.PopMinuteChart;
72327
+ if (item.BGColor) this.PopMinuteChart.BGColor=item.BGColor;
72328
+ if (item.BorderColor) this.PopMinuteChart.BorderColor=item.BorderColor;
72329
+ }
72330
+
72305
72331
  if (style.DefaultTextColor) this.DefaultTextColor = style.DefaultTextColor;
72306
72332
  if (style.DefaultTextFont) this.DefaultTextFont = style.DefaultTextFont;
72307
72333
  if (style.TitleFont) this.TitleFont = style.TitleFont;
@@ -74260,7 +74286,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
74260
74286
  this.StockHistoryDayApiUrl= g_JSChartResource.Domain+'/API/StockHistoryDay'; //股票历史数据
74261
74287
  this.TickApiUrl=g_JSChartResource.Domain+'/API/StockDetail'; //当天分笔数据
74262
74288
 
74263
- this.MinuteDialog; //双击历史K线 弹出分钟走势图
74289
+ this.PopMinuteChart=null; //双击历史K线 弹出分钟走势图
74264
74290
 
74265
74291
  this.BeforeBindMainData=null; //function(funcName) 在BindMainData() 调用前回调用
74266
74292
  this.AfterBindMainData=null; //function(funcName) 在BindMainData() 调用前后调用
@@ -75192,10 +75218,50 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
75192
75218
 
75193
75219
  if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
75194
75220
  if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
75221
+
75222
+ this.InitalPopMinuteChart(option);
75195
75223
  }
75196
75224
 
75197
-
75225
+ this.InitalPopMinuteChart=function(option)
75226
+ {
75227
+ if (!option || !option.KLine) return false;
75228
+ var item=option.KLine;
75229
+ if (item.KLineDoubleClick===true)
75230
+ {
75231
+ this.PopMinuteChart=new JSPopMinuteChart();
75232
+ this.PopMinuteChart.Inital(this);
75233
+ return true;
75234
+ }
75235
+
75236
+ return false;
75237
+ }
75238
+
75239
+ this.DestroyPopMinuteChart=function()
75240
+ {
75241
+ if (!this.PopMinuteChart) return;
75242
+
75243
+ this.PopMinuteChart.Destroy();
75244
+ this.PopMinuteChart=null;
75245
+ }
75246
+
75247
+ this.ShowMinuteChartDialog=function(data, x,y)
75248
+ {
75249
+ if (!this.PopMinuteChart) return;
75250
+ if (!data.Tooltip || !data.Chart) return;
75251
+
75252
+ var rtClient=this.UIElement.getBoundingClientRect();
75253
+ var rtScroll=GetScrollPosition();
75198
75254
 
75255
+ x+=(rtClient.left+rtScroll.Left);
75256
+ y+=(rtClient.top+rtScroll.Top);
75257
+
75258
+ var date=data.Tooltip.Data.Date;
75259
+ var symbol=data.Chart.Symbol;
75260
+
75261
+ this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x,y);
75262
+ }
75263
+
75264
+
75199
75265
  this.OnCustomKeyDown=function(keyID, e) //自定义键盘事件
75200
75266
  {
75201
75267
  if (keyID==37 && e.ctrlKey) //Ctrl+Left
@@ -79823,6 +79889,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
79823
79889
  var bShowCorss=false; //十字光标十字线
79824
79890
  if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
79825
79891
 
79892
+ var bPopMinuteChart=false;
79893
+ if (this.PopMinuteChart) bPopMinuteChart=true;
79894
+
79826
79895
  var aryMenu=
79827
79896
  [
79828
79897
  {
@@ -79984,6 +80053,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
79984
80053
 
79985
80054
  { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
79986
80055
 
80056
+ { Name:"双击弹分时图", Data:{ ID:JSCHART_MENU_ID.CMD_ENABLE_POP_MINUTE_CHART_ID, Args:[!bPopMinuteChart]}, Checked:bPopMinuteChart},
80057
+
79987
80058
  { Name:JSPopMenu.SEPARATOR_LINE_NAME },
79988
80059
  {
79989
80060
  Name:"鼠标形状",
@@ -80538,16 +80609,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
80538
80609
  }
80539
80610
  }
80540
80611
  }
80541
-
80542
- var event=null;
80543
- if (this.mapEvent.has(JSCHART_EVENT_ID.DBCLICK_KLINE)) event=this.mapEvent.get(JSCHART_EVENT_ID.DBCLICK_KLINE);
80544
-
80545
- if (!this.MinuteDialog && !event) return;
80546
80612
 
80547
80613
  var tooltip=new TooltipData();
80548
80614
  if (!this.PtInChartPaintTooltip(x,y,tooltip)) return;
80549
80615
  if (!tooltip.Data) return;
80550
80616
 
80617
+ var event=null;
80618
+ if (this.mapEvent.has(JSCHART_EVENT_ID.DBCLICK_KLINE)) event=this.mapEvent.get(JSCHART_EVENT_ID.DBCLICK_KLINE);
80551
80619
  if (event)
80552
80620
  {
80553
80621
  if (this.ClickChartTimer!=null) //清空单击定时器
@@ -80556,15 +80624,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
80556
80624
  this.ClickChartTimer=null;
80557
80625
  }
80558
80626
 
80559
- var data={ Tooltip:tooltip, Stock:{Symbol:this.Symbol, Name:this.Name }, X:e.clientX, Y:e.clientY };
80627
+ var data={ Tooltip:tooltip, Stock:{Symbol:this.Symbol, Name:this.Name }, X:e.clientX, Y:e.clientY, PreventDefault:false };
80560
80628
  event.Callback(event,data,this);
80629
+ if (data.PreventDefault) return;
80561
80630
  }
80562
80631
 
80563
- if (this.MinuteDialog)
80564
- {
80565
- e.data={Chart:this,Tooltip:tooltip};
80566
- this.MinuteDialog.DoModal(e);
80567
- }
80632
+ //内置弹分时图
80633
+ if (!this.PopMinuteChart) return;
80634
+
80635
+ this.ShowMinuteChartDialog({ Chart:this,Tooltip:tooltip, e:e }, x,y);
80568
80636
  }
80569
80637
 
80570
80638
  this.CancelAutoUpdate=function() //关闭停止更新
@@ -83561,6 +83629,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
83561
83629
  [
83562
83630
  { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
83563
83631
  { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
83632
+ { Name:JSPopMenu.SEPARATOR_LINE_NAME },
83633
+
83634
+ {
83635
+ Name:"语言设置",
83636
+ SubMenu:
83637
+ [
83638
+ { Name:"中文", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["CN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID },
83639
+ { Name:"英语", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["EN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID },
83640
+ { Name:"繁体", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["TC"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID },
83641
+ ]
83642
+ },
83564
83643
 
83565
83644
  {
83566
83645
  Name:"区间选择样式",
@@ -87955,6 +88034,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
87955
88034
  /*
87956
88035
  历史分钟走势图
87957
88036
  */
88037
+ /* 废弃 统一使用 MinuteChartContainer
87958
88038
  function HistoryMinuteChartContainer(uielement)
87959
88039
  {
87960
88040
  this.newMethod=MinuteChartContainer; //派生
@@ -87999,17 +88079,6 @@ function HistoryMinuteChartContainer(uielement)
87999
88079
  this.TitlePaint[0].Frame=this.Frame.SubFrame[0].Frame;
88000
88080
  this.TitlePaint[0].Canvas=this.Canvas;
88001
88081
  this.TitlePaint[0].IsShowDate=true;
88002
-
88003
- /*
88004
- //主图叠加画法
88005
- var paint=new ChartOverlayKLine();
88006
- paint.Canvas=this.Canvas;
88007
- paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
88008
- paint.ChartFrame=this.Frame.SubFrame[0].Frame;
88009
- paint.Name="Overlay-KLine";
88010
- this.OverlayChartPaint[0]=paint;
88011
- */
88012
-
88013
88082
  }
88014
88083
 
88015
88084
  //设置交易日期
@@ -88155,6 +88224,7 @@ HistoryMinuteChartContainer.JsonDataToMinuteData=function(data)
88155
88224
 
88156
88225
  return aryMinuteData;
88157
88226
  }
88227
+ */
88158
88228
 
88159
88229
  /////////////////////////////////////////////////////////////////////////////
88160
88230
  // 自定义指数
@@ -92736,142 +92806,6 @@ function KLineInfoTooltip(divElement)
92736
92806
  }
92737
92807
  }
92738
92808
 
92739
- //历史K线上双击 弹出分钟走势图框
92740
- function MinuteDialog(divElement)
92741
- {
92742
- this.newMethod=IDivDialog; //派生
92743
- this.newMethod(divElement);
92744
- delete this.newMethod;
92745
-
92746
-
92747
- this.JSChart=null;
92748
- this.Height=500;
92749
- this.Width=600;
92750
- this.Symbol;
92751
- this.TradeDate;
92752
- this.HistoryData;
92753
-
92754
- //显示窗口
92755
- this.Show=function(left,top,width,height)
92756
- {
92757
- var div=document.getElementById(this.ID);
92758
- if (!div) return false;
92759
-
92760
- var findDiv=div.getElementsByClassName("minute-hqchart");
92761
- if (!findDiv || findDiv.length!=1) return false;
92762
- var klineDiv=findDiv[0];
92763
-
92764
- if (IFrameSplitOperator.IsNumber(width)) div.style.width=width+"px";
92765
- if (IFrameSplitOperator.IsNumber(height)) div.style.height=height+"px";
92766
- if (IFrameSplitOperator.IsNumber(left)) div.style.left=left+"px";
92767
- if (IFrameSplitOperator.IsNumber(top)) div.style.top=top+"px";
92768
-
92769
- div.style.display='block';
92770
-
92771
- var klineWdith=klineDiv.offsetWidth;
92772
- var klineTop=klineDiv.offsetTop;
92773
- klineDiv.style.width=klineWdith+"px";
92774
- klineDiv.style.height=(height-klineTop-5)+"px";
92775
- }
92776
-
92777
- this.Create=function()
92778
- {
92779
- this.ID=Guid();
92780
- var div=document.createElement('div');
92781
- div.className='jchart-kline-minute-box';
92782
- div.id=this.ID;
92783
- var hqchartID=Guid();
92784
- div.innerHTML=`<div><div class='minute-dialog-title'><span></span><strong class='close-munite icon iconfont icon-close'></strong></div><div class='minute-hqchart' id='${hqchartID}' ></div></div>`;
92785
- div.style.width=this.Height+'px';
92786
- div.style.height=this.Width+'px';
92787
-
92788
- this.DivElement.appendChild(div);
92789
- this.JSChart=JSChart.Init(document.getElementById(hqchartID));
92790
-
92791
- var option=
92792
- {
92793
- Type:'历史分钟走势图',
92794
- Symbol:this.Symbol, //股票代码
92795
- IsAutoUpdate:false, //是自动更新数据
92796
-
92797
- IsShowRightMenu:false, //右键菜单
92798
- HistoryMinute: { TradeDate:this.TradeDate, IsShowName:false, IsShowDate:false } //显示的交易日期
92799
- };
92800
-
92801
- this.JSChart.SetOption(option);
92802
- }
92803
-
92804
- this.BindClose=function(chart)
92805
- {
92806
- //关闭按钮
92807
- $("#"+this.ID+" .close-munite").click(
92808
- {
92809
- Chart:chart
92810
- },
92811
- function(event)
92812
- {
92813
- var chart=event.data.Chart;
92814
- chart.MinuteDialog.Hide();
92815
- }
92816
- );
92817
- }
92818
-
92819
- this.DoModal=function(event)
92820
- {
92821
- this.UpColor=g_JSChartResource.UpTextColor;
92822
- this.DownColor=g_JSChartResource.DownTextColor;
92823
- this.UnchagneColor=g_JSChartResource.UnchagneTextColor;
92824
-
92825
- var chart=event.data.Chart;
92826
- var tooltip=event.data.Tooltip;
92827
- var dialog=chart.MinuteDialog;
92828
-
92829
- dialog.Symbol=chart.Symbol;
92830
- dialog.TradeDate=tooltip.Data.Date;
92831
-
92832
- if(!dialog) return;
92833
- if (dialog.ID==null)
92834
- {
92835
- dialog.Create(); //第1次 需要创建div
92836
- }
92837
- else
92838
- {
92839
- dialog.JSChart.JSChartContainer.TradeDate=dialog.TradeDate;
92840
- dialog.JSChart.ChangeSymbol(this.Symbol);
92841
- }
92842
-
92843
- var left=event.clientX;
92844
- var top=event.clientY+10;
92845
-
92846
- var pixelTatio=GetDevicePixelRatio();
92847
- dialog.Show(500/pixelTatio,100/pixelTatio,600,500);
92848
- dialog.JSChart.OnSize();
92849
-
92850
- this.BindClose(chart);
92851
-
92852
- this.GetColor=function(price,yclse)
92853
- {
92854
- if(price>yclse) return this.UpColor;
92855
- else if (price<yclse) return this.DownColor;
92856
- else return this.UnchagneColor;
92857
- }
92858
-
92859
- var strName = event.data.Chart.Name;
92860
- var strData=event.data.Tooltip.Data;
92861
- var date=new Date(parseInt(strData.Date/10000),(strData.Date/100%100-1),strData.Date%100);
92862
- var strDate = strData.Date.toString();
92863
- var strNewDate=strDate.substring(0,4)+"-"+strDate.substring(4,6)+"-"+strDate.substring(6,8); //转换时间格式
92864
- var str = "<span>"+strName+"</span>"+"<span>"+strNewDate+"</span>&nbsp;"+
92865
- "<span style='color:"+this.GetColor(strData.Open,strData.YClose)+";'>开:"+strData.Open.toFixed(2)+"</span>"+
92866
- "<span style='color:"+this.GetColor(strData.High,strData.YClose)+";'>高:"+strData.High.toFixed(2)+"</span>"+
92867
- "<span style='color:"+this.GetColor(strData.Low,strData.YClose)+";'>低:"+strData.Low.toFixed(2)+"</span>"+
92868
- "<span style='color:"+this.GetColor(strData.Close,strData.YClose)+";'>收:"+strData.Close.toFixed(2)+"</span>"+
92869
- "<span style='color:"+this.VolColor+";'>量:"+IFrameSplitOperator.FormatValueString(strData.Vol,2)+"</span>"+
92870
- "<span style='color:"+this.AmountColor+";'>额:"+IFrameSplitOperator.FormatValueString(strData.Amount,2)+"</span>";
92871
- $(".minute-dialog-title span").html(str);
92872
- }
92873
- }
92874
-
92875
92809
  function MinuteSelectRectDialog(divElement)
92876
92810
  {
92877
92811
  this.newMethod=IDivDialog; //派生
@@ -124093,6 +124027,12 @@ function GetBlackStyle()
124093
124027
  Night: { Color:"rgb(153,153,153)", BGColor:"rgb(51,51,51)", BorderColor:"rgb(51,51,51)", Margin:{ Left:5, Top:2, Bottom:2, Right:5 } },
124094
124028
  }
124095
124029
  },
124030
+
124031
+ PopMinuteChart:
124032
+ {
124033
+ BGColor:"rgba(0,0,0,0.95)",
124034
+ BorderColor:"rgb(230,230,230)",
124035
+ },
124096
124036
 
124097
124037
 
124098
124038
  DefaultTextColor: "rgb(101,104,112)",
@@ -137459,7 +137399,7 @@ function ScrollBarBGChart()
137459
137399
 
137460
137400
 
137461
137401
 
137462
- var HQCHART_VERSION="1.1.13643";
137402
+ var HQCHART_VERSION="1.1.13653";
137463
137403
 
137464
137404
  function PrintHQChartVersion()
137465
137405
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.13643";
8
+ var HQCHART_VERSION="1.1.13653";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -48701,6 +48701,11 @@ HQData.NetworkFilter=function(data, callback)
48701
48701
  HQData.RequestMinuteDaysData(data, callback);
48702
48702
  break;
48703
48703
 
48704
+ case "MinuteChartContainer::RequestPopMinuteData": //弹出分时图数据
48705
+ //HQChart使用教程29-走势图如何对接第3方数据2-最新分时数据 格式跟这个一样
48706
+ HQData.RequestPopMinuteData(data, callback);
48707
+ break;
48708
+
48704
48709
  //HQChart使用教程30-K线图如何对接第3方数据1
48705
48710
  case 'KLineChartContainer::RequestHistoryData': //日线全量数据下载
48706
48711
  //HQChart使用教程30-K线图如何对接第3方数据2-日K数据
@@ -48840,6 +48845,58 @@ HQData.RequestMinuteData=function(data, callback)
48840
48845
  }, 50);
48841
48846
  }
48842
48847
 
48848
+ HQData.RequestPopMinuteData=function(data, callback)
48849
+ {
48850
+ data.PreventDefault=true;
48851
+ var symbol=data.Request.Data.symbol[0]; //请求的股票代码
48852
+ var date=data.Request.Data.date;
48853
+ var callcation=data.Request.Data.callcation; //集合竞价
48854
+ console.log(`[HQData::RequestPopMinuteData] Symbol=${symbol} Date=${date}`);
48855
+
48856
+ setTimeout(()=>{
48857
+ var srcStock=MINUTE_1DAY_DATA.stock[0];
48858
+ var stockItem={ date:date, minute:[], yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.symbol, IsHistoryMinute:true };
48859
+ if (callcation.Before)
48860
+ {
48861
+ var before=
48862
+ [
48863
+ //[交易时间, 价格,成交量, 成交金额, 日期(可选,YYYYMMDD)],
48864
+ [915, srcStock.yclose,0,0],
48865
+ [916, srcStock.yclose+0.01,0,0],
48866
+ [917, srcStock.yclose+0.03,0,0],
48867
+ [918, srcStock.yclose+0.02,0,0],
48868
+ [919, srcStock.yclose+0.02,0,0],
48869
+ [920, srcStock.yclose+0.01,0,0],
48870
+ [921, srcStock.yclose,0,0],
48871
+ [922, srcStock.yclose-0.02,0,0],
48872
+ [923, srcStock.yclose-0.03,0,0],
48873
+ [924, srcStock.yclose,0,0],
48874
+ [925, srcStock.yclose,0,0],
48875
+ ];
48876
+
48877
+ var beforeinfo={ totalcount:11, ver:1.0 };
48878
+
48879
+ stockItem.before=before;
48880
+ stockItem.beforeinfo=beforeinfo;
48881
+ }
48882
+
48883
+ for(var i=0;i<srcStock.minute.length;++i)
48884
+ {
48885
+ var item=srcStock.minute[i];
48886
+ var newItem=CloneData(item);
48887
+ newItem.date=date;
48888
+
48889
+ stockItem.minute.push(newItem);
48890
+ }
48891
+
48892
+ var hqchartData={code:0, stock:[stockItem] };
48893
+
48894
+
48895
+ callback(hqchartData);
48896
+ }, 50);
48897
+ }
48898
+
48899
+
48843
48900
  HQData.RequestMinuteDaysData=function(data, callback)
48844
48901
  {
48845
48902
  data.PreventDefault=true;