hqchart 1.1.14216 → 1.1.14219

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

@@ -12822,6 +12822,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.Change)) frame.ChangeIndex=windowItem.Change;
             if (IFrameSplitOperator.IsBool(windowItem.Close)) frame.CloseIndex=windowItem.Close;
             if (IFrameSplitOperator.IsBool(windowItem.Overlay)) frame.OverlayIndex=windowItem.Overlay;
+            if (IFrameSplitOperator.IsBool(windowItem.AddIndexWindow)) frame.AddIndexWindow=windowItem.AddIndexWindow;
+
             if (IFrameSplitOperator.IsBool(windowItem.IsDrawTitleBG))  frame.IsDrawTitleBG=windowItem.IsDrawTitleBG;
 
             if (IFrameSplitOperator.IsNumber(windowItem.TitleHeight)) frame.ChartBorder.TitleHeight=windowItem.TitleHeight;
@@ -12880,6 +12882,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(item.Export)) frame.ExportData=item.Export;
             if (IFrameSplitOperator.IsBool(item.MaxMin)) frame.MaxMinWindow=item.MaxMin;
             if (IFrameSplitOperator.IsBool(item.TitleWindow)) frame.TitleWindow=item.TitleWindow;
+            if (IFrameSplitOperator.IsBool(item.AddIndexWindow)) frame.AddIndexWindow=item.AddIndexWindow;
 
             if (IFrameSplitOperator.IsBool(item.IsDrawTitleBG))  frame.IsDrawTitleBG=item.IsDrawTitleBG;
             if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) frame.IsShowNameArrow=item.IsShowNameArrow;
@@ -51329,7 +51332,7 @@ function SessionBreaksPaint()
     this.Draw=function()
     {
         if (!this.HQChart) return;
-        var hisData=this.HQChart.ChartOperator_Temp_GetHistroyData();;
+        var hisData=this.HQChart.ChartOperator_Temp_GetHistoryData();;
         if (!hisData) return;  //数据还没有到达
         if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return;
 
@@ -77315,7 +77318,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id===JSCHART_OPERATOR_ID.OP_GOTO_HOME)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return;  //数据还没有到达
 
             var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //获取一屏显示的数据个数
@@ -77333,7 +77336,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id===JSCHART_OPERATOR_ID.OP_GOTO_END)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             hisData.DataOffset=0;
@@ -77348,7 +77351,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_LEFT_ZOOM_IN || id==JSCHART_OPERATOR_ID.OP_LEFT_ZOOM_OUT)   //{ Step：增加/减少数量 } 左边增加/减少显示个数
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var dataCount=hisData.Data.length;
@@ -77396,7 +77399,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_RIGHT_ZOOM_IN || id==JSCHART_OPERATOR_ID.OP_RIGHT_ZOOM_OUT) //{ Step：增加/减少数量 , ShowCount:显示个数 } 右边增加/减少显示个数
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var dataCount=hisData.Data.length;
@@ -77448,7 +77451,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!this.ChartPaint[0]) return false;
             if (!this.ChartPaint[0].Data) return false;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var paint=this.GetRectSelectPaint();
             if (!paint) return false;
@@ -77534,7 +77537,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!this.ChartPaint[0]) return false;
             if (!this.ChartPaint[0].Data) return false;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var paint=this.GetRectSelectPaint();
             if (!paint) return false;
@@ -77573,7 +77576,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_SCROOLBAR_SLIDER_CHANGED)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             if (obj.Type==0)    //滑块移动
@@ -77609,7 +77612,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!IFrameSplitOperator.IsNumber(obj.Date)) return;
 
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var index=this.ChartOperator_GetIndex_ByDateTime(hisData, obj, this.Period, 0);
@@ -77643,7 +77646,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (id==JSCHART_OPERATOR_ID.OP_GOTO_BY_DATAINDEX)  //{PageSize:可选, DataIndex:起始位置数据索引}
         {
             if (!IFrameSplitOperator.IsNumber(obj.DataIndex)) return;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
             if (obj.DataIndex<0 || obj.DataIndex>=hisData.Data.length)
             {
@@ -77671,7 +77674,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             var pageInfo=this.GetChartStatus();
             if (!pageInfo) return;
 
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
             
             var start=hisData.DataOffset;
@@ -77735,7 +77738,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     }
 
     //内部函数
-    this.ChartOperator_Temp_GetHistroyData=function()
+    this.ChartOperator_Temp_GetHistoryData=function()
     {
         var hisData=null;
         if (!this.Frame.Data) hisData=this.Frame.Data;
@@ -77745,6 +77748,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return hisData;
     }
 
+    this.ChartOperator_Temp_GetHistroyData=this.ChartOperator_Temp_GetHistoryData;  //兼容老版本
+
     this.ChartOperator_Temp_Update=function()
     {
         this.UpdataDataoffset();           //更新数据偏移
@@ -79505,7 +79510,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             var kLineDrawType=this.GetKLineDrawType();
             var dateRange=null;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (hisData) dateRange=hisData.GetDateRange();
             var obj=
             {
@@ -79754,7 +79759,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             var kLineDrawType=this.GetKLineDrawType();
             var dateRange=null;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (hisData) dateRange=hisData.GetDateRange();
             var obj=
             {
@@ -84507,7 +84512,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var kItem=null;
         if (this.ChartCorssCursor.ClientPos>=0)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return false;  //数据还没有到达
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
     
@@ -84517,7 +84522,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else    //取最后一个数据
         {   
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return false;  //数据还没有到达
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var kItem=hisData.Data[hisData.Data.length-1];
@@ -91662,7 +91667,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
 
         if (funcName!="Update")
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return false;
 
             var count=hisData.Data.length;
@@ -91713,7 +91718,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
     this.MoveNextKLineData=function(option) //{PageSize:, Step:}
     {
         if (this.TrainDataCount<=0) return false;
-        var hisData=this.ChartOperator_Temp_GetHistroyData();
+        var hisData=this.ChartOperator_Temp_GetHistoryData();
         if (!hisData) return false;
 
         var step=1;
@@ -91794,7 +91799,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
         step=parseInt(step/oneStepWidth);  //除以4个像素
         if (step<=0) return false;
 
-        var data=this.ChartOperator_Temp_GetHistroyData();
+        var data=this.ChartOperator_Temp_GetHistoryData();
         if (!data) return false;
 
         var xPointcount=0;
@@ -91848,7 +91853,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
 
     this.DataMoveRight=function()
     {
-        var data=this.ChartOperator_Temp_GetHistroyData();
+        var data=this.ChartOperator_Temp_GetHistoryData();
         if (!data) return false;
 
         var xPointcount=0;
@@ -94254,7 +94259,7 @@ function IKLineInfo()
 
         //K线数据范围
         var hisData=null;
-        if (hqChart.ChartOperator_Temp_GetHistroyData)  hisData=hqChart.ChartOperator_Temp_GetHistroyData();
+        if (hqChart.ChartOperator_Temp_GetHistoryData)  hisData=hqChart.ChartOperator_Temp_GetHistoryData();
         if (hisData)
             obj.DateRange=hisData.GetDateRange();
         
@@ -129709,7 +129714,74 @@ function JSReportChartContainer(uielement)
 
     this.OnRightMenu=function(x,y,e)
     {
-       
+        this.PopupRightMenu(x,y,e);
+    }
+
+    this.PopupRightMenu=function(x,y, e)
+    {
+        var chart=this.GetReportChart();
+        if (!chart) return;
+
+        var row=chart.PtInFixedBody(x,y);
+        if (row) 
+        {
+            row.Type=1;
+        }
+        else
+        {
+            row=chart.PtInBody(x,y);
+            if (row) row.Type=2;
+        }
+
+        if (!this.JSPopMenu) return;
+
+        var data={ Row:row, X:x, Y:y };
+        var menuData={ Menu:null, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);
+        if (event && event.Callback)
+        {
+            var sendData={ MenuData:menuData, Data:data };
+            event.Callback(event, sendData, this);
+        }
+
+        if (menuData.Menu) this.PopupMenuByRClick(menuData, x, y);
+    }
+
+    //右键菜单
+    this.PopupMenuByRClick=function(menuData, x, y)
+    {
+        if (!this.JSPopMenu) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        x+=rtClient.left+rtScroll.Left;
+        y+=rtClient.top+rtScroll.Top;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByRight(x,y);
+    }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::OnClickRightMenu] ',data);
+        if (!data || !data.Data) return;
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID, aryArgs);
     }
 
     this.UIOnMouseMove=function(e)
@@ -149710,7 +149782,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14210";
+var HQCHART_VERSION="1.1.14218";
 
 function PrintHQChartVersion()
 {