hqchart 1.1.13998 → 1.1.14001
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.
package/lib/umychart.vue.js
CHANGED
|
@@ -13113,7 +13113,7 @@ this.CanvasElement=document.createElement("canvas");this.CanvasElement.className
|
|
|
13113
13113
|
var height=this.DivElement.offsetHeight;var width=this.DivElement.offsetWidth;if(this.DivElement.style.height&&this.DivElement.style.width){if(this.DivElement.style.height.includes("px"))height=parseInt(this.DivElement.style.height.replace("px",""));if(this.DivElement.style.width.includes("px"))width=parseInt(this.DivElement.style.width.replace("px",""));}this.CanvasElement.height=height;this.CanvasElement.width=width;this.CanvasElement.style.width=this.CanvasElement.width+'px';this.CanvasElement.style.height=this.CanvasElement.height+'px';var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
13114
13114
|
this.CanvasElement.height*=pixelTatio;this.CanvasElement.width*=pixelTatio;JSConsole.Chart.Log('[JSTReportChart::OnSize] devicePixelRatio='+window.devicePixelRatio+', height='+this.CanvasElement.height+', width='+this.CanvasElement.width);if(this.JSChartContainer&&this.JSChartContainer.OnSize){this.JSChartContainer.OnSize();}};this.SetOption=function(option){var chart=this.CreateJSTReportChartContainer(option);if(!chart)return false;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);this.JSChartContainer=chart;this.DivElement.JSChart=this;//div中保存一份
|
|
13115
13115
|
if(option.EnableResize==true)this.CreateResizeListener();if(option.Symbol){chart.Draw();var name=option.Symbol;if(option.Name)name=option.Name;chart.ChangeSymbol(option.Symbol,{Name:name});//下载列表码表
|
|
13116
|
-
}};this.CreateJSTReportChartContainer=function(option){var chart=new JSTReportChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}this.SetChartBorder(chart,option);//是否自动更新
|
|
13116
|
+
}};this.CreateJSTReportChartContainer=function(option){var chart=new JSTReportChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(IFrameSplitOperator.IsBool(option.EnablePageCycle))chart.EnablePageCycle=option.EnablePageCycle;if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}this.SetChartBorder(chart,option);//是否自动更新
|
|
13117
13117
|
if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;if(IFrameSplitOperator.IsBool(option.EnableFilter))chart.EnableFilter=option.EnableFilter;//注册事件
|
|
13118
13118
|
if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}return chart;};this.SetChartBorder=function(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
13119
13119
|
chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTatio;chart.Frame.ChartBorder.Top*=pixelTatio;chart.Frame.ChartBorder.Bottom*=pixelTatio;};this.CreateResizeListener=function(){var _this62=this;this.ResizeListener=new ResizeObserver(function(entries){_this62.OnDivResize(entries);});this.ResizeListener.observe(this.DivElement);};this.OnDivResize=function(entries){JSConsole.Chart.Log("[JSTReportChart::OnDivResize] entries=",entries);this.OnSize();};/////////////////////////////////////////////////////////////////////////////
|
|
@@ -13157,6 +13157,7 @@ this.UIElement=uielement;this.LastPoint=new Point();//鼠标位置
|
|
|
13157
13157
|
this.IsOnTouch=false;this.TouchDrag;this.TouchMoveMinAngle=70;//左右移动最小角度
|
|
13158
13158
|
this.YStepPixel=5*GetDevicePixelRatio();this.XStepPixel=10*GetDevicePixelRatio();//拖拽滚动条
|
|
13159
13159
|
this.DragXScroll=null;//{Start:{x,y}, End:{x, y}}
|
|
13160
|
+
this.EnablePageCycle=false;//是否循环翻页
|
|
13160
13161
|
this.IsDestroy=false;//是否已经销毁了
|
|
13161
13162
|
this.ChartDestory=function()//销毁
|
|
13162
13163
|
{this.IsDestroy=true;this.StopAutoUpdate();};//创建
|
|
@@ -13238,8 +13239,8 @@ case TREPORT_COLUMN_ID.POSITION_ID://持仓量
|
|
|
13238
13239
|
case TREPORT_COLUMN_ID.AMPLITUDE_ID:case TREPORT_COLUMN_ID.INCREASE_ID:return this.LocalNumberSort(left,right,column,sortType,cellType);default:return 0;}};this.LocalNumberSort=function(left,right,column,sortType,cellType){var leftStock=this.GetExePriceData(left);var rightStock=this.GetExePriceData(right);var leftValue=-99999999999999,rightValue=-99999999999999;if(sortType==2)leftValue=rightValue=99999999999999;var filedName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(cellType==0)//行权价格
|
|
13239
13240
|
{if(leftStock&&IFrameSplitOperator.IsNumber(leftStock.ExePrice))leftValue=leftStock.ExePrice;if(rightStock&&IFrameSplitOperator.IsNumber(rightStock.ExePrice))rightValue=rightStock.ExePrice;}else if(cellType==1){if(leftStock&&leftStock.LeftData){var value=leftStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.LeftData){var value=rightStock.LeftData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}else if(cellType==2){if(leftStock&&leftStock.RightData){var value=leftStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))leftValue=value;}if(rightStock&&rightStock.RightData){var value=rightStock.RightData[filedName];if(IFrameSplitOperator.IsNumber(value))rightValue=value;}}if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.GetTReportChart=function(){var chart=this.ChartPaint[0];return chart;};this.OnWheel=function(e)//滚轴
|
|
13240
13241
|
{JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);if(!isInClient)return;var chart=this.GetTReportChart();if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;if(wheelValue<0)//下
|
|
13241
|
-
{var result=this.MoveSelectedRow(1);if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
13242
|
-
{var result=this.MoveSelectedRow(-1);if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;switch(keyID){/*
|
|
13242
|
+
{var result=this.MoveSelectedRow(1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}else if(wheelValue>0)//上
|
|
13243
|
+
{var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetTReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;switch(keyID){/*
|
|
13243
13244
|
case 33: //page up
|
|
13244
13245
|
if (this.GotoPreviousPage(this.PageUpDownCycle))
|
|
13245
13246
|
{
|
|
@@ -13255,10 +13256,13 @@ case TREPORT_COLUMN_ID.AMPLITUDE_ID:case TREPORT_COLUMN_ID.INCREASE_ID:return th
|
|
|
13255
13256
|
}
|
|
13256
13257
|
break;
|
|
13257
13258
|
*/case 38://up
|
|
13258
|
-
var result=this.MoveSelectedRow(-1);if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}break;case 40://down
|
|
13259
|
-
var result=this.MoveSelectedRow(1);if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}break;}//不让滚动条滚动
|
|
13260
|
-
if(e.preventDefault)e.preventDefault();else e.returnValue=false;}
|
|
13261
|
-
|
|
13259
|
+
var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}break;case 40://down
|
|
13260
|
+
var result=this.MoveSelectedRow(1,{EnablePageCycle:this.EnablePageCycle});if(result){if(result.Redraw)this.Draw();if(result.Update)this.DelayUpdateStockData();}break;}//不让滚动条滚动
|
|
13261
|
+
if(e.preventDefault)e.preventDefault();else e.returnValue=false;};//是否循环翻页 { EnablePageCycle: true/false }
|
|
13262
|
+
this.MoveSelectedRow=function(step,option){var chart=this.ChartPaint[0];if(!chart)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var bPageCycle=false;if(option){if(IFrameSplitOperator.IsBool(option.EnablePageCycle))bPageCycle=option.EnablePageCycle;}var result={Redraw:false,Update:false};//Redraw=重绘, Update=更新数据
|
|
13263
|
+
var pageStatus=chart.GetCurrentPageStatus();var pageSize=pageStatus.PageSize;var selectedIndex=pageStatus.Start;var cellType=1;if(pageStatus.SelectedRow){cellType=pageStatus.SelectedRow.CellType;for(var i=0;i<this.Data.Data.length;++i){if(pageStatus.SelectedRow.ExePrice==this.Data.Data[i]){selectedIndex=i;break;}}}if(step>0){if(selectedIndex<0||selectedIndex<pageStatus.Start||selectedIndex>pageStatus.End){chart.SelectedRow={ExePrice:this.Data.Data[pageStatus.Start],CellType:cellType};result.Redraw=true;return result;}var offset=this.Data.YOffset;for(var i=0;i<step;++i){if(selectedIndex+1>=this.Data.Data.length&&!bPageCycle)break;++selectedIndex;if(selectedIndex>pageStatus.End)++offset;if(selectedIndex>=this.Data.Data.length){selectedIndex=0;offset=0;}}result.Redraw=true;result.Update=offset!=this.Data.YOffset;chart.SelectedRow={ExePrice:this.Data.Data[selectedIndex],CellType:cellType};this.Data.YOffset=offset;return result;}else if(step<0){if(selectedIndex<0||selectedIndex<pageStatus.Start||selectedIndex>pageStatus.End){chart.SelectedRow={ExePrice:this.Data.Data[pageStatus.End],CellType:cellType};result.Redraw=true;return result;}step=Math.abs(step);var offset=this.Data.YOffset;for(var i=0;i<step;++i){if(selectedIndex<=0&&!bPageCycle)//不能循环翻页
|
|
13264
|
+
break;--selectedIndex;if(selectedIndex<pageStatus.Start)--offset;if(selectedIndex<0)//自动翻到最后一页
|
|
13265
|
+
{selectedIndex=this.Data.Data.length-1;offset=this.Data.Data.length-pageSize;if(offset<0)offset=0;}}result.Redraw=true;result.Update=offset!=this.Data.YOffset;chart.SelectedRow={ExePrice:this.Data.Data[selectedIndex],CellType:cellType};this.Data.YOffset=offset;return result;}return null;};//obj={ ID:, Color: , Time:, Count: }
|
|
13262
13266
|
this.SetFlashBGItem=function(symbol,obj){var item={ID:obj.ID,Color:obj.Color,Count:1};if(IFrameSplitOperator.IsNumber(obj.Count))item.Count=obj.Count;if(IFrameSplitOperator.IsNumber(obj.Time))item.Time=obj.Time;else item.Time=Date.now();if(this.FlashBG.has(symbol)){var stockItem=this.FlashBG.get(symbol);stockItem.LastTime=item.Time;stockItem.Data.set(item.ID,item);}else{var stockItem={LastTime:item.Time,Data:new _map2.default([[item.ID,item]])};this.FlashBG.set(symbol,stockItem);}};this.GetFlashBGData=function(symbol,time){if(!this.FlashBG)return null;if(!this.FlashBG.has(symbol))return null;var timeDiff=3*1000;var stockItem=this.FlashBG.get(symbol);if(time-stockItem.LastTime>=timeDiff)//超时的删除
|
|
13263
13267
|
{this.FlashBG.delete(symbol);return null;}if(!stockItem.Data||stockItem.Data.size<=0){this.FlashBG.delete(symbol);return null;}var aryDelID=[];//超时需要参数的
|
|
13264
13268
|
var _iteratorNormalCompletion26=true;var _didIteratorError26=false;var _iteratorError26=undefined;try{for(var _iterator26=(0,_getIterator3.default)(stockItem.Data),_step26;!(_iteratorNormalCompletion26=(_step26=_iterator26.next()).done);_iteratorNormalCompletion26=true){var mapItem=_step26.value;var item=mapItem[1];if(time-item.Time>=timeDiff||item.Count<=0)aryDelID.push(item.ID);}}catch(err){_didIteratorError26=true;_iteratorError26=err;}finally{try{if(!_iteratorNormalCompletion26&&_iterator26.return){_iterator26.return();}}finally{if(_didIteratorError26){throw _iteratorError26;}}}if(IFrameSplitOperator.IsNonEmptyArray(aryDelID)){for(var i=0;i<aryDelID.length;++i){stockItem.Data.delete(aryDelID[i]);}if(stockItem.Data.size<=0){this.FlashBG.delete(symbol);return null;}}return stockItem;};}function JSTReportFrame(){this.ChartBorder;this.Canvas;//画布
|
|
@@ -13332,7 +13336,8 @@ this.Column=//{ Type:列id, Title:标题, TextAlign:文字对齐方式, MaxText:
|
|
|
13332
13336
|
//{ Type:TREPORT_COLUMN_ID.SELL_VOL_ID, Title:"卖量", TextAlign:"right", Width:null, MaxText:"88888", TextColor:g_JSChartResource.TReport.FieldColor.Vol },
|
|
13333
13337
|
//{ Type:TREPORT_COLUMN_ID.POSITION_ID, Title:"持仓量", TextAlign:"right", Width:null, MaxText:"88888", TextColor:g_JSChartResource.TReport.FieldColor.Position },
|
|
13334
13338
|
{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;//小数位数
|
|
13335
|
-
if(item.
|
|
13339
|
+
if(IFrameSplitOperator.IsNumber(item.ColorType))colItem.ColorType=item.ColorType;//0=默认 1=(>0, =0, <0) 2=(>=0, <0)
|
|
13340
|
+
if(item.DefaultText)colItem.DefaultText=item.DefaultText;if(item.Sort==1)//1本地排序 2=远程排序
|
|
13336
13341
|
{colItem.SortType=[1,2];//默认 降序 ，升序
|
|
13337
13342
|
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(); //调试用
|
|
13338
13343
|
this.Canvas.clip();this.DrawHeader();this.DrawBody();this.Canvas.restore();//this.DrawBorder();
|
|
@@ -13356,9 +13361,11 @@ case TREPORT_COLUMN_ID.SELL_PRICE_ID://卖价
|
|
|
13356
13361
|
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://卖量
|
|
13357
13362
|
case TREPORT_COLUMN_ID.BUY_VOL_ID://买量
|
|
13358
13363
|
case TREPORT_COLUMN_ID.POSITION_ID://持仓量
|
|
13359
|
-
|
|
13364
|
+
case TREPORT_COLUMN_ID.VOL_ID://成交量
|
|
13365
|
+
case TREPORT_COLUMN_ID.AMOUNT_ID://成交金额
|
|
13366
|
+
var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.Type,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}//TODO: 不同类型的 格式化输出
|
|
13360
13367
|
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);};//单独处理成交量显示
|
|
13361
|
-
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)//背景
|
|
13368
|
+
this.FormatVolString=function(value,languageID){if(!IFrameSplitOperator.IsNumber(value))return null;return IFrameSplitOperator.FormatVolString(value,languageID);};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawCell=function(drawInfo){var rtText=drawInfo.RectText;var yCenter=rtText.Top+rtText.Height/2;if(drawInfo.BGColor)//背景
|
|
13362
13369
|
{var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.FlashBGColor)//闪动背景
|
|
13363
13370
|
{var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.FlashBGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.BorderColor)//边框
|
|
13364
13371
|
{var rtItem=drawInfo.Rect;this.Canvas.strokeStyle=drawInfo.BorderColor;this.Canvas.strokeRect(ToFixedPoint(rtItem.Left),ToFixedPoint(rtItem.Top+1),ToFixedRect(rtItem.Width),ToFixedRect(rtItem.Height-3));}if(drawInfo.Text)//文字
|
|
@@ -13879,7 +13886,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13879
13886
|
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);};}/********************************************************************************
|
|
13880
13887
|
* 版本信息输出
|
|
13881
13888
|
*
|
|
13882
|
-
*/var HQCHART_VERSION="1.1.
|
|
13889
|
+
*/var HQCHART_VERSION="1.1.14000";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();//把给外界调用的方法暴露出来
|
|
13883
13890
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13884
13891
|
// BaseIndex:BaseIndex,
|
|
13885
13892
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -96,6 +96,7 @@ function JSTReportChart(divElement)
|
|
|
96
96
|
if (IFrameSplitOperator.IsBool(option.EnableDragRow)) chart.EnableDragRow=option.EnableDragRow;
|
|
97
97
|
if (IFrameSplitOperator.IsNumber(option.DragRowType)) chart.DragRowType=option.DragRowType;
|
|
98
98
|
if (IFrameSplitOperator.IsBool(option.EnableDragHeader)) chart.EnableDragHeader=option.EnableDragHeader;
|
|
99
|
+
if (IFrameSplitOperator.IsBool(option.EnablePageCycle)) chart.EnablePageCycle=option.EnablePageCycle;
|
|
99
100
|
if (option.SortInfo)
|
|
100
101
|
{
|
|
101
102
|
var item=option.SortInfo;
|
|
@@ -318,6 +319,7 @@ function JSTReportChartContainer(uielement)
|
|
|
318
319
|
|
|
319
320
|
//拖拽滚动条
|
|
320
321
|
this.DragXScroll=null; //{Start:{x,y}, End:{x, y}}
|
|
322
|
+
this.EnablePageCycle=false; //是否循环翻页
|
|
321
323
|
|
|
322
324
|
this.IsDestroy=false; //是否已经销毁了
|
|
323
325
|
|
|
@@ -1135,7 +1137,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1135
1137
|
|
|
1136
1138
|
if (wheelValue<0) //下
|
|
1137
1139
|
{
|
|
1138
|
-
var result=this.MoveSelectedRow(1)
|
|
1140
|
+
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
|
|
1139
1141
|
if (result)
|
|
1140
1142
|
{
|
|
1141
1143
|
if (result.Redraw) this.Draw();
|
|
@@ -1144,7 +1146,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1144
1146
|
}
|
|
1145
1147
|
else if (wheelValue>0) //上
|
|
1146
1148
|
{
|
|
1147
|
-
var result=this.MoveSelectedRow(-1);
|
|
1149
|
+
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
|
|
1148
1150
|
if (result)
|
|
1149
1151
|
{
|
|
1150
1152
|
if (result.Redraw) this.Draw();
|
|
@@ -1182,7 +1184,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1182
1184
|
break;
|
|
1183
1185
|
*/
|
|
1184
1186
|
case 38: //up
|
|
1185
|
-
var result=this.MoveSelectedRow(-1);
|
|
1187
|
+
var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});
|
|
1186
1188
|
if (result)
|
|
1187
1189
|
{
|
|
1188
1190
|
if (result.Redraw) this.Draw();
|
|
@@ -1190,7 +1192,7 @@ function JSTReportChartContainer(uielement)
|
|
|
1190
1192
|
}
|
|
1191
1193
|
break;
|
|
1192
1194
|
case 40: //down
|
|
1193
|
-
var result=this.MoveSelectedRow(1)
|
|
1195
|
+
var result=this.MoveSelectedRow(1, {EnablePageCycle:this.EnablePageCycle} )
|
|
1194
1196
|
if (result)
|
|
1195
1197
|
{
|
|
1196
1198
|
if (result.Redraw) this.Draw();
|
|
@@ -1204,11 +1206,17 @@ function JSTReportChartContainer(uielement)
|
|
|
1204
1206
|
else e.returnValue = false;
|
|
1205
1207
|
}
|
|
1206
1208
|
|
|
1207
|
-
|
|
1209
|
+
//是否循环翻页 { EnablePageCycle: true/false }
|
|
1210
|
+
this.MoveSelectedRow=function(step, option)
|
|
1208
1211
|
{
|
|
1209
1212
|
var chart=this.ChartPaint[0];
|
|
1210
1213
|
if (!chart) return null;
|
|
1211
1214
|
if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
|
|
1215
|
+
var bPageCycle=false;
|
|
1216
|
+
if (option)
|
|
1217
|
+
{
|
|
1218
|
+
if (IFrameSplitOperator.IsBool(option.EnablePageCycle)) bPageCycle=option.EnablePageCycle;
|
|
1219
|
+
}
|
|
1212
1220
|
|
|
1213
1221
|
var result={ Redraw:false, Update:false }; //Redraw=重绘, Update=更新数据
|
|
1214
1222
|
|
|
@@ -1242,6 +1250,9 @@ function JSTReportChartContainer(uielement)
|
|
|
1242
1250
|
var offset=this.Data.YOffset;
|
|
1243
1251
|
for(var i=0;i<step;++i)
|
|
1244
1252
|
{
|
|
1253
|
+
if (selectedIndex+1>=this.Data.Data.length && !bPageCycle)
|
|
1254
|
+
break;
|
|
1255
|
+
|
|
1245
1256
|
++selectedIndex;
|
|
1246
1257
|
if (selectedIndex>pageStatus.End) ++offset;
|
|
1247
1258
|
|
|
@@ -1273,10 +1284,13 @@ function JSTReportChartContainer(uielement)
|
|
|
1273
1284
|
var offset=this.Data.YOffset;
|
|
1274
1285
|
for(var i=0;i<step;++i)
|
|
1275
1286
|
{
|
|
1287
|
+
if (selectedIndex<=0 && !bPageCycle) //不能循环翻页
|
|
1288
|
+
break;
|
|
1289
|
+
|
|
1276
1290
|
--selectedIndex;
|
|
1277
1291
|
if (selectedIndex<pageStatus.Start) --offset;
|
|
1278
1292
|
|
|
1279
|
-
if (selectedIndex<0)
|
|
1293
|
+
if (selectedIndex<0) //自动翻到最后一页
|
|
1280
1294
|
{
|
|
1281
1295
|
selectedIndex=this.Data.Data.length-1;
|
|
1282
1296
|
offset=this.Data.Data.length-pageSize;
|
|
@@ -1662,6 +1676,8 @@ function ChartTReport()
|
|
|
1662
1676
|
if (IFrameSplitOperator.IsBool(item.EnableTooltip)) colItem.EnableTooltip=item.EnableTooltip;
|
|
1663
1677
|
if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
|
|
1664
1678
|
if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
|
|
1679
|
+
if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
|
|
1680
|
+
if (item.DefaultText) colItem.DefaultText=item.DefaultText;
|
|
1665
1681
|
|
|
1666
1682
|
if (item.Sort==1) //1本地排序 2=远程排序
|
|
1667
1683
|
{
|
|
@@ -2132,6 +2148,8 @@ function ChartTReport()
|
|
|
2132
2148
|
case TREPORT_COLUMN_ID.SELL_VOL_ID: //卖量
|
|
2133
2149
|
case TREPORT_COLUMN_ID.BUY_VOL_ID: //买量
|
|
2134
2150
|
case TREPORT_COLUMN_ID.POSITION_ID: //持仓量
|
|
2151
|
+
case TREPORT_COLUMN_ID.VOL_ID: //成交量
|
|
2152
|
+
case TREPORT_COLUMN_ID.AMOUNT_ID: //成交金额
|
|
2135
2153
|
var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
|
|
2136
2154
|
if (fieldName) drawInfo.Text=this.FormatVolString(data[fieldName]);
|
|
2137
2155
|
break;
|
|
@@ -2179,12 +2197,26 @@ function ChartTReport()
|
|
|
2179
2197
|
|
|
2180
2198
|
this.FormatReserveNumber=function(column, data, drawInfo)
|
|
2181
2199
|
{
|
|
2200
|
+
if (column.DefaultText) drawInfo.Text=column.DefaultText;
|
|
2201
|
+
|
|
2182
2202
|
var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
|
|
2183
2203
|
if (!fieldName) return;
|
|
2184
2204
|
|
|
2185
2205
|
var value=data[fieldName];
|
|
2186
2206
|
if (!IFrameSplitOperator.IsNumber(value)) return;
|
|
2187
2207
|
|
|
2208
|
+
if (IFrameSplitOperator.IsNumber(column.ColorType))
|
|
2209
|
+
{
|
|
2210
|
+
if (column.ColorType==1)
|
|
2211
|
+
{
|
|
2212
|
+
drawInfo.TextColor=this.GetUpDownColor(value,0);
|
|
2213
|
+
}
|
|
2214
|
+
else if (column.ColorType==2)
|
|
2215
|
+
{
|
|
2216
|
+
drawInfo.TextColor=this.GetUpDownColorV2(value,0);
|
|
2217
|
+
}
|
|
2218
|
+
}
|
|
2219
|
+
|
|
2188
2220
|
//TODO: 不同类型的 格式化输出
|
|
2189
2221
|
drawInfo.Text=value.toFixed(column.FloatPrecision);
|
|
2190
2222
|
}
|
|
@@ -2274,6 +2306,12 @@ function ChartTReport()
|
|
|
2274
2306
|
else return this.UnchangeColor;
|
|
2275
2307
|
}
|
|
2276
2308
|
|
|
2309
|
+
this.GetUpDownColorV2=function(price, price2)
|
|
2310
|
+
{
|
|
2311
|
+
if (price>=price2) return this.UpColor;
|
|
2312
|
+
else return this.DownColor;
|
|
2313
|
+
}
|
|
2314
|
+
|
|
2277
2315
|
this.DrawCell=function(drawInfo)
|
|
2278
2316
|
{
|
|
2279
2317
|
var rtText=drawInfo.RectText;
|
|
@@ -138812,7 +138812,7 @@ function ScrollBarBGChart()
|
|
|
138812
138812
|
|
|
138813
138813
|
|
|
138814
138814
|
|
|
138815
|
-
var HQCHART_VERSION="1.1.
|
|
138815
|
+
var HQCHART_VERSION="1.1.14000";
|
|
138816
138816
|
|
|
138817
138817
|
function PrintHQChartVersion()
|
|
138818
138818
|
{
|
|
@@ -135613,6 +135613,7 @@ function JSTReportChart(divElement)
|
|
|
135613
135613
|
if (IFrameSplitOperator.IsBool(option.EnableDragRow)) chart.EnableDragRow=option.EnableDragRow;
|
|
135614
135614
|
if (IFrameSplitOperator.IsNumber(option.DragRowType)) chart.DragRowType=option.DragRowType;
|
|
135615
135615
|
if (IFrameSplitOperator.IsBool(option.EnableDragHeader)) chart.EnableDragHeader=option.EnableDragHeader;
|
|
135616
|
+
if (IFrameSplitOperator.IsBool(option.EnablePageCycle)) chart.EnablePageCycle=option.EnablePageCycle;
|
|
135616
135617
|
if (option.SortInfo)
|
|
135617
135618
|
{
|
|
135618
135619
|
var item=option.SortInfo;
|
|
@@ -135835,6 +135836,7 @@ function JSTReportChartContainer(uielement)
|
|
|
135835
135836
|
|
|
135836
135837
|
//拖拽滚动条
|
|
135837
135838
|
this.DragXScroll=null; //{Start:{x,y}, End:{x, y}}
|
|
135839
|
+
this.EnablePageCycle=false; //是否循环翻页
|
|
135838
135840
|
|
|
135839
135841
|
this.IsDestroy=false; //是否已经销毁了
|
|
135840
135842
|
|
|
@@ -136652,7 +136654,7 @@ function JSTReportChartContainer(uielement)
|
|
|
136652
136654
|
|
|
136653
136655
|
if (wheelValue<0) //下
|
|
136654
136656
|
{
|
|
136655
|
-
var result=this.MoveSelectedRow(1)
|
|
136657
|
+
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
|
|
136656
136658
|
if (result)
|
|
136657
136659
|
{
|
|
136658
136660
|
if (result.Redraw) this.Draw();
|
|
@@ -136661,7 +136663,7 @@ function JSTReportChartContainer(uielement)
|
|
|
136661
136663
|
}
|
|
136662
136664
|
else if (wheelValue>0) //上
|
|
136663
136665
|
{
|
|
136664
|
-
var result=this.MoveSelectedRow(-1);
|
|
136666
|
+
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
|
|
136665
136667
|
if (result)
|
|
136666
136668
|
{
|
|
136667
136669
|
if (result.Redraw) this.Draw();
|
|
@@ -136699,7 +136701,7 @@ function JSTReportChartContainer(uielement)
|
|
|
136699
136701
|
break;
|
|
136700
136702
|
*/
|
|
136701
136703
|
case 38: //up
|
|
136702
|
-
var result=this.MoveSelectedRow(-1);
|
|
136704
|
+
var result=this.MoveSelectedRow(-1,{EnablePageCycle:this.EnablePageCycle});
|
|
136703
136705
|
if (result)
|
|
136704
136706
|
{
|
|
136705
136707
|
if (result.Redraw) this.Draw();
|
|
@@ -136707,7 +136709,7 @@ function JSTReportChartContainer(uielement)
|
|
|
136707
136709
|
}
|
|
136708
136710
|
break;
|
|
136709
136711
|
case 40: //down
|
|
136710
|
-
var result=this.MoveSelectedRow(1)
|
|
136712
|
+
var result=this.MoveSelectedRow(1, {EnablePageCycle:this.EnablePageCycle} )
|
|
136711
136713
|
if (result)
|
|
136712
136714
|
{
|
|
136713
136715
|
if (result.Redraw) this.Draw();
|
|
@@ -136721,11 +136723,17 @@ function JSTReportChartContainer(uielement)
|
|
|
136721
136723
|
else e.returnValue = false;
|
|
136722
136724
|
}
|
|
136723
136725
|
|
|
136724
|
-
|
|
136726
|
+
//是否循环翻页 { EnablePageCycle: true/false }
|
|
136727
|
+
this.MoveSelectedRow=function(step, option)
|
|
136725
136728
|
{
|
|
136726
136729
|
var chart=this.ChartPaint[0];
|
|
136727
136730
|
if (!chart) return null;
|
|
136728
136731
|
if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
|
|
136732
|
+
var bPageCycle=false;
|
|
136733
|
+
if (option)
|
|
136734
|
+
{
|
|
136735
|
+
if (IFrameSplitOperator.IsBool(option.EnablePageCycle)) bPageCycle=option.EnablePageCycle;
|
|
136736
|
+
}
|
|
136729
136737
|
|
|
136730
136738
|
var result={ Redraw:false, Update:false }; //Redraw=重绘, Update=更新数据
|
|
136731
136739
|
|
|
@@ -136759,6 +136767,9 @@ function JSTReportChartContainer(uielement)
|
|
|
136759
136767
|
var offset=this.Data.YOffset;
|
|
136760
136768
|
for(var i=0;i<step;++i)
|
|
136761
136769
|
{
|
|
136770
|
+
if (selectedIndex+1>=this.Data.Data.length && !bPageCycle)
|
|
136771
|
+
break;
|
|
136772
|
+
|
|
136762
136773
|
++selectedIndex;
|
|
136763
136774
|
if (selectedIndex>pageStatus.End) ++offset;
|
|
136764
136775
|
|
|
@@ -136790,10 +136801,13 @@ function JSTReportChartContainer(uielement)
|
|
|
136790
136801
|
var offset=this.Data.YOffset;
|
|
136791
136802
|
for(var i=0;i<step;++i)
|
|
136792
136803
|
{
|
|
136804
|
+
if (selectedIndex<=0 && !bPageCycle) //不能循环翻页
|
|
136805
|
+
break;
|
|
136806
|
+
|
|
136793
136807
|
--selectedIndex;
|
|
136794
136808
|
if (selectedIndex<pageStatus.Start) --offset;
|
|
136795
136809
|
|
|
136796
|
-
if (selectedIndex<0)
|
|
136810
|
+
if (selectedIndex<0) //自动翻到最后一页
|
|
136797
136811
|
{
|
|
136798
136812
|
selectedIndex=this.Data.Data.length-1;
|
|
136799
136813
|
offset=this.Data.Data.length-pageSize;
|
|
@@ -137179,6 +137193,8 @@ function ChartTReport()
|
|
|
137179
137193
|
if (IFrameSplitOperator.IsBool(item.EnableTooltip)) colItem.EnableTooltip=item.EnableTooltip;
|
|
137180
137194
|
if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
|
|
137181
137195
|
if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision; //小数位数
|
|
137196
|
+
if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType; //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
|
|
137197
|
+
if (item.DefaultText) colItem.DefaultText=item.DefaultText;
|
|
137182
137198
|
|
|
137183
137199
|
if (item.Sort==1) //1本地排序 2=远程排序
|
|
137184
137200
|
{
|
|
@@ -137649,6 +137665,8 @@ function ChartTReport()
|
|
|
137649
137665
|
case TREPORT_COLUMN_ID.SELL_VOL_ID: //卖量
|
|
137650
137666
|
case TREPORT_COLUMN_ID.BUY_VOL_ID: //买量
|
|
137651
137667
|
case TREPORT_COLUMN_ID.POSITION_ID: //持仓量
|
|
137668
|
+
case TREPORT_COLUMN_ID.VOL_ID: //成交量
|
|
137669
|
+
case TREPORT_COLUMN_ID.AMOUNT_ID: //成交金额
|
|
137652
137670
|
var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
|
|
137653
137671
|
if (fieldName) drawInfo.Text=this.FormatVolString(data[fieldName]);
|
|
137654
137672
|
break;
|
|
@@ -137696,12 +137714,26 @@ function ChartTReport()
|
|
|
137696
137714
|
|
|
137697
137715
|
this.FormatReserveNumber=function(column, data, drawInfo)
|
|
137698
137716
|
{
|
|
137717
|
+
if (column.DefaultText) drawInfo.Text=column.DefaultText;
|
|
137718
|
+
|
|
137699
137719
|
var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
|
|
137700
137720
|
if (!fieldName) return;
|
|
137701
137721
|
|
|
137702
137722
|
var value=data[fieldName];
|
|
137703
137723
|
if (!IFrameSplitOperator.IsNumber(value)) return;
|
|
137704
137724
|
|
|
137725
|
+
if (IFrameSplitOperator.IsNumber(column.ColorType))
|
|
137726
|
+
{
|
|
137727
|
+
if (column.ColorType==1)
|
|
137728
|
+
{
|
|
137729
|
+
drawInfo.TextColor=this.GetUpDownColor(value,0);
|
|
137730
|
+
}
|
|
137731
|
+
else if (column.ColorType==2)
|
|
137732
|
+
{
|
|
137733
|
+
drawInfo.TextColor=this.GetUpDownColorV2(value,0);
|
|
137734
|
+
}
|
|
137735
|
+
}
|
|
137736
|
+
|
|
137705
137737
|
//TODO: 不同类型的 格式化输出
|
|
137706
137738
|
drawInfo.Text=value.toFixed(column.FloatPrecision);
|
|
137707
137739
|
}
|
|
@@ -137791,6 +137823,12 @@ function ChartTReport()
|
|
|
137791
137823
|
else return this.UnchangeColor;
|
|
137792
137824
|
}
|
|
137793
137825
|
|
|
137826
|
+
this.GetUpDownColorV2=function(price, price2)
|
|
137827
|
+
{
|
|
137828
|
+
if (price>=price2) return this.UpColor;
|
|
137829
|
+
else return this.DownColor;
|
|
137830
|
+
}
|
|
137831
|
+
|
|
137794
137832
|
this.DrawCell=function(drawInfo)
|
|
137795
137833
|
{
|
|
137796
137834
|
var rtText=drawInfo.RectText;
|
|
@@ -145194,7 +145232,7 @@ function HQChartScriptWorker()
|
|
|
145194
145232
|
|
|
145195
145233
|
|
|
145196
145234
|
|
|
145197
|
-
var HQCHART_VERSION="1.1.
|
|
145235
|
+
var HQCHART_VERSION="1.1.14000";
|
|
145198
145236
|
|
|
145199
145237
|
function PrintHQChartVersion()
|
|
145200
145238
|
{
|