hqchart 1.1.14508 → 1.1.14514

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

@@ -7073,9 +7073,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogModifyIndexParam;    //指标参数修改
 
 
-    this.RestoreFocusTimer=null;    //恢复焦点定时器
-    this.DocContextMenuTimer=null; //清空整体的框架
-
+    this.RestoreFocusTimer=null;        //恢复焦点定时器
+    this.PreventRightMenu={ Timer:null, Enable:false, Delay:2000 };  //阻止右键菜单
+    
     this.RestoreFocus=function(delay)
     {
         var value=1000;
@@ -7517,17 +7517,21 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.UIOnContextMenu=function(e)
     {
+        if (e)
+        {
+            if (e.preventDefault) e.preventDefault();
+            if (e.stopPropagation) e.stopPropagation();
+            e.returnValue=false;
+        } 
+      
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
         if (!this.IsShowRightMenu) return;
+        if (this.PreventRightMenu.Enable) return;
 
         var x = e.clientX-this.UIElement.getBoundingClientRect().left;
         var y = e.clientY-this.UIElement.getBoundingClientRect().top;
 
         if(typeof(this.OnRightMenu)=='function') this.OnRightMenu(x,y,e);   //右键菜单事件
-
-        if (e && e.preventDefault) e.preventDefault();
-        if (e && e.stopPropagation) e.stopPropagation();
-        e.returnValue=false;
     }
 
     this.UIOnDblClick=function(e)
@@ -8353,20 +8357,21 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return true;
     }
 
-    this.ClearDocContextMenuTimer=function(delay)
+    this.ClearPreventRightMenu=function(delay)
     {
-        var value=5000;
+        var value=3000;
         if (IFrameSplitOperator.IsNumber(delay)) value=delay;
 
-        if (this.DocContextMenuTimer)
+        if (this.PreventRightMenu.Timer)
         {
-            clearTimeout(this.DocContextMenuTimer);
-            this.DocContextMenuTimer = null;
+            clearTimeout(this.PreventRightMenu.Timer);
+            this.PreventRightMenu.Timer = null;
         }
-
-        this.DocContextMenuTimer=setTimeout(()=>
+        
+        this.PreventRightMenu.Timer=setTimeout(()=>
         {
-            document.oncontextmenu=null;
+            this.PreventRightMenu.Enable=false;
+            this.PreventRightMenu.Timer=null;
         }, value);
     }
 
@@ -8375,7 +8380,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         //清空事件
         document.onmousemove=null;
         document.onmouseup=null;
- 
+
         var bRButtonSelectRect=this.IsEnableRSelectRect(e, "DocOnMouseUp");   //右键区间选择
         var bLButtonSelectRect=this.IsEnableLSelectRect(e, "DocOnMouseUp");   //左键区间选择
 
@@ -8482,7 +8487,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.CustomChartDrag=null;
         if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
 
-        this.ClearDocContextMenuTimer(5000);
+        this.ClearPreventRightMenu(this.PreventRightMenu.Delay);
     }
 
     //区间选择完成
@@ -8495,6 +8500,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var x=drag.LastMove.X-uielement.getBoundingClientRect().left;
         var y=drag.LastMove.Y-uielement.getBoundingClientRect().top;
+        if (e && e.button==2) this.PreventRightMenu.Enable=true;    //右键拖动 需要阻止菜单
 
         if (e)  //往事件里面 写如我们的数据
         {
@@ -8524,7 +8530,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         
         if (event && event.Callback)
-        
+        {
             var sendData=
             { 
                 X:x, Y:y, e:e,
@@ -8543,7 +8549,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             aryMenu=sendData.AryMenu;
             command=sendData.Command;
-        
+        }
 
         if (aryMenu)    //弹菜单
         {
@@ -8573,7 +8579,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.DocContextMenu=function(e)
     {
-        e.preventDefault();
+        if (this.PreventRightMenu.Enable) e.preventDefault();
     }
 
     this.UIOnMounseOut=function(e)
@@ -14779,6 +14785,116 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return true;
     }
+
+    this.OnMarkRectSelect=function(e)
+    {
+        var corssCursor=this.ChartCorssCursor;  //十字光标
+        if (!corssCursor || corssCursor.Status==0) return;
+        if (!IFrameSplitOperator.IsNumber(corssCursor.CursorIndex)) return;
+        if (!this.ChartPaint[0] || !this.ChartPaint[0].Data) return;
+        var paint=this.GetRectSelectPaint();
+        if (!paint) return;
+
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+
+        var cursorIndex=corssCursor.CursorIndex;
+        JSConsole.Chart.Log("[JSChartContainer::OnMarkRectSelect] dataIndex", cursorIndex);
+        cursorIndex=parseInt(cursorIndex.toFixed(0));
+        var index=cursorIndex+kData.DataOffset;
+        if (index>=kData.Data.length) index=kData.Data.length-1;
+        var item = kData.Data[index];
+        JSConsole.Chart.Log("[KLineChartContainer::OnMarkRectSelect] item", item);
+
+        if (!this.SetRectSelectData(item, index)) return;
+
+        var pointCount=paint.GetPointCount();
+        var pixelTatio = GetDevicePixelRatio();
+        var x=corssCursor.LastPoint.X/pixelTatio;
+        var y=corssCursor.LastPoint.Y/pixelTatio;
+
+        if (pointCount==1)      //第1个位置
+        {
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT_FIRST);
+            if (event && event.Callback)
+            {
+                var data=
+                { 
+                    X:x, Y:y, Item:item, Index:index,
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e,
+                };
+                event.Callback(event,data,this);
+            }
+
+            this.Draw();
+        }
+        else if (pointCount==2)
+        {
+            var selectData=paint.GetSelectRectData();
+
+            if (e)
+            {
+                var data=
+                {
+                    Chart:this, X:x, Y:y,
+                    SelectData:selectData,          //区间选择的数据
+                    RectSelectPaint:paint           //区间选择背景
+                };
+                e.data=data
+            }
+
+            var aryMenu=null,command=null;
+            var bMinuteChart=this.IsMinuteContainer();
+            if (bMinuteChart)  
+            {
+                command={ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,selectData] };
+            }
+            else  //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] }}
+                ];
+            }
+           
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT);
+            if (event && event.Callback)
+            {
+                var sendData=
+                { 
+                    X:x, Y:y,
+                    SelectData:selectData,      //区间选择的数据
+                    RectSelectPaint:paint,      //区间选择背景
+                    AryMenu:aryMenu,Command:command,
+                    e:e,
+                    PreventDefault:false,
+                };
+                if (bMinuteChart) sendData.Command=null;    //分时图 调用事件 不做任何事
+
+                event.Callback(event,sendData,this);
+                aryMenu=sendData.AryMenu;
+                command=sendData.Command;
+                if (sendData.PreventDefault) 
+                {
+                    this.Draw();
+                    return;
+                }
+            }
+
+            if (command)
+            {
+                this.ExecuteMenuCommand(command.ID, command.Args);
+            }
+            else if (aryMenu)
+            {
+                this.PopupSelectRectMenuV3(aryMenu, data, e);
+            }
+
+            this.Draw();
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -62076,8 +62192,10 @@ function DynamicChartTitlePainting()
 
     this.FormatMultiReport=function(data,format)
     {
+        if (!IFrameSplitOperator.IsNonEmptyArray(data)) return null;
+
         var text="";
-        for(var i in data)
+        for(var i=0; i<data.length; ++i)
         {
             var item = data[i];
             let quarter=item.Quarter;
@@ -62109,8 +62227,10 @@ function DynamicChartTitlePainting()
         return text;
     }
 
-    this.FromatMultiDataLine=function(value, dataInfo)
+    this.FormatMultiDataLine=function(value, dataInfo)
     {
+        if (!value) return null;
+
         var text="";
         if (Array.isArray(value))
         {
@@ -62138,7 +62258,7 @@ function DynamicChartTitlePainting()
     }
 
     //多变量输出
-    this.FromatStackedBarTitle=function(aryBar, dataInfo)
+    this.FormatStackedBarTitle=function(aryBar, dataInfo)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(aryBar)) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(dataInfo.Color)) return null;
@@ -62163,6 +62283,8 @@ function DynamicChartTitlePainting()
 
     this.FormatKLineTitle=function(item, dataInfo)
     {
+        if (!item) return null;
+
         var defaultfloatPrecision=GetfloatPrecision(dataInfo.Symbol);//价格小数位数
         var upperSymbol="";
         if (dataInfo.Symbol) upperSymbol=dataInfo.Symbol.toUpperCase();
@@ -62171,7 +62293,6 @@ function DynamicChartTitlePainting()
 
         var aryText=[];
 
-
         if (IFrameSplitOperator.IsNumber(item.Date)) 
         {
             var text=IFrameSplitOperator.FormatDateString(item.Date);
@@ -62702,6 +62823,25 @@ function DynamicChartTitlePainting()
                 if (dataIndex<0) return null;
             }
 
+            var value=null;
+            if (dataIndex>=0 && item.Data && IFrameSplitOperator.IsNonEmptyArray(item.Data.Data)) value=item.Data.Data[dataIndex];
+
+            if (this.GetEventCallback)  //外部处理
+            {
+                var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_INDEX_OUT_TEXT);
+                if (event)
+                {
+                    var sendData=
+                    { 
+                        Item:item, Index:titleIndex, Data:this.Data, FrameID:this.Frame.Identify,
+                        DataIndex:dataIndex, Value:value, PreventDefault:false, Out:null
+                    };
+                    event.Callback(event,sendData,this);
+                    if (sendData.Out) return sendData.Out;
+                    if (sendData.PreventDefault) return sendData.Out;
+                }
+            }
+
             if (item.DataType=="ChartMultiLine")   //多线段数据
             {
                 aryText=this.ForamtMultiLineTitle(dataIndex, item);
@@ -62720,46 +62860,19 @@ function DynamicChartTitlePainting()
                 if (!aryText) return null;
                 return { Text:null, ArrayText:aryText };
             }
-            
-
-            value=item.Data.Data[dataIndex];
-            
-            if (value==null && item.ChartClassName=="ChartStepLine") //当前值无效,上一个值延续
-            {
-                preVaildItem=this.GetPreVaildItem(item.Data.Data, dataIndex);
-                if (!preVaildItem) return null;
-
-                preText=this.FormatValue(preVaildItem.Item,item);
-                if (item.Name) 
-                {
-                    var dyValue=this.GetDynamicOutValue(item.Name, preText);
-                    if (dyValue) preText=dyValue;
-                }
-
-                valueText=`--(${preText})`;
-
-                return { Text:valueText, ArrayText:aryText };
-            }
-
-            if (value==null) return null;
-
-            if (item.DataType=="HistoryData-Vol")
-            {
-                value=value.Vol;
-                valueText=this.FormatValue(value,item);
-            }
             else if (item.DataType=="MultiReport")
             {
                 valueText=this.FormatMultiReport(value,item);
+                if (!valueText) return null;
             }
             else if (item.DataType=="MULTI_POINT_LINE")
             {
-                valueText=this.FromatMultiDataLine(value, item);
+                valueText=this.FormatMultiDataLine(value, item);
                 if (!valueText) return null;
             }
             else if (item.DataType=="ChartStackedBar")
             {
-                aryText=this.FromatStackedBarTitle(value, item);
+                aryText=this.FormatStackedBarTitle(value, item);
                 if (!aryText) return null;
                 return { Text:null, ArrayText:aryText };
             }
@@ -62774,36 +62887,37 @@ function DynamicChartTitlePainting()
                 var outTitle=this.FormatIndexTitle(value, item);
                 return outTitle;
             }
+            else if (item.DataType=="ChartBand")
+            {
+                return null;
+            }
             else if (g_ScriptIndexChartFactory.Has(item.DataType)) //外部挂接
             {
                 var find=g_ScriptIndexChartFactory.Get(item.DataType);
                 if (find && find.FormatTitleCallback)
                 return find.FormatTitleCallback(value, item, dataIndex);
             }
-            else
+            else if (value==null && item.ChartClassName=="ChartStepLine") //当前值无效,上一个值延续
             {
-                if (this.GetEventCallback)
+                preVaildItem=this.GetPreVaildItem(item.Data.Data, dataIndex);
+                if (!preVaildItem) return null;
+
+                preText=this.FormatValue(preVaildItem.Item,item);
+                if (item.Name) 
                 {
-                    var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_INDEX_OUT_TEXT);
-                    if (event)
-                    {
-                        var data=
-                        { 
-                            Item:item, Index:titleIndex, Data:this.Data, FrameID:this.Frame.Identify,
-                            DataIndex:dataIndex, Value:value,
-                            Out:null
-                         };
-                        event.Callback(event,data,this);
-                        if (data.Out) return data.Out;
-                    }
+                    var dyValue=this.GetDynamicOutValue(item.Name, preText);
+                    if (dyValue) preText=dyValue;
                 }
-                
-                if (item.DataType=="ChartBand") //默认不输出
-                    return null;
-                
+
+                valueText=`--(${preText})`;
+
+                return { Text:valueText, ArrayText:aryText };
+            }
+            else
+            {
+                if (value==null) return null;
 
                 var arrowSuper=null;    //独立颜色
-                
                 if (this.IsShowUpDownArrow)
                 {
                     var preValue=null;
@@ -63140,18 +63254,14 @@ function DynamicChartTitlePainting()
                     value=item.Data.Data[dataIndex];
                     if (value==null) continue;
 
-                    if (item.DataType=="HistoryData-Vol")
-                    {
-                        value=value.Vol;
-                        valueText=this.FormatValue(value,item);
-                    }
-                    else if (item.DataType=="MultiReport")
+                    if (item.DataType=="MultiReport")
                     {
                         valueText=this.FormatMultiReport(value,item);
+                        if (!valueText) continue;
                     }
                     else if (item.DataType=="ChartStackedBar")
                     {
-                        aryText=this.FromatStackedBarTitle(value, item);
+                        aryText=this.FormatStackedBarTitle(value, item);
                         if (!aryText) continue;
                     }
                     else if (item.DataType=="ChartMultiPoint")
@@ -81144,48 +81254,50 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var corssCursor=this.ChartCorssCursor;  //十字光标
         var x=corssCursor.LastPoint.X/pixelTatio;
         var y=corssCursor.LastPoint.Y/pixelTatio;
-        var isShowMenu=true;
+        
+        if (e)
+        {
+            var data=
+            {
+                Chart:this,X:x,Y:y,
+                SelectData:selectData,          //区间选择的数据
+                RectSelectPaint:paint           //区间选择背景
+            };
+            e.data=data;
+        }
+
+        var 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] }}
+        ];
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAG_SELECT_RECT_MOUSEUP);
         if (event)
         {
-            var data=
+            var sendData=
             { 
                 X:x,
                 Y:y,
                 SelectData:selectData,    //区间选择的数据
                 RectSelectPaint:paint,    //区间选择背景
-                IsShowMenu:false,
+                AryMenu:null,
+                PreventDefault:false,
             };
-            event.Callback(event,data,this);
-            isShowMenu=data.IsShowMenu;
+            event.Callback(event,sendData,this);
+
+            if (sendData.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+
+            aryMenu=sendData.AryMenu;
         }
 
         if (this.IsShowSelectRectDialog())  //区间统计
         {
-            var data=
-            {
-                Chart:this,X:x,Y:y,
-                SelectData:selectData,          //区间选择的数据
-                RectSelectPaint:paint           //区间选择背景
-            };
-            e.data=data;
-
             this.DrawSelectRectDialog(e);
         }
-        else if (isShowMenu)
+        else if (aryMenu)
         {
-            var data=
-            {
-                Chart:this,
-                X:x,
-                Y:y,
-                SelectData:selectData,          //区间选择的数据
-                RectSelectPaint:paint           //区间选择背景
-            };
-            e.data=data;
-
-            this.PopupSelectRectMenuV2(data, e);
+            this.PopupSelectRectMenuV3(aryMenu, data, e);
         }    
     }
 
@@ -81242,6 +81354,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.UpdatePointByCursorIndex();   //更新十字光标位子
     }
 
+    /*
     this.OnMarkRectSelect=function(e)
     {
         var corssCursor=this.ChartCorssCursor;  //十字光标
@@ -81323,6 +81436,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.Draw();
     }
+    */
 
     //创建指定窗口指标
     this.CreateWindowIndex=function(windowIndex)
@@ -89469,6 +89583,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         else e.returnValue = false;
     }
 
+    /*
     this.OnMarkRectSelect=function(e)
     {
         var corssCursor=this.ChartCorssCursor;  //十字光标
@@ -89544,6 +89659,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         
         this.Draw();
     }
+    */
 
     //注册鼠标右键事件
     this.OnRightMenu=function(x,y,e)
@@ -138045,9 +138161,7 @@ function ChartReport()
         {
             this.GetCustomLinkDrawInfo(data, column, drawInfo);
         }
-        else if ([REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,
-                REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,
-                REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID].includes(column.Type))
+        else if (this.IsReserveNumber(column.Type))
         {
             this.FormatReserveNumber(column, stock, drawInfo);
         }
@@ -138186,6 +138300,18 @@ function ChartReport()
         return ARARY_TYPE.includes(value);
     }
 
+    this.IsReserveNumber=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,
+            REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,
+            REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID
+        ];
+
+        return ARARY_TYPE.includes(value);
+    }
+
     this.IsReserveString=function(value)
     {
         var ARARY_TYPE=
@@ -144433,7 +144559,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14507";
+var HQCHART_VERSION="1.1.14513";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -57635,7 +57635,7 @@ HQData.APIIndex_DRAWBAND=function(data, callback)
             DrawType:"DRAWBAND",
             DrawData:[],
             Color:["rgb(220,20,60)","rgb(34,139,34)"]
-        }
+        },
     };
 
     for(var i=0;i<kData.Data.length;++i)
@@ -57681,7 +57681,7 @@ HQData.APIIndex_MULTI_LINE=function(data, callback)
             }
         }, //绘制线段数组
 
-        IsShowTitle:false
+        IsShowTitle:true,
     };
 
     var point3=
@@ -57770,7 +57770,9 @@ HQData.APIIndex_MULTI_SVGICON=function(data, callback)
                     //{ Date:20190919, Value:15.3, Symbol:'\ue615', Color:'rgb(240,240,0)', Baseline:2 },
                     //{ Date:20190909, Value:15.4, Symbol:'\ue615', Color:'rgb(240,100,30)'}
                 ] 
-            }
+            },
+
+           
         } //绘制图标数组
     };
 
@@ -58153,8 +58155,8 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
         { 
             DrawType:'MULTI_BAR', 
             DrawData:[] 
-        }, //绘制柱子数组\
-        IsShowTitle:false,
+        }, //绘制柱子数组
+        IsShowTitle:true,
     };
 
     //第一组柱子
@@ -58446,7 +58448,9 @@ HQData.APIIndex_TITLE=function(data, callback)
     {
         code:0, 
         stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
-        outdata: { date:aryDate, time:aryTime, outvar:[ textData, closeData] } 
+        outdata: { date:aryDate, time:aryTime, outvar:[ textData, closeData] },
+
+        //error: { message:"无权限查看指标“测试指标1”" }
     };
 
     console.log('[HQData.APIIndex_TITLE] apiData ', apiData);