hqchart 1.1.14804 → 1.1.14809

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 (8) hide show
  1. package/lib/umychart.vue.js +33 -42
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.DialogSearchIndex.js +58 -33
  4. package/src/jscommon/umychart.js +20 -0
  5. package/src/jscommon/umychart.report.js +84 -2
  6. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +105 -3
  7. package/src/jscommon/umychart.version.js +1 -1
  8. package/src/jscommon/umychart.vue/umychart.vue.js +163 -36
package/src/jscommon/umychart.report.js CHANGED
@@ -1633,7 +1633,7 @@ function JSReportChartContainer(uielement)
1633
1633
  //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
1634
1634
  //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
1635
1635
  //80=整行背景色
1636
- //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
1636
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
1637
1637
 
1638
1638
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
1639
1639
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -1779,7 +1779,18 @@ function JSReportChartContainer(uielement)
1779
1779
  if (IFrameSplitOperator.IsObject(item[358])) stock.ReserveButton8=item[358];
1780
1780
  if (IFrameSplitOperator.IsObject(item[359])) stock.ReserveButton9=item[359];
1781
1781
  if (IFrameSplitOperator.IsObject(item[360])) stock.ReserveButton10=item[360];
1782
-
1782
+
1783
+ //10个日期时间类型 401-499 { Value:Date, BGColor }
1784
+ if (IFrameSplitOperator.IsObject(item[401])) stock.ReserveDateTime1=item[401];
1785
+ if (IFrameSplitOperator.IsObject(item[402])) stock.ReserveDateTime2=item[402];
1786
+ if (IFrameSplitOperator.IsObject(item[403])) stock.ReserveDateTime3=item[403];
1787
+ if (IFrameSplitOperator.IsObject(item[404])) stock.ReserveDateTime4=item[404];
1788
+ if (IFrameSplitOperator.IsObject(item[405])) stock.ReserveDateTime5=item[405];
1789
+ if (IFrameSplitOperator.IsObject(item[406])) stock.ReserveDateTime6=item[406];
1790
+ if (IFrameSplitOperator.IsObject(item[407])) stock.ReserveDateTime7=item[407];
1791
+ if (IFrameSplitOperator.IsObject(item[408])) stock.ReserveDateTime8=item[408];
1792
+ if (IFrameSplitOperator.IsObject(item[409])) stock.ReserveDateTime9=item[409];
1793
+ if (IFrameSplitOperator.IsObject(item[410])) stock.ReserveDateTime10=item[410];
1783
1794
  }
1784
1795
 
1785
1796
 
@@ -4626,6 +4637,18 @@ var REPORT_COLUMN_ID=
4626
4637
  RESERVE_BUTTON9_ID:459, //ReserveButton9:
4627
4638
  RESERVE_BUTTON10_ID:460, //ReserveButton10:
4628
4639
 
4640
+
4641
+ //预留日期时间类型 10个 501-599
4642
+ RESERVE_DATETIME1_ID:501, //ReserveDateTime1;
4643
+ RESERVE_DATETIME2_ID:502,
4644
+ RESERVE_DATETIME3_ID:503,
4645
+ RESERVE_DATETIME4_ID:504,
4646
+ RESERVE_DATETIME5_ID:505,
4647
+ RESERVE_DATETIME6_ID:506,
4648
+ RESERVE_DATETIME7_ID:507,
4649
+ RESERVE_DATETIME8_ID:508,
4650
+ RESERVE_DATETIME9_ID:509,
4651
+ RESERVE_DATETIME10_ID:510,
4629
4652
  }
4630
4653
 
4631
4654
 
@@ -4722,6 +4745,17 @@ var MAP_COLUMN_FIELD=new Map([
4722
4745
  [REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,"ReserveButton8"],
4723
4746
  [REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,"ReserveButton9"],
4724
4747
  [REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,"ReserveButton10"],
4748
+
4749
+ [REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,"ReserveDateTime1"],
4750
+ [REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,"ReserveDateTime2"],
4751
+ [REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,"ReserveDateTime3"],
4752
+ [REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,"ReserveDateTime4"],
4753
+ [REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,"ReserveDateTime5"],
4754
+ [REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,"ReserveDateTime6"],
4755
+ [REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,"ReserveDateTime7"],
4756
+ [REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,"ReserveDateTime8"],
4757
+ [REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,"ReserveDateTime9"],
4758
+ [REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,"ReserveDateTime10"],
4725
4759
  ]);
4726
4760
 
4727
4761
  function ChartReport()
@@ -5119,6 +5153,10 @@ function ChartReport()
5119
5153
  if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
5120
5154
  if (item.StringFormat) colItem.StringFormat=item.StringFormat; //"{0}%" 输出增加固定字符
5121
5155
  }
5156
+ else if (this.IsReserveDateTime(item.Type))
5157
+ {
5158
+ if (item.DateTimeFormat) colItem.DateTimeFormat=item.DateTimeFormat; //日期格式化
5159
+ }
5122
5160
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
5123
5161
  {
5124
5162
  if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
@@ -5362,6 +5400,18 @@ function ChartReport()
5362
5400
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON8_ID, Title:"按钮8", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
5363
5401
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON9_ID, Title:"按钮9", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
5364
5402
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON10_ID, Title:"按钮10", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
5403
+
5404
+
5405
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME1_ID, Title:"日期1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5406
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME2_ID, Title:"日期2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5407
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME3_ID, Title:"日期3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5408
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME4_ID, Title:"日期4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5409
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME5_ID, Title:"日期5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5410
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME6_ID, Title:"日期6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5411
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME7_ID, Title:"日期7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5412
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME8_ID, Title:"日期8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5413
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME9_ID, Title:"日期9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5414
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME10_ID, Title:"日期10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
5365
5415
 
5366
5416
  ];
5367
5417
 
@@ -6656,6 +6706,11 @@ function ChartReport()
6656
6706
  this.FormatReserveString(column, stock, drawInfo);
6657
6707
  this.FormatDrawInfoEvent(stock, data, column, drawInfo);
6658
6708
  }
6709
+ else if (this.IsReserveDateTime(column.Type))
6710
+ {
6711
+ this.FormatReserveDateTime(column, stock, drawInfo);
6712
+ this.FormatDrawInfoEvent(stock, data, column, drawInfo);
6713
+ }
6659
6714
  else if (this.IsReserveProgressBarColumn(column.Type))
6660
6715
  {
6661
6716
  this.FormatReserveProgressBar(column, stock, drawInfo);
@@ -6825,6 +6880,18 @@ function ChartReport()
6825
6880
  return ARARY_TYPE.includes(value);
6826
6881
  }
6827
6882
 
6883
+ this.IsReserveDateTime=function(value)
6884
+ {
6885
+ var ARARY_TYPE=
6886
+ [
6887
+ REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,
6888
+ REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,
6889
+ REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,REPORT_COLUMN_ID.RESERVE_DATETIME10_ID
6890
+ ];
6891
+
6892
+ return ARARY_TYPE.includes(value);
6893
+ }
6894
+
6828
6895
 
6829
6896
 
6830
6897
  this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
@@ -7257,6 +7324,21 @@ function ChartReport()
7257
7324
  }
7258
7325
  }
7259
7326
 
7327
+ this.FormatReserveDateTime=function(column, data, drawInfo)
7328
+ {
7329
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
7330
+
7331
+ var fieldName=MAP_COLUMN_FIELD.get(column.Type);
7332
+ if (!data || !fieldName) return;
7333
+
7334
+ var item=data[fieldName];
7335
+ if (!IFrameSplitOperator.IsObject(item)) return;
7336
+
7337
+ if (item.DateTime) drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,column.DateTimeFormat);
7338
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
7339
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
7340
+ }
7341
+
7260
7342
  this.FormatReserveProgressBar=function(column, data, drawInfo)
7261
7343
  {
7262
7344
  var fieldName=MAP_COLUMN_FIELD.get(column.Type);
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -6880,6 +6880,8 @@ var JSCHART_EVENT_ID=
6880
6880
  ON_CLICK_CROSSCURSOR_BOTTOM:170, //十字光标底部文字点击
6881
6881
 
6882
6882
  ON_CLICK_CHART_CELL:171, //点击图形单元
6883
+
6884
+ GET_DEFAULT_INDEX_PARAM:172, //获取指标默认参数
6883
6885
  }
6884
6886
 
6885
6887
  var JSCHART_OPERATOR_ID=
@@ -57281,6 +57283,24 @@ IFrameSplitOperator.FormatDateTimeString=function(value,isShowDate,isShowTime)
57281
57283
  return result;
57282
57284
  }
57283
57285
 
57286
+ IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID)
57287
+ {
57288
+ if (!datetime) return null;
57289
+
57290
+ switch(format)
57291
+ {
57292
+ case "YYYY-MM-DD":
57293
+ return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
57294
+
57295
+ case "HH:MM:SS":
57296
+ return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}`;
57297
+ case "HH:MM":
57298
+ return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
57299
+ default:
57300
+ return null;
57301
+ }
57302
+ }
57303
+
57284
57304
  //字段颜色格式化
57285
57305
  IFrameSplitOperator.FormatValueColor = function (value, value2)
57286
57306
  {
@@ -137743,7 +137763,7 @@ function JSReportChartContainer(uielement)
137743
137763
  //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
137744
137764
  //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
137745
137765
  //80=整行背景色
137746
- //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
137766
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
137747
137767
 
137748
137768
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
137749
137769
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -137889,7 +137909,18 @@ function JSReportChartContainer(uielement)
137889
137909
  if (IFrameSplitOperator.IsObject(item[358])) stock.ReserveButton8=item[358];
137890
137910
  if (IFrameSplitOperator.IsObject(item[359])) stock.ReserveButton9=item[359];
137891
137911
  if (IFrameSplitOperator.IsObject(item[360])) stock.ReserveButton10=item[360];
137892
-
137912
+
137913
+ //10个日期时间类型 401-499 { Value:Date, BGColor }
137914
+ if (IFrameSplitOperator.IsObject(item[401])) stock.ReserveDateTime1=item[401];
137915
+ if (IFrameSplitOperator.IsObject(item[402])) stock.ReserveDateTime2=item[402];
137916
+ if (IFrameSplitOperator.IsObject(item[403])) stock.ReserveDateTime3=item[403];
137917
+ if (IFrameSplitOperator.IsObject(item[404])) stock.ReserveDateTime4=item[404];
137918
+ if (IFrameSplitOperator.IsObject(item[405])) stock.ReserveDateTime5=item[405];
137919
+ if (IFrameSplitOperator.IsObject(item[406])) stock.ReserveDateTime6=item[406];
137920
+ if (IFrameSplitOperator.IsObject(item[407])) stock.ReserveDateTime7=item[407];
137921
+ if (IFrameSplitOperator.IsObject(item[408])) stock.ReserveDateTime8=item[408];
137922
+ if (IFrameSplitOperator.IsObject(item[409])) stock.ReserveDateTime9=item[409];
137923
+ if (IFrameSplitOperator.IsObject(item[410])) stock.ReserveDateTime10=item[410];
137893
137924
  }
137894
137925
 
137895
137926
 
@@ -140736,6 +140767,18 @@ var REPORT_COLUMN_ID=
140736
140767
  RESERVE_BUTTON9_ID:459, //ReserveButton9:
140737
140768
  RESERVE_BUTTON10_ID:460, //ReserveButton10:
140738
140769
 
140770
+
140771
+ //预留日期时间类型 10个 501-599
140772
+ RESERVE_DATETIME1_ID:501, //ReserveDateTime1;
140773
+ RESERVE_DATETIME2_ID:502,
140774
+ RESERVE_DATETIME3_ID:503,
140775
+ RESERVE_DATETIME4_ID:504,
140776
+ RESERVE_DATETIME5_ID:505,
140777
+ RESERVE_DATETIME6_ID:506,
140778
+ RESERVE_DATETIME7_ID:507,
140779
+ RESERVE_DATETIME8_ID:508,
140780
+ RESERVE_DATETIME9_ID:509,
140781
+ RESERVE_DATETIME10_ID:510,
140739
140782
  }
140740
140783
 
140741
140784
 
@@ -140832,6 +140875,17 @@ var MAP_COLUMN_FIELD=new Map([
140832
140875
  [REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,"ReserveButton8"],
140833
140876
  [REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,"ReserveButton9"],
140834
140877
  [REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,"ReserveButton10"],
140878
+
140879
+ [REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,"ReserveDateTime1"],
140880
+ [REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,"ReserveDateTime2"],
140881
+ [REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,"ReserveDateTime3"],
140882
+ [REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,"ReserveDateTime4"],
140883
+ [REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,"ReserveDateTime5"],
140884
+ [REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,"ReserveDateTime6"],
140885
+ [REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,"ReserveDateTime7"],
140886
+ [REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,"ReserveDateTime8"],
140887
+ [REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,"ReserveDateTime9"],
140888
+ [REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,"ReserveDateTime10"],
140835
140889
  ]);
140836
140890
 
140837
140891
  function ChartReport()
@@ -141229,6 +141283,10 @@ function ChartReport()
141229
141283
  if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
141230
141284
  if (item.StringFormat) colItem.StringFormat=item.StringFormat; //"{0}%" 输出增加固定字符
141231
141285
  }
141286
+ else if (this.IsReserveDateTime(item.Type))
141287
+ {
141288
+ if (item.DateTimeFormat) colItem.DateTimeFormat=item.DateTimeFormat; //日期格式化
141289
+ }
141232
141290
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
141233
141291
  {
141234
141292
  if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
@@ -141472,6 +141530,18 @@ function ChartReport()
141472
141530
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON8_ID, Title:"按钮8", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
141473
141531
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON9_ID, Title:"按钮9", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
141474
141532
  { Type:REPORT_COLUMN_ID.RESERVE_BUTTON10_ID, Title:"按钮10", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
141533
+
141534
+
141535
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME1_ID, Title:"日期1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141536
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME2_ID, Title:"日期2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141537
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME3_ID, Title:"日期3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141538
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME4_ID, Title:"日期4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141539
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME5_ID, Title:"日期5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141540
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME6_ID, Title:"日期6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141541
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME7_ID, Title:"日期7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141542
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME8_ID, Title:"日期8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141543
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME9_ID, Title:"日期9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141544
+ { Type:REPORT_COLUMN_ID.RESERVE_DATETIME10_ID, Title:"日期10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
141475
141545
 
141476
141546
  ];
141477
141547
 
@@ -142766,6 +142836,11 @@ function ChartReport()
142766
142836
  this.FormatReserveString(column, stock, drawInfo);
142767
142837
  this.FormatDrawInfoEvent(stock, data, column, drawInfo);
142768
142838
  }
142839
+ else if (this.IsReserveDateTime(column.Type))
142840
+ {
142841
+ this.FormatReserveDateTime(column, stock, drawInfo);
142842
+ this.FormatDrawInfoEvent(stock, data, column, drawInfo);
142843
+ }
142769
142844
  else if (this.IsReserveProgressBarColumn(column.Type))
142770
142845
  {
142771
142846
  this.FormatReserveProgressBar(column, stock, drawInfo);
@@ -142935,6 +143010,18 @@ function ChartReport()
142935
143010
  return ARARY_TYPE.includes(value);
142936
143011
  }
142937
143012
 
143013
+ this.IsReserveDateTime=function(value)
143014
+ {
143015
+ var ARARY_TYPE=
143016
+ [
143017
+ REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,
143018
+ REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,
143019
+ REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,REPORT_COLUMN_ID.RESERVE_DATETIME10_ID
143020
+ ];
143021
+
143022
+ return ARARY_TYPE.includes(value);
143023
+ }
143024
+
142938
143025
 
142939
143026
 
142940
143027
  this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
@@ -143367,6 +143454,21 @@ function ChartReport()
143367
143454
  }
143368
143455
  }
143369
143456
 
143457
+ this.FormatReserveDateTime=function(column, data, drawInfo)
143458
+ {
143459
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
143460
+
143461
+ var fieldName=MAP_COLUMN_FIELD.get(column.Type);
143462
+ if (!data || !fieldName) return;
143463
+
143464
+ var item=data[fieldName];
143465
+ if (!IFrameSplitOperator.IsObject(item)) return;
143466
+
143467
+ if (item.DateTime) drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,column.DateTimeFormat);
143468
+ if (item.TextColor) drawInfo.TextColor=item.TextColor;
143469
+ if (item.BGColor) drawInfo.BGColor=item.BGColor;
143470
+ }
143471
+
143370
143472
  this.FormatReserveProgressBar=function(column, data, drawInfo)
143371
143473
  {
143372
143474
  var fieldName=MAP_COLUMN_FIELD.get(column.Type);
@@ -149224,7 +149326,7 @@ function ScrollBarBGChart()
149224
149326
 
149225
149327
 
149226
149328
 
149227
- var HQCHART_VERSION="1.1.14803";
149329
+ var HQCHART_VERSION="1.1.14807";
149228
149330
 
149229
149331
  function PrintHQChartVersion()
149230
149332
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14803";
8
+ var HQCHART_VERSION="1.1.14807";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {