hqchart 1.1.14501 → 1.1.14506

package/package.json

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

package/src/jscommon/umychart.js

@@ -4246,6 +4246,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+        else if (drag.Click && drag.Click.IsInFrameBottom)
+        {
+            this.OnDragXCoordinateZoom(drag, {X:moveSetp, Y:moveSetpY}, e);
+        }
         else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect)  //左右键区间选择
         {
             var yMoveSetp=Math.abs(drag.LastMove.Y-e.clientY);
@@ -4267,6 +4271,38 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    this.OnDragXCoordinateZoom=function(drag, moveData, e)
+    {
+        var moveSetp=moveData.X;
+        var moveSetpY=moveData.Y;
+        if (moveSetp<5) return;
+        
+        var isLeft=true;
+        if (drag.LastMove.X<e.clientX) isLeft=false;//右移数据
+
+        var cursorStatus="ew-resize";
+
+        var oneStepWidth=this.GetMoveOneStepWidth();
+        if (moveSetp<oneStepWidth)
+        {
+            this.SetCursor({Cursor:cursorStatus});
+            return;
+        }
+
+        if (this.XCoordinateZoom(moveSetp,isLeft))
+        {
+            this.UpdataDataoffset();
+            this.UpdateFrameMaxMin();
+            this.ResetFrameXYSplit();
+
+            this.Draw();
+            this.OnKLinePageChange("datamove");
+        }
+
+        drag.LastMove.X=e.clientX;
+        this.SetCursor({Cursor:cursorStatus});
+    }
+
     this.OnDragMode_One=function(moveData, e)
     {
         var moveSetp=moveData.X;
@@ -4327,7 +4363,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (drag.LastMove.X<e.clientX) isLeft=false;//右移数据
 
                 var cursorStatus="pointer";
-                if (drag.Click.IsInFrameBottom)  cursorStatus="ew-resize";
                 var oneStepWidth=this.GetMoveOneStepWidth();
                 if (moveSetp<oneStepWidth)
                 {
@@ -4338,18 +4373,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 else
                 {
-                    if (drag.Click && drag.Click.IsInFrameBottom)
-                    {
-                       
-                        if (this.XCoordinateZoom(moveSetp,isLeft))
-                        {
-                            this.UpdataDataoffset();
-                            this.UpdateFrameMaxMin();
-                            this.ResetFrameXYSplit();
-                            bNeedDraw=true;
-                        }
-                    }
-                    else if(this.DataMove(moveSetp,isLeft))
+                    if(this.DataMove(moveSetp,isLeft))
                     {
                         this.UpdataDataoffset();
                         //this.UpdatePointByCursorIndex(); //推拽数据的时候不需要把鼠标位置更新到K线上
@@ -4474,9 +4498,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (IsMinuteChart)
         {
-            if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);
+            if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);  //分时图区间选择
         }
-        else if (bLButtonSelectRect || bRButtonSelectRect)  //区间选择
+        else if (bLButtonSelectRect || bRButtonSelectRect)  //K线图区间选择
         {
             var drag=this.MouseDrag;
             drag.LastMove.X=e.clientX;
@@ -4491,49 +4515,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;
             selectData.JSChartContainer=this;
             selectData.Stock={Symbol:this.Symbol, Name:this.Name};
+            selectData.IsLButton=bLButtonSelectRect;
+            selectData.IsRButton=bRButtonSelectRect;
 
             if (!this.BorderDrag && this.GetSelectRectData(selectData))
             {
-                var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
-                var paint=this.GetRectSelectPaint();
-                var isShowMenu=true;
-                if (event && event.Callback)
-                {
-                    var data=
-                    { 
-                        X:drag.LastMove.X-uielement.getBoundingClientRect().left,
-                        Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
-                        SelectData:selectData,    //区间选择的数据
-                        RectSelectPaint:paint,    //区间选择背景
-                        IsShowMenu:true,
-                        e,e
-                    };
-                    event.Callback(event,data,this);
-                    isShowMenu=data.IsShowMenu;
-                }
-
-                if (IsMinuteChart)  //分时图直接显示显示区间选择
-                {
-                    this.HideSelectRect();
-                    this.UpdateSelectRect(selectData.Start,selectData.End);
-                }
-                else
-                {
-                    if (isShowMenu)
-                    {
-                        var data=
-                        { 
-                            Chart:this,
-                            X:drag.LastMove.X-uielement.getBoundingClientRect().left,
-                            Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
-                            SelectData:selectData,          //区间选择的数据
-                            RectSelectPaint:paint           //区间选择背景
-                        };
-
-                        e.data=data;
-                        this.PopupSelectRectMenuV2(data, e);
-                    }
-                }
+                this.FinishSelectRect(selectData, e);
             }
             else
             {
@@ -4573,6 +4560,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.ClearDocContextMenuTimer(5000);
     }
 
+    //区间选择完成
+    this.FinishSelectRect=function(selectData, e)
+    {
+        var bMinuteChart=this.IsMinuteContainer();
+        var drag=this.MouseDrag;
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
+        var paint=this.GetRectSelectPaint();
+
+        var x=drag.LastMove.X-uielement.getBoundingClientRect().left;
+        var y=drag.LastMove.Y-uielement.getBoundingClientRect().top;
+
+        if (e)  //往事件里面 写如我们的数据
+        {
+            var data=
+            { 
+                Chart:this, X:x,Y:y,
+                SelectData:selectData,          //区间选择的数据
+                RectSelectPaint:paint,           //区间选择背景
+                IsLButton:selectData.IsLButton, IsRButton:selectData.IsRButton,
+            };
+
+            e.data=data;
+        }
+
+        var aryMenu=null, command=null;
+        if (bMinuteChart)   //分时图 默认区间统计
+        {
+            command={ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,selectData] };
+        }
+        else    //K线默认 区间选择K线
+        {
+            aryMenu=
+            [
+                { Name:"区间统计", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,selectData] }},
+                { Name:"区间放大", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID, Args:[selectData] }}
+            ];
+        }
+        
+        if (event && event.Callback)
+        
+            var sendData=
+            { 
+                X:x, Y:y, e:e,
+                SelectData:selectData,    //区间选择的数据
+                RectSelectPaint:paint,    //区间选择背景
+                AryMenu:aryMenu,          //菜单  填null 不就会弹菜单
+                Command:command,          //执行命令
+                IsLButton:selectData.IsLButton, IsRButton:selectData.IsRButton,
+                PreventDefault:false,
+            };
+            if (bMinuteChart) sendData.Command=null;    //分时图 调用事件 不做任何事
+            
+            event.Callback(event,sendData,this);
+
+            if (sendData.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+
+            aryMenu=sendData.AryMenu;
+            command=sendData.Command;
+        
+
+        if (aryMenu)    //弹菜单
+        {
+            this.PopupSelectRectMenuV3(aryMenu, data, e);
+            return;
+        }
+
+        if (command)    //执行命令
+        {
+            this.ExecuteMenuCommand(command.ID, command.Args);
+            return;
+        }
+
+        this.HideSelectRect();
+        this.UpdateSelectRect(selectData.Start,selectData.End);
+    }
+
+    this.PopupSelectRectMenuV3=function(aryMenu, data, e)
+    {
+        if (!aryMenu) return;
+
+        var menuData={ Menu:aryMenu, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+        var x=data.X, y=data.Y;
+        this.PopupMenuByRClick(menuData, x, y);
+    }
+
     this.DocContextMenu=function(e)
     {
         e.preventDefault();
@@ -25013,12 +25086,12 @@ function IChartPainting()
             if (valueType==1)   //K线收盘价
             {
                 var kItem=this.Data.Data[i];
-                if (IFrameSplitOperator.IsNumber(kItem.Close)) value=kItem.Close
+                if (kItem && IFrameSplitOperator.IsNumber(kItem.Close)) value=kItem.Close
             }
             else if (valueType==2)
             {
                 var kItem=this.Data.Data[i];
-                if (IFrameSplitOperator.IsNumber(kItem.Vol)) value=kItem.Vol
+                if (kItem && IFrameSplitOperator.IsNumber(kItem.Vol)) value=kItem.Vol
             }
             else if (valueType==3)
             {
@@ -76642,8 +76715,21 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         x+=(rtClient.left+rtScroll.Left);
         y+=(rtClient.top+rtScroll.Top);
 
-        var date=data.Tooltip.Data.Date;
-        var symbol=data.Chart.Symbol;
+        var item=data.Tooltip.Data;
+        var date=item.Date;
+        var symbol=null;
+
+        if (data.Tooltip.ChartPaint && data.Tooltip.ChartPaint.Name=="DRAWKLINE")
+        {
+            if (item.Symbol) symbol=item.Symbol;
+            else if (data.Tooltip.Symbol) symbol=data.Tooltip.Symbol;
+        }
+        else
+        {
+            symbol=data.Chart.Symbol;
+        }
+
+        if (!symbol) return;
 
         this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x/pixelRatio,y/pixelRatio);
     }
@@ -84208,6 +84294,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
         else if ((bRButtonSelectRect || bLButtonSelectRect) && !this.BorderDrag && this.GetSelectRectData(selectData))
         {
+            this.FinishSelectRect(selectData, e);
+
+            /*
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
             var paint=this.GetRectSelectPaint();
             var isShowDialog=true;  //是否显示内置区间选择框
@@ -84245,6 +84334,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.HideSelectRect();
                 this.UpdateSelectRect(selectData.Start,selectData.End);
             }
+            */
         }
         else
         {

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

@@ -8171,6 +8171,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+        else if (drag.Click && drag.Click.IsInFrameBottom)
+        {
+            this.OnDragXCoordinateZoom(drag, {X:moveSetp, Y:moveSetpY}, e);
+        }
         else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect)  //左右键区间选择
         {
             var yMoveSetp=Math.abs(drag.LastMove.Y-e.clientY);
@@ -8192,6 +8196,38 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    this.OnDragXCoordinateZoom=function(drag, moveData, e)
+    {
+        var moveSetp=moveData.X;
+        var moveSetpY=moveData.Y;
+        if (moveSetp<5) return;
+        
+        var isLeft=true;
+        if (drag.LastMove.X<e.clientX) isLeft=false;//右移数据
+
+        var cursorStatus="ew-resize";
+
+        var oneStepWidth=this.GetMoveOneStepWidth();
+        if (moveSetp<oneStepWidth)
+        {
+            this.SetCursor({Cursor:cursorStatus});
+            return;
+        }
+
+        if (this.XCoordinateZoom(moveSetp,isLeft))
+        {
+            this.UpdataDataoffset();
+            this.UpdateFrameMaxMin();
+            this.ResetFrameXYSplit();
+
+            this.Draw();
+            this.OnKLinePageChange("datamove");
+        }
+
+        drag.LastMove.X=e.clientX;
+        this.SetCursor({Cursor:cursorStatus});
+    }
+
     this.OnDragMode_One=function(moveData, e)
     {
         var moveSetp=moveData.X;
@@ -8252,7 +8288,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (drag.LastMove.X<e.clientX) isLeft=false;//右移数据
 
                 var cursorStatus="pointer";
-                if (drag.Click.IsInFrameBottom)  cursorStatus="ew-resize";
                 var oneStepWidth=this.GetMoveOneStepWidth();
                 if (moveSetp<oneStepWidth)
                 {
@@ -8263,18 +8298,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 else
                 {
-                    if (drag.Click && drag.Click.IsInFrameBottom)
-                    {
-                       
-                        if (this.XCoordinateZoom(moveSetp,isLeft))
-                        {
-                            this.UpdataDataoffset();
-                            this.UpdateFrameMaxMin();
-                            this.ResetFrameXYSplit();
-                            bNeedDraw=true;
-                        }
-                    }
-                    else if(this.DataMove(moveSetp,isLeft))
+                    if(this.DataMove(moveSetp,isLeft))
                     {
                         this.UpdataDataoffset();
                         //this.UpdatePointByCursorIndex(); //推拽数据的时候不需要把鼠标位置更新到K线上
@@ -8399,9 +8423,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (IsMinuteChart)
         {
-            if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);
+            if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);  //分时图区间选择
         }
-        else if (bLButtonSelectRect || bRButtonSelectRect)  //区间选择
+        else if (bLButtonSelectRect || bRButtonSelectRect)  //K线图区间选择
         {
             var drag=this.MouseDrag;
             drag.LastMove.X=e.clientX;
@@ -8416,49 +8440,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;
             selectData.JSChartContainer=this;
             selectData.Stock={Symbol:this.Symbol, Name:this.Name};
+            selectData.IsLButton=bLButtonSelectRect;
+            selectData.IsRButton=bRButtonSelectRect;
 
             if (!this.BorderDrag && this.GetSelectRectData(selectData))
             {
-                var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
-                var paint=this.GetRectSelectPaint();
-                var isShowMenu=true;
-                if (event && event.Callback)
-                {
-                    var data=
-                    { 
-                        X:drag.LastMove.X-uielement.getBoundingClientRect().left,
-                        Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
-                        SelectData:selectData,    //区间选择的数据
-                        RectSelectPaint:paint,    //区间选择背景
-                        IsShowMenu:true,
-                        e,e
-                    };
-                    event.Callback(event,data,this);
-                    isShowMenu=data.IsShowMenu;
-                }
-
-                if (IsMinuteChart)  //分时图直接显示显示区间选择
-                {
-                    this.HideSelectRect();
-                    this.UpdateSelectRect(selectData.Start,selectData.End);
-                }
-                else
-                {
-                    if (isShowMenu)
-                    {
-                        var data=
-                        { 
-                            Chart:this,
-                            X:drag.LastMove.X-uielement.getBoundingClientRect().left,
-                            Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
-                            SelectData:selectData,          //区间选择的数据
-                            RectSelectPaint:paint           //区间选择背景
-                        };
-
-                        e.data=data;
-                        this.PopupSelectRectMenuV2(data, e);
-                    }
-                }
+                this.FinishSelectRect(selectData, e);
             }
             else
             {
@@ -8498,6 +8485,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.ClearDocContextMenuTimer(5000);
     }
 
+    //区间选择完成
+    this.FinishSelectRect=function(selectData, e)
+    {
+        var bMinuteChart=this.IsMinuteContainer();
+        var drag=this.MouseDrag;
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
+        var paint=this.GetRectSelectPaint();
+
+        var x=drag.LastMove.X-uielement.getBoundingClientRect().left;
+        var y=drag.LastMove.Y-uielement.getBoundingClientRect().top;
+
+        if (e)  //往事件里面 写如我们的数据
+        {
+            var data=
+            { 
+                Chart:this, X:x,Y:y,
+                SelectData:selectData,          //区间选择的数据
+                RectSelectPaint:paint,           //区间选择背景
+                IsLButton:selectData.IsLButton, IsRButton:selectData.IsRButton,
+            };
+
+            e.data=data;
+        }
+
+        var aryMenu=null, command=null;
+        if (bMinuteChart)   //分时图 默认区间统计
+        {
+            command={ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,selectData] };
+        }
+        else    //K线默认 区间选择K线
+        {
+            aryMenu=
+            [
+                { Name:"区间统计", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,selectData] }},
+                { Name:"区间放大", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID, Args:[selectData] }}
+            ];
+        }
+        
+        if (event && event.Callback)
+        
+            var sendData=
+            { 
+                X:x, Y:y, e:e,
+                SelectData:selectData,    //区间选择的数据
+                RectSelectPaint:paint,    //区间选择背景
+                AryMenu:aryMenu,          //菜单  填null 不就会弹菜单
+                Command:command,          //执行命令
+                IsLButton:selectData.IsLButton, IsRButton:selectData.IsRButton,
+                PreventDefault:false,
+            };
+            if (bMinuteChart) sendData.Command=null;    //分时图 调用事件 不做任何事
+            
+            event.Callback(event,sendData,this);
+
+            if (sendData.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+
+            aryMenu=sendData.AryMenu;
+            command=sendData.Command;
+        
+
+        if (aryMenu)    //弹菜单
+        {
+            this.PopupSelectRectMenuV3(aryMenu, data, e);
+            return;
+        }
+
+        if (command)    //执行命令
+        {
+            this.ExecuteMenuCommand(command.ID, command.Args);
+            return;
+        }
+
+        this.HideSelectRect();
+        this.UpdateSelectRect(selectData.Start,selectData.End);
+    }
+
+    this.PopupSelectRectMenuV3=function(aryMenu, data, e)
+    {
+        if (!aryMenu) return;
+
+        var menuData={ Menu:aryMenu, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+        var x=data.X, y=data.Y;
+        this.PopupMenuByRClick(menuData, x, y);
+    }
+
     this.DocContextMenu=function(e)
     {
         e.preventDefault();
@@ -28938,12 +29011,12 @@ function IChartPainting()
             if (valueType==1)   //K线收盘价
             {
                 var kItem=this.Data.Data[i];
-                if (IFrameSplitOperator.IsNumber(kItem.Close)) value=kItem.Close
+                if (kItem && IFrameSplitOperator.IsNumber(kItem.Close)) value=kItem.Close
             }
             else if (valueType==2)
             {
                 var kItem=this.Data.Data[i];
-                if (IFrameSplitOperator.IsNumber(kItem.Vol)) value=kItem.Vol
+                if (kItem && IFrameSplitOperator.IsNumber(kItem.Vol)) value=kItem.Vol
             }
             else if (valueType==3)
             {
@@ -80567,8 +80640,21 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         x+=(rtClient.left+rtScroll.Left);
         y+=(rtClient.top+rtScroll.Top);
 
-        var date=data.Tooltip.Data.Date;
-        var symbol=data.Chart.Symbol;
+        var item=data.Tooltip.Data;
+        var date=item.Date;
+        var symbol=null;
+
+        if (data.Tooltip.ChartPaint && data.Tooltip.ChartPaint.Name=="DRAWKLINE")
+        {
+            if (item.Symbol) symbol=item.Symbol;
+            else if (data.Tooltip.Symbol) symbol=data.Tooltip.Symbol;
+        }
+        else
+        {
+            symbol=data.Chart.Symbol;
+        }
+
+        if (!symbol) return;
 
         this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x/pixelRatio,y/pixelRatio);
     }
@@ -88133,6 +88219,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
         else if ((bRButtonSelectRect || bLButtonSelectRect) && !this.BorderDrag && this.GetSelectRectData(selectData))
         {
+            this.FinishSelectRect(selectData, e);
+
+            /*
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
             var paint=this.GetRectSelectPaint();
             var isShowDialog=true;  //是否显示内置区间选择框
@@ -88170,6 +88259,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.HideSelectRect();
                 this.UpdateSelectRect(selectData.Start,selectData.End);
             }
+            */
         }
         else
         {
@@ -144319,7 +144409,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14500";
+var HQCHART_VERSION="1.1.14505";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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