hqchart 1.1.13253 → 1.1.13263

package/src/jscommon/umychart.complier.js

@@ -21240,6 +21240,7 @@ function ScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
         
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
 
          var titleIndex=windowIndex+1;
@@ -21260,6 +21261,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;
@@ -21286,6 +21288,7 @@ function ScriptIndex(name,script,args,option)
         titleData.DataType="MULTI_BAR";
         hqChart.TitlePaint[titleIndex].Data[id]=titleData;
 
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -21299,6 +21302,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);
     }
 
@@ -21314,6 +21318,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);
     }
 
@@ -22887,6 +22892,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -22950,6 +22956,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);
     }
 
@@ -22966,6 +22973,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);
     }
 
@@ -22984,6 +22992,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);
     }
 
@@ -23012,6 +23021,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         this.ReloadChartResource(hqChart, windowIndex, chart);
         
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 

package/src/jscommon/umychart.js

@@ -2749,6 +2749,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;                          //画图工具 单个图形设置菜单
@@ -3486,7 +3487,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;
@@ -4029,6 +4036,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;
@@ -6089,22 +6103,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 
@@ -36788,7 +36811,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);
@@ -36965,6 +36990,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;
 
@@ -37484,7 +37511,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;
@@ -37525,7 +37552,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)
                     {
@@ -37565,7 +37592,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;
 
@@ -37574,7 +37603,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()
@@ -37622,7 +37656,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;
@@ -56021,7 +56057,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;
     
@@ -56053,6 +56089,8 @@ function ChartDrawHLine()
     this.ColseButtonSize=0;
     this.SettingButtonSize=0;
     this.ButtonBGWidth=0;
+    this.VerticalButtonInfo={ Width:0, Height:0 };  //垂直按钮信息
+   
 
 
     this.SetOption=function(option)
@@ -56189,6 +56227,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;
 
@@ -56390,15 +56431,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)
         {
@@ -56419,6 +56461,8 @@ function ChartDrawHLine()
 
             yText+=labSize.LineHeight+lineSpace;
         }
+
+        this.DrawVerticalButton(rtLab);
     }
 
     this.DrawCustomHLine=function(labInfo, yLine)
@@ -56573,27 +56617,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)
         {
@@ -68025,6 +68125,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;
@@ -68047,6 +68148,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)

package/src/jscommon/umychart.resource/css/tools.css

@@ -1350,10 +1350,10 @@ input[type="color"] {
     /*display: flex;*/
     border: 2px solid; 
     width:fit-content;
-    border-color: rgb(128,128,128);
+    border-color: rgb(204,204,204);
     visibility:hidden;
     position: absolute;
-    background-color: rgba(255,255,255,0.9);
+    background-color: rgba(250,250,250,1);
     left:1px;
     top:1px;
 }
@@ -1363,10 +1363,11 @@ input[type="color"] {
     padding-left: 2px;
     height:20px;
     border-bottom: 1px solid;
-    border-color: rgb(128,128,128);
+    border-color: rgb(204,204,204);
     display: flex;
     cursor: default;
     user-select: none;
+    background-color:rgb(222,222,222)
 }
 
 .UMyChart_DrawTool_Close_Div
@@ -1395,7 +1396,10 @@ input[type="color"] {
 
 .UMyChart_DrawTool_Span_Selected
 {
-    background: rgb(128,128,128);
+    font-size:22px;
+    border: 1px solid;
+    border-color: rgb(128,128,128);
+    background: rgb(234,85,4);
     color: rgb(255,255,255);
 }
 
@@ -1409,6 +1413,7 @@ input[type="color"] {
     font-size:22px;
     border: 1px solid;
     border-color: rgb(128,128,128);
+    color: rgb(77,77,77);
 }
 
 .UMyChart_DrawTool_Group_Tr
@@ -1427,7 +1432,7 @@ input[type="color"] {
 {
     height:5px;
     border-bottom: 1px solid;
-    border-color: rgb(128,128,128);
+    border-color: rgb(204,204,204);
 }
 
 

package/src/jscommon/umychart.resource/font/drawtool/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon hqchart_drawtool">&#xe60b;</span>
+                <div class="name">擦除</div>
+                <div class="code-name">&amp;#xe60b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon hqchart_drawtool">&#xe618;</span>
                 <div class="name">价格范围</div>
@@ -330,9 +336,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'hqchart_drawtool';
-  src: url('iconfont.woff2?t=1714547360824') format('woff2'),
-       url('iconfont.woff?t=1714547360824') format('woff'),
-       url('iconfont.ttf?t=1714547360824') format('truetype');
+  src: url('iconfont.woff2?t=1715003562605') format('woff2'),
+       url('iconfont.woff?t=1715003562605') format('woff'),
+       url('iconfont.ttf?t=1715003562605') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -358,6 +364,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon hqchart_drawtool icon-a-xiangpicachuxiangpica"></span>
+            <div class="name">
+              擦除
+            </div>
+            <div class="code-name">.icon-a-xiangpicachuxiangpica
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon hqchart_drawtool icon-jiagefanwei"></span>
             <div class="name">
@@ -772,6 +787,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-xiangpicachuxiangpica"></use>
+                </svg>
+                <div class="name">擦除</div>
+                <div class="code-name">#icon-a-xiangpicachuxiangpica</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiagefanwei"></use>

package/src/jscommon/umychart.resource/font/drawtool/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "hqchart_drawtool"; /* Project id 4529603 */
-  src: url('iconfont.woff2?t=1714547360824') format('woff2'),
-       url('iconfont.woff?t=1714547360824') format('woff'),
-       url('iconfont.ttf?t=1714547360824') format('truetype');
+  src: url('iconfont.woff2?t=1715003562605') format('woff2'),
+       url('iconfont.woff?t=1715003562605') format('woff'),
+       url('iconfont.ttf?t=1715003562605') format('truetype');
 }
 
 .hqchart_drawtool {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-xiangpicachuxiangpica:before {
+  content: "\e60b";
+}
+
 .icon-jiagefanwei:before {
   content: "\e618";
 }