hqchart 1.1.14033 → 1.1.14037
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
|
@@ -12813,7 +12813,7 @@ if(chart.MultiSelectModel==1){var pageStatus=chart.GetCurrentPageStatus();if(IFr
|
|
|
12813
12813
|
{var pageStatus=chart.GetCurrentPageStatus();var pageSize=pageStatus.End-pageStatus.Start+1;var selected=pageStatus.SelectedRow;if(step>0){selected+=step;selected=selected%pageSize;chart.SelectedRow=selected;chart.SelectedFixedRow=-1;result.Redraw=true;return result;}else if(step<0){selected+=step;if(selected<0){selected=selected%pageSize;selected=pageSize+selected;}chart.SelectedRow=selected;chart.SelectedFixedRow=-1;result.Redraw=true;return result;}}else if(chart.SelectedModel==1)//可翻页模式
|
|
12814
12814
|
{var pageStatus=chart.GetCurrentPageStatus();var pageSize=pageStatus.PageSize;var selected=pageStatus.SelectedRow;if(step>0){if(selected<0||selected<pageStatus.Start||selected>pageStatus.End){chart.SelectedRow=pageStatus.Start;result.Redraw=true;return result;}var offset=this.Data.YOffset;for(var i=0;i<step;++i){++selected;if(selected>pageStatus.End)++offset;if(selected>=this.Data.Data.length){selected=0;offset=0;}}result.Redraw=true;result.Update=offset!=this.Data.YOffset;chart.SelectedRow=selected;this.Data.YOffset=offset;return result;}else if(step<0){if(selected<0||selected<pageStatus.Start||selected>pageStatus.End){chart.SelectedRow=pageStatus.End;result.Redraw=true;return result;}step=Math.abs(step);var offset=this.Data.YOffset;for(var i=0;i<step;++i){--selected;if(selected<pageStatus.Start)--offset;if(selected<0){selected=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=selected;this.Data.YOffset=offset;return result;}}return null;};//左右移动
|
|
12815
12815
|
this.MoveXOffset=function(step){var chart=this.ChartPaint[0];if(!chart)return false;var maxOffset=chart.GetXScrollRange();if(maxOffset<=0)return false;if(step>0){if(this.Data.XOffset>=maxOffset)return false;for(var i=0;i<step;++i){if(this.Data.XOffset>=maxOffset)break;++this.Data.XOffset;}return true;}else if(step<0){if(this.Data.XOffset<=0)return false;step=Math.abs(step);for(var i=0;i<step;++i){if(this.Data.XOffset-1<0)break;--this.Data.XOffset;}return true;}return false;};this.SetXOffset=function(pos){if(!IFrameSplitOperator.IsNumber(pos))return false;var chart=this.ChartPaint[0];if(!chart)return false;var maxOffset=chart.GetXScrollRange();if(pos<0)pos=0;if(pos>maxOffset)pos=maxOffset;this.Data.XOffset=pos;return true;};this.SetYOffset=function(pos){if(!IFrameSplitOperator.IsNumber(pos))return false;var chart=this.ChartPaint[0];if(!chart)return false;var maxOffset=chart.GetYScrollRange();if(pos<0)pos=0;if(pos>maxOffset)pos=maxOffset;this.Data.YOffset=pos;return true;};this.GotoLastPage=function(){var chart=this.ChartPaint[0];if(!chart)return;//显示最后一屏
|
|
12816
|
-
var pageSize=chart.GetPageSize(true);var offset=this.Data.Data.length-pageSize;if(offset<0)offset=0;this.Data.DataOffset=offset;};this.SetColumn=function(aryColunm,option){var chart=this.ChartPaint[0];if(!chart)return;chart.SetColumn(aryColunm);chart.SizeChange=true;if(option&&option.Redraw)this.Draw();};this.SetTab=function(aryTab,option){var chart=this.ChartPaint[0];;if(!chart)return;var chartTab=chart.Tab;if(!chartTab)return;chartTab.SetTabList(aryTab);if(option&&option.Redraw)this.Draw();};this.SetVScrollbar=function(option){var chart=this.GetReportChart();if(!chart)return;var scrollbar=chart.VScrollbar;if(!scrollbar)return;
|
|
12816
|
+
var pageSize=chart.GetPageSize(true);var offset=this.Data.Data.length-pageSize;if(offset<0)offset=0;this.Data.DataOffset=offset;};this.SetColumn=function(aryColunm,option){var chart=this.ChartPaint[0];if(!chart)return;chart.SetColumn(aryColunm);chart.SizeChange=true;if(option&&option.Redraw)this.Draw();};this.SetTab=function(aryTab,option){var chart=this.ChartPaint[0];;if(!chart)return;var chartTab=chart.Tab;if(!chartTab)return;chartTab.SetTabList(aryTab);if(option&&option.Redraw)this.Draw();};this.SetVScrollbar=function(option){var chart=this.GetReportChart();if(!chart)return;var scrollbar=chart.VScrollbar;if(!scrollbar)return;scrollbar.SetOption(option);};this.SetSelectedTab=function(index,opiton){var chart=this.ChartPaint[0];;if(!chart)return;var chartTab=chart.Tab;if(!chartTab)return;chartTab.SelectedTabIndex=index;};this.ReloadResource=function(option){this.Frame.ReloadResource(option);for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.ReloadResource)item.ReloadResource(option);}if(option&&option.Redraw){this.SetSizeChange(true);this.Draw();}};//列排序
|
|
12817
12817
|
this.SortColumn=function(index,sortType){var _this58=this;if(index<0)return false;var reportChart=this.GetReportChart();if(!reportChart)return false;var column=reportChart.Column[index];if(!column)return false;if(column.Sort!=1&&column.Sort!=2)return false;var sortInfo={Field:index,Sort:sortType};if(this.Data.Virtual&&this.Data.Virtual.Enable){this.SortInfo.Field=sortInfo.Field;this.SortInfo.Sort=sortInfo.Sort;this.Data.YOffset=0;this.ResetReportSelectStatus();this.RequestVirtualStockData();//虚拟表格
|
|
12818
12818
|
return true;}else if(sortInfo.Sort==0)//不排序还原
|
|
12819
12819
|
{this.Data.Data=[];if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))this.Data.Data=this.SourceData.Data.slice();}else if(sortInfo.Sort==1||sortInfo.Sort==2){if(column.Sort==1)//本地排序
|
|
@@ -13027,7 +13027,7 @@ switch(column.ColorType){case 1:drawInfo.TextColor=this.GetUpDownColor(value,0);
|
|
|
13027
13027
|
{this.GetCustomTextDrawInfo(column,data.Symbol,value,drawInfo,data);return;}if(column.ValueType==0){if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(value,"YYYY/MM/DD");else drawInfo.Text=IFrameSplitOperator.FormatDateString(value);}};this.GetCustomIconDrawInfo=function(data,column,drawInfo){if(column.IsDrawCallback)//外部处理输出格式
|
|
13028
13028
|
{this.GetCustomIconData(column,data.Symbol,drawInfo,data);return;}};this.GetCustomCheckBoxDrawInfo=function(data,column,drawInfo){var checkData=this.GetExtendData(data,column);if(!checkData)return;if(!IFrameSplitOperator.IsBool(checkData.Checked))return;drawInfo.Checked=checkData.Checked;drawInfo.Enable=true;drawInfo.Data=checkData;if(IFrameSplitOperator.IsBool(checkData.DisableCheckBox))drawInfo.Enable=!checkData.DisableCheckBox;drawInfo.CheckBox=column.CheckBox;};this.GetCustomButtonDrawInfo=function(data,column,drawInfo){var buttonData=this.GetExtendData(data,column);if(!buttonData)return;drawInfo.Text=buttonData.Title;drawInfo.Button=column.Button;drawInfo.Font=column.Button.Font;drawInfo.Enable=true;drawInfo.Data=buttonData;if(IFrameSplitOperator.IsBool(buttonData.Enable))drawInfo.Enable=buttonData.Enable;};this.GetCustomProgressBarDrawInfo=function(data,column,drawInfo){var barData=this.GetExtendData(data,column);if(!barData)return;drawInfo.Text=barData.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=barData.Value;//占比
|
|
13029
13029
|
drawInfo.Data=barData;if(IFrameSplitOperator.IsBool(barData.Enable))drawInfo.Enable=barData.Enable;if(barData.TextColor)drawInfo.TextColor=barData.TextColor;if(barData.BarColor)drawInfo.BarColor=barData.BarColor;if(barData.BGColor)drawInfo.BGColor=barData.BGColor;};this.GetCustomLinkDrawInfo=function(data,column,drawInfo){var linkData=this.GetExtendData(data,column);if(!linkData)return;drawInfo.Text=linkData.Title;drawInfo.Link=column.Link;drawInfo.Enable=true;drawInfo.Data=linkData;drawInfo.MaxText=column.MaxText;if(IFrameSplitOperator.IsBool(linkData.Enable))drawInfo.Enable=linkData.Enable;if(linkData.TextColor)drawInfo.TextColor=linkData.TextColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!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: 不同类型的 格式化输出
|
|
13030
|
-
drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var
|
|
13030
|
+
drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.FormaTimeDrawInfo=function(column,stock,drawInfo,data){if(!IFrameSplitOperator.IsNumber(stock.Time))return;if(column.ValueType==0)//0=hhmm 1=hhmmss 2=hhmmss.fff
|
|
13031
13031
|
{drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM");}else if(column.ValueType==1){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS");}else if(column.ValueType==2){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS.fff");}};this.FormaDateDrawInfo=function(column,stock,drawInfo,data){if(!IFrameSplitOperator.IsNumber(stock.Date))return;if(column.FormatType==0)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");else if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");else if(column.FormatType==2)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");else if(column.FormatType==3)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");};//自定义图标
|
|
13032
13032
|
this.GetCustomIconData=function(columnInfo,symbol,drawInfo,data){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAW_CUSTOM_ICON);if(!event||!event.Callback)return false;var sendData={Symbol:symbol,Column:columnInfo,Data:data,Out:{Text:null,TextColor:null,TextAlign:null,Font:null}};event.Callback(event,sendData,this);if(sendData.Out.Text)drawInfo.Text=sendData.Out.Text;if(sendData.Out.TextColor)drawInfo.TextColor=sendData.Out.TextColor;if(sendData.Out.TextAlign)drawInfo.TextAlign=sendData.Out.TextAlign;if(sendData.Out.BGColor)drawInfo.BGColor=sendData.Out.BGColor;if(sendData.Out.Font)drawInfo.Font=sendData.Out.Font;return true;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo,option){if(!IFrameSplitOperator.IsNumber(price))return false;drawInfo.Text=price.toFixed(data.Decimal);var yClose=null;if(stock.PriceColorType===1)//昨结算价 计算颜色
|
|
13033
13033
|
{if(IFrameSplitOperator.IsNumber(stock.YFClose))yClose=stock.YFClose;}else//昨收价 计算颜色
|
|
@@ -13113,8 +13113,12 @@ this.IsDrawFirst=false;this.GetEventCallback;//获取事件
|
|
|
13113
13113
|
this.Report;this.MaxPos=15;//滚动条可移动长度
|
|
13114
13114
|
this.CurrentPos=15;//当前滚动条移动位置
|
|
13115
13115
|
this.Step=1;//滚动条移动步长
|
|
13116
|
-
this.ButtonSize=25;this.Enable=false;this.LastStatus={Draw:false};this.GlobalOption;this.
|
|
13117
|
-
this.
|
|
13116
|
+
this.ButtonSize=25;this.Enable=false;this.LastStatus={Draw:false};this.GlobalOption;this.Style=0;//0=滚动条+按钮 1=滚动条
|
|
13117
|
+
this.ScrollBarHeight=g_JSChartResource.Report.VScrollbar.ScrollBarHeight;this.ButtonColor=g_JSChartResource.Report.VScrollbar.ButtonColor;this.BarColor=g_JSChartResource.Report.VScrollbar.BarColor;this.BorderColor=g_JSChartResource.Report.VScrollbar.BorderColor;this.BGColor=g_JSChartResource.Report.VScrollbar.BGColor;this.Margin={Left:2,Right:2,Top:2,Bottom:2};this.BarWithConfig={Size:g_JSChartResource.Report.VScrollbar.BarWidth.Size};this.RectScroll={Top:null,Bottom:null,Bar:null,Client:null};//滚动条区域
|
|
13118
|
+
//this.BarWithConfig.Size=2;
|
|
13119
|
+
//this.Mergin={ Left:1, Right:1, Top:1, Bottom:1 };
|
|
13120
|
+
this.SetOption=function(option){if(!option)return;if(IFrameSplitOperator.IsBool(option.Enable))this.Enable=option.Enable;if(IFrameSplitOperator.IsNumber(option.Style))this.Style=option.Style;if(IFrameSplitOperator.IsNumber(option.BarWidth))this.BarWithConfig.Size=option.BarWidth;if(option.Margin){var item=option.Margin;if(IFrameSplitOperator.IsNumber(item.Top))this.Margin.Top=item.Top;if(IFrameSplitOperator.IsNumber(item.Bottom))this.Margin.Bottom=item.Bottom;if(IFrameSplitOperator.IsNumber(item.Left))this.Margin.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))this.Margin.Right=item.Right;}};this.ReloadResource=function(resource){this.ScrollBarHeight=g_JSChartResource.Report.VScrollbar.ScrollBarHeight;this.ButtonColor=g_JSChartResource.Report.VScrollbar.ButtonColor;this.BarColor=g_JSChartResource.Report.VScrollbar.BarColor;this.BorderColor=g_JSChartResource.Report.VScrollbar.BorderColor;this.BGColor=g_JSChartResource.Report.VScrollbar.BGColor;this.BarWithConfig={Size:g_JSChartResource.Report.VScrollbar.BarWidth.Size};};this.CalculateSize=function(){var pixelRatio=GetDevicePixelRatio();var width=this.BarWithConfig.Size*pixelRatio+this.Margin.Left+this.Margin.Right;this.ButtonSize=Math.min(25,width);};//不带上下按钮的滚动条样式
|
|
13121
|
+
this.DrawScrollbarStyle2=function(left,top,right,bottom){this.LastStatus.Draw=false;this.RectScroll={Left:null,Right:null,Bar:null,Client:null};if(!this.Enable)return;var isShow=this.IsShowCallback();if(!isShow)return;var pageInfo=this.Report.GetCurrentPageStatus();if(pageInfo.IsSinglePage)return;var xOffset=pageInfo.Start;var dataCount=pageInfo.DataCount-pageInfo.PageSize;var buttonSize=this.ButtonSize;this.MaxPos=dataCount;this.CurrentPos=xOffset;var scrollTop=top+this.Margin.Top+2;var scrollBottom=bottom-this.Margin.Bottom-2;var centerHeight=scrollBottom-scrollTop;var value=centerHeight-this.ScrollBarHeight;var yOffset=value*this.CurrentPos/this.MaxPos;var y=scrollTop+2+yOffset;var rtBar={Right:right-this.Margin.Right,Top:y,Width:buttonSize,Height:this.ScrollBarHeight};rtBar.Left=rtBar.Right-buttonSize;rtBar.Bottom=rtBar.Top+rtBar.Height;if(rtBar.Bottom>scrollBottom-2){rtBar.Bottom=scrollBottom-2;rtBar.Top=rtBar.Bottom-rtBar.Height;}this.RectScroll.Bar=rtBar;this.RectScroll.Client={Left:rtBar.Left,Right:rtBar.Right,Top:scrollTop,Bottom:scrollBottom};var rtBG={Right:right,Top:top,Bottom:bottom,Width:buttonSize+this.Margin.Right+this.Margin.Left};rtBG.Left=rtBG.Right-rtBG.Width;rtBG.Height=rtBG.Bottom-rtBG.Top;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.fillStyle=this.BarColor;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.LastStatus.Draw=true;};this.DrawScrollbarStyle=function(left,top,right,bottom){this.LastStatus.Draw=false;this.RectScroll={Left:null,Right:null,Bar:null,Client:null};if(!this.Enable)return;var isShow=this.IsShowCallback();if(!isShow)return;var pageInfo=this.Report.GetCurrentPageStatus();if(pageInfo.IsSinglePage)return;var xOffset=pageInfo.Start;var dataCount=pageInfo.DataCount-pageInfo.PageSize;var buttonSize=this.ButtonSize;this.MaxPos=dataCount;this.CurrentPos=xOffset;var rtTop={Right:right-this.Margin.Right,Top:top+this.Margin.Top,Width:buttonSize,Height:buttonSize};rtTop.Left=rtTop.Right-buttonSize;rtTop.Bottom=rtTop.Top+buttonSize;var rtBottom={Right:right-this.Margin.Right,Bottom:bottom-this.Margin.Bottom,Width:buttonSize,Height:buttonSize};rtBottom.Left=rtBottom.Right-buttonSize;rtBottom.Top=rtBottom.Bottom-buttonSize;var centerHeight=rtBottom.Top-2-(rtTop.Bottom+2);var value=centerHeight-this.ScrollBarHeight;var yOffset=value*this.CurrentPos/this.MaxPos;var y=rtTop.Bottom+2+yOffset;var rtBar={Right:right-this.Margin.Right,Top:y,Width:buttonSize,Height:this.ScrollBarHeight};rtBar.Left=rtBar.Right-buttonSize;rtBar.Bottom=rtBar.Top+rtBar.Height;if(rtBar.Bottom>rtBottom.Top-2){rtBar.Bottom=rtBottom.Top-2;rtBar.Top=rtBar.Bottom-rtBar.Height;}this.RectScroll.Top=rtTop;this.RectScroll.Bottom=rtBottom;this.RectScroll.Bar=rtBar;this.RectScroll.Client={Left:rtTop.Left,Right:rtTop.Right,Top:rtTop.Bottom,Bottom:rtBottom.Top};var rtBG={Right:right,Top:top,Bottom:bottom,Width:buttonSize+this.Margin.Right+this.Margin.Left};rtBG.Left=rtBG.Right-rtBG.Width;rtBG.Height=rtBG.Bottom-rtBG.Top;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);this.Canvas.fillStyle=this.ButtonColor;this.Canvas.fillRect(rtTop.Left,rtTop.Top,rtTop.Width,rtTop.Height);this.Canvas.fillRect(rtBottom.Left,rtBottom.Top,rtBottom.Width,rtBottom.Height);this.Canvas.strokeStyle=this.BorderColor;this.Canvas.strokeRect(rtTop.Left,rtTop.Top,rtTop.Width,rtTop.Height);this.Canvas.strokeRect(rtBottom.Left,rtBottom.Top,rtBottom.Width,rtBottom.Height);this.Canvas.fillStyle=this.BarColor;this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);this.LastStatus.Draw=true;};this.DrawScrollbar=function(left,top,right,bottom){if(this.Style==1)this.DrawScrollbarStyle2(left,top,right,bottom);else this.DrawScrollbarStyle(left,top,right,bottom);};this.OnMouseDown=function(x,y,e){return this.PtInScroll(x,y);};// Type 1-4 滚动条
|
|
13118
13122
|
this.PtInScroll=function(x,y){if(!this.RectScroll)return null;if(this.RectScroll.Top){var rtItem=this.RectScroll.Top;if(x>=rtItem.Left&&x<=rtItem.Right&&y>=rtItem.Top&&y<=rtItem.Bottom)return{Type:1,Rect:rtItem};}if(this.RectScroll.Bottom){var rtItem=this.RectScroll.Bottom;if(x>=rtItem.Left&&x<=rtItem.Right&&y>=rtItem.Top&&y<=rtItem.Bottom)return{Type:2,Rect:rtItem};}if(this.RectScroll.Bar){var rtItem=this.RectScroll.Bar;if(x>=rtItem.Left&&x<=rtItem.Right&&y>=rtItem.Top&&y<=rtItem.Bottom)return{Type:3,Rect:rtItem};}if(this.RectScroll.Client){var rtItem=this.RectScroll.Client;if(x>=rtItem.Left&&x<=rtItem.Right&&y>=rtItem.Top&&y<=rtItem.Bottom){return{Type:4,Rect:rtItem,Pos:this.GetScrollPostionByPoint(x,y)};}}return null;};this.GetScrollPostionByPoint=function(x,y){var rtItem=this.RectScroll.Client;var value=rtItem.Bottom-rtItem.Top-this.ScrollBarHeight;var pos=parseInt(this.MaxPos*(y-rtItem.Top)/value);return pos;};}function ChartCellTooltip(){this.Canvas;//画布
|
|
13119
13123
|
this.ChartBorder;//边框信息
|
|
13120
13124
|
this.ChartFrame;//框架画法
|
|
@@ -13930,7 +13934,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13930
13934
|
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);};}/********************************************************************************
|
|
13931
13935
|
* 版本信息输出
|
|
13932
13936
|
*
|
|
13933
|
-
*/var HQCHART_VERSION="1.1.
|
|
13937
|
+
*/var HQCHART_VERSION="1.1.14036";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();//把给外界调用的方法暴露出来
|
|
13934
13938
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13935
13939
|
// BaseIndex:BaseIndex,
|
|
13936
13940
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -3098,7 +3098,7 @@ function JSReportChartContainer(uielement)
|
|
|
3098
3098
|
var scrollbar=chart.VScrollbar;
|
|
3099
3099
|
if (!scrollbar) return;
|
|
3100
3100
|
|
|
3101
|
-
|
|
3101
|
+
scrollbar.SetOption(option);
|
|
3102
3102
|
}
|
|
3103
3103
|
|
|
3104
3104
|
this.SetSelectedTab=function(index, opiton)
|
|
@@ -6328,10 +6328,17 @@ function ChartReport()
|
|
|
6328
6328
|
var fieldName=MAP_COLUMN_FIELD.get(column.Type);
|
|
6329
6329
|
if (!fieldName) return;
|
|
6330
6330
|
|
|
6331
|
-
var
|
|
6332
|
-
if (
|
|
6333
|
-
|
|
6334
|
-
|
|
6331
|
+
var item=data[fieldName];
|
|
6332
|
+
if (IFrameSplitOperator.IsObject(item))
|
|
6333
|
+
{
|
|
6334
|
+
if (item.Text) drawInfo.Text=item.Text;
|
|
6335
|
+
if (item.TextColor) drawInfo.TextColor=item.TextColor;
|
|
6336
|
+
if (item.BGColor) drawInfo.BGColor=item.BGColor;
|
|
6337
|
+
}
|
|
6338
|
+
else if (IFrameSplitOperator.IsString(item))
|
|
6339
|
+
{
|
|
6340
|
+
drawInfo.Text=item;
|
|
6341
|
+
}
|
|
6335
6342
|
}
|
|
6336
6343
|
|
|
6337
6344
|
this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
|
|
@@ -8349,15 +8356,37 @@ function ChartVScrollbar()
|
|
|
8349
8356
|
this.LastStatus={ Draw:false, };
|
|
8350
8357
|
this.GlobalOption;
|
|
8351
8358
|
|
|
8359
|
+
this.Style=0; //0=滚动条+按钮 1=滚动条
|
|
8360
|
+
|
|
8352
8361
|
this.ScrollBarHeight=g_JSChartResource.Report.VScrollbar.ScrollBarHeight;
|
|
8353
8362
|
this.ButtonColor=g_JSChartResource.Report.VScrollbar.ButtonColor;
|
|
8354
8363
|
this.BarColor=g_JSChartResource.Report.VScrollbar.BarColor;
|
|
8355
8364
|
this.BorderColor=g_JSChartResource.Report.VScrollbar.BorderColor;
|
|
8356
8365
|
this.BGColor=g_JSChartResource.Report.VScrollbar.BGColor;
|
|
8357
|
-
this.
|
|
8366
|
+
this.Margin={ Left:2, Right:2, Top:2, Bottom:2 };
|
|
8358
8367
|
this.BarWithConfig={ Size:g_JSChartResource.Report.VScrollbar.BarWidth.Size };
|
|
8359
8368
|
|
|
8360
8369
|
this.RectScroll={ Top:null, Bottom:null, Bar:null, Client:null }; //滚动条区域
|
|
8370
|
+
|
|
8371
|
+
//this.BarWithConfig.Size=2;
|
|
8372
|
+
//this.Mergin={ Left:1, Right:1, Top:1, Bottom:1 };
|
|
8373
|
+
|
|
8374
|
+
this.SetOption=function(option)
|
|
8375
|
+
{
|
|
8376
|
+
if (!option) return;
|
|
8377
|
+
|
|
8378
|
+
if (IFrameSplitOperator.IsBool(option.Enable)) this.Enable=option.Enable;
|
|
8379
|
+
if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
|
|
8380
|
+
if (IFrameSplitOperator.IsNumber(option.BarWidth)) this.BarWithConfig.Size=option.BarWidth;
|
|
8381
|
+
if (option.Margin)
|
|
8382
|
+
{
|
|
8383
|
+
var item=option.Margin;
|
|
8384
|
+
if (IFrameSplitOperator.IsNumber(item.Top)) this.Margin.Top=item.Top;
|
|
8385
|
+
if (IFrameSplitOperator.IsNumber(item.Bottom)) this.Margin.Bottom=item.Bottom;
|
|
8386
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.Margin.Left=item.Left;
|
|
8387
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.Margin.Right=item.Right;
|
|
8388
|
+
}
|
|
8389
|
+
}
|
|
8361
8390
|
|
|
8362
8391
|
this.ReloadResource=function(resource)
|
|
8363
8392
|
{
|
|
@@ -8373,11 +8402,12 @@ function ChartVScrollbar()
|
|
|
8373
8402
|
{
|
|
8374
8403
|
var pixelRatio=GetDevicePixelRatio();
|
|
8375
8404
|
|
|
8376
|
-
var width=this.BarWithConfig.Size*pixelRatio+this.
|
|
8405
|
+
var width=this.BarWithConfig.Size*pixelRatio+this.Margin.Left+this.Margin.Right;
|
|
8377
8406
|
this.ButtonSize=Math.min(25, width);
|
|
8378
8407
|
}
|
|
8379
8408
|
|
|
8380
|
-
|
|
8409
|
+
//不带上下按钮的滚动条样式
|
|
8410
|
+
this.DrawScrollbarStyle2=function(left, top, right, bottom)
|
|
8381
8411
|
{
|
|
8382
8412
|
this.LastStatus.Draw=false;
|
|
8383
8413
|
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
@@ -8396,11 +8426,61 @@ function ChartVScrollbar()
|
|
|
8396
8426
|
this.MaxPos=dataCount;
|
|
8397
8427
|
this.CurrentPos=xOffset;
|
|
8398
8428
|
|
|
8399
|
-
var
|
|
8429
|
+
var scrollTop=top+this.Margin.Top+2;
|
|
8430
|
+
var scrollBottom=bottom-this.Margin.Bottom-2;
|
|
8431
|
+
var centerHeight=scrollBottom-scrollTop;
|
|
8432
|
+
var value = centerHeight - this.ScrollBarHeight;
|
|
8433
|
+
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
8434
|
+
var y = scrollTop + 2 + yOffset;
|
|
8435
|
+
|
|
8436
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
8437
|
+
rtBar.Left=rtBar.Right-buttonSize;
|
|
8438
|
+
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
8439
|
+
if (rtBar.Bottom>scrollBottom-2)
|
|
8440
|
+
{
|
|
8441
|
+
rtBar.Bottom=scrollBottom-2;
|
|
8442
|
+
rtBar.Top=rtBar.Bottom-rtBar.Height;
|
|
8443
|
+
}
|
|
8444
|
+
|
|
8445
|
+
this.RectScroll.Bar=rtBar;
|
|
8446
|
+
this.RectScroll.Client={ Left:rtBar.Left, Right: rtBar.Right, Top:scrollTop, Bottom:scrollBottom };
|
|
8447
|
+
|
|
8448
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
8449
|
+
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
8450
|
+
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
8451
|
+
this.Canvas.fillStyle=this.BGColor;
|
|
8452
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
8453
|
+
|
|
8454
|
+
this.Canvas.fillStyle=this.BarColor;
|
|
8455
|
+
this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);
|
|
8456
|
+
|
|
8457
|
+
this.LastStatus.Draw=true;
|
|
8458
|
+
}
|
|
8459
|
+
|
|
8460
|
+
this.DrawScrollbarStyle=function(left, top, right, bottom)
|
|
8461
|
+
{
|
|
8462
|
+
this.LastStatus.Draw=false;
|
|
8463
|
+
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
8464
|
+
if (!this.Enable) return;
|
|
8465
|
+
|
|
8466
|
+
var isShow=this.IsShowCallback();
|
|
8467
|
+
if (!isShow) return;
|
|
8468
|
+
|
|
8469
|
+
var pageInfo=this.Report.GetCurrentPageStatus();
|
|
8470
|
+
if (pageInfo.IsSinglePage) return;
|
|
8471
|
+
|
|
8472
|
+
var xOffset=pageInfo.Start;
|
|
8473
|
+
var dataCount=pageInfo.DataCount-pageInfo.PageSize;
|
|
8474
|
+
var buttonSize=this.ButtonSize;
|
|
8475
|
+
|
|
8476
|
+
this.MaxPos=dataCount;
|
|
8477
|
+
this.CurrentPos=xOffset;
|
|
8478
|
+
|
|
8479
|
+
var rtTop={ Right:right-this.Margin.Right, Top:top+this.Margin.Top, Width:buttonSize, Height:buttonSize };
|
|
8400
8480
|
rtTop.Left=rtTop.Right-buttonSize;
|
|
8401
8481
|
rtTop.Bottom=rtTop.Top+buttonSize;
|
|
8402
8482
|
|
|
8403
|
-
var rtBottom={ Right:right-this.
|
|
8483
|
+
var rtBottom={ Right:right-this.Margin.Right, Bottom:bottom-this.Margin.Bottom, Width:buttonSize, Height:buttonSize };
|
|
8404
8484
|
rtBottom.Left=rtBottom.Right-buttonSize;
|
|
8405
8485
|
rtBottom.Top=rtBottom.Bottom-buttonSize;
|
|
8406
8486
|
|
|
@@ -8409,7 +8489,7 @@ function ChartVScrollbar()
|
|
|
8409
8489
|
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
8410
8490
|
var y = rtTop.Bottom + 2 + yOffset;
|
|
8411
8491
|
|
|
8412
|
-
var rtBar = {Right:right-this.
|
|
8492
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
8413
8493
|
rtBar.Left=rtBar.Right-buttonSize;
|
|
8414
8494
|
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
8415
8495
|
if (rtBar.Bottom>rtBottom.Top-2)
|
|
@@ -8423,7 +8503,7 @@ function ChartVScrollbar()
|
|
|
8423
8503
|
this.RectScroll.Bar=rtBar;
|
|
8424
8504
|
this.RectScroll.Client={ Left:rtTop.Left, Right: rtTop.Right, Top:rtTop.Bottom, Bottom:rtBottom.Top };
|
|
8425
8505
|
|
|
8426
|
-
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.
|
|
8506
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
8427
8507
|
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
8428
8508
|
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
8429
8509
|
this.Canvas.fillStyle=this.BGColor;
|
|
@@ -8443,6 +8523,14 @@ function ChartVScrollbar()
|
|
|
8443
8523
|
this.LastStatus.Draw=true;
|
|
8444
8524
|
}
|
|
8445
8525
|
|
|
8526
|
+
this.DrawScrollbar=function(left, top, right, bottom)
|
|
8527
|
+
{
|
|
8528
|
+
if (this.Style==1)
|
|
8529
|
+
this.DrawScrollbarStyle2(left, top, right, bottom);
|
|
8530
|
+
else
|
|
8531
|
+
this.DrawScrollbarStyle(left, top, right, bottom);
|
|
8532
|
+
}
|
|
8533
|
+
|
|
8446
8534
|
this.OnMouseDown=function(x,y, e)
|
|
8447
8535
|
{
|
|
8448
8536
|
return this.PtInScroll(x,y);
|
|
@@ -130276,7 +130276,7 @@ function JSReportChartContainer(uielement)
|
|
|
130276
130276
|
var scrollbar=chart.VScrollbar;
|
|
130277
130277
|
if (!scrollbar) return;
|
|
130278
130278
|
|
|
130279
|
-
|
|
130279
|
+
scrollbar.SetOption(option);
|
|
130280
130280
|
}
|
|
130281
130281
|
|
|
130282
130282
|
this.SetSelectedTab=function(index, opiton)
|
|
@@ -133506,10 +133506,17 @@ function ChartReport()
|
|
|
133506
133506
|
var fieldName=MAP_COLUMN_FIELD.get(column.Type);
|
|
133507
133507
|
if (!fieldName) return;
|
|
133508
133508
|
|
|
133509
|
-
var
|
|
133510
|
-
if (
|
|
133511
|
-
|
|
133512
|
-
|
|
133509
|
+
var item=data[fieldName];
|
|
133510
|
+
if (IFrameSplitOperator.IsObject(item))
|
|
133511
|
+
{
|
|
133512
|
+
if (item.Text) drawInfo.Text=item.Text;
|
|
133513
|
+
if (item.TextColor) drawInfo.TextColor=item.TextColor;
|
|
133514
|
+
if (item.BGColor) drawInfo.BGColor=item.BGColor;
|
|
133515
|
+
}
|
|
133516
|
+
else if (IFrameSplitOperator.IsString(item))
|
|
133517
|
+
{
|
|
133518
|
+
drawInfo.Text=item;
|
|
133519
|
+
}
|
|
133513
133520
|
}
|
|
133514
133521
|
|
|
133515
133522
|
this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
|
|
@@ -135527,15 +135534,37 @@ function ChartVScrollbar()
|
|
|
135527
135534
|
this.LastStatus={ Draw:false, };
|
|
135528
135535
|
this.GlobalOption;
|
|
135529
135536
|
|
|
135537
|
+
this.Style=0; //0=滚动条+按钮 1=滚动条
|
|
135538
|
+
|
|
135530
135539
|
this.ScrollBarHeight=g_JSChartResource.Report.VScrollbar.ScrollBarHeight;
|
|
135531
135540
|
this.ButtonColor=g_JSChartResource.Report.VScrollbar.ButtonColor;
|
|
135532
135541
|
this.BarColor=g_JSChartResource.Report.VScrollbar.BarColor;
|
|
135533
135542
|
this.BorderColor=g_JSChartResource.Report.VScrollbar.BorderColor;
|
|
135534
135543
|
this.BGColor=g_JSChartResource.Report.VScrollbar.BGColor;
|
|
135535
|
-
this.
|
|
135544
|
+
this.Margin={ Left:2, Right:2, Top:2, Bottom:2 };
|
|
135536
135545
|
this.BarWithConfig={ Size:g_JSChartResource.Report.VScrollbar.BarWidth.Size };
|
|
135537
135546
|
|
|
135538
135547
|
this.RectScroll={ Top:null, Bottom:null, Bar:null, Client:null }; //滚动条区域
|
|
135548
|
+
|
|
135549
|
+
//this.BarWithConfig.Size=2;
|
|
135550
|
+
//this.Mergin={ Left:1, Right:1, Top:1, Bottom:1 };
|
|
135551
|
+
|
|
135552
|
+
this.SetOption=function(option)
|
|
135553
|
+
{
|
|
135554
|
+
if (!option) return;
|
|
135555
|
+
|
|
135556
|
+
if (IFrameSplitOperator.IsBool(option.Enable)) this.Enable=option.Enable;
|
|
135557
|
+
if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
|
|
135558
|
+
if (IFrameSplitOperator.IsNumber(option.BarWidth)) this.BarWithConfig.Size=option.BarWidth;
|
|
135559
|
+
if (option.Margin)
|
|
135560
|
+
{
|
|
135561
|
+
var item=option.Margin;
|
|
135562
|
+
if (IFrameSplitOperator.IsNumber(item.Top)) this.Margin.Top=item.Top;
|
|
135563
|
+
if (IFrameSplitOperator.IsNumber(item.Bottom)) this.Margin.Bottom=item.Bottom;
|
|
135564
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.Margin.Left=item.Left;
|
|
135565
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.Margin.Right=item.Right;
|
|
135566
|
+
}
|
|
135567
|
+
}
|
|
135539
135568
|
|
|
135540
135569
|
this.ReloadResource=function(resource)
|
|
135541
135570
|
{
|
|
@@ -135551,11 +135580,62 @@ function ChartVScrollbar()
|
|
|
135551
135580
|
{
|
|
135552
135581
|
var pixelRatio=GetDevicePixelRatio();
|
|
135553
135582
|
|
|
135554
|
-
var width=this.BarWithConfig.Size*pixelRatio+this.
|
|
135583
|
+
var width=this.BarWithConfig.Size*pixelRatio+this.Margin.Left+this.Margin.Right;
|
|
135555
135584
|
this.ButtonSize=Math.min(25, width);
|
|
135556
135585
|
}
|
|
135557
135586
|
|
|
135558
|
-
|
|
135587
|
+
//不带上下按钮的滚动条样式
|
|
135588
|
+
this.DrawScrollbarStyle2=function(left, top, right, bottom)
|
|
135589
|
+
{
|
|
135590
|
+
this.LastStatus.Draw=false;
|
|
135591
|
+
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
135592
|
+
if (!this.Enable) return;
|
|
135593
|
+
|
|
135594
|
+
var isShow=this.IsShowCallback();
|
|
135595
|
+
if (!isShow) return;
|
|
135596
|
+
|
|
135597
|
+
var pageInfo=this.Report.GetCurrentPageStatus();
|
|
135598
|
+
if (pageInfo.IsSinglePage) return;
|
|
135599
|
+
|
|
135600
|
+
var xOffset=pageInfo.Start;
|
|
135601
|
+
var dataCount=pageInfo.DataCount-pageInfo.PageSize;
|
|
135602
|
+
var buttonSize=this.ButtonSize;
|
|
135603
|
+
|
|
135604
|
+
this.MaxPos=dataCount;
|
|
135605
|
+
this.CurrentPos=xOffset;
|
|
135606
|
+
|
|
135607
|
+
var scrollTop=top+this.Margin.Top+2;
|
|
135608
|
+
var scrollBottom=bottom-this.Margin.Bottom-2;
|
|
135609
|
+
var centerHeight=scrollBottom-scrollTop;
|
|
135610
|
+
var value = centerHeight - this.ScrollBarHeight;
|
|
135611
|
+
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
135612
|
+
var y = scrollTop + 2 + yOffset;
|
|
135613
|
+
|
|
135614
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
135615
|
+
rtBar.Left=rtBar.Right-buttonSize;
|
|
135616
|
+
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
135617
|
+
if (rtBar.Bottom>scrollBottom-2)
|
|
135618
|
+
{
|
|
135619
|
+
rtBar.Bottom=scrollBottom-2;
|
|
135620
|
+
rtBar.Top=rtBar.Bottom-rtBar.Height;
|
|
135621
|
+
}
|
|
135622
|
+
|
|
135623
|
+
this.RectScroll.Bar=rtBar;
|
|
135624
|
+
this.RectScroll.Client={ Left:rtBar.Left, Right: rtBar.Right, Top:scrollTop, Bottom:scrollBottom };
|
|
135625
|
+
|
|
135626
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
135627
|
+
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
135628
|
+
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
135629
|
+
this.Canvas.fillStyle=this.BGColor;
|
|
135630
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
135631
|
+
|
|
135632
|
+
this.Canvas.fillStyle=this.BarColor;
|
|
135633
|
+
this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);
|
|
135634
|
+
|
|
135635
|
+
this.LastStatus.Draw=true;
|
|
135636
|
+
}
|
|
135637
|
+
|
|
135638
|
+
this.DrawScrollbarStyle=function(left, top, right, bottom)
|
|
135559
135639
|
{
|
|
135560
135640
|
this.LastStatus.Draw=false;
|
|
135561
135641
|
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
@@ -135574,11 +135654,11 @@ function ChartVScrollbar()
|
|
|
135574
135654
|
this.MaxPos=dataCount;
|
|
135575
135655
|
this.CurrentPos=xOffset;
|
|
135576
135656
|
|
|
135577
|
-
var rtTop={ Right:right-this.
|
|
135657
|
+
var rtTop={ Right:right-this.Margin.Right, Top:top+this.Margin.Top, Width:buttonSize, Height:buttonSize };
|
|
135578
135658
|
rtTop.Left=rtTop.Right-buttonSize;
|
|
135579
135659
|
rtTop.Bottom=rtTop.Top+buttonSize;
|
|
135580
135660
|
|
|
135581
|
-
var rtBottom={ Right:right-this.
|
|
135661
|
+
var rtBottom={ Right:right-this.Margin.Right, Bottom:bottom-this.Margin.Bottom, Width:buttonSize, Height:buttonSize };
|
|
135582
135662
|
rtBottom.Left=rtBottom.Right-buttonSize;
|
|
135583
135663
|
rtBottom.Top=rtBottom.Bottom-buttonSize;
|
|
135584
135664
|
|
|
@@ -135587,7 +135667,7 @@ function ChartVScrollbar()
|
|
|
135587
135667
|
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
135588
135668
|
var y = rtTop.Bottom + 2 + yOffset;
|
|
135589
135669
|
|
|
135590
|
-
var rtBar = {Right:right-this.
|
|
135670
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
135591
135671
|
rtBar.Left=rtBar.Right-buttonSize;
|
|
135592
135672
|
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
135593
135673
|
if (rtBar.Bottom>rtBottom.Top-2)
|
|
@@ -135601,7 +135681,7 @@ function ChartVScrollbar()
|
|
|
135601
135681
|
this.RectScroll.Bar=rtBar;
|
|
135602
135682
|
this.RectScroll.Client={ Left:rtTop.Left, Right: rtTop.Right, Top:rtTop.Bottom, Bottom:rtBottom.Top };
|
|
135603
135683
|
|
|
135604
|
-
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.
|
|
135684
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
135605
135685
|
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
135606
135686
|
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
135607
135687
|
this.Canvas.fillStyle=this.BGColor;
|
|
@@ -135621,6 +135701,14 @@ function ChartVScrollbar()
|
|
|
135621
135701
|
this.LastStatus.Draw=true;
|
|
135622
135702
|
}
|
|
135623
135703
|
|
|
135704
|
+
this.DrawScrollbar=function(left, top, right, bottom)
|
|
135705
|
+
{
|
|
135706
|
+
if (this.Style==1)
|
|
135707
|
+
this.DrawScrollbarStyle2(left, top, right, bottom);
|
|
135708
|
+
else
|
|
135709
|
+
this.DrawScrollbarStyle(left, top, right, bottom);
|
|
135710
|
+
}
|
|
135711
|
+
|
|
135624
135712
|
this.OnMouseDown=function(x,y, e)
|
|
135625
135713
|
{
|
|
135626
135714
|
return this.PtInScroll(x,y);
|
|
@@ -139173,7 +139261,7 @@ function ScrollBarBGChart()
|
|
|
139173
139261
|
|
|
139174
139262
|
|
|
139175
139263
|
|
|
139176
|
-
var HQCHART_VERSION="1.1.
|
|
139264
|
+
var HQCHART_VERSION="1.1.14036";
|
|
139177
139265
|
|
|
139178
139266
|
function PrintHQChartVersion()
|
|
139179
139267
|
{
|
|
@@ -130320,7 +130320,7 @@ function JSReportChartContainer(uielement)
|
|
|
130320
130320
|
var scrollbar=chart.VScrollbar;
|
|
130321
130321
|
if (!scrollbar) return;
|
|
130322
130322
|
|
|
130323
|
-
|
|
130323
|
+
scrollbar.SetOption(option);
|
|
130324
130324
|
}
|
|
130325
130325
|
|
|
130326
130326
|
this.SetSelectedTab=function(index, opiton)
|
|
@@ -133550,10 +133550,17 @@ function ChartReport()
|
|
|
133550
133550
|
var fieldName=MAP_COLUMN_FIELD.get(column.Type);
|
|
133551
133551
|
if (!fieldName) return;
|
|
133552
133552
|
|
|
133553
|
-
var
|
|
133554
|
-
if (
|
|
133555
|
-
|
|
133556
|
-
|
|
133553
|
+
var item=data[fieldName];
|
|
133554
|
+
if (IFrameSplitOperator.IsObject(item))
|
|
133555
|
+
{
|
|
133556
|
+
if (item.Text) drawInfo.Text=item.Text;
|
|
133557
|
+
if (item.TextColor) drawInfo.TextColor=item.TextColor;
|
|
133558
|
+
if (item.BGColor) drawInfo.BGColor=item.BGColor;
|
|
133559
|
+
}
|
|
133560
|
+
else if (IFrameSplitOperator.IsString(item))
|
|
133561
|
+
{
|
|
133562
|
+
drawInfo.Text=item;
|
|
133563
|
+
}
|
|
133557
133564
|
}
|
|
133558
133565
|
|
|
133559
133566
|
this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
|
|
@@ -135571,15 +135578,37 @@ function ChartVScrollbar()
|
|
|
135571
135578
|
this.LastStatus={ Draw:false, };
|
|
135572
135579
|
this.GlobalOption;
|
|
135573
135580
|
|
|
135581
|
+
this.Style=0; //0=滚动条+按钮 1=滚动条
|
|
135582
|
+
|
|
135574
135583
|
this.ScrollBarHeight=g_JSChartResource.Report.VScrollbar.ScrollBarHeight;
|
|
135575
135584
|
this.ButtonColor=g_JSChartResource.Report.VScrollbar.ButtonColor;
|
|
135576
135585
|
this.BarColor=g_JSChartResource.Report.VScrollbar.BarColor;
|
|
135577
135586
|
this.BorderColor=g_JSChartResource.Report.VScrollbar.BorderColor;
|
|
135578
135587
|
this.BGColor=g_JSChartResource.Report.VScrollbar.BGColor;
|
|
135579
|
-
this.
|
|
135588
|
+
this.Margin={ Left:2, Right:2, Top:2, Bottom:2 };
|
|
135580
135589
|
this.BarWithConfig={ Size:g_JSChartResource.Report.VScrollbar.BarWidth.Size };
|
|
135581
135590
|
|
|
135582
135591
|
this.RectScroll={ Top:null, Bottom:null, Bar:null, Client:null }; //滚动条区域
|
|
135592
|
+
|
|
135593
|
+
//this.BarWithConfig.Size=2;
|
|
135594
|
+
//this.Mergin={ Left:1, Right:1, Top:1, Bottom:1 };
|
|
135595
|
+
|
|
135596
|
+
this.SetOption=function(option)
|
|
135597
|
+
{
|
|
135598
|
+
if (!option) return;
|
|
135599
|
+
|
|
135600
|
+
if (IFrameSplitOperator.IsBool(option.Enable)) this.Enable=option.Enable;
|
|
135601
|
+
if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
|
|
135602
|
+
if (IFrameSplitOperator.IsNumber(option.BarWidth)) this.BarWithConfig.Size=option.BarWidth;
|
|
135603
|
+
if (option.Margin)
|
|
135604
|
+
{
|
|
135605
|
+
var item=option.Margin;
|
|
135606
|
+
if (IFrameSplitOperator.IsNumber(item.Top)) this.Margin.Top=item.Top;
|
|
135607
|
+
if (IFrameSplitOperator.IsNumber(item.Bottom)) this.Margin.Bottom=item.Bottom;
|
|
135608
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.Margin.Left=item.Left;
|
|
135609
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.Margin.Right=item.Right;
|
|
135610
|
+
}
|
|
135611
|
+
}
|
|
135583
135612
|
|
|
135584
135613
|
this.ReloadResource=function(resource)
|
|
135585
135614
|
{
|
|
@@ -135595,11 +135624,12 @@ function ChartVScrollbar()
|
|
|
135595
135624
|
{
|
|
135596
135625
|
var pixelRatio=GetDevicePixelRatio();
|
|
135597
135626
|
|
|
135598
|
-
var width=this.BarWithConfig.Size*pixelRatio+this.
|
|
135627
|
+
var width=this.BarWithConfig.Size*pixelRatio+this.Margin.Left+this.Margin.Right;
|
|
135599
135628
|
this.ButtonSize=Math.min(25, width);
|
|
135600
135629
|
}
|
|
135601
135630
|
|
|
135602
|
-
|
|
135631
|
+
//不带上下按钮的滚动条样式
|
|
135632
|
+
this.DrawScrollbarStyle2=function(left, top, right, bottom)
|
|
135603
135633
|
{
|
|
135604
135634
|
this.LastStatus.Draw=false;
|
|
135605
135635
|
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
@@ -135618,11 +135648,61 @@ function ChartVScrollbar()
|
|
|
135618
135648
|
this.MaxPos=dataCount;
|
|
135619
135649
|
this.CurrentPos=xOffset;
|
|
135620
135650
|
|
|
135621
|
-
var
|
|
135651
|
+
var scrollTop=top+this.Margin.Top+2;
|
|
135652
|
+
var scrollBottom=bottom-this.Margin.Bottom-2;
|
|
135653
|
+
var centerHeight=scrollBottom-scrollTop;
|
|
135654
|
+
var value = centerHeight - this.ScrollBarHeight;
|
|
135655
|
+
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
135656
|
+
var y = scrollTop + 2 + yOffset;
|
|
135657
|
+
|
|
135658
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
135659
|
+
rtBar.Left=rtBar.Right-buttonSize;
|
|
135660
|
+
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
135661
|
+
if (rtBar.Bottom>scrollBottom-2)
|
|
135662
|
+
{
|
|
135663
|
+
rtBar.Bottom=scrollBottom-2;
|
|
135664
|
+
rtBar.Top=rtBar.Bottom-rtBar.Height;
|
|
135665
|
+
}
|
|
135666
|
+
|
|
135667
|
+
this.RectScroll.Bar=rtBar;
|
|
135668
|
+
this.RectScroll.Client={ Left:rtBar.Left, Right: rtBar.Right, Top:scrollTop, Bottom:scrollBottom };
|
|
135669
|
+
|
|
135670
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
135671
|
+
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
135672
|
+
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
135673
|
+
this.Canvas.fillStyle=this.BGColor;
|
|
135674
|
+
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
135675
|
+
|
|
135676
|
+
this.Canvas.fillStyle=this.BarColor;
|
|
135677
|
+
this.Canvas.fillRect(rtBar.Left,rtBar.Top,rtBar.Width,rtBar.Height);
|
|
135678
|
+
|
|
135679
|
+
this.LastStatus.Draw=true;
|
|
135680
|
+
}
|
|
135681
|
+
|
|
135682
|
+
this.DrawScrollbarStyle=function(left, top, right, bottom)
|
|
135683
|
+
{
|
|
135684
|
+
this.LastStatus.Draw=false;
|
|
135685
|
+
this.RectScroll={ Left:null, Right:null, Bar:null, Client:null };
|
|
135686
|
+
if (!this.Enable) return;
|
|
135687
|
+
|
|
135688
|
+
var isShow=this.IsShowCallback();
|
|
135689
|
+
if (!isShow) return;
|
|
135690
|
+
|
|
135691
|
+
var pageInfo=this.Report.GetCurrentPageStatus();
|
|
135692
|
+
if (pageInfo.IsSinglePage) return;
|
|
135693
|
+
|
|
135694
|
+
var xOffset=pageInfo.Start;
|
|
135695
|
+
var dataCount=pageInfo.DataCount-pageInfo.PageSize;
|
|
135696
|
+
var buttonSize=this.ButtonSize;
|
|
135697
|
+
|
|
135698
|
+
this.MaxPos=dataCount;
|
|
135699
|
+
this.CurrentPos=xOffset;
|
|
135700
|
+
|
|
135701
|
+
var rtTop={ Right:right-this.Margin.Right, Top:top+this.Margin.Top, Width:buttonSize, Height:buttonSize };
|
|
135622
135702
|
rtTop.Left=rtTop.Right-buttonSize;
|
|
135623
135703
|
rtTop.Bottom=rtTop.Top+buttonSize;
|
|
135624
135704
|
|
|
135625
|
-
var rtBottom={ Right:right-this.
|
|
135705
|
+
var rtBottom={ Right:right-this.Margin.Right, Bottom:bottom-this.Margin.Bottom, Width:buttonSize, Height:buttonSize };
|
|
135626
135706
|
rtBottom.Left=rtBottom.Right-buttonSize;
|
|
135627
135707
|
rtBottom.Top=rtBottom.Bottom-buttonSize;
|
|
135628
135708
|
|
|
@@ -135631,7 +135711,7 @@ function ChartVScrollbar()
|
|
|
135631
135711
|
var yOffset = (value * this.CurrentPos) / this.MaxPos;
|
|
135632
135712
|
var y = rtTop.Bottom + 2 + yOffset;
|
|
135633
135713
|
|
|
135634
|
-
var rtBar = {Right:right-this.
|
|
135714
|
+
var rtBar = {Right:right-this.Margin.Right, Top:y, Width:buttonSize, Height: this.ScrollBarHeight };
|
|
135635
135715
|
rtBar.Left=rtBar.Right-buttonSize;
|
|
135636
135716
|
rtBar.Bottom=rtBar.Top+rtBar.Height;
|
|
135637
135717
|
if (rtBar.Bottom>rtBottom.Top-2)
|
|
@@ -135645,7 +135725,7 @@ function ChartVScrollbar()
|
|
|
135645
135725
|
this.RectScroll.Bar=rtBar;
|
|
135646
135726
|
this.RectScroll.Client={ Left:rtTop.Left, Right: rtTop.Right, Top:rtTop.Bottom, Bottom:rtBottom.Top };
|
|
135647
135727
|
|
|
135648
|
-
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.
|
|
135728
|
+
var rtBG={ Right:right, Top:top, Bottom:bottom, Width:buttonSize+this.Margin.Right+this.Margin.Left };
|
|
135649
135729
|
rtBG.Left=rtBG.Right-rtBG.Width;
|
|
135650
135730
|
rtBG.Height=rtBG.Bottom-rtBG.Top;
|
|
135651
135731
|
this.Canvas.fillStyle=this.BGColor;
|
|
@@ -135665,6 +135745,14 @@ function ChartVScrollbar()
|
|
|
135665
135745
|
this.LastStatus.Draw=true;
|
|
135666
135746
|
}
|
|
135667
135747
|
|
|
135748
|
+
this.DrawScrollbar=function(left, top, right, bottom)
|
|
135749
|
+
{
|
|
135750
|
+
if (this.Style==1)
|
|
135751
|
+
this.DrawScrollbarStyle2(left, top, right, bottom);
|
|
135752
|
+
else
|
|
135753
|
+
this.DrawScrollbarStyle(left, top, right, bottom);
|
|
135754
|
+
}
|
|
135755
|
+
|
|
135668
135756
|
this.OnMouseDown=function(x,y, e)
|
|
135669
135757
|
{
|
|
135670
135758
|
return this.PtInScroll(x,y);
|
|
@@ -145918,7 +146006,7 @@ function HQChartScriptWorker()
|
|
|
145918
146006
|
|
|
145919
146007
|
|
|
145920
146008
|
|
|
145921
|
-
var HQCHART_VERSION="1.1.
|
|
146009
|
+
var HQCHART_VERSION="1.1.14036";
|
|
145922
146010
|
|
|
145923
146011
|
function PrintHQChartVersion()
|
|
145924
146012
|
{
|