hqchart 1.1.14796 → 1.1.14804

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 +19 -13
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.deal.js +1 -1
  4. package/src/jscommon/umychart.report.js +61 -30
  5. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +63 -32
  6. package/src/jscommon/umychart.version.js +1 -1
  7. package/src/jscommon/umychart.vue/umychart.vue.js +63 -32
package/lib/umychart.vue.js CHANGED
@@ -12921,7 +12921,7 @@ this.Draw();};this.SetLastPageDataOffset=function(){var chart=this.GetDealChart(
12921
12921
  this.RequestDealUpdateData=function(){var self=this;if(this.NetworkFilter){var obj={Name:'JSDealChartContainer::RequestDealUpdateData',//类名::函数名
12922
12922
  Explain:'增量成交明细',Request:{Data:{symbol:self.Symbol}},Self:this,PreventDefault:false};if(this.Data&&IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)){var lastItem=this.Data.Data[this.Data.Data.length-1];//最后一条数据
12923
12923
  obj.LastItem=lastItem;}this.NetworkFilter(obj,function(data){self.RecvDealUpdateData(data);self.AutoUpdate();});if(obj.PreventDefault==true)return;}};this.GetDealChart=function(){return this.ChartPaint[0];};this.RecvDealUpdateData=function(data){var aryDeal=JSDealChartContainer.JsonDataToDealData(data);if(!IFrameSplitOperator.IsNonEmptyArray(aryDeal))return;var chart=this.GetDealChart();if(!chart)return;if(data.UpdateType===1)//全量更新
12924
- {if(chart.ShowOrder===1){if(IFrameSplitOperator.IsNonEmptyArray(aryDeal))aryDeal=aryDeal.resource();this.SourceData.Data=aryDeal;this.Data.Data=this.FilterData(this.CloneArray(aryDeal));}else{this.SourceData.Data=aryDeal;var oldCount=0,newCount=0;if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))oldCount=this.Data.Data.length;this.Data.Data=this.FilterData(this.CloneArray(aryDeal));if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))newCount=this.Data.Data.length;if(oldCount==0){if(this.IsShowLastPage)this.SetLastPageDataOffset();//显示最后一屏
12924
+ {if(chart.ShowOrder===1){if(IFrameSplitOperator.IsNonEmptyArray(aryDeal))aryDeal=aryDeal.reverse();this.SourceData.Data=aryDeal;this.Data.Data=this.FilterData(this.CloneArray(aryDeal));}else{this.SourceData.Data=aryDeal;var oldCount=0,newCount=0;if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))oldCount=this.Data.Data.length;this.Data.Data=this.FilterData(this.CloneArray(aryDeal));if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))newCount=this.Data.Data.length;if(oldCount==0){if(this.IsShowLastPage)this.SetLastPageDataOffset();//显示最后一屏
12925
12925
  }else if(newCount>oldCount)//增长 偏移增加
12926
12926
  {var pageSize=chart.GetPageSize();var count=newCount-oldCount;for(var i=0;i<count;++i){if(this.Data.DataOffset+pageSize<this.Data.Data.length)++this.Data.DataOffset;}}else{if(this.Data.DataOffset>=this.Data.Data.length)this.Data.DataOffset=0;}}}else{this.AddDealData(this.SourceData,aryDeal);this.AddDealData(this.Data,this.FilterData(aryDeal));}if(data.IsShowLastPage===true)this.SetLastPageDataOffset();this.Draw();};this.AddDealData=function(dealData,aryNewData){var chart=this.GetDealChart();if(!chart)return;if(!dealData.Data)//原来是空的
12927
12927
  {if(chart.ShowOrder===1&&IFrameSplitOperator.IsNonEmptyArray(aryNewData))aryNewData=aryNewData.reverse();dealData.Data=aryNewData;}else{if(chart.ShowOrder===1){for(var i=0;i<aryNewData.length;++i){dealData.Data.unshift(aryNewData[i]);}}else{var pageSize=chart.GetPageSize();for(var i=0;i<aryNewData.length;++i){dealData.Data.push(aryNewData[i]);if(dealData.DataOffset+pageSize<dealData.Data.length)++dealData.DataOffset;}}}};this.AutoUpdate=function(waitTime)//waitTime 更新时间
@@ -13267,9 +13267,12 @@ var chart=this.ChartPaint[0];if(chart&&this.SortInfo.Sort==1&&IFrameSplitOperato
13267
13267
  }else{//更新的股票在当前页面,需要重绘
13268
13268
  var aryStock=chart.ShowSymbol;for(var i=0;i<aryStock.length;++i){if(setUpdateSymbol.has(aryStock[i].Symbol)){bUpdate=true;break;}}}if(bUpdate)this.Draw();};//读取单条股票json数据
13269
13269
  this.ReadStockJsonData=function(stock,item){//0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
13270
- //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值
13271
- //30=全局扩展数据 31=当前板块扩展数据 36=日期字段
13272
- //88=价格颜色类型
13270
+ //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
13271
+ //30=全局扩展数据 31=当前板块扩展数据
13272
+ //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
13273
+ //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
13274
+ //80=整行背景色
13275
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
13273
13276
  if(IFrameSplitOperator.IsString(item[1]))stock.Name=item[1];if(IFrameSplitOperator.IsNumber(item[2]))stock.YClose=item[2];if(IFrameSplitOperator.IsNumber(item[3]))stock.Open=item[3];if(IFrameSplitOperator.IsNumber(item[4]))stock.High=item[4];if(IFrameSplitOperator.IsNumber(item[5]))stock.Low=item[5];if(IFrameSplitOperator.IsNumber(item[6]))stock.Price=item[6];if(IFrameSplitOperator.IsNumber(item[7]))stock.Vol=item[7];if(IFrameSplitOperator.IsNumber(item[8]))stock.Amount=item[8];if(IFrameSplitOperator.IsNumber(item[9]))stock.BuyPrice=item[9];if(IFrameSplitOperator.IsNumber(item[10]))stock.BuyVol=item[10];if(IFrameSplitOperator.IsNumber(item[11]))stock.SellPrice=item[11];if(IFrameSplitOperator.IsNumber(item[12]))stock.SellVol=item[12];if(IFrameSplitOperator.IsNumber(item[13]))stock.AvPrice=item[13];//均价
13274
13277
  if(IFrameSplitOperator.IsNumber(item[14]))stock.OutShares=item[14];//流通股
13275
13278
  if(IFrameSplitOperator.IsNumber(item[15]))stock.TotalShares=item[15];//总股本
@@ -13304,9 +13307,10 @@ if(IFrameSplitOperator.IsNumber(item[40]))stock.YFClose=item[40];//昨结算价
13304
13307
  if(IFrameSplitOperator.IsNumber(item[41]))stock.OpenPosition=item[41];//开仓量
13305
13308
  if(IFrameSplitOperator.IsNumber(item[42]))stock.ClosePosition=item[42];//平仓量
13306
13309
  //1,3,5,10,15 涨速%
13307
- 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
13310
+ 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];if(item[80]||item[80]===null)stock.BGColor=item[80];//整行背景色
13311
+ //10个数值型 101-199
13308
13312
  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
13309
- 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];//10个进度条 301-350 { Value:, BGColor: }
13313
+ if(IFrameSplitOperator.IsString(item[201])||IFrameSplitOperator.IsObject(item[201]))stock.ReserveString1=item[201];if(IFrameSplitOperator.IsString(item[202])||IFrameSplitOperator.IsObject(item[202]))stock.ReserveString2=item[202];if(IFrameSplitOperator.IsString(item[203])||IFrameSplitOperator.IsObject(item[203]))stock.ReserveString3=item[203];if(IFrameSplitOperator.IsString(item[204])||IFrameSplitOperator.IsObject(item[204]))stock.ReserveString4=item[204];if(IFrameSplitOperator.IsString(item[205])||IFrameSplitOperator.IsObject(item[205]))stock.ReserveString5=item[205];if(IFrameSplitOperator.IsString(item[206])||IFrameSplitOperator.IsObject(item[206]))stock.ReserveString6=item[206];if(IFrameSplitOperator.IsString(item[207])||IFrameSplitOperator.IsObject(item[207]))stock.ReserveString7=item[207];if(IFrameSplitOperator.IsString(item[208])||IFrameSplitOperator.IsObject(item[208]))stock.ReserveString8=item[208];if(IFrameSplitOperator.IsString(item[209])||IFrameSplitOperator.IsObject(item[209]))stock.ReserveString9=item[209];if(IFrameSplitOperator.IsString(item[210])||IFrameSplitOperator.IsObject(item[210]))stock.ReserveString10=item[210];//10个进度条 301-350 { Value:, BGColor: }
13310
13314
  if(IFrameSplitOperator.IsNumber(item[301])||IFrameSplitOperator.IsObject(item[301]))stock.ReserveProgressBar1=item[301];if(IFrameSplitOperator.IsNumber(item[302])||IFrameSplitOperator.IsObject(item[302]))stock.ReserveProgressBar2=item[302];if(IFrameSplitOperator.IsNumber(item[303])||IFrameSplitOperator.IsObject(item[303]))stock.ReserveProgressBar3=item[303];if(IFrameSplitOperator.IsNumber(item[304])||IFrameSplitOperator.IsObject(item[304]))stock.ReserveProgressBar4=item[304];if(IFrameSplitOperator.IsNumber(item[305])||IFrameSplitOperator.IsObject(item[305]))stock.ReserveProgressBar5=item[305];if(IFrameSplitOperator.IsNumber(item[306])||IFrameSplitOperator.IsObject(item[306]))stock.ReserveProgressBar6=item[306];if(IFrameSplitOperator.IsNumber(item[307])||IFrameSplitOperator.IsObject(item[307]))stock.ReserveProgressBar7=item[307];if(IFrameSplitOperator.IsNumber(item[308])||IFrameSplitOperator.IsObject(item[308]))stock.ReserveProgressBar8=item[308];if(IFrameSplitOperator.IsNumber(item[309])||IFrameSplitOperator.IsObject(item[309]))stock.ReserveProgressBar9=item[309];if(IFrameSplitOperator.IsNumber(item[310])||IFrameSplitOperator.IsObject(item[310]))stock.ReserveProgressBar10=item[310];//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
13311
13315
  if(IFrameSplitOperator.IsObject(item[351]))stock.ReserveButton1=item[351];if(IFrameSplitOperator.IsObject(item[352]))stock.ReserveButton2=item[352];if(IFrameSplitOperator.IsObject(item[353]))stock.ReserveButton3=item[353];if(IFrameSplitOperator.IsObject(item[354]))stock.ReserveButton4=item[354];if(IFrameSplitOperator.IsObject(item[355]))stock.ReserveButton5=item[355];if(IFrameSplitOperator.IsObject(item[356]))stock.ReserveButton6=item[356];if(IFrameSplitOperator.IsObject(item[357]))stock.ReserveButton7=item[357];if(IFrameSplitOperator.IsObject(item[358]))stock.ReserveButton8=item[358];if(IFrameSplitOperator.IsObject(item[359]))stock.ReserveButton9=item[359];if(IFrameSplitOperator.IsObject(item[360]))stock.ReserveButton10=item[360];};this.GetSymbolNoSuffix=function(symbol){var index=symbol.lastIndexOf(".");if(index>0)return symbol.substring(0,index);else return symbol;};this.CancelAutoUpdate=function()//关闭停止更新
13312
13316
  {if(typeof this.AutoUpdateTimer=='number'){clearTimeout(this.AutoUpdateTimer);this.AutoUpdateTimer=null;}};this.AutoUpdate=function(waitTime)//waitTime 更新时间
@@ -13573,7 +13577,7 @@ this.ItemFontConfig={Size:g_JSChartResource.Report.Item.Font.Size,Name:g_JSChart
13573
13577
  this.SortConfig={Size:g_JSChartResource.Report.SortIcon.Size,Family:g_JSChartResource.Report.SortIcon.Family,Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),Color:g_JSChartResource.Report.SortIcon.Color.slice(),Margin:{Left:g_JSChartResource.Report.SortIcon.Margin.Left,Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom}};for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(item.Type==REPORT_COLUMN_ID.INDEX_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Index;else if(item.Type==REPORT_COLUMN_ID.SYMBOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Symbol;else if(item.Type==REPORT_COLUMN_ID.NAME_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Name;else if(item.Type==REPORT_COLUMN_ID.VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.BUY_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.SELL_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.AMOUNT_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Amount;else if(item.Type==REPORT_COLUMN_ID.VOL_IN_ID)item.TextColor=g_JSChartResource.Report.DownTextColor;else if(item.Type==REPORT_COLUMN_ID.VOL_OUT_ID)item.TextColor=g_JSChartResource.Report.UpTextColor;else item.TextColor=g_JSChartResource.Report.FieldColor.Text;}if(this.Tab)this.Tab.ReloadResource(resource);if(this.VScrollbar)this.VScrollbar.ReloadResource(resource);this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);this.LinkConfig=CloneData(g_JSChartResource.Report.Link);this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);};this.CreateColumnItem=function(item){var colItem=this.GetDefaultColunm(item.Type);if(!colItem)return null;if(item.Title)colItem.Title=item.Title;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTitle))colItem.AryTitle=item.AryTitle;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.HeaderColor)colItem.HeaderColor=item.HeaderColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.MaxText2)colItem.MaxText=item.MaxText2;if(IFrameSplitOperator.IsNumber(item.Space))colItem.Space=item.Space;if(item.ID)colItem.ID=item.ID;if(item.FullColBGColor)colItem.FullColBGColor=item.FullColBGColor;//整列背景色
13574
13578
  if(item.HeaderBGColor)colItem.HeaderBGColor=item.HeaderBGColor;//表头背景色
13575
13579
  if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;if(IFrameSplitOperator.IsBool(item.EnableDragWidth))colItem.EnableDragWidth=item.EnableDragWidth;colItem.IsDrawCallback=false;if(IFrameSplitOperator.IsBool(item.IsDrawCallback))colItem.IsDrawCallback=item.IsDrawCallback;if(IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent))colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;if(IFrameSplitOperator.IsNumber(item.FloatPrecision))colItem.FloatPrecision=item.FloatPrecision;//小数位数
13576
- if(IFrameSplitOperator.IsNumber(item.ColorType))colItem.ColorType=item.ColorType;//0=默认 1=(>0, =0, <0) 2=(>=0, <0)
13580
+ if(IFrameSplitOperator.IsNumber(item.ColorType))colItem.ColorType=item.ColorType;//0=默认 1=(>0, =0, <0) 2=(>=0, <0) 3=(>YClose =YClose <YClose)
13577
13581
  if(item.Icon)colItem.Icon=item.Icon;if(IFrameSplitOperator.IsBool(item.EnableChartTooltip))colItem.ChartTooltip={Enable:item.EnableChartTooltip,Type:20};if(item.ChartTooltip)colItem.ChartTooltip={Enable:item.ChartTooltip.Enable,Type:item.ChartTooltip.Type};//点击表头弹出菜单
13578
13582
  if(IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu))colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;if(item.Sort==1||item.Sort==2)//1本地排序 2=远程排序
13579
13583
  {colItem.SortType=[1,2];//默认 降序 ，升序
@@ -13594,6 +13598,7 @@ if(IFrameSplitOperator.IsNumber(item.ValueType))colItem.FormatType=item.ValueTyp
13594
13598
  }else if(item.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){if(!IFrameSplitOperator.IsNumber(item.DataIndex)&&!IFrameSplitOperator.IsNumber(item.BlockIndex))return null;if(IFrameSplitOperator.IsNumber(item.DataIndex))colItem.DataIndex=item.DataIndex;//数据在扩展数据索引列
13595
13599
  if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.CheckBox)colItem.CheckBox=CloneData(item.CheckBox);else colItem.CheckBox=this.CheckBoxConfig;}else if(item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID){if(!IFrameSplitOperator.IsNumber(item.DataIndex)&&!IFrameSplitOperator.IsNumber(item.BlockIndex))return null;if(IFrameSplitOperator.IsNumber(item.DataIndex))colItem.DataIndex=item.DataIndex;//数据在扩展数据索引列
13596
13600
  if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.Button)colItem.Button=CloneData(item.Button);else colItem.Button=this.ButtonConfig;}else if(this.IsReserveButtonColumn(item.Type)){if(item.Button)colItem.Button=CloneData(item.Button);else colItem.Button=this.ButtonConfig;}else if(this.IsReserveNumber(item.Type)){if(item.Format)colItem.Format=item.Format;//数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
13601
+ if(item.StringFormat)colItem.StringFormat=item.StringFormat;//"{0}%" 输出增加固定字符
13597
13602
  }else if(item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID){if(!IFrameSplitOperator.IsNumber(item.DataIndex)&&!IFrameSplitOperator.IsNumber(item.BlockIndex))return null;if(IFrameSplitOperator.IsNumber(item.DataIndex))colItem.DataIndex=item.DataIndex;//数据在扩展数据索引列
13598
13603
  if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.ProgressBar)colItem.ProgressBar=CloneData(item.ProgressBar);else colItem.ProgressBar=this.ProgressBarConfig;}else if(this.IsReserveProgressBarColumn(item.Type)){if(item.ProgressBar)colItem.ProgressBar=CloneData(item.ProgressBar);else colItem.ProgressBar=this.ProgressBarConfig;}else if(item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){if(!IFrameSplitOperator.IsNumber(item.DataIndex)&&!IFrameSplitOperator.IsNumber(item.BlockIndex))return null;if(IFrameSplitOperator.IsNumber(item.DataIndex))colItem.DataIndex=item.DataIndex;//数据在扩展数据索引列
13599
13604
  if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.Link)colItem.Link=CloneData(item.Link);else colItem.Link=this.LinkConfig;}else if(item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){}else if(item.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID){if(IFrameSplitOperator.IsBool(item.IsDrawArea))colItem.IsDrawArea=item.IsDrawArea;}else if(item.Type==REPORT_COLUMN_ID.TIME_ID){if(IFrameSplitOperator.IsNumber(item.ValueType))colItem.ValueType=item.ValueType;}else if(item.Type==REPORT_COLUMN_ID.DATE_ID){if(IFrameSplitOperator.IsNumber(item.FormatType))colItem.FormatType=item.FormatType;}else if(item.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNonEmptyArray(item.AryField))colItem.AryField=item.AryField.slice();}return colItem;};this.SetColumn=function(aryColumn){if(!IFrameSplitOperator.IsNonEmptyArray(aryColumn))return;this.Column=[];for(var i=0;i<aryColumn.length;++i){var item=aryColumn[i];var colItem=this.CreateColumnItem(item);if(!colItem)continue;this.Column.push(colItem);}};this.SwapColumn=function(leftIndex,rightIndex){if(!IFrameSplitOperator.IsNumber(leftIndex)||!IFrameSplitOperator.IsNumber(rightIndex))return false;var count=this.Column.length;if(leftIndex<0||leftIndex>=count)return false;if(rightIndex<0||rightIndex>=count)return false;if(leftIndex==rightIndex)return;var tempItem=this.Column[leftIndex];this.Column[leftIndex]=this.Column[rightIndex];this.Column[rightIndex]=tempItem;return true;};this.DeleteColumn=function(index){if(!IFrameSplitOperator.IsNonEmptyArray(this.Column))return false;if(index<0||index>=this.Column.length)return false;this.Column.splice(index,1);return true;};this.ChangeColumn=function(index,newColumn){if(index<0||index>=this.Column.length)return false;var colItem=this.CreateColumnItem(newColumn);if(!colItem)return false;this.Column[index]=colItem;return true;};this.GetXScrollPos=function(){return this.Data.XOffset;};this.GetXScrollRange=function(){var maxOffset=this.Column.length-this.FixedColumn-3;if(maxOffset<0)return 0;return maxOffset;};this.GetYScrollRange=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return 0;var dataCount=this.GetAllRowCount();var maxOffset=dataCount-this.RowCount;return maxOffset;};this.GetDefaultColunm=function(id){var DEFAULT_COLUMN=[{Type:REPORT_COLUMN_ID.INDEX_ID,Title:"序号",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Index,MaxText:"8888"},{Type:REPORT_COLUMN_ID.SYMBOL_ID,Title:"代码",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Symbol,MaxText:"888888"},{Type:REPORT_COLUMN_ID.NAME_ID,Title:"名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎0"},{Type:REPORT_COLUMN_ID.NAME_EX_ID,Title:"名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.SYMBOL_NAME_ID,Title:"股票名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎0"},{Type:REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID,Title:"名称/代码",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.NameSymbolV2.Name.Color,MaxText:"擎擎擎擎*",MaxText2:"999999",Space:5,TextColor2:g_JSChartResource.Report.NameSymbolV2.Symbol.Color},{Type:REPORT_COLUMN_ID.INCREASE_ID,Title:"涨幅%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.PRICE_ID,Title:"现价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.UPDOWN_ID,Title:"涨跌",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.AMPLITUDE_ID,Title:"振幅%",TextAlign:"right",Width:null,MaxText:"888.88"},{Type:REPORT_COLUMN_ID.BUY_PRICE_ID,Title:"买价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.SELL_PRICE_ID,Title:"卖价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.AVERAGE_PRICE_ID,Title:"均价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.OPEN_ID,Title:"今开",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.HIGH_ID,Title:"最高",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.LOW_ID,Title:"最低",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.YCLOSE_ID,Title:"昨收",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.VOL_ID,Title:"总量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.AMOUNT_ID,Title:"总金额",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Amount,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID,Title:"换手%",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"88.88擎"},{Type:REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID,Title:"流通股本",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.TOTAL_SHARES_ID,Title:"总股本",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID,Title:"流通市值",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.MARKET_VALUE_ID,Title:"总市值",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.VOL_IN_ID,Title:"内盘",TextAlign:"right",TextColor:g_JSChartResource.Report.DownTextColor,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.VOL_OUT_ID,Title:"外盘",TextAlign:"right",TextColor:g_JSChartResource.Report.UpTextColor,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.CLOSE_LINE_ID,Title:"走势",TextAlign:"center",TextColor:g_JSChartResource.Report.CloseLineColor,Width:null,MaxText:"88888.88888"},{Type:REPORT_COLUMN_ID.BUY_VOL_ID,Title:"买量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.SELL_VOL_ID,Title:"卖量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},//{ Type:REPORT_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
@@ -13627,10 +13632,11 @@ this.IsDrawSortBGIcon=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.So
13627
13632
  for(var i=0;i<this.RowCount;++i){var drawTop=ToFixedPoint(rowTop);this.Canvas.moveTo(left,drawTop);this.Canvas.lineTo(right,drawTop);rotBottom=rowTop;rowTop+=this.RowHeight;}//竖线
13628
13633
  var columnLeft=left;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];var drawLeft=ToFixedPoint(columnLeft+item.Width);this.Canvas.moveTo(drawLeft,top);this.Canvas.lineTo(drawLeft,rotBottom);columnLeft+=item.Width;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];var drawLeft=ToFixedPoint(columnLeft+item.Width);this.Canvas.moveTo(drawLeft,top);this.Canvas.lineTo(drawLeft,rotBottom);columnLeft+=item.Width;}this.Canvas.stroke();};//获取一共多少行
13629
13634
  this.GetAllRowCount=function(){var count=this.Data.Data.length;if(this.Data.Virtual&&this.Data.Virtual.Enable)count=this.Data.Virtual.Count;return count;};this.DrawBody=function(){if(!this.Data)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)&&!this.Data.Virtual.Enable)return;this.Canvas.font=this.ItemFont;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var rowWidth=this.RectClient.Right-this.RectClient.Left;var arySelectedRow=[];//固定行
13630
- var textTop=top;this.Canvas.font=this.ItemFixedFont;for(var i=0;i<this.FixedRowCount;++i){if(this.SelectedFixedRow==i){this.Canvas.fillStyle=this.SelectedColor;;this.Canvas.fillRect(left,textTop,rowWidth,this.FixedRowHeight);}if(this.FixedRowData.Type==1)this.DrawFixedSymbolRow(textTop,i);else this.DrawFixedRow(textTop,i);textTop+=this.FixedRowHeight;}textTop=top+this.FixedRowHeight*this.FixedRowCount;this.Canvas.font=this.ItemFont;var eventDrawBG=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_REPORT_ROW_BG);var selectedSymbol=this.GetSelectedSymbol();var setSelected;if(this.MultiSelectModel==1)setSelected=new _set2.default(this.MultiSelectedRow);var dataCount=this.GetAllRowCount();for(var i=this.Data.YOffset,j=0;i<dataCount&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var bFillRow=false;if(this.MultiSelectModel==1){if(setSelected.has(i))bFillRow=true;}else{if(this.SelectedModel==0){if(j==this.SelectedRow)bFillRow=true;//选中行
13635
+ var textTop=top;this.Canvas.font=this.ItemFixedFont;for(var i=0;i<this.FixedRowCount;++i){if(this.SelectedFixedRow==i){this.Canvas.fillStyle=this.SelectedColor;;this.Canvas.fillRect(left,textTop,rowWidth,this.FixedRowHeight);}if(this.FixedRowData.Type==1)this.DrawFixedSymbolRow(textTop,i);else this.DrawFixedRow(textTop,i);textTop+=this.FixedRowHeight;}textTop=top+this.FixedRowHeight*this.FixedRowCount;this.Canvas.font=this.ItemFont;var eventDrawBG=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_REPORT_ROW_BG);var selectedSymbol=this.GetSelectedSymbol();var setSelected;if(this.MultiSelectModel==1)setSelected=new _set2.default(this.MultiSelectedRow);var dataCount=this.GetAllRowCount();for(var i=this.Data.YOffset,j=0;i<dataCount&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRowBG={Left:left,Top:textTop,Width:rowWidth,Height:this.RowHeight};rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;var bFillRow=false;if(this.MultiSelectModel==1){if(setSelected.has(i))bFillRow=true;}else{if(this.SelectedModel==0){if(j==this.SelectedRow)bFillRow=true;//选中行
13631
13636
  }else{if(i==this.SelectedRow)bFillRow=true;//选中行
13632
- }}if(this.DragRow){if(this.DragRow.Data){var dataIndex=this.DragRow.Data.Row.DataIndex;if(dataIndex==i){this.Canvas.fillStyle=this.DragSrcRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);}}if(this.DragRow.MoveRow){var dataIndex=this.DragRow.MoveRow.Data.DataIndex;if(dataIndex==i){this.Canvas.fillStyle=this.DragMoveRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);}}bFillRow=false;}if(eventDrawBG&&eventDrawBG.Callback){//Out:{ BGColor: }
13633
- var sendData={RowIndex:i,Symbol:symbol,Out:null,Selected:selectedSymbol,MultiSelectModel:this.MultiSelectModel};eventDrawBG.Callback(eventDrawBG,sendData,this);if(sendData.Out&&sendData.Out.BGColor){this.Canvas.fillStyle=sendData.Out.BGColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);}}if(bFillRow){var rtRowBG={Left:left,Top:textTop,Width:rowWidth,Height:this.RowHeight};rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;this.AryFullSelectedRow.push(rtRowBG);if(this.SelectedStyle===1){this.Canvas.fillStyle=this.SelectedColor;this.Canvas.fillRect(rtRowBG.Left,rtRowBG.Top,rtRowBG.Width,rtRowBG.Height);}}this.DrawRow(symbol,textTop,i);this.ShowSymbol.push({Index:i,Symbol:symbol});textTop+=this.RowHeight;}};this.DrawSelectedRow=function(){if(this.SelectedStyle===2&&IFrameSplitOperator.IsNonEmptyArray(this.AryFullSelectedRow)){this.Canvas.fillStyle=this.SelectedLineConfig.Color;var lineWidth=this.SelectedLineConfig.Width;for(var i=0;i<this.AryFullSelectedRow.length;++i){var rtBG=this.AryFullSelectedRow[i];this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth);}}};this.GetSelectedSymbol=function(){if(this.MultiSelectModel==1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiSelectedRow))return null;var aryData=[];for(var i=0;i<this.MultiSelectedRow.length;++i){var item=this.Data.Data[this.MultiSelectedRow[i]];if(!item)continue;aryData.push(item);}return aryData;}else{if(this.SelectedRow<0)return null;var index=this.SelectedRow;if(this.SelectedModel==0)//当前屏选中
13637
+ }}if(this.DragRow){if(this.DragRow.Data){var dataIndex=this.DragRow.Data.Row.DataIndex;if(dataIndex==i){this.Canvas.fillStyle=this.DragSrcRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);}}if(this.DragRow.MoveRow){var dataIndex=this.DragRow.MoveRow.Data.DataIndex;if(dataIndex==i){this.Canvas.fillStyle=this.DragMoveRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);}}bFillRow=false;}this.DrawFullRowBGColor(symbol,eventDrawBG,i,rtRowBG,{Selected:selectedSymbol});if(bFillRow){this.AryFullSelectedRow.push(rtRowBG);if(this.SelectedStyle===1){this.Canvas.fillStyle=this.SelectedColor;this.Canvas.fillRect(rtRowBG.Left,rtRowBG.Top,rtRowBG.Width,rtRowBG.Height);}}this.DrawRow(symbol,textTop,i);this.ShowSymbol.push({Index:i,Symbol:symbol});textTop+=this.RowHeight;}};//绘制整行背景色
13638
+ this.DrawFullRowBGColor=function(symbol,event,index,rtBG,option){var data={Symbol:symbol,Stock:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(data.Stock&&data.Stock.BGColor){this.Canvas.fillStyle=data.Stock.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}if(event&&event.Callback){//Out:{ BGColor: }
13639
+ var sendData={RowIndex:index,Symbol:symbol,Out:null,MultiSelectModel:this.MultiSelectModel};if(option){if(option.Selected)sendData.Selected=option.Selected;}event.Callback(event,sendData,this);if(sendData.Out&&sendData.Out.BGColor){this.Canvas.fillStyle=sendData.Out.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}}};this.DrawSelectedRow=function(){if(this.SelectedStyle===2&&IFrameSplitOperator.IsNonEmptyArray(this.AryFullSelectedRow)){this.Canvas.fillStyle=this.SelectedLineConfig.Color;var lineWidth=this.SelectedLineConfig.Width;for(var i=0;i<this.AryFullSelectedRow.length;++i){var rtBG=this.AryFullSelectedRow[i];this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth);}}};this.GetSelectedSymbol=function(){if(this.MultiSelectModel==1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiSelectedRow))return null;var aryData=[];for(var i=0;i<this.MultiSelectedRow.length;++i){var item=this.Data.Data[this.MultiSelectedRow[i]];if(!item)continue;aryData.push(item);}return aryData;}else{if(this.SelectedRow<0)return null;var index=this.SelectedRow;if(this.SelectedModel==0)//当前屏选中
13634
13640
  index=this.Data.YOffset+this.SelectedRow;var symbol=this.Data.Data[index];return[symbol];}};//单行选中模式选中股票
13635
13641
  this.GetSelectedSingleSymbol=function(){if(this.MultiSelectModel==1)return null;//多选
13636
13642
  if(this.SelectedModel==0)return null;//当前屏选中
@@ -13655,9 +13661,9 @@ drawInfo.Tooltip={Type:1,Data:{AryText:[{Text:drawInfo.Text}]}};}this.Canvas.tex
13655
13661
  switch(column.FormatType){case 1:drawInfo.Text=value.toFixed(column.Decimal);break;case 2:drawInfo.Text=IFrameSplitOperator.FormatValueThousandsString(value,column.Decimal);break;case 3:drawInfo.Text=this.FormatVolString(value);break;default:drawInfo.Text=IFrameSplitOperator.FormatValueString(value,column.Decimal);break;}//颜色
13656
13662
  switch(column.ColorType){case 1:drawInfo.TextColor=this.GetUpDownColor(value,0);break;case 2:if(!IFrameSplitOperator.IsNumber(data.Stock.YClose))drawInfo.TextColor=this.UnchagneColor;else drawInfo.TextColor=this.GetUpDownColor(value,data.Stock.YClose);break;default:break;}};this.GetCustomDateTimeDrawInfo=function(data,column,drawInfo){var value=this.GetExtendData(data,column);if(!IFrameSplitOperator.IsNumber(value))return;if(column.ValueType==0){if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(value,"YYYY/MM/DD");else drawInfo.Text=IFrameSplitOperator.FormatDateString(value);}};this.GetCustomIconDrawInfo=function(data,column,drawInfo){if(column.IsDrawCallback)//外部处理输出格式
13657
13663
  {this.GetCustomIconData(column,data.Symbol,drawInfo,data);return;}};this.GetCustomCheckBoxDrawInfo=function(data,column,drawInfo){var checkData=this.GetExtendData(data,column);if(!checkData)return;if(!IFrameSplitOperator.IsBool(checkData.Checked))return;drawInfo.Checked=checkData.Checked;drawInfo.Enable=true;drawInfo.Data=checkData;if(IFrameSplitOperator.IsBool(checkData.DisableCheckBox))drawInfo.Enable=!checkData.DisableCheckBox;drawInfo.CheckBox=column.CheckBox;};this.GetCustomButtonDrawInfo=function(data,column,drawInfo){var buttonData=this.GetExtendData(data,column);if(!buttonData)return;drawInfo.Text=buttonData.Title;drawInfo.Button=column.Button;drawInfo.Font=column.Button.Font;drawInfo.Enable=true;drawInfo.Data=buttonData;if(IFrameSplitOperator.IsBool(buttonData.Enable))drawInfo.Enable=buttonData.Enable;};this.GetCustomProgressBarDrawInfo=function(data,column,drawInfo){var barData=this.GetExtendData(data,column);if(!barData)return;drawInfo.Text=barData.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=barData.Value;//占比
13658
- drawInfo.Data=barData;if(IFrameSplitOperator.IsBool(barData.Enable))drawInfo.Enable=barData.Enable;if(barData.TextColor)drawInfo.TextColor=barData.TextColor;if(barData.BarColor)drawInfo.BarColor=barData.BarColor;if(barData.BGColor)drawInfo.BGColor=barData.BGColor;};this.GetCustomLinkDrawInfo=function(data,column,drawInfo){var linkData=this.GetExtendData(data,column);if(!linkData)return;drawInfo.Text=linkData.Title;drawInfo.Link=column.Link;drawInfo.Enable=true;drawInfo.Data=linkData;drawInfo.MaxText=column.MaxText;if(IFrameSplitOperator.IsBool(linkData.Enable))drawInfo.Enable=linkData.Enable;if(linkData.TextColor)drawInfo.TextColor=linkData.TextColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!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);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
13664
+ drawInfo.Data=barData;if(IFrameSplitOperator.IsBool(barData.Enable))drawInfo.Enable=barData.Enable;if(barData.TextColor)drawInfo.TextColor=barData.TextColor;if(barData.BarColor)drawInfo.BarColor=barData.BarColor;if(barData.BGColor)drawInfo.BGColor=barData.BGColor;};this.GetCustomLinkDrawInfo=function(data,column,drawInfo){var linkData=this.GetExtendData(data,column);if(!linkData)return;drawInfo.Text=linkData.Title;drawInfo.Link=column.Link;drawInfo.Enable=true;drawInfo.Data=linkData;drawInfo.MaxText=column.MaxText;if(IFrameSplitOperator.IsBool(linkData.Enable))drawInfo.Enable=linkData.Enable;if(linkData.TextColor)drawInfo.TextColor=linkData.TextColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!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);}else if(column.ColorType==3){drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
13659
13665
  text=value.toFixed(column.FloatPrecision);break;case 2://千分位分割
13660
- text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.FormatReserveProgressBar=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsNumber(item)){drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item;//占比
13666
+ text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}if(column.StringFormat&&text){text=column.StringFormat.replace("{0}",text);}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.FormatReserveProgressBar=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsNumber(item)){drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item;//占比
13661
13667
  drawInfo.Data={Value:item};}else if(IFrameSplitOperator.IsObject(item)){if(item.Title)drawInfo.Text=item.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item.Value;//占比
13662
13668
  drawInfo.Data=item;if(IFrameSplitOperator.IsBool(item.Enable))drawInfo.Enable=item.Enable;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BarColor)drawInfo.BarColor=item.BarColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}};this.FormatReserveButton=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(!item)return;drawInfo.Text=item.Title;drawInfo.Button=column.Button;drawInfo.Font=column.Button.Font;drawInfo.Enable=true;drawInfo.Data=item;if(IFrameSplitOperator.IsBool(item.Enable))drawInfo.Enable=item.Enable;};this.FormaTimeDrawInfo=function(column,stock,drawInfo,data){if(!IFrameSplitOperator.IsNumber(stock.Time))return;if(column.ValueType==0)//0=hhmm 1=hhmmss 2=hhmmss.fff
13663
13669
  {drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM");}else if(column.ValueType==1){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS");}else if(column.ValueType==2){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS.fff");}};this.FormaDateDrawInfo=function(column,stock,drawInfo,data){if(!IFrameSplitOperator.IsNumber(stock.Date))return;if(column.FormatType==0)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");else if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");else if(column.FormatType==2)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");else if(column.FormatType==3)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");};//自定义图标
@@ -15024,7 +15030,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
15024
15030
  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);};}/********************************************************************************
15025
15031
  * 版本信息输出
15026
15032
  *
15027
- */var HQCHART_VERSION="1.1.14794";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();//把给外界调用的方法暴露出来
15033
+ */var HQCHART_VERSION="1.1.14803";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();//把给外界调用的方法暴露出来
15028
15034
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
15029
15035
  // BaseIndex:BaseIndex,
15030
15036
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14796",
3
+ "version": "1.1.14804",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.deal.js CHANGED
@@ -692,7 +692,7 @@ function JSDealChartContainer(uielement)
692
692
  if (chart.ShowOrder===1)
693
693
  {
694
694
  if (IFrameSplitOperator.IsNonEmptyArray(aryDeal))
695
- aryDeal=aryDeal.resource();
695
+ aryDeal=aryDeal.reverse();
696
696
 
697
697
  this.SourceData.Data=aryDeal;
698
698
  this.Data.Data=this.FilterData(this.CloneArray(aryDeal));
package/src/jscommon/umychart.report.js CHANGED
@@ -1628,10 +1628,12 @@ function JSReportChartContainer(uielement)
1628
1628
  this.ReadStockJsonData=function(stock, item)
1629
1629
  {
1630
1630
  //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
1631
- //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值
1632
- //30=全局扩展数据 31=当前板块扩展数据 36=日期字段
1633
-
1634
- //88=价格颜色类型
1631
+ //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
1632
+ //30=全局扩展数据 31=当前板块扩展数据
1633
+ //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
1634
+ //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
1635
+ //80=整行背景色
1636
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
1635
1637
 
1636
1638
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
1637
1639
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -1728,6 +1730,8 @@ function JSReportChartContainer(uielement)
1728
1730
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
1729
1731
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
1730
1732
 
1733
+ if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
1734
+
1731
1735
  //10个数值型 101-199
1732
1736
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
1733
1737
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
@@ -1741,16 +1745,16 @@ function JSReportChartContainer(uielement)
1741
1745
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
1742
1746
 
1743
1747
  //10个字符型 201-299
1744
- if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
1745
- if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
1746
- if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
1747
- if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
1748
- if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
1749
- if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
1750
- if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
1751
- if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
1752
- if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
1753
- if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
1748
+ if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
1749
+ if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
1750
+ if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
1751
+ if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
1752
+ if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
1753
+ if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
1754
+ if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
1755
+ if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
1756
+ if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
1757
+ if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
1754
1758
 
1755
1759
  //10个进度条 301-350 { Value:, BGColor: }
1756
1760
  if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
@@ -5044,7 +5048,7 @@ function ChartReport()
5044
5048
  if (IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent)) colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;
5045
5049
 
5046
5050
  if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
5047
- if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
5051
+ if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0) 3=(>YClose =YClose <YClose)
5048
5052
  if (item.Icon) colItem.Icon=item.Icon;
5049
5053
  if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.ChartTooltip={ Enable:item.EnableChartTooltip, Type:20 };
5050
5054
  if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };
@@ -5113,6 +5117,7 @@ function ChartReport()
5113
5117
  else if (this.IsReserveNumber(item.Type))
5114
5118
  {
5115
5119
  if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
5120
+ if (item.StringFormat) colItem.StringFormat=item.StringFormat; //"{0}%" 输出增加固定字符
5116
5121
  }
5117
5122
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
5118
5123
  {
@@ -6001,6 +6006,9 @@ function ChartReport()
6001
6006
  for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
6002
6007
  {
6003
6008
  var symbol=this.Data.Data[i];
6009
+ var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
6010
+ rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
6011
+ rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
6004
6012
 
6005
6013
  var bFillRow=false;
6006
6014
  if (this.MultiSelectModel==1)
@@ -6045,23 +6053,10 @@ function ChartReport()
6045
6053
  bFillRow=false;
6046
6054
  }
6047
6055
 
6048
- if (eventDrawBG && eventDrawBG.Callback)
6049
- {
6050
- //Out:{ BGColor: }
6051
- var sendData={ RowIndex:i, Symbol:symbol, Out:null, Selected:selectedSymbol, MultiSelectModel:this.MultiSelectModel };
6052
- eventDrawBG.Callback(eventDrawBG,sendData,this);
6053
- if (sendData.Out && sendData.Out.BGColor)
6054
- {
6055
- this.Canvas.fillStyle=sendData.Out.BGColor;
6056
- this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);
6057
- }
6058
- }
6056
+ this.DrawFullRowBGColor(symbol, eventDrawBG, i, rtRowBG, { Selected:selectedSymbol } );
6059
6057
 
6060
6058
  if (bFillRow)
6061
6059
  {
6062
- var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
6063
- rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
6064
- rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
6065
6060
  this.AryFullSelectedRow.push(rtRowBG);
6066
6061
 
6067
6062
  if (this.SelectedStyle===1)
@@ -6077,8 +6072,35 @@ function ChartReport()
6077
6072
 
6078
6073
  textTop+=this.RowHeight;
6079
6074
  }
6075
+ }
6076
+
6077
+ //绘制整行背景色
6078
+ this.DrawFullRowBGColor=function(symbol, event, index, rtBG, option)
6079
+ {
6080
+ var data= { Symbol:symbol , Stock:null };
6081
+ if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
6082
+ if (data.Stock && data.Stock.BGColor)
6083
+ {
6084
+ this.Canvas.fillStyle=data.Stock.BGColor;
6085
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
6086
+ }
6080
6087
 
6081
-
6088
+ if (event && event.Callback)
6089
+ {
6090
+ //Out:{ BGColor: }
6091
+ var sendData={ RowIndex:index, Symbol:symbol, Out:null, MultiSelectModel:this.MultiSelectModel };
6092
+ if (option)
6093
+ {
6094
+ if (option.Selected) sendData.Selected=option.Selected;
6095
+ }
6096
+
6097
+ event.Callback(event,sendData,this);
6098
+ if (sendData.Out && sendData.Out.BGColor)
6099
+ {
6100
+ this.Canvas.fillStyle=sendData.Out.BGColor;
6101
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
6102
+ }
6103
+ }
6082
6104
  }
6083
6105
 
6084
6106
  this.DrawSelectedRow=function()
@@ -7181,6 +7203,10 @@ function ChartReport()
7181
7203
  {
7182
7204
  drawInfo.TextColor=this.GetUpDownColorV2(value,0);
7183
7205
  }
7206
+ else if (column.ColorType==3)
7207
+ {
7208
+ drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
7209
+ }
7184
7210
  }
7185
7211
 
7186
7212
  var text=value.toFixed(column.FloatPrecision);
@@ -7202,6 +7228,11 @@ function ChartReport()
7202
7228
  break;
7203
7229
  }
7204
7230
  }
7231
+
7232
+ if (column.StringFormat && text)
7233
+ {
7234
+ text=column.StringFormat.replace("{0}", text);
7235
+ }
7205
7236
 
7206
7237
  drawInfo.Text=text;
7207
7238
  }
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -134505,7 +134505,7 @@ function JSDealChartContainer(uielement)
134505
134505
  if (chart.ShowOrder===1)
134506
134506
  {
134507
134507
  if (IFrameSplitOperator.IsNonEmptyArray(aryDeal))
134508
- aryDeal=aryDeal.resource();
134508
+ aryDeal=aryDeal.reverse();
134509
134509
 
134510
134510
  this.SourceData.Data=aryDeal;
134511
134511
  this.Data.Data=this.FilterData(this.CloneArray(aryDeal));
@@ -137738,10 +137738,12 @@ function JSReportChartContainer(uielement)
137738
137738
  this.ReadStockJsonData=function(stock, item)
137739
137739
  {
137740
137740
  //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
137741
- //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值
137742
- //30=全局扩展数据 31=当前板块扩展数据 36=日期字段
137743
-
137744
- //88=价格颜色类型
137741
+ //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
137742
+ //30=全局扩展数据 31=当前板块扩展数据
137743
+ //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
137744
+ //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
137745
+ //80=整行背景色
137746
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
137745
137747
 
137746
137748
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
137747
137749
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -137838,6 +137840,8 @@ function JSReportChartContainer(uielement)
137838
137840
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
137839
137841
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
137840
137842
 
137843
+ if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
137844
+
137841
137845
  //10个数值型 101-199
137842
137846
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
137843
137847
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
@@ -137851,16 +137855,16 @@ function JSReportChartContainer(uielement)
137851
137855
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
137852
137856
 
137853
137857
  //10个字符型 201-299
137854
- if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
137855
- if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
137856
- if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
137857
- if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
137858
- if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
137859
- if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
137860
- if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
137861
- if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
137862
- if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
137863
- if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
137858
+ if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
137859
+ if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
137860
+ if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
137861
+ if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
137862
+ if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
137863
+ if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
137864
+ if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
137865
+ if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
137866
+ if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
137867
+ if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
137864
137868
 
137865
137869
  //10个进度条 301-350 { Value:, BGColor: }
137866
137870
  if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
@@ -141154,7 +141158,7 @@ function ChartReport()
141154
141158
  if (IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent)) colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;
141155
141159
 
141156
141160
  if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
141157
- if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
141161
+ if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0) 3=(>YClose =YClose <YClose)
141158
141162
  if (item.Icon) colItem.Icon=item.Icon;
141159
141163
  if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.ChartTooltip={ Enable:item.EnableChartTooltip, Type:20 };
141160
141164
  if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };
@@ -141223,6 +141227,7 @@ function ChartReport()
141223
141227
  else if (this.IsReserveNumber(item.Type))
141224
141228
  {
141225
141229
  if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
141230
+ if (item.StringFormat) colItem.StringFormat=item.StringFormat; //"{0}%" 输出增加固定字符
141226
141231
  }
141227
141232
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
141228
141233
  {
@@ -142111,6 +142116,9 @@ function ChartReport()
142111
142116
  for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
142112
142117
  {
142113
142118
  var symbol=this.Data.Data[i];
142119
+ var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
142120
+ rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
142121
+ rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
142114
142122
 
142115
142123
  var bFillRow=false;
142116
142124
  if (this.MultiSelectModel==1)
@@ -142155,23 +142163,10 @@ function ChartReport()
142155
142163
  bFillRow=false;
142156
142164
  }
142157
142165
 
142158
- if (eventDrawBG && eventDrawBG.Callback)
142159
- {
142160
- //Out:{ BGColor: }
142161
- var sendData={ RowIndex:i, Symbol:symbol, Out:null, Selected:selectedSymbol, MultiSelectModel:this.MultiSelectModel };
142162
- eventDrawBG.Callback(eventDrawBG,sendData,this);
142163
- if (sendData.Out && sendData.Out.BGColor)
142164
- {
142165
- this.Canvas.fillStyle=sendData.Out.BGColor;
142166
- this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);
142167
- }
142168
- }
142166
+ this.DrawFullRowBGColor(symbol, eventDrawBG, i, rtRowBG, { Selected:selectedSymbol } );
142169
142167
 
142170
142168
  if (bFillRow)
142171
142169
  {
142172
- var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
142173
- rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
142174
- rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
142175
142170
  this.AryFullSelectedRow.push(rtRowBG);
142176
142171
 
142177
142172
  if (this.SelectedStyle===1)
@@ -142187,8 +142182,35 @@ function ChartReport()
142187
142182
 
142188
142183
  textTop+=this.RowHeight;
142189
142184
  }
142185
+ }
142186
+
142187
+ //绘制整行背景色
142188
+ this.DrawFullRowBGColor=function(symbol, event, index, rtBG, option)
142189
+ {
142190
+ var data= { Symbol:symbol , Stock:null };
142191
+ if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
142192
+ if (data.Stock && data.Stock.BGColor)
142193
+ {
142194
+ this.Canvas.fillStyle=data.Stock.BGColor;
142195
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
142196
+ }
142190
142197
 
142191
-
142198
+ if (event && event.Callback)
142199
+ {
142200
+ //Out:{ BGColor: }
142201
+ var sendData={ RowIndex:index, Symbol:symbol, Out:null, MultiSelectModel:this.MultiSelectModel };
142202
+ if (option)
142203
+ {
142204
+ if (option.Selected) sendData.Selected=option.Selected;
142205
+ }
142206
+
142207
+ event.Callback(event,sendData,this);
142208
+ if (sendData.Out && sendData.Out.BGColor)
142209
+ {
142210
+ this.Canvas.fillStyle=sendData.Out.BGColor;
142211
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
142212
+ }
142213
+ }
142192
142214
  }
142193
142215
 
142194
142216
  this.DrawSelectedRow=function()
@@ -143291,6 +143313,10 @@ function ChartReport()
143291
143313
  {
143292
143314
  drawInfo.TextColor=this.GetUpDownColorV2(value,0);
143293
143315
  }
143316
+ else if (column.ColorType==3)
143317
+ {
143318
+ drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
143319
+ }
143294
143320
  }
143295
143321
 
143296
143322
  var text=value.toFixed(column.FloatPrecision);
@@ -143312,6 +143338,11 @@ function ChartReport()
143312
143338
  break;
143313
143339
  }
143314
143340
  }
143341
+
143342
+ if (column.StringFormat && text)
143343
+ {
143344
+ text=column.StringFormat.replace("{0}", text);
143345
+ }
143315
143346
 
143316
143347
  drawInfo.Text=text;
143317
143348
  }
@@ -149193,7 +149224,7 @@ function ScrollBarBGChart()
149193
149224
 
149194
149225
 
149195
149226
 
149196
- var HQCHART_VERSION="1.1.14794";
149227
+ var HQCHART_VERSION="1.1.14803";
149197
149228
 
149198
149229
  function PrintHQChartVersion()
149199
149230
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14794";
8
+ var HQCHART_VERSION="1.1.14803";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -134549,7 +134549,7 @@ function JSDealChartContainer(uielement)
134549
134549
  if (chart.ShowOrder===1)
134550
134550
  {
134551
134551
  if (IFrameSplitOperator.IsNonEmptyArray(aryDeal))
134552
- aryDeal=aryDeal.resource();
134552
+ aryDeal=aryDeal.reverse();
134553
134553
 
134554
134554
  this.SourceData.Data=aryDeal;
134555
134555
  this.Data.Data=this.FilterData(this.CloneArray(aryDeal));
@@ -137782,10 +137782,12 @@ function JSReportChartContainer(uielement)
137782
137782
  this.ReadStockJsonData=function(stock, item)
137783
137783
  {
137784
137784
  //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
137785
- //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值
137786
- //30=全局扩展数据 31=当前板块扩展数据 36=日期字段
137787
-
137788
- //88=价格颜色类型
137785
+ //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
137786
+ //30=全局扩展数据 31=当前板块扩展数据
137787
+ //32=收盘价线 33=K线 35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
137788
+ //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
137789
+ //80=整行背景色
137790
+ //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮
137789
137791
 
137790
137792
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
137791
137793
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -137882,6 +137884,8 @@ function JSReportChartContainer(uielement)
137882
137884
  if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46];
137883
137885
  if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47];
137884
137886
 
137887
+ if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
137888
+
137885
137889
  //10个数值型 101-199
137886
137890
  if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
137887
137891
  if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
@@ -137895,16 +137899,16 @@ function JSReportChartContainer(uielement)
137895
137899
  if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
137896
137900
 
137897
137901
  //10个字符型 201-299
137898
- if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
137899
- if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
137900
- if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
137901
- if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
137902
- if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
137903
- if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
137904
- if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
137905
- if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
137906
- if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
137907
- if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
137902
+ if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
137903
+ if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
137904
+ if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
137905
+ if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
137906
+ if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
137907
+ if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
137908
+ if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
137909
+ if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
137910
+ if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
137911
+ if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
137908
137912
 
137909
137913
  //10个进度条 301-350 { Value:, BGColor: }
137910
137914
  if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
@@ -141198,7 +141202,7 @@ function ChartReport()
141198
141202
  if (IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent)) colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;
141199
141203
 
141200
141204
  if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
141201
- if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
141205
+ if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0) 3=(>YClose =YClose <YClose)
141202
141206
  if (item.Icon) colItem.Icon=item.Icon;
141203
141207
  if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.ChartTooltip={ Enable:item.EnableChartTooltip, Type:20 };
141204
141208
  if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };
@@ -141267,6 +141271,7 @@ function ChartReport()
141267
141271
  else if (this.IsReserveNumber(item.Type))
141268
141272
  {
141269
141273
  if (item.Format) colItem.Format=item.Format; //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
141274
+ if (item.StringFormat) colItem.StringFormat=item.StringFormat; //"{0}%" 输出增加固定字符
141270
141275
  }
141271
141276
  else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
141272
141277
  {
@@ -142155,6 +142160,9 @@ function ChartReport()
142155
142160
  for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
142156
142161
  {
142157
142162
  var symbol=this.Data.Data[i];
142163
+ var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
142164
+ rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
142165
+ rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
142158
142166
 
142159
142167
  var bFillRow=false;
142160
142168
  if (this.MultiSelectModel==1)
@@ -142199,23 +142207,10 @@ function ChartReport()
142199
142207
  bFillRow=false;
142200
142208
  }
142201
142209
 
142202
- if (eventDrawBG && eventDrawBG.Callback)
142203
- {
142204
- //Out:{ BGColor: }
142205
- var sendData={ RowIndex:i, Symbol:symbol, Out:null, Selected:selectedSymbol, MultiSelectModel:this.MultiSelectModel };
142206
- eventDrawBG.Callback(eventDrawBG,sendData,this);
142207
- if (sendData.Out && sendData.Out.BGColor)
142208
- {
142209
- this.Canvas.fillStyle=sendData.Out.BGColor;
142210
- this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);
142211
- }
142212
- }
142210
+ this.DrawFullRowBGColor(symbol, eventDrawBG, i, rtRowBG, { Selected:selectedSymbol } );
142213
142211
 
142214
142212
  if (bFillRow)
142215
142213
  {
142216
- var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
142217
- rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
142218
- rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
142219
142214
  this.AryFullSelectedRow.push(rtRowBG);
142220
142215
 
142221
142216
  if (this.SelectedStyle===1)
@@ -142231,8 +142226,35 @@ function ChartReport()
142231
142226
 
142232
142227
  textTop+=this.RowHeight;
142233
142228
  }
142229
+ }
142234
142230
 
142235
-
142231
+ //绘制整行背景色
142232
+ this.DrawFullRowBGColor=function(symbol, event, index, rtBG, option)
142233
+ {
142234
+ var data= { Symbol:symbol , Stock:null };
142235
+ if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
142236
+ if (data.Stock && data.Stock.BGColor)
142237
+ {
142238
+ this.Canvas.fillStyle=data.Stock.BGColor;
142239
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
142240
+ }
142241
+
142242
+ if (event && event.Callback)
142243
+ {
142244
+ //Out:{ BGColor: }
142245
+ var sendData={ RowIndex:index, Symbol:symbol, Out:null, MultiSelectModel:this.MultiSelectModel };
142246
+ if (option)
142247
+ {
142248
+ if (option.Selected) sendData.Selected=option.Selected;
142249
+ }
142250
+
142251
+ event.Callback(event,sendData,this);
142252
+ if (sendData.Out && sendData.Out.BGColor)
142253
+ {
142254
+ this.Canvas.fillStyle=sendData.Out.BGColor;
142255
+ this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
142256
+ }
142257
+ }
142236
142258
  }
142237
142259
 
142238
142260
  this.DrawSelectedRow=function()
@@ -143335,6 +143357,10 @@ function ChartReport()
143335
143357
  {
143336
143358
  drawInfo.TextColor=this.GetUpDownColorV2(value,0);
143337
143359
  }
143360
+ else if (column.ColorType==3)
143361
+ {
143362
+ drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
143363
+ }
143338
143364
  }
143339
143365
 
143340
143366
  var text=value.toFixed(column.FloatPrecision);
@@ -143356,6 +143382,11 @@ function ChartReport()
143356
143382
  break;
143357
143383
  }
143358
143384
  }
143385
+
143386
+ if (column.StringFormat && text)
143387
+ {
143388
+ text=column.StringFormat.replace("{0}", text);
143389
+ }
143359
143390
 
143360
143391
  drawInfo.Text=text;
143361
143392
  }
@@ -160162,7 +160193,7 @@ function HQChartScriptWorker()
160162
160193
 
160163
160194
 
160164
160195
 
160165
- var HQCHART_VERSION="1.1.14794";
160196
+ var HQCHART_VERSION="1.1.14803";
160166
160197
 
160167
160198
  function PrintHQChartVersion()
160168
160199
  {