hqchart 1.1.14489 → 1.1.14496

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

@@ -4784,7 +4784,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.DisableMouse==true) chart.DisableMouse=option.DisableMouse;
         if (option.ScriptError) chart.ScriptErrorCallback=option.ScriptError;       //指标执行错误回调
         if (IFrameSplitOperator.IsString(option.SplashTitle)) chart.LoadDataSplashTitle=option.SplashTitle;
-        if (IFrameSplitOperator.IsBool(option.EnableSelectRect)) chart.EnableSelectRect=option.EnableSelectRect; //是否启用区间选择
         if (IFrameSplitOperator.IsBool(option.EnableZoomIndexWindow)) chart.EnableZoomIndexWindow=option.EnableZoomIndexWindow;
         if (IFrameSplitOperator.IsBool(option.IsDrawPictureXY)) chart.IsDrawPictureXY=option.IsDrawPictureXY;
         if (IFrameSplitOperator.IsBool(option.EnableNewIndex)) chart.EnableNewIndex=option.EnableNewIndex;
@@ -4792,6 +4791,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (IFrameSplitOperator.IsBool(option.EnableVerifyRecvData)) chart.EnableVerifyRecvData=option.EnableVerifyRecvData;
         if (IFrameSplitOperator.IsBool(option.EnableNightDayBG)) chart.EnableNightDayBG=option.EnableNightDayBG;
 
+        //老版本开启左键区间选择
+        if (IFrameSplitOperator.IsBool(option.EnableSelectRect))
+        {
+            if (!option.DragSelectRect) option.DragSelectRect={ };
+            option.DragSelectRect.Enable=true;
+            option.DragSelectRect.EnableLButton=true;
+        }
+
         if (option.GlobalOption)
         {
             var item=option.GlobalOption;
@@ -4864,7 +4871,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             if (!option.DragSelectRect)
             {
-                option.DragSelectRect={ Enable:true };  //默认开启区间选中画布
+                option.DragSelectRect={ EnableLButton:true };  //默认开启区间选中画布
             }
 
             if (option.DragSelectRect)
@@ -6768,7 +6775,7 @@ var JSCHART_MENU_ID=
     CMD_SHOW_STOCKCHIP_ID:20,   //筹码分布
     CMD_HIDE_STOCKCHIP_ID:21,
 
-    CMD_ENABLE_SELECT_RECT_ID:22,   //启动区间选择
+    CMD_XXXXXX_NONE_ID:22,          //未用!!!!
     CMD_CHANGE_DAY_COUNT_ID:23,     //切换天数
     CMD_SHOW_BEFORE_DATA_ID:24,     //显示|隐藏集合竞价
 
@@ -6812,6 +6819,9 @@ var JSCHART_MENU_ID=
     CMD_CORSS_ON_KLINE_ID:51,               //十字光标只能画在K线上   
     CMD_CORSS_POINT_ID:52,                  //十字光标圆点
 
+    CMD_RBUTTON_SELECT_RECT_ID:53,          //右键区间选择
+    CMD_LBUTTON_SELECT_RECT_ID:54,          //左键区间选择
+
 
 
     CMD_REPORT_CHANGE_BLOCK_ID:100,      //报价列表 切换板块ID
@@ -7064,6 +7074,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
 
     this.RestoreFocusTimer=null;    //恢复焦点定时器
+    this.DocContextMenuTimer=null; //清空整体的框架
 
     this.RestoreFocus=function(delay)
     {
@@ -7514,7 +7525,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if(typeof(this.OnRightMenu)=='function') this.OnRightMenu(x,y,e);   //右键菜单事件
 
-        return false;
+        if (e && e.preventDefault) e.preventDefault();
+        if (e && e.stopPropagation) e.stopPropagation();
+        e.returnValue=false;
     }
 
     this.UIOnDblClick=function(e)
@@ -8037,15 +8050,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         document.onmousemove=(e)=>{ this.DocOnMouseMove(e); }
         document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
-
-
+        document.oncontextmenu=(e)=> { this.DocContextMenu(e); }
     }
 
     this.DocOnMouseMove=function(e)
     {
         //加载数据中,禁用鼠标事件
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
-        
+
+        var bRButtonSelectRect=this.IsEnableRSelectRect(e, "DocOnMouseMove");   //右键区间选择
+        var bLButtonSelectRect=this.IsEnableLSelectRect(e, "DocOnMouseMove");   //左键区间选择
+         
         var drag=this.MouseDrag;
         if (!drag) return;
 
@@ -8084,7 +8099,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
-        else if (this.IndexChartDrag && this.IndexChartDrag.SelectedChart)
+        else if (this.IndexChartDrag && this.IndexChartDrag.SelectedChart)  //选中图形移动
         {
             if(Math.abs(drag.LastMove.Y-e.clientY)<2 &&  Math.abs(drag.LastMove.X-e.clientX)<2) return;
 
@@ -8114,7 +8129,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
             this.TryDragMove_CustomChartDrag(sendData);
         }
-        else if (this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.EnableMove===true)
+        else if (this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.EnableMove===true)    //画图工具移动
         {
             var drawPicture=this.CurrentChartDrawPicture;
             if (drawPicture.Status==1 || drawPicture.Status==2)
@@ -8156,11 +8171,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
-        else if (this.DragMode==1 || isDragSelectRect || isDragSubSelectRect)  //数据上下左右拖拽
-        {
-            this.OnDragMode_One({X:moveSetp, Y:moveSetpY}, e);
-        }
-        else if (this.DragMode==2) //区间选择
+        else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect)  //左右键区间选择
         {
             var yMoveSetp=Math.abs(drag.LastMove.Y-e.clientY);
 
@@ -8174,7 +8185,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
-
+        }
+        else if (this.DragMode==1 || isDragSelectRect || isDragSubSelectRect)  //数据上下左右拖拽 区间选择框左右拖动
+        {
+            this.OnDragMode_One({X:moveSetp, Y:moveSetpY}, e);
         }
     }
 
@@ -8315,11 +8329,32 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return true;
     }
 
+    this.ClearDocContextMenuTimer=function(delay)
+    {
+        var value=5000;
+        if (IFrameSplitOperator.IsNumber(delay)) value=delay;
+
+        if (this.DocContextMenuTimer)
+        {
+            clearTimeout(this.DocContextMenuTimer);
+            this.DocContextMenuTimer = null;
+        }
+
+        this.DocContextMenuTimer=setTimeout(()=>
+        {
+            document.oncontextmenu=null;
+        }, value);
+    }
+
     this.DocOnMouseUp=function(e)
     {
         //清空事件
         document.onmousemove=null;
         document.onmouseup=null;
+ 
+        var bRButtonSelectRect=this.IsEnableRSelectRect(e, "DocOnMouseUp");   //右键区间选择
+        var bLButtonSelectRect=this.IsEnableLSelectRect(e, "DocOnMouseUp");   //左键区间选择
+
         var IsMinuteChart=(this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer") ? true:false;
         var isDragSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Index>=0);
         var isDragSubSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Type==4);
@@ -8366,7 +8401,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);
         }
-        else if (this.DragMode==2)  //区间选择
+        else if (bLButtonSelectRect || bRButtonSelectRect)  //区间选择
         {
             var drag=this.MouseDrag;
             drag.LastMove.X=e.clientX;
@@ -8382,7 +8417,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             selectData.JSChartContainer=this;
             selectData.Stock={Symbol:this.Symbol, Name:this.Name};
 
-            if (this.ChartDragSelectRect.Enable && !this.BorderDrag && this.GetSelectRectData(selectData))
+            if (!this.BorderDrag && this.GetSelectRectData(selectData))
             {
                 var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
                 var paint=this.GetRectSelectPaint();
@@ -8459,6 +8494,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.IndexChartDrag=null;
         this.CustomChartDrag=null;
         if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
+
+        this.ClearDocContextMenuTimer(5000);
+    }
+
+    this.DocContextMenu=function(e)
+    {
+        e.preventDefault();
     }
 
     this.UIOnMounseOut=function(e)
@@ -14018,10 +14060,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.Draw();
                 }
                 break;
-            case JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID:
-                if (IFrameSplitOperator.IsBool(srcParam))
-                    this.EnableSelectRect=srcParam;
-                break;
             case JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID:
                 if (this.ChangeDayCount && param!=null)
                     this.ChangeDayCount(param);
@@ -14216,6 +14254,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
                 break;
+            case JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID:
+                if (IFrameSplitOperator.IsBool(srcParam) && this.ChartDragSelectRect) this.ChartDragSelectRect.EnableRButton=srcParam;
+                break;
+            case JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID:
+                if (IFrameSplitOperator.IsBool(srcParam) && this.ChartDragSelectRect) this.ChartDragSelectRect.EnableLButton=srcParam;
+                break;
         }
     }
 
@@ -14390,7 +14434,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var chart=g_ExtendChartPaintFactory.Create("RectDragPaint",option);
         if (!chart) return null;
 
-        if (option && option.Enable===true) chart.Enable=true;
         chart.ChartBorder=this.Frame.ChartBorder;
         chart.ChartFrame=this.Frame;
         chart.HQChart=this;
@@ -14625,6 +14668,44 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         return null;
     }
+
+    this.IsEnableRSelectRect=function(event, funcName)
+    {
+        if (!this.ChartDragSelectRect) return false;
+        if (!this.ChartDragSelectRect.EnableRButton) return false;
+        if (!event) return false;
+
+        //两个事件使用不同的变量获取鼠标按键状态
+        if (funcName=="DocOnMouseUp")
+        {
+            if (event.button!=2) return false;
+        }
+        else if (funcName=="DocOnMouseMove")
+        {
+            if (event.buttons!=2) return false;
+        }
+
+        return true;
+    }
+
+    this.IsEnableLSelectRect=function(event, funcName)
+    {
+        if (!this.ChartDragSelectRect) return false;
+        if (!this.ChartDragSelectRect.EnableLButton) return false;
+        if (!event) return false;
+
+        //两个事件使用不同的变量获取鼠标按键状态
+        if (funcName=="DocOnMouseUp")
+        {
+            if (event.button!=0) return false;
+        }
+        else if (funcName=="DocOnMouseMove")
+        {
+            if (event.buttons!=1) return false;
+        }
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -27311,7 +27392,9 @@ function ChartData()
             if (this.Data[i] && this.Data[i].Value!=null)
             { 
                 var item=this.Data[i].Value;
-                if (!isNaN(item))
+                if (IFrameSplitOperator.IsNumber(item))
+                    result[i]=item;
+                else if (IFrameSplitOperator.IsString(item))
                     result[i]=item;
                 else if (item instanceof Array)   //支持数组
                     result[i]=item;
@@ -37345,7 +37428,7 @@ function ChartIndexTitle()
 
     this.GetMaxMin=function()
     {
-        return range={ Min:null, Max:null };
+        return { Min:null, Max:null };
     }
 }
 
@@ -51987,13 +52070,20 @@ function RectDragPaint()
     this.LineWidth=g_JSChartResource.RectDrag.LineWidth;
     this.BGColor=g_JSChartResource.RectDrag.BGColor;
     this.ShowMode=0;    //0=只画边框 1=遮挡未选中区域 2=整体全选
-    this.Enable=false;  
+
+    this.EnableRButton=false;   //右键选择
+    this.EnableLButton=false;    //左键选择
 
     this.FirstPoint;
     this.SecondPoint;
 
     this.IsClearCanvas=true;    //画布是否是清空状态
 
+    this.IsEnable=function()
+    {
+        return this.EnableRButton || this.EnableLButton;
+    }
+
     //设置参数接口
     this.SetOption=function(option)
     {
@@ -52002,6 +52092,8 @@ function RectDragPaint()
             if (option.LineColor) this.LineColor=option.LineColor;
             if (option.BGColor) this.BGColor=option.BGColor;
             if (IFrameSplitOperator.IsNumber(option.ShowMode)) this.ShowMode=option.ShowMode;
+            if (IFrameSplitOperator.IsBool(option.EnableRButton)) this.EnableRButton=option.EnableRButton;
+            if (IFrameSplitOperator.IsBool(option.EnableLButton)) this.EnableLButton=option.EnableLButton;
         }
     }
 
@@ -52096,7 +52188,7 @@ function RectDragPaint()
 
     this.Draw=function()
     {
-        if (!this.Enable) return;
+        if (!this.IsEnable()) return;
         if (!this.HQChart) return;
 
         var finder=this.HQChart.GetExtraCanvas(JSChart.RectDragCanvasKey);
@@ -85169,6 +85261,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var bPopMinuteChart=false;
         if (this.PopMinuteChart) bPopMinuteChart=true;
 
+        var bRButtonSelectRect=false, bLButtonSelectRect=false;
+        if (this.ChartDragSelectRect) 
+        {
+            bRButtonSelectRect=this.ChartDragSelectRect.EnableRButton;
+            bLButtonSelectRect=this.ChartDragSelectRect.EnableLButton;
+        }
+
+
         var kItem=null;
         if (frameID>=0 && option && IFrameSplitOperator.IsNumber(option.CursorIndex))
         {
@@ -85350,7 +85450,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     
                     { Name:"禁止拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[0]}, Checked:0==this.DragMode },
                     { Name:"启动拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1]}, Checked:1==this.DragMode },
-                    { Name:"左键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[2]}, Checked:2==this.DragMode },
+                    { Name:"左键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID, Args:[!bLButtonSelectRect]}, Checked:bLButtonSelectRect },
+                    { Name:"右键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID, Args:[!bRButtonSelectRect]}, Checked:bRButtonSelectRect },
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
 
                     { Name:"背景分割", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID, Args:[!bBGSpit]}, Checked:bBGSpit},
@@ -87580,7 +87681,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.HistoryMinuteApiUrl=g_JSChartResource.Domain+'/API/StockMinuteData';  //历史分钟数据
 
     this.ColorLineData;    //主图价格线颜色自定义配置
-    this.EnableSelectRect=false;    //是否可以区间选择
 
     this.CorssCursorIndex={ DayIndex:-1, DataIndex:-1, Point:{X:-1, Y:-1} ,Type:-1 };   //Type: 单日(1=主图 2=盘前 3=盘后)  多日(10=主图 20=盘前 30=盘后)
     this.EnableNewIndex=false  //是否使用新的索引版本
@@ -87941,7 +88041,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 }
             }
         }
-        else if (this.RectSelectDrag && this.RectSelectDrag.Index>=0)    //区间选择
+        else if (this.RectSelectDrag && this.RectSelectDrag.Index>=0)    //区间选择 左右调整
         {
             if (moveSetp<5) return;
             var obj={ X:e.clientX, Y:e.clientY, PointIndex:this.RectSelectDrag.Index, Name:"MoveRectSelectLine" };
@@ -87951,10 +88051,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 bNeedDraw=true;
             }
         }
-        else
+        else        //显示区间选择
         {
             if (moveSetp<5 && yMoveSetp<5) return;
-            if (!this.EnableSelectRect) return;
+            if (this.ChartDragSelectRect && !this.ChartDragSelectRect.Enable) return;
 
             //this.UIElement.style.cursor="default";
             this.SetCursor({Cursor:"default"});
@@ -87972,6 +88072,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.OnMinuteSelectRectMouseUp=function(e)
     {
+        var bRButtonSelectRect=this.IsEnableRSelectRect(e, "DocOnMouseUp");   //右键区间选择
+        var bLButtonSelectRect=this.IsEnableLSelectRect(e, "DocOnMouseUp");   //左键区间选择
+
         var drag=this.MouseDrag;
         drag.LastMove.X=e.clientX;
         drag.LastMove.Y=e.clientY;
@@ -87990,7 +88093,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         {
 
         }
-        else if (this.EnableSelectRect && !this.BorderDrag && this.GetSelectRectData(selectData))
+        else if ((bRButtonSelectRect || bLButtonSelectRect) && !this.BorderDrag && this.GetSelectRectData(selectData))
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
             var paint=this.GetRectSelectPaint();
@@ -89329,7 +89432,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
         }
 
-
+        var bRButtonSelectRect=false,bLButtonSelectRect=false;
+        if (this.ChartDragSelectRect) 
+        {
+            bRButtonSelectRect=this.ChartDragSelectRect.EnableRButton;
+            bLButtonSelectRect=this.ChartDragSelectRect.EnableLButton;
+        }
+        
         var minItem=null;
         if (frameID>=0 && option && IFrameSplitOperator.IsNumber(option.CursorIndex))
         {
@@ -89402,7 +89511,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 ]
             },
             {
-                Name:"区间选择",Data:{ ID: JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID, Args:[!this.EnableSelectRect]}, Checked:this.EnableSelectRect
+                Name:"区间选择",
+                SubMenu:
+                [
+                    { Name:"左键区间选择",Data:{ ID:JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID, Args:[!bLButtonSelectRect]}, Checked:bLButtonSelectRect },
+                    { Name:"右键区间选择",Data:{ ID:JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID, Args:[!bRButtonSelectRect]}, Checked:bRButtonSelectRect },
+                ]
             },
             { 
                 Name:"十字光标",
@@ -144134,7 +144248,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14488";
+var HQCHART_VERSION="1.1.14495";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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