hqchart 1.1.15449 → 1.1.15451

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15449",
+  "version": "1.1.15451",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.PopMinuteChart.js

@@ -778,26 +778,52 @@ function JSTooltipMinuteChart()
         }
         else if (data.Rect)
         {
-            var rtCell=data.Rect;
-            var pixelRatio=GetDevicePixelRatio();
-            var rtItem={ Left:rtCell.Left/pixelRatio, Right:rtCell.Right/pixelRatio, Bottom:rtCell.Bottom/pixelRatio, Top:rtCell.Top/pixelRatio };
-            rtItem.Width=rtItem.Right-rtItem.Left;
-            rtItem.Height=rtItem.Bottom-rtItem.Top;
-
-            //超出窗口调整位置
-            var height=this.DivDialog.offsetHeight;
-            var width=this.DivDialog.offsetWidth;
-            var x=rtItem.Right+data.Offset.Left;
-            var y=rtItem.Bottom+data.Offset.Top;
-
-            var xRight=window.innerWidth-5;
-            var ybottom=window.innerHeight-5;
-            if (x+width>xRight) x=(rtItem.Left+data.Offset.Left)-width;
-            if (y+height>ybottom) y=(rtItem.Top+data.Offset.Top)-height;
-
-            this.DivDialog.style.visibility='visible';
-            this.DivDialog.style.top = y + "px";
-            this.DivDialog.style.left = x + "px";
+            if (data.Position===1)  //上左位置
+            {
+                var rtCell=data.Rect;
+                var pixelRatio=GetDevicePixelRatio();
+                var rtItem={ Left:rtCell.Left/pixelRatio, Right:rtCell.Right/pixelRatio, Bottom:rtCell.Bottom/pixelRatio, Top:rtCell.Top/pixelRatio };
+                rtItem.Width=rtItem.Right-rtItem.Left;
+                rtItem.Height=rtItem.Bottom-rtItem.Top;
+
+                //超出窗口调整位置
+                var height=this.DivDialog.offsetHeight;
+                var width=this.DivDialog.offsetWidth;
+                var x=rtItem.Left+data.Offset.Left;
+                var y=rtItem.Top+data.Offset.Top;
+
+                var xRight=window.innerWidth-5;
+                var ybottom=window.innerHeight-5;
+                if (x+width>xRight) x=(rtItem.Left+data.Offset.Left)-width;
+                if (y+height>ybottom) y=(rtItem.Top+data.Offset.Top)-height;
+
+                this.DivDialog.style.visibility='visible';
+                this.DivDialog.style.top = y + "px";
+                this.DivDialog.style.left = x + "px";
+            }
+            else
+            {
+                var rtCell=data.Rect;
+                var pixelRatio=GetDevicePixelRatio();
+                var rtItem={ Left:rtCell.Left/pixelRatio, Right:rtCell.Right/pixelRatio, Bottom:rtCell.Bottom/pixelRatio, Top:rtCell.Top/pixelRatio };
+                rtItem.Width=rtItem.Right-rtItem.Left;
+                rtItem.Height=rtItem.Bottom-rtItem.Top;
+
+                //超出窗口调整位置
+                var height=this.DivDialog.offsetHeight;
+                var width=this.DivDialog.offsetWidth;
+                var x=rtItem.Right+data.Offset.Left;
+                var y=rtItem.Bottom+data.Offset.Top;
+
+                var xRight=window.innerWidth-5;
+                var ybottom=window.innerHeight-5;
+                if (x+width>xRight) x=(rtItem.Left+data.Offset.Left)-width;
+                if (y+height>ybottom) y=(rtItem.Top+data.Offset.Top)-height;
+
+                this.DivDialog.style.visibility='visible';
+                this.DivDialog.style.top = y + "px";
+                this.DivDialog.style.left = x + "px";
+            }
         }
     }
 

package/src/jscommon/umychart.StatusBar.js

@@ -73,6 +73,8 @@ function JSStatusBarChart(divElement)
 
         if (option.EnableResize==true) this.CreateResizeListener();
 
+        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+
         chart.Draw();
         chart.RequestData();
     }
@@ -222,6 +224,8 @@ function JSStatusBarChartContainer(uielement)
 
     this.ToolbarTimer=null;
 
+    this.TooltipMinuteChart;                    //分时图
+
     this.UIElement=uielement;
    
     this.IsDestroy=false;        //是否已经销毁了
@@ -236,6 +240,25 @@ function JSStatusBarChartContainer(uielement)
             clearInterval(this.ToolbarTimer);
             this.ToolbarTimer=null;
         }
+
+        this.DestroyMinuteChartTooltip();
+    }
+
+    this.InitalMinuteChartTooltip=function(option)
+    {
+        if (this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart=new JSTooltipMinuteChart();
+        this.TooltipMinuteChart.Inital(this, option);
+        this.TooltipMinuteChart.Create();
+    }
+
+    this.DestroyMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Destroy();
+        this.TooltipMinuteChart=null;
     }
 
     //设置事件回调
@@ -412,12 +435,14 @@ function JSStatusBarChartContainer(uielement)
         }
 
         this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
+        this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e); }
+        this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
 
         /*
         this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
         this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
-        this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
-        this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
+        
+       
         this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }
         this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
         */
@@ -440,6 +465,59 @@ function JSStatusBarChartContainer(uielement)
         this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STATUSBAR_ITEM, ptClick, e);
     }
 
+    this.GetChartTooltipData=function(x,y,option)
+    {
+        var toolTip=new TooltipData();
+        for(var i=0;i<this.ChartPaint.length;++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item.GetTooltipData(x,y,toolTip))
+            {
+               return toolTip;
+            }
+        }
+
+        return null;
+    }
+
+    this.UIOnMouseMove=function(e)
+    {
+        var pixelTatio = GetDevicePixelRatio();
+        var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+        var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+
+        //var bShowKLineTooltip=false;
+        var bShowMinuteTooltip=false;
+        var chartTooltipData=null;
+        var tooltipData=this.GetChartTooltipData(x,y);
+
+        if (tooltipData)
+        {
+            if (tooltipData.Type==121)
+            {
+                var item=tooltipData.Data;
+                if (item && item.Data && item.Data.Symbol)
+                {
+                    bShowMinuteTooltip=true;
+                    chartTooltipData={ Symbol:item.Data.Symbol, Rect:item.Rect, Position:1 };
+                }
+            }
+        }
+
+        //if (!bShowKLineTooltip) this.HideKLineChartTooltip();
+        if (!bShowMinuteTooltip) this.HideMinuteChartTooltip();
+
+        if (bShowMinuteTooltip) this.ShowMinuteChartTooltip(null, null, chartTooltipData);
+        //if (bShowKLineTooltip) this.ShowKLineChartTooltip(null, null, chartTooltipData);
+    }
+
+    this.UIOnMounseOut=function(e)
+    {
+        this.HideAllTooltip();
+    }
+
+
+
     this.TryClickPaintEvent=function(eventID, ptClick, e)
     {
         var event=this.GetEventCallback(eventID);
@@ -521,6 +599,8 @@ function JSStatusBarChartContainer(uielement)
             this.SetSizeChange(true);
             this.Draw();
         }
+
+        if (this.TooltipMinuteChart) this.TooltipMinuteChart.ReloadResource(option);    //分时图
     }
 
     this.SetColumn=function(aryColunm, option)
@@ -552,6 +632,36 @@ function JSStatusBarChartContainer(uielement)
 
         return chart;
     }
+
+    //data={ Symbol }
+    this.ShowMinuteChartTooltip=function(x,y, data)
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+
+        data.Offset={ Left:offsetLeft, Top:offsetTop };
+
+        this.TooltipMinuteChart.Show(data, x,y);
+    }
+
+    this.HideMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Hide();
+    }
+
+    this.HideAllTooltip=function()
+    {
+        //this.HideKLineChartTooltip();
+        this.HideMinuteChartTooltip();
+    }
+
 }
 
 function JSStatusBarFrame()
@@ -796,6 +906,7 @@ function ChartStatusBarStockData()
             if (!item || !item.Symbol) continue;
             
             var rtCell={ Left:itemPos.Left, Top:itemPos.Top, Bottom:itemPos.Bottom, Right:itemPos.Left };
+            if (i>0) rtCell.Left-=config.Separator.Right;
             this.DrawCellItem(item, itemPos );
             if (itemPos.CellCount>0)
             {
@@ -1055,7 +1166,7 @@ function ChartStatusBarStockData()
             {
                 tooltip.Data=item;
                 tooltip.ChartPaint=this;
-                tooltip.Type=21;
+                tooltip.Type=121;
                 return true;
             }
         }
@@ -1067,7 +1178,7 @@ function ChartStatusBarStockData()
             {
                 tooltip.Data=item;
                 tooltip.ChartPaint=this;
-                tooltip.Type=22;
+                tooltip.Type=122;
                 return true;
             }
         }
@@ -1075,3 +1186,9 @@ function ChartStatusBarStockData()
         return false;
     }
 }
+
+
+
+
+
+

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

@@ -156514,7 +156514,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15448";
+var HQCHART_VERSION="1.1.15450";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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