hqchart 1.1.13201 → 1.1.13206
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
|
@@ -6010,11 +6010,11 @@ this.LineWidth=1;this.Precision=2;//小数位数
|
|
|
6010
6010
|
this.ValueTextColor='rgb(250,250,250)';this.IsShowCorssCursor=true;//画的时候是否显示十字光标
|
|
6011
6011
|
this.GetLabelCallback;//绘制标题回调函数
|
|
6012
6012
|
this.PointCount=1;this.ClassName='ChartDrawHLine';this.Font=14*GetDevicePixelRatio()+"px 微软雅黑";this.TextFont=12*GetDevicePixelRatio()+"px 微软雅黑";this.RightSpaceWidth=50;this.ButtonPosition=0;//按钮位置, 0=价格后面， 1=价格上面
|
|
6013
|
-
this.ButtonBGColor='rgb(190,190,190)';this.ButtonSpace=3;this.Button={CloseIcon:{Text:'\uE62B',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,TooltipText:null},SettingIcon:{Text:'\uE623',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,TooltipText:null//修改ID, Text , TooltipText 可以外部定制按钮
|
|
6013
|
+
this.ButtonBGColor='rgb(190,190,190)';this.ButtonSpace=3;this.TextMargin={Left:0,Right:0};this.Button={CloseIcon:{Text:'\uE62B',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,TooltipText:null},SettingIcon:{Text:'\uE623',Color:'rgb(255,255,255)',Family:"iconfont",Size:16,ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,TooltipText:null//修改ID, Text , TooltipText 可以外部定制按钮
|
|
6014
6014
|
}};this.AryButton=[];this.ExtendData;//扩展数据
|
|
6015
6015
|
this.ShowPriceTextConfig={IsShow:[false,false,true],//[0]=left内 [1]=right内 [2]=right外
|
|
6016
6016
|
Font:[12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1']};//内部变量
|
|
6017
|
-
this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.GetLabelCallback){this.GetLabelCallback=option.GetLabelCallback;}if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(IFrameSplitOperator.IsNumber(option.ButtonPosition))this.ButtonPosition=option.ButtonPosition;if(IFrameSplitOperator.IsNumber(option.RightSpaceWidth))this.RightSpaceWidth=option.RightSpaceWidth;if(option.Button){var item=option.Button;if(item.CloseIcon)this.Button.CloseIcon=CloneData(item.CloseIcon);else if(item.CloseIcon===null)this.Button.CloseIcon=null;if(item.SettingIcon)this.Button.SettingIcon=CloneData(item.SettingIcon);else if(item.SettingIcon===null)this.Button.SettingIcon=null;}if(option.ExtendData)this.ExtendData=option.ExtendData;if(IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText)){for(var i=0;i<option.IsShowPriceText.length&&i<3;++i){var value=option.IsShowPriceText[i];if(IFrameSplitOperator.IsBool(value))this.ShowPriceTextConfig.IsShow[i]=value;}}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.IsPointIn=this.IsPointIn_XYValue_Line;/*
|
|
6017
|
+
this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.GetLabelCallback){this.GetLabelCallback=option.GetLabelCallback;}if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(IFrameSplitOperator.IsNumber(option.ButtonPosition))this.ButtonPosition=option.ButtonPosition;if(IFrameSplitOperator.IsNumber(option.RightSpaceWidth))this.RightSpaceWidth=option.RightSpaceWidth;if(option.Button){var item=option.Button;if(item.CloseIcon)this.Button.CloseIcon=CloneData(item.CloseIcon);else if(item.CloseIcon===null)this.Button.CloseIcon=null;if(item.SettingIcon)this.Button.SettingIcon=CloneData(item.SettingIcon);else if(item.SettingIcon===null)this.Button.SettingIcon=null;}if(option.ExtendData)this.ExtendData=option.ExtendData;if(IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText)){for(var i=0;i<option.IsShowPriceText.length&&i<3;++i){var value=option.IsShowPriceText[i];if(IFrameSplitOperator.IsBool(value))this.ShowPriceTextConfig.IsShow[i]=value;}}if(option.TextMargin){var item=option.TextMargin;if(IFrameSplitOperator.IsNumber(item.Left))this.TextMargin.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))this.TextMargin.Right=item.Right;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.IsPointIn=this.IsPointIn_XYValue_Line;/*
|
|
6018
6018
|
this.GetXYCoordinate=function()
|
|
6019
6019
|
{
|
|
6020
6020
|
if (this.IsFrameMinSize()) return null;
|
|
@@ -6030,8 +6030,11 @@ if(labInfo)this.DrawLab(labInfo,drawPoint[0].Y);//画中心点
|
|
|
6030
6030
|
var xCenter=left+(right-left)/2;var point={X:xCenter,Y:drawPoint[0].Y};this.DrawPoint([point]);this.Canvas.restore();//外部右侧显示价格
|
|
6031
6031
|
if(this.ShowPriceTextConfig.IsShow[2]){var rtDraw={};this.CalculateButtonSize();this.DrawValueText(drawPoint[0].Y,rtDraw,labInfo);if(labInfo)this.DrawRightLab(labInfo,rtDraw);if(labInfo)this.DrawCustomHLine(labInfo,drawPoint[0].Y);}//鼠标是否在按钮上
|
|
6032
6032
|
if(moveonPoint&&mouseStatus){for(var i=0;i<this.AryButton.length;++i){var item=this.AryButton[i];var rtButton=item.Rect;if(moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:this.Frame,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};break;}}}};this.CalculateLabSize=function(labInfo){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";this.Canvas.font=this.TextFont;var lineHeight=this.Canvas.measureText("擎").width+2;var maxNameWidth=0,maxTextWidth=0;var lineCount=0;var lineSpace=0;if(IFrameSplitOperator.IsNumber(labInfo.LineSpace))lineSpace=labInfo.LineSpace;var maxNameWidth=0,maxTextWidth=0;var lineCount=0;var maxWidth=0;for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];item.NameWidth=0;item.TextWidth=0;if(item.Name)item.NameWidth=this.Canvas.measureText(item.Name).width+2;if(item.Text)item.TextWidth=this.Canvas.measureText(item.Text).width+2;if(maxNameWidth<item.NameWidth)maxNameWidth=item.NameWidth;if(maxTextWidth<item.TextWidth)maxTextWidth=item.TextWidth;var itemWidth=item.NameWidth+item.TextWidth;if(maxWidth<itemWidth)maxWidth=itemWidth;++lineCount;}var size={Width:maxWidth,Height:lineCount*(lineHeight+lineSpace)+lineSpace,NameWidth:maxNameWidth,TextWidth:maxTextWidth,LineHeight:lineHeight};return size;};this.DrawLab=function(labInfo,y){if(!labInfo)return;if(!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText))return;if(labInfo.Position===2)return;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var labSize=this.CalculateLabSize(labInfo);var drawLeft=right-labSize.Width;var drawTop=y-labSize.Height-1;//背景色
|
|
6033
|
-
if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=y-labSize.Height-4;this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(right+drawLeft),ToFixedRect(y-rtTop));}var yText=drawTop;for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];if(item.Name){this.Canvas.fillStyle=item.NameColor;this.Canvas.fillText(item.Name,drawLeft+1,yText+1);}if(item.Text){this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,drawLeft+labSize.NameWidth+1,yText+1);}yText+=labSize.LineHeight;}};this.DrawRightLab=function(labInfo,rtLeftDraw){if(!labInfo)return;if(!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText))return;if(labInfo.Position!=2)return;var labSize=this.CalculateLabSize(labInfo);var drawLeft=rtLeftDraw.Right-labSize.Width;var drawTop=rtLeftDraw.Bottom;var lineSpace=0;if(IFrameSplitOperator.IsNumber(labInfo.LineSpace))lineSpace=labInfo.LineSpace;//背景色
|
|
6034
|
-
if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=drawTop;this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(labSize.Width),ToFixedRect(labSize.Height));}var yText=drawTop+1+lineSpace;this.Canvas.textBaseline="top";for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];if(item.Name){this.Canvas.textAlign="left";this.Canvas.fillStyle=item.NameColor;this.Canvas.fillText(item.Name,drawLeft+1,yText+1);}if(item.Text){this.Canvas.textAlign="right";this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,
|
|
6033
|
+
if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=y-labSize.Height-4;this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(right+drawLeft),ToFixedRect(y-rtTop));}var yText=drawTop;for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];if(item.Name){this.Canvas.fillStyle=item.NameColor;this.Canvas.fillText(item.Name,drawLeft+1,yText+1);}if(item.Text){this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,drawLeft+labSize.NameWidth+1,yText+1);}yText+=labSize.LineHeight;}};this.DrawRightLab=function(labInfo,rtLeftDraw){if(!labInfo)return;if(!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryText))return;if(labInfo.Position!=2)return;var labSize=this.CalculateLabSize(labInfo);var drawLeft=rtLeftDraw.Right-labSize.Width;if(drawLeft<rtLeftDraw.Left)drawLeft=rtLeftDraw.Left;var drawRight=drawLeft+labSize.Width;var drawTop=rtLeftDraw.Bottom;var lineSpace=0;if(IFrameSplitOperator.IsNumber(labInfo.LineSpace))lineSpace=labInfo.LineSpace;//背景色
|
|
6034
|
+
if(labInfo.BGColor){this.Canvas.fillStyle=labInfo.BGColor;var rtTop=drawTop;this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(labSize.Width),ToFixedRect(labSize.Height));}var yText=drawTop+1+lineSpace;this.Canvas.textBaseline="top";for(var i=0;i<labInfo.AryText.length;++i){var item=labInfo.AryText[i];if(item.Name){this.Canvas.textAlign="left";this.Canvas.fillStyle=item.NameColor;this.Canvas.fillText(item.Name,drawLeft+1,yText+1);}if(item.Text){this.Canvas.textAlign="right";this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,drawRight-1,yText+1);}yText+=labSize.LineHeight+lineSpace;}};this.DrawCustomHLine=function(labInfo,yLine){if(!labInfo)return;if(!IFrameSplitOperator.IsNonEmptyArray(labInfo.AryLine))return;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var pixelRatio=GetDevicePixelRatio();var yMax=yLine,yMin=yLine;for(var i=0;i<labInfo.AryLine.length;++i){var item=labInfo.AryLine[i];if(!IFrameSplitOperator.IsNumber(item.Value))continue;if(item.Width<0)continue;var y=this.Frame.GetYFromData(item.Value);var yFixed=ToFixedPoint(y);var xRight=right;if(IFrameSplitOperator.IsPlusNumber(item.Width)){if(item.Width<1)xRight=left+item.Width*(right-left);//0.3 百分比
|
|
6035
|
+
else xRight=left+item.Width*pixelRatio;//>1 实际数值就是长度
|
|
6036
|
+
}if(item.Color)this.Canvas.strokeStyle=item.Color;else this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(left,yFixed);this.Canvas.lineTo(xRight,yFixed);this.Canvas.stroke();if(yMax<yFixed)yMax=yFixed;if(yMin>yFixed)yMin=yFixed;}if(yMax!=yMin&&labInfo.VLine){var item=labInfo.VLine;var x=left+20*pixelRatio;if(IFrameSplitOperator.IsNumber(item.XOffset))x=left+item.XOffset*pixelRatio;x=ToFixedPoint(x);if(item.Color)this.Canvas.strokeStyle=item.Color;else this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(x,yMax);this.Canvas.lineTo(x,yMin);this.Canvas.stroke();}};this.DrawValueText=function(y,rtDraw,labInfo){var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();if(this.RightSpaceWidth>0){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(right,ToFixedPoint(y));this.Canvas.lineTo(right+this.RightSpaceWidth,ToFixedPoint(y));this.Canvas.stroke();}var yValue=this.Frame.GetYData(y);var strValue=yValue.toFixed(this.Precision);if(labInfo&&labInfo.PriceSuffixText)strValue+=labInfo.PriceSuffixText;this.Canvas.fillStyle=this.LineColor;this.Canvas.font=this.Font;var textWidth=this.Canvas.measureText(strValue).width;var lineHeight=this.GetFontHeight();var rtBG={Left:right+this.RightSpaceWidth,Top:y-lineHeight/2,Width:textWidth+4,Height:lineHeight};//rtBG.Right=rtBG.Left+rtBG.Width;
|
|
6037
|
+
rtBG.Bottom=rtBG.Top+rtBG.Height;rtBG.Width+=this.TextMargin.Left+this.TextMargin.Right;rtBG.Right=rtBG.Left+rtBG.Width;var xText=rtBG.Left+this.TextMargin.Left+2;if(this.ButtonPosition==1){this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));}else{this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));}this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(strValue,xText,y);rtDraw.Left=rtBG.Left;rtDraw.Top=rtBG.Top;rtDraw.Bottom=rtBG.Bottom;rtDraw.Right=rtBG.Right;this.DrawButton(rtBG.Top,rtBG.Right,lineHeight,rtDraw);};this.DrawPriceText=function(text,ptStart,ptEnd,position){if(position!=1&&position!=0)return;var font=this.ShowPriceTextConfig.Font[position];this.Canvas.fillStyle=this.LineColor;this.Canvas.font=font;var textWidth=this.Canvas.measureText(text).width;var lineHeight=this.GetFontHeight();var rtBG=null;if(position==1){var rtBG={Left:ptStart.X,Top:ptStart.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}else if(position==0){var rtBG={Right:ptEnd.X,Top:ptEnd.Y-lineHeight/2,Width:textWidth+4,Height:lineHeight};rtBG.Left=rtBG.Right-rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;}this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));this.Canvas.fillStyle=this.ValueTextColor;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(text,rtBG.Left+2,ptStart.Y);};this.CalculateButtonSize=function(){var pixelRatio=GetDevicePixelRatio();if(this.Button.SettingIcon){var icon=this.Button.SettingIcon;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;var width=this.Canvas.measureText(icon.Text).width;this.SettingButtonSize=width;}if(this.Button.CloseIcon){var icon=this.Button.CloseIcon;var font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.font=font;var width=this.Canvas.measureText(icon.Text).width;this.ColseButtonSize=width;}if(this.ColseButtonSize<=0&&this.SettingButtonSize<=0)return;var buttonWidth=0;if(this.SettingButtonSize>0)buttonWidth+=this.SettingButtonSize;if(this.ColseButtonSize>0){if(buttonWidth>0)buttonWidth+=this.ButtonSpace;buttonWidth+=this.ColseButtonSize;}buttonWidth+=4;this.ButtonBGWidth=buttonWidth;};this.DrawButton=function(drawTop,drawLeft,drawHeight,rtDraw){if(this.ColseButtonSize<=0&&this.SettingButtonSize<=0)return;if(this.ButtonPosition==1)drawTop-=drawHeight;this.Canvas.fillStyle=this.LineColor;var left=drawLeft;var rtBG={Left:drawLeft,Top:drawTop,Width:this.ButtonBGWidth,Height:drawHeight};rtBG.Right=rtBG.Left+rtBG.Width;rtBG.Bottom=rtBG.Top+rtBG.Height;this.Canvas.fillStyle=this.ButtonBGColor;this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));left+=1;var pixelRatio=GetDevicePixelRatio();if(this.Button.SettingIcon&&this.Button.SettingIcon.Text){var rtButton={Left:left,Top:drawTop,Width:this.SettingButtonSize,Height:drawHeight};rtButton.Right=rtButton.Left+rtButton.Width;rtButton.Bottom=rtButton.Top+rtButton.Height;var yCenter=rtButton.Top+rtButton.Height/2;var xCenter=rtButton.Left+rtButton.Width/2;var icon=this.Button.SettingIcon;this.Canvas.font=icon.Size*pixelRatio+'px '+icon.Family;this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=icon.Color;this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);this.AryButton.push({Rect:rtButton,ID:icon.ID,TooltipText:icon.TooltipText});/*
|
|
6035
6038
|
if (this.ColseButtonSize>0)
|
|
6036
6039
|
{
|
|
6037
6040
|
var xLine=rtButton.Right+this.ButtonSpace/2;
|
|
@@ -13178,7 +13181,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13178
13181
|
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);};}/********************************************************************************
|
|
13179
13182
|
* 版本信息输出
|
|
13180
13183
|
*
|
|
13181
|
-
*/var HQCHART_VERSION="1.1.
|
|
13184
|
+
*/var HQCHART_VERSION="1.1.13205";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n* HQChart Ver: '+HQCHART_VERSION+' \n* \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13182
13185
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13183
13186
|
// BaseIndex:BaseIndex,
|
|
13184
13187
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -55989,6 +55989,8 @@ function ChartDrawHLine()
|
|
|
55989
55989
|
this.ButtonBGColor='rgb(190,190,190)';
|
|
55990
55990
|
this.ButtonSpace=3;
|
|
55991
55991
|
|
|
55992
|
+
this.TextMargin={ Left:0, Right:0 };
|
|
55993
|
+
|
|
55992
55994
|
this.Button=
|
|
55993
55995
|
{
|
|
55994
55996
|
CloseIcon: { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
|
|
@@ -56050,6 +56052,13 @@ function ChartDrawHLine()
|
|
|
56050
56052
|
if (IFrameSplitOperator.IsBool(value)) this.ShowPriceTextConfig.IsShow[i]=value;
|
|
56051
56053
|
}
|
|
56052
56054
|
}
|
|
56055
|
+
|
|
56056
|
+
if (option.TextMargin)
|
|
56057
|
+
{
|
|
56058
|
+
var item=option.TextMargin;
|
|
56059
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.TextMargin.Left=item.Left;
|
|
56060
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.TextMargin.Right=item.Right;
|
|
56061
|
+
}
|
|
56053
56062
|
}
|
|
56054
56063
|
}
|
|
56055
56064
|
|
|
@@ -56294,6 +56303,8 @@ function ChartDrawHLine()
|
|
|
56294
56303
|
var labSize=this.CalculateLabSize(labInfo);
|
|
56295
56304
|
|
|
56296
56305
|
var drawLeft=rtLeftDraw.Right-labSize.Width;
|
|
56306
|
+
if (drawLeft<rtLeftDraw.Left) drawLeft=rtLeftDraw.Left;
|
|
56307
|
+
var drawRight=drawLeft+labSize.Width;
|
|
56297
56308
|
var drawTop=rtLeftDraw.Bottom;
|
|
56298
56309
|
var lineSpace=0;
|
|
56299
56310
|
if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
|
|
@@ -56323,7 +56334,7 @@ function ChartDrawHLine()
|
|
|
56323
56334
|
{
|
|
56324
56335
|
this.Canvas.textAlign="right";
|
|
56325
56336
|
this.Canvas.fillStyle=item.TextColor;
|
|
56326
|
-
this.Canvas.fillText(item.Text,
|
|
56337
|
+
this.Canvas.fillText(item.Text,drawRight-1,yText+1);
|
|
56327
56338
|
}
|
|
56328
56339
|
|
|
56329
56340
|
yText+=labSize.LineHeight+lineSpace;
|
|
@@ -56344,11 +56355,17 @@ function ChartDrawHLine()
|
|
|
56344
56355
|
{
|
|
56345
56356
|
var item=labInfo.AryLine[i];
|
|
56346
56357
|
if (!IFrameSplitOperator.IsNumber(item.Value)) continue;
|
|
56358
|
+
if (item.Width<0) continue;
|
|
56347
56359
|
|
|
56348
56360
|
var y=this.Frame.GetYFromData(item.Value);
|
|
56349
56361
|
var yFixed=ToFixedPoint(y);
|
|
56350
56362
|
var xRight=right;
|
|
56351
|
-
if (IFrameSplitOperator.
|
|
56363
|
+
if (IFrameSplitOperator.IsPlusNumber(item.Width))
|
|
56364
|
+
{
|
|
56365
|
+
if (item.Width<1) xRight=left+(item.Width*(right-left)); //0.3 百分比
|
|
56366
|
+
else xRight=left+item.Width*pixelRatio; //>1 实际数值就是长度
|
|
56367
|
+
}
|
|
56368
|
+
|
|
56352
56369
|
if (item.Color) this.Canvas.strokeStyle=item.Color;
|
|
56353
56370
|
else this.Canvas.strokeStyle=this.LineColor;
|
|
56354
56371
|
|
|
@@ -56400,17 +56417,25 @@ function ChartDrawHLine()
|
|
|
56400
56417
|
var textWidth=this.Canvas.measureText(strValue).width;
|
|
56401
56418
|
var lineHeight=this.GetFontHeight();
|
|
56402
56419
|
var rtBG={ Left:right+this.RightSpaceWidth, Top:y- lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
56403
|
-
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
56420
|
+
//rtBG.Right=rtBG.Left+rtBG.Width;
|
|
56404
56421
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
56422
|
+
rtBG.Width+=(this.TextMargin.Left+this.TextMargin.Right);
|
|
56423
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
56424
|
+
var xText=rtBG.Left+this.TextMargin.Left+2;
|
|
56425
|
+
|
|
56405
56426
|
if (this.ButtonPosition==1)
|
|
56427
|
+
{
|
|
56406
56428
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));
|
|
56429
|
+
}
|
|
56407
56430
|
else
|
|
56431
|
+
{
|
|
56408
56432
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
|
|
56433
|
+
}
|
|
56409
56434
|
|
|
56410
56435
|
this.Canvas.fillStyle=this.ValueTextColor
|
|
56411
56436
|
this.Canvas.textAlign="left";
|
|
56412
56437
|
this.Canvas.textBaseline="middle";
|
|
56413
|
-
this.Canvas.fillText(strValue,
|
|
56438
|
+
this.Canvas.fillText(strValue,xText,y);
|
|
56414
56439
|
|
|
56415
56440
|
rtDraw.Left=rtBG.Left;
|
|
56416
56441
|
rtDraw.Top=rtBG.Top;
|
|
@@ -56436,6 +56461,7 @@ function ChartDrawHLine()
|
|
|
56436
56461
|
var rtBG={ Left:ptStart.X, Top:ptStart.Y-lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
56437
56462
|
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
56438
56463
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
56464
|
+
|
|
56439
56465
|
}
|
|
56440
56466
|
else if (position==0)
|
|
56441
56467
|
{
|
|
@@ -59881,6 +59881,8 @@ function ChartDrawHLine()
|
|
|
59881
59881
|
this.ButtonBGColor='rgb(190,190,190)';
|
|
59882
59882
|
this.ButtonSpace=3;
|
|
59883
59883
|
|
|
59884
|
+
this.TextMargin={ Left:0, Right:0 };
|
|
59885
|
+
|
|
59884
59886
|
this.Button=
|
|
59885
59887
|
{
|
|
59886
59888
|
CloseIcon: { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
|
|
@@ -59942,6 +59944,13 @@ function ChartDrawHLine()
|
|
|
59942
59944
|
if (IFrameSplitOperator.IsBool(value)) this.ShowPriceTextConfig.IsShow[i]=value;
|
|
59943
59945
|
}
|
|
59944
59946
|
}
|
|
59947
|
+
|
|
59948
|
+
if (option.TextMargin)
|
|
59949
|
+
{
|
|
59950
|
+
var item=option.TextMargin;
|
|
59951
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.TextMargin.Left=item.Left;
|
|
59952
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.TextMargin.Right=item.Right;
|
|
59953
|
+
}
|
|
59945
59954
|
}
|
|
59946
59955
|
}
|
|
59947
59956
|
|
|
@@ -60186,6 +60195,8 @@ function ChartDrawHLine()
|
|
|
60186
60195
|
var labSize=this.CalculateLabSize(labInfo);
|
|
60187
60196
|
|
|
60188
60197
|
var drawLeft=rtLeftDraw.Right-labSize.Width;
|
|
60198
|
+
if (drawLeft<rtLeftDraw.Left) drawLeft=rtLeftDraw.Left;
|
|
60199
|
+
var drawRight=drawLeft+labSize.Width;
|
|
60189
60200
|
var drawTop=rtLeftDraw.Bottom;
|
|
60190
60201
|
var lineSpace=0;
|
|
60191
60202
|
if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
|
|
@@ -60215,7 +60226,7 @@ function ChartDrawHLine()
|
|
|
60215
60226
|
{
|
|
60216
60227
|
this.Canvas.textAlign="right";
|
|
60217
60228
|
this.Canvas.fillStyle=item.TextColor;
|
|
60218
|
-
this.Canvas.fillText(item.Text,
|
|
60229
|
+
this.Canvas.fillText(item.Text,drawRight-1,yText+1);
|
|
60219
60230
|
}
|
|
60220
60231
|
|
|
60221
60232
|
yText+=labSize.LineHeight+lineSpace;
|
|
@@ -60236,11 +60247,17 @@ function ChartDrawHLine()
|
|
|
60236
60247
|
{
|
|
60237
60248
|
var item=labInfo.AryLine[i];
|
|
60238
60249
|
if (!IFrameSplitOperator.IsNumber(item.Value)) continue;
|
|
60250
|
+
if (item.Width<0) continue;
|
|
60239
60251
|
|
|
60240
60252
|
var y=this.Frame.GetYFromData(item.Value);
|
|
60241
60253
|
var yFixed=ToFixedPoint(y);
|
|
60242
60254
|
var xRight=right;
|
|
60243
|
-
if (IFrameSplitOperator.
|
|
60255
|
+
if (IFrameSplitOperator.IsPlusNumber(item.Width))
|
|
60256
|
+
{
|
|
60257
|
+
if (item.Width<1) xRight=left+(item.Width*(right-left)); //0.3 百分比
|
|
60258
|
+
else xRight=left+item.Width*pixelRatio; //>1 实际数值就是长度
|
|
60259
|
+
}
|
|
60260
|
+
|
|
60244
60261
|
if (item.Color) this.Canvas.strokeStyle=item.Color;
|
|
60245
60262
|
else this.Canvas.strokeStyle=this.LineColor;
|
|
60246
60263
|
|
|
@@ -60292,17 +60309,25 @@ function ChartDrawHLine()
|
|
|
60292
60309
|
var textWidth=this.Canvas.measureText(strValue).width;
|
|
60293
60310
|
var lineHeight=this.GetFontHeight();
|
|
60294
60311
|
var rtBG={ Left:right+this.RightSpaceWidth, Top:y- lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
60295
|
-
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60312
|
+
//rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60296
60313
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
60314
|
+
rtBG.Width+=(this.TextMargin.Left+this.TextMargin.Right);
|
|
60315
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60316
|
+
var xText=rtBG.Left+this.TextMargin.Left+2;
|
|
60317
|
+
|
|
60297
60318
|
if (this.ButtonPosition==1)
|
|
60319
|
+
{
|
|
60298
60320
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));
|
|
60321
|
+
}
|
|
60299
60322
|
else
|
|
60323
|
+
{
|
|
60300
60324
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
|
|
60325
|
+
}
|
|
60301
60326
|
|
|
60302
60327
|
this.Canvas.fillStyle=this.ValueTextColor
|
|
60303
60328
|
this.Canvas.textAlign="left";
|
|
60304
60329
|
this.Canvas.textBaseline="middle";
|
|
60305
|
-
this.Canvas.fillText(strValue,
|
|
60330
|
+
this.Canvas.fillText(strValue,xText,y);
|
|
60306
60331
|
|
|
60307
60332
|
rtDraw.Left=rtBG.Left;
|
|
60308
60333
|
rtDraw.Top=rtBG.Top;
|
|
@@ -60328,6 +60353,7 @@ function ChartDrawHLine()
|
|
|
60328
60353
|
var rtBG={ Left:ptStart.X, Top:ptStart.Y-lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
60329
60354
|
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60330
60355
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
60356
|
+
|
|
60331
60357
|
}
|
|
60332
60358
|
else if (position==0)
|
|
60333
60359
|
{
|
|
@@ -131849,7 +131875,7 @@ function ScrollBarBGChart()
|
|
|
131849
131875
|
|
|
131850
131876
|
|
|
131851
131877
|
|
|
131852
|
-
var HQCHART_VERSION="1.1.
|
|
131878
|
+
var HQCHART_VERSION="1.1.13205";
|
|
131853
131879
|
|
|
131854
131880
|
function PrintHQChartVersion()
|
|
131855
131881
|
{
|
|
@@ -59925,6 +59925,8 @@ function ChartDrawHLine()
|
|
|
59925
59925
|
this.ButtonBGColor='rgb(190,190,190)';
|
|
59926
59926
|
this.ButtonSpace=3;
|
|
59927
59927
|
|
|
59928
|
+
this.TextMargin={ Left:0, Right:0 };
|
|
59929
|
+
|
|
59928
59930
|
this.Button=
|
|
59929
59931
|
{
|
|
59930
59932
|
CloseIcon: { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
|
|
@@ -59986,6 +59988,13 @@ function ChartDrawHLine()
|
|
|
59986
59988
|
if (IFrameSplitOperator.IsBool(value)) this.ShowPriceTextConfig.IsShow[i]=value;
|
|
59987
59989
|
}
|
|
59988
59990
|
}
|
|
59991
|
+
|
|
59992
|
+
if (option.TextMargin)
|
|
59993
|
+
{
|
|
59994
|
+
var item=option.TextMargin;
|
|
59995
|
+
if (IFrameSplitOperator.IsNumber(item.Left)) this.TextMargin.Left=item.Left;
|
|
59996
|
+
if (IFrameSplitOperator.IsNumber(item.Right)) this.TextMargin.Right=item.Right;
|
|
59997
|
+
}
|
|
59989
59998
|
}
|
|
59990
59999
|
}
|
|
59991
60000
|
|
|
@@ -60230,6 +60239,8 @@ function ChartDrawHLine()
|
|
|
60230
60239
|
var labSize=this.CalculateLabSize(labInfo);
|
|
60231
60240
|
|
|
60232
60241
|
var drawLeft=rtLeftDraw.Right-labSize.Width;
|
|
60242
|
+
if (drawLeft<rtLeftDraw.Left) drawLeft=rtLeftDraw.Left;
|
|
60243
|
+
var drawRight=drawLeft+labSize.Width;
|
|
60233
60244
|
var drawTop=rtLeftDraw.Bottom;
|
|
60234
60245
|
var lineSpace=0;
|
|
60235
60246
|
if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
|
|
@@ -60259,7 +60270,7 @@ function ChartDrawHLine()
|
|
|
60259
60270
|
{
|
|
60260
60271
|
this.Canvas.textAlign="right";
|
|
60261
60272
|
this.Canvas.fillStyle=item.TextColor;
|
|
60262
|
-
this.Canvas.fillText(item.Text,
|
|
60273
|
+
this.Canvas.fillText(item.Text,drawRight-1,yText+1);
|
|
60263
60274
|
}
|
|
60264
60275
|
|
|
60265
60276
|
yText+=labSize.LineHeight+lineSpace;
|
|
@@ -60280,11 +60291,17 @@ function ChartDrawHLine()
|
|
|
60280
60291
|
{
|
|
60281
60292
|
var item=labInfo.AryLine[i];
|
|
60282
60293
|
if (!IFrameSplitOperator.IsNumber(item.Value)) continue;
|
|
60294
|
+
if (item.Width<0) continue;
|
|
60283
60295
|
|
|
60284
60296
|
var y=this.Frame.GetYFromData(item.Value);
|
|
60285
60297
|
var yFixed=ToFixedPoint(y);
|
|
60286
60298
|
var xRight=right;
|
|
60287
|
-
if (IFrameSplitOperator.
|
|
60299
|
+
if (IFrameSplitOperator.IsPlusNumber(item.Width))
|
|
60300
|
+
{
|
|
60301
|
+
if (item.Width<1) xRight=left+(item.Width*(right-left)); //0.3 百分比
|
|
60302
|
+
else xRight=left+item.Width*pixelRatio; //>1 实际数值就是长度
|
|
60303
|
+
}
|
|
60304
|
+
|
|
60288
60305
|
if (item.Color) this.Canvas.strokeStyle=item.Color;
|
|
60289
60306
|
else this.Canvas.strokeStyle=this.LineColor;
|
|
60290
60307
|
|
|
@@ -60336,17 +60353,25 @@ function ChartDrawHLine()
|
|
|
60336
60353
|
var textWidth=this.Canvas.measureText(strValue).width;
|
|
60337
60354
|
var lineHeight=this.GetFontHeight();
|
|
60338
60355
|
var rtBG={ Left:right+this.RightSpaceWidth, Top:y- lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
60339
|
-
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60356
|
+
//rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60340
60357
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
60358
|
+
rtBG.Width+=(this.TextMargin.Left+this.TextMargin.Right);
|
|
60359
|
+
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60360
|
+
var xText=rtBG.Left+this.TextMargin.Left+2;
|
|
60361
|
+
|
|
60341
60362
|
if (this.ButtonPosition==1)
|
|
60363
|
+
{
|
|
60342
60364
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width+this.ButtonBGWidth),ToFixedRect(rtBG.Height));
|
|
60365
|
+
}
|
|
60343
60366
|
else
|
|
60367
|
+
{
|
|
60344
60368
|
this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
|
|
60369
|
+
}
|
|
60345
60370
|
|
|
60346
60371
|
this.Canvas.fillStyle=this.ValueTextColor
|
|
60347
60372
|
this.Canvas.textAlign="left";
|
|
60348
60373
|
this.Canvas.textBaseline="middle";
|
|
60349
|
-
this.Canvas.fillText(strValue,
|
|
60374
|
+
this.Canvas.fillText(strValue,xText,y);
|
|
60350
60375
|
|
|
60351
60376
|
rtDraw.Left=rtBG.Left;
|
|
60352
60377
|
rtDraw.Top=rtBG.Top;
|
|
@@ -60372,6 +60397,7 @@ function ChartDrawHLine()
|
|
|
60372
60397
|
var rtBG={ Left:ptStart.X, Top:ptStart.Y-lineHeight/2, Width:textWidth+4, Height:lineHeight };
|
|
60373
60398
|
rtBG.Right=rtBG.Left+rtBG.Width;
|
|
60374
60399
|
rtBG.Bottom=rtBG.Top+rtBG.Height;
|
|
60400
|
+
|
|
60375
60401
|
}
|
|
60376
60402
|
else if (position==0)
|
|
60377
60403
|
{
|
|
@@ -134762,7 +134788,7 @@ function HQChartScriptWorker()
|
|
|
134762
134788
|
|
|
134763
134789
|
|
|
134764
134790
|
|
|
134765
|
-
var HQCHART_VERSION="1.1.
|
|
134791
|
+
var HQCHART_VERSION="1.1.13205";
|
|
134766
134792
|
|
|
134767
134793
|
function PrintHQChartVersion()
|
|
134768
134794
|
{
|