hqchart 1.1.13213 → 1.1.13220
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 +10 -7
- package/package.json +1 -1
- package/src/jscommon/umychart.complier.js +3 -0
- package/src/jscommon/umychart.js +52 -6
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +56 -7
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +56 -7
package/lib/umychart.vue.js
CHANGED
|
@@ -1486,7 +1486,8 @@ CMD_SELECTED_SUMMARY_ID:26,//区间统计
|
|
|
1486
1486
|
CMD_SHOW_INDEX_ID:27,//显示隐藏指标
|
|
1487
1487
|
CMD_SHOW_OVERLAY_INDEX_ID:28,//显示隐藏叠加指标
|
|
1488
1488
|
CMD_DELETE_OVERLAY_INDEX_ID:29,//删除叠加指标
|
|
1489
|
-
CMD_SHOW_OVERLAY_Y_AXIS_ID:30
|
|
1489
|
+
CMD_SHOW_OVERLAY_Y_AXIS_ID:30,//显示隐藏Y轴叠加指标
|
|
1490
|
+
CMD_ENABLE_OVERLAY_SHARE_Y_ID:31//和主图指标共享Y轴坐标
|
|
1490
1491
|
};function PhoneDBClick(){this.Start=[];this.Clear=function(){this.Start=[];};this.AddTouchStart=function(x,y,time){if(this.Start.length>0){var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>0&&spanTime<300){this.Start.push({X:x,Y:y,Time:time});}else{this.Start=[];}}else{this.Start.push({X:x,Y:y,Time:time});}};this.IsVaildDBClick=function(){if(this.Start.length==2)return true;return false;};this.AddTouchEnd=function(time){if(this.Start.length<=0)return;var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>=0&&spanTime<150){}else{this.Start=[];}};}/*
|
|
1491
1492
|
图形控件
|
|
1492
1493
|
*/function JSChartContainer(uielement,OffscreenElement,cacheElement){var _this5=this;this.ClassName='JSChartContainer';var _self=this;this.Frame;//框架画法
|
|
@@ -1989,7 +1990,9 @@ this.SetSizeChange(true);this.Draw();break;case JSCHART_MENU_ID.CMD_HIDE_STOCKCH
|
|
|
1989
1990
|
if(param==null||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;var windowIndex=param,showType=aryArgs[1];var script=this.WindowIndex[windowIndex];if(!script)return false;if(showType==1)script.IsShow=false;else if(showType==2)script.IsShow=true;else script.IsShow=!script.IsShow;this.UpdateWindowIndex(windowIndex);break;case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID://显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
|
|
1990
1991
|
if(!srcParam||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;var indexGuid=srcParam,showType=aryArgs[1];var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return false;var script=overlay.OverlayItem.Script;if(showType==1)script.IsShow=false;else if(showType==2)script.IsShow==true;else script.IsShow=!script.IsShow;this.UpdateOverlayIndex(indexGuid);break;case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:if(srcParam&&this.DeleteOverlayWindowsIndex)this.DeleteOverlayWindowsIndex(srcParam);break;case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:if(!srcParam||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;if(!this.GetOverlayIndexByIdentify)return false;var indexGuid=srcParam,showType=aryArgs[1];var finder=this.GetOverlayIndexByIdentify(indexGuid);if(!finder||!finder.OverlayItem)return false;var frame=finder.OverlayItem.Frame;if(showType==1)frame.IsShow=false;else if(showType==2)frame.IsShow==true;else frame.IsShow=!frame.IsShow;this.UpdataDataoffset();//更新数据偏移
|
|
1991
1992
|
this.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
1992
|
-
this.Draw();break;
|
|
1993
|
+
this.Draw();break;case JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID:if(!srcParam||!IFrameSplitOperator.IsNumber(aryArgs[1]))return false;if(!this.GetOverlayIndexByIdentify)return false;var indexGuid=srcParam,showType=aryArgs[1];var finder=this.GetOverlayIndexByIdentify(indexGuid);if(!finder||!finder.OverlayItem)return false;var frame=finder.OverlayItem.Frame;if(showType==1)frame.IsShareY=false;else if(showType==2)frame.IsShareY==true;else frame.IsShareY=!frame.IsShareY;this.UpdataDataoffset();//更新数据偏移
|
|
1994
|
+
this.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
1995
|
+
this.Draw();break;}};this.GetShowIndexMenuData=function(windowIndex,showType){var script=this.WindowIndex[windowIndex];if(!script)return null;var data={Name:script.IsShow?"隐藏指标":"显示指标",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_INDEX_ID,Args:[windowIndex,0]}};return data;};this.GetShowOverlayIndexMenuData=function(indexGuid,showType){var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return null;var script=overlay.OverlayItem.Script;var data={Name:script.IsShow?"隐藏指标":"显示指标",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID,Args:[indexGuid,0]}};return data;};this.GetShowOverlayIndexYAxisMenuData=function(indexGuid,showType){var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return null;var frame=overlay.OverlayItem.Frame;var data={Name:frame.IsShow?"隐藏Y轴":"显示Y轴",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID,Args:[indexGuid,0]}};return data;};this.GetOverlayIndexShareYMenuData=function(indexGuid,showType){var overlay=this.GetOverlayIndexByIdentify(indexGuid);if(!overlay||!overlay.OverlayItem||!overlay.OverlayItem.Script)return null;var frame=overlay.OverlayItem.Frame;var data={Name:"公用窗口Y轴",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID,Args:[indexGuid,0]},Checked:frame.IsShareY};return data;};//点击右键菜单
|
|
1993
1996
|
this.OnClickRightMenu=function(data){JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);if(!data||!data.Data)return;var cmdID=data.Data.ID;//命令ID
|
|
1994
1997
|
var aryArgs=data.Data.Args;//参数
|
|
1995
1998
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);//回调通知外部
|
|
@@ -6026,7 +6029,7 @@ this.AryShowButton=[];//需要显示的按钮 { Data:, Width }
|
|
|
6026
6029
|
this.AryButton=[];this.ExtendData;//扩展数据
|
|
6027
6030
|
this.ShowPriceTextConfig={IsShow:[false,false,true],//[0]=left内 [1]=right内 [2]=right外
|
|
6028
6031
|
Font:[12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1']};//内部变量
|
|
6029
|
-
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(
|
|
6032
|
+
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(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(option.ButtonBGColor)this.ButtonBGColor=option.ButtonBGColor;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);if(!this.Button.CloseIcon.ID)this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;}else if(item.CloseIcon===null){this.Button.CloseIcon=null;}if(item.SettingIcon){this.Button.SettingIcon=CloneData(item.SettingIcon);if(!this.Button.SettingIcon.ID)this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;}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;/*
|
|
6030
6033
|
this.GetXYCoordinate=function()
|
|
6031
6034
|
{
|
|
6032
6035
|
if (this.IsFrameMinSize()) return null;
|
|
@@ -11471,7 +11474,7 @@ if(varItem.Draw.FixedPosition==="TOP")chartText.FixedPosition=1;else if(varItem.
|
|
|
11471
11474
|
hqChart.ChartPaint.push(chartText);};//DRAWTEXT
|
|
11472
11475
|
this.CreateDrawTextV2=function(hqChart,windowIndex,varItem,id){var chartText=new ChartDrawText();chartText.Canvas=hqChart.Canvas;chartText.Name=varItem.Name;chartText.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chartText.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chartText.ReloadResource();if(varItem.Color)chartText.Color=this.GetColor(varItem.Color);else chartText.Color=this.GetDefaultColor(id);if(varItem.IsDrawCenter===true)chartText.TextAlign='center';if(varItem.IsDrawAbove===true)chartText.TextBaseline='bottom';if(varItem.IsDrawBelow===true)chartText.TextBaseline='top';if(varItem.Draw.DrawData)chartText.Data.Data=varItem.Draw.DrawData;chartText.Text=varItem.Draw.Text;if(varItem.Draw.Direction>0)chartText.Direction=varItem.Draw.Direction;if(varItem.Draw.YOffset>0)chartText.YOffset=varItem.Draw.YOffset;if(varItem.Draw.TextAlign)chartText.TextAlign=varItem.Draw.TextAlign;//指定输出位置
|
|
11473
11476
|
if(varItem.Draw.FixedPosition==="TOP")chartText.FixedPosition=1;else if(varItem.Draw.FixedPosition==="BOTTOM")chartText.FixedPosition=2;if(varItem.DrawVAlign>=0){if(varItem.DrawVAlign==0)chartText.TextBaseline='top';else if(varItem.DrawVAlign==1)chartText.TextBaseline='middle';else if(varItem.DrawVAlign==2)chartText.TextBaseline='bottom';}if(varItem.DrawAlign>=0){if(varItem.DrawAlign==0)chartText.TextAlign="left";else if(varItem.DrawAlign==1)chartText.TextAlign="center";else if(varItem.DrawAlign==2)chartText.TextAlign='right';}if(varItem.DrawFontSize>0)chartText.FixedFontSize=varItem.DrawFontSize;if(varItem.Background)chartText.TextBG=varItem.Background;if(varItem.VerticalLine)chartText.VerticalLine=varItem.VerticalLine;if(IFrameSplitOperator.IsNumber(varItem.YOffset))chartText.ShowOffset.Y=varItem.YOffset;if(IFrameSplitOperator.IsNumber(varItem.XOffset))chartText.ShowOffset.X=varItem.XOffset;var titleIndex=windowIndex+1;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
11474
|
-
hqChart.ChartPaint.push(chartText);};//COLORSTICK
|
|
11477
|
+
this.SetChartIndexName(chartText);hqChart.ChartPaint.push(chartText);};//COLORSTICK
|
|
11475
11478
|
this.CreateMACD=function(hqChart,windowIndex,varItem,id){var chartMACD=new ChartMACD();chartMACD.Canvas=hqChart.Canvas;chartMACD.Identify=this.Guid;chartMACD.Name=varItem.Name;chartMACD.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chartMACD.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chartMACD.LineWidth=width;}var titleIndex=windowIndex+1;chartMACD.Data.Data=varItem.Data;var clrTitle=this.GetDefaultColor(id);if(varItem.Color)clrTitle=this.GetColor(varItem.Color);if(varItem.UpColor)chartMACD.UpColor=varItem.UpColor;if(varItem.DownColor)chartMACD.DownColor=varItem.DownColor;this.ReloadChartResource(hqChart,windowIndex,chartMACD);hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(chartMACD.Data,varItem.Name,clrTitle);this.SetChartIndexName(chartMACD);hqChart.ChartPaint.push(chartMACD);};this.CreatePointDot=function(hqChart,windowIndex,varItem,id,hisData){var pointDot=new ChartPointDot();pointDot.Canvas=hqChart.Canvas;pointDot.Name=varItem.Name;pointDot.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;pointDot.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Color)pointDot.Color=this.GetColor(varItem.Color);else pointDot.Color=this.GetDefaultColor(id);if(varItem.Radius)pointDot.Radius=varItem.Radius;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)pointDot.Radius=width;}if(IFrameSplitOperator.IsBool(varItem.UpDownDot)){pointDot.EnableUpDownColor=varItem.UpDownDot;pointDot.HistoryData=hisData;}var titleIndex=windowIndex+1;pointDot.Data.Data=varItem.Data;hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(pointDot.Data,varItem.Name,pointDot.Color);this.SetChartIndexName(pointDot);hqChart.ChartPaint.push(pointDot);};this.CreateStick=function(hqChart,windowIndex,varItem,id){var chart=new ChartStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;this.ReloadChartResource(hqChart,windowIndex,chart);hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateLineStick=function(hqChart,windowIndex,varItem,id){var chart=new ChartLineStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);hqChart.ChartPaint.push(chart);};this.CreateStraightLine=function(hqChart,windowIndex,varItem,id){var line=new ChartLine();line.DrawType=1;line.Canvas=hqChart.Canvas;line.Name=varItem.Name;line.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;line.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Color)line.Color=this.GetColor(varItem.Color);else line.Color=this.GetDefaultColor(id);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)line.LineWidth=width;}var titleIndex=windowIndex+1;line.Data.Data=varItem.Draw.DrawData;if(varItem.Name=="DRAWLINE")hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,null,line.Color);//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,varItem.Name,line.Color);
|
|
11476
11479
|
hqChart.ChartPaint.push(line);};this.CreateVolStick=function(hqChart,windowIndex,varItem,id,hisData){var chart=new ChartVolStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.KLineDrawType=hqChart.KLineDrawType;//设置K线显示类型
|
|
11477
11480
|
chart.Identify=this.Guid;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);if(varItem.UpColor)chart.UpColor=varItem.UpColor;if(varItem.DownColor)chart.DownColor=varItem.DownColor;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(IFrameSplitOperator.IsPlusNumber(width))chart.BarWidth=width;}var titleIndex=windowIndex+1;chart.Data.Data=varItem.Data;chart.HistoryData=hisData;this.ReloadChartResource(hqChart,windowIndex,chart);var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);hqChart.TitlePaint[titleIndex].Data[id]=titleData;this.SetTitleData(titleData,chart);this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateBand=function(hqChart,windowIndex,varItem,id){var chart=new ChartBand();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.FirstColor=varItem.Draw.Color[0];chart.SecondColor=varItem.Draw.Color[1];chart.Data.Data=varItem.Draw.DrawData;if(IFrameSplitOperator.IsBool(varItem.IsFirstDraw))chart.IsDrawFirst=varItem.IsFirstDraw;hqChart.ChartPaint.push(chart);};this.CreateFillRGN=function(hqChart,windowIndex,varItem,id){var chart=new ChartLineArea();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data.Data=varItem.Draw.DrawData;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(id);hqChart.ChartPaint.push(chart);};this.CreateFillRGN2=function(hqChart,windowIndex,varItem,id){var chart=new ChartFillRGN();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data.Data=varItem.Draw.DrawData;hqChart.ChartPaint.push(chart);};this.CreateFillBGRGN=function(hqChart,windowIndex,varItem,id){var chart=new ChartFillBGRGN();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data.Data=varItem.Draw.DrawData;hqChart.ChartPaint.push(chart);};this.CreateFLOATRGN=function(hqChart,windowIndex,varItem,id){var chart=new ChartFLOATRGN();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data.Data=varItem.Draw.DrawData;hqChart.ChartPaint.push(chart);};//创建K线图
|
|
@@ -11490,9 +11493,9 @@ hqChart.ChartPaint.push(chart);};this.CreateTextLine=function(hqChart,windowInde
|
|
|
11490
11493
|
var titleIndex=windowIndex+1;chartText.Data.Data=varItem.Draw.DrawData.Value;chartText.Text=varItem.Draw.DrawData.Text;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
11491
11494
|
this.SetChartIndexName(chartText);hqChart.ChartPaint.push(chartText);};this.CreateDrawText=function(hqChart,windowIndex,varItem,id){var chartText=new ChartSingleText();chartText.Canvas=hqChart.Canvas;chartText.Name=varItem.Name;chartText.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chartText.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chartText.ReloadResource();if(varItem.Color)chartText.Color=this.GetColor(varItem.Color);else chartText.Color=this.GetDefaultColor(id);if(varItem.IsDrawAbove)chartText.Direction=1;else chartText.Direction=0;if(varItem.DrawFontSize>0)chartText.TextFont=varItem.DrawFontSize*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1';//临时用下吧
|
|
11492
11495
|
var titleIndex=windowIndex+1;chartText.DrawData=varItem.Draw.DrawData;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
11493
|
-
hqChart.ChartPaint.push(chartText);};//创建图标
|
|
11496
|
+
this.SetChartIndexName(chartText);hqChart.ChartPaint.push(chartText);};//创建图标
|
|
11494
11497
|
this.CreateIcon=function(hqChart,windowIndex,varItem,id){var chartText=new ChartSingleText();chartText.Canvas=hqChart.Canvas;chartText.TextAlign='center';chartText.Name=varItem.Name;chartText.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chartText.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chartText.Direction=2;if(varItem.IsDrawAbove)chartText.Direction=1;if(varItem.DrawVAlign>=0){if(varItem.DrawVAlign==0)chartText.Direction=1;else if(varItem.DrawVAlign==1)chartText.Direction=0;else if(varItem.DrawVAlign==2)chartText.Direction=2;}if(varItem.DrawAlign>=0){if(varItem.DrawAlign==0)chartText.TextAlign="left";else if(varItem.DrawAlign==1)chartText.TextAlign="center";else if(varItem.DrawAlign==2)chartText.TextAlign='right';}var titleIndex=windowIndex+1;chartText.Data.Data=varItem.Draw.DrawData;var icon=varItem.Draw.Icon;if(icon.IconFont==true){chartText.IconFont={Family:icon.Family,Text:icon.Symbol,Color:icon.Color};if(varItem.Color)chartText.IconFont.Color=this.GetColor(varItem.Color);}else{chartText.Text=icon.Symbol;if(varItem.Color)chartText.Color=this.GetColor(varItem.Color);else if(icon.Color)chartText.Color=icon.Color;else chartText.Color='rgb(0,0,0)';}if(varItem.DrawFontSize>0)chartText.FixedFontSize=varItem.DrawFontSize;if(IFrameSplitOperator.IsNumber(varItem.XOffset))chartText.ShowOffset.X=varItem.XOffset;if(IFrameSplitOperator.IsNumber(varItem.YOffset))chartText.ShowOffset.Y=varItem.YOffset;//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
11495
|
-
hqChart.ChartPaint.push(chartText);};this.CreateTipIcon=function(hqChart,windowIndex,varItem,i){var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(hqChart.ChartPaint[0].IsMinuteFrame())chart.Data=hqChart.SourceData;else chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
|
|
11498
|
+
this.SetChartIndexName(chartText);hqChart.ChartPaint.push(chartText);};this.CreateTipIcon=function(hqChart,windowIndex,varItem,i){var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(hqChart.ChartPaint[0].IsMinuteFrame())chart.Data=hqChart.SourceData;else chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
|
|
11496
11499
|
chart.Family=varItem.Draw.Icon.Family;chart.TextFont=g_JSChartResource.TIPICON.TextFont;var svgSize=g_JSChartResource.TIPICON.Size;var svgColor=g_JSChartResource.TIPICON.Color;var svgYOffset=0;var svgVAlign=2;//上下对齐方式
|
|
11497
11500
|
if(IFrameSplitOperator.IsNumber(varItem.YOffset))svgYOffset=varItem.YOffset;if(varItem.Color)svgColor=this.GetColor(varItem.Color);if(varItem.DrawFontSize>0)svgSize=varItem.DrawFontSize;if(varItem.DrawVAlign>=0)svgVAlign=varItem.DrawVAlign;if(varItem.Draw&&IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.DrawData)&&varItem.Draw.Icon){var drawData=varItem.Draw.DrawData;var aryData=[];var isArrayTip=Array.isArray(varItem.Draw.Text);var singleTip=null;if(!isArrayTip&&varItem.Draw.Text)singleTip={Text:varItem.Draw.Text};for(var j=0;j<drawData.length;++j){var item=drawData[j];if(!IFrameSplitOperator.IsNumber(item))continue;var svgItem={Index:j,Value:item,SVG:{Symbol:varItem.Draw.Icon.Symbol,Size:svgSize,Color:svgColor,YOffset:svgYOffset,VAlign:svgVAlign}};if(isArrayTip){var text=varItem.Draw.Text[j];if(text)svgItem.Tooltip={Text:text};}else{svgItem.Tooltip=singleTip;}aryData.push(svgItem);}chart.Texts=aryData;}hqChart.ChartPaint.push(chart);};//创建通道
|
|
11498
11501
|
this.CreateChannel=function(hqChart,windowIndex,varItem,id){var chart=new ChartChannel();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Draw.AreaColor)chart.AreaColor=varItem.Draw.AreaColor;else if(varItem.Color)chart.AreaColor=this.GetColor(varItem.Color);else chart.AreaColor=this.GetDefaultColor(id);if(varItem.Draw.Border.Color)chart.LineColor=varItem.Draw.Border.Color;else chart.LineColor=null;if(varItem.Draw.Border.Dotted)chart.LineDotted=varItem.Draw.Border.Dotted;if(varItem.Draw.Border.Width>0)chart.LineWidth=varItem.Draw.Border.Width;//let titleIndex=windowIndex+1;
|
|
@@ -13184,7 +13187,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13184
13187
|
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);};}/********************************************************************************
|
|
13185
13188
|
* 版本信息输出
|
|
13186
13189
|
*
|
|
13187
|
-
*/var HQCHART_VERSION="1.1.
|
|
13190
|
+
*/var HQCHART_VERSION="1.1.13219";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();//把给外界调用的方法暴露出来
|
|
13188
13191
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13189
13192
|
// BaseIndex:BaseIndex,
|
|
13190
13193
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -20442,6 +20442,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
20442
20442
|
|
|
20443
20443
|
let titleIndex=windowIndex+1;
|
|
20444
20444
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
20445
|
+
this.SetChartIndexName(chartText);
|
|
20445
20446
|
hqChart.ChartPaint.push(chartText);
|
|
20446
20447
|
}
|
|
20447
20448
|
|
|
@@ -21029,6 +21030,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
21029
21030
|
chartText.DrawData=varItem.Draw.DrawData;
|
|
21030
21031
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
21031
21032
|
|
|
21033
|
+
this.SetChartIndexName(chartText);
|
|
21032
21034
|
hqChart.ChartPaint.push(chartText);
|
|
21033
21035
|
}
|
|
21034
21036
|
|
|
@@ -21082,6 +21084,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
21082
21084
|
|
|
21083
21085
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
21084
21086
|
|
|
21087
|
+
this.SetChartIndexName(chartText);
|
|
21085
21088
|
hqChart.ChartPaint.push(chartText);
|
|
21086
21089
|
}
|
|
21087
21090
|
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -2667,6 +2667,7 @@ var JSCHART_MENU_ID=
|
|
|
2667
2667
|
CMD_SHOW_OVERLAY_INDEX_ID:28, //显示隐藏叠加指标
|
|
2668
2668
|
CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
|
|
2669
2669
|
CMD_SHOW_OVERLAY_Y_AXIS_ID:30, //显示隐藏Y轴叠加指标
|
|
2670
|
+
CMD_ENABLE_OVERLAY_SHARE_Y_ID:31, //和主图指标共享Y轴坐标
|
|
2670
2671
|
}
|
|
2671
2672
|
|
|
2672
2673
|
|
|
@@ -8012,7 +8013,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
8012
8013
|
this.ChartDrawPicture=[];
|
|
8013
8014
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
8014
8015
|
this.SelectChartDrawPicture=null;
|
|
8015
|
-
|
|
8016
|
+
|
|
8016
8017
|
if (option && option.Draw==false) bDraw=false;
|
|
8017
8018
|
if (bDraw) this.Draw();
|
|
8018
8019
|
}
|
|
@@ -9324,6 +9325,25 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
9324
9325
|
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
9325
9326
|
this.Draw();
|
|
9326
9327
|
|
|
9328
|
+
break;
|
|
9329
|
+
|
|
9330
|
+
case JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID:
|
|
9331
|
+
if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
|
|
9332
|
+
if (!this.GetOverlayIndexByIdentify) return false;
|
|
9333
|
+
|
|
9334
|
+
var indexGuid=srcParam,showType=aryArgs[1];
|
|
9335
|
+
var finder=this.GetOverlayIndexByIdentify(indexGuid);
|
|
9336
|
+
if (!finder || !finder.OverlayItem) return false;
|
|
9337
|
+
|
|
9338
|
+
var frame=finder.OverlayItem.Frame;
|
|
9339
|
+
if (showType==1) frame.IsShareY=false;
|
|
9340
|
+
else if (showType==2) frame.IsShareY==true;
|
|
9341
|
+
else frame.IsShareY=!frame.IsShareY;
|
|
9342
|
+
|
|
9343
|
+
this.UpdataDataoffset(); //更新数据偏移
|
|
9344
|
+
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
9345
|
+
this.Draw();
|
|
9346
|
+
|
|
9327
9347
|
break;
|
|
9328
9348
|
}
|
|
9329
9349
|
}
|
|
@@ -9360,6 +9380,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
9360
9380
|
return data;
|
|
9361
9381
|
}
|
|
9362
9382
|
|
|
9383
|
+
this.GetOverlayIndexShareYMenuData=function(indexGuid, showType)
|
|
9384
|
+
{
|
|
9385
|
+
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
9386
|
+
if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
|
|
9387
|
+
|
|
9388
|
+
var frame=overlay.OverlayItem.Frame;
|
|
9389
|
+
var data= { Name:"公用窗口Y轴", Data:{ ID: JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID, Args:[indexGuid, 0] } , Checked:frame.IsShareY };
|
|
9390
|
+
|
|
9391
|
+
return data;
|
|
9392
|
+
}
|
|
9393
|
+
|
|
9363
9394
|
//点击右键菜单
|
|
9364
9395
|
this.OnClickRightMenu=function(data)
|
|
9365
9396
|
{
|
|
@@ -56130,20 +56161,35 @@ function ChartDrawHLine()
|
|
|
56130
56161
|
this.GetLabelCallback=option.GetLabelCallback;
|
|
56131
56162
|
}
|
|
56132
56163
|
|
|
56133
|
-
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
56134
56164
|
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
56135
56165
|
if (option.Font) this.Font=option.Font;
|
|
56136
56166
|
if (option.ValueTextColor) this.ValueTextColor=option.ValueTextColor;
|
|
56167
|
+
if (option.ButtonBGColor) this.ButtonBGColor=option.ButtonBGColor;
|
|
56137
56168
|
if (IFrameSplitOperator.IsNumber(option.ButtonPosition)) this.ButtonPosition=option.ButtonPosition;
|
|
56138
56169
|
if (IFrameSplitOperator.IsNumber(option.RightSpaceWidth)) this.RightSpaceWidth=option.RightSpaceWidth;
|
|
56139
56170
|
|
|
56140
56171
|
if (option.Button)
|
|
56141
56172
|
{
|
|
56142
56173
|
var item=option.Button;
|
|
56143
|
-
if (item.CloseIcon)
|
|
56144
|
-
|
|
56145
|
-
|
|
56146
|
-
|
|
56174
|
+
if (item.CloseIcon)
|
|
56175
|
+
{
|
|
56176
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
56177
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
56178
|
+
}
|
|
56179
|
+
else if (item.CloseIcon===null)
|
|
56180
|
+
{
|
|
56181
|
+
this.Button.CloseIcon=null;
|
|
56182
|
+
}
|
|
56183
|
+
|
|
56184
|
+
if (item.SettingIcon)
|
|
56185
|
+
{
|
|
56186
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
56187
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
56188
|
+
}
|
|
56189
|
+
else if (item.SettingIcon===null)
|
|
56190
|
+
{
|
|
56191
|
+
this.Button.SettingIcon=null;
|
|
56192
|
+
}
|
|
56147
56193
|
}
|
|
56148
56194
|
|
|
56149
56195
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -6559,6 +6559,7 @@ var JSCHART_MENU_ID=
|
|
|
6559
6559
|
CMD_SHOW_OVERLAY_INDEX_ID:28, //显示隐藏叠加指标
|
|
6560
6560
|
CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
|
|
6561
6561
|
CMD_SHOW_OVERLAY_Y_AXIS_ID:30, //显示隐藏Y轴叠加指标
|
|
6562
|
+
CMD_ENABLE_OVERLAY_SHARE_Y_ID:31, //和主图指标共享Y轴坐标
|
|
6562
6563
|
}
|
|
6563
6564
|
|
|
6564
6565
|
|
|
@@ -11904,7 +11905,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11904
11905
|
this.ChartDrawPicture=[];
|
|
11905
11906
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
11906
11907
|
this.SelectChartDrawPicture=null;
|
|
11907
|
-
|
|
11908
|
+
|
|
11908
11909
|
if (option && option.Draw==false) bDraw=false;
|
|
11909
11910
|
if (bDraw) this.Draw();
|
|
11910
11911
|
}
|
|
@@ -13216,6 +13217,25 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13216
13217
|
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
13217
13218
|
this.Draw();
|
|
13218
13219
|
|
|
13220
|
+
break;
|
|
13221
|
+
|
|
13222
|
+
case JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID:
|
|
13223
|
+
if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
|
|
13224
|
+
if (!this.GetOverlayIndexByIdentify) return false;
|
|
13225
|
+
|
|
13226
|
+
var indexGuid=srcParam,showType=aryArgs[1];
|
|
13227
|
+
var finder=this.GetOverlayIndexByIdentify(indexGuid);
|
|
13228
|
+
if (!finder || !finder.OverlayItem) return false;
|
|
13229
|
+
|
|
13230
|
+
var frame=finder.OverlayItem.Frame;
|
|
13231
|
+
if (showType==1) frame.IsShareY=false;
|
|
13232
|
+
else if (showType==2) frame.IsShareY==true;
|
|
13233
|
+
else frame.IsShareY=!frame.IsShareY;
|
|
13234
|
+
|
|
13235
|
+
this.UpdataDataoffset(); //更新数据偏移
|
|
13236
|
+
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
13237
|
+
this.Draw();
|
|
13238
|
+
|
|
13219
13239
|
break;
|
|
13220
13240
|
}
|
|
13221
13241
|
}
|
|
@@ -13252,6 +13272,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13252
13272
|
return data;
|
|
13253
13273
|
}
|
|
13254
13274
|
|
|
13275
|
+
this.GetOverlayIndexShareYMenuData=function(indexGuid, showType)
|
|
13276
|
+
{
|
|
13277
|
+
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
13278
|
+
if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
|
|
13279
|
+
|
|
13280
|
+
var frame=overlay.OverlayItem.Frame;
|
|
13281
|
+
var data= { Name:"公用窗口Y轴", Data:{ ID: JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID, Args:[indexGuid, 0] } , Checked:frame.IsShareY };
|
|
13282
|
+
|
|
13283
|
+
return data;
|
|
13284
|
+
}
|
|
13285
|
+
|
|
13255
13286
|
//点击右键菜单
|
|
13256
13287
|
this.OnClickRightMenu=function(data)
|
|
13257
13288
|
{
|
|
@@ -60022,20 +60053,35 @@ function ChartDrawHLine()
|
|
|
60022
60053
|
this.GetLabelCallback=option.GetLabelCallback;
|
|
60023
60054
|
}
|
|
60024
60055
|
|
|
60025
|
-
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
60026
60056
|
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
60027
60057
|
if (option.Font) this.Font=option.Font;
|
|
60028
60058
|
if (option.ValueTextColor) this.ValueTextColor=option.ValueTextColor;
|
|
60059
|
+
if (option.ButtonBGColor) this.ButtonBGColor=option.ButtonBGColor;
|
|
60029
60060
|
if (IFrameSplitOperator.IsNumber(option.ButtonPosition)) this.ButtonPosition=option.ButtonPosition;
|
|
60030
60061
|
if (IFrameSplitOperator.IsNumber(option.RightSpaceWidth)) this.RightSpaceWidth=option.RightSpaceWidth;
|
|
60031
60062
|
|
|
60032
60063
|
if (option.Button)
|
|
60033
60064
|
{
|
|
60034
60065
|
var item=option.Button;
|
|
60035
|
-
if (item.CloseIcon)
|
|
60036
|
-
|
|
60037
|
-
|
|
60038
|
-
|
|
60066
|
+
if (item.CloseIcon)
|
|
60067
|
+
{
|
|
60068
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
60069
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
60070
|
+
}
|
|
60071
|
+
else if (item.CloseIcon===null)
|
|
60072
|
+
{
|
|
60073
|
+
this.Button.CloseIcon=null;
|
|
60074
|
+
}
|
|
60075
|
+
|
|
60076
|
+
if (item.SettingIcon)
|
|
60077
|
+
{
|
|
60078
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
60079
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
60080
|
+
}
|
|
60081
|
+
else if (item.SettingIcon===null)
|
|
60082
|
+
{
|
|
60083
|
+
this.Button.SettingIcon=null;
|
|
60084
|
+
}
|
|
60039
60085
|
}
|
|
60040
60086
|
|
|
60041
60087
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -115144,6 +115190,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115144
115190
|
|
|
115145
115191
|
let titleIndex=windowIndex+1;
|
|
115146
115192
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115193
|
+
this.SetChartIndexName(chartText);
|
|
115147
115194
|
hqChart.ChartPaint.push(chartText);
|
|
115148
115195
|
}
|
|
115149
115196
|
|
|
@@ -115731,6 +115778,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115731
115778
|
chartText.DrawData=varItem.Draw.DrawData;
|
|
115732
115779
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115733
115780
|
|
|
115781
|
+
this.SetChartIndexName(chartText);
|
|
115734
115782
|
hqChart.ChartPaint.push(chartText);
|
|
115735
115783
|
}
|
|
115736
115784
|
|
|
@@ -115784,6 +115832,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115784
115832
|
|
|
115785
115833
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115786
115834
|
|
|
115835
|
+
this.SetChartIndexName(chartText);
|
|
115787
115836
|
hqChart.ChartPaint.push(chartText);
|
|
115788
115837
|
}
|
|
115789
115838
|
|
|
@@ -131966,7 +132015,7 @@ function ScrollBarBGChart()
|
|
|
131966
132015
|
|
|
131967
132016
|
|
|
131968
132017
|
|
|
131969
|
-
var HQCHART_VERSION="1.1.
|
|
132018
|
+
var HQCHART_VERSION="1.1.13219";
|
|
131970
132019
|
|
|
131971
132020
|
function PrintHQChartVersion()
|
|
131972
132021
|
{
|
|
@@ -6603,6 +6603,7 @@ var JSCHART_MENU_ID=
|
|
|
6603
6603
|
CMD_SHOW_OVERLAY_INDEX_ID:28, //显示隐藏叠加指标
|
|
6604
6604
|
CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
|
|
6605
6605
|
CMD_SHOW_OVERLAY_Y_AXIS_ID:30, //显示隐藏Y轴叠加指标
|
|
6606
|
+
CMD_ENABLE_OVERLAY_SHARE_Y_ID:31, //和主图指标共享Y轴坐标
|
|
6606
6607
|
}
|
|
6607
6608
|
|
|
6608
6609
|
|
|
@@ -11948,7 +11949,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11948
11949
|
this.ChartDrawPicture=[];
|
|
11949
11950
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
11950
11951
|
this.SelectChartDrawPicture=null;
|
|
11951
|
-
|
|
11952
|
+
|
|
11952
11953
|
if (option && option.Draw==false) bDraw=false;
|
|
11953
11954
|
if (bDraw) this.Draw();
|
|
11954
11955
|
}
|
|
@@ -13260,6 +13261,25 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13260
13261
|
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
13261
13262
|
this.Draw();
|
|
13262
13263
|
|
|
13264
|
+
break;
|
|
13265
|
+
|
|
13266
|
+
case JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID:
|
|
13267
|
+
if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
|
|
13268
|
+
if (!this.GetOverlayIndexByIdentify) return false;
|
|
13269
|
+
|
|
13270
|
+
var indexGuid=srcParam,showType=aryArgs[1];
|
|
13271
|
+
var finder=this.GetOverlayIndexByIdentify(indexGuid);
|
|
13272
|
+
if (!finder || !finder.OverlayItem) return false;
|
|
13273
|
+
|
|
13274
|
+
var frame=finder.OverlayItem.Frame;
|
|
13275
|
+
if (showType==1) frame.IsShareY=false;
|
|
13276
|
+
else if (showType==2) frame.IsShareY==true;
|
|
13277
|
+
else frame.IsShareY=!frame.IsShareY;
|
|
13278
|
+
|
|
13279
|
+
this.UpdataDataoffset(); //更新数据偏移
|
|
13280
|
+
this.UpdateFrameMaxMin(); //调整坐标最大 最小值
|
|
13281
|
+
this.Draw();
|
|
13282
|
+
|
|
13263
13283
|
break;
|
|
13264
13284
|
}
|
|
13265
13285
|
}
|
|
@@ -13296,6 +13316,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13296
13316
|
return data;
|
|
13297
13317
|
}
|
|
13298
13318
|
|
|
13319
|
+
this.GetOverlayIndexShareYMenuData=function(indexGuid, showType)
|
|
13320
|
+
{
|
|
13321
|
+
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
13322
|
+
if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
|
|
13323
|
+
|
|
13324
|
+
var frame=overlay.OverlayItem.Frame;
|
|
13325
|
+
var data= { Name:"公用窗口Y轴", Data:{ ID: JSCHART_MENU_ID.CMD_ENABLE_OVERLAY_SHARE_Y_ID, Args:[indexGuid, 0] } , Checked:frame.IsShareY };
|
|
13326
|
+
|
|
13327
|
+
return data;
|
|
13328
|
+
}
|
|
13329
|
+
|
|
13299
13330
|
//点击右键菜单
|
|
13300
13331
|
this.OnClickRightMenu=function(data)
|
|
13301
13332
|
{
|
|
@@ -60066,20 +60097,35 @@ function ChartDrawHLine()
|
|
|
60066
60097
|
this.GetLabelCallback=option.GetLabelCallback;
|
|
60067
60098
|
}
|
|
60068
60099
|
|
|
60069
|
-
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
60070
60100
|
if (IFrameSplitOperator.IsNumber(option.Precision)) this.Precision=option.Precision;
|
|
60071
60101
|
if (option.Font) this.Font=option.Font;
|
|
60072
60102
|
if (option.ValueTextColor) this.ValueTextColor=option.ValueTextColor;
|
|
60103
|
+
if (option.ButtonBGColor) this.ButtonBGColor=option.ButtonBGColor;
|
|
60073
60104
|
if (IFrameSplitOperator.IsNumber(option.ButtonPosition)) this.ButtonPosition=option.ButtonPosition;
|
|
60074
60105
|
if (IFrameSplitOperator.IsNumber(option.RightSpaceWidth)) this.RightSpaceWidth=option.RightSpaceWidth;
|
|
60075
60106
|
|
|
60076
60107
|
if (option.Button)
|
|
60077
60108
|
{
|
|
60078
60109
|
var item=option.Button;
|
|
60079
|
-
if (item.CloseIcon)
|
|
60080
|
-
|
|
60081
|
-
|
|
60082
|
-
|
|
60110
|
+
if (item.CloseIcon)
|
|
60111
|
+
{
|
|
60112
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
60113
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
60114
|
+
}
|
|
60115
|
+
else if (item.CloseIcon===null)
|
|
60116
|
+
{
|
|
60117
|
+
this.Button.CloseIcon=null;
|
|
60118
|
+
}
|
|
60119
|
+
|
|
60120
|
+
if (item.SettingIcon)
|
|
60121
|
+
{
|
|
60122
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
60123
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
60124
|
+
}
|
|
60125
|
+
else if (item.SettingIcon===null)
|
|
60126
|
+
{
|
|
60127
|
+
this.Button.SettingIcon=null;
|
|
60128
|
+
}
|
|
60083
60129
|
}
|
|
60084
60130
|
|
|
60085
60131
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -115188,6 +115234,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115188
115234
|
|
|
115189
115235
|
let titleIndex=windowIndex+1;
|
|
115190
115236
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115237
|
+
this.SetChartIndexName(chartText);
|
|
115191
115238
|
hqChart.ChartPaint.push(chartText);
|
|
115192
115239
|
}
|
|
115193
115240
|
|
|
@@ -115775,6 +115822,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115775
115822
|
chartText.DrawData=varItem.Draw.DrawData;
|
|
115776
115823
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115777
115824
|
|
|
115825
|
+
this.SetChartIndexName(chartText);
|
|
115778
115826
|
hqChart.ChartPaint.push(chartText);
|
|
115779
115827
|
}
|
|
115780
115828
|
|
|
@@ -115828,6 +115876,7 @@ function ScriptIndex(name,script,args,option)
|
|
|
115828
115876
|
|
|
115829
115877
|
//hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
|
|
115830
115878
|
|
|
115879
|
+
this.SetChartIndexName(chartText);
|
|
115831
115880
|
hqChart.ChartPaint.push(chartText);
|
|
115832
115881
|
}
|
|
115833
115882
|
|
|
@@ -134879,7 +134928,7 @@ function HQChartScriptWorker()
|
|
|
134879
134928
|
|
|
134880
134929
|
|
|
134881
134930
|
|
|
134882
|
-
var HQCHART_VERSION="1.1.
|
|
134931
|
+
var HQCHART_VERSION="1.1.13219";
|
|
134883
134932
|
|
|
134884
134933
|
function PrintHQChartVersion()
|
|
134885
134934
|
{
|