hqchart 1.1.15451 → 1.1.15455

package/package.json

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

package/src/jscommon/umychart.StatusBar.js

@@ -437,6 +437,7 @@ 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.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
 
         /*
         this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
@@ -444,7 +445,7 @@ function JSStatusBarChartContainer(uielement)
         
        
         this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }
-        this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
+        
         */
 
         var frequency=500;
@@ -461,8 +462,21 @@ function JSStatusBarChartContainer(uielement)
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
 
-        var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
-        this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STATUSBAR_ITEM, ptClick, e);
+        if (e && e.button==0)   //左键点击
+        {
+            var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
+            this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STATUSBAR_ITEM, ptClick, e);
+        }
+    }
+
+    this.UIOnContextMenu=function(e)
+    {
+        if (e)  //去掉系统右键菜单
+        {
+            if (e.preventDefault) e.preventDefault();
+            if (e.stopPropagation) e.stopPropagation();
+            e.returnValue=false;
+        } 
     }
 
     this.GetChartTooltipData=function(x,y,option)

package/src/jscommon/umychart.StockInfo.js

@@ -111,6 +111,8 @@ function JSStockInfoChart(divElement)
 
         if (IFrameSplitOperator.IsNonEmptyArray(option.Column))  chart.SetColumn(option.Column);
         if (IFrameSplitOperator.IsNonEmptyArray(option.HeaderColumn))  chart.SetHeaderColumn(option.HeaderColumn);
+        if (IFrameSplitOperator.IsNonEmptyArray(option.MouseOnKey)) chart.SetMouseOnKey(option.MouseOnKey);
+
         //是否自动更新
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
@@ -339,6 +341,7 @@ function JSStockInfoChartContainer(uielement)
         {
             if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
             if (IFrameSplitOperator.IsNumber(option.BuySellCount)) this.SetBuySellCount(option.BuySellCount);
+            if (IFrameSplitOperator.IsNonEmptyArray(option.MouseOnKey)) this.SetMouseOnKey(option.MouseOnKey);
         }
 
         this.Draw();
@@ -486,17 +489,95 @@ function JSStockInfoChartContainer(uielement)
         }
 
        
-
-        /*
-        this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
+        this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(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); }
+        /*
+        this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
+        
         */
     }
 
+    this.UIOnMouseDown=function(e)
+    {
+        var pixelTatio = GetDevicePixelRatio();
+        this.ClickDownPoint={ X:e.clientX, Y:e.clientY };
+        var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+        var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+    }
+
+    this.UIOnContextMenu=function(e)
+    {
+        if (e)  //去掉系统右键菜单
+        {
+            if (e.preventDefault) e.preventDefault();
+            if (e.stopPropagation) e.stopPropagation();
+            e.returnValue=false;
+        } 
+    }
+
+    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 option={ Update:false };
+
+        this.OnChartMouseMove(x,y,e,option);
+
+        if (option.Update===true) this.Draw();
+    }
+
+    this.OnChartMouseMove=function(x, y, e, option)
+    {
+        for(var i=0;i<this.ChartPaint.length;++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item && item.OnMouseMove)
+            {
+                if (item.OnMouseMove(x,y,e,option)) return true;
+            }
+        }
+
+        return false;
+    }
+
+    this.UIOnMouseleave=function(e)
+    {
+        var option={ Update:false }
+        
+        this.ChartClearMouseOnData(option);
+
+        if (option.Update===true) this.Draw();
+    }
+
+    this.UIOnMounseOut=function(e)
+    {
+        var option={ Update:false }
+
+        this.ChartClearMouseOnData(option);
+
+        if (option.Update===true) this.Draw();
+
+        //this.HideAllTooltip();
+    }
+
+    this.ChartClearMouseOnData=function(option)
+    {
+        for(var i=0;i<this.ChartPaint.length;++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item && item.ClearMouseOnData)
+            {
+                item.ClearMouseOnData(option);
+            }
+        }
+    }
+
+
     this.Draw=function()
     {
         if (this.UIElement.width<=0 || this.UIElement.height<=0) return; 
@@ -582,6 +663,14 @@ function JSStockInfoChartContainer(uielement)
 
         if (option && option.Redraw) this.Draw();
     }
+
+    this.SetMouseOnKey=function(aryKey)
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart)  return;
+
+        chart.SetMouseOnKey(aryKey);
+    }
 }
 
 function JSStockInfoFrame()
@@ -713,7 +802,15 @@ function ChartStockData()
         [{ Name:"内盘", Key:"InVol", ColorType:4, FloatPrecision:0 }, { Name:"外盘",  Key:"OutVol",ColorType:5, FloatPrecision:0 }],
         [{ Name:"TTM", Key:"PE_TTM",  FloatPrecision:2 }, { Name:"市净率",  Key:"PB", FloatPrecision:2 }],
         [{ Name:"流通市值", Key:"FlowMarketValue",  FloatPrecision:0, Format:{ Type:3, ExFloatPrecision:2 } }, { Name:"总市值",  Key:"TotalMarketValue", FloatPrecision:0, Format:{ Type:3, ExFloatPrecision:2 } }],
-    ]
+    ];
+
+    this.AryCellRect=[];
+    this.MouseOnItem=null; //{ Key:, Rect: }
+    //this.MouseOnItem={ Key:"SELL_PRICE_0" };
+    this.MouseOnConfig=CloneData(g_JSChartResource.StockInfo.MouseOn); 
+
+    this.MapMouseOnKey=new Map();
+    
     
     this.ReloadResource=function(resource)
     {
@@ -727,6 +824,17 @@ function ChartStockData()
         this.BuySellConfig=CloneData(g_JSChartResource.StockInfo.BuySell);
 
         this.TableConfig=CloneData(g_JSChartResource.StockInfo.Table);
+
+        this.MouseOnConfig=CloneData(g_JSChartResource.StockInfo.MouseOn); 
+    }
+
+    this.ClearMouseOnData=function(option)
+    {
+        if (!this.MouseOnItem)
+        {
+            this.MouseOnItem=null;
+            if (option) option.Update=true; //需要更新
+        }
     }
 
     this.SetColumn=function(aryColumn)
@@ -755,8 +863,55 @@ function ChartStockData()
         }
     }
 
+    this.SetMouseOnKey=function(aryKey)
+    {
+        this.MapMouseOnKey.clear();
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryKey)) return;
+
+        for(var i=0;i<aryKey.length;++i)
+        {
+            var key=aryKey[i];
+            if (!key) continue;
+
+            this.MapMouseOnKey.set(key, { Key:key });
+        }
+        
+    }
+
+    this.OnMouseMove=function(x, y, e, option)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect)) return false;
+
+        if (this.MouseOnItem && this.MouseOnItem.Rect)
+        {
+            var rect=this.MouseOnItem.Rect;
+            if (Path2DHelper.PtInRect(x,y,rect )) return true;
+        }
+
+        for(var i=0;i<this.AryCellRect.length;++i)
+        {
+            var item=this.AryCellRect[i];
+            var rect=item.Rect;
+            if (Path2DHelper.PtInRect(x,y, rect))
+            {
+                this.MouseOnItem={ Key:item.Data.Key, Rect:rect };
+                if (option) option.Update=true;
+                return true;
+            }
+        }
+
+        if (this.MouseOnItem)
+        {
+            this.MouseOnItem=null;
+            if (option) option.Update=true;
+        }
+
+        return false;
+    }
+
     this.Draw=function()
     {
+        this.AryCellRect=[];
         this.Decimal=GetfloatPrecision(this.Data.Symbol);
         var border=this.ChartBorder.GetBorder();
         var position = { Left:border.Left, Right:border.Right, Top:border.Top, Width:border.Right-border.Left, Border:border };
@@ -874,11 +1029,13 @@ function ChartStockData()
         {
             var xLeft=position.Border.Left, xRight=position.Border.Right;
             this.Canvas.strokeStyle=config.BottomLine.Color;
-            this.Canvas.lineWidth=1*GetDevicePixelRatio();
+            var lineWidth=1*GetDevicePixelRatio();;
+            this.Canvas.lineWidth=lineWidth;
             this.Canvas.beginPath();
             this.Canvas.moveTo(xLeft,ToFixedPoint(yText));
             this.Canvas.lineTo(xRight,ToFixedPoint(yText));
             this.Canvas.stroke();
+            position.Top=ToFixedPoint(yText);
         }
     }
 
@@ -905,7 +1062,7 @@ function ChartStockData()
         {
             xText=left;
             var item=this.Data.Sells[i];
-            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight);
+            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:1, Index:i});
             if (IFrameSplitOperator.IsNumber(item.Vol)) sellVol+=item.Vol;
             yText+=cellHeight;
         }
@@ -924,7 +1081,7 @@ function ChartStockData()
         {
             xText=left;
             var item=this.Data.Buys[i];
-            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight);
+            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:2, Index:i});
             if (IFrameSplitOperator.IsNumber(item.Vol)) buyVol+=item.Vol;
             yText+=cellHeight;
         }
@@ -989,7 +1146,8 @@ function ChartStockData()
         }
     }
 
-    this.DrawBuySellItem=function(item, left, top, cellWidth, cellHeight)
+    //itemInfo={ Type:2(1=买 2=卖), Index:数据索引 }
+    this.DrawBuySellItem=function(item, left, top, cellWidth, cellHeight, itemInfo)
     {
         var config=this.BuySellConfig;
         var xText=left;
@@ -1004,11 +1162,22 @@ function ChartStockData()
 
         if (IFrameSplitOperator.IsNumber(item.Price))
         {
+            var key=`${itemInfo.Type==1?"BUY":"SELL"}_PRICE_${itemInfo.Index}`;
+            var mouseOnItem=this.IsMouseOn(key);
+
             var text=item.Price.toFixed(this.Decimal);
             var textWidth=this.Canvas.measureText(text).width;
             var x=xText+cellWidth-textWidth-config.CellMargin.Right;
+            var rtCell={ Left:xText, Width:cellWidth, Top:top, Height:cellHeight };
+            rtCell.Right=rtCell.Left+rtCell.Width;
+            rtCell.Bottom=rtCell.Top+rtCell.Height;
+            if (mouseOnItem) this.DrawMouseOnRect(rtCell);
+
             this.Canvas.fillStyle=this.GetPriceColor(item.Price);
             this.Canvas.fillText(text,x,yBottom);
+            
+            if (this.MapMouseOnKey.has(key))
+                this.AryCellRect.push({ Rect:rtCell, Data:{ Type:1, Key:key, Value:item.Price }});
         }
         xText+=cellWidth;
 
@@ -1024,6 +1193,25 @@ function ChartStockData()
         }
     }
 
+    this.IsMouseOn=function(key)
+    {
+        if (!this.MouseOnItem) return null;
+
+        if (this.MouseOnItem.Key===key) return this.MouseOnItem;
+
+        return null;
+    }
+
+    this.DrawMouseOnRect=function(rect)
+    {
+        if (!this.MouseOnItem) return;
+
+        this.Canvas.fillStyle=this.MouseOnConfig.BGColor;
+        this.Canvas.fillRect(rect.Left, rect.Top, rect.Width, rect.Height);
+
+        this.MouseOnItem.Rect=rect;
+    }
+
 
     this.DrawTable=function(position)
     {
@@ -1093,18 +1281,36 @@ function ChartStockData()
                     {
                         if (i==0 && item.ShowType==1)   //整行显示
                         {
+                            var mouseOnItem=this.IsMouseOn(item.Key);
                             var textWidth=this.Canvas.measureText(text).width;
                             var x=xText+(cellWidth*3)-textWidth-config.CellMargin.Right;
+                            var rtCell={ Left:xText+cellWidth, Top:top, Width:cellWidth*2, Height:cellHeight};
+                            rtCell.Right=rtCell.Left+rtCell.Width;
+                            rtCell.Bottom=rtCell.Top+rtCell.Height;
+                            if (mouseOnItem) this.DrawMouseOnRect(rtCell);
+
                             this.Canvas.fillStyle=color;
                             this.Canvas.fillText(text,x,yBottom);
+
+                            if (this.MapMouseOnKey.has(item.Key))
+                                this.AryCellRect.push({ Rect:rtCell, Data:{ Type:2, Key:item.Key, Value:dataItem }});
                             break;
                         }
                         else
                         {
+                            var mouseOnItem=this.IsMouseOn(item.Key);
                             var textWidth=this.Canvas.measureText(text).width;
                             var x=xText+cellWidth-textWidth-config.CellMargin.Right;
+                            var rtCell={ Left:xText, Top:top, Width:cellWidth, Height:cellHeight};
+                            rtCell.Right=rtCell.Left+rtCell.Width;
+                            rtCell.Bottom=rtCell.Top+rtCell.Height;
+                            if (mouseOnItem) this.DrawMouseOnRect(rtCell);
+
                             this.Canvas.fillStyle=color;
                             this.Canvas.fillText(text,x,yBottom);
+
+                            if (this.MapMouseOnKey.has(item.Key))
+                                this.AryCellRect.push({ Rect:rtCell, Data:{ Type:2, Key:item.Key, Value:dataItem }});
                         }
                         
                     }

package/src/jscommon/umychart.js

@@ -56826,6 +56826,8 @@ function FrameSplitKLinePriceY()
                 isLast=pageInfo.IsLast;
             }
         }
+
+        if (!latestItem || !IFrameSplitOperator.IsNumber(latestItem.Close)) return null;
         
         var info=new CoordinateInfo();
         info.Type=0;
@@ -79928,7 +79930,7 @@ function JSChartResource()
             TitleColor:"rgb(90,90,90)",
             VolColor:"rgb(90,90,90)",
             Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
-            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+            CellMargin:{ Top:3*GetDevicePixelRatio(), Bottom:3*GetDevicePixelRatio(), Left:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), YOffset:1*GetDevicePixelRatio() },
             BottomLine:{ Enable:true, Color:"rgb(192,192,192)"},    //底部分割线
             TopLine:{ Enable:false, Color:"rgb(192,192,192)"},    //底部分割线
 
@@ -79944,10 +79946,12 @@ function JSChartResource()
             Font:14*GetDevicePixelRatio() +'px 微软雅黑',
             TitleColor:"rgb(90,90,90)",
             TextColor:"rgb(90,90,90)",
-            Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
-            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+            Margin:{ Left:0, Top:2*GetDevicePixelRatio(), Bottom:0, Right:0 },
+            CellMargin:{ Top:3*GetDevicePixelRatio(), Bottom:3*GetDevicePixelRatio(), Left:5, Right:5, YOffset:1*GetDevicePixelRatio() },
         },
 
+        MouseOn:{ BGColor:"rgb(169,169,169)" },
+
         UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
         DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
         UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
@@ -81150,6 +81154,12 @@ function JSChartResource()
             }
         }
 
+        if (style.MouseOn)
+        {
+            var item=style.MouseOn;
+            if (item.BGColor) dest.MouseOn.BGColor=item.BGColor;
+        }
+
         if (style.UpTextColor) dest.UpTextColor=style.UpTextColor;
         if (style.DownTextColor) dest.DownTextColor=style.DownTextColor;
         if (style.UnchangeTextColor) dest.UnchangeTextColor=style.UnchangeTextColor;

package/src/jscommon/umychart.style.js

@@ -1062,6 +1062,8 @@ function GetBlackStyle()
                 //CellMargin:{ Top:5, Bottom:5, YOffset:0, Left:5, Right:5, YOffset:-5 },
             },
 
+            MouseOn:{ BGColor:"rgb(54,54,54)" },
+
             UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
             DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
             UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 

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

@@ -60922,6 +60922,8 @@ function FrameSplitKLinePriceY()
                 isLast=pageInfo.IsLast;
             }
         }
+
+        if (!latestItem || !IFrameSplitOperator.IsNumber(latestItem.Close)) return null;
         
         var info=new CoordinateInfo();
         info.Type=0;
@@ -84024,7 +84026,7 @@ function JSChartResource()
             TitleColor:"rgb(90,90,90)",
             VolColor:"rgb(90,90,90)",
             Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
-            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+            CellMargin:{ Top:3*GetDevicePixelRatio(), Bottom:3*GetDevicePixelRatio(), Left:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), YOffset:1*GetDevicePixelRatio() },
             BottomLine:{ Enable:true, Color:"rgb(192,192,192)"},    //底部分割线
             TopLine:{ Enable:false, Color:"rgb(192,192,192)"},    //底部分割线
 
@@ -84040,10 +84042,12 @@ function JSChartResource()
             Font:14*GetDevicePixelRatio() +'px 微软雅黑',
             TitleColor:"rgb(90,90,90)",
             TextColor:"rgb(90,90,90)",
-            Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
-            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+            Margin:{ Left:0, Top:2*GetDevicePixelRatio(), Bottom:0, Right:0 },
+            CellMargin:{ Top:3*GetDevicePixelRatio(), Bottom:3*GetDevicePixelRatio(), Left:5, Right:5, YOffset:1*GetDevicePixelRatio() },
         },
 
+        MouseOn:{ BGColor:"rgb(169,169,169)" },
+
         UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
         DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
         UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
@@ -85246,6 +85250,12 @@ function JSChartResource()
             }
         }
 
+        if (style.MouseOn)
+        {
+            var item=style.MouseOn;
+            if (item.BGColor) dest.MouseOn.BGColor=item.BGColor;
+        }
+
         if (style.UpTextColor) dest.UpTextColor=style.UpTextColor;
         if (style.DownTextColor) dest.DownTextColor=style.DownTextColor;
         if (style.UnchangeTextColor) dest.UnchangeTextColor=style.UnchangeTextColor;
@@ -140070,6 +140080,8 @@ function GetBlackStyle()
                 //CellMargin:{ Top:5, Bottom:5, YOffset:0, Left:5, Right:5, YOffset:-5 },
             },
 
+            MouseOn:{ BGColor:"rgb(54,54,54)" },
+
             UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
             DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
             UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
@@ -156514,7 +156526,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15450";
+var HQCHART_VERSION="1.1.15454";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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