hqchart 1.1.14611 → 1.1.14617
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 +5 -4
- package/package.json +1 -1
- package/src/jscommon/umychart.js +1 -1
- package/src/jscommon/umychart.report.js +5 -3
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +7 -5
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +7 -5
package/lib/umychart.vue.js
CHANGED
|
@@ -2171,7 +2171,7 @@ for(var i=0;i<data.length;++i){var item=data[i];strRow+='"'+item.Name+'"';if(i==
|
|
|
2171
2171
|
this.ResetFrameXYSplit();this.Frame.SetSizeChage(true);this.Draw();if(this.PopMinuteChart)this.PopMinuteChart.SetLanguage(language);};this.ReloadTiltePaintResource=function(resource)//重新加载配置
|
|
2172
2172
|
{for(var i in this.TitlePaint){var item=this.TitlePaint[i];if(item.ReloadResource)item.ReloadResource(resource);}};this.ReloadExtendChartPaintResource=function(resource)//扩展画法重新加载配置
|
|
2173
2173
|
{for(var i=0;i<this.ExtendChartPaint.length;++i){var item=this.ExtendChartPaint[i];if(item.ReloadResource)item.ReloadResource(resource);}if(this.ChartDragSelectRect&&this.ChartDragSelectRect.ReloadResource)this.ChartDragSelectRect.ReloadResource(resource);};this.ReloadChartDrawPictureResource=function(resource){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartDrawPicture))return;for(var i=0;i<this.ChartDrawPicture.length;++i){var item=this.ChartDrawPicture[i];if(item.ReloadResource)item.ReloadResource(resource);}};this.ReloadResource=function(option){this.ReloadBorder(option);this.ReloadTiltePaintResource(option.Resource);this.ReloadChartPaint(option.Resource);this.ReloadFrame(option.Resource);this.ReloadExtendChartPaintResource(option.Resource);this.ReloadChartCorssCursor(option,option.Resource);this.ReloadChartDrawPictureResource(option.Resource);if(option.Update&&this.Update)this.Update({UpdateCursorIndexType:2});//是否立即更新并重绘
|
|
2174
|
-
else if(option.Draw==true)this.Draw();//是否立即重绘
|
|
2174
|
+
else if(option.Draw==true||option.Redraw==true)this.Draw();//是否立即重绘
|
|
2175
2175
|
if(this.PopMinuteChart)this.PopMinuteChart.ReloadResource(option);if(this.DialogTooltip)this.DialogTooltip.ReloadResource(option);if(this.FloatTooltip)this.FloatTooltip.ReloadResource(option);if(this.DialogSelectRect)this.DialogSelectRect.ReloadResource(option);if(this.DialogSearchIndex)this.DialogSearchIndex.ReloadResource(option);};this.ReloadBorder=function(option)//根据页面缩放调整对应边框的尺长
|
|
2176
2176
|
{if(!option)return;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
2177
2177
|
if(option.Border){var item=option.Border;if(IFrameSplitOperator.IsNumber(item.Left))this.Frame.ChartBorder.Left=item.Left*pixelTatio;if(IFrameSplitOperator.IsNumber(item.Right))this.Frame.ChartBorder.Right=item.Right*pixelTatio;if(IFrameSplitOperator.IsNumber(item.Top))this.Frame.ChartBorder.Top=item.Top*pixelTatio;if(IFrameSplitOperator.IsNumber(item.Bottom))this.Frame.ChartBorder.Bottom=item.Bottom*pixelTatio;}for(var i in option.Windows){var item=option.Windows[i];if(i>=this.Frame.SubFrame.length)continue;var subFrame=this.Frame.SubFrame[i];var border=subFrame.Frame.ChartBorder;if(IFrameSplitOperator.IsNumber(item.TitleHeight))border.TitleHeight=item.TitleHeight*pixelTatio;}for(var i in option.Frame){var item=option.Frame[i];if(i>=this.Frame.SubFrame.length)continue;var subFrame=this.Frame.SubFrame[i];var border=subFrame.Frame.ChartBorder;if(item.TopSpace>=0)border.TopSpace=item.TopSpace*pixelTatio;if(item.BottomSpace>=0)border.BottomSpace=item.BottomSpace*pixelTatio;}};this.ReloadFrame=function(resource){for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i];var subFrame=item.Frame;if(subFrame&&subFrame.ReloadResource)subFrame.ReloadResource(resource);for(var j=0;j<item.OverlayIndex.length;++j){var overlayItem=item.OverlayIndex[j];if(overlayItem.Frame&&overlayItem.Frame.ReloadResource)overlayItem.Frame.ReloadResource(resource);}}};this.ReloadChartPaint=function(resource){for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item&&item.ReloadResource)item.ReloadResource(resource);}};this.ReloadChartCorssCursor=function(option,resource){var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
@@ -13248,7 +13248,8 @@ if(chart.MultiSelectModel==1){var pageStatus=chart.GetCurrentPageStatus();if(IFr
|
|
|
13248
13248
|
{var pageStatus=chart.GetCurrentPageStatus();var pageSize=pageStatus.PageSize;var selected=pageStatus.SelectedRow;result.OldIndex=pageStatus.SelectedRow;if(step>0){if(selected<0||selected<pageStatus.Start||selected>pageStatus.End){chart.SelectedRow=pageStatus.Start;result.Redraw=true;result.NewIndex=pageStatus.Start;return result;}var offset=this.Data.YOffset;for(var i=0;i<step;++i){if(selected+1>=this.Data.Data.length&&!bPageCycle)break;++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;result.NewIndex=selected;return result;}else if(step<0){if(selected<0||selected<pageStatus.Start||selected>pageStatus.End){chart.SelectedRow=pageStatus.End;result.Redraw=true;result.NewIndex=pageStatus.End;return result;}step=Math.abs(step);var offset=this.Data.YOffset;for(var i=0;i<step;++i){if(selected<=0&&!bPageCycle)//不能循环翻页
|
|
13249
13249
|
break;--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;result.NewIndex=selected;return result;}}return null;};this.MoveSelectedRowEvent=function(oldIndex,newIndex){var chart=this.ChartPaint[0];if(!chart)return null;if(oldIndex==newIndex)return;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOVE_SELECTED_REPORT_ROW);if(!event||!event.Callback)return;if(!IFrameSplitOperator.IsNonEmptyArray(chart.Data.Data))return;var arySymbol=chart.Data.Data;var oldData=null,newData=null;if(oldIndex>=0&&oldIndex<arySymbol.length){var symbol=arySymbol[oldIndex];oldData={Symbol:symbol,Index:oldIndex};}if(newIndex>=0&&newIndex<arySymbol.length){var symbol=arySymbol[newIndex];newData={Symbol:symbol,Index:newIndex};}var endData={Old:oldData,Now:newData};event.Callback(event,endData,this);};//左右移动
|
|
13250
13250
|
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;//显示最后一屏
|
|
13251
|
-
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();}if(this.
|
|
13251
|
+
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||option.Draw)){this.SetSizeChange(true);this.Draw();}if(this.TooltipMinuteChart)this.TooltipMinuteChart.ReloadResource(option);//分时图
|
|
13252
|
+
if(this.TooltipKLineChart)this.TooltipKLineChart.ReloadResource(option);};//列排序
|
|
13252
13253
|
this.SortColumn=function(index,sortType){var _this62=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();//虚拟表格
|
|
13253
13254
|
return true;}else if(sortInfo.Sort==0)//不排序还原
|
|
13254
13255
|
{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)//本地排序
|
|
@@ -13552,7 +13553,7 @@ this.GetNameColor=function(colunmInfo,symbol,rowType){var event=this.GetEventCal
|
|
|
13552
13553
|
{var sendData={Column:buttonData.Column,Index:buttonData.Index,Stock:buttonData.Stock,ColumnIndex:buttonData.ColumnIndex,Data:buttonData.Data};this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_LINK,sendData);status.Redraw=true;return true;}return false;};this.OnDblClick=function(x,y,e){if(!this.Data)return false;var header=this.PtInHeaderDragBorder(x,y);if(header){this.SendClickEvent(JSCHART_EVENT_ID.ON_DBCLICK_REPORT_DRAG_COLUMN_WIDTH,{Data:header,X:x,Y:y});return true;}var row=this.PtInBody(x,y);if(row){this.SendClickEvent(JSCHART_EVENT_ID.ON_DBCLICK_REPORT_ROW,{Data:row,X:x,Y:y});return true;}return false;};this.PtInClient=function(x,y){if(x>this.RectClient.Left&&x<this.RectClient.Right&&y>this.RectClient.Top&&y<this.RectClient.Bottom)return true;return false;};this.PtInBody=function(x,y){if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var rowWidth=this.RectClient.Right-this.RectClient.Left;var textTop=top+this.FixedRowHeight*this.FixedRowCount;for(var i=this.Data.YOffset,j=0;i<this.Data.Data.length&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRow={Left:left,Top:textTop,Right:right,Bottom:textTop+this.RowHeight};if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={Rect:rtRow,DataIndex:i,Index:j,Symbol:symbol};data.Item=this.PtInItem(x,y,rtRow.Top,rtRow.Bottom);return data;}textTop+=this.RowHeight;}return null;};this.PtInFixedBody=function(x,y){if(this.FixedRowCount<=0)return null;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var rowWidth=this.RectClient.Right-this.RectClient.Left;var textTop=top;for(var i=0;i<this.FixedRowCount;++i){var rtRow={Left:left,Top:textTop,Right:right,Bottom:textTop+this.FixedRowHeight};if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={Rect:rtRow,Index:i};data.Item=this.PtInItem(x,y,rtRow.Top,rtRow.Bottom);return data;}textTop+=this.FixedRowHeight;}return null;};this.PtInItem=function(x,y,top,bottom){var left=this.RectClient.Left;var right=this.RectClient.Right;var textLeft=left;//固定列
|
|
13553
13554
|
for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];var header={Left:textLeft,Right:textLeft+item.Width,Top:top,Bottom:bottom};if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:true};}textLeft+=item.Width;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];if(textLeft>=right)break;var header={Left:textLeft,Right:textLeft+item.Width,Top:top,Bottom:bottom};if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:false};}textLeft+=item.Width;}return null;};this.PtInHeader=function(x,y){if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(!(x>=left&&x<=right&&y>=top&&y<=bottom))return null;return this.PtInItem(x,y,top,bottom);};this.IsPtInBody=function(x,y){var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var bottom=this.RectClient.Bottom;if(x>=left&&x<=right&&y>=top&&y<=bottom)return true;return false;};this.IsPtInHeader=function(x,y){if(!this.IsShowHeader)return false;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(x>=left&&x<=right&&y>=top&&y<=bottom)return true;return false;};this.SendClickEvent=function(id,data){var event=this.GetEventCallback(id);if(event&&event.Callback){event.Callback(event,data,this);}};this.DrawDragRow=function(){if(!this.DragRow)return;var drag=this.DragRow;if(!drag.Data||!drag.Inside||!drag.Data.Row)return;var dataIndex=drag.Data.Row.DataIndex;if(!IFrameSplitOperator.IsNumber(dataIndex)||dataIndex<0)return;var textTop=drag.Inside.Y-this.RowHeight/2;var top=textTop;var left=this.RectClient.Left;var rowWidth=this.RectClient.Right-this.RectClient.Left;//背景
|
|
13554
13555
|
this.Canvas.fillStyle=this.DragRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);var symbol=this.Data.Data[dataIndex];var data={Symbol:symbol,Stock:null,Block:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(this.GetBlockDataCallback)data.Block=this.GetBlockDataCallback(symbol);data.Decimal=GetfloatPrecision(symbol);//小数位数
|
|
13555
|
-
var chartRight=this.RectClient.Right;this.Canvas.font=this.ItemFont;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}};this.DrawDragHeader=function(){if(!this.DragHeader)return;var drag=this.DragHeader;var clickData=drag.ClickData;var rtHeader=clickData.Header.Rect;var headerWidth=rtHeader.Right-rtHeader.Left;var rtRow={Left:drag.
|
|
13556
|
+
var chartRight=this.RectClient.Right;this.Canvas.font=this.ItemFont;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}};this.DrawDragHeader=function(){if(!this.DragHeader)return;var drag=this.DragHeader;var clickData=drag.ClickData;var rtHeader=clickData.Header.Rect;var headerWidth=rtHeader.Right-rtHeader.Left;var rtRow={Left:drag.MovePoint.X-headerWidth/2,Top:this.RectClient.Top+this.HeaderHeight,Width:headerWidth};rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;rtRow.Right=rtRow.Left+rtRow.Width;rtRow.Height=rtRow.Bottom-rtRow.Top;//背景
|
|
13556
13557
|
this.Canvas.fillStyle=this.DragRowColor;this.Canvas.fillRect(rtRow.Left,rtRow.Top,rtRow.Width,rtRow.Height);//文字
|
|
13557
13558
|
var cellHeader={Left:rtRow.Left,Top:rtRow.Top,Right:rtRow.Right,Width:rtRow.Width,Height:this.HeaderHeight};cellHeader.Bottom=cellHeader.Top+cellHeader.Height;this.DrawHeaderItem(clickData.Header.Column,cellHeader,clickData.Header.Index,{HeaderColor:this.DragRowTextColor});var textTop=cellHeader.Bottom+this.FixedRowHeight*this.FixedRowCount;this.Canvas.font=this.ItemFont;var dataCount=this.GetAllRowCount();for(var i=this.Data.YOffset,j=0;i<dataCount&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var data={Symbol:symbol,Stock:null,Block:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(this.GetBlockDataCallback)data.Block=this.GetBlockDataCallback(symbol);if(this.GetFlashBGDataCallback)data.FlashBG=this.GetFlashBGDataCallback(symbol,Date.now());data.Decimal=GetfloatPrecision(symbol);//小数位数
|
|
13558
13559
|
var item=this.Column[clickData.Header.Index];this.DrawItem(i,data,item,cellHeader.Left,textTop,3);textTop+=this.RowHeight;}};this.GetTooltipData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect))return null;for(var i=0;i<this.TooltipRect.length;++i){var item=this.TooltipRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data};}}return null;};this.GetButtonData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.ButtonRect))return null;for(var i=0;i<this.ButtonRect.length;++i){var item=this.ButtonRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data,ColumnIndex:item.ColumnIndex};}}};this.PtInHeaderDragBorder=function(x,y){if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(!(x>=left&&x<=right&&y>=top&&y<=bottom))return null;var textLeft=left;var dragBarWidth=5*GetDevicePixelRatio();//固定列
|
|
@@ -14853,7 +14854,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
14853
14854
|
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);};}/********************************************************************************
|
|
14854
14855
|
* 版本信息输出
|
|
14855
14856
|
*
|
|
14856
|
-
*/var HQCHART_VERSION="1.1.
|
|
14857
|
+
*/var HQCHART_VERSION="1.1.14616";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();//把给外界调用的方法暴露出来
|
|
14857
14858
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
14858
14859
|
// BaseIndex:BaseIndex,
|
|
14859
14860
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -8954,7 +8954,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
8954
8954
|
this.ReloadChartDrawPictureResource(option.Resource);
|
|
8955
8955
|
|
|
8956
8956
|
if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} ); //是否立即更新并重绘
|
|
8957
|
-
else if (option.Draw==true) this.Draw(); //是否立即重绘
|
|
8957
|
+
else if (option.Draw==true || option.Redraw==true) this.Draw(); //是否立即重绘
|
|
8958
8958
|
|
|
8959
8959
|
if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
|
|
8960
8960
|
if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
|
|
@@ -3505,13 +3505,14 @@ function JSReportChartContainer(uielement)
|
|
|
3505
3505
|
if (item.ReloadResource) item.ReloadResource(option);
|
|
3506
3506
|
}
|
|
3507
3507
|
|
|
3508
|
-
if (option && option.Redraw)
|
|
3508
|
+
if (option && (option.Redraw || option.Draw))
|
|
3509
3509
|
{
|
|
3510
3510
|
this.SetSizeChange(true);
|
|
3511
3511
|
this.Draw();
|
|
3512
3512
|
}
|
|
3513
3513
|
|
|
3514
|
-
if (this.
|
|
3514
|
+
if (this.TooltipMinuteChart) this.TooltipMinuteChart.ReloadResource(option); //分时图
|
|
3515
|
+
if (this.TooltipKLineChart) this.TooltipKLineChart.ReloadResource(option);
|
|
3515
3516
|
}
|
|
3516
3517
|
|
|
3517
3518
|
//列排序
|
|
@@ -8724,7 +8725,8 @@ function ChartReport()
|
|
|
8724
8725
|
var clickData=drag.ClickData;
|
|
8725
8726
|
var rtHeader=clickData.Header.Rect;
|
|
8726
8727
|
var headerWidth=rtHeader.Right-rtHeader.Left;
|
|
8727
|
-
|
|
8728
|
+
|
|
8729
|
+
var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
|
|
8728
8730
|
rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
|
|
8729
8731
|
rtRow.Right=rtRow.Left+rtRow.Width;
|
|
8730
8732
|
rtRow.Height=rtRow.Bottom-rtRow.Top;
|
|
@@ -13050,7 +13050,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13050
13050
|
this.ReloadChartDrawPictureResource(option.Resource);
|
|
13051
13051
|
|
|
13052
13052
|
if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} ); //是否立即更新并重绘
|
|
13053
|
-
else if (option.Draw==true) this.Draw(); //是否立即重绘
|
|
13053
|
+
else if (option.Draw==true || option.Redraw==true) this.Draw(); //是否立即重绘
|
|
13054
13054
|
|
|
13055
13055
|
if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
|
|
13056
13056
|
if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
|
|
@@ -136519,13 +136519,14 @@ function JSReportChartContainer(uielement)
|
|
|
136519
136519
|
if (item.ReloadResource) item.ReloadResource(option);
|
|
136520
136520
|
}
|
|
136521
136521
|
|
|
136522
|
-
if (option && option.Redraw)
|
|
136522
|
+
if (option && (option.Redraw || option.Draw))
|
|
136523
136523
|
{
|
|
136524
136524
|
this.SetSizeChange(true);
|
|
136525
136525
|
this.Draw();
|
|
136526
136526
|
}
|
|
136527
136527
|
|
|
136528
|
-
if (this.
|
|
136528
|
+
if (this.TooltipMinuteChart) this.TooltipMinuteChart.ReloadResource(option); //分时图
|
|
136529
|
+
if (this.TooltipKLineChart) this.TooltipKLineChart.ReloadResource(option);
|
|
136529
136530
|
}
|
|
136530
136531
|
|
|
136531
136532
|
//列排序
|
|
@@ -141738,7 +141739,8 @@ function ChartReport()
|
|
|
141738
141739
|
var clickData=drag.ClickData;
|
|
141739
141740
|
var rtHeader=clickData.Header.Rect;
|
|
141740
141741
|
var headerWidth=rtHeader.Right-rtHeader.Left;
|
|
141741
|
-
|
|
141742
|
+
|
|
141743
|
+
var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
|
|
141742
141744
|
rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
|
|
141743
141745
|
rtRow.Right=rtRow.Left+rtRow.Width;
|
|
141744
141746
|
rtRow.Height=rtRow.Bottom-rtRow.Top;
|
|
@@ -146032,7 +146034,7 @@ function ScrollBarBGChart()
|
|
|
146032
146034
|
|
|
146033
146035
|
|
|
146034
146036
|
|
|
146035
|
-
var HQCHART_VERSION="1.1.
|
|
146037
|
+
var HQCHART_VERSION="1.1.14616";
|
|
146036
146038
|
|
|
146037
146039
|
function PrintHQChartVersion()
|
|
146038
146040
|
{
|
|
@@ -13094,7 +13094,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13094
13094
|
this.ReloadChartDrawPictureResource(option.Resource);
|
|
13095
13095
|
|
|
13096
13096
|
if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} ); //是否立即更新并重绘
|
|
13097
|
-
else if (option.Draw==true) this.Draw(); //是否立即重绘
|
|
13097
|
+
else if (option.Draw==true || option.Redraw==true) this.Draw(); //是否立即重绘
|
|
13098
13098
|
|
|
13099
13099
|
if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
|
|
13100
13100
|
if (this.DialogTooltip) this.DialogTooltip.ReloadResource(option);
|
|
@@ -136563,13 +136563,14 @@ function JSReportChartContainer(uielement)
|
|
|
136563
136563
|
if (item.ReloadResource) item.ReloadResource(option);
|
|
136564
136564
|
}
|
|
136565
136565
|
|
|
136566
|
-
if (option && option.Redraw)
|
|
136566
|
+
if (option && (option.Redraw || option.Draw))
|
|
136567
136567
|
{
|
|
136568
136568
|
this.SetSizeChange(true);
|
|
136569
136569
|
this.Draw();
|
|
136570
136570
|
}
|
|
136571
136571
|
|
|
136572
|
-
if (this.
|
|
136572
|
+
if (this.TooltipMinuteChart) this.TooltipMinuteChart.ReloadResource(option); //分时图
|
|
136573
|
+
if (this.TooltipKLineChart) this.TooltipKLineChart.ReloadResource(option);
|
|
136573
136574
|
}
|
|
136574
136575
|
|
|
136575
136576
|
//列排序
|
|
@@ -141782,7 +141783,8 @@ function ChartReport()
|
|
|
141782
141783
|
var clickData=drag.ClickData;
|
|
141783
141784
|
var rtHeader=clickData.Header.Rect;
|
|
141784
141785
|
var headerWidth=rtHeader.Right-rtHeader.Left;
|
|
141785
|
-
|
|
141786
|
+
|
|
141787
|
+
var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
|
|
141786
141788
|
rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
|
|
141787
141789
|
rtRow.Right=rtRow.Left+rtRow.Width;
|
|
141788
141790
|
rtRow.Height=rtRow.Bottom-rtRow.Top;
|
|
@@ -156744,7 +156746,7 @@ function HQChartScriptWorker()
|
|
|
156744
156746
|
|
|
156745
156747
|
|
|
156746
156748
|
|
|
156747
|
-
var HQCHART_VERSION="1.1.
|
|
156749
|
+
var HQCHART_VERSION="1.1.14616";
|
|
156748
156750
|
|
|
156749
156751
|
function PrintHQChartVersion()
|
|
156750
156752
|
{
|