hqchart 1.1.13253 → 1.1.13263

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -6685,6 +6685,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.CurrentChartDrawPicture=null;              //当前的画图工具
     this.SelectChartDrawPicture=null;               //当前选中的画图
     this.MoveOnChartDrawPicture=null;               //鼠标在画图上
+    this.EnableEraseChartDrawPicture=false;         //擦除画图
     this.IsDrawPictureXY=false;                     //选中的画图工具是否显示X,Y轴对应数值
     this.EnableShowCorssCursor={ DrawPicture:true };  //DrawPicture=画图是否显示十字光标
     this.ChartPictureMenu;                          //画图工具 单个图形设置菜单
@@ -7422,7 +7423,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drawPictrueData.Y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
             if (this.GetChartDrawPictureByPoint(drawPictrueData))
             {
-                if (drawPictrueData.ChartDrawPicture.EnableMove==true)
+                if (this.EnableEraseChartDrawPicture)   //擦掉画线
+                {
+                    this.CurrentChartDrawPicture=null;
+                    this.SelectChartDrawPicture=null;
+                    this.ClearChartDrawPicture(drawPictrueData.ChartDrawPicture);
+                }
+                else if (drawPictrueData.ChartDrawPicture.EnableMove==true)
                 {
                     this.UpDownDrag=null;   //画图优先
                     this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
@@ -7965,6 +7972,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.MouseDrag=null;
         this.ClickDownPoint=null;
         this.IsOnTouch=false;
+        if (this.EnableEraseChartDrawPicture==true) 
+        {
+            this.EnableEraseChartDrawPicture=false;
+            //更改画图工具对话框橡皮状态
+            if (this.DialogDrawTool && this.DialogDrawTool.SetEraseChartButtonStatus) this.DialogDrawTool.SetEraseChartButtonStatus(false);
+        }
+        
         if (this.BorderDrag && this.BorderDrag.Index>=0) this.Frame.SaveSubFrameHeightRate();   //拖拽指标窗口高度以后保存
         this.BorderDrag=null;
         this.YDrag=null;
@@ -10025,22 +10039,31 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var drawPictrueData={};
             drawPictrueData.X=x;
             drawPictrueData.Y=y;
-            if (this.GetChartDrawPictureByPoint(drawPictrueData) && 
-                drawPictrueData.ChartDrawPicture && drawPictrueData.ChartDrawPicture.EnableMove==true) 
+            if (this.GetChartDrawPictureByPoint(drawPictrueData) && drawPictrueData.ChartDrawPicture) 
             {
-                
-                if (drawPictrueData.PointIndex===100) 
+                if (this.EnableEraseChartDrawPicture)
                 {
-                    if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor;
-                    else this.SetCursor({Cursor:"move"}); //this.UIElement.style.cursor="move";
+                    this.SetCursor({Cursor:"grabbing"});
                 }
-                else 
+                else
                 {
-                    if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor
-                    else this.SetCursor({Cursor:"pointer"}); //this.UIElement.style.cursor="pointer";
-                }
+                    if (drawPictrueData.ChartDrawPicture.EnableMove==true)
+                    {
+                        if (drawPictrueData.PointIndex===100) 
+                        {
+                            if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor;
+                            else this.SetCursor({Cursor:"move"}); //this.UIElement.style.cursor="move";
+                        }
+                        else 
+                        {
+                            if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor
+                            else this.SetCursor({Cursor:"pointer"}); //this.UIElement.style.cursor="pointer";
+                        }
 
-                bDrawPicture=true;
+                        bDrawPicture=true;
+                    }
+                }
+               
                 this.MoveOnChartDrawPicture=drawPictrueData.ChartDrawPicture;
             }
             else 
@@ -40724,7 +40747,9 @@ function ChartMultiBar()
 
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || this.Data.length<=0) return;
 
         this.IsHScreen=(this.ChartFrame.IsHScreen===true);
@@ -40901,6 +40926,8 @@ function ChartMultiLine()
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || this.Data.length<=0) return;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Lines)) return;
 
@@ -41420,7 +41447,7 @@ function ChartMultiText()
                 var y=top;
                 if (item.Value=="TOP") y=top;
                 else if (item.Value=="BOTTOM") y=bottom;
-                else y=this.ChartFrame.GetYFromData(item.Value);
+                else y=this.ChartFrame.GetYFromData(item.Value, false);
 
                 if (item.Color)  this.Canvas.fillStyle = item.Color;
                 else this.Canvas.fillStyle = this.Color;
@@ -41461,7 +41488,7 @@ function ChartMultiText()
                 {
                     var kItem=this.Data.Data[item.Index];
                     var price=item.Line.KData=="H"? kItem.High:kItem.Low;
-                    var yPrice=this.ChartFrame.GetYFromData(price);
+                    var yPrice=this.ChartFrame.GetYFromData(price, false);
                     var yText=y;
                     if (Array.isArray(item.Line.Offset) && item.Line.Offset.length==2)
                     {
@@ -41501,7 +41528,9 @@ function ChartMultiText()
 
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || this.Data.length<=0) return;
         if (!this.Texts) return;
 
@@ -41510,7 +41539,12 @@ function ChartMultiText()
         var mapText=this.GetShowTextData();
         if (mapText.size<=0) return;
 
+        this.Canvas.save();
+        this.ClipClient(this.IsHScreen);
+
         this.DrawAllText(mapText);
+
+        this.Canvas.restore();
     }
 
     this.GetMaxMin=function()
@@ -41558,7 +41592,9 @@ function ChartMultiSVGIcon()
     this.Draw=function()
     {
         this.IconRect=[];
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || this.Data.length<=0) return;
         if (!this.Family || !this.Icon) return;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Icon)) return;
@@ -59957,7 +59993,7 @@ function ChartDrawHLine()
     this.TextFont=12*GetDevicePixelRatio() +"px 微软雅黑";
     this.RightSpaceWidth=50;
 
-    this.ButtonPosition=0;              //按钮位置, 0=价格后面， 1=价格上面 2=价格上面 左对齐
+    this.ButtonPosition=0;              //按钮位置, 0=价格后面， 1=价格上面 2=价格上面 左对齐 3=垂直排列
     this.ButtonBGColor='rgb(190,190,190)';
     this.ButtonSpace=3;
     
@@ -59989,6 +60025,8 @@ function ChartDrawHLine()
     this.ColseButtonSize=0;
     this.SettingButtonSize=0;
     this.ButtonBGWidth=0;
+    this.VerticalButtonInfo={ Width:0, Height:0 };  //垂直按钮信息
+   
 
 
     this.SetOption=function(option)
@@ -60125,6 +60163,9 @@ function ChartDrawHLine()
         this.SettingButtonSize=0;
         this.ButtonBGWidth=0;
 
+        this.VerticalButtonInfo.Width=0;
+        this.VerticalButtonInfo.Height=0;
+
         if (this.IsFrameMinSize()) return;
         if (!this.IsShow) return;
 
@@ -60326,15 +60367,16 @@ function ChartDrawHLine()
         if (IFrameSplitOperator.IsNumber(labInfo.LineSpace)) lineSpace=labInfo.LineSpace;
 
         //背景色
+        var rtLab={ Left:drawLeft, Top:drawTop, Width:labSize.Width, Height:labSize.Height }
+        rtLab.Right=rtLab.Left+rtLab.Width;
+        rtLab.Bottom=rtLab.Top+rtLab.Height;
         if (labInfo.BGColor)
         {
             this.Canvas.fillStyle=labInfo.BGColor;
-            var rtTop=drawTop;
-            this.Canvas.fillRect(ToFixedRect(drawLeft),ToFixedRect(rtTop),ToFixedRect(labSize.Width),ToFixedRect(labSize.Height));  
+            this.Canvas.fillRect(ToFixedRect(rtLab.Left),ToFixedRect(rtLab.Top),ToFixedRect(rtLab.Width),ToFixedRect(rtLab.Height));  
         }
 
         var yText=drawTop+1+lineSpace;
-        
         this.Canvas.textBaseline="top";
         for(var i=0;i<labInfo.AryText.length;++i)
         {
@@ -60355,6 +60397,8 @@ function ChartDrawHLine()
 
             yText+=labSize.LineHeight+lineSpace;
         }
+
+        this.DrawVerticalButton(rtLab);
     }
 
     this.DrawCustomHLine=function(labInfo, yLine)
@@ -60509,27 +60553,83 @@ function ChartDrawHLine()
             var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
             this.Canvas.font=font;
             item.Width=this.Canvas.measureText(icon.Text).width+2;
+            item.Height=item.Width;
 
             if (icon.Margin)
             {
                 var margin=icon.Margin;
                 if (IFrameSplitOperator.IsNumber(margin.Left)) item.Width+=margin.Left;
                 if (IFrameSplitOperator.IsNumber(margin.Right)) item.Width+=margin.Right;
+
+                if (IFrameSplitOperator.IsNumber(margin.Top)) item.Height+=margin.Top;
+                if (IFrameSplitOperator.IsNumber(margin.Bottom)) item.Height+=margin.Bottom;
             }
 
+            if (this.VerticalButtonInfo.Width<item.Width) this.VerticalButtonInfo.Width=item.Width;
+            this.VerticalButtonInfo.Height+=item.Height;
+
             totalWidth+=item.Width;
         }
 
         this.ButtonBGWidth=totalWidth;
     }
 
-    this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
+    //垂直排列按钮
+    this.DrawVerticalButton=function(rtLab)
     {
+        if (this.ButtonPosition!=3) return;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
+        if (this.VerticalButtonInfo.Height<=0) return;
 
+        var rtBG={ Left:rtLab.Right, Top:rtLab.Top, Width:this.VerticalButtonInfo.Width, Height:this.VerticalButtonInfo.Height };
+        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));
+
+        var pixelRatio=GetDevicePixelRatio();
+        var yTop=rtLab.Top;
+        for(var i=0;i<this.AryShowButton.length;++i)
+        {
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
+
+            var rtButton={Left:rtBG.Left, Top:yTop, Width:this.VerticalButtonInfo.Width, Height:item.Height };
+            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 font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+            this.Canvas.font=font;
+            this.Canvas.textAlign="center";
+            this.Canvas.textBaseline="middle";
+            this.Canvas.fillStyle=icon.Color;
+            this.Canvas.fillText(icon.Text,xCenter,yCenter);
+
+            this.AryButton.push({Rect:rtButton,ID:icon.ID, TooltipText:icon.TooltipText, Data:icon.Data });
+
+            yTop=rtButton.Bottom;
+        }
+    }
+
+    this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
+        if (this.ButtonPosition==3) return; //垂直按钮在DrawVerticalButton()调用
+ 
         if (this.ButtonPosition==1) 
         {
             drawTop-=drawHeight;
+            var chartWidth=this.Frame.ChartBorder.GetChartWidth();
+            var chartLeft=this.Frame.ChartBorder.GetRight()+this.RightSpaceWidth;
+            if (drawLeft+this.ButtonBGWidth>chartWidth) //右边不够了 往左移动
+            {
+                drawLeft=chartWidth-this.ButtonBGWidth;
+            }
+
+            if (rtDraw.Left>drawLeft) drawLeft=rtDraw.Left;
+
         }
         else if (this.ButtonPosition==2)
         {
@@ -71961,6 +72061,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             {
                 var cursorIndex={ ZoomType:this.ZoomType, IsLockRight:this.IsZoomLockRight };
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));
+                if (e.ctrlKey) cursorIndex.ZoomType=1;  //ctrl+滚轴 十字中心缩放
                 if (this.Frame.ZoomDown(cursorIndex, { ZoomDownloadDataCallback:(requestData)=>{ this.ZoomDownloadData(requestData) } } ))
                 {
                     this.CursorIndex=cursorIndex.Index;
@@ -71983,6 +72084,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             {
                 var cursorIndex={ ZoomType:this.ZoomType, IsLockRight:this.IsZoomLockRight };
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));
+                if (e.ctrlKey) cursorIndex.ZoomType=1;  //ctrl+滚轴 十字中心缩放
                 if (this.Frame.ZoomUp(cursorIndex))
                 {
                     JSConsole.Chart.Log("[KLineChartContainer::OnWheel] cursorIndex ",cursorIndex)
@@ -115944,6 +116046,7 @@ function ScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
         
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
 
          var titleIndex=windowIndex+1;
@@ -115964,6 +116067,7 @@ function ScriptIndex(name,script,args,option)
         chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
         if (varItem.Draw.Name) chart.Name=varItem.Draw.Name;
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
 
          var titleIndex=windowIndex+1;
@@ -115990,6 +116094,7 @@ function ScriptIndex(name,script,args,option)
         titleData.DataType="MULTI_BAR";
         hqChart.TitlePaint[titleIndex].Data[id]=titleData;
 
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -116003,6 +116108,7 @@ function ScriptIndex(name,script,args,option)
 
         chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
         chart.Texts=varItem.Draw.DrawData; 
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -116018,6 +116124,7 @@ function ScriptIndex(name,script,args,option)
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
         chart.BuildCacheData();
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -117591,6 +117698,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117654,6 +117762,7 @@ function OverlayScriptIndex(name,script,args,option)
         titleData.DataType="MULTI_BAR";
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117670,6 +117779,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
         chart.Texts=varItem.Draw.DrawData; 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117688,6 +117798,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
         chart.BuildCacheData();
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117716,6 +117827,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
         
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -134782,7 +134894,8 @@ var JS_DRAWTOOL_MENU_ID=
 {
     CMD_SELECTED_ID:1,
     CMD_CHANGE_LINE_COLOR_ID:2,
-    CMD_DELETE_ALL_RAW_CHART_ID:3
+    CMD_DELETE_ALL_DRAW_CHART_ID:3,
+    CMD_ERASE_DRAW_CHART_ID:4,
 };
 
 function JSDialogDrawTool()
@@ -134870,7 +134983,8 @@ function JSDialogDrawTool()
             { Title:"选中", ClassName:'hqchart_drawtool icon-arrow', Type:1, Data:{ID:JS_DRAWTOOL_MENU_ID.CMD_SELECTED_ID} },
             { Title:'尺子', ClassName: 'hqchart_drawtool icon-ruler', Type:0, Data:{ ID:"尺子" } },
             { Title:"点击切换颜色", ClassName: 'hqchart_drawtool icon-fangkuai', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
-            { Title:"删除所有画线", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_ALL_RAW_CHART_ID }}
+            { Title:"擦除画线", ClassName: 'hqchart_drawtool icon-a-xiangpicachuxiangpica', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ERASE_DRAW_CHART_ID }},
+            { Title:"删除所有画线", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_ALL_DRAW_CHART_ID }}
         ]
     };
 
@@ -135003,18 +135117,27 @@ function JSDialogDrawTool()
         {
             this.OnChangeLineColor(data);
         }
-        else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_DELETE_ALL_RAW_CHART_ID)
+        else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_DELETE_ALL_DRAW_CHART_ID)
         {
             this.DeleteAllChart();
         }
+        else if (type==2 &&  id==JS_DRAWTOOL_MENU_ID.CMD_ERASE_DRAW_CHART_ID)
+        {
+            this.ClearAllSelectedChart();
+            this.ClearCurrnetDrawPicture();
+            this.EnableEraseChart(true);
+        }
         else if (type==1 && id==JS_DRAWTOOL_MENU_ID.CMD_SELECTED_ID)
         {
             this.ClearAllSelectedChart();
             this.ClearCurrnetDrawPicture();
+            this.EnableEraseChart(false);
         }
         else if (type==0)
         {
             this.ClearAllSelectedChart();
+            this.EnableEraseChart(false);
+            data.Span.classList.remove("UMyChart_DrawTool_Span");
             data.Span.classList.add("UMyChart_DrawTool_Span_Selected");
             this.CreateDrawPicture(data);
         }
@@ -135027,6 +135150,7 @@ function JSDialogDrawTool()
         {
             var item=this.AryDivChart[i];
             item.Span.classList.remove("UMyChart_DrawTool_Span_Selected");
+            item.Span.classList.add("UMyChart_DrawTool_Span");
         }
     }
 
@@ -135100,6 +135224,43 @@ function JSDialogDrawTool()
         this.HQChart.ClearChartDrawPicture();
     }
 
+    this.SetEraseChartButtonStatus=function(enable)
+    {
+        for(var i=0;i<this.AryDivChart.length;++i)
+        {
+            var item=this.AryDivChart[i];
+            if (item.Item.Type==2 && item.Item.Data && item.Item.Data.ID==JS_DRAWTOOL_MENU_ID.CMD_ERASE_DRAW_CHART_ID)
+            {
+                if (enable)
+                {
+                    if (item.Span.classList.contains("UMyChart_DrawTool_Span"))
+                    {
+                        item.Span.classList.replace("UMyChart_DrawTool_Span", "UMyChart_DrawTool_Span_Selected");
+                    }
+                }
+                else
+                {
+                    if (item.Span.classList.contains("UMyChart_DrawTool_Span_Selected"))
+                    {
+                        item.Span.classList.replace("UMyChart_DrawTool_Span_Selected","UMyChart_DrawTool_Span");
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    this.EnableEraseChart=function(enable)
+    {
+        if (!this.HQChart) return;
+
+        if (this.HQChart.EnableEraseChartDrawPicture==enable) return;
+
+        this.HQChart.EnableEraseChartDrawPicture=enable;
+
+        this.SetEraseChartButtonStatus(enable);
+    }
+
     this.CreateDrawPicture=function(data)
     {
         if (!this.HQChart) return null;
@@ -135126,6 +135287,7 @@ function JSDialogDrawTool()
     this.OnFinishDrawPicture=function(chart, data)
     {
         data.Span.classList.remove("UMyChart_DrawTool_Span_Selected");
+        data.Span.classList.add("UMyChart_DrawTool_Span");
     }
 
     this.Show=function(x, y)
@@ -135314,7 +135476,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13252";
+var HQCHART_VERSION="1.1.13262";
 
 function PrintHQChartVersion()
 {