hqchart 1.1.14012 → 1.1.14016

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 +19 -18
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.PopKeyboard.js +7 -0
  4. package/src/jscommon/umychart.TReport.js +80 -9
  5. package/src/jscommon/umychart.report.js +5 -3
  6. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +6 -4
  7. package/src/jscommon/umychart.version.js +1 -1
  8. package/src/jscommon/umychart.vue/umychart.vue.js +93 -13
package/lib/umychart.vue.js CHANGED
@@ -12712,8 +12712,9 @@ if(IFrameSplitOperator.IsNumber(item[40]))stock.YFClose=item[40];//昨结算价
12712
12712
  if(IFrameSplitOperator.IsNumber(item[41]))stock.OpenPosition=item[41];//开仓量
12713
12713
  if(IFrameSplitOperator.IsNumber(item[42]))stock.ClosePosition=item[42];//平仓量
12714
12714
  //1,3,5,10,15 涨速%
12715
- if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];//10个数值型 101-110
12716
- if(IFrameSplitOperator.IsNumber(item[101]))stock.ReserveNumber1=item[101];if(IFrameSplitOperator.IsNumber(item[102]))stock.ReserveNumber2=item[102];if(IFrameSplitOperator.IsNumber(item[103]))stock.ReserveNumber3=item[103];if(IFrameSplitOperator.IsNumber(item[104]))stock.ReserveNumber4=item[104];if(IFrameSplitOperator.IsNumber(item[105]))stock.ReserveNumber5=item[105];if(IFrameSplitOperator.IsNumber(item[106]))stock.ReserveNumber6=item[106];if(IFrameSplitOperator.IsNumber(item[107]))stock.ReserveNumber7=item[107];if(IFrameSplitOperator.IsNumber(item[108]))stock.ReserveNumber8=item[108];if(IFrameSplitOperator.IsNumber(item[109]))stock.ReserveNumber9=item[109];if(IFrameSplitOperator.IsNumber(item[110]))stock.ReserveNumber10=item[110];};this.GetSymbolNoSuffix=function(symbol){var index=symbol.lastIndexOf(".");if(index>0)return symbol.substring(0,index);else return symbol;};this.CancelAutoUpdate=function()//关闭停止更新
12715
+ if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];//10个数值型 101-199
12716
+ if(IFrameSplitOperator.IsNumber(item[101]))stock.ReserveNumber1=item[101];if(IFrameSplitOperator.IsNumber(item[102]))stock.ReserveNumber2=item[102];if(IFrameSplitOperator.IsNumber(item[103]))stock.ReserveNumber3=item[103];if(IFrameSplitOperator.IsNumber(item[104]))stock.ReserveNumber4=item[104];if(IFrameSplitOperator.IsNumber(item[105]))stock.ReserveNumber5=item[105];if(IFrameSplitOperator.IsNumber(item[106]))stock.ReserveNumber6=item[106];if(IFrameSplitOperator.IsNumber(item[107]))stock.ReserveNumber7=item[107];if(IFrameSplitOperator.IsNumber(item[108]))stock.ReserveNumber8=item[108];if(IFrameSplitOperator.IsNumber(item[109]))stock.ReserveNumber9=item[109];if(IFrameSplitOperator.IsNumber(item[110]))stock.ReserveNumber10=item[110];//10个字符型 201-299
12717
+ };this.GetSymbolNoSuffix=function(symbol){var index=symbol.lastIndexOf(".");if(index>0)return symbol.substring(0,index);else return symbol;};this.CancelAutoUpdate=function()//关闭停止更新
12717
12718
  {if(typeof this.AutoUpdateTimer=='number'){clearTimeout(this.AutoUpdateTimer);this.AutoUpdateTimer=null;}};this.AutoUpdate=function(waitTime)//waitTime 更新时间
12718
12719
  {this.CancelAutoUpdate();if(!this.IsAutoUpdate)return;var self=this;var marketStatus=2;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_MARKET_STATUS);if(event&&event.Callback){var sendData={MarketStatus:2};event.Callback(event,sendData,this);if(IFrameSplitOperator.IsNumber(sendData.MarketStatus))marketStatus=sendData.MarketStatus;}if(marketStatus==0||marketStatus==3)return;//闭市,盘后
12719
12720
  var frequency=this.AutoUpdateFrequency;if(marketStatus==1)//盘前
@@ -12881,8 +12882,8 @@ CUSTOM_BUTTON_ID:105,//自定义按钮
12881
12882
  CUSTOM_PROGRESS_ID:106,//进度条
12882
12883
  CUSTOM_LINK_ID:107,//链接
12883
12884
  //预留数值类型 10个
12884
- RESERVE_NUMBER1_ID:200,//ReserveNumber1:
12885
- RESERVE_NUMBER2_ID:201,RESERVE_NUMBER3_ID:203,RESERVE_NUMBER4_ID:204,RESERVE_NUMBER5_ID:205,RESERVE_NUMBER6_ID:206,RESERVE_NUMBER7_ID:207,RESERVE_NUMBER8_ID:208,RESERVE_NUMBER9_ID:209,RESERVE_NUMBER10_ID:210//数据对应字段名对照表
12885
+ RESERVE_NUMBER1_ID:201,//ReserveNumber1:
12886
+ RESERVE_NUMBER2_ID:202,RESERVE_NUMBER3_ID:203,RESERVE_NUMBER4_ID:204,RESERVE_NUMBER5_ID:205,RESERVE_NUMBER6_ID:206,RESERVE_NUMBER7_ID:207,RESERVE_NUMBER8_ID:208,RESERVE_NUMBER9_ID:209,RESERVE_NUMBER10_ID:210//数据对应字段名对照表
12886
12887
  };var MAP_COLUMN_FIELD=new _map2.default([[REPORT_COLUMN_ID.SYMBOL_ID,"Symbol"],[REPORT_COLUMN_ID.NAME_ID,"Name"],[REPORT_COLUMN_ID.PRICE_ID,"Price"],[REPORT_COLUMN_ID.INCREASE_ID,"Increase"],[REPORT_COLUMN_ID.UPDOWN_ID,"UpDown"],[REPORT_COLUMN_ID.VOL_ID,"Vol"],[REPORT_COLUMN_ID.BUY_PRICE_ID,"BuyPrice"],[REPORT_COLUMN_ID.SELL_PRICE_ID,"SellPrice"],[REPORT_COLUMN_ID.AMOUNT_ID,"Amount"],[REPORT_COLUMN_ID.BUY_VOL_ID,"BuyVol"],[REPORT_COLUMN_ID.SELL_VOL_ID,"SellVol"],[REPORT_COLUMN_ID.YCLOSE_ID,"YClose"],[REPORT_COLUMN_ID.OPEN_ID,"Open"],[REPORT_COLUMN_ID.HIGH_ID,"High"],[REPORT_COLUMN_ID.LOW_ID,"Low"],[REPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],[REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID,"OutShares"],[REPORT_COLUMN_ID.TOTAL_SHARES_ID,"TotalShares"],[REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID,"CircMarketValue"],[REPORT_COLUMN_ID.MARKET_VALUE_ID,"MarketValue"],[REPORT_COLUMN_ID.EXCHANGE_RATE_ID,"Exchange"],[REPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],[REPORT_COLUMN_ID.LIMIT_HIGH_ID,"LimitHigh"],[REPORT_COLUMN_ID.LIMIT_LOW_ID,"LimitLow"],[REPORT_COLUMN_ID.VOL_IN_ID,"VolIn"],[REPORT_COLUMN_ID.VOL_OUT_ID,"VolOut"],[REPORT_COLUMN_ID.NAME_EX_ID,"NameEx"],[REPORT_COLUMN_ID.DATE_ID,"Date"],[REPORT_COLUMN_ID.FUTURES_POSITION_ID,"Position"],[REPORT_COLUMN_ID.FUTURES_CLOSE_ID,"FClose"],[REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,"YFClose"],[REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,"OpenPosition"],[REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,"ClosePosition"],[REPORT_COLUMN_ID.RISING_SPEED_1M_ID,"RSpeed1M"],[REPORT_COLUMN_ID.RISING_SPEED_3M_ID,"RSpeed3M"],[REPORT_COLUMN_ID.RISING_SPEED_5M_ID,"RSpeed5M"],[REPORT_COLUMN_ID.RISING_SPEED_10M_ID,"RSpeed10M"],[REPORT_COLUMN_ID.RISING_SPEED_15M_ID,"RSpeed15M"],[REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],[REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],[REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],[REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],[REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],[REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],[REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],[REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],[REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],[REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"]]);function ChartReport(){this.Canvas;//画布
12887
12888
  this.ChartBorder;//边框信息
12888
12889
  this.ChartFrame;//框架画法
@@ -13233,8 +13234,9 @@ if(!IFrameSplitOperator.IsNumber(item[21]))//涨幅%
13233
13234
  {if(IFrameSplitOperator.IsNumber(stock.High)&&IFrameSplitOperator.IsNumber(stock.Low)&&IFrameSplitOperator.IsNumber(stock.YClose)&&stock.YClose!=0)stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;}if(item[30])stock.ExtendData=item[30];//30=全局扩展数据
13234
13235
  if(item[32])stock.CloseLine=item[32];//32=收盘价线
13235
13236
  if(item[33])stock.KLine=item[33];//33=K线
13236
- //10个数值型 101-110
13237
- if(IFrameSplitOperator.IsNumber(item[101]))stock.ReserveNumber1=item[101];if(IFrameSplitOperator.IsNumber(item[102]))stock.ReserveNumber2=item[102];if(IFrameSplitOperator.IsNumber(item[103]))stock.ReserveNumber3=item[103];if(IFrameSplitOperator.IsNumber(item[104]))stock.ReserveNumber4=item[104];if(IFrameSplitOperator.IsNumber(item[105]))stock.ReserveNumber5=item[105];if(IFrameSplitOperator.IsNumber(item[106]))stock.ReserveNumber6=item[106];if(IFrameSplitOperator.IsNumber(item[107]))stock.ReserveNumber7=item[107];if(IFrameSplitOperator.IsNumber(item[108]))stock.ReserveNumber8=item[108];if(IFrameSplitOperator.IsNumber(item[109]))stock.ReserveNumber9=item[109];if(IFrameSplitOperator.IsNumber(item[110]))stock.ReserveNumber10=item[110];};this.AutoUpdate=function(waitTime)//waitTime 更新时间
13237
+ //10个数值型 101-199
13238
+ if(IFrameSplitOperator.IsNumber(item[101]))stock.ReserveNumber1=item[101];if(IFrameSplitOperator.IsNumber(item[102]))stock.ReserveNumber2=item[102];if(IFrameSplitOperator.IsNumber(item[103]))stock.ReserveNumber3=item[103];if(IFrameSplitOperator.IsNumber(item[104]))stock.ReserveNumber4=item[104];if(IFrameSplitOperator.IsNumber(item[105]))stock.ReserveNumber5=item[105];if(IFrameSplitOperator.IsNumber(item[106]))stock.ReserveNumber6=item[106];if(IFrameSplitOperator.IsNumber(item[107]))stock.ReserveNumber7=item[107];if(IFrameSplitOperator.IsNumber(item[108]))stock.ReserveNumber8=item[108];if(IFrameSplitOperator.IsNumber(item[109]))stock.ReserveNumber9=item[109];if(IFrameSplitOperator.IsNumber(item[110]))stock.ReserveNumber10=item[110];//10个字符型 201-299
13239
+ if(IFrameSplitOperator.IsString(item[201]))stock.ReserveString1=item[201];if(IFrameSplitOperator.IsString(item[202]))stock.ReserveString2=item[202];if(IFrameSplitOperator.IsString(item[203]))stock.ReserveString3=item[203];if(IFrameSplitOperator.IsString(item[204]))stock.ReserveString4=item[204];if(IFrameSplitOperator.IsString(item[205]))stock.ReserveString5=item[205];if(IFrameSplitOperator.IsString(item[206]))stock.ReserveString6=item[206];if(IFrameSplitOperator.IsString(item[207]))stock.ReserveString7=item[207];if(IFrameSplitOperator.IsString(item[208]))stock.ReserveString8=item[208];if(IFrameSplitOperator.IsString(item[209]))stock.ReserveString9=item[209];if(IFrameSplitOperator.IsString(item[210]))stock.ReserveString10=item[210];};this.AutoUpdate=function(waitTime)//waitTime 更新时间
13238
13240
  {this.CancelAutoUpdate();if(!this.IsAutoUpdate)return;var self=this;var marketStatus=2;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_TREPORT_MARKET_STATUS);if(event&&event.Callback){var sendData={MarketStatus:2};event.Callback(event,sendData,this);if(IFrameSplitOperator.IsNumber(sendData.MarketStatus))marketStatus=sendData.MarketStatus;}if(marketStatus==0||marketStatus==3)return;//闭市,盘后
13239
13241
  var frequency=this.AutoUpdateFrequency;if(marketStatus==1)//盘前
13240
13242
  {this.AutoUpdateTimer=setTimeout(function(){self.AutoUpdate();},frequency);}else if(marketStatus==2)//盘中
@@ -13309,13 +13311,11 @@ VOL_OUT_ID:26,//外盘
13309
13311
  NAME_EX_ID:27,//扩展名字
13310
13312
  CLOSE_LINE_ID:28,//收盘价线
13311
13313
  KLINE_ID:29,//K线
13312
- CUSTOM_STRING_TEXT_ID:100,//自定义字符串文本
13313
- CUSTOM_NUMBER_TEXT_ID:101,//自定义数值型
13314
- CUSTOM_DATETIME_TEXT_ID:102,//自定义日期类型
13315
- CUSTOM_ICON_ID:103,//自定义图标
13316
- //预留数值类型 10个
13317
- RESERVE_NUMBER1_ID:200,//ReserveNumber1:
13318
- RESERVE_NUMBER2_ID:201,RESERVE_NUMBER3_ID:203,RESERVE_NUMBER4_ID:204,RESERVE_NUMBER5_ID:205,RESERVE_NUMBER6_ID:206,RESERVE_NUMBER7_ID:207,RESERVE_NUMBER8_ID:208,RESERVE_NUMBER9_ID:209,RESERVE_NUMBER10_ID:210};var MAP_TREPORT_COLUMN_FIELD=new _map2.default([[TREPORT_COLUMN_ID.SYMBOL_ID,"Symbol"],[TREPORT_COLUMN_ID.NAME_ID,"Name"],[TREPORT_COLUMN_ID.PRICE_ID,"Price"],[TREPORT_COLUMN_ID.INCREASE_ID,"Increase"],[TREPORT_COLUMN_ID.UPDOWN_ID,"UpDown"],[TREPORT_COLUMN_ID.VOL_ID,"Vol"],[TREPORT_COLUMN_ID.BUY_PRICE_ID,"BuyPrice"],[TREPORT_COLUMN_ID.SELL_PRICE_ID,"SellPrice"],[TREPORT_COLUMN_ID.AMOUNT_ID,"Amount"],[TREPORT_COLUMN_ID.BUY_VOL_ID,"BuyVol"],[TREPORT_COLUMN_ID.SELL_VOL_ID,"SellVol"],[TREPORT_COLUMN_ID.YCLOSE_ID,"YClose"],[TREPORT_COLUMN_ID.OPEN_ID,"Open"],[TREPORT_COLUMN_ID.HIGH_ID,"High"],[TREPORT_COLUMN_ID.LOW_ID,"Low"],[TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],[TREPORT_COLUMN_ID.POSITION_ID,"Position"],[TREPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],[TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],[TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],[TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],[TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],[TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],[TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],[TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],[TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],[TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],[TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"]]);function ChartTReport(){this.Canvas;//画布
13314
+ //预留数值类型 10个 201-299
13315
+ RESERVE_NUMBER1_ID:201,//ReserveNumber1:
13316
+ RESERVE_NUMBER2_ID:202,RESERVE_NUMBER3_ID:203,RESERVE_NUMBER4_ID:204,RESERVE_NUMBER5_ID:205,RESERVE_NUMBER6_ID:206,RESERVE_NUMBER7_ID:207,RESERVE_NUMBER8_ID:208,RESERVE_NUMBER9_ID:209,RESERVE_NUMBER10_ID:210,//预留字符串类型 10个 301-399
13317
+ RESERVE_STRING1_ID:301,//ReserveString1:
13318
+ RESERVE_STRING2_ID:302,RESERVE_STRING3_ID:303,RESERVE_STRING4_ID:304,RESERVE_STRING5_ID:305,RESERVE_STRING6_ID:306,RESERVE_STRING7_ID:307,RESERVE_STRING8_ID:308,RESERVE_STRING9_ID:309,RESERVE_STRING10_ID:310};var MAP_TREPORT_COLUMN_FIELD=new _map2.default([[TREPORT_COLUMN_ID.SYMBOL_ID,"Symbol"],[TREPORT_COLUMN_ID.NAME_ID,"Name"],[TREPORT_COLUMN_ID.PRICE_ID,"Price"],[TREPORT_COLUMN_ID.INCREASE_ID,"Increase"],[TREPORT_COLUMN_ID.UPDOWN_ID,"UpDown"],[TREPORT_COLUMN_ID.VOL_ID,"Vol"],[TREPORT_COLUMN_ID.BUY_PRICE_ID,"BuyPrice"],[TREPORT_COLUMN_ID.SELL_PRICE_ID,"SellPrice"],[TREPORT_COLUMN_ID.AMOUNT_ID,"Amount"],[TREPORT_COLUMN_ID.BUY_VOL_ID,"BuyVol"],[TREPORT_COLUMN_ID.SELL_VOL_ID,"SellVol"],[TREPORT_COLUMN_ID.YCLOSE_ID,"YClose"],[TREPORT_COLUMN_ID.OPEN_ID,"Open"],[TREPORT_COLUMN_ID.HIGH_ID,"High"],[TREPORT_COLUMN_ID.LOW_ID,"Low"],[TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],[TREPORT_COLUMN_ID.POSITION_ID,"Position"],[TREPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],[TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],[TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],[TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],[TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],[TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],[TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],[TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],[TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],[TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],[TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],[TREPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],[TREPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],[TREPORT_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],[TREPORT_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],[TREPORT_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],[TREPORT_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],[TREPORT_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],[TREPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],[TREPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],[TREPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"]]);function ChartTReport(){this.Canvas;//画布
13319
13319
  this.ChartBorder;//边框信息
13320
13320
  this.ChartFrame;//框架画法
13321
13321
  this.Name;//名称
@@ -13354,7 +13354,7 @@ this.Column=//{ Type:列id, Title:标题, TextAlign:文字对齐方式, MaxText:
13354
13354
  if(IFrameSplitOperator.IsNumber(item.ColorType))colItem.ColorType=item.ColorType;//0=默认 1=(>0, =0, <0) 2=(>=0, <0)
13355
13355
  if(item.DefaultText)colItem.DefaultText=item.DefaultText;if(item.Sort==1)//1本地排序 2=远程排序
13356
13356
  {colItem.SortType=[1,2];//默认 降序 ，升序
13357
- if(IFrameSplitOperator.IsNonEmptyArray(item.SortType))colItem.SortType=item.SortType.slice();}this.Column.push(colItem);}};this.GetDefaultColunm=function(id){var DEFAULT_COLUMN=[{Type:TREPORT_COLUMN_ID.INDEX_ID,Title:"序号",TextAlign:"center",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Index,MaxText:"8888"},{Type:TREPORT_COLUMN_ID.SYMBOL_ID,Title:"代码",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Symbol,MaxText:"888888"},{Type:TREPORT_COLUMN_ID.NAME_ID,Title:"合约名称",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Name,MaxText:"AAAAAA-A-AAAA"},{Type:TREPORT_COLUMN_ID.INCREASE_ID,Title:"涨幅%",TextAlign:"right",Width:null,MaxText:"-888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.PRICE_ID,Title:"现价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.UPDOWN_ID,Title:"涨跌",TextAlign:"right",Width:null,MaxText:"-888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AMPLITUDE_ID,Title:"振幅%",TextAlign:"right",Width:null,MaxText:"888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.BUY_PRICE_ID,Title:"买价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.SELL_PRICE_ID,Title:"卖价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,Title:"均价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.OPEN_ID,Title:"今开",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.HIGH_ID,Title:"最高",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.LOW_ID,Title:"最低",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.YCLOSE_ID,Title:"昨收",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.POSITION_ID,Title:"持仓量",TextAlign:"right",Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0],TextColor:g_JSChartResource.TReport.FieldColor.Position},{Type:TREPORT_COLUMN_ID.VOL_ID,Title:"总量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AMOUNT_ID,Title:"总金额",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Amount,Width:null,MaxText:"8888.8擎",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.BUY_VOL_ID,Title:"买量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.SELL_VOL_ID,Title:"卖量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,Title:"数值1",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,Title:"数值2",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,Title:"数值3",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,Title:"数值4",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,Title:"数值5",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,Title:"数值6",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,Title:"数值7",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,Title:"数值8",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,Title:"数值9",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,Title:"数值10",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2}];for(var i=0;i<DEFAULT_COLUMN.length;++i){var item=DEFAULT_COLUMN[i];if(item.Type==id)return item;}return null;};this.Draw=function(){this.ShowSymbol=[];this.TooltipRect=[];this.RectSelectedRow=null;if(this.GlobalOption)this.GlobalOption.FlashBGCount=0;if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,this.RectClient.Right-this.RectClient.Left,this.RectClient.Bottom-this.RectClient.Top);//this.Canvas.stroke(); //调试用
13357
+ if(IFrameSplitOperator.IsNonEmptyArray(item.SortType))colItem.SortType=item.SortType.slice();}this.Column.push(colItem);}};this.GetDefaultColunm=function(id){var DEFAULT_COLUMN=[{Type:TREPORT_COLUMN_ID.INDEX_ID,Title:"序号",TextAlign:"center",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Index,MaxText:"8888"},{Type:TREPORT_COLUMN_ID.SYMBOL_ID,Title:"代码",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Symbol,MaxText:"888888"},{Type:TREPORT_COLUMN_ID.NAME_ID,Title:"合约名称",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Name,MaxText:"AAAAAA-A-AAAA"},{Type:TREPORT_COLUMN_ID.INCREASE_ID,Title:"涨幅%",TextAlign:"right",Width:null,MaxText:"-888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.PRICE_ID,Title:"现价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.UPDOWN_ID,Title:"涨跌",TextAlign:"right",Width:null,MaxText:"-888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AMPLITUDE_ID,Title:"振幅%",TextAlign:"right",Width:null,MaxText:"888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.BUY_PRICE_ID,Title:"买价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.SELL_PRICE_ID,Title:"卖价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,Title:"均价",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.OPEN_ID,Title:"今开",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.HIGH_ID,Title:"最高",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.LOW_ID,Title:"最低",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.YCLOSE_ID,Title:"昨收",TextAlign:"right",Width:null,MaxText:"88888.88",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.POSITION_ID,Title:"持仓量",TextAlign:"right",Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0],TextColor:g_JSChartResource.TReport.FieldColor.Position},{Type:TREPORT_COLUMN_ID.VOL_ID,Title:"总量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.AMOUNT_ID,Title:"总金额",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Amount,Width:null,MaxText:"8888.8擎",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.BUY_VOL_ID,Title:"买量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.SELL_VOL_ID,Title:"卖量",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Vol,Width:null,MaxText:"88888",Sort:1,SortType:[1,2,0]},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,Title:"数值1",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,Title:"数值2",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,Title:"数值3",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,Title:"数值4",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,Title:"数值5",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,Title:"数值6",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,Title:"数值7",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,Title:"数值8",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,Title:"数值9",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,Title:"数值10",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:TREPORT_COLUMN_ID.RESERVE_STRING1_ID,Title:"文字1",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING2_ID,Title:"文字2",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING3_ID,Title:"文字3",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING4_ID,Title:"文字4",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING5_ID,Title:"文字5",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING6_ID,Title:"文字6",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING7_ID,Title:"文字7",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING8_ID,Title:"文字8",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING9_ID,Title:"文字9",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:TREPORT_COLUMN_ID.RESERVE_STRING10_ID,Title:"文字10",TextAlign:"right",TextColor:g_JSChartResource.TReport.FieldColor.Text,MaxText:"擎擎擎擎擎擎"}];for(var i=0;i<DEFAULT_COLUMN.length;++i){var item=DEFAULT_COLUMN[i];if(item.Type==id)return item;}return null;};this.Draw=function(){this.ShowSymbol=[];this.TooltipRect=[];this.RectSelectedRow=null;if(this.GlobalOption)this.GlobalOption.FlashBGCount=0;if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,this.RectClient.Right-this.RectClient.Left,this.RectClient.Bottom-this.RectClient.Top);//this.Canvas.stroke(); //调试用
13358
13358
  this.Canvas.clip();this.DrawHeader();this.DrawBody();this.Canvas.restore();//this.DrawBorder();
13359
13359
  this.SizeChange=false;};//更新缓存变量
13360
13360
  this.UpdateCacheData=function(){this.RectClient.Left=this.ChartBorder.GetLeft();this.RectClient.Right=this.ChartBorder.GetRight();this.RectClient.Top=this.ChartBorder.GetTop();this.RectClient.Bottom=this.ChartBorder.GetBottom();};this.CalculateSize=function()//计算大小
@@ -13387,8 +13387,8 @@ case TREPORT_COLUMN_ID.BUY_VOL_ID://买量
13387
13387
  case TREPORT_COLUMN_ID.POSITION_ID://持仓量
13388
13388
  case TREPORT_COLUMN_ID.VOL_ID://成交量
13389
13389
  case TREPORT_COLUMN_ID.AMOUNT_ID://成交金额
13390
- var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.Type,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}//TODO: 不同类型的 格式化输出
13391
- drawInfo.Text=value.toFixed(column.FloatPrecision);};this.GetFlashBGData=function(drawInfo,exePriceData,columnType,cellType){if(!exePriceData.TData)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(columnType)){var item=data.Data.get(columnType);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
13390
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:this.FormatReserveString(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.Type,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}//TODO: 不同类型的 格式化输出
13391
+ drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var text=data[fieldName];if(!IFrameSplitOperator.IsString(text))return;drawInfo.Text=text;};this.GetFlashBGData=function(drawInfo,exePriceData,columnType,cellType){if(!exePriceData.TData)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(columnType)){var item=data.Data.get(columnType);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
13392
13392
  this.FormatVolString=function(value,languageID){if(!IFrameSplitOperator.IsNumber(value))return null;return IFrameSplitOperator.FormatVolString(value,languageID);};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawCell=function(drawInfo){var rtText=drawInfo.RectText;var yCenter=rtText.Top+rtText.Height/2;if(drawInfo.BGColor)//背景
13393
13393
  {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.FlashBGColor)//闪动背景
13394
13394
  {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.FlashBGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.BorderColor)//边框
@@ -13817,7 +13817,8 @@ chart.AddEventCallback({event:JSCHART_EVENT_ID.ON_KEYBOARD_MOUSEUP,callback:func
13817
13817
  {var strText=this.InputDOM.value;if(strText.length==0){this.Hide();//只有按了删除 才能隐藏
13818
13818
  return;}}if(code>=48&&code<=57||code>=65&&code<=90||code>=97&&code<=122||code==8){var strText=this.InputDOM.value;strText=strText.toUpperCase();this.Keyboard.JSChart.Search(strText);}};this.OnMouseDownTitle=function(e){var _this90=this;if(!this.DivDialog)return;var dragData={X:e.clientX,Y:e.clientY};dragData.YOffset=e.clientX-this.DivDialog.offsetLeft;dragData.XOffset=e.clientY-this.DivDialog.offsetTop;this.DragTitle=dragData;document.onmousemove=function(e){_this90.DocOnMouseMoveTitle(e);};document.onmouseup=function(e){_this90.DocOnMouseUpTitle(e);};};this.DocOnMouseMoveTitle=function(e){if(!this.DragTitle)return;var left=e.clientX-this.DragTitle.YOffset;var top=e.clientY-this.DragTitle.XOffset;var right=left+this.DivDialog.offsetWidth;var bottom=top+this.DivDialog.offsetHeight;if(right+5>=window.innerWidth)left=window.innerWidth-this.DivDialog.offsetWidth-5;if(bottom+5>=window.innerHeight)top=window.innerHeight-this.DivDialog.offsetHeight-5;this.DivDialog.style.left=left+'px';this.DivDialog.style.top=top+'px';if(e.preventDefault)e.preventDefault();};this.DocOnMouseUpTitle=function(e){this.DragTitle=null;this.onmousemove=null;this.onmouseup=null;};this.SetSymbolData=function(data){if(!this.Keyboard.JSChart)return false;this.Keyboard.JSChart.SetSymbolData(data);};this.Show=function(){if(!this.DivDialog)return;//显示在右下方
13819
13819
  var height=this.DivDialog.offsetHeight;var width=this.DivDialog.offsetWidth;var xRight=window.innerWidth-5;var ybottom=window.innerHeight-5;var x=xRight-width;var y=ybottom-height;this.DivDialog.style.visibility='visible';this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";};this.Hide=function(){if(!this.DivDialog)return;this.DivDialog.style.visibility='hidden';this.InputDOM.value="";this.Keyboard.JSChart.ClearSearch();if(this.ActiveDOM){if(this.ActiveDOM.focus)this.ActiveDOM.focus();//把焦点换回去
13820
- this.ActiveDOM=null;}};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.OnGlobalKeydown=function(event){if(!this.DivDialog)return;var code=event.keyCode;if(!this.IsShow()&&code>=48&&code<=57||code>=65&&code<=90||code>=97&&code<=122){this.Show();this.InputDOM.focus();if(event.target)this.ActiveDOM=event.target;}else if(code==27&&this.IsShow()){this.Hide();}};this.OnGlobalMouseDown=function(event){if(!this.DivDialog)return;if(this.DivDialog.style.display=='none')return;if(!this.DivDialog.contains(event.target)){this.Hide();}};this.OnChartMouseUp=function(event,data,chart){this.InputDOM.focus();};}JSPopKeyboard.GetOption=function(){var option={Type:'键盘精灵',//创建图形类型
13820
+ this.ActiveDOM=null;}};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.OnGlobalKeydown=function(event){if(!this.DivDialog)return;var code=event.keyCode;if(code==116)return;//F5不处理
13821
+ if(!this.IsShow()&&code>=48&&code<=57||code>=65&&code<=90||code>=97&&code<=122){this.Show();this.InputDOM.focus();if(this.InputDOM.value==""){this.InputDOM.value=event.key;event.preventDefault();}if(event.target)this.ActiveDOM=event.target;}else if(code==27&&this.IsShow()){this.Hide();}};this.OnGlobalMouseDown=function(event){if(!this.DivDialog)return;if(this.DivDialog.style.display=='none')return;if(!this.DivDialog.contains(event.target)){this.Hide();}};this.OnChartMouseUp=function(event,data,chart){this.InputDOM.focus();};}JSPopKeyboard.GetOption=function(){var option={Type:'键盘精灵',//创建图形类型
13821
13822
  Border://边框
13822
13823
  {Left:1,//左边间距
13823
13824
  Right:1,//右边间距
@@ -13910,7 +13911,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
13910
13911
  this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
13911
13912
  * 版本信息输出
13912
13913
  *
13913
- */var HQCHART_VERSION="1.1.14011";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
13914
+ */var HQCHART_VERSION="1.1.14015";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
13914
13915
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
13915
13916
  // BaseIndex:BaseIndex,
13916
13917
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14012",
3
+ "version": "1.1.14016",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.PopKeyboard.js CHANGED
@@ -260,10 +260,17 @@ function JSPopKeyboard()
260
260
  if (!this.DivDialog) return;
261
261
 
262
262
  var code=event.keyCode;
263
+ if (code==116) return; //F5不处理
264
+
263
265
  if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122))
264
266
  {
265
267
  this.Show();
266
268
  this.InputDOM.focus();
269
+ if (this.InputDOM.value=="")
270
+ {
271
+ this.InputDOM.value=event.key;
272
+ event.preventDefault();
273
+ }
267
274
  if (event.target) this.ActiveDOM=event.target;
268
275
  }
269
276
  else if (code==27 && this.IsShow())
package/src/jscommon/umychart.TReport.js CHANGED
@@ -878,7 +878,7 @@ function JSTReportChartContainer(uielement)
878
878
  if (item[32]) stock.CloseLine=item[32]; //32=收盘价线
879
879
  if (item[33]) stock.KLine=item[33]; //33=K线
880
880
 
881
- //10个数值型 101-110
881
+ //10个数值型 101-199
882
882
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
883
883
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
884
884
  if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
@@ -889,6 +889,19 @@ function JSTReportChartContainer(uielement)
889
889
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
890
890
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
891
891
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
892
+
893
+
894
+ //10个字符型 201-299
895
+ if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
896
+ if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
897
+ if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
898
+ if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
899
+ if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
900
+ if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
901
+ if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
902
+ if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
903
+ if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
904
+ if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
892
905
  }
893
906
 
894
907
 
@@ -1541,14 +1554,9 @@ var TREPORT_COLUMN_ID=
1541
1554
  CLOSE_LINE_ID:28, //收盘价线
1542
1555
  KLINE_ID:29, //K线
1543
1556
 
1544
- CUSTOM_STRING_TEXT_ID:100, //自定义字符串文本
1545
- CUSTOM_NUMBER_TEXT_ID:101, //自定义数值型
1546
- CUSTOM_DATETIME_TEXT_ID:102, //自定义日期类型
1547
- CUSTOM_ICON_ID:103, //自定义图标
1548
-
1549
- //预留数值类型 10个
1550
- RESERVE_NUMBER1_ID:200, //ReserveNumber1:
1551
- RESERVE_NUMBER2_ID:201,
1557
+ //预留数值类型 10个 201-299
1558
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
1559
+ RESERVE_NUMBER2_ID:202,
1552
1560
  RESERVE_NUMBER3_ID:203,
1553
1561
  RESERVE_NUMBER4_ID:204,
1554
1562
  RESERVE_NUMBER5_ID:205,
@@ -1557,6 +1565,18 @@ var TREPORT_COLUMN_ID=
1557
1565
  RESERVE_NUMBER8_ID:208,
1558
1566
  RESERVE_NUMBER9_ID:209,
1559
1567
  RESERVE_NUMBER10_ID:210,
1568
+
1569
+ //预留字符串类型 10个 301-399
1570
+ RESERVE_STRING1_ID:301, //ReserveString1:
1571
+ RESERVE_STRING2_ID:302,
1572
+ RESERVE_STRING3_ID:303,
1573
+ RESERVE_STRING4_ID:304,
1574
+ RESERVE_STRING5_ID:305,
1575
+ RESERVE_STRING6_ID:306,
1576
+ RESERVE_STRING7_ID:307,
1577
+ RESERVE_STRING8_ID:308,
1578
+ RESERVE_STRING9_ID:309,
1579
+ RESERVE_STRING10_ID:310,
1560
1580
  }
1561
1581
 
1562
1582
  var MAP_TREPORT_COLUMN_FIELD=new Map(
@@ -1590,6 +1610,18 @@ var MAP_TREPORT_COLUMN_FIELD=new Map(
1590
1610
  [TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
1591
1611
  [TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
1592
1612
  [TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
1613
+
1614
+
1615
+ [TREPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
1616
+ [TREPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
1617
+ [TREPORT_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],
1618
+ [TREPORT_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],
1619
+ [TREPORT_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],
1620
+ [TREPORT_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],
1621
+ [TREPORT_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],
1622
+ [TREPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
1623
+ [TREPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
1624
+ [TREPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
1593
1625
  ]);
1594
1626
 
1595
1627
 
@@ -1779,6 +1811,18 @@ function ChartTReport()
1779
1811
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1780
1812
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1781
1813
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1814
+
1815
+
1816
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1817
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1818
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING3_ID, Title:"文字3", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1819
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING4_ID, Title:"文字4", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1820
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING5_ID, Title:"文字5", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1821
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING6_ID, Title:"文字6", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1822
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING7_ID, Title:"文字7", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1823
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1824
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1825
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
1782
1826
  ];
1783
1827
 
1784
1828
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -2317,6 +2361,20 @@ function ChartTReport()
2317
2361
  this.FormatReserveNumber(column, data, drawInfo);
2318
2362
  break;
2319
2363
 
2364
+ case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:
2365
+ case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:
2366
+ case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:
2367
+ case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:
2368
+ case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:
2369
+ case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:
2370
+ case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:
2371
+ case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:
2372
+ case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:
2373
+ case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:
2374
+ this.FormatReserveString(column, data, drawInfo);
2375
+ break;
2376
+
2377
+
2320
2378
  default:
2321
2379
  drawInfo.Text=`-----`;
2322
2380
  }
@@ -2354,6 +2412,19 @@ function ChartTReport()
2354
2412
  drawInfo.Text=value.toFixed(column.FloatPrecision);
2355
2413
  }
2356
2414
 
2415
+ this.FormatReserveString=function(column, data, drawInfo)
2416
+ {
2417
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
2418
+
2419
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
2420
+ if (!fieldName) return;
2421
+
2422
+ var text=data[fieldName];
2423
+ if (!IFrameSplitOperator.IsString(text)) return;
2424
+
2425
+ drawInfo.Text=text;
2426
+ }
2427
+
2357
2428
  this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
2358
2429
  {
2359
2430
  if (!exePriceData.TData) return;
package/src/jscommon/umychart.report.js CHANGED
@@ -1502,7 +1502,7 @@ function JSReportChartContainer(uielement)
1502
1502
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
1503
1503
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
1504
1504
 
1505
- //10个数值型 101-110
1505
+ //10个数值型 101-199
1506
1506
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
1507
1507
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
1508
1508
  if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
@@ -1513,6 +1513,8 @@ function JSReportChartContainer(uielement)
1513
1513
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
1514
1514
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
1515
1515
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
1516
+
1517
+ //10个字符型 201-299
1516
1518
  }
1517
1519
 
1518
1520
 
@@ -4134,8 +4136,8 @@ var REPORT_COLUMN_ID=
4134
4136
 
4135
4137
 
4136
4138
  //预留数值类型 10个
4137
- RESERVE_NUMBER1_ID:200, //ReserveNumber1:
4138
- RESERVE_NUMBER2_ID:201,
4139
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
4140
+ RESERVE_NUMBER2_ID:202,
4139
4141
  RESERVE_NUMBER3_ID:203,
4140
4142
  RESERVE_NUMBER4_ID:204,
4141
4143
  RESERVE_NUMBER5_ID:205,
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -128512,7 +128512,7 @@ function JSReportChartContainer(uielement)
128512
128512
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
128513
128513
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
128514
128514
 
128515
- //10个数值型 101-110
128515
+ //10个数值型 101-199
128516
128516
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
128517
128517
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
128518
128518
  if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
@@ -128523,6 +128523,8 @@ function JSReportChartContainer(uielement)
128523
128523
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
128524
128524
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
128525
128525
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
128526
+
128527
+ //10个字符型 201-299
128526
128528
  }
128527
128529
 
128528
128530
 
@@ -131144,8 +131146,8 @@ var REPORT_COLUMN_ID=
131144
131146
 
131145
131147
 
131146
131148
  //预留数值类型 10个
131147
- RESERVE_NUMBER1_ID:200, //ReserveNumber1:
131148
- RESERVE_NUMBER2_ID:201,
131149
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
131150
+ RESERVE_NUMBER2_ID:202,
131149
131151
  RESERVE_NUMBER3_ID:203,
131150
131152
  RESERVE_NUMBER4_ID:204,
131151
131153
  RESERVE_NUMBER5_ID:205,
@@ -138939,7 +138941,7 @@ function ScrollBarBGChart()
138939
138941
 
138940
138942
 
138941
138943
 
138942
- var HQCHART_VERSION="1.1.14011";
138944
+ var HQCHART_VERSION="1.1.14015";
138943
138945
 
138944
138946
  function PrintHQChartVersion()
138945
138947
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14011";
8
+ var HQCHART_VERSION="1.1.14015";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -128556,7 +128556,7 @@ function JSReportChartContainer(uielement)
128556
128556
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
128557
128557
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
128558
128558
 
128559
- //10个数值型 101-110
128559
+ //10个数值型 101-199
128560
128560
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
128561
128561
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
128562
128562
  if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
@@ -128567,6 +128567,8 @@ function JSReportChartContainer(uielement)
128567
128567
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
128568
128568
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
128569
128569
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
128570
+
128571
+ //10个字符型 201-299
128570
128572
  }
128571
128573
 
128572
128574
 
@@ -131188,8 +131190,8 @@ var REPORT_COLUMN_ID=
131188
131190
 
131189
131191
 
131190
131192
  //预留数值类型 10个
131191
- RESERVE_NUMBER1_ID:200, //ReserveNumber1:
131192
- RESERVE_NUMBER2_ID:201,
131193
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
131194
+ RESERVE_NUMBER2_ID:202,
131193
131195
  RESERVE_NUMBER3_ID:203,
131194
131196
  RESERVE_NUMBER4_ID:204,
131195
131197
  RESERVE_NUMBER5_ID:205,
@@ -136522,7 +136524,7 @@ function JSTReportChartContainer(uielement)
136522
136524
  if (item[32]) stock.CloseLine=item[32]; //32=收盘价线
136523
136525
  if (item[33]) stock.KLine=item[33]; //33=K线
136524
136526
 
136525
- //10个数值型 101-110
136527
+ //10个数值型 101-199
136526
136528
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
136527
136529
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
136528
136530
  if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
@@ -136533,6 +136535,19 @@ function JSTReportChartContainer(uielement)
136533
136535
  if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
136534
136536
  if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
136535
136537
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
136538
+
136539
+
136540
+ //10个字符型 201-299
136541
+ if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
136542
+ if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
136543
+ if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
136544
+ if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
136545
+ if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
136546
+ if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
136547
+ if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
136548
+ if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
136549
+ if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
136550
+ if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
136536
136551
  }
136537
136552
 
136538
136553
 
@@ -137185,14 +137200,9 @@ var TREPORT_COLUMN_ID=
137185
137200
  CLOSE_LINE_ID:28, //收盘价线
137186
137201
  KLINE_ID:29, //K线
137187
137202
 
137188
- CUSTOM_STRING_TEXT_ID:100, //自定义字符串文本
137189
- CUSTOM_NUMBER_TEXT_ID:101, //自定义数值型
137190
- CUSTOM_DATETIME_TEXT_ID:102, //自定义日期类型
137191
- CUSTOM_ICON_ID:103, //自定义图标
137192
-
137193
- //预留数值类型 10个
137194
- RESERVE_NUMBER1_ID:200, //ReserveNumber1:
137195
- RESERVE_NUMBER2_ID:201,
137203
+ //预留数值类型 10个 201-299
137204
+ RESERVE_NUMBER1_ID:201, //ReserveNumber1:
137205
+ RESERVE_NUMBER2_ID:202,
137196
137206
  RESERVE_NUMBER3_ID:203,
137197
137207
  RESERVE_NUMBER4_ID:204,
137198
137208
  RESERVE_NUMBER5_ID:205,
@@ -137201,6 +137211,18 @@ var TREPORT_COLUMN_ID=
137201
137211
  RESERVE_NUMBER8_ID:208,
137202
137212
  RESERVE_NUMBER9_ID:209,
137203
137213
  RESERVE_NUMBER10_ID:210,
137214
+
137215
+ //预留字符串类型 10个 301-399
137216
+ RESERVE_STRING1_ID:301, //ReserveString1:
137217
+ RESERVE_STRING2_ID:302,
137218
+ RESERVE_STRING3_ID:303,
137219
+ RESERVE_STRING4_ID:304,
137220
+ RESERVE_STRING5_ID:305,
137221
+ RESERVE_STRING6_ID:306,
137222
+ RESERVE_STRING7_ID:307,
137223
+ RESERVE_STRING8_ID:308,
137224
+ RESERVE_STRING9_ID:309,
137225
+ RESERVE_STRING10_ID:310,
137204
137226
  }
137205
137227
 
137206
137228
  var MAP_TREPORT_COLUMN_FIELD=new Map(
@@ -137234,6 +137256,18 @@ var MAP_TREPORT_COLUMN_FIELD=new Map(
137234
137256
  [TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
137235
137257
  [TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
137236
137258
  [TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
137259
+
137260
+
137261
+ [TREPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
137262
+ [TREPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
137263
+ [TREPORT_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],
137264
+ [TREPORT_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],
137265
+ [TREPORT_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],
137266
+ [TREPORT_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],
137267
+ [TREPORT_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],
137268
+ [TREPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
137269
+ [TREPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
137270
+ [TREPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
137237
137271
  ]);
137238
137272
 
137239
137273
 
@@ -137423,6 +137457,18 @@ function ChartTReport()
137423
137457
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137424
137458
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137425
137459
  { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137460
+
137461
+
137462
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137463
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137464
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING3_ID, Title:"文字3", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137465
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING4_ID, Title:"文字4", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137466
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING5_ID, Title:"文字5", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137467
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING6_ID, Title:"文字6", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137468
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING7_ID, Title:"文字7", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137469
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137470
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137471
+ { Type:TREPORT_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
137426
137472
  ];
137427
137473
 
137428
137474
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -137961,6 +138007,20 @@ function ChartTReport()
137961
138007
  this.FormatReserveNumber(column, data, drawInfo);
137962
138008
  break;
137963
138009
 
138010
+ case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:
138011
+ case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:
138012
+ case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:
138013
+ case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:
138014
+ case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:
138015
+ case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:
138016
+ case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:
138017
+ case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:
138018
+ case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:
138019
+ case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:
138020
+ this.FormatReserveString(column, data, drawInfo);
138021
+ break;
138022
+
138023
+
137964
138024
  default:
137965
138025
  drawInfo.Text=`-----`;
137966
138026
  }
@@ -137998,6 +138058,19 @@ function ChartTReport()
137998
138058
  drawInfo.Text=value.toFixed(column.FloatPrecision);
137999
138059
  }
138000
138060
 
138061
+ this.FormatReserveString=function(column, data, drawInfo)
138062
+ {
138063
+ if (column.DefaultText) drawInfo.Text=column.DefaultText;
138064
+
138065
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
138066
+ if (!fieldName) return;
138067
+
138068
+ var text=data[fieldName];
138069
+ if (!IFrameSplitOperator.IsString(text)) return;
138070
+
138071
+ drawInfo.Text=text;
138072
+ }
138073
+
138001
138074
  this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
138002
138075
  {
138003
138076
  if (!exePriceData.TData) return;
@@ -143615,10 +143688,17 @@ function JSPopKeyboard()
143615
143688
  if (!this.DivDialog) return;
143616
143689
 
143617
143690
  var code=event.keyCode;
143691
+ if (code==116) return; //F5不处理
143692
+
143618
143693
  if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122))
143619
143694
  {
143620
143695
  this.Show();
143621
143696
  this.InputDOM.focus();
143697
+ if (this.InputDOM.value=="")
143698
+ {
143699
+ this.InputDOM.value=event.key;
143700
+ event.preventDefault();
143701
+ }
143622
143702
  if (event.target) this.ActiveDOM=event.target;
143623
143703
  }
143624
143704
  else if (code==27 && this.IsShow())
@@ -145492,7 +145572,7 @@ function HQChartScriptWorker()
145492
145572
 
145493
145573
 
145494
145574
 
145495
- var HQCHART_VERSION="1.1.14011";
145575
+ var HQCHART_VERSION="1.1.14015";
145496
145576
 
145497
145577
  function PrintHQChartVersion()
145498
145578
  {