hqchart 1.1.13245 → 1.1.13251

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -13149,19 +13149,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.Draw();
                 break;
             case JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:
-                var StockChip=chart.GetExtendChartByClassName('StockChip');
+                var StockChip=this.GetExtendChartByClassName('StockChip');
                 if (StockChip)
                 {
                     var chipWidth=StockChip.Chart.Width;
-                    var chipIndex=parseInt(StockChip.Index);
-                    for(var i=chipIndex+1; i<this.ExtendChartPaint.length; ++i)   //在筹码后面创建的需要筹码的宽度
-                    {
-                        var item=this.ExtendChartPaint[i];
-                        if (item.ClassName=='DrawToolsButton')
-                        {
-                            item.Left-=chipWidth;
-                        }
-                    }
                     this.DeleteExtendChart(StockChip); 
                     this.Frame.ChartBorder.Right-=chipWidth;
                     this.SetSizeChange(true);
@@ -13533,6 +13524,7 @@ function CoordinateInfo()
     this.ExtendData;                                            //扩展属性
                                                                 //百分比 { PriceColor:, PercentageColor:, SplitColor:, Font: }
                                                                 //自定义刻度 { Custom:{ Position: 1=强制内部 }}
+    this.AreaData;  //区域: { Start:, End:, BGColor:, Position:[0=左, 1=右] }
 }
 
 
@@ -16047,6 +16039,91 @@ function AverageWidthFrame()
         }
     }
 
+    this.DrawCustomAreaItem=function(item)    //自定义Y轴区域
+    {
+        if (!item.AreaData) return;
+        if (this.IsHScreen) return; //暂时不支持横屏
+
+        //item.AreaData;  //区域: { Value[], BGColor:, Position:[0=左, 1=右] }
+        if (!IFrameSplitOperator.IsNonEmptyArray(item.AreaData.Value) || item.AreaData.Value.length!=2) return;
+
+        var max=Math.max(item.AreaData.Value[0],item.AreaData.Value[1]);
+        var min=Math.min(item.AreaData.Value[0],item.AreaData.Value[1]);
+        if (min>=this.HorizontalMax) return;
+        if (max<=this.HorizontalMin) return;
+
+        if (max>this.HorizontalMax) max=this.HorizontalMax;
+        if (min<this.HorizontalMin) min=this.HorizontalMin;
+
+        var border=this.GetBorder();
+        var left=border.Left;
+        var right=border.Right;
+        var borderRight = this.ChartBorder.Right;
+        var borderLeft = this.ChartBorder.Left;
+
+        var yTop=this.GetYFromData(max);
+        var yBottom=this.GetYFromData(min);
+
+        if (item.AreaData.Position.includes(0) && borderLeft>10) //左
+        {
+            var rtBG={ Left:0, Right:left-1, Top:yTop, Bottom:yBottom };
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            this.Canvas.fillStyle=item.AreaData.BGColor;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            this.DrawCustomAreaText(rtBG, item, 0);
+        }
+
+        if (item.AreaData.Position.includes(1) && borderRight>10) //右
+        {
+            var rtBG={ Left:right+1, Top:yTop, Bottom:yBottom };
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (this.YRightTextInfo && IFrameSplitOperator.IsNumber(this.YRightTextInfo.MainTextWidth))   //右侧自动调整 可以获取宽度
+            {
+                rtBG.Width=this.YRightTextInfo.MainTextWidth-1;
+                rtBG.Right=rtBG.Left+rtBG.Width;
+            }
+            else
+            {
+                rtBG.Right=border.ChartWidth;
+                rtBG.Width=rtBG.Right-rtBG.Left;
+            }
+
+            this.Canvas.fillStyle=item.AreaData.BGColor;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            this.DrawCustomAreaText(rtBG, item, 1);
+        }
+    }
+
+    this.DrawCustomAreaText=function(rtBG, item, position) //position 0=左 1=右
+    {
+        if (item.Font != null) this.Canvas.font = item.Font;
+        var fontHeight=this.GetFontHeight();
+        if (rtBG.Height<fontHeight) return;
+
+        var pixelTatio = GetDevicePixelRatio();
+        var text, xText;
+        if (position==0)
+        {
+            if (!item.Message[0]) return;
+            this.Canvas.textAlign = "right";
+            text=item.Message[0];
+            xText=rtBG.Right-2*pixelTatio;
+        }
+        else if (position==1)
+        {
+            if (!item.Message[1]) return;
+            this.Canvas.textAlign = "left";
+            text=item.Message[1];
+            xText=rtBG.Left+2*pixelTatio
+        }
+
+        var yText=rtBG.Top+rtBG.Height/2;
+        this.Canvas.textBaseline = "middle";
+        this.Canvas.fillStyle = item.TextColor;
+        this.Canvas.fillText(text, xText, yText);
+    }
+
     this.SendDrawCountDownEvent=function(sendData)
     {
         if (!this.GetEventCallback) return false;
@@ -19598,6 +19675,9 @@ function KLineFrame()
                 case 4: //叠加K线涨幅刻度
                     this.DrawCustomItem(item, mapTextRect);  
                     break;
+                case 5:
+                    this.DrawCustomAreaItem(item);
+                    break;
             }
         }
     }
@@ -76706,7 +76786,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
                     { Name:"背景分割", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID, Args:[!bBGSpit]}, Checked:bBGSpit},
 
-                    { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
+                    { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
                 ]
@@ -131875,7 +131955,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13244";
+var HQCHART_VERSION="1.1.13250";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.13244";
+var HQCHART_VERSION="1.1.13250";
 
 function PrintHQChartVersion()
 {

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

@@ -13193,19 +13193,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.Draw();
                 break;
             case JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:
-                var StockChip=chart.GetExtendChartByClassName('StockChip');
+                var StockChip=this.GetExtendChartByClassName('StockChip');
                 if (StockChip)
                 {
                     var chipWidth=StockChip.Chart.Width;
-                    var chipIndex=parseInt(StockChip.Index);
-                    for(var i=chipIndex+1; i<this.ExtendChartPaint.length; ++i)   //在筹码后面创建的需要筹码的宽度
-                    {
-                        var item=this.ExtendChartPaint[i];
-                        if (item.ClassName=='DrawToolsButton')
-                        {
-                            item.Left-=chipWidth;
-                        }
-                    }
                     this.DeleteExtendChart(StockChip); 
                     this.Frame.ChartBorder.Right-=chipWidth;
                     this.SetSizeChange(true);
@@ -13577,6 +13568,7 @@ function CoordinateInfo()
     this.ExtendData;                                            //扩展属性
                                                                 //百分比 { PriceColor:, PercentageColor:, SplitColor:, Font: }
                                                                 //自定义刻度 { Custom:{ Position: 1=强制内部 }}
+    this.AreaData;  //区域: { Start:, End:, BGColor:, Position:[0=左, 1=右] }
 }
 
 
@@ -16091,6 +16083,91 @@ function AverageWidthFrame()
         }
     }
 
+    this.DrawCustomAreaItem=function(item)    //自定义Y轴区域
+    {
+        if (!item.AreaData) return;
+        if (this.IsHScreen) return; //暂时不支持横屏
+
+        //item.AreaData;  //区域: { Value[], BGColor:, Position:[0=左, 1=右] }
+        if (!IFrameSplitOperator.IsNonEmptyArray(item.AreaData.Value) || item.AreaData.Value.length!=2) return;
+
+        var max=Math.max(item.AreaData.Value[0],item.AreaData.Value[1]);
+        var min=Math.min(item.AreaData.Value[0],item.AreaData.Value[1]);
+        if (min>=this.HorizontalMax) return;
+        if (max<=this.HorizontalMin) return;
+
+        if (max>this.HorizontalMax) max=this.HorizontalMax;
+        if (min<this.HorizontalMin) min=this.HorizontalMin;
+
+        var border=this.GetBorder();
+        var left=border.Left;
+        var right=border.Right;
+        var borderRight = this.ChartBorder.Right;
+        var borderLeft = this.ChartBorder.Left;
+
+        var yTop=this.GetYFromData(max);
+        var yBottom=this.GetYFromData(min);
+
+        if (item.AreaData.Position.includes(0) && borderLeft>10) //左
+        {
+            var rtBG={ Left:0, Right:left-1, Top:yTop, Bottom:yBottom };
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            this.Canvas.fillStyle=item.AreaData.BGColor;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            this.DrawCustomAreaText(rtBG, item, 0);
+        }
+
+        if (item.AreaData.Position.includes(1) && borderRight>10) //右
+        {
+            var rtBG={ Left:right+1, Top:yTop, Bottom:yBottom };
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (this.YRightTextInfo && IFrameSplitOperator.IsNumber(this.YRightTextInfo.MainTextWidth))   //右侧自动调整 可以获取宽度
+            {
+                rtBG.Width=this.YRightTextInfo.MainTextWidth-1;
+                rtBG.Right=rtBG.Left+rtBG.Width;
+            }
+            else
+            {
+                rtBG.Right=border.ChartWidth;
+                rtBG.Width=rtBG.Right-rtBG.Left;
+            }
+
+            this.Canvas.fillStyle=item.AreaData.BGColor;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            this.DrawCustomAreaText(rtBG, item, 1);
+        }
+    }
+
+    this.DrawCustomAreaText=function(rtBG, item, position) //position 0=左 1=右
+    {
+        if (item.Font != null) this.Canvas.font = item.Font;
+        var fontHeight=this.GetFontHeight();
+        if (rtBG.Height<fontHeight) return;
+
+        var pixelTatio = GetDevicePixelRatio();
+        var text, xText;
+        if (position==0)
+        {
+            if (!item.Message[0]) return;
+            this.Canvas.textAlign = "right";
+            text=item.Message[0];
+            xText=rtBG.Right-2*pixelTatio;
+        }
+        else if (position==1)
+        {
+            if (!item.Message[1]) return;
+            this.Canvas.textAlign = "left";
+            text=item.Message[1];
+            xText=rtBG.Left+2*pixelTatio
+        }
+
+        var yText=rtBG.Top+rtBG.Height/2;
+        this.Canvas.textBaseline = "middle";
+        this.Canvas.fillStyle = item.TextColor;
+        this.Canvas.fillText(text, xText, yText);
+    }
+
     this.SendDrawCountDownEvent=function(sendData)
     {
         if (!this.GetEventCallback) return false;
@@ -19642,6 +19719,9 @@ function KLineFrame()
                 case 4: //叠加K线涨幅刻度
                     this.DrawCustomItem(item, mapTextRect);  
                     break;
+                case 5:
+                    this.DrawCustomAreaItem(item);
+                    break;
             }
         }
     }
@@ -76750,7 +76830,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
                     { Name:"背景分割", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID, Args:[!bBGSpit]}, Checked:bBGSpit},
 
-                    { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
+                    { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
                 ]
@@ -134423,6 +134503,8 @@ function JSPopMenu()
     {
         var trDom=document.createElement("tr");
         trDom.className='UMyChart_MenuItem_Tr';
+
+        if (item.Disable===true) trDom.classList.add('UMyChart_DrawTool_Disable_Tr');
         
         var prtTdDom=null;
         for(var i=0;i<this.AryTDClassName.length;++i)
@@ -134498,8 +134580,15 @@ function JSPopMenu()
         }
         else
         {
-            trDom.onmousedown=(e)=> { this.OnClickMenu(e, item, false); };   //菜单点击
-            trDom.onmouseover=(e)=>{ this.OnMouseOver(e, parentItem); }
+            if (item.Disable===true)
+            {
+                
+            }
+            else
+            {
+                trDom.onmousedown=(e)=> { this.OnClickMenu(e, item, false); };   //菜单点击
+                trDom.onmouseover=(e)=>{ this.OnMouseOver(e, parentItem); }
+            }
         }
 
         return trDom;
@@ -134633,6 +134722,8 @@ function JSPopMenu()
                 subMenu.style.left=`${x}px`;
                 subMenu.style.top=`${y}px`;
 
+
+
                 trDom.classList.add(this.SelectedClassName);
 
                 /*
@@ -135223,7 +135314,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13244";
+var HQCHART_VERSION="1.1.13250";
 
 function PrintHQChartVersion()
 {