hqchart 1.1.14072 → 1.1.14079

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 (7) hide show
  1. package/lib/umychart.vue.js +27 -20
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.DialogSearchIndex.js +21 -6
  4. package/src/jscommon/umychart.report.js +125 -8
  5. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +126 -9
  6. package/src/jscommon/umychart.version.js +1 -1
  7. package/src/jscommon/umychart.vue/umychart.vue.js +147 -15
package/src/jscommon/umychart.report.js CHANGED
@@ -1525,6 +1525,18 @@ function JSReportChartContainer(uielement)
1525
1525
  if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
1526
1526
  if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
1527
1527
  if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
1528
+
1529
+ //10个进度条 301-350 { Value:, BGColor: }
1530
+ if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
1531
+ if (IFrameSplitOperator.IsNumber(item[302]) || IFrameSplitOperator.IsObject(item[302])) stock.ReserveProgressBar2=item[302];
1532
+ if (IFrameSplitOperator.IsNumber(item[303]) || IFrameSplitOperator.IsObject(item[303])) stock.ReserveProgressBar3=item[303];
1533
+ if (IFrameSplitOperator.IsNumber(item[304]) || IFrameSplitOperator.IsObject(item[304])) stock.ReserveProgressBar4=item[304];
1534
+ if (IFrameSplitOperator.IsNumber(item[305]) || IFrameSplitOperator.IsObject(item[305])) stock.ReserveProgressBar5=item[305];
1535
+ if (IFrameSplitOperator.IsNumber(item[306]) || IFrameSplitOperator.IsObject(item[306])) stock.ReserveProgressBar6=item[306];
1536
+ if (IFrameSplitOperator.IsNumber(item[307]) || IFrameSplitOperator.IsObject(item[307])) stock.ReserveProgressBar7=item[307];
1537
+ if (IFrameSplitOperator.IsNumber(item[308]) || IFrameSplitOperator.IsObject(item[308])) stock.ReserveProgressBar8=item[308];
1538
+ if (IFrameSplitOperator.IsNumber(item[309]) || IFrameSplitOperator.IsObject(item[309])) stock.ReserveProgressBar9=item[309];
1539
+ if (IFrameSplitOperator.IsNumber(item[310]) || IFrameSplitOperator.IsObject(item[310])) stock.ReserveProgressBar10=item[310];
1528
1540
  }
1529
1541
 
1530
1542
 
@@ -4169,8 +4181,22 @@ var REPORT_COLUMN_ID=
4169
4181
  RESERVE_STRING8_ID:308,
4170
4182
  RESERVE_STRING9_ID:309,
4171
4183
  RESERVE_STRING10_ID:310,
4184
+
4185
+ //预留进度条类型 10个 401-450
4186
+ RESERVE_PROGRESS_BAR1_ID:401, //ReserveProgressBar1:
4187
+ RESERVE_PROGRESS_BAR2_ID:402,
4188
+ RESERVE_PROGRESS_BAR3_ID:403,
4189
+ RESERVE_PROGRESS_BAR4_ID:404,
4190
+ RESERVE_PROGRESS_BAR5_ID:405,
4191
+ RESERVE_PROGRESS_BAR6_ID:406,
4192
+ RESERVE_PROGRESS_BAR7_ID:407,
4193
+ RESERVE_PROGRESS_BAR8_ID:408,
4194
+ RESERVE_PROGRESS_BAR9_ID:409,
4195
+ RESERVE_PROGRESS_BAR10_ID:410,
4196
+
4172
4197
  }
4173
4198
 
4199
+
4174
4200
  //数据对应字段名对照表
4175
4201
  var MAP_COLUMN_FIELD=new Map([
4176
4202
  [REPORT_COLUMN_ID.SYMBOL_ID, "Symbol"],
@@ -4241,6 +4267,17 @@ var MAP_COLUMN_FIELD=new Map([
4241
4267
  [REPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
4242
4268
  [REPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
4243
4269
  [REPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
4270
+
4271
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,"ReserveProgressBar1"],
4272
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,"ReserveProgressBar2"],
4273
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,"ReserveProgressBar3"],
4274
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,"ReserveProgressBar4"],
4275
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,"ReserveProgressBar5"],
4276
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,"ReserveProgressBar6"],
4277
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,"ReserveProgressBar7"],
4278
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,"ReserveProgressBar8"],
4279
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,"ReserveProgressBar9"],
4280
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,"ReserveProgressBar10"],
4244
4281
  ]);
4245
4282
 
4246
4283
  function ChartReport()
@@ -4325,14 +4362,14 @@ function ChartReport()
4325
4362
  Left:g_JSChartResource.Report.Item.Mergin.Left,
4326
4363
  Right:g_JSChartResource.Report.Item.Mergin.Right,
4327
4364
  Top:g_JSChartResource.Report.Item.Mergin.Top,
4328
- Bottom:g_JSChartResource.Report.Item.Mergin.Bottom
4365
+ Bottom:g_JSChartResource.Report.Item.Mergin.Bottom,
4329
4366
  };
4330
4367
  this.BarMergin=
4331
4368
  {
4332
4369
  Top:g_JSChartResource.Report.Item.BarMergin.Top,
4333
4370
  Left:g_JSChartResource.Report.Item.BarMergin.Left,
4334
4371
  Right:g_JSChartResource.Report.Item.BarMergin.Right,
4335
- Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom
4372
+ Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom,
4336
4373
  };
4337
4374
 
4338
4375
  this.LimitDrawType=0; //0=绘制边框 1=背景色
@@ -4389,15 +4426,21 @@ function ChartReport()
4389
4426
  this.HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
4390
4427
  this.SortFont=null,
4391
4428
  this.ItemFont=15*GetDevicePixelRatio() +"px 微软雅黑";
4429
+ this.ItemFontHeight=0;
4430
+
4392
4431
  this.ItemFixedFont=15*GetDevicePixelRatio() +"px 微软雅黑";
4432
+
4393
4433
  this.ItemSymbolFont=12*GetDevicePixelRatio() +"px 微软雅黑";
4394
4434
  this.ItemNameFont=15*GetDevicePixelRatio() +"px 微软雅黑";
4395
4435
  this.ItemNameHeight=0;
4436
+ this.ItemSymbolHeight=0;
4437
+
4396
4438
  this.NameSymbolFont={ Symbol:null, Name:null };
4397
4439
  this.RowCount=0; //一屏显示行数
4398
4440
  this.HeaderHeight=0; //表头高度
4399
4441
  this.FixedRowHeight=0; //固定行高度
4400
4442
  this.RowHeight=0; //行高度
4443
+ this.ItemTextLines=1; //单元格输出行数
4401
4444
  this.BottomToolbarHeight=0; //底部工具条高度
4402
4445
  this.IsShowAllColumn=false; //是否已显示所有列
4403
4446
  this.DevicePixelRatio=GetDevicePixelRatio(); //分辨率
@@ -4616,6 +4659,11 @@ function ChartReport()
4616
4659
  if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
4617
4660
  else colItem.ProgressBar=this.ProgressBarConfig;
4618
4661
  }
4662
+ else if (this.IsReserveProgressBarColumn(item.Type))
4663
+ {
4664
+ if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
4665
+ else colItem.ProgressBar=this.ProgressBarConfig;
4666
+ }
4619
4667
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
4620
4668
  {
4621
4669
  if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
@@ -4789,6 +4837,19 @@ function ChartReport()
4789
4837
  { Type:REPORT_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
4790
4838
  { Type:REPORT_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
4791
4839
  { Type:REPORT_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
4840
+
4841
+
4842
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID, Title:"进度条1", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4843
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID, Title:"进度条2", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4844
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID, Title:"进度条3", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4845
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID, Title:"进度条4", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4846
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID, Title:"进度条5", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4847
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID, Title:"进度条6", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4848
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID, Title:"进度条7", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4849
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID, Title:"进度条8", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4850
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID, Title:"进度条9", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4851
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID, Title:"进度条10", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
4852
+
4792
4853
  ];
4793
4854
 
4794
4855
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -4922,7 +4983,9 @@ function ChartReport()
4922
4983
  this.NameSymbolFont.Symbol=`${this.NameSymbolV2Config.Symbol.Size*pixelRatio}px ${this.NameSymbolV2Config.Symbol.Name}`;
4923
4984
  this.NameSymbolFont.Name=`${this.ItemSymbolFontConfig.Name.Size*pixelRatio}px ${this.NameSymbolV2Config.Name.Name}`;
4924
4985
 
4925
- this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
4986
+ this.ItemFontHeight=this.GetFontHeight(this.ItemFont,"擎");
4987
+ this.RowHeight=this.ItemFontHeight+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
4988
+ this.ItemTextLines=1;
4926
4989
  this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
4927
4990
  this.SortFont=`${this.SortConfig.Size*pixelRatio}px ${ this.SortConfig.Family}`;
4928
4991
 
@@ -4941,6 +5004,7 @@ function ChartReport()
4941
5004
  this.Canvas.font=this.ItemSymbolFont;
4942
5005
  var symbolWidth=this.Canvas.measureText(item.MaxText).width;
4943
5006
  var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");
5007
+ this.ItemSymbolHeight=symboHeight;
4944
5008
 
4945
5009
  this.Canvas.font=this.ItemFont;
4946
5010
 
@@ -4948,6 +5012,7 @@ function ChartReport()
4948
5012
  item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;
4949
5013
 
4950
5014
  var rowHeight=nameHeight+symboHeight+this.ItemMergin.Top+ this.ItemMergin.Bottom;
5015
+ this.ItemTextLines=2;
4951
5016
  if (rowHeight>this.RowHeight) this.RowHeight=rowHeight;
4952
5017
  if (rowHeight>this.FixedRowHeight) this.FixedRowHeight=rowHeight;
4953
5018
  }
@@ -5853,6 +5918,10 @@ function ChartReport()
5853
5918
  {
5854
5919
  this.FormatReserveString(column, stock, drawInfo);
5855
5920
  }
5921
+ else if (this.IsReserveProgressBarColumn(column.Type))
5922
+ {
5923
+ this.FormatReserveProgressBar(column, stock, drawInfo);
5924
+ }
5856
5925
 
5857
5926
 
5858
5927
  //拖拽行颜色
@@ -5875,7 +5944,7 @@ function ChartReport()
5875
5944
  {
5876
5945
  this.DrawButton(drawInfo, left, top, itemWidth);
5877
5946
  }
5878
- else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
5947
+ else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID || this.IsReserveProgressBarColumn(column.Type))
5879
5948
  {
5880
5949
  this.DrawProgressBar(drawInfo, left, top, itemWidth);
5881
5950
  }
@@ -5921,6 +5990,18 @@ function ChartReport()
5921
5990
  }
5922
5991
  }
5923
5992
 
5993
+ this.IsReserveProgressBarColumn=function(value)
5994
+ {
5995
+ var ARARY_TYPE=
5996
+ [
5997
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID, REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,
5998
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,
5999
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID
6000
+ ];
6001
+
6002
+ return ARARY_TYPE.includes(value);
6003
+ }
6004
+
5924
6005
  this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
5925
6006
  {
5926
6007
  if (!drawInfo.Text) return;
@@ -6021,7 +6102,7 @@ function ChartReport()
6021
6102
  var text=name;
6022
6103
  if (text)
6023
6104
  {
6024
- this.Canvas.textBaseline="ideographic";
6105
+ this.Canvas.textBaseline="bottom";
6025
6106
  this.Canvas.fillStyle=textColor;
6026
6107
  this.Canvas.font=this.ItemNameFont;
6027
6108
  text=this.TextEllipsis(text, width, column.MaxText);
@@ -6031,10 +6112,10 @@ function ChartReport()
6031
6112
  text=symbol;
6032
6113
  if (text)
6033
6114
  {
6034
- this.Canvas.textBaseline="top";
6115
+ this.Canvas.textBaseline="bottom";
6035
6116
  this.Canvas.font=this.ItemSymbolFont;
6036
6117
  this.Canvas.fillStyle=textColor;
6037
- this.Canvas.fillText(text,x,y);
6118
+ this.Canvas.fillText(text,x,y+this.ItemSymbolHeight);
6038
6119
  }
6039
6120
 
6040
6121
  this.Canvas.font=this.ItemFont; //还原字体
@@ -6341,6 +6422,32 @@ function ChartReport()
6341
6422
  }
6342
6423
  }
6343
6424
 
6425
+ this.FormatReserveProgressBar=function(column, data, drawInfo)
6426
+ {
6427
+ var fieldName=MAP_COLUMN_FIELD.get(column.Type);
6428
+ if (!fieldName) return;
6429
+ var item=data[fieldName];
6430
+ if (IFrameSplitOperator.IsNumber(item))
6431
+ {
6432
+ drawInfo.ProgressBar=column.ProgressBar;
6433
+ drawInfo.Enable=true;
6434
+ drawInfo.Value=item; //占比
6435
+ drawInfo.Data={ Value:item };
6436
+ }
6437
+ else if (IFrameSplitOperator.IsObject(item))
6438
+ {
6439
+ if (item.Title) drawInfo.Text=item.Title;
6440
+ drawInfo.ProgressBar=column.ProgressBar;
6441
+ drawInfo.Enable=true;
6442
+ drawInfo.Value=item.Value; //占比
6443
+ drawInfo.Data=item;
6444
+ if (IFrameSplitOperator.IsBool(item.Enable)) drawInfo.Enable=item.Enable;
6445
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
6446
+ if (item.BarColor) drawInfo.BarColor=item.BarColor;
6447
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
6448
+ }
6449
+ }
6450
+
6344
6451
  this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
6345
6452
  {
6346
6453
  if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -6521,7 +6628,17 @@ function ChartReport()
6521
6628
 
6522
6629
  this.Canvas.textBaseline="bottom";
6523
6630
  this.Canvas.fillStyle=textColor;
6524
- this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
6631
+
6632
+ if (this.ItemTextLines>1) //多行模式要上下居中
6633
+ {
6634
+ var yOffset=(this.RowHeight-this.ItemMergin.Bottom-this.ItemMergin.Top-this.ItemFontHeight)/2;
6635
+ var yBottom=top+this.RowHeight-this.ItemMergin.Bottom-yOffset;
6636
+ this.Canvas.fillText(text,x,yBottom);
6637
+ }
6638
+ else
6639
+ {
6640
+ this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
6641
+ }
6525
6642
 
6526
6643
  if (bClip) this.Canvas.restore();
6527
6644
  }
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -128599,6 +128599,18 @@ function JSReportChartContainer(uielement)
128599
128599
  if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
128600
128600
  if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
128601
128601
  if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
128602
+
128603
+ //10个进度条 301-350 { Value:, BGColor: }
128604
+ if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
128605
+ if (IFrameSplitOperator.IsNumber(item[302]) || IFrameSplitOperator.IsObject(item[302])) stock.ReserveProgressBar2=item[302];
128606
+ if (IFrameSplitOperator.IsNumber(item[303]) || IFrameSplitOperator.IsObject(item[303])) stock.ReserveProgressBar3=item[303];
128607
+ if (IFrameSplitOperator.IsNumber(item[304]) || IFrameSplitOperator.IsObject(item[304])) stock.ReserveProgressBar4=item[304];
128608
+ if (IFrameSplitOperator.IsNumber(item[305]) || IFrameSplitOperator.IsObject(item[305])) stock.ReserveProgressBar5=item[305];
128609
+ if (IFrameSplitOperator.IsNumber(item[306]) || IFrameSplitOperator.IsObject(item[306])) stock.ReserveProgressBar6=item[306];
128610
+ if (IFrameSplitOperator.IsNumber(item[307]) || IFrameSplitOperator.IsObject(item[307])) stock.ReserveProgressBar7=item[307];
128611
+ if (IFrameSplitOperator.IsNumber(item[308]) || IFrameSplitOperator.IsObject(item[308])) stock.ReserveProgressBar8=item[308];
128612
+ if (IFrameSplitOperator.IsNumber(item[309]) || IFrameSplitOperator.IsObject(item[309])) stock.ReserveProgressBar9=item[309];
128613
+ if (IFrameSplitOperator.IsNumber(item[310]) || IFrameSplitOperator.IsObject(item[310])) stock.ReserveProgressBar10=item[310];
128602
128614
  }
128603
128615
 
128604
128616
 
@@ -131243,8 +131255,22 @@ var REPORT_COLUMN_ID=
131243
131255
  RESERVE_STRING8_ID:308,
131244
131256
  RESERVE_STRING9_ID:309,
131245
131257
  RESERVE_STRING10_ID:310,
131258
+
131259
+ //预留进度条类型 10个 401-450
131260
+ RESERVE_PROGRESS_BAR1_ID:401, //ReserveProgressBar1:
131261
+ RESERVE_PROGRESS_BAR2_ID:402,
131262
+ RESERVE_PROGRESS_BAR3_ID:403,
131263
+ RESERVE_PROGRESS_BAR4_ID:404,
131264
+ RESERVE_PROGRESS_BAR5_ID:405,
131265
+ RESERVE_PROGRESS_BAR6_ID:406,
131266
+ RESERVE_PROGRESS_BAR7_ID:407,
131267
+ RESERVE_PROGRESS_BAR8_ID:408,
131268
+ RESERVE_PROGRESS_BAR9_ID:409,
131269
+ RESERVE_PROGRESS_BAR10_ID:410,
131270
+
131246
131271
  }
131247
131272
 
131273
+
131248
131274
  //数据对应字段名对照表
131249
131275
  var MAP_COLUMN_FIELD=new Map([
131250
131276
  [REPORT_COLUMN_ID.SYMBOL_ID, "Symbol"],
@@ -131315,6 +131341,17 @@ var MAP_COLUMN_FIELD=new Map([
131315
131341
  [REPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
131316
131342
  [REPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
131317
131343
  [REPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
131344
+
131345
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,"ReserveProgressBar1"],
131346
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,"ReserveProgressBar2"],
131347
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,"ReserveProgressBar3"],
131348
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,"ReserveProgressBar4"],
131349
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,"ReserveProgressBar5"],
131350
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,"ReserveProgressBar6"],
131351
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,"ReserveProgressBar7"],
131352
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,"ReserveProgressBar8"],
131353
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,"ReserveProgressBar9"],
131354
+ [REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,"ReserveProgressBar10"],
131318
131355
  ]);
131319
131356
 
131320
131357
  function ChartReport()
@@ -131399,14 +131436,14 @@ function ChartReport()
131399
131436
  Left:g_JSChartResource.Report.Item.Mergin.Left,
131400
131437
  Right:g_JSChartResource.Report.Item.Mergin.Right,
131401
131438
  Top:g_JSChartResource.Report.Item.Mergin.Top,
131402
- Bottom:g_JSChartResource.Report.Item.Mergin.Bottom
131439
+ Bottom:g_JSChartResource.Report.Item.Mergin.Bottom,
131403
131440
  };
131404
131441
  this.BarMergin=
131405
131442
  {
131406
131443
  Top:g_JSChartResource.Report.Item.BarMergin.Top,
131407
131444
  Left:g_JSChartResource.Report.Item.BarMergin.Left,
131408
131445
  Right:g_JSChartResource.Report.Item.BarMergin.Right,
131409
- Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom
131446
+ Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom,
131410
131447
  };
131411
131448
 
131412
131449
  this.LimitDrawType=0; //0=绘制边框 1=背景色
@@ -131463,15 +131500,21 @@ function ChartReport()
131463
131500
  this.HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
131464
131501
  this.SortFont=null,
131465
131502
  this.ItemFont=15*GetDevicePixelRatio() +"px 微软雅黑";
131503
+ this.ItemFontHeight=0;
131504
+
131466
131505
  this.ItemFixedFont=15*GetDevicePixelRatio() +"px 微软雅黑";
131506
+
131467
131507
  this.ItemSymbolFont=12*GetDevicePixelRatio() +"px 微软雅黑";
131468
131508
  this.ItemNameFont=15*GetDevicePixelRatio() +"px 微软雅黑";
131469
131509
  this.ItemNameHeight=0;
131510
+ this.ItemSymbolHeight=0;
131511
+
131470
131512
  this.NameSymbolFont={ Symbol:null, Name:null };
131471
131513
  this.RowCount=0; //一屏显示行数
131472
131514
  this.HeaderHeight=0; //表头高度
131473
131515
  this.FixedRowHeight=0; //固定行高度
131474
131516
  this.RowHeight=0; //行高度
131517
+ this.ItemTextLines=1; //单元格输出行数
131475
131518
  this.BottomToolbarHeight=0; //底部工具条高度
131476
131519
  this.IsShowAllColumn=false; //是否已显示所有列
131477
131520
  this.DevicePixelRatio=GetDevicePixelRatio(); //分辨率
@@ -131690,6 +131733,11 @@ function ChartReport()
131690
131733
  if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
131691
131734
  else colItem.ProgressBar=this.ProgressBarConfig;
131692
131735
  }
131736
+ else if (this.IsReserveProgressBarColumn(item.Type))
131737
+ {
131738
+ if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
131739
+ else colItem.ProgressBar=this.ProgressBarConfig;
131740
+ }
131693
131741
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
131694
131742
  {
131695
131743
  if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
@@ -131863,6 +131911,19 @@ function ChartReport()
131863
131911
  { Type:REPORT_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
131864
131912
  { Type:REPORT_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
131865
131913
  { Type:REPORT_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
131914
+
131915
+
131916
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID, Title:"进度条1", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131917
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID, Title:"进度条2", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131918
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID, Title:"进度条3", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131919
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID, Title:"进度条4", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131920
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID, Title:"进度条5", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131921
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID, Title:"进度条6", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131922
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID, Title:"进度条7", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131923
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID, Title:"进度条8", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131924
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID, Title:"进度条9", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131925
+ { Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID, Title:"进度条10", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
131926
+
131866
131927
  ];
131867
131928
 
131868
131929
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -131996,7 +132057,9 @@ function ChartReport()
131996
132057
  this.NameSymbolFont.Symbol=`${this.NameSymbolV2Config.Symbol.Size*pixelRatio}px ${this.NameSymbolV2Config.Symbol.Name}`;
131997
132058
  this.NameSymbolFont.Name=`${this.ItemSymbolFontConfig.Name.Size*pixelRatio}px ${this.NameSymbolV2Config.Name.Name}`;
131998
132059
 
131999
- this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
132060
+ this.ItemFontHeight=this.GetFontHeight(this.ItemFont,"擎");
132061
+ this.RowHeight=this.ItemFontHeight+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
132062
+ this.ItemTextLines=1;
132000
132063
  this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
132001
132064
  this.SortFont=`${this.SortConfig.Size*pixelRatio}px ${ this.SortConfig.Family}`;
132002
132065
 
@@ -132015,6 +132078,7 @@ function ChartReport()
132015
132078
  this.Canvas.font=this.ItemSymbolFont;
132016
132079
  var symbolWidth=this.Canvas.measureText(item.MaxText).width;
132017
132080
  var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");
132081
+ this.ItemSymbolHeight=symboHeight;
132018
132082
 
132019
132083
  this.Canvas.font=this.ItemFont;
132020
132084
 
@@ -132022,6 +132086,7 @@ function ChartReport()
132022
132086
  item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;
132023
132087
 
132024
132088
  var rowHeight=nameHeight+symboHeight+this.ItemMergin.Top+ this.ItemMergin.Bottom;
132089
+ this.ItemTextLines=2;
132025
132090
  if (rowHeight>this.RowHeight) this.RowHeight=rowHeight;
132026
132091
  if (rowHeight>this.FixedRowHeight) this.FixedRowHeight=rowHeight;
132027
132092
  }
@@ -132927,6 +132992,10 @@ function ChartReport()
132927
132992
  {
132928
132993
  this.FormatReserveString(column, stock, drawInfo);
132929
132994
  }
132995
+ else if (this.IsReserveProgressBarColumn(column.Type))
132996
+ {
132997
+ this.FormatReserveProgressBar(column, stock, drawInfo);
132998
+ }
132930
132999
 
132931
133000
 
132932
133001
  //拖拽行颜色
@@ -132949,7 +133018,7 @@ function ChartReport()
132949
133018
  {
132950
133019
  this.DrawButton(drawInfo, left, top, itemWidth);
132951
133020
  }
132952
- else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
133021
+ else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID || this.IsReserveProgressBarColumn(column.Type))
132953
133022
  {
132954
133023
  this.DrawProgressBar(drawInfo, left, top, itemWidth);
132955
133024
  }
@@ -132995,6 +133064,18 @@ function ChartReport()
132995
133064
  }
132996
133065
  }
132997
133066
 
133067
+ this.IsReserveProgressBarColumn=function(value)
133068
+ {
133069
+ var ARARY_TYPE=
133070
+ [
133071
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID, REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,
133072
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,
133073
+ REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID
133074
+ ];
133075
+
133076
+ return ARARY_TYPE.includes(value);
133077
+ }
133078
+
132998
133079
  this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
132999
133080
  {
133000
133081
  if (!drawInfo.Text) return;
@@ -133095,7 +133176,7 @@ function ChartReport()
133095
133176
  var text=name;
133096
133177
  if (text)
133097
133178
  {
133098
- this.Canvas.textBaseline="ideographic";
133179
+ this.Canvas.textBaseline="bottom";
133099
133180
  this.Canvas.fillStyle=textColor;
133100
133181
  this.Canvas.font=this.ItemNameFont;
133101
133182
  text=this.TextEllipsis(text, width, column.MaxText);
@@ -133105,10 +133186,10 @@ function ChartReport()
133105
133186
  text=symbol;
133106
133187
  if (text)
133107
133188
  {
133108
- this.Canvas.textBaseline="top";
133189
+ this.Canvas.textBaseline="bottom";
133109
133190
  this.Canvas.font=this.ItemSymbolFont;
133110
133191
  this.Canvas.fillStyle=textColor;
133111
- this.Canvas.fillText(text,x,y);
133192
+ this.Canvas.fillText(text,x,y+this.ItemSymbolHeight);
133112
133193
  }
133113
133194
 
133114
133195
  this.Canvas.font=this.ItemFont; //还原字体
@@ -133415,6 +133496,32 @@ function ChartReport()
133415
133496
  }
133416
133497
  }
133417
133498
 
133499
+ this.FormatReserveProgressBar=function(column, data, drawInfo)
133500
+ {
133501
+ var fieldName=MAP_COLUMN_FIELD.get(column.Type);
133502
+ if (!fieldName) return;
133503
+ var item=data[fieldName];
133504
+ if (IFrameSplitOperator.IsNumber(item))
133505
+ {
133506
+ drawInfo.ProgressBar=column.ProgressBar;
133507
+ drawInfo.Enable=true;
133508
+ drawInfo.Value=item; //占比
133509
+ drawInfo.Data={ Value:item };
133510
+ }
133511
+ else if (IFrameSplitOperator.IsObject(item))
133512
+ {
133513
+ if (item.Title) drawInfo.Text=item.Title;
133514
+ drawInfo.ProgressBar=column.ProgressBar;
133515
+ drawInfo.Enable=true;
133516
+ drawInfo.Value=item.Value; //占比
133517
+ drawInfo.Data=item;
133518
+ if (IFrameSplitOperator.IsBool(item.Enable)) drawInfo.Enable=item.Enable;
133519
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
133520
+ if (item.BarColor) drawInfo.BarColor=item.BarColor;
133521
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
133522
+ }
133523
+ }
133524
+
133418
133525
  this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
133419
133526
  {
133420
133527
  if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -133595,7 +133702,17 @@ function ChartReport()
133595
133702
 
133596
133703
  this.Canvas.textBaseline="bottom";
133597
133704
  this.Canvas.fillStyle=textColor;
133598
- this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
133705
+
133706
+ if (this.ItemTextLines>1) //多行模式要上下居中
133707
+ {
133708
+ var yOffset=(this.RowHeight-this.ItemMergin.Bottom-this.ItemMergin.Top-this.ItemFontHeight)/2;
133709
+ var yBottom=top+this.RowHeight-this.ItemMergin.Bottom-yOffset;
133710
+ this.Canvas.fillText(text,x,yBottom);
133711
+ }
133712
+ else
133713
+ {
133714
+ this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
133715
+ }
133599
133716
 
133600
133717
  if (bClip) this.Canvas.restore();
133601
133718
  }
@@ -139157,7 +139274,7 @@ function ScrollBarBGChart()
139157
139274
 
139158
139275
 
139159
139276
 
139160
- var HQCHART_VERSION="1.1.14071";
139277
+ var HQCHART_VERSION="1.1.14078";
139161
139278
 
139162
139279
  function PrintHQChartVersion()
139163
139280
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14071";
8
+ var HQCHART_VERSION="1.1.14078";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {