hqchart 1.1.14824 → 1.1.14829

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

@@ -5433,6 +5433,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 chart.CreateOverlayWindowsIndex(obj);
             }
         }
+
+        if (option.LatestPointFlash)
+        {
+            var item=option.LatestPointFlash;
+            if (item.Enable)
+            {
+                this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey, { ZIndex:6 });
+                chart.CreateExtendChart("LatestPointFlashPaint", item);
+                chart.StartLatestPointFlash();
+            }
+        }
         
         return chart;
     }
@@ -6493,6 +6504,7 @@ JSChart.EnableCanvasWillReadFrequently=false;   //https://html.spec.whatwg.org/m
 JSChart.CorssCursorCanvasKey="hqchart_corsscursor";
 JSChart.TooltipCursorCanvasKey="hqchart_tooltip";
 JSChart.RectDragCanvasKey="hqchart_drag_rect";
+JSChart.LatestPointFlashKey="hqchart_point_flash";  //最新数据点闪烁
 
 //初始化
 JSChart.Init=function(divElement,bScreen,bCacheCanvas)
@@ -7373,6 +7385,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         MapIndexChartCache:new Map(),      //key 指标GUID
 
         TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
+
+        LatestPoint:null,   //最新的点位置 { X:, Y: }
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -7386,6 +7400,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DisplayLatestOption={ Timer:null, Enable: false, DelayTime:60*1000*3, LastPoint:null };
     this.DrawDynamicInfoOption={ Timer:null, Enable:false , DelayTime:10 };
 
+    this.LatestPointFlashOption={ Timer:null, DelayTime:100 };
+
     this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
     this.StockCache={ Data:null };        //扩展数据缓存数据
@@ -7480,6 +7496,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.MapEventListenerCache.clear();
     }
 
+    this.ClearGlobalOption=function()
+    {
+        if (!this.GlobalOption) return;
+
+        this.GlobalOption.LatestPoint=null;
+        this.GlobalOption.TradeStatus=null;
+    }
+
     this.RestoreFocus=function(delay)
     {
         var value=1000;
@@ -7851,6 +7875,40 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    this.StartLatestPointFlash=function()
+    {
+        this.LatestPointFlashOption.Timer=setInterval(()=>
+        {
+            this.DrawLatestPoint(); 
+        }, this.LatestPointFlashOption.DelayTime);
+    }
+
+    this.StopLatestPointFlash=function()
+    {
+        if (this.LatestPointFlashOption.Timer)
+        {
+            clearInterval(this.LatestPointFlashOption.Timer);
+            this.LatestPointFlashOption.Timer=null;
+        }
+    }
+
+    this.DrawLatestPoint=function()
+    {
+        var finder=this.GetExtendChartByClassName("LatestPointFlashPaint");
+        if (finder && finder.Chart)
+            finder.Chart.Draw();
+    }
+
+    this.SetLatestPointFlash=function(flashCount, option)
+    {
+        if (!IFrameSplitOperator.IsNumber(flashCount)) return;
+        var finder=this.GetExtendChartByClassName("LatestPointFlashPaint");
+        if (!finder || !finder.Chart) return false;
+
+        var chart=finder.Chart;
+        chart.FlashCount=flashCount;
+    }
+
     this.ChartDestroy=function()    //销毁
     {
         this.IsDestroy=true;
@@ -7869,6 +7927,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DestroyPopMenu();
 
+        this.StopLatestPointFlash();
+
         document.oncontextmenu=null;
         this.RemoveAllEventListener();
     }
@@ -43962,6 +44022,12 @@ function ChartMinutePriceLine()
         this.DrawAfterClose();      //收盘集合竞价
         this.DrawMultiDayAfterClose();
 
+        if (this.Identify=="Minute-Line" && this.ChartFrame.GlobalOption)
+        {
+            var globalOption=this.ChartFrame.GlobalOption;
+            globalOption.LatestPoint={ X:this.LastPoint.X, Y:this.LastPoint.Y };
+        }
+
         if (this.GetEventCallback)
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_MINUTE_LAST_POINT);
@@ -51293,7 +51359,8 @@ function ExtendChartPaintFactory()
             ["RectDragPaint", { Create:function() { return new RectDragPaint(); } }],
             ["DragMovePaint", { Create:function() { return new DragMovePaint(); } }],
             ["SessionBreaksPaint", { Create:function() { return new SessionBreaksPaint(); }}],
-            ["FrameButtomToolbarPaint", {Create:function() { return new FrameButtomToolbarPaint(); }}]
+            ["FrameButtomToolbarPaint", {Create:function() { return new FrameButtomToolbarPaint(); }}],
+            ["LatestPointFlashPaint", {Create:function() { return new LatestPointFlashPaint(); }}]
         ]
     );
 
@@ -55919,6 +55986,101 @@ function MinuteBackgroundPaint()
     }
 }
 
+//最新数据点闪动
+function LatestPointFlashPaint()
+{
+    this.newMethod=IExtendChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='LatestPointFlashPaint';
+    this.HQChart;
+
+    this.Status=0;
+    this.UpdateTime=new Date();
+    this.FlashCount=0;  //闪烁次数
+    this.Frequency=500; //闪烁频率ms
+
+    this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;
+    this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;
+    this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
+    this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
+    this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+    this.FlashCanvas;
+
+    this.SetOption=function(option)
+    {
+        if (this.HQChart)   
+        {
+            var extraElement=this.HQChart.GetExtraCanvas(JSChart.LatestPointFlashKey);
+            if (extraElement && extraElement.Canvas) this.FlashCanvas=extraElement.Canvas;   //绑定独立的画布
+        }
+
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Frequency)) this.Frequency=option.Frequency;
+        }
+    }
+
+    this.ReloadResource=function(resource)
+    {
+        this.PointColor=g_JSChartResource.LatestPointFlash.PointColor;
+        this.PointRadius=g_JSChartResource.LatestPointFlash.PointRadius;
+        this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
+        this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
+    }
+
+    this.Draw=function()
+    {
+        if (!this.FlashCanvas) return;
+        if (!this.HQChart) return;
+        this.HQChart.ClearCanvas(this.FlashCanvas);
+
+        if (this.FlashCount<=0) return;
+        if (this.IsStatusChange())
+        {
+            this.Status=(this.Status+1)%2;
+            --this.FlashCount;
+        }
+
+        if (this.Status==0) return;
+        if (!this.HQChart.GlobalOption || !this.HQChart.GlobalOption.LatestPoint) return;
+        var point=this.HQChart.GlobalOption.LatestPoint;
+        if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
+
+        this.FlashCanvas.fillStyle=this.BGColor;
+        this.FlashCanvas.beginPath();
+        this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);
+        this.FlashCanvas.fill();                         
+        this.FlashCanvas.closePath();
+
+        //画实心圆
+        this.FlashCanvas.fillStyle=this.PointColor;
+        this.FlashCanvas.beginPath();
+        this.FlashCanvas.arc(point.X,point.Y,this.PointRadius,0,360,false);
+        this.FlashCanvas.fill();                         
+        this.FlashCanvas.closePath();
+    }
+
+    this.IsStatusChange=function()
+    {
+        if (!this.UpdateTime)
+        {
+            this.UpdateTime=new Date();
+            return true;
+        }
+
+
+        var now=new Date();
+        var diffValue=now.getTime()-this.UpdateTime.getTime();
+        if (diffValue<=this.Frequency) 
+            return false;
+
+        this.UpdateTime=now;
+        return true;
+    }
+}
+
 //拖拽效果图
 var JSCHART_DRAGCHART_TYPE_ID=
 {
@@ -79093,6 +79255,15 @@ function JSChartResource()
 
         CorssPoint:{ Center:{ Radius:5*GetDevicePixelRatio(), Color:"rgb(50,171,205)"}, Border:{ Color:'rgb(255,255,255)', Width:1*GetDevicePixelRatio() } }
     };
+
+    this.LatestPointFlash=
+    {
+        PointColor:"rgb(50,171,205)",
+        PointRadius:3*GetDevicePixelRatio(),
+
+        BGColor:"rgba(50,171,205,0.7)",
+        BGRadius:6*GetDevicePixelRatio(),
+    }
    
     //指标锁
     this.IndexLock=
@@ -80637,6 +80808,17 @@ function JSChartResource()
                 if (subItem.Color) subDest.Color=subItem.Color;
             }
         }
+
+        if (style.LatestPointFlash)
+        {
+            var item=style.LatestPointFlash;
+            var dest=this.LatestPointFlash;
+            if (item.PointColor) dest.PointColor=item.PointColor;
+            if (IFrameSplitOperator.IsNumber(item.PointRadius)) dest.PointRadius=item.PointRadius;
+
+            if (item.BGColor) dest.BGColor=item.BGColor;
+            if (IFrameSplitOperator.IsNumber(item.BGRadius)) dest.BGRadius=item.BGRadius;
+        }
         
         if (style.KLine) this.KLine = style.KLine;
         if (style.VirtualKLine)
@@ -86743,7 +86925,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 if (IFrameSplitOperator.IsNumber(item.DataWidth)) this.KLineSize={ DataWidth:item.DataWidth };
             }
 
-            if (option.Reload==true) isReload=true;
+            if (IFrameSplitOperator.IsBool(option.Reload)) isReload=option.Reload;
+            if (IFrameSplitOperator.IsBool(option.IsApiPeriod)) this.IsApiPeriod=option.IsApiPeriod;
         };
 
         if (this.Period==period && isReload==false) 
@@ -95893,6 +96076,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
             this.RecvBuySellData(data.stock[0].BuySellData);
         }
+
+        if (data.LatestPointFlash)  //最新数据闪烁
+        {
+            var item=data.LatestPointFlash;
+            if (IFrameSplitOperator.IsNumber(item.FlashCount))
+                this.SetLatestPointFlash(item.FlashCount)
+        }
         
         this.DataStatus.LatestDay=true;
             
@@ -152920,7 +153110,11 @@ function JSPopMenu()
 
     this.Destroy=function()
     {
-        if (this.MouseDownlistenerPtr) window.removeEventListener('mousedown', this.MouseDownlistenerPtr);
+        if (this.MouseDownlistenerPtr) 
+        {
+            window.removeEventListener('mousedown', this.MouseDownlistenerPtr);
+            this.MouseDownlistenerPtr=null;
+        }
     }
 
     //创建菜单
@@ -160601,7 +160795,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14823";
+var HQCHART_VERSION="1.1.14828";
 
 function PrintHQChartVersion()
 {
@@ -160766,7 +160960,7 @@ export default {
         JSCHART_DATA_FIELD_ID:JSCHART_DATA_FIELD_ID,
         JSCHART_WORKER_MESSAGE_ID:JSCHART_WORKER_MESSAGE_ID,
         JSCHART_MENU_ID:JSCHART_MENU_ID,
-        JSCHART_TRADE_STATUS_ID,        //交易状态
+        JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,        //交易状态
     },