hqchart 1.1.12463 → 1.1.12472

package/src/jscommon/umychart.js

@@ -5025,6 +5025,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 this.ChartCorssCursor.LastPoint=this.LastPoint;
                 this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+                if (this.EnableNewIndex)
+                {
+                    this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                    this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
+                }
 
                 var bRestoreCanvas=false;
                 if (this.CorssCursorCanvas) //独立的十字光标层
@@ -5387,6 +5392,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             this.ChartCorssCursor.LastPoint=this.LastPoint;
             this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+            if (this.EnableNewIndex)
+            {
+                this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
+            }
 
             var bRestoreCanvas=false;
             if (this.CorssCursorCanvas) //独立的十字光标层
@@ -8438,6 +8448,30 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         
         return aryData;
     }
+
+    //重置指标计数器
+    this.ClearIndexRunCount=function()
+    {
+        //主图指标
+        for(var i=0;i<this.WindowIndex.length;++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+
+            item.RunCount=0;
+        }
+
+        //叠加指标
+        for(var i=0;i<this.Frame.SubFrame.length;++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            for(var j=0; j<item.OverlayIndex.length; ++j)
+            {
+                var overlayItem=item.OverlayIndex[j];
+                if (overlayItem.Script) overlayItem.Script.RunCount=0;
+            }
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -45027,6 +45061,9 @@ function ChartCorssCursor()
     this.IsFixXLastTime=false;                                  //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
     this.IsDrawXRangeBG=false;                                  //是否绘制十字光标背景
 
+    this.EnableNewIndex=false;      //分时图是否使用最新的索引结构 (由外部chart容器传入)
+    this.CorssCursorIndex;          //分时图新版本的索引结构 (由外部chart容器传入)
+
     this.PointX;
     this.PointY;
 
@@ -45084,20 +45121,34 @@ function ChartCorssCursor()
 
     this.GetMinuteCloseYPoint=function(index)
     {
-        if (!IFrameSplitOperator.IsNumber(index)) return null;
-        index=parseInt(index);
-        if (!this.StringFormatX.Data) return null;
-        var data = this.StringFormatX.Data;
-        if (!data.Data || data.Data.length <= 0) return null;
-        var dataIndex = data.DataOffset + index;
-        if (dataIndex >= data.Data.length) dataIndex = data.Data.length - 1;
-        if (dataIndex < 0) return null;
+        if (this.EnableNewIndex && this.CorssCursorIndex)
+        {
+            if (!this.StringFormatX || !this.StringFormatX.GetMinuteCloseYPoint) return null;
+            
+            var closeData=this.StringFormatX.GetMinuteCloseYPoint(this.CorssCursorIndex);
+            if (!closeData) return null;
+            
+            this.Close=closeData.Price;
+            return closeData.Y;
+        }
+        else
+        {
 
-        var close = data.Data[dataIndex];
-        if (!IFrameSplitOperator.IsNumber(index)) return null;
-        this.Close=close;
-        var yPoint = this.Frame.GetYFromData(this.Close);
-        return yPoint;
+            if (!IFrameSplitOperator.IsNumber(index)) return null;
+            index=parseInt(index);
+            if (!this.StringFormatX.Data) return null;
+            var data = this.StringFormatX.Data;
+            if (!data.Data || data.Data.length <= 0) return null;
+            var dataIndex = data.DataOffset + index;
+            if (dataIndex >= data.Data.length) dataIndex = data.Data.length - 1;
+            if (dataIndex < 0) return null;
+    
+            var close = data.Data[dataIndex];
+            if (!IFrameSplitOperator.IsNumber(index)) return null;
+            this.Close=close;
+            var yPoint = this.Frame.GetYFromData(this.Close);
+            return yPoint;
+        }
     }
 
     this.GetDateTimeRange=function(index, option)
@@ -46764,6 +46815,7 @@ function HQMinuteTimeStringFormat()
     this.newMethod();
     delete this.newMethod;
 
+    this.ClassName="HQMinuteTimeStringFormat";
     this.Frame;
     this.Symbol;
     this.Point;
@@ -46895,6 +46947,88 @@ function HQMinuteTimeStringFormat()
 
         return true;
     }
+
+    this.GetMinuteCloseYPoint=function(cursorIndexData)
+    {
+        var type=cursorIndexData.Type;
+        if (type==1 || type==2 || type==3)  //单日  1=主图 2=盘前 3=盘后
+        {
+            if (type==1)
+            {
+                if (!this.Data || this.Data.Data.length <= 0) return null;
+                var index=cursorIndexData.DataIndex;
+                if (index<0 || index>=this.Data.Data.length) index=this.Data.Data.length-1;
+
+                var close = this.Data.Data[index];
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==2)
+            {
+                if (!this.BeforeOpenData || !this.BeforeOpenData.Data) return false;
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=this.BeforeOpenData.Data.length) return null;
+                var item=this.BeforeOpenData.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==3)
+            {
+                if (!this.AfterCloseData || !this.AfterCloseData.Data) return false;
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=this.AfterCloseData.Data.length) return null;
+                var item=this.AfterCloseData.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+        }
+        else if (type==10 || type==20 || type==30)  //多日  10=主图 20=盘前 30=盘后
+        {
+            if (type==10)
+            {
+                if (!this.Data || this.Data.Data.length <= 0) return null;
+                var index=this.Frame.MinuteCount*cursorIndexData.DayIndex+cursorIndexData.DataIndex;
+                if (index<0 || index>=this.Data.Data.length) index=this.Data.Data.length-1;
+
+                var close = this.Data.Data[index];
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==20)
+            {
+                var multiDayBeforeOpenData=this.GetMultiDayBeforeOpenData();
+                if (!multiDayBeforeOpenData) return null;
+                if (cursorIndexData.DayIndex<0 || cursorIndexData.DayIndex>=multiDayBeforeOpenData.length) return null;
+
+                var dayItem=multiDayBeforeOpenData[cursorIndexData.DayIndex];
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=dayItem.Data.length) return null;
+                var item=dayItem.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==30)
+            {
+                var multiDayAfterCloseData=this.GetMultiDayAfterCloseData();
+                if (!multiDayAfterCloseData) return null;
+                if (cursorIndexData.DayIndex<0 || cursorIndexData.DayIndex>=multiDayAfterCloseData.length) return null;
+
+                var dayItem=multiDayAfterCloseData[cursorIndexData.DayIndex];
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=dayItem.Data.length) return null;
+                var item=dayItem.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+        }
+
+
+        return null;
+    }
 }
 
 
@@ -64305,22 +64439,27 @@ function KLineChartContainer(uielement,OffscreenElement)
     {
         if (!this.WindowIndex[windowIndex]) return;
 
-        if (typeof(this.WindowIndex[windowIndex].RequestData)=="function")  //数据需要另外下载的.
+        var item=this.WindowIndex[windowIndex];
+        if (typeof(item.RequestData)=="function")  //数据需要另外下载的.
         {
-            this.WindowIndex[windowIndex].RequestData(this,windowIndex,hisData, option);
+            item.RequestData(this,windowIndex,hisData, option);
             return;
         }
-        if (typeof(this.WindowIndex[windowIndex].ExecuteScript)=='function')
+
+        if (typeof(item.ExecuteScript)=='function')
         {
-            this.WindowIndex[windowIndex].ExecuteScript(this,windowIndex,hisData);
+            if (option && option.CheckRunCount)
+                if (item.IsExcessRunCount()) return;
+
+            item.ExecuteScript(this,windowIndex,hisData);
             return;
         }
 
-        this.WindowIndex[windowIndex].BindData(this,windowIndex,hisData);
+        item.BindData(this,windowIndex,hisData);
     }
 
     //叠加指标
-    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData)
+    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData, option)
     {
         if (!overlayItem.Script) return;
 
@@ -64332,6 +64471,9 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (typeof(overlayItem.Script.ExecuteScript)=='function')
         {
+            if (option && option.CheckRunCount)
+                if (overlayItem.Script.IsExcessRunCount()) return;
+                
             overlayItem.Script.ExecuteScript(this,windowIndex,hisData);
             return;
         }
@@ -64497,7 +64639,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
-    this.BindAllOverlayIndexData=function(hisData)
+    this.BindAllOverlayIndexData=function(hisData, option)
     {
         if (!this.Frame || !this.Frame.SubFrame) return;
 
@@ -64508,7 +64650,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             for(var j in item.OverlayIndex)
             {
                 var overlayItem=item.OverlayIndex[j];
-                this.BindOverlayIndexData(overlayItem,i,hisData)
+                this.BindOverlayIndexData(overlayItem,i,hisData,option)
             }
         }
     }
@@ -65191,7 +65333,7 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         for(var i=0; i<this.Frame.SubFrame.length; ++i)
         {
-            this.BindIndexData(i,bindData);
+            this.BindIndexData(i,bindData, { CheckRunCount:true });
         }
 
         //刷新画图
@@ -65204,7 +65346,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.SendKLineUpdateEvent(bindData);
 
         //叠加指标计算
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData,{ CheckRunCount:true });
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA))
         {
@@ -65929,6 +66071,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ClearRectSelect(true);
         this.Frame.ClearUpDonwFrameYData();
         this.ClearCustomKLine();
+       
 
         var kLineDrawType=this.GetKLineDrawType();
         if (kLineDrawType==10 || kLineDrawType==11 || kLineDrawType==12 || kLineDrawType==16) isDataTypeChange=true;
@@ -65950,6 +66093,7 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (isDataTypeChange==false && !this.IsApiPeriod)
         {
+            this.ClearIndexRunCount();
             this.Update( {UpdateCursorIndexType:2} ); //更新的时候 取消显示十字光标
             return;
         }
@@ -65962,6 +66106,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');                //切换周期先停止更新
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
+            this.ClearIndexRunCount();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -65971,6 +66116,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');                //切换周期先停止更新
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
+            this.ClearIndexRunCount();
             this.ReqeustHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
@@ -65978,6 +66124,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.CancelAutoUpdate();                    //先停止定时器
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');
             this.ResetScrollBar();
+            this.ClearIndexRunCount();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -67278,6 +67425,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ClearKLineCaluate();
         this.HideTooltip();
         this.ResetScrollBar();
+        this.ClearIndexRunCount();
         
         this.Symbol=symbol;
         if (!symbol)
@@ -72375,6 +72523,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ClearIndexPaint();             //清空指标
         this.ResetOverlaySymbolStatus();
         this.ReloadChartDrawPicture();
+        this.ClearIndexRunCount();
 
         if (option)
         {
@@ -73763,7 +73912,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
-    this.BindIndexData=function(windowIndex,hisData)
+    this.BindIndexData=function(windowIndex, hisData, option)
     {
         if (!this.WindowIndex[windowIndex]) return;
 
@@ -74208,7 +74357,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     }
 
     //计算叠加指标
-    this.BindAllOverlayIndexData=function(hisData)
+    this.BindAllOverlayIndexData=function(hisData, option)
     {
         if (!this.Frame || !this.Frame.SubFrame) return;
 
@@ -74219,13 +74368,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             for(var j in item.OverlayIndex)
             {
                 var overlayItem=item.OverlayIndex[j];
-                this.BindOverlayIndexData(overlayItem,i,hisData)
+                this.BindOverlayIndexData(overlayItem,i,hisData,option)
             }
         }
     }
 
     //叠加指标
-    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData)
+    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData, option)
     {
         if (!overlayItem.Script) return;
 

package/src/jscommon/umychart.testdata/60000.sh.5day.minute.js

@@ -4919,7 +4919,7 @@ var MINUTE_5DAY_DATA={
                 ]
             ],
             "date": 20230706,
-            "yclose": 7.21
+            "yclose": 7.24
         },
         {
             "minute": [
@@ -7598,7 +7598,7 @@ var MINUTE_5DAY_DATA={
                 ]
             ],
             "date": 20230705,
-            "yclose": 7.21
+            "yclose": 7.18
         },
         {
             "minute": [
@@ -10277,7 +10277,7 @@ var MINUTE_5DAY_DATA={
                 ]
             ],
             "date": 20230704,
-            "yclose": 7.21
+            "yclose": 7.20
         },
         {
             "minute": [
@@ -12956,7 +12956,7 @@ var MINUTE_5DAY_DATA={
                 ]
             ],
             "date": 20230703,
-            "yclose": 7.21
+            "yclose": 7.25
         }
     ],
     "code": 0