hqchart 1.1.13965 → 1.1.13973

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 +18 -11
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.TReport.js +75 -0
  4. package/src/jscommon/umychart.js +28 -0
  5. package/src/jscommon/umychart.report.js +7 -1
  6. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +36 -2
  7. package/src/jscommon/umychart.version.js +1 -1
  8. package/src/jscommon/umychart.vue/umychart.vue.js +111 -2
package/lib/umychart.vue.js CHANGED
@@ -4822,7 +4822,7 @@ this.ShowRangeText.Font=g_JSChartResource.RectSelect.RangeTextFont;this.ShowRang
4822
4822
  else if(ChartData.IsMinutePeriod(period,true))return value.Date*10000+value.Time;//YYYYMMDDHHMM
4823
4823
  else if(ChartData.IsSecondPeriod(period)||ChartData.IsTickPeriod(period))return value.Date*1000000+value.Time;//YYYYMMDDHHMMSS
4824
4824
  else if(ChartData.IsMilliSecondPeriod(period))return value.Date*1000000000+value.Time;//YYYYMMDDHHMMSSFFF
4825
- }return null;};this.GetSelectRectData=function(){if(!this.FirstPoint||!this.SecondPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondDate=this.DateToNumber(this.SecondPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value)selectData.Start=i;if(secondDate==value)selectData.End=i;if(IFrameSplitOperator.IsNumber(selectData.Start)&&IFrameSplitOperator.IsNumber(selectData.End)){if(selectData.Start>selectData.End){var temp=selectData.Start;selectData.Start=selectData.End;selectData.End=temp;}return selectData;}}return null;};this.SortPoint=function(){var isMinuteChart=this.IsMinuteChart();this.CenterData=null;if(this.FirstPoint&&!this.SecondPoint){this.StartDate={Date:this.DateToNumber(this.FirstPoint,isMinuteChart),Index:0};}else if(this.FirstPoint&&this.SecondPoint){var firstValue=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.StartDate={Date:firstValue,Index:0};this.EndDate={Date:secondValue,Index:1};}else{this.StartDate={Date:secondValue,Index:1};this.EndDate={Date:firstValue,Index:0};}if(this.CenterPoint){var centerValue=this.DateToNumber(this.CenterPoint,isMinuteChart);this.CenterDate={Date:centerValue,Index:2};}//子区域
4825
+ }return null;};this.GetSelectRectDataByOnePoint=function(){if(!this.FirstPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value){selectData.Start=i;selectData.End=i;return selectData;}}return null;};this.GetSelectRectData=function(){if(this.IsOnlyOnePoint)return this.GetSelectRectDataByOnePoint();if(!this.FirstPoint||!this.SecondPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondDate=this.DateToNumber(this.SecondPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value)selectData.Start=i;if(secondDate==value)selectData.End=i;if(IFrameSplitOperator.IsNumber(selectData.Start)&&IFrameSplitOperator.IsNumber(selectData.End)){if(selectData.Start>selectData.End){var temp=selectData.Start;selectData.Start=selectData.End;selectData.End=temp;}return selectData;}}return null;};this.SortPoint=function(){var isMinuteChart=this.IsMinuteChart();this.CenterData=null;if(this.FirstPoint&&!this.SecondPoint){this.StartDate={Date:this.DateToNumber(this.FirstPoint,isMinuteChart),Index:0};}else if(this.FirstPoint&&this.SecondPoint){var firstValue=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.StartDate={Date:firstValue,Index:0};this.EndDate={Date:secondValue,Index:1};}else{this.StartDate={Date:secondValue,Index:1};this.EndDate={Date:firstValue,Index:0};}if(this.CenterPoint){var centerValue=this.DateToNumber(this.CenterPoint,isMinuteChart);this.CenterDate={Date:centerValue,Index:2};}//子区域
4826
4826
  if(this.SubClient.FirstPoint&&this.SubClient.SecondPoint){var firstValue=this.DateToNumber(this.SubClient.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SubClient.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.SubClient.Start={Date:firstValue,Index:3};this.SubClient.End={Date:secondValue,Index:4};}else{this.SubClient.Start={Date:secondValue,Index:4};this.SubClient.End={Date:firstValue,Index:3};}//不能超出区间范围
4827
4827
  if(this.SubClient.End.Date<=this.StartDate.Date||this.SubClient.Start.Date>=this.EndDate.Date){this.SubClient.Start=null;this.SubClient.End=null;}else{if(this.SubClient.Start.Date<this.StartDate.Date)this.SubClient.Start.Date=this.StartDate.Date;if(this.SubClient.End.Date>this.EndDate.Date)this.SubClient.End.Date=this.EndDate.Date;}}}};this.GetCenterPoint=function(){if(!this.FirstPoint||!this.SecondPoint)return null;if(!IFrameSplitOperator.IsNumber(this.FirstPoint.DataIndex))return null;if(!IFrameSplitOperator.IsNumber(this.SecondPoint.DataIndex))return null;var count=this.FirstPoint.DataIndex-this.SecondPoint.DataIndex;if(Math.abs(count)<3)return null;var centerIndex=parseInt(this.FirstPoint.DataIndex+(this.SecondPoint.DataIndex-this.FirstPoint.DataIndex)/2);if(centerIndex<0)return null;var data=this.GetKData();if(!data||!data.Data)return null;var kItem=data.Data[centerIndex];if(!kItem)return null;return{Date:kItem.Date,Time:kItem.Time,DataIndex:centerIndex};};this.MovePoint=function(offset){if(!this.FirstPoint||!this.SecondPoint)return false;var data=this.GetKData();if(!data||!data.Data)return false;var dataIndex=this.FirstPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var firstPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};var dataIndex=this.SecondPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var secondPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};var dataIndex=this.CenterPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var centerPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.FirstPoint=firstPoint;this.SecondPoint=secondPoint;this.CenterPoint=centerPoint;return true;};this.MoveSubRect=function(step,isLeft){if(!this.FirstPoint||!this.SecondPoint)return false;if(!this.SubClient||!this.SubClient.FirstPoint||!this.SubClient.SecondPoint)return false;var data=this.GetKData();if(!data||!data.Data)return false;//区间范围
4828
4828
  var startIndex=Math.min(this.FirstPoint.DataIndex,this.SecondPoint.DataIndex);var endIndex=Math.max(this.FirstPoint.DataIndex,this.SecondPoint.DataIndex);var subStartPoint=this.SubClient.FirstPoint;var subEndPoint=this.SubClient.SecondPoint;if(this.SubClient.FirstPoint.DataIndex>this.SubClient.SecondPoint.DataIndex){var subStartPoint=this.SubClient.SecondPoint;var subEndPoint=this.SubClient.FirstPoint;}var subStartIndex=subStartPoint.DataIndex;var subEndIndex=subEndPoint.DataIndex;if(isLeft){if(subStartIndex<=startIndex)return false;subStartIndex-=step;subEndIndex-=step;}else{if(subEndPoint.DataIndex>=endIndex)return false;subStartIndex+=step;subEndIndex+=step;}var bChanged=false;if(subStartIndex!=subStartPoint.DataIndex){subStartPoint.DataIndex=subStartIndex;var kItem=data.Data[subStartIndex];subStartPoint.Date=kItem.Date;subStartPoint.Time=kItem.Time;bChanged=true;}if(subEndIndex!=subStartPoint.DataIndex){subEndPoint.DataIndex=subEndIndex;var kItem=data.Data[subEndIndex];subEndPoint.Date=kItem.Date;subEndPoint.Time=kItem.Time;bChanged=true;}return bChanged;};this.SetPoint=function(kItem,option){var dataIndex=null;if(option){if(IFrameSplitOperator.IsNumber(option.DataIndex))dataIndex=option.DataIndex;}if(option&&IFrameSplitOperator.IsNumber(option.Index)){switch(option.Index){case 0:this.FirstPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.CenterPoint=this.GetCenterPoint();return true;case 1:this.SecondPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.CenterPoint=this.GetCenterPoint();return true;case 2://中心偏移
@@ -12863,7 +12863,7 @@ Explain:'报价列表股票排序数据',Request:{Data:{range:{start:startIndex,
12863
12863
  };this.RecvStockSortData=function(data){//更新股票数据
12864
12864
  var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){for(var i=0;i<data.data.length;++i){var item=data.data[i];//数据
12865
12865
  var symbol=item[0];if(!symbol)continue;var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;stock.Symbol=this.GetSymbolNoSuffix(symbol);this.MapStockData.set(symbol,stock);}this.ReadStockJsonData(stock,item);arySymbol.push(symbol);}}//更新股票顺序
12866
- if(IFrameSplitOperator.IsNonEmptyArray(data.index)){for(var i=0;i<data.index.length;++i){var index=data.index[i];var newSymbol=arySymbol[i];var oldSymbol=this.Data.Data[index];if(newSymbol==oldSymbol)continue;this.Data.Data[index]=newSymbol;}}var chart=this.ChartPaint[0];if(!chart)return;//更新的股票在当前页面,需要重绘
12866
+ if(IFrameSplitOperator.IsNonEmptyArray(data.index)){for(var i=0;i<data.index.length;++i){var index=data.index[i];var newSymbol=arySymbol[i];var oldSymbol=this.Data.Data[index];if(newSymbol==oldSymbol)continue;this.Data.Data[index]=newSymbol;}}if(data.Virtual){var item=data.Virtual;if(IFrameSplitOperator.IsNumber(item.Count))this.Data.Virtual.Count=item.Count;}var chart=this.ChartPaint[0];if(!chart)return;//更新的股票在当前页面,需要重绘
12867
12867
  var bUpdate=true;if(bUpdate)this.Draw();};//虚拟表格 请求序号 所有数据后台返回
12868
12868
  this.RequestVirtualStockData=function(){var chart=this.ChartPaint[0];if(!chart)return;var self=this;var startIndex=this.Data.YOffset;var pageSize=chart.GetPageSize();var endIndex=startIndex+pageSize;var dataCount=chart.GetAllRowCount();if(endIndex>=dataCount)endIndex=dataCount-1;if(!this.NetworkFilter)return;var requestData={range:{start:startIndex,end:endIndex,count:chart.GetAllRowCount()},column:null,sort:0,symbol:this.Symbol,name:this.Name,pageSize:pageSize};if(this.SortInfo&&this.SortInfo.Field>=0&&this.SortInfo.Sort>0)//排序
12869
12869
  {var column=chart.Column[this.SortInfo.Field];requestData.column={name:column.Title,type:column.Type,index:this.SortInfo.Field,ID:column.ID};requestData.sort=this.SortInfo.Sort;}var obj={Name:'JSDealChartContainer::RequestVirtualStockData',//类名::函数名
@@ -13016,7 +13016,7 @@ for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i
13016
13016
  {var iconWidth=item.Icon.Size;if(item.Icon.Margin){var margin=item.Icon.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))iconWidth+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))iconWidth+=margin.Right;}}textWidth-=iconWidth;if(item.HeaderColor)this.Canvas.fillStyle=item.HeaderColor;else this.Canvas.fillStyle=this.HeaderColor;var textSize={};if(this.SortInfo&&this.SortInfo.Field==i&&this.SortInfo.Sort>0){this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort,textSize);}else{this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);}if(iconWidth>0){this.DrawHeaderIcon(item.Icon,textSize.Right,yBottom,i,item);this.Canvas.font=this.HeaderFont;}textLeft+=item.Width;}};this.DrawText=function(text,textAlign,x,yBottom,cellWidth,textSize){var textWidth=this.Canvas.measureText(text).width;if(textAlign=='center'){x=x+(cellWidth-textWidth)/2;}else if(textAlign=='right'){x=x+cellWidth-textWidth;}this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";this.Canvas.fillText(text,x,yBottom-this.HeaderMergin.Bottom);if(textSize){textSize.Right=x+textWidth;textSize.Width=textWidth;}};this.DrawHeaderIcon=function(icon,x,yBottom,index,column){var iconFont=icon.Size+'px '+icon.Family;this.Canvas.font=iconFont;this.Canvas.textAlign="left";if(icon.Color)this.Canvas.fillStyle=icon.Color;var xIcon=x;var yIcon=yBottom;if(icon.Margin&&IFrameSplitOperator.IsNumber(icon.Margin.Left))xIcon+=icon.Margin.Left;if(icon.Margin&&IFrameSplitOperator.IsNumber(icon.Margin.Bottom))yIcon-=icon.Margin.Bottom;this.Canvas.fillText(icon.Symbol,xIcon,yIcon);if(icon.Tooltip){var rtIcon={Left:xIcon,Bottom:yIcon,Width:icon.Size,Height:icon.Size};rtIcon.Right=rtIcon.Left+rtIcon.Width;rtIcon.Top=rtIcon.Bottom-rtIcon.Height;var tooltipData={Rect:rtIcon,Type:2,Column:column,Index:index,Data:icon.Tooltip.Data};this.TooltipRect.push(tooltipData);}};this.DrawSortHeader=function(text,textAlign,x,yBottom,width,sortType,textSize){var pixelRatio=GetDevicePixelRatio();var sortText=this.SortConfig.Arrow[sortType];this.Canvas.font=this.HeaderFont;var textWidth=this.Canvas.measureText(text).width;var sortTextWidth=this.SortConfig.Size*pixelRatio+this.SortConfig.Margin.Left;if(textAlign=='center'){x=x+width/2-(sortTextWidth+textWidth)/2;}else if(textAlign=='right'){x=x+width-sortTextWidth-textWidth;}this.Canvas.textBaseline="bottom";this.Canvas.textAlign="left";var xText=x;this.Canvas.font=this.HeaderFont;this.Canvas.fillStyle=this.HeaderColor;this.Canvas.fillText(text,xText,yBottom-this.HeaderMergin.Bottom);xText+=textWidth+this.SortConfig.Margin.Left;this.Canvas.font=this.SortFont;this.Canvas.fillStyle=this.SortConfig.Color[sortType];this.Canvas.fillText(sortText,xText,yBottom-this.SortConfig.Margin.Bottom);this.Canvas.font=this.HeaderFont;this.Canvas.fillStyle=this.HeaderColor;if(textSize){textSize.Right=x+textWidth+sortTextWidth;textSize.Width=textWidth+sortTextWidth;}};this.DrawBorder=function(){if(!this.IsDrawBorder)return;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=this.RectClient.Bottom;this.Canvas.strokeStyle=this.BorderColor;this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(top+this.HeaderHeight));this.Canvas.lineTo(right,ToFixedPoint(top+this.HeaderHeight));var rowTop=top+this.HeaderHeight+this.RowHeight;var rotBottom=rowTop;for(var i=0;i<this.FixedRowCount;++i){var drawTop=ToFixedPoint(rowTop);this.Canvas.moveTo(left,drawTop);this.Canvas.lineTo(right,drawTop);rotBottom=rowTop;rowTop+=this.FixedRowHeight;}var rowTop=top+this.HeaderHeight+this.RowHeight+this.FixedRowHeight*this.FixedRowCount;var rotBottom=rowTop;//横线
13017
13017
  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;}//竖线
13018
13018
  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();};//获取一共多少行
13019
- 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))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;//固定行
13019
+ 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;//固定行
13020
13020
  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;//选中行
13021
13021
  }else{if(i==this.SelectedRow)bFillRow=true;//选中行
13022
13022
  }}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: }
@@ -13228,7 +13228,8 @@ this.UIElement.ondblclick=function(e){_this64.UIOnDblClick(e);};this.UIElement.o
13228
13228
  */};this.Draw=function(){if(this.UIElement.width<=0||this.UIElement.height<=0)return;this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
13229
13229
  this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段宽度
13230
13230
  if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash){this.Frame.Draw({IsEnableSplash:this.ChartSplashPaint.IsEnableSplash});this.ChartSplashPaint.Draw();return;}this.Frame.Draw();this.Frame.DrawLogo();//框架内图形
13231
- for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this65=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this65.Draw();},frequency);};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Price=null;this.MapStockData=null;this.MapExePriceData=null;this.BorderData.MapData=null;};this.StopAutoUpdate=function(){this.CancelAutoUpdate();this.AutoUpdateEvent(false,'JSTReportChartContainer::StopAutoUpdate');if(!this.IsAutoUpdate)return;this.IsAutoUpdate=false;};//设置事件回调
13231
+ for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this65=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this65.Draw();},frequency);};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Price=null;this.Data.XOffset=0;//清空偏移
13232
+ this.Data.YOffset=0;this.MapStockData=null;this.MapExePriceData=null;this.BorderData.MapData=null;};this.StopAutoUpdate=function(){this.CancelAutoUpdate();this.AutoUpdateEvent(false,'JSTReportChartContainer::StopAutoUpdate');if(!this.IsAutoUpdate)return;this.IsAutoUpdate=false;};//设置事件回调
13232
13233
  //{event:事件id, callback:回调函数}
13233
13234
  this.AddEventCallback=function(object){if(!object||!object.event||!object.callback)return;var data={Callback:object.callback,Source:object};this.mapEvent.set(object.event,data);};this.RemoveEventCallback=function(eventid){if(!this.mapEvent.has(eventid))return;this.mapEvent.delete(eventid);};this.GetEventCallback=function(id)//获取事件回调
13234
13235
  {if(!this.mapEvent.has(id))return null;var item=this.mapEvent.get(id);return item;};this.OnSize=function(){if(!this.Frame)return;this.SetSizeChange(true);this.Draw();this.DelayUpdateStockData();};this.SetSizeChange=function(bChanged){for(var i=0;i<this.ChartPaint.length;++i){var chart=this.ChartPaint[i];if(chart)chart.SizeChange=bChanged;}};this.ChangeSymbol=function(symbol,option){this.CancelAutoUpdate();this.ClearData();this.Symbol=symbol;this.Name=symbol;if(option){if(option.Name)this.Name=option.Name;}this.RequestStockListData();};this.CancelAutoUpdate=function()//关闭停止更新
@@ -13246,6 +13247,7 @@ this.CalculateData=function(){if(!this.MapExePriceData||this.MapExePriceData.siz
13246
13247
  this.ReadStockJsonData=function(stock,item){//0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=持仓 16=涨停价 17=跌停价
13247
13248
  //21=涨幅% 22=涨跌 24=振幅%
13248
13249
  //30=全局扩展数据 31=当前板块扩展数据
13250
+ // 101-110 数值
13249
13251
  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];//均价
13250
13252
  if(IFrameSplitOperator.IsNumber(item[14]))stock.Position=item[14];//持仓
13251
13253
  if(IFrameSplitOperator.IsNumber(item[16]))stock.LimitHigh=item[16];//涨停价
@@ -13261,7 +13263,8 @@ if(!IFrameSplitOperator.IsNumber(item[21]))//涨幅%
13261
13263
  {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=全局扩展数据
13262
13264
  if(item[32])stock.CloseLine=item[32];//32=收盘价线
13263
13265
  if(item[33])stock.KLine=item[33];//33=K线
13264
- };this.AutoUpdate=function(waitTime)//waitTime 更新时间
13266
+ //10个数值型 101-110
13267
+ 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 更新时间
13265
13268
  {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;//闭市,盘后
13266
13269
  var frequency=this.AutoUpdateFrequency;if(marketStatus==1)//盘前
13267
13270
  {this.AutoUpdateTimer=setTimeout(function(){self.AutoUpdate();},frequency);}else if(marketStatus==2)//盘中
@@ -13335,8 +13338,10 @@ KLINE_ID:29,//K线
13335
13338
  CUSTOM_STRING_TEXT_ID:100,//自定义字符串文本
13336
13339
  CUSTOM_NUMBER_TEXT_ID:101,//自定义数值型
13337
13340
  CUSTOM_DATETIME_TEXT_ID:102,//自定义日期类型
13338
- CUSTOM_ICON_ID:103//自定义图标
13339
- };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"]]);function ChartTReport(){this.Canvas;//画布
13341
+ CUSTOM_ICON_ID:103,//自定义图标
13342
+ //预留数值类型 10个
13343
+ RESERVE_NUMBER1_ID:200,//ReserveNumber1:
13344
+ 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;//画布
13340
13345
  this.ChartBorder;//边框信息
13341
13346
  this.ChartFrame;//框架画法
13342
13347
  this.Name;//名称
@@ -13370,9 +13375,10 @@ this.Column=//{ Type:列id, Title:标题, TextAlign:文字对齐方式, MaxText:
13370
13375
  [{Type:TREPORT_COLUMN_ID.PRICE_ID,Title:"现价",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:TREPORT_COLUMN_ID.INCREASE_ID,Title:"涨幅%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:TREPORT_COLUMN_ID.BUY_PRICE_ID,Title:"买价",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:TREPORT_COLUMN_ID.BUY_VOL_ID,Title:"买量",TextAlign:"right",Width:null,MaxText:"88888",TextColor:g_JSChartResource.TReport.FieldColor.Vol},//{ Type:TREPORT_COLUMN_ID.SELL_PRICE_ID, Title:"卖价", TextAlign:"right", Width:null, MaxText:"-888.88" },
13371
13376
  //{ Type:TREPORT_COLUMN_ID.SELL_VOL_ID, Title:"卖量", TextAlign:"right", Width:null, MaxText:"88888", TextColor:g_JSChartResource.TReport.FieldColor.Vol },
13372
13377
  //{ Type:TREPORT_COLUMN_ID.POSITION_ID, Title:"持仓量", TextAlign:"right", Width:null, MaxText:"88888", TextColor:g_JSChartResource.TReport.FieldColor.Position },
13373
- {Type:TREPORT_COLUMN_ID.NAME_ID,Title:"合约代码",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Name,MaxText:"AAAAAA-A-AAAA"}];this.CenterColumn={Type:TREPORT_COLUMN_ID.EXE_PRICE_ID,Title:"购<行权价>沽",TextAlign:"center",Width:null,MaxText:"99999.99",Sort:1,SortType:[1,2]};this.RectClient={};this.TooltipRect=[];this.ReloadResource=function(resource){};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.GetDefaultColunm(item.Type);if(!colItem)continue;if(item.Title)colItem.Title=item.Title;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.ID)colItem.ID=item.ID;if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsBool(item.EnableTooltip))colItem.EnableTooltip=item.EnableTooltip;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;if(item.Sort==1)//1本地排序 2=远程排序
13378
+ {Type:TREPORT_COLUMN_ID.NAME_ID,Title:"合约代码",TextAlign:"right",Width:null,TextColor:g_JSChartResource.TReport.FieldColor.Name,MaxText:"AAAAAA-A-AAAA"}];this.CenterColumn={Type:TREPORT_COLUMN_ID.EXE_PRICE_ID,Title:"购<行权价>沽",TextAlign:"center",Width:null,MaxText:"99999.99",Sort:1,SortType:[1,2]};this.RectClient={};this.TooltipRect=[];this.ReloadResource=function(resource){};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.GetDefaultColunm(item.Type);if(!colItem)continue;if(item.Title)colItem.Title=item.Title;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.ID)colItem.ID=item.ID;if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsBool(item.EnableTooltip))colItem.EnableTooltip=item.EnableTooltip;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;if(IFrameSplitOperator.IsNumber(item.FloatPrecision))colItem.FloatPrecision=item.FloatPrecision;//小数位数
13379
+ if(item.Sort==1)//1本地排序 2=远程排序
13374
13380
  {colItem.SortType=[1,2];//默认 降序 ，升序
13375
- 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]}];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(); //调试用
13381
+ 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(); //调试用
13376
13382
  this.Canvas.clip();this.DrawHeader();this.DrawBody();this.Canvas.restore();//this.DrawBorder();
13377
13383
  this.SizeChange=false;};//更新缓存变量
13378
13384
  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()//计算大小
@@ -13394,7 +13400,8 @@ case TREPORT_COLUMN_ID.SELL_PRICE_ID://卖价
13394
13400
  var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)this.GetPriceDrawInfo(data[fieldName],data,exePriceData,drawInfo);break;case TREPORT_COLUMN_ID.SELL_VOL_ID://卖量
13395
13401
  case TREPORT_COLUMN_ID.BUY_VOL_ID://买量
13396
13402
  case TREPORT_COLUMN_ID.POSITION_ID://持仓量
13397
- 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;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.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);};//单独处理成交量显示
13403
+ 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){var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;//TODO: 不同类型的 格式化输出
13404
+ 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);};//单独处理成交量显示
13398
13405
  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.DrawCell=function(drawInfo){var rtText=drawInfo.RectText;var yCenter=rtText.Top+rtText.Height/2;if(drawInfo.BGColor)//背景
13399
13406
  {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.FlashBGColor)//闪动背景
13400
13407
  {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.FlashBGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.BorderColor)//边框
@@ -13883,7 +13890,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
13883
13890
  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);};}/********************************************************************************
13884
13891
  * 版本信息输出
13885
13892
  *
13886
- */var HQCHART_VERSION="1.1.13964";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();//把给外界调用的方法暴露出来
13893
+ */var HQCHART_VERSION="1.1.13972";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();//把给外界调用的方法暴露出来
13887
13894
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
13888
13895
  // BaseIndex:BaseIndex,
13889
13896
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.13965",
3
+ "version": "1.1.13973",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.TReport.js CHANGED
@@ -473,6 +473,8 @@ function JSTReportChartContainer(uielement)
473
473
  this.SourceData.Data=[];
474
474
  this.Data.Data=[];
475
475
  this.Data.Price=null;
476
+ this.Data.XOffset=0; //清空偏移
477
+ this.Data.YOffset=0;
476
478
  this.MapStockData=null;
477
479
  this.MapExePriceData=null;
478
480
  this.BorderData.MapData=null;
@@ -785,6 +787,7 @@ function JSTReportChartContainer(uielement)
785
787
  //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=持仓 16=涨停价 17=跌停价
786
788
  //21=涨幅% 22=涨跌 24=振幅%
787
789
  //30=全局扩展数据 31=当前板块扩展数据
790
+ // 101-110 数值
788
791
 
789
792
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
790
793
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -835,6 +838,18 @@ function JSTReportChartContainer(uielement)
835
838
 
836
839
  if (item[32]) stock.CloseLine=item[32]; //32=收盘价线
837
840
  if (item[33]) stock.KLine=item[33]; //33=K线
841
+
842
+ //10个数值型 101-110
843
+ if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
844
+ if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
845
+ if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
846
+ if (IFrameSplitOperator.IsNumber(item[104])) stock.ReserveNumber4=item[104];
847
+ if (IFrameSplitOperator.IsNumber(item[105])) stock.ReserveNumber5=item[105];
848
+ if (IFrameSplitOperator.IsNumber(item[106])) stock.ReserveNumber6=item[106];
849
+ if (IFrameSplitOperator.IsNumber(item[107])) stock.ReserveNumber7=item[107];
850
+ if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
851
+ if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
852
+ if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
838
853
  }
839
854
 
840
855
 
@@ -1466,6 +1481,18 @@ var TREPORT_COLUMN_ID=
1466
1481
  CUSTOM_NUMBER_TEXT_ID:101, //自定义数值型
1467
1482
  CUSTOM_DATETIME_TEXT_ID:102, //自定义日期类型
1468
1483
  CUSTOM_ICON_ID:103, //自定义图标
1484
+
1485
+ //预留数值类型 10个
1486
+ RESERVE_NUMBER1_ID:200, //ReserveNumber1:
1487
+ RESERVE_NUMBER2_ID:201,
1488
+ RESERVE_NUMBER3_ID:203,
1489
+ RESERVE_NUMBER4_ID:204,
1490
+ RESERVE_NUMBER5_ID:205,
1491
+ RESERVE_NUMBER6_ID:206,
1492
+ RESERVE_NUMBER7_ID:207,
1493
+ RESERVE_NUMBER8_ID:208,
1494
+ RESERVE_NUMBER9_ID:209,
1495
+ RESERVE_NUMBER10_ID:210,
1469
1496
  }
1470
1497
 
1471
1498
  var MAP_TREPORT_COLUMN_FIELD=new Map(
@@ -1487,6 +1514,18 @@ var MAP_TREPORT_COLUMN_FIELD=new Map(
1487
1514
  [TREPORT_COLUMN_ID.LOW_ID, "Low"],
1488
1515
  [TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],
1489
1516
  [TREPORT_COLUMN_ID.POSITION_ID,"Position"],
1517
+ [TREPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],
1518
+
1519
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
1520
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
1521
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
1522
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],
1523
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],
1524
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],
1525
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],
1526
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
1527
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
1528
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
1490
1529
  ]);
1491
1530
 
1492
1531
 
@@ -1621,6 +1660,7 @@ function ChartTReport()
1621
1660
  if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
1622
1661
  if (IFrameSplitOperator.IsBool(item.EnableTooltip)) colItem.EnableTooltip=item.EnableTooltip;
1623
1662
  if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
1663
+ if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
1624
1664
 
1625
1665
  if (item.Sort==1) //1本地排序 2=远程排序
1626
1666
  {
@@ -1659,6 +1699,17 @@ function ChartTReport()
1659
1699
 
1660
1700
  { 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] },
1661
1701
  { 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] },
1702
+
1703
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1704
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1705
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1706
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID, Title:"数值4", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1707
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID, Title:"数值5", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1708
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID, Title:"数值6", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1709
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID, Title:"数值7", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1710
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1711
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1712
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
1662
1713
  ];
1663
1714
 
1664
1715
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -2101,6 +2152,18 @@ function ChartTReport()
2101
2152
  }
2102
2153
  }
2103
2154
  break;
2155
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:
2156
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:
2157
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:
2158
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:
2159
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:
2160
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:
2161
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:
2162
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
2163
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
2164
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
2165
+ this.FormatReserveNumber(column, data, drawInfo);
2166
+ break;
2104
2167
 
2105
2168
  default:
2106
2169
  drawInfo.Text=`-----`;
@@ -2113,6 +2176,18 @@ function ChartTReport()
2113
2176
  this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
2114
2177
  }
2115
2178
 
2179
+ this.FormatReserveNumber=function(column, data, drawInfo)
2180
+ {
2181
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
2182
+ if (!fieldName) return;
2183
+
2184
+ var value=data[fieldName];
2185
+ if (!IFrameSplitOperator.IsNumber(value)) return;
2186
+
2187
+ //TODO: 不同类型的 格式化输出
2188
+ drawInfo.Text=value.toFixed(column.FloatPrecision);
2189
+ }
2190
+
2116
2191
  this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
2117
2192
  {
2118
2193
  if (!exePriceData.TData) return;
package/src/jscommon/umychart.js CHANGED
@@ -44628,8 +44628,36 @@ function RectSelectPaint()
44628
44628
  return null;
44629
44629
  }
44630
44630
 
44631
+ this.GetSelectRectDataByOnePoint=function()
44632
+ {
44633
+ if (!this.FirstPoint) return null;
44634
+
44635
+ var data=this.GetKData();
44636
+ if (!data) return null;
44637
+ var isMinuteChart=this.IsMinuteChart();
44638
+ var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
44639
+ var selectData={ Start:null, End:null, Data:data };
44640
+ for(var i=0;i<data.Data.length;++i)
44641
+ {
44642
+ var item=data.Data[i];
44643
+ if (!item) continue;
44644
+ var value=this.DateToNumber(item,isMinuteChart);
44645
+
44646
+ if (firstDate==value)
44647
+ {
44648
+ selectData.Start=i;
44649
+ selectData.End=i;
44650
+ return selectData;
44651
+ }
44652
+ }
44653
+
44654
+ return null;
44655
+ }
44656
+
44631
44657
  this.GetSelectRectData=function()
44632
44658
  {
44659
+ if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
44660
+
44633
44661
  if (!this.FirstPoint || !this.SecondPoint) return null;
44634
44662
 
44635
44663
  var data=this.GetKData();
package/src/jscommon/umychart.report.js CHANGED
@@ -3845,6 +3845,12 @@ function JSReportChartContainer(uielement)
3845
3845
  }
3846
3846
  }
3847
3847
 
3848
+ if (data.Virtual)
3849
+ {
3850
+ var item=data.Virtual;
3851
+ if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
3852
+ }
3853
+
3848
3854
  var chart=this.ChartPaint[0];
3849
3855
  if (!chart) return;
3850
3856
 
@@ -5185,7 +5191,7 @@ function ChartReport()
5185
5191
  this.DrawBody=function()
5186
5192
  {
5187
5193
  if (!this.Data) return;
5188
- if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
5194
+ if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data) && !this.Data.Virtual.Enable) return;
5189
5195
 
5190
5196
  this.Canvas.font=this.ItemFont;
5191
5197
  var top=this.RectClient.Top+this.HeaderHeight;
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -48553,8 +48553,36 @@ function RectSelectPaint()
48553
48553
  return null;
48554
48554
  }
48555
48555
 
48556
+ this.GetSelectRectDataByOnePoint=function()
48557
+ {
48558
+ if (!this.FirstPoint) return null;
48559
+
48560
+ var data=this.GetKData();
48561
+ if (!data) return null;
48562
+ var isMinuteChart=this.IsMinuteChart();
48563
+ var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
48564
+ var selectData={ Start:null, End:null, Data:data };
48565
+ for(var i=0;i<data.Data.length;++i)
48566
+ {
48567
+ var item=data.Data[i];
48568
+ if (!item) continue;
48569
+ var value=this.DateToNumber(item,isMinuteChart);
48570
+
48571
+ if (firstDate==value)
48572
+ {
48573
+ selectData.Start=i;
48574
+ selectData.End=i;
48575
+ return selectData;
48576
+ }
48577
+ }
48578
+
48579
+ return null;
48580
+ }
48581
+
48556
48582
  this.GetSelectRectData=function()
48557
48583
  {
48584
+ if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
48585
+
48558
48586
  if (!this.FirstPoint || !this.SecondPoint) return null;
48559
48587
 
48560
48588
  var data=this.GetKData();
@@ -131303,6 +131331,12 @@ function JSReportChartContainer(uielement)
131303
131331
  }
131304
131332
  }
131305
131333
 
131334
+ if (data.Virtual)
131335
+ {
131336
+ var item=data.Virtual;
131337
+ if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
131338
+ }
131339
+
131306
131340
  var chart=this.ChartPaint[0];
131307
131341
  if (!chart) return;
131308
131342
 
@@ -132643,7 +132677,7 @@ function ChartReport()
132643
132677
  this.DrawBody=function()
132644
132678
  {
132645
132679
  if (!this.Data) return;
132646
- if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
132680
+ if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data) && !this.Data.Virtual.Enable) return;
132647
132681
 
132648
132682
  this.Canvas.font=this.ItemFont;
132649
132683
  var top=this.RectClient.Top+this.HeaderHeight;
@@ -139281,7 +139315,7 @@ function ScrollBarBGChart()
139281
139315
 
139282
139316
 
139283
139317
 
139284
- var HQCHART_VERSION="1.1.13964";
139318
+ var HQCHART_VERSION="1.1.13972";
139285
139319
 
139286
139320
  function PrintHQChartVersion()
139287
139321
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.13964";
8
+ var HQCHART_VERSION="1.1.13972";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -48597,8 +48597,36 @@ function RectSelectPaint()
48597
48597
  return null;
48598
48598
  }
48599
48599
 
48600
+ this.GetSelectRectDataByOnePoint=function()
48601
+ {
48602
+ if (!this.FirstPoint) return null;
48603
+
48604
+ var data=this.GetKData();
48605
+ if (!data) return null;
48606
+ var isMinuteChart=this.IsMinuteChart();
48607
+ var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
48608
+ var selectData={ Start:null, End:null, Data:data };
48609
+ for(var i=0;i<data.Data.length;++i)
48610
+ {
48611
+ var item=data.Data[i];
48612
+ if (!item) continue;
48613
+ var value=this.DateToNumber(item,isMinuteChart);
48614
+
48615
+ if (firstDate==value)
48616
+ {
48617
+ selectData.Start=i;
48618
+ selectData.End=i;
48619
+ return selectData;
48620
+ }
48621
+ }
48622
+
48623
+ return null;
48624
+ }
48625
+
48600
48626
  this.GetSelectRectData=function()
48601
48627
  {
48628
+ if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
48629
+
48602
48630
  if (!this.FirstPoint || !this.SecondPoint) return null;
48603
48631
 
48604
48632
  var data=this.GetKData();
@@ -131347,6 +131375,12 @@ function JSReportChartContainer(uielement)
131347
131375
  }
131348
131376
  }
131349
131377
 
131378
+ if (data.Virtual)
131379
+ {
131380
+ var item=data.Virtual;
131381
+ if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
131382
+ }
131383
+
131350
131384
  var chart=this.ChartPaint[0];
131351
131385
  if (!chart) return;
131352
131386
 
@@ -132687,7 +132721,7 @@ function ChartReport()
132687
132721
  this.DrawBody=function()
132688
132722
  {
132689
132723
  if (!this.Data) return;
132690
- if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
132724
+ if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data) && !this.Data.Virtual.Enable) return;
132691
132725
 
132692
132726
  this.Canvas.font=this.ItemFont;
132693
132727
  var top=this.RectClient.Top+this.HeaderHeight;
@@ -136459,6 +136493,8 @@ function JSTReportChartContainer(uielement)
136459
136493
  this.SourceData.Data=[];
136460
136494
  this.Data.Data=[];
136461
136495
  this.Data.Price=null;
136496
+ this.Data.XOffset=0; //清空偏移
136497
+ this.Data.YOffset=0;
136462
136498
  this.MapStockData=null;
136463
136499
  this.MapExePriceData=null;
136464
136500
  this.BorderData.MapData=null;
@@ -136771,6 +136807,7 @@ function JSTReportChartContainer(uielement)
136771
136807
  //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=持仓 16=涨停价 17=跌停价
136772
136808
  //21=涨幅% 22=涨跌 24=振幅%
136773
136809
  //30=全局扩展数据 31=当前板块扩展数据
136810
+ // 101-110 数值
136774
136811
 
136775
136812
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
136776
136813
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -136821,6 +136858,18 @@ function JSTReportChartContainer(uielement)
136821
136858
 
136822
136859
  if (item[32]) stock.CloseLine=item[32]; //32=收盘价线
136823
136860
  if (item[33]) stock.KLine=item[33]; //33=K线
136861
+
136862
+ //10个数值型 101-110
136863
+ if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
136864
+ if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
136865
+ if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
136866
+ if (IFrameSplitOperator.IsNumber(item[104])) stock.ReserveNumber4=item[104];
136867
+ if (IFrameSplitOperator.IsNumber(item[105])) stock.ReserveNumber5=item[105];
136868
+ if (IFrameSplitOperator.IsNumber(item[106])) stock.ReserveNumber6=item[106];
136869
+ if (IFrameSplitOperator.IsNumber(item[107])) stock.ReserveNumber7=item[107];
136870
+ if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
136871
+ if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
136872
+ if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
136824
136873
  }
136825
136874
 
136826
136875
 
@@ -137452,6 +137501,18 @@ var TREPORT_COLUMN_ID=
137452
137501
  CUSTOM_NUMBER_TEXT_ID:101, //自定义数值型
137453
137502
  CUSTOM_DATETIME_TEXT_ID:102, //自定义日期类型
137454
137503
  CUSTOM_ICON_ID:103, //自定义图标
137504
+
137505
+ //预留数值类型 10个
137506
+ RESERVE_NUMBER1_ID:200, //ReserveNumber1:
137507
+ RESERVE_NUMBER2_ID:201,
137508
+ RESERVE_NUMBER3_ID:203,
137509
+ RESERVE_NUMBER4_ID:204,
137510
+ RESERVE_NUMBER5_ID:205,
137511
+ RESERVE_NUMBER6_ID:206,
137512
+ RESERVE_NUMBER7_ID:207,
137513
+ RESERVE_NUMBER8_ID:208,
137514
+ RESERVE_NUMBER9_ID:209,
137515
+ RESERVE_NUMBER10_ID:210,
137455
137516
  }
137456
137517
 
137457
137518
  var MAP_TREPORT_COLUMN_FIELD=new Map(
@@ -137473,6 +137534,18 @@ var MAP_TREPORT_COLUMN_FIELD=new Map(
137473
137534
  [TREPORT_COLUMN_ID.LOW_ID, "Low"],
137474
137535
  [TREPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],
137475
137536
  [TREPORT_COLUMN_ID.POSITION_ID,"Position"],
137537
+ [TREPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],
137538
+
137539
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
137540
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
137541
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
137542
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],
137543
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],
137544
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],
137545
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],
137546
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
137547
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
137548
+ [TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
137476
137549
  ]);
137477
137550
 
137478
137551
 
@@ -137607,6 +137680,7 @@ function ChartTReport()
137607
137680
  if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
137608
137681
  if (IFrameSplitOperator.IsBool(item.EnableTooltip)) colItem.EnableTooltip=item.EnableTooltip;
137609
137682
  if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
137683
+ if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
137610
137684
 
137611
137685
  if (item.Sort==1) //1本地排序 2=远程排序
137612
137686
  {
@@ -137645,6 +137719,17 @@ function ChartTReport()
137645
137719
 
137646
137720
  { 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] },
137647
137721
  { 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] },
137722
+
137723
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137724
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137725
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137726
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID, Title:"数值4", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137727
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID, Title:"数值5", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137728
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID, Title:"数值6", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137729
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID, Title:"数值7", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137730
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137731
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137732
+ { Type:TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.TReport.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
137648
137733
  ];
137649
137734
 
137650
137735
  for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -138087,6 +138172,18 @@ function ChartTReport()
138087
138172
  }
138088
138173
  }
138089
138174
  break;
138175
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:
138176
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:
138177
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:
138178
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:
138179
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:
138180
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:
138181
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:
138182
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
138183
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
138184
+ case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
138185
+ this.FormatReserveNumber(column, data, drawInfo);
138186
+ break;
138090
138187
 
138091
138188
  default:
138092
138189
  drawInfo.Text=`-----`;
@@ -138099,6 +138196,18 @@ function ChartTReport()
138099
138196
  this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
138100
138197
  }
138101
138198
 
138199
+ this.FormatReserveNumber=function(column, data, drawInfo)
138200
+ {
138201
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
138202
+ if (!fieldName) return;
138203
+
138204
+ var value=data[fieldName];
138205
+ if (!IFrameSplitOperator.IsNumber(value)) return;
138206
+
138207
+ //TODO: 不同类型的 格式化输出
138208
+ drawInfo.Text=value.toFixed(column.FloatPrecision);
138209
+ }
138210
+
138102
138211
  this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
138103
138212
  {
138104
138213
  if (!exePriceData.TData) return;
@@ -144686,7 +144795,7 @@ function HQChartScriptWorker()
144686
144795
 
144687
144796
 
144688
144797
 
144689
- var HQCHART_VERSION="1.1.13964";
144798
+ var HQCHART_VERSION="1.1.13972";
144690
144799
 
144691
144800
  function PrintHQChartVersion()
144692
144801
  {