hqchart 1.1.15881 → 1.1.15883
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 +13 -6
- package/package.json +1 -1
- package/src/jscommon/umychart/umychart.js +131 -30
- package/src/jscommon/umychart/umychart.min.js +1 -1
- package/src/jscommon/umychart.js +130 -29
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +131 -30
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +131 -30
package/lib/umychart.vue.js
CHANGED
|
@@ -5683,6 +5683,7 @@ if(parseInt(item.Date/10000)!=parseInt(startDate/10000)){startDate=item.Date;++i
|
|
|
5683
5683
|
if(item.Date!=startDate){startDate=item.Date;++index;}this.Data.push({ID:index,Date:item.Date});break;}}this.KDataFeature={Symbol:this.HQChart.Symbol,Period:period,DataCount:hisData.Data.length};};}//窗口底部工具栏
|
|
5684
5684
|
function FrameButtomToolbarPaint(){this.newMethod=IExtendChartPainting;//派生
|
|
5685
5685
|
this.newMethod();delete this.newMethod;this.ClassName='FrameButtomToolbarPaint';this.FrameID=-1;this.FrameGuid=null;this.IsDynamic=true;this.DrawAfterTitle=true;this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;this.AryButton=[];// { Title:, ID:, Data:数据, TooltipText:提示信息 }
|
|
5686
|
+
this.AryRButton=[];// 右侧按钮数据
|
|
5686
5687
|
this.SelectedID=null;// 选中按钮ID
|
|
5687
5688
|
this.AryRectButton=[];this.BGColor=g_JSChartResource.FrameButtomToolbar.BGColor;this.BorderColor=g_JSChartResource.FrameButtomToolbar.BorderColor;this.ButtonConfig=CloneData(g_JSChartResource.FrameButtomToolbar.Button);/*
|
|
5688
5689
|
{
|
|
@@ -5705,13 +5706,19 @@ this.AryRectButton=[];this.BGColor=g_JSChartResource.FrameButtomToolbar.BGColor;
|
|
|
5705
5706
|
{ Title:"降龙掌", ID:"B3"}
|
|
5706
5707
|
];
|
|
5707
5708
|
this.SelectedID="A1"
|
|
5708
|
-
|
|
5709
|
+
*///缓存
|
|
5710
|
+
this.FontCache;this.SVGFontCache;this.ReloadResource=function(resource){this.BGColor=g_JSChartResource.FrameButtomToolbar.BGColor;this.BorderColor=g_JSChartResource.FrameButtomToolbar.BorderColor;this.ButtonConfig=CloneData(g_JSChartResource.FrameButtomToolbar.Button);};this.SetOption=function(option){if(option){if(IFrameSplitOperator.IsNumber(option.FrameID))this.FrameID=option.FrameID;if(option.FrameGuid)this.FrameGuid=option.FrameGuid;if(IFrameSplitOperator.IsNonEmptyArray(option.AryButton))this.AryButton=option.AryButton.slice();if(IFrameSplitOperator.IsNonEmptyArray(option.AryRButton))this.AryRButton=option.AryRButton.slice();if(option.SelectedID)this.SelectedID=option.SelectedID;}};//设置当前选中的菜单ID
|
|
5709
5711
|
this.SetSelectedID=function(id){this.SelectedID=id;};this.Draw=function(moveonPoint,mouseStatus){this.AryRectButton=[];var frame=this.GetFrame();if(!frame)return;if(frame.IsHScreen)return;//不支持横屏
|
|
5710
|
-
if(frame.IsMinSize)return;if(frame.ChartBorder.IsShowTitleOnly)return;var border=frame.ChartBorder.GetBorder();var rtBG={Left:border.Left+1,Right:border.Right-1,Top:border.BottomEx+1,Bottom:border.Bottom-1};rtBG.Width=rtBG.Right-rtBG.Left;rtBG.Height=rtBG.Bottom-rtBG.Top;if(rtBG.Height<10)return;if(this.BGColor){this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}
|
|
5711
|
-
var bgColor=this.ButtonConfig.BGColor.Default;var titleColor=this.ButtonConfig.TitleColor.Default;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){bgColor=this.ButtonConfig.BGColor.MoveOn;titleColor=this.ButtonConfig.TitleColor.MoveOn;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y},ID:"TitleButton"};}if(this.SelectedID&&this.SelectedID==item.ID){bgColor=this.ButtonConfig.BGColor.Selected;titleColor=this.ButtonConfig.TitleColor.Selected;}
|
|
5712
|
-
var yText=rtButton.Top+this.ButtonConfig.Mergin.Top+(rtButton.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom)/2;this.Canvas.fillText(item.Title,xText,yText);}var rtSVG=null;if(item.SVGButton&&item.SVGButton.Symbol){this.Canvas.font=svgFont;this.Canvas.fillStyle=titleColor;var xText=rtButton.Right-this.ButtonConfig.SVG.Size/2-this.ButtonConfig.Mergin.Right;this.Canvas.fillText(item.SVGButton.Symbol,xText,yText);this.Canvas.font=font;rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size,Top:rtButton.Top,Width:this.ButtonConfig.SVG.Size,Height:this.ButtonConfig.SVG.Size};rtSVG.Right=rtSVG.Left+rtSVG.Width;rtSVG.Bottom=rtSVG.Top+rtSVG.Height;}//{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
|
|
5712
|
+
if(frame.IsMinSize)return;if(frame.ChartBorder.IsShowTitleOnly)return;var border=frame.ChartBorder.GetBorder();var rtBG={Left:border.Left+1,Right:border.Right-1,Top:border.BottomEx+1,Bottom:border.Bottom-1};rtBG.Width=rtBG.Right-rtBG.Left;rtBG.Height=rtBG.Bottom-rtBG.Top;if(rtBG.Height<10)return;if(this.BGColor){this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}this.FontCache=this.GetTitleFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);this.SVGFontCache=this.GetSVGFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);this.Canvas.textBaseline='middle';this.Canvas.textAlign='center';this.Canvas.font=this.FontCache;var xBotton=rtBG.Left;for(var i=0;i<this.AryButton.length;++i){var item=this.AryButton[i];if(!item.Title&&!(item.SVGButton&&item.SVGButton.Symbol))continue;var textWidth=0;if(item.Title){textWidth=this.Canvas.measureText(item.Title).width+2;}var svgButtonWidth=0;if(item.SVGButton&&item.SVGButton.Symbol){svgButtonWidth=this.ButtonConfig.SVG.Size;if(textWidth>0)svgButtonWidth+=this.ButtonConfig.SVG.MerginLeft;}var buttonWidth=textWidth+svgButtonWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;var rtButton={Left:xBotton,Top:rtBG.Top,Bottom:rtBG.Bottom,Height:rtBG.Height,Width:buttonWidth};rtButton.Right=rtButton.Left+rtButton.Width;rtButton.SVGButtonWidth=svgButtonWidth;var rtSVG=null;if(item.SVGButton&&item.SVGButton.Symbol){rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size,Top:rtButton.Top,Width:this.ButtonConfig.SVG.Size,Height:this.ButtonConfig.SVG.Size};rtSVG.Right=rtSVG.Left+rtSVG.Width;rtSVG.Bottom=rtSVG.Top+rtSVG.Height;}//鼠标是否在按钮上
|
|
5713
|
+
var bgColor=this.ButtonConfig.BGColor.Default;var titleColor=this.ButtonConfig.TitleColor.Default;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){bgColor=this.ButtonConfig.BGColor.MoveOn;titleColor=this.ButtonConfig.TitleColor.MoveOn;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y},ID:"TitleButton"};}if(this.SelectedID&&this.SelectedID==item.ID){bgColor=this.ButtonConfig.BGColor.Selected;titleColor=this.ButtonConfig.TitleColor.Selected;}this.DrawButtom(rtButton,item,bgColor,titleColor);//{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
|
|
5713
5714
|
if(textWidth>0&&svgButtonWidth>0){var rtText={Left:rtButton.Left,Top:rtButton.Top,Bottom:rtButton.Bottom};rtText.Right=rtText.Left+textWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.SVG.MerginLeft/2;var cacheItem={Rect:rtText,ID:item.ID,Data:item,RectCell:rtButton,ButtonType:0};this.AryRectButton.push(cacheItem);var rtSVG={Left:rtText.Right,Right:rtButton.Right,Top:rtButton.Top,Bottom:rtButton.Bottom};var cacheItem={Rect:rtSVG,ID:item.ID,Data:item,RectCell:rtButton,ButtonType:1};this.AryRectButton.push(cacheItem);}else{var cacheItem={Rect:rtButton,ID:item.ID,Data:item,RectCell:rtButton};//RectCell 全部的大小
|
|
5714
|
-
if(textWidth>0)cacheItem.ButtonType=0;else if(svgButtonWidth>0)cacheItem.ButtonType=1;this.AryRectButton.push(cacheItem);}xBotton+=buttonWidth+1;}
|
|
5715
|
+
if(textWidth>0)cacheItem.ButtonType=0;else if(svgButtonWidth>0)cacheItem.ButtonType=1;this.AryRectButton.push(cacheItem);}xBotton+=buttonWidth+1;}var xRButton=rtBG.Right;//右边
|
|
5716
|
+
for(var i=0;i<this.AryRButton.length;++i){var item=this.AryRButton[i];if(!item.Title&&!(item.SVGButton&&item.SVGButton.Symbol))continue;var textWidth=0;if(item.Title){textWidth=this.Canvas.measureText(item.Title).width+2;}var svgButtonWidth=0;if(item.SVGButton&&item.SVGButton.Symbol){svgButtonWidth=this.ButtonConfig.SVG.Size;if(textWidth>0)svgButtonWidth+=this.ButtonConfig.SVG.MerginLeft;}var buttonWidth=textWidth+svgButtonWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;var rtButton={Right:xRButton,Top:rtBG.Top,Bottom:rtBG.Bottom,Height:rtBG.Height,Width:buttonWidth};rtButton.Left=rtButton.Right-rtButton.Width;rtButton.SVGButtonWidth=svgButtonWidth;var rtSVG=null;if(item.SVGButton&&item.SVGButton.Symbol){rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size,Top:rtButton.Top,Width:this.ButtonConfig.SVG.Size,Height:this.ButtonConfig.SVG.Size};rtSVG.Right=rtSVG.Left+rtSVG.Width;rtSVG.Bottom=rtSVG.Top+rtSVG.Height;}//鼠标是否在按钮上
|
|
5717
|
+
var bgColor=this.ButtonConfig.BGColor.Default;var titleColor=this.ButtonConfig.TitleColor.Default;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){bgColor=this.ButtonConfig.BGColor.MoveOn;titleColor=this.ButtonConfig.TitleColor.MoveOn;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y},ID:"TitleButton"};}if(this.SelectedID&&this.SelectedID==item.ID){bgColor=this.ButtonConfig.BGColor.Selected;titleColor=this.ButtonConfig.TitleColor.Selected;}this.DrawButtom(rtButton,item,bgColor,titleColor,1);//{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
|
|
5718
|
+
if(textWidth>0&&svgButtonWidth>0){var rtText={Left:rtButton.Left,Top:rtButton.Top,Bottom:rtButton.Bottom};rtText.Right=rtText.Left+textWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.SVG.MerginLeft/2;var cacheItem={Rect:rtText,ID:item.ID,Data:item,RectCell:rtButton,ButtonType:0};this.AryRectButton.push(cacheItem);var rtSVG={Left:rtText.Right,Right:rtButton.Right,Top:rtButton.Top,Bottom:rtButton.Bottom};var cacheItem={Rect:rtSVG,ID:item.ID,Data:item,RectCell:rtButton,ButtonType:1};this.AryRectButton.push(cacheItem);}else{var cacheItem={Rect:rtButton,ID:item.ID,Data:item,RectCell:rtButton};//RectCell 全部的大小
|
|
5719
|
+
if(textWidth>0)cacheItem.ButtonType=0;else if(svgButtonWidth>0)cacheItem.ButtonType=1;this.AryRectButton.push(cacheItem);}xRButton-=buttonWidth+1;}if(this.BorderColor){this.Canvas.strokeStyle=this.BorderColor;this.Canvas.beginPath();this.Canvas.moveTo(border.Left,ToFixedPoint(border.BottomEx));this.Canvas.lineTo(border.Right,ToFixedPoint(border.BottomEx));this.Canvas.stroke();}};//type 0=左按钮 1=右按钮
|
|
5720
|
+
this.DrawButtom=function(rtButton,item,bgColor,titleColor){var type=arguments.length>4&&arguments[4]!==undefined?arguments[4]:0;var svgButtonWidth=rtButton.SVGButtonWidth;if(bgColor){this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);}if(this.ButtonConfig.BorderColor){this.Canvas.strokeStyle=this.ButtonConfig.BorderColor;this.Canvas.beginPath();if(type===1){this.Canvas.moveTo(ToFixedPoint(rtButton.Left),rtButton.Top);this.Canvas.lineTo(ToFixedPoint(rtButton.Left),rtButton.Bottom);}else{this.Canvas.moveTo(ToFixedPoint(rtButton.Right),rtButton.Top);this.Canvas.lineTo(ToFixedPoint(rtButton.Right),rtButton.Bottom);}this.Canvas.stroke();}if(item.Title){this.Canvas.fillStyle=titleColor;var xText=rtButton.Left+(rtButton.Width-svgButtonWidth)/2;//居中
|
|
5721
|
+
var yText=rtButton.Top+this.ButtonConfig.Mergin.Top+(rtButton.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom)/2;this.Canvas.fillText(item.Title,xText,yText);}if(item.SVGButton&&item.SVGButton.Symbol){this.Canvas.font=this.SVGFontCache;this.Canvas.fillStyle=titleColor;var xText=rtButton.Right-this.ButtonConfig.SVG.Size/2-this.ButtonConfig.Mergin.Right;this.Canvas.fillText(item.SVGButton.Symbol,xText,yText);this.Canvas.font=this.FontCache;}};this.GetFrame=function(){if(!this.ChartFrame)return null;if(this.FrameID>=0){var subFrame=this.ChartFrame.SubFrame[this.FrameID];if(!subFrame||!subFrame.Frame)return null;return subFrame.Frame;}return null;};this.GetTitleFont=function(height){var config=this.ButtonConfig.Font;var fontSize=height*GetDevicePixelRatio();if(IFrameSplitOperator.IsPlusNumber(config.Size))fontSize=config.Size;var font="".concat(fontSize,"px ").concat(config.Family);return font;};this.GetSVGFont=function(height){var config=this.ButtonConfig.SVG;var fontSize=height*GetDevicePixelRatio();if(IFrameSplitOperator.IsPlusNumber(config.Size))fontSize=config.Size;var font="".concat(fontSize,"px ").concat(config.Family);return font;};this.PtInButtons=function(x,y){for(var i=0;i<this.AryRectButton.length;++i){var item=this.AryRectButton[i];var rect=item.Rect;if(x>rect.Left&&x<rect.Right&&y>rect.Top&&y<rect.Bottom){var frame=this.GetFrame();var result={ID:item.Data.ID,Rect:rect,FrameID:this.FrameID,Frame:frame,Data:item.Data,ButtonType:item.ButtonType,RectCell:item.RectCell};return result;}}return null;};}//弹幕数据 { X:X偏移, Y:Y偏移, Text:内容, Color:颜色 }
|
|
5715
5722
|
function BarrageList(){this.PlayList=[];//正在播放队列
|
|
5716
5723
|
this.Cache=[];//没有播放的弹幕数据
|
|
5717
5724
|
this.MinLineHeight=40*GetDevicePixelRatio();this.Height;//高度
|
|
@@ -16776,7 +16783,7 @@ if(dayItem.Text){var textWidth=this.Canvas.measureText(dayItem.Text).width;xText
|
|
|
16776
16783
|
{yCell=rtCell.Bottom;xCell=left;}++j;}}},{key:"DrawMarkDay",value:function DrawMarkDay(dayItem,markItem,rtCell,yText){var config=this.MarkDayConfig;var radius=config.Dots.Radius;var yOffset=config.Dots.YOffset;var color=config.Dots.Color;if(markItem.Color)color=markItem.Color;if(IFrameSplitOperator.IsNumber(markItem.YOffset))yOffset=markItem.YOffset;if(IFrameSplitOperator.IsNumber(markItem.Radius))radius=markItem.Radius;var x=rtCell.Left+rtCell.Width/2;var y=yText+yOffset;this.Canvas.fillStyle=color;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();}},{key:"PtInCell",value:function PtInCell(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect))return null;for(var i=0;i<this.AryCellRect.length;++i){var item=this.AryCellRect[i];var rtCell=item.Rect;if(x>=rtCell.Left&&x<=rtCell.Right&&y>=rtCell.Top&&y<=rtCell.Bottom){var data={Rect:rtCell,Type:item.Type,Data:item.Data};return data;}}return null;}},{key:"OnMouseOn",value:function OnMouseOn(x,y,e){var pixelTatio=GetDevicePixelRatio();var insidePoint={X:x/pixelTatio,Y:y/pixelTatio};var uiElement;if(this.UIElement)uiElement={Left:this.UIElement.getBoundingClientRect().left,Top:this.UIElement.getBoundingClientRect().top};else uiElement={Left:null,Top:null};var bDraw=false;var cell=this.PtInCell(x,y);if(cell){bDraw=false;var selData=this.MoveOnData.Data;if(selData&&cell.Type==selData.Type){if(cell.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID||cell.Type===JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID){if(cell.Data.Date!=selData.Data.Date){this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}}}else{this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}return{Redraw:bDraw,Cell:cell};}if(this.MoveOnData.Data){this.MoveOnData.Data=null;bDraw=true;}return{Redraw:bDraw,Cell:null};}},{key:"OnMouseDown",value:function OnMouseDown(x,y,e){var cell=this.PtInCell(x,y);if(!cell)return null;var bDraw=false;return{Type:cell.Type,Redraw:bDraw,Data:cell.Data};}},{key:"SetSelectedDay",value:function SetSelectedDay(aryData){this.ArySelectedDay=[];if(IFrameSplitOperator.IsNonEmptyArray(aryData))this.ArySelectedDay=aryData.slice();}}]);}();/********************************************************************************
|
|
16777
16784
|
* 版本信息输出
|
|
16778
16785
|
*
|
|
16779
|
-
*/var HQCHART_VERSION="1.1.
|
|
16786
|
+
*/var HQCHART_VERSION="1.1.15882";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: ".concat(HQCHART_VERSION," \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ");console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
16780
16787
|
var _default=exports["default"]=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
16781
16788
|
// BaseIndex:BaseIndex,
|
|
16782
16789
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -61165,6 +61165,7 @@ function FrameButtomToolbarPaint()
|
|
|
61165
61165
|
this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
|
|
61166
61166
|
|
|
61167
61167
|
this.AryButton=[]; // { Title:, ID:, Data:数据, TooltipText:提示信息 }
|
|
61168
|
+
this.AryRButton=[]; // 右侧按钮数据
|
|
61168
61169
|
this.SelectedID=null; // 选中按钮ID
|
|
61169
61170
|
this.AryRectButton=[];
|
|
61170
61171
|
|
|
@@ -61195,6 +61196,10 @@ function FrameButtomToolbarPaint()
|
|
|
61195
61196
|
];
|
|
61196
61197
|
this.SelectedID="A1"
|
|
61197
61198
|
*/
|
|
61199
|
+
|
|
61200
|
+
//缓存
|
|
61201
|
+
this.FontCache;
|
|
61202
|
+
this.SVGFontCache;
|
|
61198
61203
|
|
|
61199
61204
|
this.ReloadResource=function(resource)
|
|
61200
61205
|
{
|
|
@@ -61211,6 +61216,7 @@ function FrameButtomToolbarPaint()
|
|
|
61211
61216
|
if (IFrameSplitOperator.IsNumber(option.FrameID)) this.FrameID=option.FrameID;
|
|
61212
61217
|
if (option.FrameGuid) this.FrameGuid=option.FrameGuid;
|
|
61213
61218
|
if (IFrameSplitOperator.IsNonEmptyArray(option.AryButton)) this.AryButton=option.AryButton.slice();
|
|
61219
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.AryRButton)) this.AryRButton=option.AryRButton.slice();
|
|
61214
61220
|
if (option.SelectedID) this.SelectedID=option.SelectedID;
|
|
61215
61221
|
}
|
|
61216
61222
|
}
|
|
@@ -61243,16 +61249,18 @@ function FrameButtomToolbarPaint()
|
|
|
61243
61249
|
this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
|
|
61244
61250
|
}
|
|
61245
61251
|
|
|
61246
|
-
|
|
61247
|
-
|
|
61252
|
+
this.FontCache=this.GetTitleFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);
|
|
61253
|
+
this.SVGFontCache=this.GetSVGFont(rtBG.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom);
|
|
61254
|
+
|
|
61248
61255
|
this.Canvas.textBaseline='middle';
|
|
61249
61256
|
this.Canvas.textAlign='center';
|
|
61250
|
-
this.Canvas.font=
|
|
61257
|
+
this.Canvas.font=this.FontCache;
|
|
61258
|
+
|
|
61251
61259
|
var xBotton=rtBG.Left;
|
|
61252
61260
|
for(var i=0;i<this.AryButton.length;++i)
|
|
61253
61261
|
{
|
|
61254
61262
|
var item=this.AryButton[i];
|
|
61255
|
-
if (!item.Title && !(item.SVGButton && item.SVGButton.Symbol))
|
|
61263
|
+
if (!item.Title && !(item.SVGButton && item.SVGButton.Symbol)) continue;
|
|
61256
61264
|
|
|
61257
61265
|
var textWidth=0;
|
|
61258
61266
|
if (item.Title)
|
|
@@ -61265,12 +61273,20 @@ function FrameButtomToolbarPaint()
|
|
|
61265
61273
|
{
|
|
61266
61274
|
svgButtonWidth=this.ButtonConfig.SVG.Size;
|
|
61267
61275
|
if (textWidth>0) svgButtonWidth+=this.ButtonConfig.SVG.MerginLeft;
|
|
61268
|
-
|
|
61269
61276
|
}
|
|
61270
61277
|
|
|
61271
61278
|
var buttonWidth=textWidth+svgButtonWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;
|
|
61272
61279
|
var rtButton={ Left:xBotton, Top:rtBG.Top, Bottom:rtBG.Bottom, Height:rtBG.Height, Width:buttonWidth };
|
|
61273
61280
|
rtButton.Right=rtButton.Left+rtButton.Width;
|
|
61281
|
+
rtButton.SVGButtonWidth=svgButtonWidth;
|
|
61282
|
+
|
|
61283
|
+
var rtSVG=null;
|
|
61284
|
+
if (item.SVGButton && item.SVGButton.Symbol)
|
|
61285
|
+
{
|
|
61286
|
+
rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size, Top:rtButton.Top, Width:this.ButtonConfig.SVG.Size, Height:this.ButtonConfig.SVG.Size};
|
|
61287
|
+
rtSVG.Right=rtSVG.Left+rtSVG.Width;
|
|
61288
|
+
rtSVG.Bottom=rtSVG.Top+rtSVG.Height;
|
|
61289
|
+
}
|
|
61274
61290
|
|
|
61275
61291
|
//鼠标是否在按钮上
|
|
61276
61292
|
var bgColor=this.ButtonConfig.BGColor.Default;
|
|
@@ -61289,45 +61305,84 @@ function FrameButtomToolbarPaint()
|
|
|
61289
61305
|
titleColor=this.ButtonConfig.TitleColor.Selected;
|
|
61290
61306
|
}
|
|
61291
61307
|
|
|
61308
|
+
this.DrawButtom(rtButton, item, bgColor, titleColor);
|
|
61292
61309
|
|
|
61293
|
-
|
|
61310
|
+
//{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
|
|
61311
|
+
if (textWidth>0 && svgButtonWidth>0)
|
|
61294
61312
|
{
|
|
61295
|
-
|
|
61296
|
-
this.
|
|
61313
|
+
var rtText={ Left:rtButton.Left, Top:rtButton.Top, Bottom:rtButton.Bottom };
|
|
61314
|
+
rtText.Right=rtText.Left+textWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.SVG.MerginLeft/2;
|
|
61315
|
+
var cacheItem={ Rect:rtText, ID:item.ID, Data:item, RectCell:rtButton, ButtonType:0 };
|
|
61316
|
+
this.AryRectButton.push(cacheItem);
|
|
61317
|
+
|
|
61318
|
+
var rtSVG={Left:rtText.Right, Right:rtButton.Right, Top:rtButton.Top, Bottom:rtButton.Bottom };
|
|
61319
|
+
var cacheItem={ Rect:rtSVG, ID:item.ID, Data:item, RectCell:rtButton, ButtonType:1 };
|
|
61320
|
+
this.AryRectButton.push(cacheItem);
|
|
61297
61321
|
}
|
|
61298
|
-
|
|
61299
|
-
if (this.ButtonConfig.BorderColor)
|
|
61322
|
+
else
|
|
61300
61323
|
{
|
|
61301
|
-
|
|
61302
|
-
|
|
61303
|
-
|
|
61304
|
-
this.
|
|
61305
|
-
this.Canvas.stroke();
|
|
61324
|
+
var cacheItem={ Rect:rtButton, ID:item.ID, Data:item, RectCell:rtButton }; //RectCell 全部的大小
|
|
61325
|
+
if (textWidth>0) cacheItem.ButtonType=0;
|
|
61326
|
+
else if (svgButtonWidth>0) cacheItem.ButtonType=1;
|
|
61327
|
+
this.AryRectButton.push(cacheItem);
|
|
61306
61328
|
}
|
|
61329
|
+
|
|
61330
|
+
xBotton+=buttonWidth+1;
|
|
61331
|
+
}
|
|
61332
|
+
|
|
61307
61333
|
|
|
61334
|
+
var xRButton=rtBG.Right; //右边
|
|
61335
|
+
for(var i=0;i<this.AryRButton.length;++i)
|
|
61336
|
+
{
|
|
61337
|
+
var item=this.AryRButton[i];
|
|
61338
|
+
if (!item.Title && !(item.SVGButton && item.SVGButton.Symbol)) continue;
|
|
61339
|
+
|
|
61340
|
+
|
|
61341
|
+
var textWidth=0;
|
|
61308
61342
|
if (item.Title)
|
|
61309
61343
|
{
|
|
61310
|
-
this.Canvas.
|
|
61311
|
-
|
|
61312
|
-
|
|
61313
|
-
|
|
61344
|
+
textWidth=this.Canvas.measureText(item.Title).width+2;
|
|
61345
|
+
}
|
|
61346
|
+
|
|
61347
|
+
var svgButtonWidth=0;
|
|
61348
|
+
if (item.SVGButton && item.SVGButton.Symbol)
|
|
61349
|
+
{
|
|
61350
|
+
svgButtonWidth=this.ButtonConfig.SVG.Size;
|
|
61351
|
+
if (textWidth>0) svgButtonWidth+=this.ButtonConfig.SVG.MerginLeft;
|
|
61314
61352
|
}
|
|
61315
|
-
|
|
61353
|
+
|
|
61354
|
+
var buttonWidth=textWidth+svgButtonWidth+this.ButtonConfig.Mergin.Left+this.ButtonConfig.Mergin.Right;
|
|
61355
|
+
var rtButton={ Right:xRButton, Top:rtBG.Top, Bottom:rtBG.Bottom, Height:rtBG.Height, Width:buttonWidth };
|
|
61356
|
+
rtButton.Left=rtButton.Right-rtButton.Width;
|
|
61357
|
+
rtButton.SVGButtonWidth=svgButtonWidth;
|
|
61316
61358
|
|
|
61317
61359
|
var rtSVG=null;
|
|
61318
61360
|
if (item.SVGButton && item.SVGButton.Symbol)
|
|
61319
61361
|
{
|
|
61320
|
-
this.Canvas.font=svgFont;
|
|
61321
|
-
this.Canvas.fillStyle=titleColor;
|
|
61322
|
-
var xText=rtButton.Right-this.ButtonConfig.SVG.Size/2-this.ButtonConfig.Mergin.Right;
|
|
61323
|
-
this.Canvas.fillText(item.SVGButton.Symbol,xText,yText);
|
|
61324
|
-
this.Canvas.font=font;
|
|
61325
|
-
|
|
61326
61362
|
rtSVG={Left:rtButton.Right-this.ButtonConfig.Mergin.Right-this.ButtonConfig.SVG.Size, Top:rtButton.Top, Width:this.ButtonConfig.SVG.Size, Height:this.ButtonConfig.SVG.Size};
|
|
61327
61363
|
rtSVG.Right=rtSVG.Left+rtSVG.Width;
|
|
61328
61364
|
rtSVG.Bottom=rtSVG.Top+rtSVG.Height;
|
|
61329
61365
|
}
|
|
61330
61366
|
|
|
61367
|
+
//鼠标是否在按钮上
|
|
61368
|
+
var bgColor=this.ButtonConfig.BGColor.Default;
|
|
61369
|
+
var titleColor=this.ButtonConfig.TitleColor.Default;
|
|
61370
|
+
if (moveonPoint && (moveonPoint.X>=rtButton.Left && moveonPoint.X<rtButton.Right && moveonPoint.Y>=rtButton.Top && moveonPoint.Y<=rtButton.Bottom))
|
|
61371
|
+
{
|
|
61372
|
+
bgColor=this.ButtonConfig.BGColor.MoveOn;
|
|
61373
|
+
titleColor=this.ButtonConfig.TitleColor.MoveOn;
|
|
61374
|
+
if (mouseStatus)
|
|
61375
|
+
mouseStatus.MouseOnToolbar={ Rect:rtButton, Item:item, Frame:frame, Point:{X:moveonPoint.X, Y:moveonPoint.Y}, ID:"TitleButton" };
|
|
61376
|
+
}
|
|
61377
|
+
|
|
61378
|
+
if (this.SelectedID && this.SelectedID==item.ID)
|
|
61379
|
+
{
|
|
61380
|
+
bgColor=this.ButtonConfig.BGColor.Selected;
|
|
61381
|
+
titleColor=this.ButtonConfig.TitleColor.Selected;
|
|
61382
|
+
}
|
|
61383
|
+
|
|
61384
|
+
this.DrawButtom(rtButton, item, bgColor, titleColor, 1);
|
|
61385
|
+
|
|
61331
61386
|
//{ Rect:rtButton, ID:item.ID, Data:item, RectSVG:rtSVG }
|
|
61332
61387
|
if (textWidth>0 && svgButtonWidth>0)
|
|
61333
61388
|
{
|
|
@@ -61348,9 +61403,7 @@ function FrameButtomToolbarPaint()
|
|
|
61348
61403
|
this.AryRectButton.push(cacheItem);
|
|
61349
61404
|
}
|
|
61350
61405
|
|
|
61351
|
-
|
|
61352
|
-
|
|
61353
|
-
xBotton+=buttonWidth+1;
|
|
61406
|
+
xRButton-=buttonWidth+1;
|
|
61354
61407
|
}
|
|
61355
61408
|
|
|
61356
61409
|
if (this.BorderColor)
|
|
@@ -61363,6 +61416,54 @@ function FrameButtomToolbarPaint()
|
|
|
61363
61416
|
}
|
|
61364
61417
|
}
|
|
61365
61418
|
|
|
61419
|
+
//type 0=左按钮 1=右按钮
|
|
61420
|
+
this.DrawButtom=function(rtButton, item, bgColor, titleColor, type=0)
|
|
61421
|
+
{
|
|
61422
|
+
var svgButtonWidth=rtButton.SVGButtonWidth;
|
|
61423
|
+
|
|
61424
|
+
if (bgColor)
|
|
61425
|
+
{
|
|
61426
|
+
this.Canvas.fillStyle=bgColor;
|
|
61427
|
+
this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);
|
|
61428
|
+
}
|
|
61429
|
+
|
|
61430
|
+
if (this.ButtonConfig.BorderColor)
|
|
61431
|
+
{
|
|
61432
|
+
this.Canvas.strokeStyle=this.ButtonConfig.BorderColor;
|
|
61433
|
+
this.Canvas.beginPath();
|
|
61434
|
+
|
|
61435
|
+
if (type===1)
|
|
61436
|
+
{
|
|
61437
|
+
this.Canvas.moveTo(ToFixedPoint(rtButton.Left),rtButton.Top);
|
|
61438
|
+
this.Canvas.lineTo(ToFixedPoint(rtButton.Left),rtButton.Bottom);
|
|
61439
|
+
}
|
|
61440
|
+
else
|
|
61441
|
+
{
|
|
61442
|
+
this.Canvas.moveTo(ToFixedPoint(rtButton.Right),rtButton.Top);
|
|
61443
|
+
this.Canvas.lineTo(ToFixedPoint(rtButton.Right),rtButton.Bottom);
|
|
61444
|
+
}
|
|
61445
|
+
|
|
61446
|
+
this.Canvas.stroke();
|
|
61447
|
+
}
|
|
61448
|
+
|
|
61449
|
+
if (item.Title)
|
|
61450
|
+
{
|
|
61451
|
+
this.Canvas.fillStyle=titleColor;
|
|
61452
|
+
var xText=rtButton.Left+(rtButton.Width-svgButtonWidth)/2; //居中
|
|
61453
|
+
var yText=rtButton.Top+this.ButtonConfig.Mergin.Top+(rtButton.Height-this.ButtonConfig.Mergin.Top-this.ButtonConfig.Mergin.Bottom)/2;
|
|
61454
|
+
this.Canvas.fillText(item.Title,xText,yText);
|
|
61455
|
+
}
|
|
61456
|
+
|
|
61457
|
+
if (item.SVGButton && item.SVGButton.Symbol)
|
|
61458
|
+
{
|
|
61459
|
+
this.Canvas.font=this.SVGFontCache;
|
|
61460
|
+
this.Canvas.fillStyle=titleColor;
|
|
61461
|
+
var xText=rtButton.Right-this.ButtonConfig.SVG.Size/2-this.ButtonConfig.Mergin.Right;
|
|
61462
|
+
this.Canvas.fillText(item.SVGButton.Symbol,xText,yText);
|
|
61463
|
+
this.Canvas.font=this.FontCache;
|
|
61464
|
+
}
|
|
61465
|
+
}
|
|
61466
|
+
|
|
61366
61467
|
this.GetFrame=function()
|
|
61367
61468
|
{
|
|
61368
61469
|
if (!this.ChartFrame) return null;
|
|
@@ -177975,7 +178076,7 @@ function ChartScrollText()
|
|
|
177975
178076
|
|
|
177976
178077
|
|
|
177977
178078
|
|
|
177978
|
-
var HQCHART_VERSION="1.1.
|
|
178079
|
+
var HQCHART_VERSION="1.1.15882";
|
|
177979
178080
|
|
|
177980
178081
|
function PrintHQChartVersion()
|
|
177981
178082
|
{
|