hqchart 1.1.13921 → 1.1.13933

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.
Files changed (24) hide show
  1. package/lib/umychart.NetworkFilterTest.vue.js +2 -2
  2. package/lib/umychart.vue.js +53 -37
  3. package/package.json +1 -1
  4. package/src/jscommon/umychart.DialogTooltip.js +166 -66
  5. package/src/jscommon/umychart.NetworkFilterTest.js +17 -0
  6. package/src/jscommon/umychart.js +144 -5
  7. package/src/jscommon/umychart.report.js +102 -1
  8. package/src/jscommon/umychart.resource/css/tools.css +11 -1
  9. package/src/jscommon/umychart.style.js +6 -0
  10. package/src/jscommon/umychart.testdata/DayKLine/IFL8.cfe.day.kline.js +8 -0
  11. package/src/jscommon/umychart.testdata/DayKLine/IFL8.cfe.day.kline.json +1 -0
  12. package/src/jscommon/umychart.testdata/DayKLine/IML8.cfe.day.kline.js +7 -0
  13. package/src/jscommon/umychart.testdata/DayKLine/IML8.cfe.day.kline.json +1 -0
  14. package/src/jscommon/umychart.testdata/M1KLine/ICL8.cfe.minute.kline.js +7 -0
  15. package/src/jscommon/umychart.testdata/M1KLine/ICL8.cfe.minute.kline.json +1 -0
  16. package/src/jscommon/umychart.testdata/M1KLine/IFL8.cfe.minute.kline.js +7 -0
  17. package/src/jscommon/umychart.testdata/M1KLine/IFL8.cfe.minute.kline.json +1 -0
  18. package/src/jscommon/umychart.testdata/M1KLine/IML8.cfe.minute.kline.js +7 -0
  19. package/src/jscommon/umychart.testdata/M1KLine/IML8.cfe.minute.kline.json +1 -0
  20. package/src/jscommon/umychart.testdata.js +17 -0
  21. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +253 -7
  22. package/src/jscommon/umychart.version.js +1 -1
  23. package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +17 -0
  24. package/src/jscommon/umychart.vue/umychart.vue.js +413 -67
@@ -1332,6 +1332,8 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
1332
1332
  }
1333
1333
 
1334
1334
  arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.cfe", Type:0 } } );
1335
+ arySymbol.push( { Symbol:"IML8.cfe", Name:"中千主连", ShortSymbol:"IML8", Spell:"IML8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IML8.cfe", Type:0 } } );
1336
+ arySymbol.push( { Symbol:"IFL8.cfe", Name:"沪深主连", ShortSymbol:"IFL8", Spell:"IFL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IFL8.cfe", Type:0 } } );
1335
1337
 
1336
1338
  arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
1337
1339
  arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
@@ -1390,6 +1392,15 @@ HQData.GetM1KLineDataBySymbol=function(symbol)
1390
1392
  case "399006.sz":
1391
1393
  data=SZ_399006_M1_KLINE;
1392
1394
  break;
1395
+ case "ICL8.cfe":
1396
+ data=CFE_ICL8_M1_KLINE;
1397
+ break;
1398
+ case "IML8.cfe":
1399
+ data=CFE_IML8_M1_KLINE;
1400
+ break;
1401
+ case "IFL8.cfe":
1402
+ data=CFE_IFL8_M1_KLINE;
1403
+ break;
1393
1404
  default:
1394
1405
  data=SZ_000001_M1_KLINE;
1395
1406
  break;
@@ -1433,6 +1444,12 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
1433
1444
  case "ICL8.cfe":
1434
1445
  data=CFE_ICL8_DAY_KLINE;
1435
1446
  break;
1447
+ case "IML8.cfe":
1448
+ data=CFE_IML8_DAY_KLINE;
1449
+ break;
1450
+ case "IFL8.cfe":
1451
+ data=CFE_IFL8_DAY_KLINE;
1452
+ break;
1436
1453
  default:
1437
1454
  data=SZ_000001_DAY_KLINE;
1438
1455
  break;
@@ -5646,7 +5646,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5646
5646
  if (option.EnableModifyDrawDialogV2===true) chart.InitalModifyDrawDialog();
5647
5647
 
5648
5648
  //K线tooltip
5649
- if (option.EnableTooltipDialog===true) chart.InitalTooltipDialog();
5649
+ if (option.TooltipDialog && option.TooltipDialog.Enable)
5650
+ chart.InitalTooltipDialog(option.TooltipDialog);
5650
5651
 
5651
5652
  //注册事件
5652
5653
  if (option.EventCallback)
@@ -6552,6 +6553,8 @@ var JSCHART_EVENT_ID=
6552
6553
  ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156, //日盘夜盘的分界线
6553
6554
  ON_CUSTOM_MINUTE_BG:157, //自定义分时图背景颜色
6554
6555
  ON_CLICK_HORIZONTAL_LABEL:158, //点击Y轴刻度标签
6556
+
6557
+ ON_FORMAT_DIALOG_TOOLTIP_TEXT:159, //格式化Tooltip对话框显示文字
6555
6558
  }
6556
6559
 
6557
6560
  var JSCHART_OPERATOR_ID=
@@ -6726,6 +6729,8 @@ var JSCHART_MENU_ID=
6726
6729
  CMD_REPORT_COLUMN_DEL_ID:62, //报价列表 删除列
6727
6730
  CMD_REPORT_COLUMN_MOVE_ID:63, //报价列表 列移动
6728
6731
  CMD_REPORT_COLUMN_FILTER_ID:64, //报价列表 筛选
6732
+
6733
+ CMD_DIALOG_TOOLTIP_ATTRIBUTE:65, //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
6729
6734
  }
6730
6735
 
6731
6736
 
@@ -6974,12 +6979,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
6974
6979
  this.DialogDrawTool.Create();
6975
6980
  }
6976
6981
 
6977
- this.InitalTooltipDialog=function()
6982
+ this.InitalTooltipDialog=function(option)
6978
6983
  {
6979
6984
  if (this.DialogTooltip) return;
6980
6985
 
6981
6986
  this.DialogTooltip=new JSDialogTooltip();
6982
- this.DialogTooltip.Inital(this);
6987
+ this.DialogTooltip.Inital(this, option);
6983
6988
  this.DialogTooltip.Create();
6984
6989
  }
6985
6990
 
@@ -7053,6 +7058,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7053
7058
  this.DialogTooltip.Close();
7054
7059
  }
7055
7060
 
7061
+ this.DestroyTooltipDialog=function()
7062
+ {
7063
+ if (!this.DialogTooltip) return;
7064
+
7065
+ this.DialogTooltip.Destroy();
7066
+ this.DialogTooltip=null;
7067
+ }
7068
+
7056
7069
 
7057
7070
 
7058
7071
  //obj={ Element:, Canvas: }
@@ -7104,6 +7117,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7104
7117
  {
7105
7118
  this.IsDestroy=true;
7106
7119
  this.StopAutoUpdate();
7120
+ this.DestroyTooltipDialog();
7107
7121
  }
7108
7122
 
7109
7123
  this.ChartDestory=this.ChartDestroy; //老版本写错了,需要兼容下
@@ -13680,6 +13694,20 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
13680
13694
  klineChart.InfoPosition=param;
13681
13695
  this.Draw();
13682
13696
  break;
13697
+ case JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE:
13698
+ if (!aryArgs[0]) return false;
13699
+ var option=aryArgs[0];
13700
+ if (!IFrameSplitOperator.IsBool(option.Enable)) return false;
13701
+ if (option.Enable===false)
13702
+ {
13703
+ this.DestroyTooltipDialog();
13704
+ }
13705
+ else
13706
+ {
13707
+ this.DestroyTooltipDialog();
13708
+ this.InitalTooltipDialog(option);
13709
+ }
13710
+ break;
13683
13711
  }
13684
13712
  }
13685
13713
 
@@ -13982,6 +14010,71 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
13982
14010
  }
13983
14011
  }
13984
14012
  }
14013
+
14014
+ this.UpdateWindowIndexV2=function(aryIndex)
14015
+ {
14016
+ if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
14017
+
14018
+ var aryID=[];
14019
+ for(var i=0;i<this.WindowIndex.length;++i)
14020
+ {
14021
+ var item=this.WindowIndex[i];
14022
+ if (!item) continue;
14023
+ if (!item.ID) continue;
14024
+
14025
+ if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
14026
+ {
14027
+ aryID.push(i);
14028
+ }
14029
+ }
14030
+
14031
+ if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
14032
+
14033
+ if (this.IsKLineContainer()) //K线
14034
+ {
14035
+ var bindData=new ChartData();
14036
+ bindData.Data=this.SourceData.Data;
14037
+ bindData.Period=this.Period;
14038
+ bindData.Right=this.Right;
14039
+
14040
+ if (this.IsApiPeriod)
14041
+ {
14042
+
14043
+ }
14044
+ else
14045
+ {
14046
+ if (bindData.Right>0) //复权
14047
+ {
14048
+ var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
14049
+ bindData.Data=rightData;
14050
+ }
14051
+
14052
+ if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false)) //周期数据
14053
+ {
14054
+ var periodData=bindData.GetPeriodData(bindData.Period);
14055
+ bindData.Data=periodData;
14056
+ }
14057
+ }
14058
+ }
14059
+ else if (this.IsMinuteContainer()) //分时图
14060
+ {
14061
+ var bindData=this.SourceData;
14062
+ }
14063
+ else
14064
+ {
14065
+ return;
14066
+ }
14067
+
14068
+
14069
+ for(var i=0;i<aryID.length;++i)
14070
+ {
14071
+ this.BindIndexData(aryID[i],bindData)
14072
+ }
14073
+
14074
+ this.UpdataDataoffset(); //更新数据偏移
14075
+ this.UpdateFrameMaxMin(); //调整坐标最大 最小值
14076
+ this.Draw();
14077
+ }
13985
14078
  }
13986
14079
 
13987
14080
  function GetDevicePixelRatio()
@@ -73366,7 +73459,8 @@ function JSChartResource()
73366
73459
  Font:{ Size:15, Name:"微软雅黑"},
73367
73460
  BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
73368
73461
  NameFont:{ Size:14, Name:"微软雅黑" },
73369
- SymbolFont:{ Size:12, Name:"微软雅黑" }
73462
+ SymbolFont:{ Size:12, Name:"微软雅黑" },
73463
+
73370
73464
  },
73371
73465
 
73372
73466
  //固定行
@@ -73381,6 +73475,13 @@ function JSChartResource()
73381
73475
  Mergin:{ Top:1, Bottom:1,Left:0, Right:0 },
73382
73476
  },
73383
73477
 
73478
+
73479
+ NameSymbolV2:
73480
+ {
73481
+ Name:{ Size:14, Name:"微软雅黑", Color: "rgb(60,60,60)"},
73482
+ Symbol:{ Size:10, Name:"微软雅黑", Color: "rgb(105 105 105)"},
73483
+ },
73484
+
73384
73485
  //涨停 跌停背景色
73385
73486
  LimitColor:
73386
73487
  {
@@ -74537,6 +74638,26 @@ function JSChartResource()
74537
74638
  }
74538
74639
  }
74539
74640
 
74641
+ if (item.NameSymbolV2)
74642
+ {
74643
+ var nameSymbol=item.NameSymbolV2;
74644
+ if (nameSymbol.Name)
74645
+ {
74646
+ var subItem=nameSymbol.Name;
74647
+ if (IFrameSplitOperator.IsNumber(subItem.Size)) this.Report.NameSymbolV2.Name.Size=subItem.Size;
74648
+ if (subItem.Name) this.Report.NameSymbolV2.Name.Name=subItem.Name;
74649
+ if (subItem.Color) this.Report.NameSymbolV2.Name.Color=subItem.Color;
74650
+ }
74651
+
74652
+ if (nameSymbol.Symbol)
74653
+ {
74654
+ var subItem=nameSymbol.Symbol;
74655
+ if (IFrameSplitOperator.IsNumber(subItem.Size)) this.Report.NameSymbolV2.Symbol.Size=subItem.Size;
74656
+ if (subItem.Name) this.Report.NameSymbolV2.Symbol.Name=subItem.Name;
74657
+ if (subItem.Color) this.Report.NameSymbolV2.Symbol.Color=subItem.Color;
74658
+ }
74659
+ }
74660
+
74540
74661
  if (item.Tab)
74541
74662
  {
74542
74663
  var tab=item.Tab;
@@ -74894,7 +75015,7 @@ function JSChartLocalization()
74894
75015
  ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
74895
75016
  ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
74896
75017
  ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
74897
- ['DialogTooltip-YClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
75018
+ ['DialogTooltip-FClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
74898
75019
  ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
74899
75020
  ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
74900
75021
  ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
@@ -81560,6 +81681,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
81560
81681
  { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[1]}, Checked:1==this.ChartDragSelectRect.ShowMode },
81561
81682
  { Name:"样式3", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[2]}, Checked:2==this.ChartDragSelectRect.ShowMode },
81562
81683
  ]
81684
+ },
81685
+ {
81686
+ Name:"K线浮动框",
81687
+ SubMenu:
81688
+ [
81689
+ { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:false}]}, Checked:!this.DialogTooltip },
81690
+ { Name:"样式1", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:0}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===0) },
81691
+ { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:1}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===1) },
81692
+ ]
81563
81693
  }
81564
81694
  ]
81565
81695
  }
@@ -85232,6 +85362,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
85232
85362
  ]
85233
85363
  },
85234
85364
 
85365
+ {
85366
+ Name:"K线浮动框",
85367
+ SubMenu:
85368
+ [
85369
+ { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:false}]}, Checked:!this.DialogTooltip },
85370
+ { Name:"样式1", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:0}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===0) },
85371
+ { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:1}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===1) },
85372
+ ]
85373
+ }
85235
85374
 
85236
85375
  ]
85237
85376
  }
@@ -125537,6 +125676,12 @@ function GetBlackStyle()
125537
125676
  Text:"rgb(245,245,245)", //默认文本
125538
125677
  },
125539
125678
 
125679
+ NameSymbolV2:
125680
+ {
125681
+ Name:{ Size:14, Name:"微软雅黑", Color: "rgb(250,250,250)"},
125682
+ Symbol:{ Size:12, Name:"微软雅黑", Color: "rgb(190, 190, 190)"},
125683
+ },
125684
+
125540
125685
  CloseLine:
125541
125686
  {
125542
125687
  CloseColor:"rgb(30,144,255)",
@@ -131173,7 +131318,8 @@ var REPORT_COLUMN_ID=
131173
131318
  RISING_SPEED_10M_ID:63,
131174
131319
  RISING_SPEED_15M_ID:64,
131175
131320
 
131176
- SYMBOL_NAME_ID:99,
131321
+ SYMBOL_NAME_V2_ID:98, //单行
131322
+ SYMBOL_NAME_ID:99, //两行
131177
131323
 
131178
131324
  CUSTOM_STRING_TEXT_ID:100, //自定义字符串文本
131179
131325
  CUSTOM_NUMBER_TEXT_ID:101, //自定义数值型
@@ -131374,6 +131520,9 @@ function ChartReport()
131374
131520
  this.ItemSymbolFontConfig={Size:g_JSChartResource.Report.Item.SymbolFont.Size, Name:g_JSChartResource.Report.Item.SymbolFont.Name};
131375
131521
  this.ItemNameFontConfg={Size:g_JSChartResource.Report.Item.NameFont.Size, Name:g_JSChartResource.Report.Item.NameFont.Name};
131376
131522
 
131523
+ //名称+代码
131524
+ this.NameSymbolV2Config=CloneData(g_JSChartResource.Report.NameSymbolV2);
131525
+
131377
131526
  //缓存
131378
131527
  this.HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
131379
131528
  this.SortFont=null,
@@ -131382,6 +131531,7 @@ function ChartReport()
131382
131531
  this.ItemSymbolFont=12*GetDevicePixelRatio() +"px 微软雅黑";
131383
131532
  this.ItemNameFont=15*GetDevicePixelRatio() +"px 微软雅黑";
131384
131533
  this.ItemNameHeight=0;
131534
+ this.NameSymbolFont={ Symbol:null, Name:null };
131385
131535
  this.RowCount=0; //一屏显示行数
131386
131536
  this.HeaderHeight=0; //表头高度
131387
131537
  this.FixedRowHeight=0; //固定行高度
@@ -131526,6 +131676,8 @@ function ChartReport()
131526
131676
  if (item.TextColor) colItem.TextColor=item.TextColor;
131527
131677
  if (item.HeaderColor) colItem.HeaderColor=item.HeaderColor;
131528
131678
  if (item.MaxText) colItem.MaxText=item.MaxText;
131679
+ if (item.MaxText2) colItem.MaxText=item.MaxText2;
131680
+ if (IFrameSplitOperator.IsNumber(item.Space)) colItem.Space=item.Space;
131529
131681
  if (item.ID) colItem.ID=item.ID;
131530
131682
  if (item.FullColBGColor) colItem.FullColBGColor=item.FullColBGColor; //整列背景色
131531
131683
  if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor; //表头背景色
@@ -131686,6 +131838,7 @@ function ChartReport()
131686
131838
  { Type:REPORT_COLUMN_ID.NAME_ID, Title:"名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎0" },
131687
131839
  { Type:REPORT_COLUMN_ID.NAME_EX_ID, Title:"名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎擎擎" },
131688
131840
  { Type:REPORT_COLUMN_ID.SYMBOL_NAME_ID, Title:"股票名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎0"},
131841
+ { Type:REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID, Title:"名称/代码", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.NameSymbolV2.Name.Color, MaxText:"擎擎擎擎*", MaxText2:"999999", Space:5, TextColor2:g_JSChartResource.Report.NameSymbolV2.Symbol.Color },
131689
131842
 
131690
131843
  { Type:REPORT_COLUMN_ID.INCREASE_ID, Title:"涨幅%", TextAlign:"right", Width:null, MaxText:"-888.88" },
131691
131844
  { Type:REPORT_COLUMN_ID.PRICE_ID, Title:"现价", TextAlign:"right", Width:null, MaxText:"88888.88" },
@@ -131879,6 +132032,9 @@ function ChartReport()
131879
132032
  this.ItemSymbolFont=`${this.ItemSymbolFontConfig.Size*pixelRatio}px ${ this.ItemSymbolFontConfig.Name}`;
131880
132033
  this.ItemNameFont=`${this.ItemNameFontConfg.Size*pixelRatio}px ${ this.ItemNameFontConfg.Name}`;
131881
132034
 
132035
+ this.NameSymbolFont.Symbol=`${this.NameSymbolV2Config.Symbol.Size*pixelRatio}px ${this.NameSymbolV2Config.Symbol.Name}`;
132036
+ this.NameSymbolFont.Name=`${this.ItemSymbolFontConfig.Name.Size*pixelRatio}px ${this.NameSymbolV2Config.Name.Name}`;
132037
+
131882
132038
  this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
131883
132039
  this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
131884
132040
  this.SortFont=`${this.SortConfig.Size*pixelRatio}px ${ this.SortConfig.Family}`;
@@ -131908,6 +132064,25 @@ function ChartReport()
131908
132064
  if (rowHeight>this.RowHeight) this.RowHeight=rowHeight;
131909
132065
  if (rowHeight>this.FixedRowHeight) this.FixedRowHeight=rowHeight;
131910
132066
  }
132067
+ else if (item.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID) //单行显示
132068
+ {
132069
+ this.Canvas.font==this.NameSymbolFont.Name;
132070
+ var nameWidth=this.Canvas.measureText(item.MaxText).width;
132071
+ var nameHeight=this.GetFontHeight(this.ItemNameFont,"擎");
132072
+
132073
+
132074
+ this.Canvas.font==this.NameSymbolFont.Symbol;
132075
+ var symbolWidth=this.Canvas.measureText(item.MaxText2).width;
132076
+ var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");
132077
+
132078
+ this.ItemNameHeight=Math.abs(nameHeight,symboHeight);
132079
+
132080
+ var space=2;
132081
+ if (IFrameSplitOperator.IsNumber(item.Space)) space=item.Space;
132082
+ itemWidth=nameWidth+symbolWidth+space;
132083
+
132084
+ item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;
132085
+ }
131911
132086
  else
131912
132087
  {
131913
132088
  if (IFrameSplitOperator.IsNumber(item.FixedWidth)) itemWidth=item.FixedWidth;
@@ -132502,6 +132677,11 @@ function ChartReport()
132502
132677
 
132503
132678
  this.FormatDrawInfo(column, stock, drawInfo, data);
132504
132679
  }
132680
+ else if (column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID)
132681
+ {
132682
+ this.DrawSymbolNameV2(data, column, left, top, rowType);
132683
+ this.FormatDrawInfo(column, stock, drawInfo, data);
132684
+ }
132505
132685
  else if (column.Type==REPORT_COLUMN_ID.NAME_ID)
132506
132686
  {
132507
132687
  if (stock && stock.Name)
@@ -132952,6 +133132,72 @@ function ChartReport()
132952
133132
  this.Canvas.font=this.ItemFont; //还原字体
132953
133133
  }
132954
133134
 
133135
+ this.DrawSymbolNameV2=function(data, column, left, top, rowType)
133136
+ {
133137
+ var stock=data.Stock;
133138
+ var symbol=data.Symbol;
133139
+ var name;
133140
+ if (stock)
133141
+ {
133142
+ symbol=stock.Symbol;
133143
+ name=stock.Name;
133144
+ }
133145
+
133146
+ if (!symbol && !name) return;
133147
+
133148
+ var y=top+this.ItemMergin.Top+this.ItemNameHeight;
133149
+ var textLeft=left+this.ItemMergin.Left;
133150
+ var x=textLeft;
133151
+ var width=column.Width-this.ItemMergin.Left-this.ItemMergin.Right;
133152
+ var textAlign=column.TextAlign;
133153
+ if (textAlign=='center')
133154
+ {
133155
+ x=textLeft+width/2;
133156
+ this.Canvas.textAlign="center";
133157
+ }
133158
+ else if (textAlign=='right')
133159
+ {
133160
+ x=textLeft+width-2;
133161
+ this.Canvas.textAlign="right";
133162
+ }
133163
+ else
133164
+ {
133165
+ x+=2;
133166
+ this.Canvas.textAlign="left";
133167
+ }
133168
+
133169
+ this.Canvas.textBaseline="bottom";
133170
+
133171
+ var textColor=column.TextColor;
133172
+ var text=name;
133173
+ if (text)
133174
+ {
133175
+ this.Canvas.fillStyle=textColor;
133176
+ this.Canvas.font=this.NameSymbolFont.Name;
133177
+ text=this.TextEllipsis(text, width, column.MaxText);
133178
+ if (text)
133179
+ {
133180
+ this.Canvas.fillText(text,x,y);
133181
+ var textWidth=this.Canvas.measureText(text).width;
133182
+ var space=2;
133183
+ if (IFrameSplitOperator.IsNumber(column.Space)) space=column.Space;
133184
+ x+=(textWidth+space);
133185
+ }
133186
+
133187
+ }
133188
+
133189
+ var textColor=column.TextColor2;
133190
+ text=symbol;
133191
+ if (text)
133192
+ {
133193
+ this.Canvas.font=this.NameSymbolFont.Symbol;
133194
+ this.Canvas.fillStyle=textColor;
133195
+ this.Canvas.fillText(text,x,y);
133196
+ }
133197
+
133198
+ this.Canvas.font=this.ItemFont; //还原字体
133199
+ }
133200
+
132955
133201
  this.DrawLimitPriceBorder=function(value, stock, left, top, itemWidth)
132956
133202
  {
132957
133203
  if (!IFrameSplitOperator.IsNumber(value) || !stock) return;
@@ -138794,7 +139040,7 @@ function ScrollBarBGChart()
138794
139040
 
138795
139041
 
138796
139042
 
138797
- var HQCHART_VERSION="1.1.13920";
139043
+ var HQCHART_VERSION="1.1.13932";
138798
139044
 
138799
139045
  function PrintHQChartVersion()
138800
139046
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.13920";
8
+ var HQCHART_VERSION="1.1.13932";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -56864,6 +56864,8 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
56864
56864
  }
56865
56865
 
56866
56866
  arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.cfe", Type:0 } } );
56867
+ arySymbol.push( { Symbol:"IML8.cfe", Name:"中千主连", ShortSymbol:"IML8", Spell:"IML8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IML8.cfe", Type:0 } } );
56868
+ arySymbol.push( { Symbol:"IFL8.cfe", Name:"沪深主连", ShortSymbol:"IFL8", Spell:"IFL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IFL8.cfe", Type:0 } } );
56867
56869
 
56868
56870
  arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
56869
56871
  arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
@@ -56922,6 +56924,15 @@ HQData.GetM1KLineDataBySymbol=function(symbol)
56922
56924
  case "399006.sz":
56923
56925
  data=SZ_399006_M1_KLINE;
56924
56926
  break;
56927
+ case "ICL8.cfe":
56928
+ data=CFE_ICL8_M1_KLINE;
56929
+ break;
56930
+ case "IML8.cfe":
56931
+ data=CFE_IML8_M1_KLINE;
56932
+ break;
56933
+ case "IFL8.cfe":
56934
+ data=CFE_IFL8_M1_KLINE;
56935
+ break;
56925
56936
  default:
56926
56937
  data=SZ_000001_M1_KLINE;
56927
56938
  break;
@@ -56965,6 +56976,12 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
56965
56976
  case "ICL8.cfe":
56966
56977
  data=CFE_ICL8_DAY_KLINE;
56967
56978
  break;
56979
+ case "IML8.cfe":
56980
+ data=CFE_IML8_DAY_KLINE;
56981
+ break;
56982
+ case "IFL8.cfe":
56983
+ data=CFE_IFL8_DAY_KLINE;
56984
+ break;
56968
56985
  default:
56969
56986
  data=SZ_000001_DAY_KLINE;
56970
56987
  break;